From 9e2a23b19893edee5cbd3d298ee1c394a4d3df7c Mon Sep 17 00:00:00 2001 From: Hookie Date: Mon, 23 Dec 2024 14:14:47 -0600 Subject: [PATCH 1/3] Add Neglected Mobs to Gold Slime Spawns (#4699) * Adds items to various import tabs * Update vitezstvi_ammo.dm no longer require broadbanding for ammo carriers * Add left behind mobs to gold slime reactions Adds mobs to the friendly and hostile gold slime reactions that were either strange omissions (like the pet spawner being unable to create a docile fox or a doberman) or mobs that are otherwise rarely seen. * Revert "Add left behind mobs to gold slime reactions" This reverts commit 44f72284d5ec473b430618d8588710eb2ad64a0a. * Reapply "Add left behind mobs to gold slime reactions" This reverts commit 9fe1b3e010f6792d5bf12d57bed7dc39327f927e. * Revert "Reapply "Add left behind mobs to gold slime reactions"" This reverts commit 4f98114a47b59bb70c77af6a3f3f767b891814e7. * uhhh fix it * fix it (fr) * fix .dme order you should really put this in the guide to modularization yknow * Update modular_nova/modules/more_gold_slime_monsters/code/more_gold_slime_monsters.dm Co-authored-by: FlufflesTheDog * Update modular_nova/modules/more_gold_slime_monsters/code/more_gold_slime_monsters.dm Co-authored-by: FlufflesTheDog * Update more_gold_slime_monsters.dm --------- Co-authored-by: FlufflesTheDog --- .../unit_tests/simple_animal_freeze.dm | 4 +++ .../modules/mob/living/pets/dog/doberman.dm | 1 + modular_nova/modules/mold/code/mold_mobs.dm | 2 ++ .../code/more_gold_slime_monsters.dm | 33 +++++++++++++++++++ tgstation.dme | 1 + 5 files changed, 41 insertions(+) create mode 100644 modular_nova/modules/more_gold_slime_monsters/code/more_gold_slime_monsters.dm diff --git a/code/modules/unit_tests/simple_animal_freeze.dm b/code/modules/unit_tests/simple_animal_freeze.dm index 8d761468eea..d4750181a4b 100644 --- a/code/modules/unit_tests/simple_animal_freeze.dm +++ b/code/modules/unit_tests/simple_animal_freeze.dm @@ -125,6 +125,7 @@ /mob/living/simple_animal/hostile/vox/ranged/space/laser, /mob/living/simple_animal/hostile/zombie/cheesezombie, /mob/living/simple_animal/hostile/zombie/nocorpse, +<<<<<<< HEAD /mob/living/simple_animal/hostile/fleshmind/slicer, /mob/living/simple_animal/hostile/fleshmind/floater, /mob/living/simple_animal/hostile/fleshmind/globber, @@ -136,6 +137,9 @@ /mob/living/simple_animal/hostile/fleshmind/mechiver, /mob/living/simple_animal/hostile/fleshmind/mauler_monkey, /mob/living/simple_animal/hostile/fleshmind, +======= + /mob/living/simple_animal/hostile/ooze/grapes/xenobio, // update when grapes are updated, must be here to stop errors +>>>>>>> 0edd8dc6343 (Add Neglected Mobs to Gold Slime Spawns (#4699)) // DO NOT ADD NEW ENTRIES TO THIS LIST // READ THE COMMENT ABOVE diff --git a/modular_nova/master_files/code/modules/mob/living/pets/dog/doberman.dm b/modular_nova/master_files/code/modules/mob/living/pets/dog/doberman.dm index a315a946368..ac0fbadee03 100644 --- a/modular_nova/master_files/code/modules/mob/living/pets/dog/doberman.dm +++ b/modular_nova/master_files/code/modules/mob/living/pets/dog/doberman.dm @@ -6,3 +6,4 @@ icon_dead = "dobbydead" icon_living = "dobber" gender = MALE + gold_core_spawnable = FRIENDLY_SPAWN diff --git a/modular_nova/modules/mold/code/mold_mobs.dm b/modular_nova/modules/mold/code/mold_mobs.dm index 3fe1091dc09..86d5ced8a73 100644 --- a/modular_nova/modules/mold/code/mold_mobs.dm +++ b/modular_nova/modules/mold/code/mold_mobs.dm @@ -190,6 +190,7 @@ attack_verb_simple = "sting" attack_sound = 'sound/effects/blob/attackblob.ogg' basic_mob_flags = DEL_ON_DEATH + gold_core_spawnable = HOSTILE_SPAWN ai_controller = /datum/ai_controller/basic_controller/electric_mosquito @@ -256,6 +257,7 @@ light_range = 2 light_power = 1 light_color = LIGHT_COLOR_GREEN + gold_core_spawnable = HOSTILE_SPAWN ai_controller = /datum/ai_controller/basic_controller/centaur diff --git a/modular_nova/modules/more_gold_slime_monsters/code/more_gold_slime_monsters.dm b/modular_nova/modules/more_gold_slime_monsters/code/more_gold_slime_monsters.dm new file mode 100644 index 00000000000..2a92e44e13a --- /dev/null +++ b/modular_nova/modules/more_gold_slime_monsters/code/more_gold_slime_monsters.dm @@ -0,0 +1,33 @@ +// this folder is entirely just adding tags to let things spawn, or not spawn, in gold slimes. enjoy + +/mob/living/basic/pet/gondola + gold_core_spawnable = HOSTILE_SPAWN // make them less consistent + +/mob/living/basic/deer + gold_core_spawnable = FRIENDLY_SPAWN + +/mob/living/basic/pet/dog/corgi/exoticcorgi + gold_core_spawnable = FRIENDLY_SPAWN + +/mob/living/basic/pet/fox/docile + gold_core_spawnable = FRIENDLY_SPAWN + +/mob/living/basic/mad_piano + gold_core_spawnable = HOSTILE_SPAWN + +/mob/living/basic/flesh_spider + gold_core_spawnable = HOSTILE_SPAWN // Not like rat kings - does not ping ghosts for control if spawned directly, so this is fine. + +/mob/living/basic/spaceman + gold_core_spawnable = HOSTILE_SPAWN + +/mob/living/basic/bat + gold_core_spawnable = HOSTILE_SPAWN + +/mob/living/simple_animal/hostile/ooze/gelatinous + gold_core_spawnable = HOSTILE_SPAWN + +/mob/living/simple_animal/hostile/ooze/grapes/xenobio + ghost_controllable = FALSE // i lied, we also define this one mob to not be ghost controllable. + gold_core_spawnable = HOSTILE_SPAWN + diff --git a/tgstation.dme b/tgstation.dme index 14f3ecd3edc..66f3227c488 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -8309,6 +8309,7 @@ #include "modular_nova\modules\mold\code\mold_mobs.dm" #include "modular_nova\modules\mold\code\mold_structures.dm" #include "modular_nova\modules\more_briefcases\code\briefcases.dm" +#include "modular_nova\modules\more_gold_slime_monsters\code\more_gold_slime_monsters.dm" #include "modular_nova\modules\morefermentplants\code\ambrosia.dm" #include "modular_nova\modules\morefermentplants\code\banana.dm" #include "modular_nova\modules\morefermentplants\code\beans.dm" From dc7197dfe3b877a5589338d43c75c981fb3aaa34 Mon Sep 17 00:00:00 2001 From: StealsThePRs Date: Mon, 23 Dec 2024 23:15:26 +0300 Subject: [PATCH 2/3] [MIRROR] Add Neglected Mobs to Gold Slime Spawns From edcf7441cf49c8e52b1b36bb8a0de9339ea2962d Mon Sep 17 00:00:00 2001 From: Feenie <62373791+FeenieRU@users.noreply.github.com> Date: Tue, 24 Dec 2024 19:42:10 +0300 Subject: [PATCH 3/3] Fix conflict --- code/modules/unit_tests/simple_animal_freeze.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/modules/unit_tests/simple_animal_freeze.dm b/code/modules/unit_tests/simple_animal_freeze.dm index d4750181a4b..97b98a6f03d 100644 --- a/code/modules/unit_tests/simple_animal_freeze.dm +++ b/code/modules/unit_tests/simple_animal_freeze.dm @@ -125,7 +125,6 @@ /mob/living/simple_animal/hostile/vox/ranged/space/laser, /mob/living/simple_animal/hostile/zombie/cheesezombie, /mob/living/simple_animal/hostile/zombie/nocorpse, -<<<<<<< HEAD /mob/living/simple_animal/hostile/fleshmind/slicer, /mob/living/simple_animal/hostile/fleshmind/floater, /mob/living/simple_animal/hostile/fleshmind/globber, @@ -137,9 +136,7 @@ /mob/living/simple_animal/hostile/fleshmind/mechiver, /mob/living/simple_animal/hostile/fleshmind/mauler_monkey, /mob/living/simple_animal/hostile/fleshmind, -======= /mob/living/simple_animal/hostile/ooze/grapes/xenobio, // update when grapes are updated, must be here to stop errors ->>>>>>> 0edd8dc6343 (Add Neglected Mobs to Gold Slime Spawns (#4699)) // DO NOT ADD NEW ENTRIES TO THIS LIST // READ THE COMMENT ABOVE