shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixing chair runtimes

Browse Source 
fixed the chair runtimes that resulted from porting over comfy chair padding overlay code
This commit is contained in:
evilew
2024-11-25 19:01:27 +01:00
parent ecd025e7c7
commit 251a4c8fa4
1 changed files with 15 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
code/game/objects/structures/beds_chairs/chair.dm
View File

@@ -14,8 +14,6 @@
var/buildstackamount = 1
var/item_chair = /obj/item/chair // if null it can't be picked up
layer = OBJ_LAYER
var/paddingcolor = "" //GS13 - better comfy chairs
var/mutable_appearance/lower
/obj/structure/chair/examine(mob/user)
. = ..()
@@ -28,14 +26,6 @@
if(!anchored) //why would you put these on the shuttle?
addtimer(CALLBACK(src, PROC_REF(RemoveFromLatejoin)), 0)
lower = GetLower() //if the chair has a lower part.
lower.layer = TABLE_LAYER
add_overlay(lower)
return ..()
/obj/structure/chair/proc/GetLower()
return mutable_appearance('GainStation13/icons/obj/chairs.dmi', "[icon_state]_lower") //GS13 - better chairs
/obj/structure/chair/ComponentInitialize()
. = ..()
AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE, CALLBACK(src, PROC_REF(can_user_rotate),CALLBACK(src), PROC_REF(can_be_rotated)),null)
@@ -200,16 +190,9 @@
max_integrity = 70
buildstackamount = 2
item_chair = null
paddingcolor = "#e82d2d" //GS13 - better comfy chairs
var/mutable_appearance/armrest
var/mutable_appearance/padding
/obj/structure/chair/comfy/Initialize(mapload) //GS13 - better comfy chairs
padding = GetPadding()
padding.color = paddingcolor
if(paddingcolor)
add_overlay(padding)
/obj/structure/chair/comfy/Initialize(mapload)
armrest = GetArmrest()
armrest.layer = ABOVE_MOB_LAYER
return ..()
@@ -217,9 +200,6 @@
/obj/structure/chair/comfy/proc/GetArmrest()
return mutable_appearance('GainStation13/icons/obj/chairs.dmi', "comfychair_armrest") //GS13 - better comfy chairs
/obj/structure/chair/comfy/proc/GetPadding()
return mutable_appearance('GainStation13/icons/obj/chairs.dmi', "comfychair_padding") //GS13 - better comfy chairs
/obj/structure/chair/comfy/Destroy()
QDEL_NULL(armrest)
return ..()
@@ -238,29 +218,27 @@
. = ..()
update_armrest()
/obj/structure/chair/comfy/brown //GS13 - better comfy chairs
paddingcolor = rgb(255,113,0)
/obj/structure/chair/comfy/brown
color = rgb(197, 130, 76)
/obj/structure/chair/comfy/beige //GS13 - better comfy chairs
paddingcolor = rgb(255,253,195)
/obj/structure/chair/comfy/beige
color = rgb(193, 191, 153)
/obj/structure/chair/comfy/teal //GS13 - better comfy chairs
paddingcolor = rgb(0,255,255)
/obj/structure/chair/comfy/teal
color = rgb(71, 190, 190)
/obj/structure/chair/comfy/black //GS13 - better comfy chairs
paddingcolor = rgb(167,164,153)
/obj/structure/chair/comfy/black
color = rgb(167,164,153)
/obj/structure/chair/comfy/lime //GS13 - better comfy chairs
paddingcolor = rgb(255,251,0)
/obj/structure/chair/comfy/lime
color = rgb(194, 192, 78)
/obj/structure/chair/comfy/blue //GS13 - better comfy chairs
paddingcolor = rgb(125, 137, 218)
/obj/structure/chair/comfy/purple
color = rgb(173, 85, 163)
/obj/structure/chair/comfy/green //GS13 - better comfy chairs
paddingcolor = rgb(102, 137, 81)
/obj/structure/chair/comfy/green
color = rgb(110, 148, 99)
/obj/structure/chair/comfy/purple //GS13 - better comfy chairs
paddingcolor = rgb(130, 86, 171)
/obj/structure/chair/comfy/plywood
name = "plywood chair"
@@ -277,7 +255,6 @@
name = "shuttle seat"
desc = "A comfortable, secure seat. It has a more sturdy looking buckling system, for smoother flights."
icon_state = "shuttle_chair"
paddingcolor = "" //gs13 - padding appearance
/obj/structure/chair/comfy/shuttle/GetArmrest()
return mutable_appearance('icons/obj/chairs.dmi', "shuttle_chair_armrest")