Skip to content

Commit

Permalink
Incident displays: Bubber map edits (Bubberstation#1779)
Browse files Browse the repository at this point in the history
## Original PR: tgstation/tgstation#84812

## About The Pull Request

Bubber map edits relating to PR 84812

---------

Co-authored-by: The Sharkening <[email protected]>
  • Loading branch information
lessthnthree and StrangeWeirdKitten committed Jul 28, 2024
1 parent e7839e3 commit 18b1875
Show file tree
Hide file tree
Showing 10 changed files with 12,676 additions and 12,642 deletions.
14,966 changes: 7,483 additions & 7,483 deletions _maps/map_files/Birdshot/birdshot.dmm

Large diffs are not rendered by default.

9 changes: 6 additions & 3 deletions _maps/map_files/BoxStation/BoxStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -10359,6 +10359,7 @@
/obj/effect/turf_decal/tile/brown{
dir = 8
},
/obj/machinery/incident_display/bridge/directional/north,
/turf/open/floor/iron,
/area/station/command/bridge)
"aUc" = (
Expand Down Expand Up @@ -26105,6 +26106,7 @@
dir = 8
},
/obj/machinery/light/directional/south,
/obj/machinery/incident_display/delam/directional/south,
/turf/open/floor/iron,
/area/station/hallway/primary/aft)
"bYr" = (
Expand Down Expand Up @@ -28953,8 +28955,8 @@
/turf/open/floor/iron/smooth_large,
/area/station/engineering/main)
"cnY" = (
/obj/structure/sign/warning/no_smoking/directional/north,
/obj/structure/cable,
/obj/machinery/incident_display/delam/directional/north,
/turf/open/floor/iron/smooth_large,
/area/station/engineering/main)
"cnZ" = (
Expand Down Expand Up @@ -31837,6 +31839,7 @@
dir = 1
},
/obj/item/pipe_dispenser,
/obj/machinery/incident_display/delam/directional/north,
/turf/open/floor/engine,
/area/station/engineering/main)
"cDi" = (
Expand Down Expand Up @@ -89012,7 +89015,7 @@ ckB
ckB
ckB
cjJ
ckH
cnY
kja
cBO
cgR
Expand Down Expand Up @@ -89269,7 +89272,7 @@ ckB
ckB
ckC
cjJ
cnY
ckH
kja
cgR
cgR
Expand Down
176 changes: 88 additions & 88 deletions _maps/map_files/NSVBlueshift/Blueshift.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@
/obj/effect/spawner/random/maintenance,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/morgue)
"aba" = (
/obj/machinery/smartfridge/drying,
/turf/open/floor/iron/cafeteria,
/area/station/service/kitchen)
"abj" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
Expand Down Expand Up @@ -3347,6 +3351,11 @@
/obj/machinery/duct,
/turf/open/floor/wood,
/area/station/common/pool)
"aIg" = (
/obj/effect/turf_decal/tile/blue/half/contrasted,
/obj/machinery/incident_display/bridge/directional/south,
/turf/open/floor/iron/dark/side,
/area/station/hallway/secondary/command)
"aIi" = (
/obj/structure/grille,
/obj/structure/window/reinforced/spawner/directional/south,
Expand Down Expand Up @@ -31941,6 +31950,16 @@
},
/turf/open/floor/iron/dark/smooth_large/airless,
/area/space/nearstation)
"gbm" = (
/obj/effect/turf_decal/siding/wood{
dir = 4
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
},
/obj/machinery/smartfridge/drying/rack,
/turf/open/floor/wood,
/area/station/service/chapel)
"gbv" = (
/obj/effect/decal/cleanable/dirt{
icon_state = "dirt-flat-1"
Expand Down Expand Up @@ -37623,33 +37642,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/plating,
/area/station/maintenance/central)
"hhx" = (
/obj/machinery/door/firedoor,
/obj/machinery/flasher{
id = "secentranceflasher";
pixel_x = 25
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
cycle_id = "brig-enterance"
},
/obj/machinery/door/airlock/security/glass{
id_tag = "outerbrig";
name = "Brig"
},
/obj/effect/decal/cleanable/dirt{
icon_state = "dirt-flat-1"
},
/obj/effect/turf_decal/delivery/blue,
/obj/machinery/door/poddoor/preopen{
id = "brigfront";
name = "Brig Blast Door"
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
/obj/machinery/scanner_gate/preset_guns,
/turf/open/floor/iron/dark,
/area/station/security/brig)
"hhy" = (
/obj/machinery/door/poddoor/preopen{
id = "ceblast";
Expand Down Expand Up @@ -39224,19 +39216,6 @@
/obj/item/folder/red,
/turf/open/floor/plating,
/area/station/maintenance/abandon_holding_cell)
"hyk" = (
/obj/structure/window/reinforced/spawner/directional/north,
/obj/structure/window/reinforced/spawner/directional/east,
/obj/machinery/door/firedoor/border_only{
dir = 1
},
/obj/machinery/door/firedoor/border_only{
dir = 4
},
/obj/effect/turf_decal/bot,
/obj/machinery/atmospherics/components/unary/thermomachine/freezer/layer4,
/turf/open/floor/iron/dark,
/area/station/science/ordnance)
"hym" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
Expand Down Expand Up @@ -40734,11 +40713,6 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/station/hallway/secondary/service)
"hMR" = (
/obj/effect/turf_decal/tile/blue/half/contrasted,
/obj/machinery/incident_display/bridge/directional/south,
/turf/open/floor/iron/dark/side,
/area/station/hallway/secondary/command)
"hMW" = (
/obj/structure/cable,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
Expand Down Expand Up @@ -59660,6 +59634,19 @@
/obj/item/pen,
/turf/open/floor/iron/dark,
/area/station/engineering/transit_tube)
"lrX" = (
/obj/structure/window/reinforced/spawner/directional/north,
/obj/structure/window/reinforced/spawner/directional/east,
/obj/machinery/door/firedoor/border_only{
dir = 1
},
/obj/machinery/door/firedoor/border_only{
dir = 4
},
/obj/effect/turf_decal/bot,
/obj/machinery/atmospherics/components/unary/thermomachine/freezer/layer4,
/turf/open/floor/iron/dark,
/area/station/science/ordnance)
"lsb" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
Expand Down Expand Up @@ -62866,6 +62853,29 @@
dir = 4
},
/area/station/hallway/primary/central/aft)
"lXP" = (
/obj/machinery/door/firedoor,
/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
cycle_id = "brig-enterance"
},
/obj/machinery/door/airlock/security/glass{
id_tag = "outerbrig";
name = "Brig"
},
/obj/effect/decal/cleanable/dirt{
icon_state = "dirt-flat-1"
},
/obj/effect/turf_decal/delivery/blue,
/obj/machinery/door/poddoor/preopen{
id = "brigfront";
name = "Brig Blast Door"
},
/obj/effect/landmark/navigate_destination,
/obj/structure/cable,
/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
/obj/machinery/scanner_gate/preset_guns,
/turf/open/floor/iron/dark,
/area/station/security/brig)
"lXQ" = (
/obj/structure/table/wood,
/obj/machinery/computer/records/medical/laptop,
Expand Down Expand Up @@ -70250,6 +70260,33 @@
/obj/machinery/space_heater,
/turf/open/floor/plating,
/area/station/maintenance/port/central)
"nxd" = (
/obj/machinery/door/firedoor,
/obj/machinery/flasher{
id = "secentranceflasher";
pixel_x = 25
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
cycle_id = "brig-enterance"
},
/obj/machinery/door/airlock/security/glass{
id_tag = "outerbrig";
name = "Brig"
},
/obj/effect/decal/cleanable/dirt{
icon_state = "dirt-flat-1"
},
/obj/effect/turf_decal/delivery/blue,
/obj/machinery/door/poddoor/preopen{
id = "brigfront";
name = "Brig Blast Door"
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
/obj/machinery/scanner_gate/preset_guns,
/turf/open/floor/iron/dark,
/area/station/security/brig)
"nxf" = (
/obj/structure/railing,
/obj/item/cigbutt,
Expand Down Expand Up @@ -92199,29 +92236,6 @@
/obj/structure/closet/secure_closet/engineering_personal,
/turf/open/floor/iron/dark,
/area/station/engineering/break_room)
"rCE" = (
/obj/machinery/door/firedoor,
/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
cycle_id = "brig-enterance"
},
/obj/machinery/door/airlock/security/glass{
id_tag = "outerbrig";
name = "Brig"
},
/obj/effect/decal/cleanable/dirt{
icon_state = "dirt-flat-1"
},
/obj/effect/turf_decal/delivery/blue,
/obj/machinery/door/poddoor/preopen{
id = "brigfront";
name = "Brig Blast Door"
},
/obj/effect/landmark/navigate_destination,
/obj/structure/cable,
/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
/obj/machinery/scanner_gate/preset_guns,
/turf/open/floor/iron/dark,
/area/station/security/brig)
"rCH" = (
/obj/structure/rack/wooden,
/obj/item/clothing/under/color/yellow{
Expand Down Expand Up @@ -110748,16 +110762,6 @@
/obj/effect/mapping_helpers/airlock/access/any/engineering/construction,
/turf/open/floor/engine,
/area/station/ai_monitored/turret_protected/aisat_interior)
"vfU" = (
/obj/effect/turf_decal/siding/wood{
dir = 4
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
},
/obj/machinery/smartfridge/drying/rack,
/turf/open/floor/wood,
/area/station/service/chapel)
"vfY" = (
/obj/structure/table,
/obj/machinery/chem_dispenser/drinks{
Expand Down Expand Up @@ -112833,10 +112837,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/engineering/main)
"vyB" = (
/obj/machinery/smartfridge/drying,
/turf/open/floor/iron/cafeteria,
/area/station/service/kitchen)
"vyF" = (
/obj/structure/bed/medical/anchored{
dir = 1
Expand Down Expand Up @@ -151317,7 +151317,7 @@ vHZ
hyA
hyF
rlC
vfU
gbm
hyA
hyA
hyA
Expand Down Expand Up @@ -157675,7 +157675,7 @@ msQ
hlp
vxA
sqV
rCE
lXP
sjH
tOv
weu
Expand Down Expand Up @@ -158189,7 +158189,7 @@ qhq
rsX
lze
jPv
hhx
nxd
tUK
ush
cbm
Expand Down Expand Up @@ -162594,7 +162594,7 @@ vsd
kcP
tWO
gWE
vyB
aba
vpa
mNS
qkB
Expand Down Expand Up @@ -223217,7 +223217,7 @@ duP
gRC
wZW
gwW
hMR
aIg
xai
wEl
vre
Expand Down Expand Up @@ -229727,7 +229727,7 @@ hDu
eoz
yjD
hJE
hyk
lrX
leC
dxT
xbd
Expand Down
Loading

0 comments on commit 18b1875

Please sign in to comment.