Fix some shuttle chair stuff (#38557)

* Fix shuttle chair stuff

* Remove redundancy
This commit is contained in:
Jordan Brown
2018-06-19 02:29:38 -04:00
committed by letterjay
parent 1438afa013
commit 2cd16aa1ad
43 changed files with 253 additions and 255 deletions
@@ -148,14 +148,17 @@
resistance_flags = FLAMMABLE
max_integrity = 70
buildstackamount = 2
var/mutable_appearance/armrest
item_chair = null
var/mutable_appearance/armrest
/obj/structure/chair/comfy/Initialize()
armrest = mutable_appearance('icons/obj/chairs.dmi', "comfychair_armrest")
armrest = GetArmrest()
armrest.layer = ABOVE_MOB_LAYER
return ..()
/obj/structure/chair/comfy/proc/GetArmrest()
return mutable_appearance('icons/obj/chairs.dmi', "comfychair_armrest")
/obj/structure/chair/comfy/Destroy()
QDEL_NULL(armrest)
return ..()
@@ -189,6 +192,14 @@
/obj/structure/chair/comfy/lime
color = rgb(255,251,0)
/obj/structure/chair/comfy/shuttle
name = "shuttle seat"
desc = "A comfortable, secure seat. It has a more sturdy looking buckling system, for smoother flights."
icon_state = "shuttle_chair"
/obj/structure/chair/comfy/shuttle/GetArmrest()
return mutable_appearance('icons/obj/chairs.dmi', "shuttle_chair_armrest")
/obj/structure/chair/office
anchored = FALSE
buildstackamount = 5
@@ -407,16 +418,3 @@
. = ..()
if(has_gravity())
playsound(src, 'sound/machines/clockcult/integration_cog_install.ogg', 50, TRUE)
/obj/structure/chair/shuttle
name = "shuttle seat"
desc = "A comfortable, secure seat. It has a more sturdy looking buckling system, for smoother flights."
icon_state = "shuttle_chair"
buildstackamount = 2
var/mutable_appearance/armrest
item_chair = null
/obj/structure/chair/shuttle/Initialize()
armrest = mutable_appearance('icons/obj/chairs.dmi', "shuttle_chair_armrest")
armrest.layer = ABOVE_MOB_LAYER
return ..()