Skip to content

Commit

Permalink
[MIRROR] Adds a proper skeletal rack subtype (#1012)
Browse files Browse the repository at this point in the history
* Adds a proper skeletal rack subtype (#81484)

## About The Pull Request

This is mapped in a few places and I thought it would be better to have
a subtype of rack to use rather than varediting the icon and state.

## Why It's Good For The Game

The less varedited icons the better imo, it's way easier to ensure icons
aren't fucked up this way and easier to fix too.

## Changelog

No player-facing changes.

* Adds a proper skeletal rack subtype

---------

Co-authored-by: John Willard <[email protected]>
  • Loading branch information
2 people authored and StealsThePRs committed Feb 17, 2024
1 parent e3578ab commit 558c254
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 30 deletions.
6 changes: 1 addition & 5 deletions _maps/map_files/Birdshot/birdshot.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -19620,13 +19620,9 @@
/obj/effect/turf_decal/siding/wood{
dir = 9
},
/obj/structure/rack{
icon = 'icons/obj/fluff/general.dmi';
icon_state = "minibar";
name = "skeletal minibar"
},
/obj/item/storage/fancy/candle_box,
/obj/machinery/light_switch/directional/west,
/obj/structure/rack/skeletal,
/turf/open/floor/iron/grimy,
/area/station/service/library)
"hei" = (
Expand Down
6 changes: 1 addition & 5 deletions _maps/map_files/MetaStation/MetaStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -24819,13 +24819,9 @@
/turf/open/floor/iron/white,
/area/station/science/ordnance/storage)
"iWB" = (
/obj/structure/rack{
icon = 'icons/obj/fluff/general.dmi';
icon_state = "minibar";
name = "skeletal minibar"
},
/obj/item/storage/fancy/candle_box,
/obj/machinery/light/small/directional/east,
/obj/structure/rack/skeletal,
/turf/open/floor/engine/cult,
/area/station/service/library)
"iWD" = (
Expand Down
6 changes: 1 addition & 5 deletions _maps/shuttles/emergency_monastery.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2444,16 +2444,12 @@
/turf/open/floor/carpet,
/area/shuttle/escape)
"Ju" = (
/obj/structure/rack{
icon = 'icons/obj/fluff/general.dmi';
icon_state = "minibar";
name = "skeletal minibar"
},
/obj/item/book/codex_gigas,
/obj/machinery/camera/directional/south{
c_tag = "Monastery Archives Aft";
network = list("ss13","monastery")
},
/obj/structure/rack/skeletal,
/turf/open/floor/iron/dark,
/area/shuttle/escape)
"Jv" = (
Expand Down
12 changes: 2 additions & 10 deletions _maps/shuttles/pirate_dutchman.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -464,15 +464,11 @@
/obj/effect/turf_decal/siding/wood{
dir = 8
},
/obj/structure/rack{
icon = 'icons/obj/fluff/general.dmi';
icon_state = "minibar";
name = "skeletal minibar"
},
/obj/item/food/grown/sugarcane,
/obj/item/food/grown/sugarcane,
/obj/item/food/grown/sugarcane,
/obj/item/reagent_containers/cup/bucket/wooden,
/obj/structure/rack/skeletal,
/turf/open/floor/wood/airless,
/area/shuttle/pirate/flying_dutchman)
"vT" = (
Expand Down Expand Up @@ -550,17 +546,13 @@
dir = 10
},
/obj/machinery/light/floor,
/obj/structure/rack{
icon = 'icons/obj/fluff/general.dmi';
icon_state = "minibar";
name = "skeletal minibar"
},
/obj/item/reagent_containers/condiment/milk{
pixel_x = -5
},
/obj/item/reagent_containers/condiment/milk{
pixel_x = 5
},
/obj/structure/rack/skeletal,
/turf/open/floor/wood/airless,
/area/shuttle/pirate/flying_dutchman)
"zE" = (
Expand Down
6 changes: 1 addition & 5 deletions _maps/virtual_domains/pirates.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -480,14 +480,10 @@
/area/virtual_domain/fullbright)
"AF" = (
/obj/effect/mapping_helpers/burnt_floor,
/obj/structure/rack{
icon = 'icons/obj/fluff/general.dmi';
icon_state = "minibar";
name = "skeletal minibar"
},
/obj/item/storage/bag/money/dutchmen{
pixel_y = 13
},
/obj/structure/rack/skeletal,
/turf/open/floor/wood/parquet,
/area/virtual_domain)
"AP" = (
Expand Down
6 changes: 6 additions & 0 deletions code/game/objects/structures/tables_racks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -825,6 +825,12 @@
pass_flags_self = LETPASSTHROW //You can throw objects over this, despite it's density.
max_integrity = 20

/obj/structure/rack/skeletal
name = "skeletal minibar"
desc = "Rattle me boozes!"
icon = 'icons/obj/fluff/general.dmi'
icon_state = "minibar"

/obj/structure/rack/Initialize(mapload)
. = ..()
AddElement(/datum/element/climbable)
Expand Down

0 comments on commit 558c254

Please sign in to comment.