Skip to content

Commit

Permalink
Merge pull request tgstation#13088 from as334/master
Browse files Browse the repository at this point in the history
Plasmamen fixes
  • Loading branch information
RemieRichards committed Nov 29, 2015
2 parents 2a66db0 + 0048a5b commit edfb957
Show file tree
Hide file tree
Showing 17 changed files with 32 additions and 20 deletions.
4 changes: 2 additions & 2 deletions code/datums/supplypacks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1184,8 +1184,8 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
/obj/item/clothing/under/plasmaman,
/obj/item/weapon/tank/internals/plasmaman/belt/full,
/obj/item/weapon/tank/internals/plasmaman/belt/full,
/obj/item/clothing/head/helmet/plasmaman,
/obj/item/clothing/head/helmet/plasmaman)
/obj/item/clothing/head/helmet/space/plasmaman,
/obj/item/clothing/head/helmet/space/plasmaman)
cost = 20
containername = "plasma-man supply kit"

Expand Down
6 changes: 5 additions & 1 deletion code/game/gamemodes/nuclear/nuclear.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
recommended_enemies = 5
antag_flag = ROLE_OPERATIVE
enemy_minimum_age = 14

var/const/agents_possible = 5 //If we ever need more syndicate agents.

var/nukes_left = 1 // Call 3714-PRAY right now and order more nukes! Limited offer!
Expand Down Expand Up @@ -43,6 +42,11 @@
synd_mind.assigned_role = "Syndicate"
synd_mind.special_role = "Syndicate"//So they actually have a special role/N
log_game("[synd_mind.key] (ckey) has been selected as a nuclear operative")
if(ishuman(synd_mind.current))//don't want operatives burning to death instantly.
var/mob/living/carbon/human/human = synd_mind.current
if(human.dna && human.dna.species.dangerous_existence)
human.set_species(/datum/species/human)

return 1


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ var/list/possibleShadowlingNames = list("U'ruan", "Y`shej", "Nex", "Hel-uae", "N
charge_counter = charge_max
return
if("Yes")
H.Stun(INFINITY) //This is bad but notransform won't work.
H.stunned = INFINITY //This is bad but hulks can't be stunned with the actual procs. I'm sorry.
H.visible_message("<span class='warning'>[H]'s things suddenly slip off. They hunch over and vomit up a copious amount of purple goo which begins to shape around them!</span>", \
"<span class='shadowling'>You remove any equipment which would hinder your hatching and begin regurgitating the resin which will protect you.</span>")

Expand All @@ -33,6 +33,8 @@ var/list/possibleShadowlingNames = list("U'ruan", "Y`shej", "Nex", "Hel-uae", "N
for(var/obj/structure/alien/resin/wall/shadowling/R in shadowturf) //extremely hacky
qdel(R)
new /obj/structure/alien/weeds/node(shadowturf) //Dim lighting in the chrysalis -- removes itself afterwards
var/temp_flags = H.status_flags
H.status_flags |= GODMODE //Can't die while hatching

H.visible_message("<span class='warning'>A chrysalis forms around [H], sealing them inside.</span>", \
"<span class='shadowling'>You create your chrysalis and begin to contort within.</span>")
Expand All @@ -54,14 +56,14 @@ var/list/possibleShadowlingNames = list("U'ruan", "Y`shej", "Nex", "Hel-uae", "N
sleep(10)
playsound(H.loc, 'sound/weapons/slice.ogg', 25, 1)
H << "<i><b>You are free!</b></i>"

H.status_flags = temp_flags
sleep(10)
playsound(H.loc, 'sound/effects/ghost.ogg', 100, 1)
var/newNameId = pick(possibleShadowlingNames)
possibleShadowlingNames.Remove(newNameId)
H.real_name = newNameId
H.name = user.real_name
H.SetStunned(0)
H.stunned = 0 //Same as above. Due to hulks.
H << "<i><b><font size=3>YOU LIVE!!!</i></b></font>"

for(var/obj/structure/alien/resin/wall/shadowling/W in orange(1, H))
Expand Down
2 changes: 1 addition & 1 deletion code/modules/awaymissions/corpse.dm
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@

/obj/effect/landmark/corpse/plasmaman
mob_species = "plasmaman"
corpsehelmet = /obj/item/clothing/head/helmet/plasmaman
corpsehelmet = /obj/item/clothing/head/helmet/space/plasmaman
corpseuniform = /obj/item/clothing/under/plasmaman
corpseback = /obj/item/weapon/tank/internals/plasmaman/full
corpsemask = /obj/item/clothing/mask/breath
Expand Down
4 changes: 2 additions & 2 deletions code/modules/clothing/outfits/standard.dm
Original file line number Diff line number Diff line change
Expand Up @@ -327,9 +327,9 @@
/datum/outfit/plasmaman
name = "Plasmaman"

head = /obj/item/clothing/head/helmet/plasmaman
head = /obj/item/clothing/head/helmet/space/plasmaman
uniform = /obj/item/clothing/under/plasmaman
belt = /obj/item/weapon/tank/internals/plasmaman/belt/full
r_hand= /obj/item/weapon/tank/internals/plasmaman/belt/full
mask = /obj/item/clothing/mask/breath

/datum/outfit/death_commando
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/spacesuits/plasmamen.dm
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@


//I just want the light feature of the hardsuit helmet
/obj/item/clothing/head/helmet/plasmaman
/obj/item/clothing/head/helmet/space/plasmaman
name = "plasmaman helmet"
desc = "A special containment helmet designed to protect a plasmaman's volatile body from outside exposure and quickly extinguish it in emergencies."
icon_state = "plasmaman-helm"
Expand Down
9 changes: 4 additions & 5 deletions code/modules/clothing/under/miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -507,11 +507,10 @@
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 0)
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
can_adjust = 0
slowdown = 1
strip_delay = 80
var/next_extinguish = 0
var/extinguish_cooldown = 100
var/extinguishes_left = 10
var/extinguishes_left = 5


/obj/item/clothing/under/plasmaman/examine(mob/user)
Expand All @@ -536,11 +535,11 @@

/obj/item/clothing/under/plasmaman/attackby(obj/item/E, mob/user, params)
if (istype(E, /obj/item/device/extinguisher_refill))
if (extinguishes_left == 10)
if (extinguishes_left == 5)
user << "<span class='notice'>The inbuilt extinguisher is full.</span>"
return
else
extinguishes_left = 10
extinguishes_left = 5
user << "<span class='notice'>You refill the suits inbuilt extinguisher, using up the refill pack.</span>"
qdel(E)
return
Expand All @@ -550,5 +549,5 @@
/obj/item/device/extinguisher_refill
name = "Plasma-man jumpsuit refill pack"
desc = "A compressed water pack used to refill plasma-man jumpsuit auto-extinguishers."
icon_state = "multitool"
icon_state = "plasmarefill"

13 changes: 10 additions & 3 deletions code/modules/mob/living/carbon/human/species_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
default_features = list("mcolor" = "FFF", "tail_human" = "None", "ears" = "None")
use_skintones = 1


/datum/species/human/qualifies_for_rank(rank, list/features)
if((!features["tail_human"] || features["tail_human"] == "None") && (!features["ears"] || features["ears"] == "None"))
return 1 //Pure humans are always allowed in all roles.
Expand Down Expand Up @@ -475,22 +476,28 @@ var/global/image/plasmaman_on_fire = image("icon"='icons/mob/OnFire.dmi', "icon_
safe_toxins_max = 0
dangerous_existence = 1 //So so much
need_nutrition = 0 //Hard to eat through a helmet
burnmod = 2
heatmod = 2
speedmod = 1
var/skin = 0

/datum/species/plasmaman/skin
name = "Skinbone"
skin = 1
roundstart = 0

/datum/species/plasmaman/update_base_icon_state(mob/living/carbon/human/H)
var/base = ..()
if(base == id)
base = "[base][skin]"
if(base == id && !skin)
base = "[base]_m"
else
base = "skinbone_m"
return base

/datum/species/plasmaman/spec_life(mob/living/carbon/human/H)
var/datum/gas_mixture/environment = H.loc.return_air()

if(!istype(H.w_uniform, /obj/item/clothing/under/plasmaman) || !istype(H.head, /obj/item/clothing/head/helmet/plasmaman))
if(!istype(H.w_uniform, /obj/item/clothing/under/plasmaman) || !istype(H.head, /obj/item/clothing/head/helmet/space/plasmaman))
if(environment)
var/total_moles = environment.total_moles()
if(total_moles)
Expand Down
4 changes: 2 additions & 2 deletions config/game_options.txt
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ DEFAULT_LAWS 1
SILICON_MAX_LAW_AMOUNT 12

## Uncomment to give players the choice of their species before they join the game
#JOIN_WITH_MUTANT_RACE
JOIN_WITH_MUTANT_RACE


## Roundstart Races
Expand All @@ -263,7 +263,7 @@ ROUNDSTART_RACES human
## Races that are strictly worse than humans that could probably be turned on without balance concerns
ROUNDSTART_RACES lizard
#ROUNDSTART_RACES fly
#ROUNDSTART_RACES plasmaman
ROUNDSTART_RACES plasmaman
#ROUNDSTART_RACES shadow
#ROUNDSTART_RACES shadowling

Expand Down
Binary file modified icons/mob/head.dmi
Binary file not shown.
Binary file modified icons/mob/human.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/clothing_lefthand.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/clothing_righthand.dmi
Binary file not shown.
Binary file modified icons/mob/uniform.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/hats.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/uniforms.dmi
Binary file not shown.
Binary file modified icons/obj/device.dmi
Binary file not shown.

0 comments on commit edfb957

Please sign in to comment.