Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Add Neglected Mobs to Gold Slime Spawns #5261

Merged
merged 3 commits into from
Dec 24, 2024
+38 −0
Merged

[MIRROR] Add Neglected Mobs to Gold Slime Spawns #5261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e2a23b
Add Neglected Mobs to Gold Slime Spawns (#4699)
LordHookie Dec 23, 2024
dc7197d
[MIRROR] Add Neglected Mobs to Gold Slime Spawns
Dec 23, 2024
edcf744
Fix conflict
FeenieRU Dec 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions code/modules/unit_tests/simple_animal_freeze.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +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

// DO NOT ADD NEW ENTRIES TO THIS LIST
// READ THE COMMENT ABOVE
Expand Down
1 change: 1 addition & 0 deletions modular_nova/master_files/code/modules/mob/living/pets/dog/doberman.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@
icon_dead = "dobbydead"
icon_living = "dobber"
gender = MALE
gold_core_spawnable = FRIENDLY_SPAWN
2 changes: 2 additions & 0 deletions modular_nova/modules/mold/code/mold_mobs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
33 changes: 33 additions & 0 deletions modular_nova/modules/more_gold_slime_monsters/code/more_gold_slime_monsters.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

1 change: 1 addition & 0 deletions tgstation.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading