Skip to content

Commit

Permalink
Merge branch 'master' into translate
Browse files Browse the repository at this point in the history
  • Loading branch information
Legendaxe committed Aug 1, 2024
2 parents 108b752 + 79c5f46 commit c040e65
Show file tree
Hide file tree
Showing 236 changed files with 16,204 additions and 8,267 deletions.
18,405 changes: 12,723 additions & 5,682 deletions _maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm

Large diffs are not rendered by default.

27 changes: 13 additions & 14 deletions _maps/map_files/stations/boxstation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -41341,6 +41341,7 @@
pixel_x = 3;
pixel_y = -3
},
/obj/machinery/atmospherics/pipe/simple/visible,
/turf/simulated/floor/plasteel{
icon_state = "whitepurple"
},
Expand Down Expand Up @@ -52029,6 +52030,15 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"dLj" = (
/obj/machinery/door/poddoor/preopen{
name = "Biohazard Shutter";
id_tag = "RnDChem"
},
/obj/effect/spawner/window/reinforced/plasma,
/obj/machinery/atmospherics/pipe/simple/visible,
/turf/simulated/floor/engine,
/area/station/science/misc_lab)
"dLF" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/door/poddoor/preopen{
Expand Down Expand Up @@ -52106,10 +52116,6 @@
icon_state = "purplecorner"
},
/area/station/hallway/primary/starboard/east)
"dMK" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/wall,
/area/station/public/toilet/unisex)
"dMM" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/obj/effect/spawner/random_spawners/oil_maybe,
Expand Down Expand Up @@ -64148,8 +64154,6 @@
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
/area/station/command/teleporter)
"jzZ" = (
Expand Down Expand Up @@ -79554,11 +79558,6 @@
/obj/machinery/atmospherics/pipe/simple/visible,
/turf/simulated/floor/plating,
/area/station/science/toxins/mixing)
"qRE" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/wall,
/area/station/command/meeting_room)
"qRU" = (
/obj/machinery/atmospherics/unary/vent_pump/siphon/on{
dir = 1;
Expand Down Expand Up @@ -124830,7 +124829,7 @@ aWZ
thN
xVe
qcB
dMK
aUQ
cts
csD
csD
Expand Down Expand Up @@ -125061,7 +125060,7 @@ brb
bpt
jju
nvC
qRE
bxl
bxl
lOo
lOo
Expand Down Expand Up @@ -143863,7 +143862,7 @@ cDG
cFU
cHp
cIF
cJP
dLj
oEK
cLe
tWz
Expand Down
Loading

0 comments on commit c040e65

Please sign in to comment.