diff --git a/_maps/map_files/RandomRuins/SpaceRuins/whiteship.dmm b/_maps/map_files/RandomRuins/SpaceRuins/whiteship.dmm index 80bd5870bc3..004476da73d 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/whiteship.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/whiteship.dmm @@ -6,6 +6,10 @@ /obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plating, /area/shuttle/abandoned) +"bE" = ( +/obj/effect/spawner/random/pool/whiteship_mob, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/abandoned) "cf" = ( /obj/effect/spawner/random/oil/often, /turf/simulated/floor/plating, @@ -61,6 +65,10 @@ }, /turf/simulated/floor/plating, /area/shuttle/abandoned) +"fT" = ( +/obj/effect/spawner/random/pool/whiteship_mob, +/turf/simulated/floor/plating, +/area/shuttle/abandoned) "gd" = ( /obj/machinery/door/airlock/titanium/glass, /turf/simulated/floor/mineral/titanium/blue, @@ -214,7 +222,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/mob/living/simple_animal/hostile/pirate, +/obj/effect/spawner/random/pool/whiteship_mob, /turf/simulated/floor/mineral/plastitanium, /area/shuttle/abandoned) "ys" = ( @@ -243,6 +251,7 @@ /area/shuttle/abandoned) "zH" = ( /obj/machinery/light/small, +/obj/effect/spawner/random/pool/whiteship_mob, /turf/simulated/floor/plating, /area/shuttle/abandoned) "zM" = ( @@ -304,6 +313,10 @@ /obj/effect/spawner/random/dirt/often, /turf/simulated/floor/mineral/titanium, /area/shuttle/abandoned) +"KW" = ( +/obj/effect/spawner/random/pool/whiteship_mob, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/abandoned) "KX" = ( /obj/structure/bed, /obj/item/bedsheet, @@ -338,6 +351,7 @@ /obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, +/obj/effect/spawner/random/pool/whiteship_mob, /turf/simulated/floor/wood, /area/shuttle/abandoned) "Pi" = ( @@ -520,7 +534,7 @@ zM zM zO AS -vB +bE wh vB vB @@ -542,7 +556,7 @@ kO vB gd Of -Of +KW zO zO zM @@ -622,7 +636,7 @@ vB sk zO Xq -ux +fT Xq zO zM diff --git a/code/game/objects/effects/spawners/random/misc_spawners.dm b/code/game/objects/effects/spawners/random/misc_spawners.dm index ba6607cf132..95ccbca86df 100644 --- a/code/game/objects/effects/spawners/random/misc_spawners.dm +++ b/code/game/objects/effects/spawners/random/misc_spawners.dm @@ -115,3 +115,10 @@ /obj/item/flashlight/flare/glowstick/yellow, /obj/item/flashlight/flare/glowstick/pink, ) + +/obj/effect/spawner/random/space_pirate + name = "random space pirate spawner" + loot = list( + /mob/living/simple_animal/hostile/pirate, + /mob/living/simple_animal/hostile/pirate/ranged, + ) diff --git a/code/game/objects/effects/spawners/random/pool/misc_pools.dm b/code/game/objects/effects/spawners/random/pool/misc_pools.dm new file mode 100644 index 00000000000..509616aa64f --- /dev/null +++ b/code/game/objects/effects/spawners/random/pool/misc_pools.dm @@ -0,0 +1,15 @@ +/datum/spawn_pool/whiteship_mobs + id = "whiteship_mobs_spawn_pool" + available_points = 0 + +/obj/effect/spawner/random/pool/whiteship_mob + icon = 'icons/effects/random_spawners.dmi' + icon_state = "giftbox" + spawn_pool_id = "whiteship_mobs_spawn_pool" + unique_picks = TRUE + guaranteed = TRUE + point_value = 0 + loot = list( + /mob/living/simple_animal/hostile/pirate, + /obj/effect/spawner/random/space_pirate, + ) diff --git a/code/game/objects/effects/spawners/random/pool/spawn_pool.dm b/code/game/objects/effects/spawners/random/pool/spawn_pool.dm index 7c1ff9434c5..0e60961a43d 100644 --- a/code/game/objects/effects/spawners/random/pool/spawn_pool.dm +++ b/code/game/objects/effects/spawners/random/pool/spawn_pool.dm @@ -26,6 +26,7 @@ available_points -= points /datum/spawn_pool/proc/process_guaranteed_spawners() + shuffle_inplace(guaranteed_spawners) while(length(guaranteed_spawners)) var/obj/effect/spawner/random/pool/spawner = guaranteed_spawners[length(guaranteed_spawners)] guaranteed_spawners.len-- diff --git a/paradise.dme b/paradise.dme index 191b90a6ceb..9b6a6c19de2 100644 --- a/paradise.dme +++ b/paradise.dme @@ -1111,6 +1111,7 @@ #include "code\game\objects\effects\spawners\random\random_spawner.dm" #include "code\game\objects\effects\spawners\random\toy_spawners.dm" #include "code\game\objects\effects\spawners\random\trash_spawners.dm" +#include "code\game\objects\effects\spawners\random\pool\misc_pools.dm" #include "code\game\objects\effects\spawners\random\pool\pool_spawner.dm" #include "code\game\objects\effects\spawners\random\pool\space_loot.dm" #include "code\game\objects\effects\spawners\random\pool\spawn_pool.dm"