diff --git a/_maps/map_files/RandomRuins/SpaceRuins/casino.dmm b/_maps/map_files/RandomRuins/SpaceRuins/casino.dmm index 872694b2d21..3a2327942da 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/casino.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/casino.dmm @@ -22,7 +22,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/mob/living/simple_animal/hostile/pirate, +/obj/effect/spawner/random/pool/casino_mob, /turf/simulated/floor/plasteel/dark, /area/ruin/space/powered/casino/arrivals) "ar" = ( @@ -311,9 +311,6 @@ /area/ruin/space/powered/casino/kitchen) "id" = ( /obj/structure/safe, -/obj/item/stack/spacecash/c500{ - pixel_y = -5 - }, /obj/item/circuitboard/teleporter_hub{ pixel_x = 3; pixel_y = 6 @@ -321,8 +318,9 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed, -/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed, +/obj/item/stack/spacecash/c1000, +/obj/effect/spawner/random/pool/spaceloot/syndicate/rare/casino, +/obj/effect/spawner/random/pool/spaceloot/syndicate/rare/casino, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/casino/security) "in" = ( @@ -341,9 +339,9 @@ /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/casino/security) "iL" = ( -/obj/effect/mob_spawn/human/corpse/random_species/gambler, -/turf/simulated/floor/wood, -/area/ruin/space/powered/casino/kitchen) +/obj/effect/spawner/window/plastitanium, +/turf/simulated/floor/plating, +/area/ruin/space/powered/casino/docked_ships) "ja" = ( /obj/structure/extinguisher_cabinet{ name = "north bump"; @@ -389,7 +387,7 @@ /obj/structure/chair/wood{ dir = 8 }, -/mob/living/simple_animal/hostile/pirate, +/obj/effect/spawner/random/pool/casino_mob, /turf/simulated/floor/carpet/black, /area/ruin/space/powered/casino/floor) "jK" = ( @@ -517,12 +515,9 @@ /turf/simulated/wall, /area/ruin/space/powered/casino/kitchen) "no" = ( -/obj/structure/chair/wood{ - dir = 4 - }, -/obj/effect/mob_spawn/human/corpse/random_species/gambler, -/turf/simulated/floor/wood, -/area/ruin/space/powered/casino/kitchen) +/obj/effect/spawner/random/pool/casino_mob, +/turf/simulated/floor/plating, +/area/ruin/space/powered/casino/floor) "nx" = ( /turf/simulated/floor/mineral/silver/fancy, /area/ruin/space/powered/casino/hall) @@ -606,7 +601,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/mob/living/simple_animal/hostile/pirate/ranged, +/obj/effect/spawner/random/pool/casino_mob, /turf/simulated/floor/plasteel/dark, /area/ruin/space/powered/casino/security) "pV" = ( @@ -753,10 +748,10 @@ /turf/simulated/floor/plating, /area/ruin/space/powered/casino/security) "vo" = ( -/mob/living/simple_animal/hostile/pirate, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/spawner/random/pool/casino_mob, /turf/simulated/floor/mineral/silver, /area/ruin/space/powered/casino/hall) "vQ" = ( @@ -822,7 +817,7 @@ /turf/simulated/floor/carpet/black, /area/ruin/space/powered/casino/floor) "wx" = ( -/mob/living/simple_animal/hostile/pirate, +/obj/effect/spawner/random/pool/casino_mob, /turf/simulated/floor/mineral/silver, /area/ruin/space/powered/casino/hall) "wB" = ( @@ -854,7 +849,7 @@ /obj/structure/chair/office{ dir = 1 }, -/mob/living/simple_animal/hostile/pirate, +/obj/effect/spawner/random/pool/casino_mob, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/casino/security) "xd" = ( @@ -1059,7 +1054,7 @@ /area/ruin/space/powered/casino/floor) "DJ" = ( /obj/effect/spawner/random/dirt/maybe, -/mob/living/simple_animal/hostile/pirate, +/obj/effect/spawner/random/pool/casino_mob, /turf/simulated/floor/plating, /area/ruin/space/powered/casino/maints) "DL" = ( @@ -1155,7 +1150,7 @@ /obj/structure/chair/wood{ dir = 4 }, -/mob/living/simple_animal/hostile/pirate, +/obj/effect/spawner/random/pool/casino_mob, /turf/simulated/floor/wood, /area/ruin/space/powered/casino/kitchen) "GJ" = ( @@ -1186,7 +1181,7 @@ /obj/machinery/light/small{ dir = 8 }, -/mob/living/simple_animal/hostile/pirate, +/obj/effect/spawner/random/pool/casino_mob, /turf/simulated/floor/plasteel/freezer, /area/ruin/space/powered/casino/hall) "Hx" = ( @@ -1215,7 +1210,7 @@ /turf/simulated/floor/plating, /area/ruin/space/powered/casino/maints) "ID" = ( -/mob/living/simple_animal/hostile/pirate, +/obj/effect/spawner/random/pool/casino_mob, /turf/simulated/floor/plating, /area/ruin/space/powered/casino/security) "IJ" = ( @@ -1309,7 +1304,7 @@ /turf/simulated/floor/wood, /area/ruin/space/powered/casino/kitchen) "MU" = ( -/mob/living/simple_animal/hostile/pirate/ranged, +/obj/effect/spawner/random/pool/casino_mob, /turf/simulated/floor/carpet/black, /area/ruin/space/powered/casino/floor) "Nh" = ( @@ -1357,7 +1352,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/mob/living/simple_animal/hostile/pirate, +/obj/effect/spawner/random/pool/casino_mob, /turf/simulated/floor/plasteel/dark, /area/ruin/space/powered/casino/arrivals) "ON" = ( @@ -1559,7 +1554,7 @@ /turf/simulated/floor/wood, /area/ruin/space/powered/casino/kitchen) "TW" = ( -/mob/living/simple_animal/hostile/pirate, +/obj/effect/spawner/random/pool/casino_mob, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -1738,10 +1733,6 @@ }, /turf/template_noop, /area/template_noop) -"Xm" = ( -/obj/effect/mob_spawn/human/corpse/bartender, -/turf/simulated/floor/carpet/black, -/area/ruin/space/powered/casino/floor) "Xo" = ( /turf/simulated/wall/mineral/plastitanium, /area/ruin/space/powered/casino/floor) @@ -1757,7 +1748,7 @@ /turf/simulated/wall, /area/ruin/space/powered/casino/teleporter) "XN" = ( -/mob/living/simple_animal/hostile/pirate, +/obj/effect/spawner/random/pool/casino_mob, /turf/simulated/floor/plasteel/dark, /area/ruin/space/powered/casino/arrivals) "Yo" = ( @@ -1866,9 +1857,9 @@ wg wg wg Mt -Mt -Mt -Mt +iL +iL +iL Mt wg wg @@ -2207,7 +2198,7 @@ sO sO IJ dL -iL +TV dL IJ sO @@ -2471,7 +2462,7 @@ EK ql DM sO -no +nT nT TV TV @@ -2966,12 +2957,12 @@ qe AO qe Tx -Xm +Th aD ZJ Th Th -ZR +Sz ZR Sz Th @@ -3098,7 +3089,7 @@ KV KV jz du -du +no Dy Th Th @@ -3530,9 +3521,9 @@ wg wg wg SK -SK -SK -SK +eP +eP +eP SK wg wg diff --git a/code/game/objects/effects/spawners/random/misc_spawners.dm b/code/game/objects/effects/spawners/random/misc_spawners.dm index e931b6f08aa..f02cc2d9d60 100644 --- a/code/game/objects/effects/spawners/random/misc_spawners.dm +++ b/code/game/objects/effects/spawners/random/misc_spawners.dm @@ -188,6 +188,7 @@ /obj/effect/spawner/random/space_pirate name = "random space pirate spawner" + icon_state = "pirate" loot = list( /mob/living/simple_animal/hostile/pirate, /mob/living/simple_animal/hostile/pirate/ranged, diff --git a/code/modules/awaymissions/mission_code/ruins/casino.dm b/code/modules/awaymissions/mission_code/ruins/casino.dm new file mode 100644 index 00000000000..552ba603a18 --- /dev/null +++ b/code/modules/awaymissions/mission_code/ruins/casino.dm @@ -0,0 +1,14 @@ +/obj/effect/spawner/random/pool/spaceloot/syndicate/rare/casino + guaranteed = TRUE + +/datum/spawn_pool/casino_mobs + available_points = 6 + +/obj/effect/spawner/random/pool/casino_mob + icon_state = "pirate" + spawn_pool = /datum/spawn_pool/casino_mobs + point_value = 1 + loot = list( + /mob/living/simple_animal/hostile/pirate, + /mob/living/simple_animal/hostile/pirate/ranged, + ) diff --git a/icons/effects/random_spawners.dmi b/icons/effects/random_spawners.dmi index efd93a1e875..aa2d69a265e 100644 Binary files a/icons/effects/random_spawners.dmi and b/icons/effects/random_spawners.dmi differ diff --git a/icons/effects/spawner_icons.dmi b/icons/effects/spawner_icons.dmi index 91f4b0fde68..88bf608b766 100644 Binary files a/icons/effects/spawner_icons.dmi and b/icons/effects/spawner_icons.dmi differ diff --git a/paradise.dme b/paradise.dme index be15c1007bd..56ce4bf53a3 100644 --- a/paradise.dme +++ b/paradise.dme @@ -1777,6 +1777,7 @@ #include "code\modules\awaymissions\mission_code\ghost_role_spawners\golems.dm" #include "code\modules\awaymissions\mission_code\ghost_role_spawners\oldstation_spawns.dm" #include "code\modules\awaymissions\mission_code\ruins\abandoned_engi_sat.dm" +#include "code\modules\awaymissions\mission_code\ruins\casino.dm" #include "code\modules\awaymissions\mission_code\ruins\deepstorage.dm" #include "code\modules\awaymissions\mission_code\ruins\derelict5.dm" #include "code\modules\awaymissions\mission_code\ruins\freegolems.dm"