Merge branch 'PMed-New-Jacket' of https://github.com/MKardinal/Paradi…

…se-SS220 into PMed-New-Jacket
ss220club · Feb 13, 2025 · 90f0ca6 · 90f0ca6
2 parents b8bca72 + 7fbea97
commit 90f0ca6
Show file tree

Hide file tree

Showing 211 changed files with 4,181 additions and 2,251 deletions.
diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm
@@ -73111,10 +73111,6 @@
 /area/station/maintenance/solar_maintenance/port)
 "pGm" = (
 /obj/machinery/ai_status_display,
-/obj/item/radio/intercom{
-	pixel_y = 28;
-	name = "custom placement"
-	},
 /turf/simulated/wall/r_wall,
 /area/station/command/office/hop)
 "pGx" = (

diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm
@@ -57343,7 +57343,6 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
-/obj/item/kirbyplants/large,
 /turf/simulated/floor/plasteel,
 /area/station/engineering/control)
 "eyG" = (
@@ -69651,7 +69650,6 @@
 /area/station/medical/reception)
 "lBJ" = (
 /obj/item/kirbyplants/large,
-/obj/item/kirbyplants/large,
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "vault"

diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm
@@ -35363,16 +35363,6 @@
 	icon_state = "freezerfloor"
 	},
 /area/station/medical/cloning)
-"haD" = (
-/obj/machinery/recharger/wallcharger{
-	pixel_x = 30;
-	pixel_y = 1
-	},
-/turf/simulated/floor/plasteel{
-	dir = 4;
-	icon_state = "darkredcorners"
-	},
-/area/station/security/brig)
 "haF" = (
 /obj/structure/table/wood,
 /obj/item/stack/tape_roll,
@@ -42963,6 +42953,14 @@
 /obj/item/storage/box/cups,
 /turf/simulated/floor/wood,
 /area/station/legal/courtroom)
+"iAk" = (
+/obj/machinery/camera/motion{
+	c_tag = "AI Satellite Hallway";
+	dir = 8;
+	network = list("SS13","MiniSat")
+	},
+/turf/simulated/floor/bluegrid,
+/area/station/aisat/hall)
 "iAo" = (
 /mob/living/simple_animal/hostile/scarybat,
 /obj/structure/closet/crate{
@@ -108464,6 +108462,10 @@
 	},
 /turf/space,
 /area/station/engineering/solar/aft_starboard)
+"vyc" = (
+/obj/machinery/firealarm/directional/west,
+/turf/simulated/floor/bluegrid,
+/area/station/aisat/hall)
 "vyj" = (
 /obj/effect/mapping_helpers/turfs/rust/maybe,
 /turf/simulated/wall,
@@ -166569,7 +166571,7 @@ geh
 iLL
 uwp
 aKa
-lLR
+vyc
 sRx
 tFJ
 aKa
@@ -167595,7 +167597,7 @@ dQC
 sIx
 xwv
 iLL
-uwp
+iAk
 aKa
 bqT
 rtf
@@ -173364,7 +173366,7 @@ upq
 jDu
 pXO
 snW
-haD
+tZY
 hjy
 jLZ
 ihH

diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/convoy_ambush.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/convoy_ambush.dmm
@@ -417,7 +417,7 @@
 /obj/structure/closet/crate/secure/weapon{
 	req_access = list(3)
 	},
-/obj/item/gun/energy/laser/retro/old,
+/obj/effect/spawner/random/pool/spaceloot/laser,
 /turf/simulated/floor/plasteel/airless{
 	icon_state = "dark"
 	},
@@ -588,7 +588,7 @@
 	dir = 2
 	},
 /obj/structure/closet/crate,
-/obj/item/grenade/frag,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/common_rare,
 /turf/simulated/floor/mineral/plastitanium/red,
 /area/ruin/space/unpowered/unpowered_structures)
 "zo" = (
@@ -830,7 +830,7 @@
 	dir = 2
 	},
 /obj/structure/closet/crate,
-/obj/item/grenade/frag,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/common_rare,
 /turf/simulated/floor/mineral/plastitanium/red,
 /area/ruin/space/unpowered/unpowered_structures)
 "IN" = (
@@ -921,6 +921,15 @@
 	icon_state = "dark"
 	},
 /area/ruin/space/unpowered/unpowered_structures)
+"LZ" = (
+/obj/effect/turf_decal/delivery/white,
+/obj/effect/turf_decal/delivery,
+/obj/structure/closet/crate,
+/obj/effect/spawner/random/pool/spaceloot/mining_tool,
+/turf/simulated/floor/plasteel/airless{
+	icon_state = "dark"
+	},
+/area/ruin/space/unpowered/unpowered_structures)
 "Md" = (
 /obj/structure/lattice,
 /obj/machinery/atmospherics/pipe/simple/visible{
@@ -1119,17 +1128,16 @@
 /area/ruin/space/unpowered/unpowered_structures)
 "TF" = (
 /obj/structure/closet/syndicate,
-/obj/item/ammo_box/magazine/m10mm,
-/obj/item/gun/projectile/automatic/pistol,
 /obj/structure/window/plasmareinforced{
 	color = "#FF0000";
 	dir = 4
 	},
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/mineral/plastitanium/red,
 /area/ruin/space/unpowered/unpowered_structures)
 "TT" = (
-/obj/machinery/suit_storage_unit/standard_unit,
 /obj/machinery/status_display/directional/east,
+/obj/effect/spawner/random/pool/spaceloot/security/modsuit,
 /turf/simulated/floor/plasteel/airless{
 	icon_state = "dark"
 	},
@@ -1179,8 +1187,8 @@
 /area/ruin/space/unpowered/unpowered_structures)
 "VO" = (
 /obj/structure/table,
-/obj/item/grenade/plastic/c4,
 /obj/item/clothing/glasses/sunglasses,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/common_rare,
 /turf/simulated/floor/mineral/plastitanium/red,
 /area/ruin/space/unpowered/unpowered_structures)
 "VX" = (
@@ -4816,7 +4824,7 @@ TA
 wB
 wB
 wB
-SA
+LZ
 RP
 wr
 wr

diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/destroyed_infiltrator.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/destroyed_infiltrator.dmm
@@ -29,7 +29,7 @@
 /turf/template_noop,
 /area/ruin/space/unpowered/unpowered_structures)
 "bi" = (
-/obj/item/reagent_containers/hypospray/autoinjector/nanocalcium,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/template_noop,
 /area/template_noop)
 "bq" = (
@@ -333,10 +333,6 @@
 /obj/effect/mapping_helpers/turfs/damage,
 /turf/simulated/floor/mineral/plastitanium/red/airless,
 /area/ruin/space/unpowered/unpowered_structures)
-"zg" = (
-/obj/item/storage/box/syndidonkpockets,
-/turf/template_noop,
-/area/template_noop)
 "zG" = (
 /obj/structure/table,
 /obj/structure/lattice,
@@ -452,7 +448,7 @@
 /turf/template_noop,
 /area/template_noop)
 "IA" = (
-/obj/machinery/suit_storage_unit/syndicate/secure,
+/obj/effect/spawner/random/pool/spaceloot/modsuit_syndie/nuclear,
 /turf/simulated/floor/mineral/plastitanium/red/airless,
 /area/ruin/space/unpowered/unpowered_structures)
 "Jr" = (
@@ -1598,7 +1594,7 @@ Ly
 Ly
 SK
 Ly
-zg
+bi
 jM
 tO
 SK

diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/infected_ship.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/infected_ship.dmm
@@ -6,10 +6,7 @@
 	pixel_x = 4;
 	pixel_y = 4
 	},
-/obj/item/storage/toolbox/syndicate{
-	pixel_x = -10;
-	pixel_y = 10
-	},
+/obj/effect/spawner/random/pool/spaceloot/syndicate/common_rare,
 /turf/simulated/floor/pod,
 /area/ruin/space/powered/requires_power_space)
 "al" = (
@@ -358,7 +355,7 @@
 /obj/effect/turf_decal/stripes/white/line{
 	dir = 8
 	},
-/obj/item/toy/sword,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/mineral/plastitanium,
 /area/ruin/space/powered/requires_power_space)
 "iP" = (
@@ -936,8 +933,8 @@
 /obj/machinery/light_construct/directional/west,
 /obj/item/paper/crumpled,
 /obj/effect/spawner/random/dirt/often,
-/obj/item/storage/secure/briefcase/syndie,
 /obj/item/trash/spentcasing/bullet,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/common,
 /turf/simulated/floor/mineral/plastitanium,
 /area/ruin/space/powered/requires_power_space)
 "yd" = (
@@ -1605,7 +1602,7 @@
 	amount = 1
 	},
 /obj/structure/bed/nest,
-/obj/effect/mob_spawn/human/corpse/syndicatecommando,
+/obj/effect/spawner/random/pool/spaceloot/modsuit_syndie/corpse,
 /turf/simulated/floor/plating,
 /area/ruin/space/powered/requires_power_space)
 "WR" = (