diff --git a/code/__DEFINES/mob.dm b/code/__DEFINES/mob.dm index 9f9d1d15c94..2bdb3432f69 100644 --- a/code/__DEFINES/mob.dm +++ b/code/__DEFINES/mob.dm @@ -94,3 +94,7 @@ #define DEFAULT_ITEM_PUTON_DELAY 20 //time taken (in deciseconsd) to reverse-strip somebody #define IGNORE_ACCESS -1 + +#define CHEM_MOB_SPAWN_INVALID 0 +#define CHEM_MOB_SPAWN_HOSTILE 1 +#define CHEM_MOB_SPAWN_FRIENDLY 2 \ No newline at end of file diff --git a/code/game/gamemodes/blob/blobs/blob_mobs.dm b/code/game/gamemodes/blob/blobs/blob_mobs.dm index fbaadbd8ec8..a35505470fa 100644 --- a/code/game/gamemodes/blob/blobs/blob_mobs.dm +++ b/code/game/gamemodes/blob/blobs/blob_mobs.dm @@ -40,7 +40,7 @@ var/obj/effect/blob/factory/factory = null var/list/human_overlays = list() var/is_zombie = 0 - gold_core_spawnable = 1 + gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE /mob/living/simple_animal/hostile/blob/blobspore/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume) ..() @@ -161,7 +161,7 @@ maxbodytemp = 360 force_threshold = 10 environment_smash = 3 - gold_core_spawnable = 1 + gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE /mob/living/simple_animal/hostile/blob/blobbernaut/blob_act() diff --git a/code/modules/events/tear.dm b/code/modules/events/tear.dm index dcaad24f853..e409f6592d8 100644 --- a/code/modules/events/tear.dm +++ b/code/modules/events/tear.dm @@ -44,7 +44,7 @@ var/list/tear_critters = list() for(var/T in typesof(/mob/living/simple_animal)) var/mob/living/simple_animal/SA = T - if(initial(SA.gold_core_spawnable) == 1) + if(initial(SA.gold_core_spawnable) == CHEM_MOB_SPAWN_HOSTILE) tear_critters += T for(var/i in 1 to 5) diff --git a/code/modules/mob/living/simple_animal/friendly/butterfly.dm b/code/modules/mob/living/simple_animal/friendly/butterfly.dm index ce36d85ce30..60aad72ab36 100644 --- a/code/modules/mob/living/simple_animal/friendly/butterfly.dm +++ b/code/modules/mob/living/simple_animal/friendly/butterfly.dm @@ -18,7 +18,7 @@ pass_flags = PASSTABLE | PASSGRILLE | PASSMOB ventcrawler = 2 butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat = 0) - gold_core_spawnable = 2 + gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY /mob/living/simple_animal/butterfly/New() ..() diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index 29f288b7c67..c77d117bad4 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -20,7 +20,7 @@ response_help = "pets" response_disarm = "gently pushes aside" response_harm = "kicks" - gold_core_spawnable = 2 + gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY //RUNTIME IS ALIVE! SQUEEEEEEEE~ /mob/living/simple_animal/pet/cat/Runtime @@ -33,7 +33,7 @@ gender = FEMALE var/turns_since_scan = 0 var/mob/living/simple_animal/mouse/movement_target - gold_core_spawnable = 0 + gold_core_spawnable = CHEM_MOB_SPAWN_INVALID /mob/living/simple_animal/pet/cat/Runtime/handle_automated_action() ..() @@ -99,4 +99,4 @@ faction = list("syndicate") var/turns_since_scan = 0 var/mob/living/simple_animal/mouse/movement_target - gold_core_spawnable = 0 \ No newline at end of file + gold_core_spawnable = CHEM_MOB_SPAWN_INVALID \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm index 520b7af0e01..7be60d7d5d6 100644 --- a/code/modules/mob/living/simple_animal/friendly/corgi.dm +++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm @@ -26,7 +26,7 @@ var/obj/item/inventory_head var/obj/item/inventory_back var/facehugger - gold_core_spawnable = 2 + gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY /mob/living/simple_animal/pet/corgi/New() ..() @@ -398,7 +398,7 @@ response_help = "pets" response_disarm = "bops" response_harm = "kicks" - gold_core_spawnable = 0 + gold_core_spawnable = CHEM_MOB_SPAWN_INVALID /mob/living/simple_animal/pet/corgi/Ian/process_ai() ..() @@ -555,7 +555,7 @@ response_harm = "kicks" var/turns_since_scan = 0 var/puppies = 0 - gold_core_spawnable = 0 + gold_core_spawnable = CHEM_MOB_SPAWN_INVALID //Lisa already has a cute bow! /mob/living/simple_animal/pet/corgi/Lisa/Topic(href, href_list) diff --git a/code/modules/mob/living/simple_animal/friendly/crab.dm b/code/modules/mob/living/simple_animal/friendly/crab.dm index 0777771b235..70639291ab9 100644 --- a/code/modules/mob/living/simple_animal/friendly/crab.dm +++ b/code/modules/mob/living/simple_animal/friendly/crab.dm @@ -22,7 +22,7 @@ var/obj/item/inventory_mask can_hide = 1 can_collar = 1 - gold_core_spawnable = 2 + gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY /mob/living/simple_animal/crab/handle_automated_movement() //CRAB movement @@ -47,7 +47,7 @@ response_help = "pets" response_disarm = "gently pushes aside" response_harm = "stomps" - gold_core_spawnable = 0 + gold_core_spawnable = CHEM_MOB_SPAWN_INVALID //LOOK AT THIS - ..()?? /*/mob/living/simple_animal/crab/attackby(var/obj/item/O as obj, var/mob/user as mob, params) diff --git a/code/modules/mob/living/simple_animal/friendly/deer.dm b/code/modules/mob/living/simple_animal/friendly/deer.dm index c55b5fc6850..034fa07b6fb 100644 --- a/code/modules/mob/living/simple_animal/friendly/deer.dm +++ b/code/modules/mob/living/simple_animal/friendly/deer.dm @@ -15,4 +15,4 @@ response_disarm = "gently pushes aside" response_harm = "kicks" can_collar = 1 - gold_core_spawnable = 2 \ No newline at end of file + gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm index a1c5bf16dd7..863141e5e83 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -111,7 +111,7 @@ health = 50 var/milk_content = 0 can_collar = 1 - gold_core_spawnable = 2 + gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY /mob/living/simple_animal/cow/New() ..() @@ -179,7 +179,7 @@ small = 1 can_hide = 1 can_collar = 1 - gold_core_spawnable = 2 + gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY /mob/living/simple_animal/chick/New() ..() @@ -222,7 +222,7 @@ var/global/chicken_count = 0 small = 1 can_hide = 1 can_collar = 1 - gold_core_spawnable = 2 + gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY /mob/living/simple_animal/chicken/New() ..() @@ -300,7 +300,7 @@ var/global/chicken_count = 0 attacktext = "kicks" health = 50 can_collar = 1 - gold_core_spawnable = 2 + gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY /mob/living/simple_animal/turkey name = "turkey" @@ -322,7 +322,7 @@ var/global/chicken_count = 0 attacktext = "pecks" health = 50 can_collar = 1 - gold_core_spawnable = 2 + gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY /mob/living/simple_animal/goose name = "goose" @@ -344,7 +344,7 @@ var/global/chicken_count = 0 attacktext = "kicks" health = 50 can_collar = 1 - gold_core_spawnable = 2 + gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY /mob/living/simple_animal/seal name = "seal" @@ -366,7 +366,7 @@ var/global/chicken_count = 0 attacktext = "kicks" health = 50 can_collar = 1 - gold_core_spawnable = 2 + gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY /mob/living/simple_animal/walrus name = "walrus" @@ -388,4 +388,4 @@ var/global/chicken_count = 0 attacktext = "kicks" health = 50 can_collar = 1 - gold_core_spawnable = 2 + gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY diff --git a/code/modules/mob/living/simple_animal/friendly/fox.dm b/code/modules/mob/living/simple_animal/friendly/fox.dm index b7555301c18..5bf03f083a2 100644 --- a/code/modules/mob/living/simple_animal/friendly/fox.dm +++ b/code/modules/mob/living/simple_animal/friendly/fox.dm @@ -17,13 +17,13 @@ response_help = "pets" response_disarm = "gently pushes aside" response_harm = "kicks" - gold_core_spawnable = 2 + gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY //Captain fox /mob/living/simple_animal/pet/fox/Renault name = "Renault" desc = "Renault, the Captain's trustworthy fox. I wonder what it says?" - gold_core_spawnable = 0 + gold_core_spawnable = CHEM_MOB_SPAWN_INVALID //Syndi fox /mob/living/simple_animal/pet/fox/Syndifox @@ -35,4 +35,4 @@ icon_resting = "Syndifox_rest" flags = NO_BREATHE faction = list("syndicate") - gold_core_spawnable = 0 + gold_core_spawnable = CHEM_MOB_SPAWN_INVALID diff --git a/code/modules/mob/living/simple_animal/friendly/lizard.dm b/code/modules/mob/living/simple_animal/friendly/lizard.dm index e4aab2ed47e..b5c0ccedeae 100644 --- a/code/modules/mob/living/simple_animal/friendly/lizard.dm +++ b/code/modules/mob/living/simple_animal/friendly/lizard.dm @@ -22,4 +22,4 @@ can_hide = 1 butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat = 1) can_collar = 1 - gold_core_spawnable = 2 + gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index 3d090de3144..90c4c0f06ec 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -31,7 +31,7 @@ can_hide = 1 holder_type = /obj/item/weapon/holder/mouse can_collar = 1 - gold_core_spawnable = 2 + gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY /mob/living/simple_animal/mouse/handle_automated_speech() ..() @@ -145,4 +145,4 @@ response_help = "pets" response_disarm = "gently pushes aside" response_harm = "splats" - gold_core_spawnable = 0 + gold_core_spawnable = CHEM_MOB_SPAWN_INVALID diff --git a/code/modules/mob/living/simple_animal/friendly/pug.dm b/code/modules/mob/living/simple_animal/friendly/pug.dm index 4b25505561b..ec8a38509f1 100644 --- a/code/modules/mob/living/simple_animal/friendly/pug.dm +++ b/code/modules/mob/living/simple_animal/friendly/pug.dm @@ -17,7 +17,7 @@ response_disarm = "bops" response_harm = "kicks" see_in_dark = 5 - gold_core_spawnable = 2 + gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY /mob/living/simple_animal/pet/pug/process_ai() ..() diff --git a/code/modules/mob/living/simple_animal/friendly/tomato.dm b/code/modules/mob/living/simple_animal/friendly/tomato.dm index 998071443f3..ca135fe87be 100644 --- a/code/modules/mob/living/simple_animal/friendly/tomato.dm +++ b/code/modules/mob/living/simple_animal/friendly/tomato.dm @@ -15,4 +15,4 @@ harm_intent_damage = 5 pass_flags = PASSTABLE can_hide = 1 - gold_core_spawnable = 2 \ No newline at end of file + gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/hostile/alien.dm b/code/modules/mob/living/simple_animal/hostile/alien.dm index ff2f03d74cf..80571d2eef8 100644 --- a/code/modules/mob/living/simple_animal/hostile/alien.dm +++ b/code/modules/mob/living/simple_animal/hostile/alien.dm @@ -29,7 +29,7 @@ see_in_dark = 8 see_invisible = SEE_INVISIBLE_MINIMUM heat_damage_per_tick = 20 - gold_core_spawnable = 1 + gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE /mob/living/simple_animal/hostile/alien/drone @@ -128,7 +128,7 @@ move_to_delay = 4 maxHealth = 400 health = 400 - gold_core_spawnable = 0 + gold_core_spawnable = CHEM_MOB_SPAWN_INVALID /obj/item/projectile/neurotox name = "neurotoxin" @@ -153,7 +153,7 @@ icon_state = "maid" icon_living = "maid" icon_dead = "maid_dead" - gold_core_spawnable = 0 //no fun allowed + gold_core_spawnable = CHEM_MOB_SPAWN_INVALID //no fun allowed /mob/living/simple_animal/hostile/alien/maid/AttackingTarget() if(istype(target, /atom/movable)) diff --git a/code/modules/mob/living/simple_animal/hostile/bat.dm b/code/modules/mob/living/simple_animal/hostile/bat.dm index eaae85b5eb2..bbdf639c0f4 100644 --- a/code/modules/mob/living/simple_animal/hostile/bat.dm +++ b/code/modules/mob/living/simple_animal/hostile/bat.dm @@ -29,7 +29,7 @@ faction = list("scarybat") var/mob/living/owner - gold_core_spawnable = 1 + gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE /mob/living/simple_animal/hostile/scarybat/New(loc, mob/living/L as mob) ..() diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm index b9fce10e8f0..f55c4ce98d6 100644 --- a/code/modules/mob/living/simple_animal/hostile/bear.dm +++ b/code/modules/mob/living/simple_animal/hostile/bear.dm @@ -31,7 +31,7 @@ var/stance_step = 0 faction = list("russian") - gold_core_spawnable = 1 + gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE //SPACE BEARS! SQUEEEEEEEE~ OW! FUCK! IT BIT MY HAND OFF!! /mob/living/simple_animal/hostile/bear/Hudson diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm index 2c971649e64..ddd302c3e8c 100644 --- a/code/modules/mob/living/simple_animal/hostile/carp.dm +++ b/code/modules/mob/living/simple_animal/hostile/carp.dm @@ -33,7 +33,7 @@ faction = list("carp") flying = 1 - gold_core_spawnable = 1 + gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE /mob/living/simple_animal/hostile/carp/Process_Spacemove(var/movement_dir = 0) return 1 //No drifting in space for space carp! //original comments do not steal @@ -54,7 +54,7 @@ icon_state = "holocarp" icon_living = "holocarp" maxbodytemp = INFINITY - gold_core_spawnable = 0 + gold_core_spawnable = CHEM_MOB_SPAWN_INVALID /mob/living/simple_animal/hostile/carp/holocarp/death() ..() diff --git a/code/modules/mob/living/simple_animal/hostile/creature.dm b/code/modules/mob/living/simple_animal/hostile/creature.dm index 24c4eede1de..50aa20b60d0 100644 --- a/code/modules/mob/living/simple_animal/hostile/creature.dm +++ b/code/modules/mob/living/simple_animal/hostile/creature.dm @@ -13,5 +13,5 @@ attacktext = "chomps" attack_sound = 'sound/weapons/bite.ogg' faction = list("creature") - gold_core_spawnable = 1 + gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE diff --git a/code/modules/mob/living/simple_animal/hostile/faithless.dm b/code/modules/mob/living/simple_animal/hostile/faithless.dm index 1f496c8347c..a14efc6d279 100644 --- a/code/modules/mob/living/simple_animal/hostile/faithless.dm +++ b/code/modules/mob/living/simple_animal/hostile/faithless.dm @@ -25,7 +25,7 @@ speed = 4 faction = list("faithless") - gold_core_spawnable = 1 + gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE /mob/living/simple_animal/hostile/faithless/Process_Spacemove(var/movement_dir = 0) return 1 diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm index 088155c25aa..bb381f24be1 100644 --- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm @@ -49,7 +49,7 @@ move_to_delay = 6 attacktext = "bites" attack_sound = 'sound/weapons/bite.ogg' - gold_core_spawnable = 1 + gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE //nursemaids - these create webs and eggs /mob/living/simple_animal/hostile/poison/giant_spider/nurse diff --git a/code/modules/mob/living/simple_animal/hostile/headcrab.dm b/code/modules/mob/living/simple_animal/hostile/headcrab.dm index 5aa075a8cc5..b2b6d9ff716 100644 --- a/code/modules/mob/living/simple_animal/hostile/headcrab.dm +++ b/code/modules/mob/living/simple_animal/hostile/headcrab.dm @@ -21,7 +21,7 @@ ventcrawler = 2 var/datum/mind/origin var/egg_lain = 0 - gold_core_spawnable = 1 + gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE /mob/living/simple_animal/hostile/headcrab/proc/Infect(mob/living/carbon/victim) var/obj/item/organ/internal/body_egg/changeling_egg/egg = new(victim) diff --git a/code/modules/mob/living/simple_animal/hostile/hivebot.dm b/code/modules/mob/living/simple_animal/hostile/hivebot.dm index 7116d49fb55..3ccbb9abec2 100644 --- a/code/modules/mob/living/simple_animal/hostile/hivebot.dm +++ b/code/modules/mob/living/simple_animal/hostile/hivebot.dm @@ -21,7 +21,7 @@ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) minbodytemp = 0 speak_emote = list("states") - gold_core_spawnable = 1 + gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE /mob/living/simple_animal/hostile/hivebot/range name = "Hivebot" diff --git a/code/modules/mob/living/simple_animal/hostile/jungle_animals.dm b/code/modules/mob/living/simple_animal/hostile/jungle_animals.dm index 75ecdf79511..85268dee619 100644 --- a/code/modules/mob/living/simple_animal/hostile/jungle_animals.dm +++ b/code/modules/mob/living/simple_animal/hostile/jungle_animals.dm @@ -30,7 +30,7 @@ layer = 3.1 //so they can stay hidde under the /obj/structure/bush var/stalk_tick_delay = 3 - gold_core_spawnable = 1 + gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE /mob/living/simple_animal/hostile/panther/ListTargets() var/list/targets = list() @@ -88,7 +88,7 @@ layer = 3.1 //so they can stay hidde under the /obj/structure/bush var/stalk_tick_delay = 3 - gold_core_spawnable = 1 + gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE /mob/living/simple_animal/hostile/snake/ListTargets() var/list/targets = list() diff --git a/code/modules/mob/living/simple_animal/hostile/mimic.dm b/code/modules/mob/living/simple_animal/hostile/mimic.dm index ab83a592e1f..7cff96385e1 100644 --- a/code/modules/mob/living/simple_animal/hostile/mimic.dm +++ b/code/modules/mob/living/simple_animal/hostile/mimic.dm @@ -30,7 +30,7 @@ move_to_delay = 9 var/is_electronic = 0 - gold_core_spawnable = 1 + gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE /mob/living/simple_animal/hostile/mimic/FindTarget() . = ..() @@ -140,7 +140,7 @@ var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/ca var/mob/living/creator = null // the creator var/destroy_objects = 0 var/knockdown_people = 0 - gold_core_spawnable = 0 + gold_core_spawnable = CHEM_MOB_SPAWN_INVALID /mob/living/simple_animal/hostile/mimic/copy/New(loc, var/obj/copy, var/mob/living/creator, var/destroy_original = 0) ..(loc) diff --git a/code/modules/mob/living/simple_animal/hostile/poison_bees.dm b/code/modules/mob/living/simple_animal/hostile/poison_bees.dm index 6bb6efc003d..c8a6a79fb04 100644 --- a/code/modules/mob/living/simple_animal/hostile/poison_bees.dm +++ b/code/modules/mob/living/simple_animal/hostile/poison_bees.dm @@ -24,7 +24,7 @@ //Spaceborn beings don't get hurt by space atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) minbodytemp = 0 - gold_core_spawnable = 1 + gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE /mob/living/simple_animal/hostile/poison/bees/Process_Spacemove(var/check_drift = 0) return 1 diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm index 1c869805a03..3a9d9e46aa6 100644 --- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm +++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm @@ -132,7 +132,7 @@ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) minbodytemp = 0 flying = 1 - gold_core_spawnable = 1 + gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE /mob/living/simple_animal/hostile/viscerator/death() ..() diff --git a/code/modules/mob/living/simple_animal/hostile/tree.dm b/code/modules/mob/living/simple_animal/hostile/tree.dm index 361cea751ad..bd39b681978 100644 --- a/code/modules/mob/living/simple_animal/hostile/tree.dm +++ b/code/modules/mob/living/simple_animal/hostile/tree.dm @@ -28,7 +28,7 @@ minbodytemp = 0 faction = list("hostile", "winter") - gold_core_spawnable = 1 + gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE /mob/living/simple_animal/hostile/tree/FindTarget() . = ..() diff --git a/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm b/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm index ae176992a9e..274ba14f156 100644 --- a/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm +++ b/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm @@ -33,7 +33,7 @@ bodytemperature = 73.0 //it's made of snow and hatred, so it's pretty cold. maxbodytemp = 280.15 //at roughly 7 C, these will start melting (dying) from the warmth. Mind over matter or something. heat_damage_per_tick = 10 //Now With Rapid Thawing Action! - gold_core_spawnable = 1 + gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE /mob/living/simple_animal/hostile/winter/snowman/death() @@ -64,7 +64,7 @@ melee_damage_lower = 5 melee_damage_upper = 10 - gold_core_spawnable = 1 + gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE /mob/living/simple_animal/hostile/winter/santa maxHealth = 150 //if this seems low for a "boss", it's because you have to fight him multiple times, with him fully healing between stages diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index 33372a9904f..3096a85e39b 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -82,7 +82,7 @@ //Parrots are kleptomaniacs. This variable ... stores the item a parrot is holding. var/obj/item/held_item = null - gold_core_spawnable = 2 + gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY /mob/living/simple_animal/parrot/New() @@ -683,7 +683,7 @@ name = "Poly" desc = "Poly the Parrot. An expert on quantum cracker theory." speak = list("Poly wanna cracker!", ":eCheck the singlo, you chucklefucks!",":eCheck the tesla, you shits!",":eSTOP HOT-WIRING THE ENGINE, FUCKING CHRIST!",":eWire the solars, you lazy bums!",":eWHO TOOK THE DAMN HARDSUITS?",":eOH GOD ITS FREE CALL THE SHUTTLE") - gold_core_spawnable = 0 + gold_core_spawnable = CHEM_MOB_SPAWN_INVALID /mob/living/simple_animal/parrot/Poly/New() ears = new /obj/item/device/radio/headset/headset_eng(src) diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index bd8d6b8e740..f862b889710 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -67,7 +67,7 @@ var/scan_ready = 1 var/simplespecies //Sorry, no spider+corgi buttbabies. - var/gold_core_spawnable = 0 //if 1 can be spawned by plasma with gold core, 2 are 'friendlies' spawned with blood + var/gold_core_spawnable = CHEM_MOB_SPAWN_INVALID //if CHEM_MOB_SPAWN_HOSTILE can be spawned by plasma with gold core, CHEM_MOB_SPAWN_FRIENDLY are 'friendlies' spawned with blood var/master_commander = null //holding var for determining who own/controls a sentient simple animal (for sentience potions). var/sentience_type = SENTIENCE_ORGANIC // Sentience type, for slime potions diff --git a/code/modules/research/xenoarchaeology/genetics/prehistoric_animals.dm b/code/modules/research/xenoarchaeology/genetics/prehistoric_animals.dm index 50446de112d..654b1a9ccde 100644 --- a/code/modules/research/xenoarchaeology/genetics/prehistoric_animals.dm +++ b/code/modules/research/xenoarchaeology/genetics/prehistoric_animals.dm @@ -17,7 +17,7 @@ speak = list("Hruuugh!","Hrunnph") emote_see = list("paws the ground","shakes its mane","stomps") emote_hear = list("snuffles") - gold_core_spawnable = 1 + gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE /mob/living/simple_animal/hostile/diyaab name = "diyaab" @@ -38,7 +38,7 @@ speak = list("Awrr?","Aowrl!","Worrl") emote_see = list("sniffs the air cautiously","looks around") emote_hear = list("snuffles") - gold_core_spawnable = 1 + gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE /mob/living/simple_animal/hostile/shantak name = "shantak" @@ -58,7 +58,7 @@ speak_chance = 5 speak = list("Shuhn","Shrunnph?","Shunpf") emote_see = list("scratches the ground","shakes out it's mane","tinkles gently") - gold_core_spawnable = 1 + gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE /mob/living/simple_animal/yithian name = "yithian" @@ -66,7 +66,7 @@ icon_state = "yithian" icon_living = "yithian" icon_dead = "yithian_dead" - gold_core_spawnable = 2 + gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY /mob/living/simple_animal/tindalos name = "tindalos" @@ -74,4 +74,4 @@ icon_state = "tindalos" icon_living = "tindalos" icon_dead = "tindalos_dead" - gold_core_spawnable = 2 + gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY