Skip to content

Commit

Permalink
Merge upstream 15.06.2024 (#302)
Browse files Browse the repository at this point in the history 
## About The Pull Request

Merge upstream
  • Loading branch information
@Gaxeer
Gaxeer authored Jun 15, 2024
2 parents 3a286e7 + cdb9c74 commit d36a54f
Show file tree
Hide file tree
Showing 337 changed files with 4,033 additions and 2,574 deletions.
142 changes: 39 additions & 103 deletions _maps/RandomRuins/IceRuins/icemoon_underground_comms_agent.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,7 @@
/obj/machinery/light/directional/south,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/wood{
initial_gas_mix = "ICEMOON_ATMOS";
name = "bridge"
},
/turf/open/floor/wood,
/area/ruin/comms_agent)
"ce" = (
/obj/machinery/modular_computer/preset{
Expand Down Expand Up @@ -65,17 +62,11 @@
/area/ruin/comms_agent)
"dP" = (
/obj/structure/closet/crate/secure/freezer/commsagent,
/turf/open/floor/wood{
initial_gas_mix = "ICEMOON_ATMOS";
name = "bridge"
},
/turf/open/floor/wood,
/area/ruin/comms_agent)
"eE" = (
/obj/structure/cable,
/turf/open/floor/wood{
initial_gas_mix = "ICEMOON_ATMOS";
name = "bridge"
},
/turf/open/floor/wood,
/area/ruin/comms_agent)
"eT" = (
/obj/effect/mob_spawn/ghost_role/human/lavaland_syndicate/comms/icemoon{
Expand Down Expand Up @@ -135,10 +126,7 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/wood{
initial_gas_mix = "ICEMOON_ATMOS";
name = "bridge"
},
/turf/open/floor/wood,
/area/ruin/comms_agent)
"ig" = (
/obj/effect/turf_decal/siding/wood,
Expand All @@ -148,17 +136,11 @@
/obj/effect/turf_decal/siding/wideplating/light/corner{
dir = 8
},
/turf/open/floor/wood{
initial_gas_mix = "ICEMOON_ATMOS";
name = "bridge"
},
/turf/open/floor/wood,
/area/ruin/comms_agent)
"in" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood{
initial_gas_mix = "ICEMOON_ATMOS";
name = "bridge"
},
/turf/open/floor/wood,
/area/ruin/comms_agent)
"iZ" = (
/obj/effect/turf_decal/siding/wood{
Expand All @@ -174,10 +156,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
},
/turf/open/floor/wood{
initial_gas_mix = "ICEMOON_ATMOS";
name = "bridge"
},
/turf/open/floor/wood,
/area/ruin/comms_agent)
"ka" = (
/obj/machinery/seed_extractor,
Expand Down Expand Up @@ -213,19 +192,13 @@
/obj/effect/decal/cleanable/cobweb,
/obj/item/storage/bag/trash,
/obj/structure/closet/crate/bin,
/turf/open/floor/wood{
initial_gas_mix = "ICEMOON_ATMOS";
name = "bridge"
},
/turf/open/floor/wood,
/area/ruin/comms_agent)
"kL" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/wood{
initial_gas_mix = "ICEMOON_ATMOS";
name = "bridge"
},
/turf/open/floor/wood,
/area/ruin/comms_agent)
"la" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
Expand All @@ -250,10 +223,7 @@
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/wood{
initial_gas_mix = "ICEMOON_ATMOS";
name = "bridge"
},
/turf/open/floor/wood,
/area/ruin/comms_agent)
"mr" = (
/obj/effect/turf_decal/siding/wood{
Expand All @@ -262,10 +232,7 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/wood{
initial_gas_mix = "ICEMOON_ATMOS";
name = "bridge"
},
/turf/open/floor/wood,
/area/ruin/comms_agent)
"mM" = (
/obj/structure/ore_box,
Expand Down Expand Up @@ -351,6 +318,9 @@
/obj/structure/filingcabinet,
/obj/item/paperwork,
/obj/item/paper/monitorkey,
/obj/item/paper/fluff/ruins/listeningstation/briefing{
pixel_x = -2
},
/turf/open/floor/wood/tile,
/area/ruin/comms_agent)
"sc" = (
Expand Down Expand Up @@ -395,10 +365,7 @@
pixel_x = 6;
pixel_y = 4
},
/turf/open/floor/wood{
initial_gas_mix = "ICEMOON_ATMOS";
name = "bridge"
},
/turf/open/floor/wood,
/area/ruin/comms_agent)
"ud" = (
/obj/effect/decal/cleanable/dirt,
Expand All @@ -423,17 +390,11 @@
},
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/structure/tank_holder/extinguisher,
/turf/open/floor/wood{
initial_gas_mix = "ICEMOON_ATMOS";
name = "bridge"
},
/turf/open/floor/wood,
/area/ruin/comms_agent)
"up" = (
/obj/effect/decal/cleanable/food/flour,
/turf/open/floor/wood{
initial_gas_mix = "ICEMOON_ATMOS";
name = "bridge"
},
/turf/open/floor/wood,
/area/ruin/comms_agent)
"uY" = (
/obj/effect/mapping_helpers/broken_floor,
Expand All @@ -444,19 +405,21 @@
"vB" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table/reinforced,
/obj/item/paper/fluff/ruins/listeningstation/briefing{
pixel_x = -2
/obj/item/pen/survival{
pixel_x = 8;
pixel_y = 8
},
/obj/machinery/button/door{
id = "syndie_lpost_icemoon_windows";
name = "Window Shutters";
req_access = list("syndicate")
},
/obj/item/pen/survival,
/turf/open/floor/wood/tile,
/area/ruin/comms_agent)
"vK" = (
/obj/effect/turf_decal/siding/wideplating/light,
/obj/machinery/computer/arcade/orion_trail,
/turf/open/floor/wood{
initial_gas_mix = "ICEMOON_ATMOS";
name = "bridge"
},
/turf/open/floor/wood,
/area/ruin/comms_agent)
"vV" = (
/obj/structure/toilet{
Expand Down Expand Up @@ -554,10 +517,7 @@
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/wood{
initial_gas_mix = "ICEMOON_ATMOS";
name = "bridge"
},
/turf/open/floor/wood,
/area/ruin/comms_agent)
"zJ" = (
/obj/machinery/biogenerator,
Expand All @@ -571,10 +531,7 @@
/obj/machinery/coffeemaker/impressa{
pixel_y = 4
},
/turf/open/floor/wood{
initial_gas_mix = "ICEMOON_ATMOS";
name = "bridge"
},
/turf/open/floor/wood,
/area/ruin/comms_agent)
"Bx" = (
/obj/effect/baseturf_helper/asteroid/snow,
Expand Down Expand Up @@ -669,10 +626,7 @@
"FZ" = (
/obj/effect/baseturf_helper/reinforced_plating/ceiling,
/obj/structure/cable,
/turf/open/floor/wood{
initial_gas_mix = "ICEMOON_ATMOS";
name = "bridge"
},
/turf/open/floor/wood,
/area/ruin/comms_agent)
"Gp" = (
/obj/structure/fluff/empty_sleeper/syndicate{
Expand All @@ -687,10 +641,7 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/wood{
initial_gas_mix = "ICEMOON_ATMOS";
name = "bridge"
},
/turf/open/floor/wood,
/area/ruin/comms_agent)
"GI" = (
/obj/structure/closet/crate/hydroponics,
Expand Down Expand Up @@ -752,10 +703,7 @@
pixel_y = 4
},
/obj/item/storage/box/coffeepack,
/turf/open/floor/wood{
initial_gas_mix = "ICEMOON_ATMOS";
name = "bridge"
},
/turf/open/floor/wood,
/area/ruin/comms_agent)
"JD" = (
/obj/structure/closet/cabinet,
Expand Down Expand Up @@ -894,10 +842,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
/turf/open/floor/wood{
initial_gas_mix = "ICEMOON_ATMOS";
name = "bridge"
},
/turf/open/floor/wood,
/area/ruin/comms_agent)
"MH" = (
/turf/closed/mineral/snowmountain/icemoon,
Expand Down Expand Up @@ -979,10 +924,7 @@
/obj/machinery/power/apc/auto_name/directional/east,
/obj/effect/mapping_helpers/apc/syndicate_access,
/obj/structure/cable,
/turf/open/floor/wood{
initial_gas_mix = "ICEMOON_ATMOS";
name = "bridge"
},
/turf/open/floor/wood,
/area/ruin/comms_agent)
"Qx" = (
/obj/structure/cable,
Expand All @@ -999,10 +941,7 @@
/obj/item/pipe/trinary/flippable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/wood{
initial_gas_mix = "ICEMOON_ATMOS";
name = "bridge"
},
/turf/open/floor/wood,
/area/ruin/comms_agent)
"QT" = (
/obj/structure/table,
Expand All @@ -1011,10 +950,7 @@
pixel_y = 4
},
/obj/item/crowbar/red,
/turf/open/floor/wood{
initial_gas_mix = "ICEMOON_ATMOS";
name = "bridge"
},
/turf/open/floor/wood,
/area/ruin/comms_agent)
"QU" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
Expand Down Expand Up @@ -1127,6 +1063,9 @@
/area/ruin/comms_agent)
"XU" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
id = "syndie_lpost_icemoon_windows"
},
/turf/open/floor/plating,
/area/ruin/comms_agent)
"Yz" = (
Expand Down Expand Up @@ -1157,10 +1096,7 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/wood{
initial_gas_mix = "ICEMOON_ATMOS";
name = "bridge"
},
/turf/open/floor/wood,
/area/ruin/comms_agent)
"ZE" = (
/obj/structure/sink/directional/east,
Expand Down
8 changes: 4 additions & 4 deletions _maps/RandomRuins/LavaRuins/lavaland_surface_shuttle_wreckage.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
},
/area/ruin/unpowered)
"gP" = (
/turf/closed/mineral/titanium,
/turf/closed/mineral/titanium/volcanic,
/area/ruin/unpowered)
"hT" = (
/turf/closed/wall/mineral/titanium{
Expand Down Expand Up @@ -132,7 +132,7 @@
/turf/open/misc/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered)
"sZ" = (
/turf/closed/mineral/random,
/turf/closed/mineral/random/volcanic,
/area/ruin/unpowered)
"tp" = (
/obj/item/stack/sheet/iron,
Expand All @@ -153,7 +153,7 @@
},
/area/ruin/unpowered)
"uh" = (
/turf/closed/mineral/random,
/turf/closed/mineral/random/volcanic,
/area/lavaland/surface)
"uH" = (
/obj/effect/spawner/random/structure/crate,
Expand Down Expand Up @@ -272,7 +272,7 @@
/turf/open/misc/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered)
"GZ" = (
/turf/closed/mineral/titanium,
/turf/closed/mineral/titanium/volcanic,
/area/lavaland/surface)
"Hy" = (
/obj/machinery/computer/communications{
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/IceBoxStation/IceBoxStation.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22520,7 +22520,7 @@
/obj/item/pen{
pixel_x = -5
},
/obj/item/hand_labeler/borg{
/obj/item/hand_labeler{
pixel_y = -3
},
/turf/open/floor/wood,
Expand Down
Loading

0 comments on commit d36a54f

Please sign in to comment.