From cc32d60595a06aa526606e5321c2b0bf327d7214 Mon Sep 17 00:00:00 2001 From: UniquaSa <111698205+UniquaSa@users.noreply.github.com> Date: Sun, 20 Jul 2025 22:27:44 +0200 Subject: [PATCH] Maintenance Pred Additions (#11214) --- code/_helpers/global_lists_ch.dm | 89 +++++++++++++++++++ .../objects/structures/ghost_pods/event_vr.dm | 9 +- .../maps/southern_cross/southern_cross-1.dmm | 26 +++++- vorestation.dme | 3 +- 4 files changed, 119 insertions(+), 8 deletions(-) create mode 100644 code/_helpers/global_lists_ch.dm diff --git a/code/_helpers/global_lists_ch.dm b/code/_helpers/global_lists_ch.dm new file mode 100644 index 0000000000..6e5efad44b --- /dev/null +++ b/code/_helpers/global_lists_ch.dm @@ -0,0 +1,89 @@ +GLOBAL_LIST_INIT(maint_mob_pred_options, list( + "Rabbit" = /mob/living/simple_mob/vore/rabbit, + "Red Panda" = /mob/living/simple_mob/vore/redpanda, + "Fennec" = /mob/living/simple_mob/vore/fennec, + "Fennix" = /mob/living/simple_mob/vore/fennix, + "Fox" = /mob/living/simple_mob/animal/passive/fox, + "Syndi-Fox" = /mob/living/simple_mob/animal/passive/fox/syndicate, + "Raccoon" = /mob/living/simple_mob/animal/passive/raccoon_ch, + "Cat" = /mob/living/simple_mob/animal/passive/cat, + "Space Bumblebee" = /mob/living/simple_mob/vore/bee, + "Space Bear" = /mob/living/simple_mob/animal/space/bear, + "Voracious Lizard" = /mob/living/simple_mob/vore/aggressive/dino, + "Lizardman" = /mob/living/simple_mob/vore/aggressive/lizardman, + "Giant Frog" = /mob/living/simple_mob/vore/aggressive/frog, + "Giant Rat" = /mob/living/simple_mob/vore/aggressive/rat, + "Giant Lab Rat" = /mob/living/simple_mob/vore/aggressive/rat/labrat, + "Jelly Blob" = /mob/living/simple_mob/vore/jelly, + "Wolf" = /mob/living/simple_mob/vore/wolf, + "Dire Wolf" = /mob/living/simple_mob/vore/wolf/direwolf, + "Large Dog" = /mob/living/simple_mob/vore/wolf/direwolf/dog, + "Hyena" = /mob/living/simple_mob/animal/hyena, + "Juvenile Solargrub" = /mob/living/simple_mob/vore/solargrub, + "Sect Queen" = /mob/living/simple_mob/vore/sect_queen, + "Sect Drone" = /mob/living/simple_mob/vore/sect_drone, + "Defanged Xenomorph" = /mob/living/simple_mob/vore/xeno_defanged, + "Xenomorph Hunter" = /mob/living/simple_mob/xeno_ch/hunter, + "Xenomorph Sentinel" = /mob/living/simple_mob/xeno_ch/sentinel, + "Xenomorph Queen" = /mob/living/simple_mob/xeno_ch/queen, + "Xenomorph Maid Queen" = /mob/living/simple_mob/xeno_ch/queen/maid, //We have to. + "Panther" = /mob/living/simple_mob/vore/aggressive/panther, + "Giant Snake" = /mob/living/simple_mob/vore/aggressive/giant_snake, + "Deathclaw" = /mob/living/simple_mob/vore/aggressive/deathclaw, + "Otie" = /mob/living/simple_mob/vore/otie, + "Chubby Otie" = /mob/living/simple_mob/vore/otie/friendly/chubby, + "Mutated Otie" = /mob/living/simple_mob/vore/otie/feral, + "Chubby Mutated Otie" = /mob/living/simple_mob/vore/otie/feral/chubby, + "Red Otie" = /mob/living/simple_mob/vore/otie/red, + "Chubby Red Otie" = /mob/living/simple_mob/vore/otie/red/chubby, + "Zorgoia" = /mob/living/simple_mob/vore/zorgoia, + "Corrupt Hound" = /mob/living/simple_mob/vore/aggressive/corrupthound, + "Corrupt Corrupt Hound" = /mob/living/simple_mob/vore/aggressive/corrupthound/prettyboi, + "Corrupt JaniHound" = /mob/living/simple_mob/vore/retaliate/corrupthound/janihound, + "Corrupt Old JaniHound" = /mob/living/simple_mob/vore/retaliate/corrupthound/janihound/old, + "Corrupt MediHound" = /mob/living/simple_mob/vore/retaliate/corrupthound/janihound/medihound, + "Hunter Giant Spider" = /mob/living/simple_mob/animal/giant_spider/hunter, + "Lurker Giant Spider" = /mob/living/simple_mob/animal/giant_spider/lurker, + "Pepper Giant Spider" = /mob/living/simple_mob/animal/giant_spider/pepper, + "Thermic Giant Spider" = /mob/living/simple_mob/animal/giant_spider/thermic, + "Webslinger Giant Spider" = /mob/living/simple_mob/animal/giant_spider/webslinger, + "Frost Giant Spider" = /mob/living/simple_mob/animal/giant_spider/frost, + "Nurse Giant Spider" = /mob/living/simple_mob/animal/giant_spider/nurse/eggless, + "Giant Spider Queen" = /mob/living/simple_mob/animal/giant_spider/nurse/queen/eggless, + "Red Dragon" = /mob/living/simple_mob/vore/aggressive/dragon, + "Phoron Dragon" = /mob/living/simple_mob/vore/aggressive/dragon/virgo3b, + "Space Dragon" = /mob/living/simple_mob/vore/aggressive/dragon/space, + "Crypt Drake" = /mob/living/simple_mob/vore/cryptdrake, + "Gryphon" = /mob/living/simple_mob/vore/gryphon, + "Weretiger" = /mob/living/simple_mob/vore/weretiger, + "Lesser Large Dragon" = /mob/living/simple_mob/vore/bigdragon/friendly/maintpred, + "Catslug" = /mob/living/simple_mob/vore/alienanimals/catslug, + "Squirrel" = /mob/living/simple_mob/vore/squirrel/big, + "Pakkun" =/mob/living/simple_mob/vore/pakkun, + "Snapdragon" =/mob/living/simple_mob/vore/pakkun/snapdragon, + "Sand pakkun" = /mob/living/simple_mob/vore/pakkun/sand, + "Fire pakkun" = /mob/living/simple_mob/vore/pakkun/fire, + "Amethyst pakkun" = /mob/living/simple_mob/vore/pakkun/purple, + "Raptor" = /mob/living/simple_mob/vore/raptor, + "Giant Bat" = /mob/living/simple_mob/vore/bat, + "Scel (Orange)" = /mob/living/simple_mob/vore/scel/orange, + "Scel (Blue)" = /mob/living/simple_mob/vore/scel/blue, + "Scel (Purple)" = /mob/living/simple_mob/vore/scel/purple, + "Scel (Red)" = /mob/living/simple_mob/vore/scel/red, + "Scel (Green)" = /mob/living/simple_mob/vore/scel/green, + "Cave Stalker" = /mob/living/simple_mob/vore/stalker, + "Kelpie" = /mob/living/simple_mob/vore/horse/kelpie, + "Scrubble" = /mob/living/simple_mob/vore/scrubble, + "Sonadile" = /mob/living/simple_mob/vore/sonadile, + "kururak" = /mob/living/simple_mob/animal/sif/kururak, + "Statue of Temptation" = /mob/living/simple_mob/vore/devil, + "Meowl" = /mob/living/simple_mob/vore/meowl, + "Synx" = /mob/living/simple_mob/animal/synx, + "Reindeer" = /mob/living/simple_mob/vore/reindeer, + "Lion/Lioness" = /mob/living/simple_mob/vore/retaliate/lion, + "Abyss Leaper" = /mob/living/simple_mob/vore/vore_hostile/leaper, + "Abyss Lurker" = /mob/living/simple_mob/vore/vore_hostile/abyss_lurker, + "Swoopie XL" = /mob/living/simple_mob/vore/aggressive/corrupthound/swoopie, + "Teppie" = /datum/category_item/catalogue/fauna/teppi, + "Frostlit Lamp" = /mob/living/simple_mob/animal/passive/gaslamp/snow + )) diff --git a/code/game/objects/structures/ghost_pods/event_vr.dm b/code/game/objects/structures/ghost_pods/event_vr.dm index e283e18263..e35c0cb185 100644 --- a/code/game/objects/structures/ghost_pods/event_vr.dm +++ b/code/game/objects/structures/ghost_pods/event_vr.dm @@ -15,6 +15,7 @@ invisibility = INVISIBILITY_OBSERVER spawn_active = TRUE var/announce_prob = 35 + /* // CHOMPRemove Start. var/list/possible_mobs = list("Rabbit" = /mob/living/simple_mob/vore/rabbit, "Red Panda" = /mob/living/simple_mob/vore/redpanda, "Fennec" = /mob/living/simple_mob/vore/fennec, @@ -88,6 +89,8 @@ "Statue of Temptation" = /mob/living/simple_mob/vore/devil ) + */ //CHOMPRemove End + /obj/structure/ghost_pod/ghost_activated/maintpred/create_occupant(var/mob/M) ..() var/choice @@ -99,11 +102,11 @@ return //No OOC notes - if (not_has_ooc_text(M)) + if(not_has_ooc_text(M)) return while(finalized != "Yes" && M.client) - choice = tgui_input_list(M, "What type of predator do you want to play as?", "Maintpred Choice", possible_mobs) + choice = tgui_input_list(M, "What type of predator do you want to play as?", "Maintpred Choice", GLOB.maint_mob_pred_options) //CHOMPStation Edit if(!choice) //We probably pushed the cancel button on the mob selection. Let's just put the ghost pod back in the list. to_chat(M, span_notice("No mob selected, cancelling.")) reset_ghostpod() @@ -116,7 +119,7 @@ reset_ghostpod() return - var/mobtype = possible_mobs[choice] + var/mobtype = GLOB.maint_mob_pred_options[choice] //CHOMPStation Edit var/mob/living/simple_mob/newPred = new mobtype(get_turf(src)) qdel(newPred.ai_holder) newPred.ai_holder = null diff --git a/modular_chomp/maps/southern_cross/southern_cross-1.dmm b/modular_chomp/maps/southern_cross/southern_cross-1.dmm index 42479e354e..700b73f993 100644 --- a/modular_chomp/maps/southern_cross/southern_cross-1.dmm +++ b/modular_chomp/maps/southern_cross/southern_cross-1.dmm @@ -223,6 +223,10 @@ }, /turf/simulated/floor/plating/turfpack/station, /area/maintenance/zeroport) +"aE" = ( +/obj/structure/ghost_pod/ghost_activated/maintpred/no_announce, +/turf/simulated/floor/plating/turfpack/station, +/area/maintenance/abcargo) "aF" = ( /obj/effect/floor_decal/techfloor/corner{ dir = 5 @@ -234,12 +238,21 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, /area/maintenance/engineering/gravgen) +"aG" = ( +/obj/effect/decal/cleanable/flour, +/obj/structure/ghost_pod/ghost_activated/maintpred/no_announce, +/turf/simulated/floor/plating/turfpack/station, +/area/maintenance/abchemistry) "aH" = ( /obj/structure/bed/chair/sofa/right/beige{ dir = 4 }, /turf/simulated/floor/wood/alt/parquet/turfpack/station, /area/maintenance/lookout) +"aI" = ( +/obj/structure/ghost_pod/ghost_activated/maintpred/no_announce, +/turf/simulated/floor/wood/turfpack/station, +/area/maintenance/zerobar) "aJ" = ( /obj/machinery/light{ dir = 8; @@ -247,6 +260,10 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/gravgen) +"aK" = ( +/obj/structure/ghost_pod/ghost_activated/maintpred/no_announce, +/turf/simulated/floor/tiled/white, +/area/maintenance/abscience) "aM" = ( /obj/effect/floor_decal/rust, /obj/structure/catwalk, @@ -4400,6 +4417,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/ghost_pod/ghost_activated/maintpred/no_announce, /turf/simulated/floor/tiled/white, /area/maintenance/abfirstaid) "rZ" = ( @@ -35753,7 +35771,7 @@ oY EP ly In -Vb +aI UP wq tm @@ -36549,7 +36567,7 @@ gv ls gK qn -zu +aE Re qh xl @@ -39125,7 +39143,7 @@ PJ XP qi xf -xz +aG xf Sd sr @@ -42710,7 +42728,7 @@ WY LU br Nz -hA +aK hA GF Hy diff --git a/vorestation.dme b/vorestation.dme index 87e36a4486..fecf269de1 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -250,6 +250,7 @@ #include "code\_helpers\game.dm" #include "code\_helpers\generators.dm" #include "code\_helpers\global_lists.dm" +#include "code\_helpers\global_lists_ch.dm" #include "code\_helpers\global_lists_vr.dm" #include "code\_helpers\icons.dm" #include "code\_helpers\icons_procs.dm" @@ -626,9 +627,9 @@ #include "code\datums\components\traits\burninlight.dm" #include "code\datums\components\traits\drippy.dm" #include "code\datums\components\traits\gargoyle.dm" -#include "code\datums\components\traits\waddle.dm" #include "code\datums\components\traits\nutrition_size_change.dm" #include "code\datums\components\traits\photosynth.dm" +#include "code\datums\components\traits\waddle.dm" #include "code\datums\components\traits\weaver.dm" #include "code\datums\diseases\_disease.dm" #include "code\datums\diseases\_MobProcs.dm"