Merge pull request #33905 from ShizCalev/jumpsuit-fix

Fixes being able to adjust jumpsuits without an adjust state w/ chameleon & random jumpsuit
This commit is contained in:
Jordan Brown
2017-12-29 11:09:56 -05:00
committed by CitadelStationBot
parent 48e0c47410
commit d38a4a2aa5
7 changed files with 22 additions and 27 deletions
+1 -1
View File
@@ -231,10 +231,10 @@ LINEN BINS
desc = "If you're reading this description ingame, something has gone wrong! Honk!"
/obj/item/bedsheet/random/Initialize()
. = INITIALIZE_HINT_QDEL
..()
var/type = pick(typesof(/obj/item/bedsheet) - /obj/item/bedsheet/random)
new type(loc)
return INITIALIZE_HINT_QDEL
/obj/structure/bedsheetbin
name = "linen bin"
@@ -184,10 +184,10 @@
var/obj/machinery/manned_turret/turret
/obj/item/gun_control/Initialize()
. = ..()
turret = loc
if(!istype(turret))
return INITIALIZE_HINT_QDEL
. = ..()
turret = loc
if(!istype(turret))
return INITIALIZE_HINT_QDEL
/obj/item/gun_control/Destroy()
turret = null