Merge remote-tracking branch 'upstream/master' into mining_ruin

shiptest-ss13 · Nov 14, 2024 · 0bb0ea3 · 0bb0ea3
2 parents 3acadac + 9fb5e3c
commit 0bb0ea3
Show file tree

Hide file tree

Showing 81 changed files with 498 additions and 763 deletions.
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_abandonedlisteningpost.dmm b/_maps/RandomRuins/LavaRuins/lavaland_abandonedlisteningpost.dmm
@@ -186,9 +186,7 @@
 "dJ" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/siding/wood{
-	dir = 2
-	},
+/obj/effect/turf_decal/siding/wood,
 /turf/open/floor/carpet/nanoweave/red,
 /area/ruin/unpowered/listening_post/commons)
 "dM" = (
@@ -298,9 +296,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 2
-	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 1
@@ -464,9 +460,7 @@
 /turf/open/floor/carpet/nanoweave/red,
 /area/ruin/unpowered/listening_post/commons)
 "hA" = (
-/obj/structure/cable{
-	icon_state = "0-1"
-	},
+/obj/structure/cable,
 /obj/machinery/power/terminal{
 	dir = 1
 	},
@@ -727,12 +721,12 @@
 /area/ruin/unpowered/listening_post/operations)
 "na" = (
 /obj/structure/table/reinforced,
-/obj/machinery/fax{
-	pixel_y = 7
-	},
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 1
 	},
+/obj/machinery/fax/ruin{
+	pixel_y = 6
+	},
 /turf/open/floor/plasteel/dark,
 /area/ruin/unpowered/listening_post/operations)
 "nc" = (
@@ -1763,9 +1757,7 @@
 /turf/open/floor/plasteel/dark,
 /area/ruin/unpowered/listening_post/operations)
 "FW" = (
-/obj/structure/cable{
-	icon_state = "0-1"
-	},
+/obj/structure/cable,
 /obj/machinery/power/smes/engineering,
 /turf/open/floor/plating,
 /area/ruin/unpowered/listening_post/engineering)
@@ -2199,9 +2191,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 2
-	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 8
@@ -2471,9 +2461,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 2
-	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/dark,

diff --git a/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm b/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm
@@ -766,9 +766,7 @@
 /turf/open/floor/wood,
 /area/ruin/rockplanet/distillery/office)
 "ir" = (
-/obj/structure/cable/yellow{
-	icon_state = "0-1"
-	},
+/obj/structure/cable/yellow,
 /obj/machinery/porta_turret/ship/weak,
 /turf/open/floor/plating/asteroid/rockplanet/cracked/lit,
 /area/ruin/rockplanet/distillery/office)
@@ -798,9 +796,7 @@
 /obj/structure/window/reinforced{
 	dir = 8
 	},
-/obj/machinery/power/smes/shuttle/micro/precharged{
-	dir = 4
-	},
+/obj/machinery/power/smes/shuttle/micro/precharged,
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "pod_window"
 	},
@@ -1125,9 +1121,7 @@
 /turf/open/floor/pod/rockplanet,
 /area/ruin/rockplanet/distillery/shuttle)
 "mK" = (
-/turf/open/floor/plasteel/stairs/wood{
-	color = "#5B3E1D"
-	},
+/turf/open/floor/plasteel/stairs/wood,
 /area/ruin/rockplanet/distillery/saloon)
 "mX" = (
 /obj/effect/turf_decal/siding/wood{
@@ -2416,9 +2410,7 @@
 /obj/effect/turf_decal/spline/fancy/opaque/white{
 	dir = 9
 	},
-/obj/effect/turf_decal/trimline/opaque/neutral/filled/corner{
-	dir = 2
-	},
+/obj/effect/turf_decal/trimline/opaque/neutral/filled/corner,
 /turf/open/floor/plasteel/patterned/rockplanet/lit,
 /area/overmap_encounter/planetoid/rockplanet/explored)
 "Bn" = (
@@ -2595,7 +2587,7 @@
 /turf/open/floor/plasteel/patterned/brushed/rockplanet,
 /area/ruin/rockplanet/distillery)
 "CW" = (
-/obj/machinery/fax/admin/frontiersmen,
+/obj/machinery/fax/ruin,
 /obj/structure/table/wood/reinforced,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 5
@@ -2631,9 +2623,7 @@
 /turf/open/floor/pod,
 /area/ruin/rockplanet/distillery/crew)
 "DX" = (
-/obj/structure/cable{
-	icon_state = "0-1"
-	},
+/obj/structure/cable,
 /obj/structure/cable/yellow{
 	icon_state = "1-10"
 	},
@@ -3581,9 +3571,7 @@
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable/yellow{
-	icon_state = "0-1"
-	},
+/obj/structure/cable/yellow,
 /obj/machinery/light/small/directional/south,
 /turf/open/floor/pod/rockplanet,
 /area/ruin/rockplanet/distillery)
@@ -3657,9 +3645,7 @@
 /turf/open/floor/plasteel/patterned/brushed,
 /area/ruin/rockplanet/distillery/engineering)
 "PI" = (
-/obj/machinery/power/shuttle/engine/electric{
-	dir = 4
-	},
+/obj/machinery/power/shuttle/engine/electric,
 /obj/structure/cable/yellow{
 	icon_state = "0-4"
 	},
@@ -4544,9 +4530,7 @@
 /obj/structure/window/reinforced{
 	dir = 1
 	},
-/obj/machinery/power/smes/shuttle/micro/precharged{
-	dir = 4
-	},
+/obj/machinery/power/smes/shuttle/micro/precharged,
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "pod_window"
 	},

diff --git a/_maps/RandomRuins/SpaceRuins/onehalf.dmm b/_maps/RandomRuins/SpaceRuins/onehalf.dmm
@@ -1401,7 +1401,7 @@
 /obj/effect/turf_decal/industrial/warning/corner{
 	dir = 1
 	},
-/mob/living/simple_animal/hostile/hivebot/range,
+/mob/living/simple_animal/hostile/hivebot/ranged,
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/onehalf)
 "qC" = (
@@ -1606,7 +1606,7 @@
 /turf/open/floor/plating/airless,
 /area/space/nearstation)
 "zS" = (
-/mob/living/simple_animal/hostile/hivebot/range,
+/mob/living/simple_animal/hostile/hivebot/ranged,
 /turf/open/floor/plasteel/airless,
 /area/ruin/space/has_grav/onehalf)
 "Af" = (
@@ -1969,7 +1969,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/siding/wood,
 /obj/effect/decal/cleanable/dirt,
-/mob/living/simple_animal/hostile/hivebot/range,
+/mob/living/simple_animal/hostile/hivebot/ranged,
 /turf/open/floor/wood/airless,
 /area/ruin/space/has_grav/onehalf)
 "OW" = (

diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_tradepost.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_tradepost.dmm
@@ -50,7 +50,7 @@
 /turf/open/floor/plasteel/dark,
 /area/ruin/wasteplanet/tradepost/barracks)
 "aM" = (
-/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged/rapid,
+/mob/living/simple_animal/hostile/hivebot/ranged,
 /turf/open/floor/plating/asteroid/wasteplanet,
 /area/overmap_encounter/planetoid/cave/explored)
 "aQ" = (
@@ -90,7 +90,7 @@
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/mob/living/simple_animal/hostile/hivebot/wasteplanet/strong,
+/mob/living/simple_animal/hostile/hivebot/strong,
 /obj/structure/foamedmetal/iron,
 /turf/open/floor/pod,
 /area/ruin/wasteplanet/tradepost/center)
@@ -116,7 +116,7 @@
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
 	dir = 1
 	},
-/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged,
+/mob/living/simple_animal/hostile/hivebot/ranged,
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
 	dir = 1
 	},
@@ -382,7 +382,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 6
 	},
-/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged/rapid,
+/mob/living/simple_animal/hostile/hivebot/ranged,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
 /obj/item/trash/plate,
 /obj/effect/turf_decal/spline/fancy/opaque/black/corner{
@@ -394,7 +394,7 @@
 /turf/open/floor/pod,
 /area/ruin/wasteplanet/tradepost/center)
 "ew" = (
-/mob/living/simple_animal/hostile/hivebot/wasteplanet/strong,
+/mob/living/simple_animal/hostile/hivebot/strong,
 /turf/open/floor/plating/asteroid/wasteplanet,
 /area/overmap_encounter/planetoid/cave/explored)
 "ez" = (
@@ -608,7 +608,7 @@
 /obj/effect/decal/cleanable/blood/tracks,
 /obj/item/paper_bin,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/mob/living/simple_animal/hostile/hivebot/wasteplanet/strong,
+/mob/living/simple_animal/hostile/hivebot/strong,
 /obj/item/trash/plate,
 /obj/item/ammo_casing/spent,
 /turf/open/floor/pod,
@@ -851,7 +851,7 @@
 /obj/effect/decal/cleanable/oil/streak{
 	icon_state = "streak2"
 	},
-/mob/living/simple_animal/hostile/hivebot/wasteplanet/strong,
+/mob/living/simple_animal/hostile/hivebot/strong,
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
 	dir = 4
 	},
@@ -897,7 +897,7 @@
 /area/overmap_encounter/planetoid/cave/explored)
 "kr" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged,
+/mob/living/simple_animal/hostile/hivebot/ranged,
 /turf/open/floor/concrete/pavement/wasteplanet,
 /area/overmap_encounter/planetoid/cave/explored)
 "ks" = (
@@ -1575,7 +1575,7 @@
 "rN" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/holopad/secure,
-/mob/living/simple_animal/hostile/hivebot/wasteplanet/strong,
+/mob/living/simple_animal/hostile/hivebot/strong,
 /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer2,
 /obj/effect/turf_decal/corner/opaque/yellow/full,
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4,
@@ -2354,7 +2354,7 @@
 /obj/effect/decal/cleanable/oil/streak{
 	icon_state = "streak2"
 	},
-/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged/rapid,
+/mob/living/simple_animal/hostile/hivebot/ranged,
 /turf/open/floor/pod,
 /area/ruin/wasteplanet/tradepost/center)
 "zO" = (
@@ -2502,7 +2502,7 @@
 /turf/open/floor/pod/dark,
 /area/ruin/wasteplanet/tradepost/center)
 "BN" = (
-/mob/living/simple_animal/hostile/hivebot/wasteplanet/strong,
+/mob/living/simple_animal/hostile/hivebot/strong,
 /turf/open/floor/plating/asteroid/wasteplanet/lit,
 /area/overmap_encounter/planetoid/wasteplanet/explored)
 "Cb" = (
@@ -2949,7 +2949,7 @@
 /turf/open/floor/plasteel/tech,
 /area/ruin/wasteplanet/tradepost/barracks)
 "FK" = (
-/mob/living/simple_animal/hostile/hivebot/wasteplanet/strong,
+/mob/living/simple_animal/hostile/hivebot/strong,
 /obj/item/ammo_casing/spent,
 /turf/open/floor/concrete/pavement/wasteplanet,
 /area/overmap_encounter/planetoid/cave/explored)
@@ -3229,7 +3229,7 @@
 /turf/open/floor/wood/walnut,
 /area/ruin/wasteplanet/tradepost/center)
 "IM" = (
-/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged/rapid,
+/mob/living/simple_animal/hostile/hivebot/ranged,
 /turf/open/floor/concrete/pavement/wasteplanet,
 /area/overmap_encounter/planetoid/cave/explored)
 "IN" = (
@@ -3579,7 +3579,7 @@
 /area/overmap_encounter/planetoid/cave/explored)
 "LW" = (
 /obj/effect/decal/cleanable/dirt,
-/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged,
+/mob/living/simple_animal/hostile/hivebot/ranged,
 /obj/item/ammo_casing/spent,
 /turf/open/floor/concrete/pavement/wasteplanet,
 /area/overmap_encounter/planetoid/cave/explored)
@@ -3988,7 +3988,7 @@
 /turf/open/floor/pod,
 /area/ruin/wasteplanet/tradepost/center)
 "Qn" = (
-/mob/living/simple_animal/hostile/hivebot/wasteplanet/strong,
+/mob/living/simple_animal/hostile/hivebot/strong,
 /turf/open/floor/plating/wasteplanet/rust,
 /area/overmap_encounter/planetoid/wasteplanet/explored)
 "QB" = (
@@ -4694,7 +4694,7 @@
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
 	dir = 8
 	},
-/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged/rapid,
+/mob/living/simple_animal/hostile/hivebot/ranged,
 /obj/structure/door_assembly/door_assembly_com,
 /turf/open/floor/pod,
 /area/ruin/wasteplanet/tradepost/center)

diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_unhonorable.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_unhonorable.dmm
@@ -93,7 +93,7 @@
 /turf/open/floor/plating/wasteplanet,
 /area/ruin/wasteplanet/wasteplanet_radiation)
 "gx" = (
-/mob/living/simple_animal/hostile/hivebot/wasteplanet,
+/mob/living/simple_animal/hostile/hivebot,
 /turf/open/floor/plating/asteroid/wasteplanet,
 /area/ruin/wasteplanet/wasteplanet_radiation)
 "gM" = (
@@ -684,7 +684,7 @@
 /turf/open/floor/plating/asteroid/wasteplanet,
 /area/ruin/wasteplanet/wasteplanet_radiation)
 "Mh" = (
-/mob/living/simple_animal/hostile/hivebot/wasteplanet/ranged/rapid,
+/mob/living/simple_animal/hostile/hivebot/ranged,
 /turf/open/floor/plating/asteroid/wasteplanet,
 /area/ruin/wasteplanet/wasteplanet_radiation)
 "Mq" = (