mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-24 13:38:41 +01:00
[MODULAR] [Delta] Some QoL to the prison (#15828)
This commit is contained in:
Jolly
@@ -144,6 +144,7 @@
|
||||
},
|
||||
/obj/item/pillow,
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/machinery/firealarm/directional/east,
|
||||
/turf/open/floor/carpet/royalblue,
|
||||
/area/station/security/prison/rec)
|
||||
"be" = (
|
||||
@@ -563,6 +564,9 @@
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/machinery/firealarm/directional/north,
|
||||
/obj/machinery/portable_atmospherics/canister/air,
|
||||
/obj/machinery/light_switch/directional/north{
|
||||
pixel_x = 9
|
||||
},
|
||||
/turf/open/floor/iron/dark/textured,
|
||||
/area/station/security/prison/work)
|
||||
"eO" = (
|
||||
@@ -816,14 +820,7 @@
|
||||
/obj/effect/turf_decal/siding/wood{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/hydroponics/soil{
|
||||
desc = "A patch of fertile soil that you can plant stuff in.";
|
||||
icon = 'icons/turf/floors.dmi';
|
||||
icon_state = "dirt";
|
||||
layer = 2.0001;
|
||||
plane = -7;
|
||||
self_sustaining = 1
|
||||
},
|
||||
/obj/machinery/hydroponics/soil/fake_turf,
|
||||
/obj/item/reagent_containers/cup/bucket{
|
||||
pixel_y = -5
|
||||
},
|
||||
@@ -857,14 +854,7 @@
|
||||
/area/station/security/execution)
|
||||
"hY" = (
|
||||
/obj/machinery/firealarm/directional/west,
|
||||
/obj/machinery/hydroponics/soil{
|
||||
desc = "A patch of fertile soil that you can plant stuff in.";
|
||||
icon = 'icons/turf/floors.dmi';
|
||||
icon_state = "dirt";
|
||||
layer = 2.0001;
|
||||
plane = -7;
|
||||
self_sustaining = 1
|
||||
},
|
||||
/obj/machinery/hydroponics/soil/fake_turf,
|
||||
/turf/open/floor/plating,
|
||||
/area/station/security/prison/garden)
|
||||
"if" = (
|
||||
@@ -970,14 +960,7 @@
|
||||
/turf/open/floor/iron/dark/blue/side,
|
||||
/area/station/security/prison/safe)
|
||||
"jz" = (
|
||||
/obj/machinery/hydroponics/soil{
|
||||
desc = "A patch of fertile soil that you can plant stuff in.";
|
||||
icon = 'icons/turf/floors.dmi';
|
||||
icon_state = "dirt";
|
||||
layer = 2.0001;
|
||||
plane = -7;
|
||||
self_sustaining = 1
|
||||
},
|
||||
/obj/machinery/hydroponics/soil/fake_turf,
|
||||
/obj/item/reagent_containers/cup/bucket{
|
||||
pixel_x = -4
|
||||
},
|
||||
@@ -1052,7 +1035,7 @@
|
||||
"kj" = (
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
/obj/machinery/door/airlock/public/glass{
|
||||
/obj/machinery/door/airlock/security{
|
||||
name = "Prison Cell"
|
||||
},
|
||||
/turf/open/floor/iron/dark/brown,
|
||||
@@ -1181,10 +1164,8 @@
|
||||
pixel_x = -5;
|
||||
pixel_y = 3
|
||||
},
|
||||
/obj/structure/sign/poster/official/random{
|
||||
pixel_x = -32
|
||||
},
|
||||
/obj/machinery/light/directional/west,
|
||||
/obj/structure/sign/poster/official/random/directional/west,
|
||||
/turf/open/floor/iron/dark/blue/side{
|
||||
dir = 8
|
||||
},
|
||||
@@ -1250,14 +1231,7 @@
|
||||
/turf/closed/wall,
|
||||
/area/station/security/execution/transfer)
|
||||
"mA" = (
|
||||
/obj/machinery/hydroponics/soil{
|
||||
desc = "A patch of fertile soil that you can plant stuff in.";
|
||||
icon = 'icons/turf/floors.dmi';
|
||||
icon_state = "dirt";
|
||||
layer = 2.0001;
|
||||
plane = -7;
|
||||
self_sustaining = 1
|
||||
},
|
||||
/obj/machinery/hydroponics/soil/fake_turf,
|
||||
/obj/machinery/camera{
|
||||
c_tag = " Prison - Garden";
|
||||
network = list("ss13","prison")
|
||||
@@ -1643,14 +1617,7 @@
|
||||
/obj/effect/turf_decal/siding/wood{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/hydroponics/soil{
|
||||
desc = "A patch of fertile soil that you can plant stuff in.";
|
||||
icon = 'icons/turf/floors.dmi';
|
||||
icon_state = "dirt";
|
||||
layer = 2.0001;
|
||||
plane = -7;
|
||||
self_sustaining = 1
|
||||
},
|
||||
/obj/machinery/hydroponics/soil/fake_turf,
|
||||
/turf/open/floor/plating,
|
||||
/area/station/security/prison/garden)
|
||||
"qF" = (
|
||||
@@ -1709,13 +1676,11 @@
|
||||
"ra" = (
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/effect/turf_decal/delivery/blue,
|
||||
/obj/machinery/door/airlock/security{
|
||||
req_access = list("brig")
|
||||
},
|
||||
/obj/machinery/door/poddoor/shutters/window/preopen{
|
||||
id = "permaturnstile";
|
||||
name = "Lockdown"
|
||||
},
|
||||
/obj/machinery/prisongate,
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/station/security/prison)
|
||||
"rk" = (
|
||||
@@ -1760,14 +1725,12 @@
|
||||
/area/station/security/prison)
|
||||
"rs" = (
|
||||
/obj/effect/turf_decal/delivery/blue,
|
||||
/obj/machinery/door/airlock/security{
|
||||
req_access = list("brig")
|
||||
},
|
||||
/obj/machinery/door/poddoor/shutters/window/preopen{
|
||||
id = "permaturnstile";
|
||||
name = "Lockdown"
|
||||
},
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/machinery/prisongate,
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/station/security/prison)
|
||||
"rv" = (
|
||||
@@ -2261,7 +2224,6 @@
|
||||
c_tag = " Prison - Entrance";
|
||||
network = list("ss13","prison")
|
||||
},
|
||||
/obj/machinery/light_switch/directional/south,
|
||||
/turf/open/floor/iron,
|
||||
/area/station/security/prison)
|
||||
"wD" = (
|
||||
@@ -2395,6 +2357,16 @@
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/turf/open/floor/iron/kitchen,
|
||||
/area/station/security/prison/mess)
|
||||
"yy" = (
|
||||
/obj/structure/chair/sofa/corp/left{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/landmark/start/prisoner,
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/effect/turf_decal/tile/bar/opposingcorners,
|
||||
/obj/machinery/light_switch/directional/west,
|
||||
/turf/open/floor/iron,
|
||||
/area/station/security/prison/mess)
|
||||
"yB" = (
|
||||
/obj/structure/bed,
|
||||
/obj/item/bedsheet/brown,
|
||||
@@ -2650,14 +2622,7 @@
|
||||
/turf/open/floor/iron/white,
|
||||
/area/station/security/medical)
|
||||
"Ay" = (
|
||||
/obj/machinery/hydroponics/soil{
|
||||
desc = "A patch of fertile soil that you can plant stuff in.";
|
||||
icon = 'icons/turf/floors.dmi';
|
||||
icon_state = "dirt";
|
||||
layer = 2.0001;
|
||||
plane = -7;
|
||||
self_sustaining = 1
|
||||
},
|
||||
/obj/machinery/hydroponics/soil/fake_turf,
|
||||
/obj/structure/sink/directional/west,
|
||||
/turf/open/floor/plating,
|
||||
/area/station/security/prison/garden)
|
||||
@@ -2717,14 +2682,7 @@
|
||||
},
|
||||
/area/station/security/prison)
|
||||
"Br" = (
|
||||
/obj/machinery/hydroponics/soil{
|
||||
desc = "A patch of fertile soil that you can plant stuff in.";
|
||||
icon = 'icons/turf/floors.dmi';
|
||||
icon_state = "dirt";
|
||||
layer = 2.0001;
|
||||
plane = -7;
|
||||
self_sustaining = 1
|
||||
},
|
||||
/obj/machinery/hydroponics/soil/fake_turf,
|
||||
/obj/item/reagent_containers/cup/bucket{
|
||||
pixel_x = 6;
|
||||
pixel_y = -8
|
||||
@@ -2846,26 +2804,24 @@
|
||||
/obj/structure/cable,
|
||||
/obj/effect/turf_decal/tile/red,
|
||||
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
|
||||
/obj/machinery/button/door{
|
||||
/obj/machinery/button/door/directional/north{
|
||||
pixel_x = -6;
|
||||
id = "permainner";
|
||||
name = "Inner Bolt Control";
|
||||
normaldoorcontrol = 1;
|
||||
pixel_x = -6;
|
||||
pixel_y = 25;
|
||||
specialfunctions = 4
|
||||
},
|
||||
/obj/machinery/button/door{
|
||||
/obj/machinery/button/door/directional/north{
|
||||
pixel_x = 6;
|
||||
id = "permaouter";
|
||||
name = "Outer Bolt Control";
|
||||
normaldoorcontrol = 1;
|
||||
pixel_x = 6;
|
||||
pixel_y = 25;
|
||||
specialfunctions = 4
|
||||
},
|
||||
/obj/machinery/button/door{
|
||||
/obj/machinery/button/door/directional/north{
|
||||
pixel_y = 36;
|
||||
id = "permaturnstile";
|
||||
name = "Turnstile Lockdown";
|
||||
pixel_y = 37
|
||||
name = "Prison Gate Lockdown"
|
||||
},
|
||||
/turf/open/floor/iron,
|
||||
/area/station/security/execution/transfer)
|
||||
@@ -2896,7 +2852,6 @@
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/light/directional/south,
|
||||
/obj/machinery/door/airlock/security/glass{
|
||||
name = "Prison Sanitarium"
|
||||
},
|
||||
@@ -3089,11 +3044,11 @@
|
||||
/turf/closed/wall/rust,
|
||||
/area/station/security/prison/mess)
|
||||
"Ec" = (
|
||||
/obj/machinery/firealarm/directional/east,
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/effect/turf_decal/siding/wood{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/light_switch/directional/east,
|
||||
/turf/open/floor/wood,
|
||||
/area/station/security/prison/rec)
|
||||
"El" = (
|
||||
@@ -3157,6 +3112,16 @@
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/station/security/prison)
|
||||
"EB" = (
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
/obj/machinery/door/airlock/security{
|
||||
name = "Prison Cell"
|
||||
},
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/turf/open/floor/iron/dark/purple,
|
||||
/area/station/security/prison/safe)
|
||||
"EK" = (
|
||||
/obj/structure/cable,
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
@@ -3293,14 +3258,7 @@
|
||||
/turf/open/floor/iron,
|
||||
/area/station/security/execution/transfer)
|
||||
"Gb" = (
|
||||
/obj/machinery/hydroponics/soil{
|
||||
desc = "A patch of fertile soil that you can plant stuff in.";
|
||||
icon = 'icons/turf/floors.dmi';
|
||||
icon_state = "dirt";
|
||||
layer = 2.0001;
|
||||
plane = -7;
|
||||
self_sustaining = 1
|
||||
},
|
||||
/obj/machinery/hydroponics/soil/fake_turf,
|
||||
/obj/structure/reagent_dispensers/watertank,
|
||||
/turf/open/floor/plating,
|
||||
/area/station/security/prison/garden)
|
||||
@@ -3443,11 +3401,11 @@
|
||||
"Ig" = (
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
/obj/machinery/door/airlock/public/glass{
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/machinery/door/airlock/security{
|
||||
name = "Prison Cell"
|
||||
},
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/turf/open/floor/iron/dark/purple,
|
||||
/area/station/security/prison/safe)
|
||||
"Ii" = (
|
||||
@@ -3469,6 +3427,7 @@
|
||||
/obj/item/reagent_containers/dropper,
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
/obj/effect/turf_decal/trimline/blue/filled/line,
|
||||
/obj/machinery/light/directional/south,
|
||||
/turf/open/floor/iron/white,
|
||||
/area/station/security/medical)
|
||||
"Il" = (
|
||||
@@ -3587,6 +3546,7 @@
|
||||
/obj/effect/turf_decal/trimline/blue/filled/line{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/light/directional/north,
|
||||
/turf/open/floor/iron/white,
|
||||
/area/station/security/medical)
|
||||
"Jc" = (
|
||||
@@ -3773,6 +3733,16 @@
|
||||
"Le" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/effect/turf_decal/delivery/red,
|
||||
/obj/machinery/door/poddoor/shutters/window/preopen{
|
||||
id = "prisonlockdown5";
|
||||
name = "Lockdown"
|
||||
},
|
||||
/obj/machinery/button/door/directional/west{
|
||||
id = "prisonlockdown5";
|
||||
name = "Lockdown";
|
||||
req_access = list("brig")
|
||||
},
|
||||
/turf/open/floor/iron/dark/side{
|
||||
dir = 9
|
||||
},
|
||||
@@ -3785,7 +3755,7 @@
|
||||
"Ls" = (
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
/obj/machinery/door/airlock/public/glass{
|
||||
/obj/machinery/door/airlock/security{
|
||||
name = "Prison Cell"
|
||||
},
|
||||
/obj/structure/cable,
|
||||
@@ -3803,6 +3773,12 @@
|
||||
/obj/structure/lattice,
|
||||
/turf/open/space/basic,
|
||||
/area/space/nearstation)
|
||||
"LC" = (
|
||||
/obj/machinery/shower/directional/south,
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/machinery/light_switch/directional/west,
|
||||
/turf/open/floor/iron/freezer,
|
||||
/area/station/security/prison/shower)
|
||||
"LD" = (
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
@@ -4130,6 +4106,11 @@
|
||||
/obj/machinery/duct,
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/effect/turf_decal/delivery/red,
|
||||
/obj/machinery/door/poddoor/shutters/window/preopen{
|
||||
id = "prisonlockdown5";
|
||||
name = "Lockdown"
|
||||
},
|
||||
/turf/open/floor/iron/dark/side{
|
||||
dir = 5
|
||||
},
|
||||
@@ -4387,14 +4368,7 @@
|
||||
},
|
||||
/area/station/security/prison/safe)
|
||||
"Sd" = (
|
||||
/obj/machinery/hydroponics/soil{
|
||||
desc = "A patch of fertile soil that you can plant stuff in.";
|
||||
icon = 'icons/turf/floors.dmi';
|
||||
icon_state = "dirt";
|
||||
layer = 2.0001;
|
||||
plane = -7;
|
||||
self_sustaining = 1
|
||||
},
|
||||
/obj/machinery/hydroponics/soil/fake_turf,
|
||||
/turf/open/floor/plating,
|
||||
/area/station/security/prison/garden)
|
||||
"Se" = (
|
||||
@@ -4834,7 +4808,7 @@
|
||||
"Wc" = (
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
/obj/machinery/door/airlock/public/glass{
|
||||
/obj/machinery/door/airlock/security{
|
||||
name = "Prison Cell"
|
||||
},
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
@@ -5055,7 +5029,6 @@
|
||||
},
|
||||
/obj/machinery/firealarm/directional/west,
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/machinery/vending/dorms,
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/station/security/prison)
|
||||
"Ys" = (
|
||||
@@ -5482,10 +5455,10 @@ fn
|
||||
Wc
|
||||
DB
|
||||
fn
|
||||
Ig
|
||||
EB
|
||||
am
|
||||
fn
|
||||
Ig
|
||||
EB
|
||||
vN
|
||||
fn
|
||||
Ig
|
||||
@@ -5647,7 +5620,7 @@ BL
|
||||
VD
|
||||
XR
|
||||
VD
|
||||
fL
|
||||
yy
|
||||
CX
|
||||
ol
|
||||
OT
|
||||
@@ -6439,7 +6412,7 @@ ir
|
||||
eG
|
||||
eG
|
||||
ER
|
||||
EX
|
||||
LC
|
||||
DL
|
||||
vX
|
||||
Im
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
// Modular turf stuff
|
||||
|
||||
// Reskinned soil to make it look like its turf, but its not!
|
||||
/obj/machinery/hydroponics/soil/fake_turf
|
||||
desc = "A patch of fertile soil that you can plant stuff in."
|
||||
icon = 'icons/turf/floors.dmi' // This makes it look like the dirt floor
|
||||
icon_state = "dirt"
|
||||
layer = 2.0001
|
||||
plane = -7
|
||||
self_sustaining = 1
|
||||
pixel_z = 0
|
||||
@@ -5649,6 +5649,7 @@
|
||||
#include "modular_skyrat\modules\mapping\code\spaceship_turfs.dm"
|
||||
#include "modular_skyrat\modules\mapping\code\static_plaques.dm"
|
||||
#include "modular_skyrat\modules\mapping\code\tools.dm"
|
||||
#include "modular_skyrat\modules\mapping\code\turf.dm"
|
||||
#include "modular_skyrat\modules\mapping\code\turf_decals.dm"
|
||||
#include "modular_skyrat\modules\mapping\code\vgdecals.dm"
|
||||
#include "modular_skyrat\modules\mapping\code\wardrobes.dm"
|
||||
|
||||
Reference in New Issue
Block a user