Refactor of outfits datums and corpse spawners

This commit is contained in:
c0
2017-01-08 10:30:31 +03:00
parent ddf208daef
commit 0b311121d9
19 changed files with 374 additions and 320 deletions
-4
View File
@@ -132,7 +132,6 @@
myjob = new/datum/job/assistant()
job = myjob.title
myjob.equip(src)
myjob.apply_fingerprints(src)
/mob/living/carbon/human/interactive/attacked_by(obj/item/I, mob/living/user, def_zone)
. = ..()
@@ -206,7 +205,6 @@
for(var/obj/item/W in T)
qdel(W)
T.myjob.equip(T)
T.myjob.apply_fingerprints(T)
T.doSetup()
break
if(choice == "Random")
@@ -215,7 +213,6 @@
for(var/obj/item/W in T)
qdel(W)
T.myjob.equip(T)
T.myjob.apply_fingerprints(T)
T.doSetup()
if(prob(25))
var/list/validchoices = list()
@@ -239,7 +236,6 @@
for(var/obj/item/W in T)
qdel(W)
T.myjob.equip(T)
T.myjob.apply_fingerprints(T)
T.doSetup()
var/shouldDoppel = input("Do you want the SNPC to disguise themself as a crewmember?") as null|anything in list("Yes","No")
if(shouldDoppel)
@@ -30,7 +30,6 @@
gloves = /obj/item/clothing/gloves/combat
radio = /obj/item/device/radio/headset
mask = /obj/item/clothing/mask/gas/syndicate
helmet = /obj/item/clothing/head/helmet/space/hardsuit/syndi
back = /obj/item/weapon/tank/jetpack/oxygen
pocket1 = /obj/item/weapon/tank/internals/emergency_oxygen
has_id = 1
@@ -45,7 +44,6 @@
gloves = /obj/item/clothing/gloves/combat
radio = /obj/item/device/radio/headset
mask = /obj/item/clothing/mask/gas/syndicate
helmet = /obj/item/clothing/head/helmet/space/hardsuit/syndi/elite
back = /obj/item/weapon/tank/jetpack/oxygen/harness
has_id = 1
id_job = "Operative"
@@ -53,18 +51,9 @@
/obj/effect/mob_spawn/human/corpse/clown
name = "Clown"
uniform = /obj/item/clothing/under/rank/clown
shoes = /obj/item/clothing/shoes/clown_shoes
radio = /obj/item/device/radio/headset
mask = /obj/item/clothing/mask/gas/clown_hat
pocket1 = /obj/item/weapon/bikehorn
back = /obj/item/weapon/storage/backpack/clown
has_id = 1
id_job = "Clown"
id_access = "Clown"
/obj/effect/mob_spawn/human/clown/corpse
roundstart = FALSE
instant = TRUE
/obj/effect/mob_spawn/human/corpse/pirate
@@ -24,7 +24,7 @@
obj_damage = 0
environment_smash = 0
del_on_death = 1
loot = list(/obj/effect/mob_spawn/human/corpse/clown)
loot = list(/obj/effect/mob_spawn/human/clown/corpse)
atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 270