Merge pull request #2721 from CHOMPStationBot/upstream-merge-11331

[MIRROR] Skyrat benches
This commit is contained in:
Razgriz
2021-08-03 20:11:36 -07:00
committed by GitHub
2 changed files with 37 additions and 0 deletions

View File

@@ -275,6 +275,43 @@
icon_state = "pewend_right"
base_icon = "pewend_right"
// Metal benches from Skyrat
/obj/structure/bed/chair/sofa/bench
name = "metal bench"
desc = "Almost as comfortable as waiting at a bus station for hours on end."
base_icon = "benchmiddle"
icon_state = "benchmiddle"
applies_material_colour = FALSE
color = null
var/padding_color = "#CC0000"
/obj/structure/bed/chair/sofa/bench/Initialize()
. = ..()
var/mutable_appearance/MA
// If we're north-facing, metal goes above mob, padding overlay goes below mob.
if((dir & NORTH) && !corner_piece)
plane = MOB_PLANE
layer = ABOVE_MOB_LAYER
MA = mutable_appearance(icon, icon_state = "o[icon_state]", layer = BELOW_MOB_LAYER, plane = MOB_PLANE, appearance_flags = KEEP_APART|RESET_COLOR)
// Else just normal plane and layer for everything, which will be below mobs.
else
MA = mutable_appearance(icon, icon_state = "o[icon_state]", appearance_flags = KEEP_APART|RESET_COLOR)
MA.color = padding_color
add_overlay(MA)
/obj/structure/bed/chair/sofa/bench/left
icon_state = "bench_left"
base_icon = "bench_left"
/obj/structure/bed/chair/sofa/bench/right
icon_state = "bench_right"
base_icon = "bench_right"
/obj/structure/bed/chair/sofa/bench/corner
icon_state = "benchcorner"
base_icon = "benchcorner"
//corner_piece = TRUE // These sprites work fine without the parent doing layer shenanigans
// Corporate sofa - one color fits all
/obj/structure/bed/chair/sofa/corp
name = "black leather sofa"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 20 KiB