cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 03:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes sofa paths

Browse Source 
Sofas used to have really weird subtypes, now they correctly inherit from either the base (middle), left, right, or corner, which solves the issue with layers on the non-red corner sofas (which red sofas were exempt from due to them being the base object type).
This commit is contained in:
ktccd0
2022-02-16 14:48:28 +01:00
parent e73983fd6f
commit 618f11ad3e
2 changed files with 98 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+68 -65
View File
@@ -320,21 +320,24 @@
icon_state = "corp_sofamiddle"
applies_material_colour = FALSE
/obj/structure/bed/chair/sofa/corp/left
/obj/structure/bed/chair/sofa/left/corp
icon_state = "corp_sofaend_left"
base_icon = "corp_sofaend_left"
applies_material_colour = FALSE
/obj/structure/bed/chair/sofa/corp/right
/obj/structure/bed/chair/sofa/right/corp
icon_state = "corp_sofaend_right"
base_icon = "corp_sofaend_right"
applies_material_colour = FALSE
/obj/structure/bed/chair/sofa/corp/corner
/obj/structure/bed/chair/sofa/corner/corp
icon_state = "corp_sofacorner"
base_icon = "corp_sofacorner"
corner_piece = TRUE
applies_material_colour = FALSE
//corner_piece = TRUE //No need to re-state this, as the parent object already handles corners
//color variations
//Middle sofas first
/obj/structure/bed/chair/sofa
sofa_material = "carpet"
@@ -379,92 +382,92 @@
/obj/structure/bed/chair/sofa/corner
icon_state = "sofacorner"
/obj/structure/bed/chair/sofa/brown/left
icon_state = "sofaend_left"
/obj/structure/bed/chair/sofa/left/brown
sofa_material = "leather"
/obj/structure/bed/chair/sofa/brown/right
icon_state = "sofaend_right"
/obj/structure/bed/chair/sofa/right/brown
sofa_material = "leather"
/obj/structure/bed/chair/sofa/brown/corner
icon_state = "sofacorner"
/obj/structure/bed/chair/sofa/corner/brown
sofa_material = "leather"
/obj/structure/bed/chair/sofa/teal/left
icon_state = "sofaend_left"
/obj/structure/bed/chair/sofa/left/teal
sofa_material = "teal"
/obj/structure/bed/chair/sofa/teal/right
icon_state = "sofaend_right"
/obj/structure/bed/chair/sofa/right/teal
sofa_material = "teal"
/obj/structure/bed/chair/sofa/teal/corner
icon_state = "sofacorner"
/obj/structure/bed/chair/sofa/corner/teal
sofa_material = "teal"
/obj/structure/bed/chair/sofa/black/left
icon_state = "sofaend_left"
/obj/structure/bed/chair/sofa/left/black
sofa_material = "black"
/obj/structure/bed/chair/sofa/black/right
icon_state = "sofaend_right"
/obj/structure/bed/chair/sofa/right/black
sofa_material = "black"
/obj/structure/bed/chair/sofa/black/corner
icon_state = "sofacorner"
/obj/structure/bed/chair/sofa/corner/black
sofa_material = "black"
/obj/structure/bed/chair/sofa/green/left
icon_state = "sofaend_left"
/obj/structure/bed/chair/sofa/left/green
sofa_material = "green"
/obj/structure/bed/chair/sofa/green/right
icon_state = "sofaend_right"
/obj/structure/bed/chair/sofa/right/green
sofa_material = "green"
/obj/structure/bed/chair/sofa/green/corner
icon_state = "sofacorner"
/obj/structure/bed/chair/sofa/corner/green
sofa_material = "green"
/obj/structure/bed/chair/sofa/purp/left
icon_state = "sofaend_left"
/obj/structure/bed/chair/sofa/left/purp
sofa_material = "purple"
/obj/structure/bed/chair/sofa/purp/right
icon_state = "sofaend_right"
/obj/structure/bed/chair/sofa/right/purp
sofa_material = "purple"
/obj/structure/bed/chair/sofa/purp/corner
icon_state = "sofacorner"
/obj/structure/bed/chair/sofa/corner/purp
sofa_material = "purple"
/obj/structure/bed/chair/sofa/blue/left
icon_state = "sofaend_left"
/obj/structure/bed/chair/sofa/left/blue
sofa_material = "blue"
/obj/structure/bed/chair/sofa/blue/right
icon_state = "sofaend_right"
/obj/structure/bed/chair/sofa/right/blue
sofa_material = "blue"
/obj/structure/bed/chair/sofa/blue/corner
icon_state = "sofacorner"
/obj/structure/bed/chair/sofa/corner/blue
sofa_material = "blue"
/obj/structure/bed/chair/sofa/beige/left
icon_state = "sofaend_left"
/obj/structure/bed/chair/sofa/left/beige
sofa_material = "beige"
/obj/structure/bed/chair/sofa/beige/right
icon_state = "sofaend_right"
/obj/structure/bed/chair/sofa/right/beige
sofa_material = "beige"
/obj/structure/bed/chair/sofa/beige/corner
icon_state = "sofacorner"
/obj/structure/bed/chair/sofa/corner/beige
sofa_material = "beige"
/obj/structure/bed/chair/sofa/lime/left
icon_state = "sofaend_left"
/obj/structure/bed/chair/sofa/left/lime
sofa_material = "lime"
/obj/structure/bed/chair/sofa/lime/right
icon_state = "sofaend_right"
/obj/structure/bed/chair/sofa/right/lime
sofa_material = "lime"
/obj/structure/bed/chair/sofa/lime/corner
icon_state = "sofacorner"
/obj/structure/bed/chair/sofa/corner/lime
sofa_material = "lime"
/obj/structure/bed/chair/sofa/yellow/left
icon_state = "sofaend_left"
/obj/structure/bed/chair/sofa/left/yellow
sofa_material = "yellow"
/obj/structure/bed/chair/sofa/yellow/right
icon_state = "sofaend_right"
/obj/structure/bed/chair/sofa/right/yellow
sofa_material = "yellow"
/obj/structure/bed/chair/sofa/yellow/corner
icon_state = "sofacorner"
/obj/structure/bed/chair/sofa/corner/yellow
sofa_material = "yellow"
/obj/structure/bed/chair/sofa/orange/left
icon_state = "sofaend_left"
/obj/structure/bed/chair/sofa/left/orange
sofa_material = "orange"
/obj/structure/bed/chair/sofa/orange/right
icon_state = "sofaend_right"
/obj/structure/bed/chair/sofa/right/orange
sofa_material = "orange"
/obj/structure/bed/chair/sofa/orange/corner
icon_state = "sofacorner"
/obj/structure/bed/chair/sofa/corner/orange
sofa_material = "orange"