Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Delta/brig minor fix #871

Merged
merged 2 commits into from
Dec 18, 2023
Merged

Fix: Delta/brig minor fix #871

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3d99f5
Fix 17.12.23/11.30
Hearstrings Dec 17, 2023
68e55ea
Fix 17.12.23/11.40
Hearstrings Dec 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
125 changes: 80 additions & 45 deletions _maps/map_files220/delta/delta.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17534,14 +17534,9 @@
dir = 1
},
/obj/structure/cable{
d1 = 2;
d1 = 4;
d2 = 8;
icon_state = "2-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
icon_state = "4-8"
},
/turf/simulated/floor/plasteel,
/area/station/security/brig)
Expand Down Expand Up @@ -27301,22 +27296,6 @@
icon_state = "neutral"
},
/area/station/public/fitness)
"cep" = (
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkred"
},
/area/station/security/warden)
"ceq" = (
/obj/machinery/papershredder,
/obj/effect/turf_decal/siding/wood{
Expand Down Expand Up @@ -42505,6 +42484,11 @@
/obj/item/pen,
/obj/machinery/newscaster/security_unit/south,
/obj/machinery/light/directional/south,
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "darkred"
Expand Down Expand Up @@ -50146,6 +50130,11 @@
dir = 4
},
/obj/effect/landmark/start/warden,
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkred"
Expand Down Expand Up @@ -56100,6 +56089,10 @@
id_tag = "ArmoryLock";
name = "Armory Lockdown"
},
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/turf/simulated/floor/plating,
/area/station/security/warden)
"gwd" = (
Expand Down Expand Up @@ -58487,10 +58480,13 @@
id_tag = "Warden";
name = "Warden Privacy Shutters"
},
/obj/structure/cable,
/obj/effect/spawner/window/reinforced/polarized/grilled{
id = "WardenD"
},
/obj/structure/cable{
d2 = 4;
icon_state = "0-4"
},
/turf/simulated/floor/plating,
/area/station/security/warden)
"hjJ" = (
Expand Down Expand Up @@ -64760,11 +64756,6 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "red"
},
Expand Down Expand Up @@ -72967,6 +72958,11 @@
pixel_x = -3;
pixel_y = -3
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkred"
Expand Down Expand Up @@ -80338,6 +80334,11 @@
/obj/structure/table/reinforced,
/obj/item/clipboard,
/obj/item/stamp/warden,
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkred"
Expand Down Expand Up @@ -89289,6 +89290,16 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/turf/simulated/floor/plasteel{
icon_state = "redfull"
},
Expand Down Expand Up @@ -91216,11 +91227,6 @@
name = "Security Blast Door"
},
/obj/effect/spawner/window/reinforced/grilled,
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
Expand Down Expand Up @@ -95798,6 +95804,16 @@
dir = 8
},
/obj/effect/landmark/start/warden,
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkred"
Expand Down Expand Up @@ -103427,6 +103443,19 @@
/mob/living/simple_animal/mouse/rat,
/turf/simulated/floor/engine,
/area/station/maintenance/incinerator)
"vmP" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/simulated/floor/plasteel{
icon_state = "red"
},
/area/station/security/brig)
"vmT" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -108932,24 +108961,30 @@
},
/area/station/security/warden)
"xcz" = (
/obj/machinery/door/poddoor/shutters/preopen{
dir = 8;
id_tag = "Warden";
name = "Warden Privacy Shutters"
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "0-4"
icon_state = "1-4"
},
/obj/effect/spawner/window/reinforced/polarized/grilled{
id = "WardenD"
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkred"
},
/turf/simulated/floor/plating,
/area/station/security/warden)
"xcD" = (
/obj/item/chair/wood,
Expand Down Expand Up @@ -163205,7 +163240,7 @@ vBg
xqb
duP
vBg
xcz
nWC
vQN
hjl
vBg
Expand Down Expand Up @@ -163719,8 +163754,8 @@ eYD
nRd
rLn
eYD
cep
eYD
xcz
bep
lMA
oaR
Expand Down Expand Up @@ -167323,7 +167358,7 @@ mSs
xhC
dTU
qQC
dUT
vmP
dMP
wzU
gsx
Expand Down