Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…
Browse files Browse the repository at this point in the history
…to metansing
  • Loading branch information
Zevotech committed Jan 11, 2025
2 parents 434a364 + f77b347 commit 834011f
Show file tree
Hide file tree
Showing 473 changed files with 30,828 additions and 138,572 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ RUN git init \
&& git remote add origin \$AUXMOS_REPO \
&& git fetch --depth 1 origin \$AUXMOS_VERSION" \
&& git checkout FETCH_HEAD \
&& env PKG_CONFIG_ALLOW_CROSS=1 cargo build --release --target=i686-unknown-linux-gnu --features "all_reaction_hooks,katmos"
&& env PKG_CONFIG_ALLOW_CROSS=1 cargo build --release --target=i686-unknown-linux-gnu --features "citadel_reactions,katmos"

# Install nodejs which is required to deploy Shiptest
FROM base as node
Expand Down
10 changes: 5 additions & 5 deletions _maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
},
/area/ruin/unpowered)
"cW" = (
/obj/structure/radioactive,
/obj/structure/hazard/radioactive,
/turf/open/water/beach,
/area/overmap_encounter/planetoid/beachplanet/explored)
"dG" = (
Expand Down Expand Up @@ -233,7 +233,7 @@
/obj/effect/turf_decal/weather/sand{
dir = 1
},
/obj/structure/radioactive,
/obj/structure/hazard/radioactive,
/turf/open/floor/plating/rust,
/area/ruin/unpowered)
"kP" = (
Expand Down Expand Up @@ -991,7 +991,7 @@
/turf/open/floor/plating/asteroid/sand/dense/lit,
/area/overmap_encounter/planetoid/beachplanet/explored)
"Sl" = (
/obj/structure/radioactive/stack,
/obj/structure/hazard/radioactive/stack,
/turf/open/floor/plating/asteroid/sand/lit,
/area/overmap_encounter/planetoid/beachplanet/explored)
"Sx" = (
Expand Down Expand Up @@ -1060,7 +1060,7 @@
/turf/open/floor/plating,
/area/ruin/unpowered)
"TI" = (
/obj/structure/radioactive/waste,
/obj/structure/hazard/radioactive/waste,
/obj/effect/decal/cleanable/greenglow,
/turf/open/floor/plating/asteroid/sand/lit,
/area/overmap_encounter/planetoid/beachplanet/explored)
Expand Down Expand Up @@ -1147,7 +1147,7 @@
/turf/open/floor/plating/rust,
/area/overmap_encounter/planetoid/beachplanet/explored)
"Xc" = (
/obj/structure/radioactive,
/obj/structure/hazard/radioactive,
/obj/effect/decal/cleanable/greenglow,
/turf/open/water/beach,
/area/overmap_encounter/planetoid/beachplanet/explored)
Expand Down
Loading

0 comments on commit 834011f

Please sign in to comment.