Merge branch 'master' of https://github.com/Monkestation/Monkestation2.0

 into aneri-part-3-hamazura-edition

.github/alternate_byond_versions.txt

@@ -7,6 +7,6 @@
 # 500.1337: runtimestation
 # 516.1638: runtimestation;516
 # Lowest supported version
-515.1627: runtimestation
+515.1642: runtimestation
 # Beta version
-516.1651: runtimestation;516
+516.1652: runtimestation;516

.tgs.yml

@@ -3,7 +3,7 @@
 version: 1
 # The BYOND version to use (kept in sync with dependencies.sh by the "TGS Test Suite" CI job)
 # Must be interpreted as a string, keep quoted
-byond: "515.1642"
+byond: "515.1647"
 # Folders to create in "<instance_path>/Configuration/GameStaticFiles/"
 static_files:
   # Config directory should be static

_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm

@@ -384,7 +384,7 @@
 /obj/structure/railing/corner{
 	dir = 4
 	},
-/mob/living/simple_animal/hostile/mimic/crate,
+/mob/living/basic/mimic/crate,
 /turf/open/floor/plating/snowed/icemoon,
 /area/icemoon/underground/explored)
 "fO" = (
@@ -2164,7 +2164,7 @@
 /turf/open/floor/plating/snowed/smoothed/icemoon,
 /area/icemoon/underground/explored)
 "KV" = (
-/mob/living/simple_animal/hostile/mimic/crate,
+/mob/living/basic/mimic/crate,
 /turf/open/floor/plating/snowed/icemoon,
 /area/icemoon/underground/explored)
 "KY" = (

_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm

@@ -392,7 +392,7 @@
 "vy" = (
 /obj/structure/cable,
 /obj/effect/turf_decal/tile/green/fourcorners,
-/mob/living/basic/trooper/russian/ranged/lootless,
+/mob/living/basic/alien/drone,
 /turf/open/floor/iron/dark,
 /area/ruin/space/has_grav/abandonedzoo)
 "vU" = (
@@ -710,7 +710,7 @@ eY
 Ni
 YJ
 Ni
-oS
+vy
 Ni
 Ni
 Ni
@@ -731,7 +731,7 @@ Ni
 Ni
 Ni
 Ni
-vy
+oS
 Ni
 Ni
 Ni

_maps/RandomRuins/SpaceRuins/anomaly_research.dmm

@@ -208,11 +208,22 @@
 	dir = 1
 	},
 /obj/structure/table/reinforced,
-/obj/item/anomaly_neutralizer,
-/obj/item/anomaly_neutralizer,
+/obj/item/anomaly_neutralizer{
+	pixel_x = 6;
+	pixel_y = 0
+	},
+/obj/item/anomaly_neutralizer{
+	pixel_x = 8;
+	pixel_y = 0
+	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/item/raw_anomaly_core/random,
+/obj/item/raw_anomaly_core/random{
+	pixel_x = -8;
+	pixel_y = 0
+	},
 /turf/open/floor/iron/white,
 /area/misc/anomaly_research)
 "gs" = (
@@ -245,19 +256,18 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
 	},
+/obj/effect/artifact_spawner,
 /turf/open/floor/iron/smooth,
 /area/misc/anomaly_research)
 "hq" = (
 /obj/effect/turf_decal/tile/purple/half/contrasted{
 	dir = 1
 	},
 /obj/structure/table/reinforced,
-/obj/item/raw_anomaly_core/random{
-	pixel_x = -7
-	},
 /obj/machinery/light/small/directional/north,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/item/assembly/signaler/anomaly/random,
 /turf/open/floor/iron/white,
 /area/misc/anomaly_research)
 "hV" = (
@@ -337,6 +347,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
+/obj/effect/artifact_spawner,
 /turf/open/floor/iron/smooth,
 /area/misc/anomaly_research)
 "jE" = (
@@ -749,6 +760,8 @@
 	pixel_y = 10
 	},
 /obj/effect/turf_decal/siding/purple,
+/obj/effect/spawner/random/exotic/technology,
+/obj/effect/spawner/random/exotic/technology,
 /turf/open/floor/iron/dark,
 /area/misc/anomaly_research)
 "tx" = (

_maps/RandomRuins/SpaceRuins/dangerous_research.dmm

@@ -1158,10 +1158,6 @@
 /area/ruin/space/has_grav/dangerous_research/medical)
 "pR" = (
 /obj/effect/mapping_helpers/burnt_floor,
-/obj/item/gun/ballistic/revolver/c38{
-	name = "outpost revolver";
-	pin = /obj/item/firing_pin/explorer
-	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/white,
 /area/ruin/space/has_grav/dangerous_research/medical)
@@ -3592,6 +3588,10 @@
 /obj/effect/heretic_rune/big,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/mapping_helpers/broken_floor,
+/obj/item/gun/ballistic/revolver/c38{
+	name = "outpost revolver";
+	pin = /obj/item/firing_pin/explorer
+	},
 /turf/open/floor/iron/dark,
 /area/ruin/space/has_grav/dangerous_research/lab)
 "UA" = (

_maps/RandomRuins/SpaceRuins/deepstorage.dmm

@@ -3916,10 +3916,10 @@ KZ
 KZ
 KZ
 ab
-Iy
-Iy
-Iy
-Iy
+ab
+ab
+ab
+ab
 ab
 ab
 ab
@@ -3968,9 +3968,9 @@ iK
 Fv
 KZ
 ab
-Iy
-Iy
-Iy
+ab
+ab
+ab
 ab
 ab
 ab
@@ -4683,7 +4683,7 @@ aa
 aa
 aa
 Iy
-Iy
+ab
 ab
 ab
 ab

_maps/RandomRuins/SpaceRuins/derelict_sulaco.dmm

@@ -705,7 +705,7 @@
 "vz" = (
 /obj/effect/decal/cleanable/glass,
 /obj/structure/cable,
-/mob/living/basic/alien/sentinel,
+/mob/living/basic/alien/queen/large,
 /turf/open/floor/pod/light,
 /area/ruin/space/has_grav/derelictsulaco)
 "vJ" = (
@@ -760,6 +760,7 @@
 /area/ruin/space/has_grav/derelictsulaco)
 "yb" = (
 /obj/structure/cable,
+/mob/living/basic/alien/sentinel,
 /turf/open/floor/iron/tgmcemblem{
 	dir = 4
 	},
@@ -1505,7 +1506,6 @@
 "Ub" = (
 /obj/structure/alien/weeds/node,
 /obj/effect/decal/remains/xeno,
-/mob/living/basic/alien/queen/large,
 /turf/open/floor/plating/reinforced,
 /area/ruin/space/has_grav/derelictsulaco)
 "Ug" = (
@@ -1606,8 +1606,8 @@
 /area/template_noop)
 "WQ" = (
 /obj/structure/table/reinforced,
-/obj/item/gun/energy/dueling,
 /obj/effect/turf_decal/tile/red/fourcorners,
+/obj/item/storage/lockbox/dueling,
 /turf/open/floor/iron/smooth_edge,
 /area/ruin/space/has_grav/derelictsulaco)
 "WR" = (
@@ -2601,7 +2601,7 @@ FM
 Yw
 lS
 JT
-mg
+lS
 dD
 lS
 FA
@@ -2639,7 +2639,7 @@ JT
 Ub
 lS
 Lv
-lS
+mg
 vi
 iu
 LW

_maps/RandomRuins/SpaceRuins/gondolaasteroid.dmm

@@ -98,10 +98,6 @@
 	},
 /turf/open/floor/grass,
 /area/ruin/space/has_grav)
-"N" = (
-/obj/item/scalpel/alien,
-/turf/open/floor/grass,
-/area/ruin/space/has_grav)
 
 (1,1,1) = {"
 a
@@ -1147,7 +1143,7 @@ c
 c
 b
 b
-N
+d
 d
 d
 f

_maps/RandomRuins/SpaceRuins/hellfactory.dmm

@@ -405,6 +405,13 @@
 "bs" = (
 /obj/machinery/conveyor/auto,
 /obj/structure/window/reinforced/spawner/directional/west,
+/mob/living/basic/mimic/crate{
+	icon = 'icons/obj/puzzle_small.dmi';
+	icon_living = "laserbox";
+	icon_state = "laserbox";
+	name = "holobox";
+	health = 50
+	},
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/hellfactory)
 "bt" = (
@@ -897,6 +904,17 @@
 /obj/structure/extinguisher_cabinet/directional/north,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/hellfactory)
+"uj" = (
+/obj/effect/decal/cleanable/dirt,
+/mob/living/basic/mimic/crate{
+	icon = 'icons/obj/puzzle_small.dmi';
+	icon_living = "laserbox";
+	icon_state = "laserbox";
+	name = "holobox";
+	health = 50
+	},
+/turf/open/floor/iron/checker,
+/area/ruin/space/has_grav/hellfactory)
 "uL" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light/floor,
@@ -921,17 +939,17 @@
 /obj/effect/decal/cleanable/cobweb/cobweb2,
 /turf/open/floor/holofloor/wood,
 /area/ruin/space/has_grav/hellfactory)
+"Bc" = (
+/obj/machinery/light/small/directional/south,
+/obj/item/pressure_plate,
+/obj/item/pressure_plate,
+/turf/open/floor/iron/grimy,
+/area/ruin/space/has_grav/hellfactoryoffice)
 "BC" = (
 /obj/machinery/light/floor/has_bulb,
 /obj/effect/turf_decal/bot_white/left,
 /turf/open/floor/iron/dark,
 /area/ruin/space/has_grav/hellfactory)
-"CN" = (
-/mob/living/simple_animal/hostile/pirate/melee/space{
-	name = "Indentured Factory Worker"
-	},
-/turf/open/floor/iron,
-/area/ruin/space/has_grav/hellfactory)
 "EJ" = (
 /obj/structure/sign/poster/random/directional/west,
 /turf/open/floor/iron,
@@ -971,12 +989,16 @@
 /obj/machinery/light/directional/east,
 /turf/open/floor/plastic,
 /area/ruin/space/has_grav/hellfactory)
-"Pv" = (
-/mob/living/simple_animal/hostile/pirate/melee/space{
-	name = "Indentured Factory Worker"
+"PB" = (
+/mob/living/basic/mimic/crate{
+	icon = 'icons/obj/puzzle_small.dmi';
+	icon_living = "laserbox";
+	icon_state = "laserbox";
+	name = "holobox";
+	health = 50
 	},
-/turf/open/floor/iron/dark,
-/area/ruin/space/has_grav/hellfactory)
+/turf/open/floor/iron/grimy,
+/area/ruin/space/has_grav/hellfactoryoffice)
 "PO" = (
 /obj/machinery/light/small/directional/south,
 /turf/open/floor/plating,
@@ -1161,7 +1183,7 @@ bU
 ce
 aA
 bL
-CN
+aA
 cn
 cs
 aW
@@ -1310,15 +1332,15 @@ ah
 al
 ao
 aG
-Yd
+Bc
 ah
 bg
 aA
 bL
 aA
 Wh
 Wh
-Pv
+oJ
 by
 by
 oJ
@@ -1362,7 +1384,7 @@ aa
 aa
 ah
 an
-ao
+PB
 aI
 aR
 bf
@@ -1605,7 +1627,7 @@ aa
 aa
 ac
 at
-GE
+uj
 aL
 GE
 aZ