mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-22 04:37:45 +01:00
Merge pull request #13343 from Heroman3003/deco-axe
Adds 'fireaxes' to atmos/emt bay on SD/RP
This commit is contained in:
@@ -2,4 +2,10 @@
|
||||
icon = 'icons/obj/decals_vr.dmi'
|
||||
name = "\improper ITG"
|
||||
desc = "A polished metal sign which reads 'Ironcrest Transport Group'."
|
||||
icon_state = "itg"
|
||||
icon_state = "itg"
|
||||
|
||||
/obj/structure/sign/scenery/fakefireaxe
|
||||
name = "decorative fire axe cabinet"
|
||||
desc = "A fancy decorative indent in the wall, with an axe inside. The axe is actually a part of the indent and cannot be removed. A nostalgic reminder of older times of firefighting."
|
||||
icon_state = "fireaxe1000"
|
||||
icon = 'icons/obj/closet.dmi'
|
||||
@@ -489,6 +489,14 @@ lel
|
||||
outdoors = 0
|
||||
},
|
||||
/area/groundbase/security/lobby)
|
||||
"bq" = (
|
||||
/obj/machinery/vending/wardrobe/atmosdrobe,
|
||||
/obj/machinery/atmospherics/unary/vent_pump/on,
|
||||
/obj/structure/sign/scenery/fakefireaxe{
|
||||
pixel_y = 32
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/groundbase/engineering/atmos/monitoring)
|
||||
"br" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 6
|
||||
@@ -9005,11 +9013,6 @@ lel
|
||||
/obj/item/weapon/hand_labeler,
|
||||
/turf/simulated/floor/carpet,
|
||||
/area/groundbase/security/detective)
|
||||
"vS" = (
|
||||
/obj/machinery/vending/wardrobe/atmosdrobe,
|
||||
/obj/machinery/atmospherics/unary/vent_pump/on,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/groundbase/engineering/atmos/monitoring)
|
||||
"vT" = (
|
||||
/obj/machinery/atmospherics/portables_connector{
|
||||
dir = 8
|
||||
@@ -36642,7 +36645,7 @@ Lt
|
||||
Lt
|
||||
Lt
|
||||
iS
|
||||
vS
|
||||
bq
|
||||
wu
|
||||
aM
|
||||
iS
|
||||
|
||||
@@ -5,6 +5,13 @@ lol
|
||||
"aa" = (
|
||||
/turf/simulated/wall,
|
||||
/area/groundbase/exploration/equipment)
|
||||
"ab" = (
|
||||
/obj/machinery/suit_cycler/medical,
|
||||
/obj/structure/sign/scenery/fakefireaxe{
|
||||
pixel_y = 32
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/groundbase/medical/paramedic)
|
||||
"ak" = (
|
||||
/obj/structure/table/glass,
|
||||
/obj/item/weapon/paper_bin,
|
||||
@@ -16476,7 +16483,7 @@ ID
|
||||
lz
|
||||
Cv
|
||||
Vm
|
||||
og
|
||||
ab
|
||||
to
|
||||
to
|
||||
Qk
|
||||
|
||||
@@ -1736,6 +1736,18 @@
|
||||
/obj/machinery/hologram/holopad,
|
||||
/turf/simulated/floor/tiled/eris/dark/orangecorner,
|
||||
/area/engineering/locker_room)
|
||||
"dT" = (
|
||||
/obj/machinery/computer/atmos_alert{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/camera/network/engineering{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/sign/scenery/fakefireaxe{
|
||||
pixel_x = -32
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/engineering/atmos/monitoring)
|
||||
"dU" = (
|
||||
/obj/structure/bed/chair/backed_red{
|
||||
dir = 4
|
||||
@@ -14518,15 +14530,6 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/eris/cafe,
|
||||
/area/crew_quarters/kitchen)
|
||||
"GC" = (
|
||||
/obj/machinery/computer/atmos_alert{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/camera/network/engineering{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/engineering/atmos/monitoring)
|
||||
"GD" = (
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/green,
|
||||
@@ -29690,7 +29693,7 @@ NK
|
||||
eq
|
||||
sz
|
||||
to
|
||||
GC
|
||||
dT
|
||||
Ag
|
||||
Fl
|
||||
sp
|
||||
|
||||
Reference in New Issue
Block a user