Merge branch 'master' into fix-sliceable-altclick

ParadiseSS13 · Jan 26, 2025 · 941bfb8 · 941bfb8
2 parents 596f5e7 + 5120053
commit 941bfb8
Show file tree

Hide file tree

Showing 473 changed files with 9,272 additions and 4,815 deletions.
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm
@@ -33,7 +33,7 @@
 /turf/simulated/floor/wood/lavaland_air,
 /area/ruin/powered/pizza_party)
 "j" = (
-/obj/item/food/mushroompizzaslice,
+/obj/item/food/sliced/mushroom_pizza,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating/lavaland_air,
 /area/ruin/powered/pizza_party)
@@ -144,13 +144,13 @@
 /area/ruin/powered/pizza_party)
 "D" = (
 /obj/structure/table/wood,
-/obj/item/food/margheritapizzaslice,
+/obj/item/food/sliced/margherita_pizza,
 /obj/item/trash/plate,
 /turf/simulated/floor/wood/lavaland_air,
 /area/ruin/powered/pizza_party)
 "E" = (
 /obj/structure/table/wood,
-/obj/item/food/meatpizzaslice,
+/obj/item/food/sliced/meat_pizza,
 /turf/simulated/floor/wood/lavaland_air,
 /area/ruin/powered/pizza_party)
 "F" = (

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/abandoned_engi_sat.dmm b/_maps/map_files/RandomRuins/SpaceRuins/abandoned_engi_sat.dmm
@@ -194,6 +194,10 @@
 /obj/effect/mapping_helpers/turfs/burn,
 /turf/simulated/floor/plating,
 /area/ruin/space/abandoned_engi_sat)
+"fs" = (
+/mob/living/simple_animal/hostile/asteroid/hivelord,
+/turf/simulated/floor/wood/airless,
+/area/ruin/space/abandoned_engi_sat)
 "fA" = (
 /turf/simulated/floor/plasteel,
 /area/ruin/space/abandoned_engi_sat)
@@ -364,6 +368,7 @@
 	name = "torn sign";
 	pixel_x = -1
 	},
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plating,
 /area/ruin/space/abandoned_engi_sat)
 "kT" = (
@@ -503,6 +508,7 @@
 	pixel_y = -24;
 	name = "south bump"
 	},
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plasteel,
 /area/ruin/space/abandoned_engi_sat)
 "oL" = (
@@ -546,6 +552,7 @@
 /area/ruin/space/abandoned_engi_sat)
 "pX" = (
 /obj/structure/closet/secure_closet/engineering_personal/empty,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/wood/airless,
 /area/ruin/space/abandoned_engi_sat)
 "qu" = (
@@ -711,6 +718,7 @@
 	pixel_y = 32
 	},
 /obj/structure/closet/crate/internals,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plasteel{
 	icon_state = "bot";
 	dir = 1
@@ -931,6 +939,7 @@
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plasteel{
 	icon_state = "vault";
 	dir = 5
@@ -950,6 +959,10 @@
 	name = "floor"
 	},
 /area/ruin/space/abandoned_engi_sat)
+"FN" = (
+/mob/living/simple_animal/hostile/asteroid/hivelord,
+/turf/simulated/floor/carpet/airless,
+/area/ruin/space/abandoned_engi_sat)
 "FQ" = (
 /obj/machinery/door/airlock/engineering{
 	name = "Construction Area"
@@ -1259,6 +1272,11 @@
 	dir = 5
 	},
 /area/ruin/space/abandoned_engi_sat)
+"RV" = (
+/obj/effect/mapping_helpers/turfs/damage,
+/mob/living/simple_animal/hostile/asteroid/hivelord,
+/turf/simulated/floor/plasteel,
+/area/ruin/space/abandoned_engi_sat)
 "Sa" = (
 /obj/structure/table,
 /turf/simulated/floor/plasteel{
@@ -1340,6 +1358,10 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating,
 /area/ruin/space/abandoned_engi_sat)
+"Ye" = (
+/mob/living/simple_animal/hostile/asteroid/hivelord,
+/turf/simulated/floor/plasteel,
+/area/ruin/space/abandoned_engi_sat)
 "Yz" = (
 /obj/structure/closet/emcloset,
 /turf/simulated/floor/plasteel{
@@ -2089,7 +2111,7 @@ Ux
 Vx
 mQ
 DO
-DO
+fs
 DO
 DO
 bi
@@ -2159,7 +2181,7 @@ kI
 mG
 pX
 hB
-nH
+FN
 pX
 EU
 EU
@@ -2286,9 +2308,9 @@ oL
 xp
 gL
 fA
-kd
-fA
+RV
 fA
+Ye
 fA
 eG
 iV

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/abandoned_sec_shuttle.dmm b/_maps/map_files/RandomRuins/SpaceRuins/abandoned_sec_shuttle.dmm
@@ -115,6 +115,7 @@
 /obj/item/gun/projectile/automatic/pistol/enforcer,
 /obj/item/grenade/flashbang,
 /obj/item/storage/firstaid/regular,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plating/airless,
 /area/ruin/space/sec_shuttle)
 "F" = (

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/abandonedtele.dmm b/_maps/map_files/RandomRuins/SpaceRuins/abandonedtele.dmm
@@ -90,6 +90,7 @@
 /area/ruin/space/abandtele)
 "w" = (
 /obj/structure/closet,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plating/airless,
 /area/ruin/space/abandtele)
 "x" = (
@@ -106,6 +107,7 @@
 /obj/item/weldingtool,
 /obj/item/wrench,
 /obj/item/circuitboard/teleporter,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plating/airless,
 /area/ruin/space/abandtele)
 "z" = (

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm b/_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm
@@ -216,7 +216,7 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/item/gun/energy/floragun,
+/obj/effect/spawner/random/pool/spaceloot/zoo,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -376,7 +376,7 @@
 /area/ruin/space/unpowered)
 "aY" = (
 /obj/structure/table/reinforced,
-/obj/item/gun/energy/temperature,
+/obj/effect/spawner/random/pool/spaceloot/zoo,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/asteroid1.dmm b/_maps/map_files/RandomRuins/SpaceRuins/asteroid1.dmm
@@ -9,6 +9,10 @@
 "c" = (
 /turf/simulated/mineral/random/high_chance,
 /area/ruin/space/unpowered)
+"l" = (
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
+/turf/simulated/floor/plating/asteroid/airless,
+/area/ruin/space/unpowered)
 "V" = (
 /turf/template_noop,
 /area/template_noop)
@@ -149,7 +153,7 @@ V
 V
 V
 b
-b
+l
 V
 V
 V

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/asteroid2.dmm b/_maps/map_files/RandomRuins/SpaceRuins/asteroid2.dmm
@@ -15,6 +15,10 @@
 /obj/structure/spawner/mining/basilisk,
 /turf/simulated/floor/plating/asteroid/airless,
 /area/ruin/space/unpowered)
+"C" = (
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
+/turf/simulated/floor/plating/asteroid/airless,
+/area/ruin/space/unpowered)
 "R" = (
 /obj/structure/spawner/mining/goliath,
 /turf/simulated/floor/plating/asteroid/airless,
@@ -220,7 +224,7 @@ c
 d
 c
 c
-c
+C
 c
 c
 c
@@ -337,7 +341,7 @@ c
 c
 c
 c
-c
+C
 c
 c
 c

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/asteroid3.dmm b/_maps/map_files/RandomRuins/SpaceRuins/asteroid3.dmm
@@ -22,6 +22,10 @@
 "q" = (
 /turf/simulated/mineral/random/low_chance,
 /area/ruin/space/unpowered)
+"r" = (
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
+/turf/simulated/floor/plating/asteroid/airless,
+/area/ruin/space/unpowered)
 "v" = (
 /obj/structure/spawner/mining/basilisk,
 /turf/simulated/floor/plating/asteroid/airless,
@@ -175,7 +179,7 @@ q
 c
 c
 c
-b
+r
 c
 c
 q

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/asteroid4.dmm b/_maps/map_files/RandomRuins/SpaceRuins/asteroid4.dmm
@@ -50,6 +50,10 @@
 	},
 /turf/simulated/floor/mineral/titanium/blue,
 /area/ruin/space/unpowered)
+"p" = (
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
+/turf/simulated/floor/plating,
+/area/ruin/space/unpowered)
 "Q" = (
 /turf/simulated/mineral/random/low_chance,
 /area/ruin/space/unpowered)
@@ -354,7 +358,7 @@ a
 c
 c
 b
-f
+p
 f
 i
 i

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/asteroid5.dmm b/_maps/map_files/RandomRuins/SpaceRuins/asteroid5.dmm
@@ -15,6 +15,10 @@
 /obj/structure/spawner/mining/goliath,
 /turf/simulated/floor/plating/asteroid/airless,
 /area/ruin/space/unpowered)
+"o" = (
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
+/turf/simulated/floor/plating/asteroid/airless,
+/area/ruin/space/unpowered)
 "A" = (
 /turf/simulated/mineral/random/low_chance,
 /area/ruin/space/unpowered)
@@ -606,7 +610,7 @@ d
 c
 c
 b
-d
+o
 d
 c
 d

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/blowntcommsat.dmm b/_maps/map_files/RandomRuins/SpaceRuins/blowntcommsat.dmm
@@ -51,6 +51,13 @@
 	},
 /turf/simulated/floor/plating/airless,
 /area/ruin/space/tcommsat)
+"cl" = (
+/obj/structure/rack,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
+/turf/simulated/floor/plasteel/airless{
+	icon_state = "dark"
+	},
+/area/ruin/space/tcommsat)
 "cM" = (
 /obj/effect/decal/cleanable/blood/writing{
 	dir = 8
@@ -207,7 +214,7 @@
 	},
 /area/ruin/space/tcommsat)
 "lq" = (
-/mob/living/simple_animal/hostile/syndicate/ranged/space/autogib,
+/obj/effect/spawner/random/pool/spaceloot/modsuit_syndie,
 /turf/simulated/floor/plating/airless,
 /area/ruin/space/tcommsat)
 "my" = (
@@ -481,6 +488,7 @@
 /area/ruin/space/tcommsat)
 "Go" = (
 /obj/structure/table,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plating/airless,
 /area/ruin/space/tcommsat)
 "GG" = (
@@ -585,11 +593,15 @@
 /turf/simulated/wall/r_wall,
 /area/space/nearstation)
 "Nw" = (
-/obj/item/food/xenomeatbreadslice{
+/obj/item/food/sliced/xeno_meat_bread{
 	name = "green mold bread slice"
 	},
 /turf/simulated/floor/plating/airless,
 /area/ruin/space/tcommsat)
+"NC" = (
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
+/turf/simulated/floor/plating/airless,
+/area/ruin/space/tcommsat)
 "NJ" = (
 /obj/structure/disposaloutlet{
 	dir = 4
@@ -632,6 +644,7 @@
 	dir = 8
 	},
 /obj/structure/closet/firecloset,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plasteel,
 /area/ruin/space/tcommsat)
 "PZ" = (
@@ -1241,7 +1254,7 @@ Wc
 Is
 ot
 UK
-fS
+cl
 Wr
 kx
 Jr
@@ -2082,7 +2095,7 @@ Wc
 Wc
 Wc
 Is
-Wc
+NC
 Wr
 kx
 Jr
@@ -2862,7 +2875,7 @@ au
 Wc
 ot
 bc
-Wc
+NC
 Wr
 bc
 Wc