From 4a22fed89df01cb8c762e1ac33a1b78d3cb68fe8 Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Sun, 26 Nov 2017 17:51:54 -0500 Subject: [PATCH 01/11] Cleans up goldcore defines --- code/__DEFINES/misc.dm | 9 ++++++++ code/__HELPERS/icons.dm | 2 +- code/game/gamemodes/blob/blobs/blob_mobs.dm | 4 ++-- .../simple_animal/friendly/butterfly.dm | 2 +- .../mob/living/simple_animal/friendly/cat.dm | 8 +++++-- .../simple_animal/friendly/cockroach.dm | 2 +- .../mob/living/simple_animal/friendly/crab.dm | 10 ++++++--- .../mob/living/simple_animal/friendly/dog.dm | 10 ++++----- .../simple_animal/friendly/farm_animals.dm | 8 +++++-- .../mob/living/simple_animal/friendly/fox.dm | 6 +++++- .../living/simple_animal/friendly/lizard.dm | 4 ++++ .../living/simple_animal/friendly/mouse.dm | 4 ++-- .../living/simple_animal/friendly/penguin.dm | 2 +- .../living/simple_animal/friendly/sloth.dm | 6 +++--- .../mob/living/simple_animal/hostile/alien.dm | 6 +++--- .../mob/living/simple_animal/hostile/bear.dm | 4 ++++ .../mob/living/simple_animal/hostile/bees.dm | 2 +- .../mob/living/simple_animal/hostile/carp.dm | 6 +++--- .../living/simple_animal/hostile/creature.dm | 21 +++++++++++++++++++ .../living/simple_animal/hostile/faithless.dm | 2 +- .../simple_animal/hostile/giant_spider.dm | 14 ++++++------- .../living/simple_animal/hostile/headcrab.dm | 4 ++++ .../living/simple_animal/hostile/hivebot.dm | 2 +- .../simple_animal/hostile/killertomato.dm | 2 +- .../hostile/megafauna/colossus.dm | 2 +- .../mob/living/simple_animal/hostile/mimic.dm | 4 ++-- .../hostile/mining_mobs/basilisk.dm | 2 +- .../hostile/mining_mobs/gutlunch.dm | 2 +- .../simple_animal/hostile/retaliate/frog.dm | 2 +- .../simple_animal/hostile/retaliate/ghost.dm | 2 +- .../living/simple_animal/hostile/skeleton.dm | 6 +++--- .../living/simple_animal/hostile/syndicate.dm | 2 +- .../mob/living/simple_animal/hostile/tree.dm | 2 +- .../simple_animal/hostile/wumborian_fugu.dm | 2 +- .../mob/living/simple_animal/parrot.dm | 8 +++++-- .../mob/living/simple_animal/simple_animal.dm | 2 +- code/modules/reagents/chemistry/recipes.dm | 4 ++-- code/modules/shuttle/special.dm | 2 +- 38 files changed, 122 insertions(+), 60 deletions(-) diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index d83557aaec..1782c7aa62 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -478,3 +478,12 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE #define SYRINGE_DRAW 0 #define SYRINGE_INJECT 1 +<<<<<<< HEAD +======= +#define RESEARCH_MATERIAL_RECLAMATION_ID "0" + +//gold slime core spawning +#define NO_SPAWN 0 +#define HOSTILE_SPAWN 1 +#define FRIENDLY_SPAWN 2 +>>>>>>> 2abae67... Cleans up goldcore defines (#33090) diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm index 99c540ec34..d26e3a4477 100644 --- a/code/__HELPERS/icons.dm +++ b/code/__HELPERS/icons.dm @@ -949,7 +949,7 @@ GLOBAL_LIST_EMPTY(friendly_animal_types) if(!GLOB.friendly_animal_types.len) for(var/T in typesof(/mob/living/simple_animal)) var/mob/living/simple_animal/SA = T - if(initial(SA.gold_core_spawnable) == 2) + if(initial(SA.gold_core_spawnable) == FRIENDLY_SPAWN) GLOB.friendly_animal_types += SA diff --git a/code/game/gamemodes/blob/blobs/blob_mobs.dm b/code/game/gamemodes/blob/blobs/blob_mobs.dm index d27c3aa820..5572bbd9d8 100644 --- a/code/game/gamemodes/blob/blobs/blob_mobs.dm +++ b/code/game/gamemodes/blob/blobs/blob_mobs.dm @@ -100,7 +100,7 @@ var/death_cloud_size = 1 //size of cloud produced from a dying spore var/mob/living/carbon/human/oldguy var/is_zombie = 0 - gold_core_spawnable = 1 + gold_core_spawnable = HOSTILE_SPAWN /mob/living/simple_animal/hostile/blob/blobspore/Initialize(mapload, var/obj/structure/blob/factory/linked_node) if(istype(linked_node)) @@ -299,4 +299,4 @@ /mob/living/simple_animal/hostile/blob/blobbernaut/independent independent = TRUE - gold_core_spawnable = 1 + gold_core_spawnable = HOSTILE_SPAWN diff --git a/code/modules/mob/living/simple_animal/friendly/butterfly.dm b/code/modules/mob/living/simple_animal/friendly/butterfly.dm index 9c16c2a924..6a00ca0006 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 = VENTCRAWLER_ALWAYS mob_size = MOB_SIZE_TINY - gold_core_spawnable = 2 + gold_core_spawnable = FRIENDLY_SPAWN verb_say = "flutters" verb_ask = "flutters inquisitively" verb_exclaim = "flutters intensely" diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index fd03dc2359..f9ddd94f0a 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -28,9 +28,13 @@ response_harm = "kicks" var/turns_since_scan = 0 var/mob/living/simple_animal/mouse/movement_target +<<<<<<< HEAD gold_core_spawnable = 2 devourable = TRUE no_vore = FALSE +======= + gold_core_spawnable = FRIENDLY_SPAWN +>>>>>>> 2abae67... Cleans up goldcore defines (#33090) /mob/living/simple_animal/pet/cat/Initialize() . = ..() @@ -81,7 +85,7 @@ icon_living = "cat" icon_dead = "cat_dead" gender = FEMALE - gold_core_spawnable = 0 + gold_core_spawnable = NO_SPAWN var/list/family = list()//var restored from savefile, has count of each child type var/list/children = list()//Actual mob instances of children var/cats_deployed = 0 @@ -154,7 +158,7 @@ /mob/living/simple_animal/pet/cat/Proc name = "Proc" gender = MALE - gold_core_spawnable = 0 + gold_core_spawnable = NO_SPAWN /mob/living/simple_animal/pet/cat/Life() if(!stat && !buckled && !client) diff --git a/code/modules/mob/living/simple_animal/friendly/cockroach.dm b/code/modules/mob/living/simple_animal/friendly/cockroach.dm index 77c29cd3cf..a6e24f43dd 100644 --- a/code/modules/mob/living/simple_animal/friendly/cockroach.dm +++ b/code/modules/mob/living/simple_animal/friendly/cockroach.dm @@ -18,7 +18,7 @@ speak_emote = list("chitters") density = FALSE ventcrawler = VENTCRAWLER_ALWAYS - gold_core_spawnable = 2 + gold_core_spawnable = FRIENDLY_SPAWN verb_say = "chitters" verb_ask = "chitters inquisitively" verb_exclaim = "chitters loudly" diff --git a/code/modules/mob/living/simple_animal/friendly/crab.dm b/code/modules/mob/living/simple_animal/friendly/crab.dm index 6f5158ac83..99d91b299e 100644 --- a/code/modules/mob/living/simple_animal/friendly/crab.dm +++ b/code/modules/mob/living/simple_animal/friendly/crab.dm @@ -19,8 +19,12 @@ ventcrawler = VENTCRAWLER_ALWAYS var/obj/item/inventory_head var/obj/item/inventory_mask +<<<<<<< HEAD gold_core_spawnable = 2 devourable = TRUE +======= + gold_core_spawnable = FRIENDLY_SPAWN +>>>>>>> 2abae67... Cleans up goldcore defines (#33090) /mob/living/simple_animal/crab/Life() ..() @@ -44,7 +48,7 @@ response_help = "pets" response_disarm = "gently pushes aside" response_harm = "stomps" - gold_core_spawnable = FALSE + gold_core_spawnable = NO_SPAWN /mob/living/simple_animal/crab/evil name = "Evil Crab" @@ -56,7 +60,7 @@ response_help = "pokes" response_disarm = "shoves" response_harm = "stomps" - gold_core_spawnable = TRUE + gold_core_spawnable = HOSTILE_SPAWN /mob/living/simple_animal/crab/kreb name = "Kreb" @@ -68,7 +72,7 @@ response_help = "pets" response_disarm = "gently pushes aside" response_harm = "stomps" - gold_core_spawnable = FALSE + gold_core_spawnable = NO_SPAWN /mob/living/simple_animal/crab/evil/kreb name = "Evil Kreb" diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm index 2a94052274..770834b0cf 100644 --- a/code/modules/mob/living/simple_animal/friendly/dog.dm +++ b/code/modules/mob/living/simple_animal/friendly/dog.dm @@ -31,7 +31,7 @@ var/obj/item/inventory_head var/obj/item/inventory_back var/nofur = 0 //Corgis that have risen past the material plane of existence. - gold_core_spawnable = 2 + gold_core_spawnable = FRIENDLY_SPAWN /mob/living/simple_animal/pet/dog/pug name = "\improper pug" @@ -42,7 +42,7 @@ icon_living = "pug" icon_dead = "pug_dead" butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/pug = 3) - gold_core_spawnable = 2 + gold_core_spawnable = FRIENDLY_SPAWN /mob/living/simple_animal/pet/dog/Initialize() . = ..() @@ -290,7 +290,7 @@ response_help = "pets" response_disarm = "bops" response_harm = "kicks" - gold_core_spawnable = 0 + gold_core_spawnable = NO_SPAWN var/age = 0 var/record_age = 1 var/memory_saved = FALSE @@ -438,7 +438,7 @@ icon_living = "narsian" icon_dead = "narsian_dead" faction = list("dog", "cult") - gold_core_spawnable = FALSE + gold_core_spawnable = NO_SPAWN nofur = TRUE /mob/living/simple_animal/pet/dog/corgi/narsie/Life() @@ -560,7 +560,7 @@ response_harm = "kicks" var/turns_since_scan = 0 var/puppies = 0 - gold_core_spawnable = 0 + gold_core_spawnable = NO_SPAWN //Lisa already has a cute bow! /mob/living/simple_animal/pet/dog/corgi/Lisa/Topic(href, href_list) 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 6fb1c500b2..03d79e98e0 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -117,7 +117,7 @@ health = 50 maxHealth = 50 var/obj/item/udder/udder = null - gold_core_spawnable = 2 + gold_core_spawnable = FRIENDLY_SPAWN blood_volume = BLOOD_VOLUME_NORMAL devourable = TRUE no_vore = FALSE @@ -195,8 +195,12 @@ var/amount_grown = 0 pass_flags = PASSTABLE | PASSGRILLE | PASSMOB mob_size = MOB_SIZE_TINY +<<<<<<< HEAD gold_core_spawnable = 2 devourable = TRUE +======= + gold_core_spawnable = FRIENDLY_SPAWN +>>>>>>> 2abae67... Cleans up goldcore defines (#33090) /mob/living/simple_animal/chick/Initialize() . = ..() @@ -250,7 +254,7 @@ var/list/feedMessages = list("It clucks happily.","It clucks happily.") var/list/layMessage = list("lays an egg.","squats down and croons.","begins making a huge racket.","begins clucking raucously.") var/list/validColors = list("brown","black","white") - gold_core_spawnable = 2 + gold_core_spawnable = FRIENDLY_SPAWN var/static/chicken_count = 0 devourable = TRUE no_vore = FALSE diff --git a/code/modules/mob/living/simple_animal/friendly/fox.dm b/code/modules/mob/living/simple_animal/friendly/fox.dm index e7d6bfbf64..6b06ac7a86 100644 --- a/code/modules/mob/living/simple_animal/friendly/fox.dm +++ b/code/modules/mob/living/simple_animal/friendly/fox.dm @@ -17,6 +17,7 @@ response_help = "pets" response_disarm = "gently pushes aside" response_harm = "kicks" +<<<<<<< HEAD gold_core_spawnable = 2 devourable = TRUE var/mob/living/simple_animal/mouse/movement_target @@ -59,10 +60,13 @@ if(movement_target) stop_automated_movement = 1 walk_to(src,movement_target,0,3) +======= + gold_core_spawnable = FRIENDLY_SPAWN +>>>>>>> 2abae67... Cleans up goldcore defines (#33090) //Captain fox /mob/living/simple_animal/pet/fox/Renault name = "Renault" desc = "Renault, the Captain's trustworthy fox." gender = FEMALE - gold_core_spawnable = 0 + gold_core_spawnable = NO_SPAWN diff --git a/code/modules/mob/living/simple_animal/friendly/lizard.dm b/code/modules/mob/living/simple_animal/friendly/lizard.dm index c4e11cc2bd..e4e1b26225 100644 --- a/code/modules/mob/living/simple_animal/friendly/lizard.dm +++ b/code/modules/mob/living/simple_animal/friendly/lizard.dm @@ -18,8 +18,12 @@ density = FALSE pass_flags = PASSTABLE | PASSMOB mob_size = MOB_SIZE_SMALL +<<<<<<< HEAD gold_core_spawnable = 2 devourable = TRUE +======= + gold_core_spawnable = FRIENDLY_SPAWN +>>>>>>> 2abae67... Cleans up goldcore defines (#33090) obj_damage = 0 environment_smash = ENVIRONMENT_SMASH_NONE var/static/list/edibles = typecacheof(list(/mob/living/simple_animal/butterfly, /mob/living/simple_animal/cockroach)) //list of atoms, however turfs won't affect AI, but will affect consumption. diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index 1a7ed0261f..85ec19bfb9 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -22,7 +22,7 @@ pass_flags = PASSTABLE | PASSGRILLE | PASSMOB mob_size = MOB_SIZE_TINY var/body_color //brown, gray and white, leave blank for random - gold_core_spawnable = 2 + gold_core_spawnable = FRIENDLY_SPAWN var/chew_probability = 1 devourable = TRUE @@ -99,7 +99,7 @@ response_help = "pets" response_disarm = "gently pushes aside" response_harm = "splats" - gold_core_spawnable = 0 + gold_core_spawnable = NO_SPAWN /obj/item/reagent_containers/food/snacks/deadmouse name = "dead mouse" diff --git a/code/modules/mob/living/simple_animal/friendly/penguin.dm b/code/modules/mob/living/simple_animal/friendly/penguin.dm index 07515808dd..fe0187fee6 100644 --- a/code/modules/mob/living/simple_animal/friendly/penguin.dm +++ b/code/modules/mob/living/simple_animal/friendly/penguin.dm @@ -23,7 +23,7 @@ icon_living = "penguin" icon_dead = "penguin_dead" butcher_results = list() - gold_core_spawnable = 2 + gold_core_spawnable = FRIENDLY_SPAWN /mob/living/simple_animal/pet/penguin/emperor/shamebrero name = "Shamebrero penguin" diff --git a/code/modules/mob/living/simple_animal/friendly/sloth.dm b/code/modules/mob/living/simple_animal/friendly/sloth.dm index 4d81afdf5e..7519951876 100644 --- a/code/modules/mob/living/simple_animal/friendly/sloth.dm +++ b/code/modules/mob/living/simple_animal/friendly/sloth.dm @@ -14,7 +14,7 @@ response_help = "pets" response_disarm = "gently pushes aside" response_harm = "kicks" - gold_core_spawnable = 2 + gold_core_spawnable = FRIENDLY_SPAWN melee_damage_lower = 18 melee_damage_upper = 18 health = 50 @@ -27,7 +27,7 @@ /mob/living/simple_animal/sloth/paperwork name = "Paperwork" desc = "Cargo's pet sloth. About as useful as the rest of the techs." - gold_core_spawnable = 0 + gold_core_spawnable = NO_SPAWN //Cargo Sloth 2 @@ -39,4 +39,4 @@ icon_dead = "cool_sloth_dead" gender = FEMALE butcher_results = list(/obj/item/toy/spinningtoy = 1) - gold_core_spawnable = 0 \ No newline at end of file + gold_core_spawnable = NO_SPAWN \ 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 fa4cefd839..2651065b75 100644 --- a/code/modules/mob/living/simple_animal/hostile/alien.dm +++ b/code/modules/mob/living/simple_animal/hostile/alien.dm @@ -32,7 +32,7 @@ see_in_dark = 8 lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE unique_name = 1 - gold_core_spawnable = 0 + gold_core_spawnable = NO_SPAWN death_sound = 'sound/voice/hiss6.ogg' deathmessage = "lets out a waning guttural screech, green blood bubbling from its maw..." devourable = TRUE @@ -139,7 +139,7 @@ butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/xeno = 10, /obj/item/stack/sheet/animalhide/xeno = 2) mob_size = MOB_SIZE_LARGE - gold_core_spawnable = 0 + gold_core_spawnable = NO_SPAWN /obj/item/projectile/neurotox name = "neurotoxin" @@ -161,7 +161,7 @@ friendly = "caresses" obj_damage = 0 environment_smash = ENVIRONMENT_SMASH_NONE - gold_core_spawnable = 1 + gold_core_spawnable = HOSTILE_SPAWN icon_state = "maid" icon_living = "maid" icon_dead = "maid_dead" diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm index ef662c8f5a..2300eb5c7c 100644 --- a/code/modules/mob/living/simple_animal/hostile/bear.dm +++ b/code/modules/mob/living/simple_animal/hostile/bear.dm @@ -36,9 +36,13 @@ maxbodytemp = 1500 faction = list("russian") +<<<<<<< HEAD gold_core_spawnable = 1 devourable = TRUE no_vore = FALSE +======= + gold_core_spawnable = HOSTILE_SPAWN +>>>>>>> 2abae67... Cleans up goldcore defines (#33090) //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/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm index 02252254c9..ef2e393a7d 100644 --- a/code/modules/mob/living/simple_animal/hostile/bees.dm +++ b/code/modules/mob/living/simple_animal/hostile/bees.dm @@ -37,7 +37,7 @@ pass_flags = PASSTABLE | PASSGRILLE | PASSMOB mob_size = MOB_SIZE_TINY movement_type = FLYING - gold_core_spawnable = 1 + gold_core_spawnable = HOSTILE_SPAWN search_objects = 1 //have to find those plant trays! //Spaceborn beings don't get hurt by space diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm index 4be394e2b5..878f7b3019 100644 --- a/code/modules/mob/living/simple_animal/hostile/carp.dm +++ b/code/modules/mob/living/simple_animal/hostile/carp.dm @@ -35,7 +35,7 @@ faction = list("carp") movement_type = FLYING pressure_resistance = 200 - gold_core_spawnable = 1 + gold_core_spawnable = HOSTILE_SPAWN /mob/living/simple_animal/hostile/carp/AttackingTarget() . = ..() @@ -47,7 +47,7 @@ icon_state = "holocarp" icon_living = "holocarp" maxbodytemp = INFINITY - gold_core_spawnable = 0 + gold_core_spawnable = NO_SPAWN del_on_death = 1 /mob/living/simple_animal/hostile/carp/megacarp @@ -92,7 +92,7 @@ desc = "A failed Syndicate experiment in weaponized space carp technology, it now serves as a lovable mascot." gender = FEMALE speak_emote = list("squeaks") - gold_core_spawnable = 0 + gold_core_spawnable = NO_SPAWN faction = list("syndicate") AIStatus = AI_OFF diff --git a/code/modules/mob/living/simple_animal/hostile/creature.dm b/code/modules/mob/living/simple_animal/hostile/creature.dm index 50baf1038e..070f076544 100644 --- a/code/modules/mob/living/simple_animal/hostile/creature.dm +++ b/code/modules/mob/living/simple_animal/hostile/creature.dm @@ -1,3 +1,4 @@ +<<<<<<< HEAD /mob/living/simple_animal/hostile/creature name = "creature" desc = "A sanity-destroying otherthing." @@ -16,3 +17,23 @@ gold_core_spawnable = 1 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 +======= +/mob/living/simple_animal/hostile/creature + name = "creature" + desc = "A sanity-destroying otherthing." + icon_state = "otherthing" + icon_living = "otherthing" + icon_dead = "otherthing-dead" + health = 80 + maxHealth = 80 + obj_damage = 100 + melee_damage_lower = 25 + melee_damage_upper = 50 + attacktext = "chomps" + attack_sound = 'sound/weapons/bite.ogg' + faction = list("creature") + speak_emote = list("screams") + gold_core_spawnable = HOSTILE_SPAWN + 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 +>>>>>>> 2abae67... Cleans up goldcore defines (#33090) diff --git a/code/modules/mob/living/simple_animal/hostile/faithless.dm b/code/modules/mob/living/simple_animal/hostile/faithless.dm index 173c8a6b8d..2929e146f1 100644 --- a/code/modules/mob/living/simple_animal/hostile/faithless.dm +++ b/code/modules/mob/living/simple_animal/hostile/faithless.dm @@ -31,7 +31,7 @@ minbodytemp = 0 faction = list("faithless") - gold_core_spawnable = 1 + gold_core_spawnable = HOSTILE_SPAWN /mob/living/simple_animal/hostile/faithless/AttackingTarget() . = ..() 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 3ea1be6f03..2d18fd3331 100644 --- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm @@ -44,7 +44,7 @@ attacktext = "bites" attack_sound = 'sound/weapons/bite.ogg' unique_name = 1 - gold_core_spawnable = 1 + gold_core_spawnable = HOSTILE_SPAWN see_in_dark = 4 lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE var/playable_spider = FALSE @@ -152,7 +152,7 @@ move_to_delay = 4 poison_type = "venom" //all in venom, glass cannon. you bite 5 times and they are DEFINITELY dead, but 40 health and you are extremely obvious. Ambush, maybe? speed = 1 - gold_core_spawnable = 0 + gold_core_spawnable = NO_SPAWN //tarantulas are really tanky, regenerating (maybe), hulky monster but are also extremely slow, so. /mob/living/simple_animal/hostile/poison/giant_spider/tarantula @@ -170,7 +170,7 @@ speed = 7 status_flags = NONE mob_size = MOB_SIZE_LARGE - gold_core_spawnable = 0 + gold_core_spawnable = NO_SPAWN /mob/living/simple_animal/hostile/poison/giant_spider/tarantula/movement_delay() var/turf/T = get_turf(src) @@ -190,7 +190,7 @@ maxHealth = 40 health = 40 var/datum/action/innate/spider/comm/letmetalkpls - gold_core_spawnable = 0 + gold_core_spawnable = NO_SPAWN /mob/living/simple_animal/hostile/poison/giant_spider/nurse/midwife/Initialize() . = ..() @@ -208,7 +208,7 @@ maxbodytemp = 1500 poison_type = "frost_oil" color = rgb(114,228,250) - gold_core_spawnable = 0 + gold_core_spawnable = NO_SPAWN /mob/living/simple_animal/hostile/poison/giant_spider/nurse/ice name = "giant ice spider" @@ -217,7 +217,7 @@ maxbodytemp = 1500 poison_type = "frost_oil" color = rgb(114,228,250) - gold_core_spawnable = 0 + gold_core_spawnable = NO_SPAWN /mob/living/simple_animal/hostile/poison/giant_spider/hunter/ice name = "giant ice spider" @@ -226,7 +226,7 @@ maxbodytemp = 1500 poison_type = "frost_oil" color = rgb(114,228,250) - gold_core_spawnable = 0 + gold_core_spawnable = NO_SPAWN /mob/living/simple_animal/hostile/poison/giant_spider/handle_automated_action() if(!..()) //AIStatus is off diff --git a/code/modules/mob/living/simple_animal/hostile/headcrab.dm b/code/modules/mob/living/simple_animal/hostile/headcrab.dm index f59cf79f22..5b4324623f 100644 --- a/code/modules/mob/living/simple_animal/hostile/headcrab.dm +++ b/code/modules/mob/living/simple_animal/hostile/headcrab.dm @@ -22,7 +22,11 @@ ventcrawler = VENTCRAWLER_ALWAYS var/datum/mind/origin var/egg_lain = 0 +<<<<<<< HEAD // gold_core_spawnable = 1 //are you sure about this?? +======= + gold_core_spawnable = HOSTILE_SPAWN //are you sure about this?? +>>>>>>> 2abae67... Cleans up goldcore defines (#33090) /mob/living/simple_animal/hostile/headcrab/proc/Infect(mob/living/carbon/victim) var/obj/item/organ/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 06f2a56a0e..41a08a949c 100644 --- a/code/modules/mob/living/simple_animal/hostile/hivebot.dm +++ b/code/modules/mob/living/simple_animal/hostile/hivebot.dm @@ -24,7 +24,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 = HOSTILE_SPAWN del_on_death = 1 loot = list(/obj/effect/decal/cleanable/robot_debris) diff --git a/code/modules/mob/living/simple_animal/hostile/killertomato.dm b/code/modules/mob/living/simple_animal/hostile/killertomato.dm index db1f253645..17658cc7c1 100644 --- a/code/modules/mob/living/simple_animal/hostile/killertomato.dm +++ b/code/modules/mob/living/simple_animal/hostile/killertomato.dm @@ -24,4 +24,4 @@ atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) minbodytemp = 150 maxbodytemp = 500 - gold_core_spawnable = 1 + gold_core_spawnable = HOSTILE_SPAWN diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm index 587afef82f..58e3e0837b 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm @@ -612,7 +612,7 @@ Difficulty: Very Hard pass_flags = PASSTABLE | PASSGRILLE | PASSMOB ventcrawler = VENTCRAWLER_ALWAYS mob_size = MOB_SIZE_TINY - gold_core_spawnable = TRUE + gold_core_spawnable = HOSTILE_SPAWN verb_say = "warps" verb_ask = "floats inquisitively" verb_exclaim = "zaps" diff --git a/code/modules/mob/living/simple_animal/hostile/mimic.dm b/code/modules/mob/living/simple_animal/hostile/mimic.dm index 0c7edd0334..dd96c87371 100644 --- a/code/modules/mob/living/simple_animal/hostile/mimic.dm +++ b/code/modules/mob/living/simple_animal/hostile/mimic.dm @@ -27,7 +27,7 @@ faction = list("mimic") move_to_delay = 9 - gold_core_spawnable = 1 + gold_core_spawnable = HOSTILE_SPAWN del_on_death = 1 // Aggro when you try to open them. Will also pickup loot when spawns and drop it when dies. @@ -101,7 +101,7 @@ GLOBAL_LIST_INIT(protected_objects, list(/obj/structure/table, /obj/structure/ca var/destroy_objects = 0 var/knockdown_people = 0 var/static/mutable_appearance/googly_eyes = mutable_appearance('icons/mob/mob.dmi', "googly_eyes") - gold_core_spawnable = 0 + gold_core_spawnable = NO_SPAWN /mob/living/simple_animal/hostile/mimic/copy/Initialize(mapload, obj/copy, mob/living/creator, destroy_original = 0) . = ..() diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm index 38022461b7..a9627c7e2d 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm @@ -33,7 +33,7 @@ aggro_vision_range = 9 idle_vision_range = 2 turns_per_move = 5 - gold_core_spawnable = TRUE + gold_core_spawnable = HOSTILE_SPAWN loot = list(/obj/item/ore/diamond{layer = ABOVE_MOB_LAYER}, /obj/item/ore/diamond{layer = ABOVE_MOB_LAYER}) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm index 04282d12fd..ad7edb1716 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm @@ -23,7 +23,7 @@ friendly = "pinches" a_intent = INTENT_HELP ventcrawler = VENTCRAWLER_ALWAYS - gold_core_spawnable = 2 + gold_core_spawnable = FRIENDLY_SPAWN stat_attack = UNCONSCIOUS gender = NEUTER stop_automated_movement = FALSE diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm index 1db0bf1e20..18e07391ba 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm @@ -23,7 +23,7 @@ butcher_results = list(/obj/item/reagent_containers/food/snacks/nugget = 1) pass_flags = PASSTABLE | PASSGRILLE | PASSMOB mob_size = MOB_SIZE_TINY - gold_core_spawnable = 1 + gold_core_spawnable = HOSTILE_SPAWN /mob/living/simple_animal/hostile/retaliate/frog/Initialize() . = ..() diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/ghost.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/ghost.dm index 6d492a2be0..2d24f847df 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/ghost.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/ghost.dm @@ -29,7 +29,7 @@ maxbodytemp = 1500 movement_type = FLYING pressure_resistance = 300 - gold_core_spawnable = 0 //too spooky for science + gold_core_spawnable = NO_SPAWN //too spooky for science var/ghost_hair_style var/ghost_hair_color var/mutable_appearance/ghost_hair diff --git a/code/modules/mob/living/simple_animal/hostile/skeleton.dm b/code/modules/mob/living/simple_animal/hostile/skeleton.dm index 3a3cfbb27d..5455d17a80 100644 --- a/code/modules/mob/living/simple_animal/hostile/skeleton.dm +++ b/code/modules/mob/living/simple_animal/hostile/skeleton.dm @@ -25,7 +25,7 @@ unsuitable_atmos_damage = 10 robust_searching = 1 stat_attack = UNCONSCIOUS - gold_core_spawnable = 1 + gold_core_spawnable = HOSTILE_SPAWN faction = list("skeleton") see_in_dark = 8 lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE @@ -41,7 +41,7 @@ icon_dead = "eskimo_dead" maxHealth = 55 health = 55 - gold_core_spawnable = 0 + gold_core_spawnable = NO_SPAWN melee_damage_lower = 17 melee_damage_upper = 20 deathmessage = "collapses into a pile of bones, its gear falling to the floor!" @@ -60,7 +60,7 @@ maxHealth = 150 health = 150 speed = 2 - gold_core_spawnable = 0 + gold_core_spawnable = NO_SPAWN speak_chance = 1 speak = list("THE GODS WILL IT!","DEUS VULT!","REMOVE KABAB!") force_threshold = 10 //trying to simulate actually having armor diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm index a17ec0ff66..af665a4345 100644 --- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm +++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm @@ -153,6 +153,6 @@ limb_destroyer = 1 speak_emote = list("states") bubble_icon = "syndibot" - gold_core_spawnable = 1 + gold_core_spawnable = HOSTILE_SPAWN del_on_death = 1 deathmessage = "is smashed into pieces!" diff --git a/code/modules/mob/living/simple_animal/hostile/tree.dm b/code/modules/mob/living/simple_animal/hostile/tree.dm index ced75cb076..3d10bfd121 100644 --- a/code/modules/mob/living/simple_animal/hostile/tree.dm +++ b/code/modules/mob/living/simple_animal/hostile/tree.dm @@ -36,7 +36,7 @@ faction = list("hostile") deathmessage = "is hacked into pieces!" loot = list(/obj/item/stack/sheet/mineral/wood) - gold_core_spawnable = 1 + gold_core_spawnable = HOSTILE_SPAWN del_on_death = 1 /mob/living/simple_animal/hostile/tree/Life() diff --git a/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm b/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm index 881215e97b..97dd430a12 100644 --- a/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm +++ b/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm @@ -27,7 +27,7 @@ idle_vision_range = 5 mob_size = MOB_SIZE_SMALL environment_smash = ENVIRONMENT_SMASH_NONE - gold_core_spawnable = TRUE + gold_core_spawnable = HOSTILE_SPAWN var/wumbo = 0 var/inflate_cooldown = 0 loot = list(/obj/item/asteroid/fugu_gland{layer = ABOVE_MOB_LAYER}) diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index 641e78a0f3..0bb72ef5cf 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -59,9 +59,13 @@ friendly = "grooms" mob_size = MOB_SIZE_SMALL movement_type = FLYING +<<<<<<< HEAD gold_core_spawnable = 2 devourable = TRUE no_vore = FALSE +======= + gold_core_spawnable = FRIENDLY_SPAWN +>>>>>>> 2abae67... Cleans up goldcore defines (#33090) var/parrot_damage_upper = 10 var/parrot_state = PARROT_WANDER //Hunt for a perch when created @@ -871,7 +875,7 @@ name = "Poly" desc = "Poly the Parrot. An expert on quantum cracker theory." speak = list("Poly wanna cracker!", ":e Check the crystal, you chucklefucks!",":e Wire the solars, you lazy bums!",":e WHO TOOK THE DAMN HARDSUITS?",":e OH GOD ITS ABOUT TO DELAMINATE CALL THE SHUTTLE") - gold_core_spawnable = 0 + gold_core_spawnable = NO_SPAWN speak_chance = 3 var/memory_saved = FALSE var/rounds_survived = 0 @@ -1012,7 +1016,7 @@ emote_hear = list("squawks rustily.", "bawks metallically!") emote_see = list("flutters its metal wings.") faction = list("ratvar") - gold_core_spawnable = FALSE + gold_core_spawnable = NO_SPAWN del_on_death = TRUE death_sound = 'sound/magic/clockwork/anima_fragment_death.ogg' diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index fffc05ccf9..72a1ec84c1 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -63,7 +63,7 @@ //simple_animal access var/obj/item/card/id/access_card = null //innate access uses an internal ID card var/buffed = 0 //In the event that you want to have a buffing effect on the mob, but don't want it to stack with other effects, any outside force that applies a buff to a simple mob should at least set this to 1, so we have something to check against - 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 = NO_SPAWN //If the mob can be spawned with a gold slime core. HOSTILE_SPAWN are spawned with plasma, FRIENDLY_SPAWN are spawned with blood var/mob/living/simple_animal/hostile/spawner/nest diff --git a/code/modules/reagents/chemistry/recipes.dm b/code/modules/reagents/chemistry/recipes.dm index aaa070703f..6bcc3412ca 100644 --- a/code/modules/reagents/chemistry/recipes.dm +++ b/code/modules/reagents/chemistry/recipes.dm @@ -29,9 +29,9 @@ for (var/T in typesof(/mob/living/simple_animal)) var/mob/living/simple_animal/SA = T switch(initial(SA.gold_core_spawnable)) - if(1) + if(HOSTILE_SPAWN) chemical_mob_spawn_meancritters += T - if(2) + if(FRIENDLY_SPAWN) chemical_mob_spawn_nicecritters += T var/atom/A = holder.my_atom var/turf/T = get_turf(A) diff --git a/code/modules/shuttle/special.dm b/code/modules/shuttle/special.dm index 6db6e73cff..ea603039bc 100644 --- a/code/modules/shuttle/special.dm +++ b/code/modules/shuttle/special.dm @@ -153,7 +153,7 @@ access_card.access |= ACCESS_CENT_BAR /mob/living/simple_animal/hostile/alien/maid/barmaid - gold_core_spawnable = 0 + gold_core_spawnable = NO_SPAWN name = "Barmaid" desc = "A barmaid, a maiden found in a bar." pass_flags = PASSTABLE From 59b873137001ffa8bdc01d9d9b809ef9f0475004 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sun, 26 Nov 2017 21:20:54 -0500 Subject: [PATCH 02/11] Update misc.dm --- code/__DEFINES/misc.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 1782c7aa62..7cc2e4537f 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -478,12 +478,8 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE #define SYRINGE_DRAW 0 #define SYRINGE_INJECT 1 -<<<<<<< HEAD -======= -#define RESEARCH_MATERIAL_RECLAMATION_ID "0" //gold slime core spawning #define NO_SPAWN 0 #define HOSTILE_SPAWN 1 #define FRIENDLY_SPAWN 2 ->>>>>>> 2abae67... Cleans up goldcore defines (#33090) From 4e2db63a33f3387311c04bc107aaf9a9602c7743 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sun, 26 Nov 2017 21:21:28 -0500 Subject: [PATCH 03/11] Update cat.dm --- code/modules/mob/living/simple_animal/friendly/cat.dm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index f9ddd94f0a..a333f22c38 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -28,13 +28,9 @@ response_harm = "kicks" var/turns_since_scan = 0 var/mob/living/simple_animal/mouse/movement_target -<<<<<<< HEAD - gold_core_spawnable = 2 + gold_core_spawnable = FRIENDLY_SPAWN devourable = TRUE no_vore = FALSE -======= - gold_core_spawnable = FRIENDLY_SPAWN ->>>>>>> 2abae67... Cleans up goldcore defines (#33090) /mob/living/simple_animal/pet/cat/Initialize() . = ..() @@ -286,4 +282,4 @@ ..() if(L.a_intent == INTENT_HARM && L.reagents && !stat) L.reagents.add_reagent("nutriment", 0.4) - L.reagents.add_reagent("vitamin", 0.4) \ No newline at end of file + L.reagents.add_reagent("vitamin", 0.4) From 933b4a7a3a18e7b907310f69c72405b09c6ce104 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sun, 26 Nov 2017 21:21:55 -0500 Subject: [PATCH 04/11] Update crab.dm --- code/modules/mob/living/simple_animal/friendly/crab.dm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/code/modules/mob/living/simple_animal/friendly/crab.dm b/code/modules/mob/living/simple_animal/friendly/crab.dm index 99d91b299e..35d7d12174 100644 --- a/code/modules/mob/living/simple_animal/friendly/crab.dm +++ b/code/modules/mob/living/simple_animal/friendly/crab.dm @@ -19,12 +19,8 @@ ventcrawler = VENTCRAWLER_ALWAYS var/obj/item/inventory_head var/obj/item/inventory_mask -<<<<<<< HEAD - gold_core_spawnable = 2 - devourable = TRUE -======= gold_core_spawnable = FRIENDLY_SPAWN ->>>>>>> 2abae67... Cleans up goldcore defines (#33090) + devourable = TRUE /mob/living/simple_animal/crab/Life() ..() From eb13f4ee2f7378909421830644edf36a4c7bb6ec Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sun, 26 Nov 2017 21:22:42 -0500 Subject: [PATCH 05/11] Update farm_animals.dm --- .../mob/living/simple_animal/friendly/farm_animals.dm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) 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 03d79e98e0..cbd14bb376 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -195,12 +195,8 @@ var/amount_grown = 0 pass_flags = PASSTABLE | PASSGRILLE | PASSMOB mob_size = MOB_SIZE_TINY -<<<<<<< HEAD - gold_core_spawnable = 2 - devourable = TRUE -======= gold_core_spawnable = FRIENDLY_SPAWN ->>>>>>> 2abae67... Cleans up goldcore defines (#33090) + devourable = TRUE /mob/living/simple_animal/chick/Initialize() . = ..() From e70daa585c65ffbca214afda7dbf9d21b4ce23e4 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sun, 26 Nov 2017 21:23:26 -0500 Subject: [PATCH 06/11] Update fox.dm --- code/modules/mob/living/simple_animal/friendly/fox.dm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/code/modules/mob/living/simple_animal/friendly/fox.dm b/code/modules/mob/living/simple_animal/friendly/fox.dm index 6b06ac7a86..b9192c1746 100644 --- a/code/modules/mob/living/simple_animal/friendly/fox.dm +++ b/code/modules/mob/living/simple_animal/friendly/fox.dm @@ -17,8 +17,7 @@ response_help = "pets" response_disarm = "gently pushes aside" response_harm = "kicks" -<<<<<<< HEAD - gold_core_spawnable = 2 + gold_core_spawnable = FRIENDLY_SPAWN devourable = TRUE var/mob/living/simple_animal/mouse/movement_target var/turns_since_scan = 0 @@ -60,9 +59,6 @@ if(movement_target) stop_automated_movement = 1 walk_to(src,movement_target,0,3) -======= - gold_core_spawnable = FRIENDLY_SPAWN ->>>>>>> 2abae67... Cleans up goldcore defines (#33090) //Captain fox /mob/living/simple_animal/pet/fox/Renault From c67063beb5b4ec13b8281698ff2d5695e8c5d94e Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sun, 26 Nov 2017 21:23:50 -0500 Subject: [PATCH 07/11] Update lizard.dm --- code/modules/mob/living/simple_animal/friendly/lizard.dm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/code/modules/mob/living/simple_animal/friendly/lizard.dm b/code/modules/mob/living/simple_animal/friendly/lizard.dm index e4e1b26225..f45e7f7950 100644 --- a/code/modules/mob/living/simple_animal/friendly/lizard.dm +++ b/code/modules/mob/living/simple_animal/friendly/lizard.dm @@ -18,12 +18,8 @@ density = FALSE pass_flags = PASSTABLE | PASSMOB mob_size = MOB_SIZE_SMALL -<<<<<<< HEAD - gold_core_spawnable = 2 - devourable = TRUE -======= gold_core_spawnable = FRIENDLY_SPAWN ->>>>>>> 2abae67... Cleans up goldcore defines (#33090) + devourable = TRUE obj_damage = 0 environment_smash = ENVIRONMENT_SMASH_NONE var/static/list/edibles = typecacheof(list(/mob/living/simple_animal/butterfly, /mob/living/simple_animal/cockroach)) //list of atoms, however turfs won't affect AI, but will affect consumption. From e5e17cf3342040fdb7a0bd205e38afbf046205fa Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sun, 26 Nov 2017 21:24:27 -0500 Subject: [PATCH 08/11] Update bear.dm --- code/modules/mob/living/simple_animal/hostile/bear.dm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm index 2300eb5c7c..d63b5d4114 100644 --- a/code/modules/mob/living/simple_animal/hostile/bear.dm +++ b/code/modules/mob/living/simple_animal/hostile/bear.dm @@ -36,13 +36,9 @@ maxbodytemp = 1500 faction = list("russian") -<<<<<<< HEAD - gold_core_spawnable = 1 + gold_core_spawnable = HOSTILE_SPAWN devourable = TRUE no_vore = FALSE -======= - gold_core_spawnable = HOSTILE_SPAWN ->>>>>>> 2abae67... Cleans up goldcore defines (#33090) //SPACE BEARS! SQUEEEEEEEE~ OW! FUCK! IT BIT MY HAND OFF!! /mob/living/simple_animal/hostile/bear/Hudson From 90e13d005390da8530a97f4b6f048e70c3994045 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sun, 26 Nov 2017 21:25:13 -0500 Subject: [PATCH 09/11] Update creature.dm --- .../living/simple_animal/hostile/creature.dm | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/creature.dm b/code/modules/mob/living/simple_animal/hostile/creature.dm index 070f076544..12da922fc0 100644 --- a/code/modules/mob/living/simple_animal/hostile/creature.dm +++ b/code/modules/mob/living/simple_animal/hostile/creature.dm @@ -1,23 +1,3 @@ -<<<<<<< HEAD -/mob/living/simple_animal/hostile/creature - name = "creature" - desc = "A sanity-destroying otherthing." - icon_state = "otherthing" - icon_living = "otherthing" - icon_dead = "otherthing-dead" - health = 80 - maxHealth = 80 - obj_damage = 100 - melee_damage_lower = 25 - melee_damage_upper = 50 - attacktext = "chomps" - attack_sound = 'sound/weapons/bite.ogg' - faction = list("creature") - speak_emote = list("screams") - gold_core_spawnable = 1 - 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 -======= /mob/living/simple_animal/hostile/creature name = "creature" desc = "A sanity-destroying otherthing." @@ -36,4 +16,3 @@ gold_core_spawnable = HOSTILE_SPAWN 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 ->>>>>>> 2abae67... Cleans up goldcore defines (#33090) From 12cb0a98a4d17627633b8ceedf8a290b7e48e845 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sun, 26 Nov 2017 21:25:51 -0500 Subject: [PATCH 10/11] Update headcrab.dm --- code/modules/mob/living/simple_animal/hostile/headcrab.dm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/headcrab.dm b/code/modules/mob/living/simple_animal/hostile/headcrab.dm index 5b4324623f..4e302b3d55 100644 --- a/code/modules/mob/living/simple_animal/hostile/headcrab.dm +++ b/code/modules/mob/living/simple_animal/hostile/headcrab.dm @@ -22,11 +22,7 @@ ventcrawler = VENTCRAWLER_ALWAYS var/datum/mind/origin var/egg_lain = 0 -<<<<<<< HEAD -// gold_core_spawnable = 1 //are you sure about this?? -======= - gold_core_spawnable = HOSTILE_SPAWN //are you sure about this?? ->>>>>>> 2abae67... Cleans up goldcore defines (#33090) +// gold_core_spawnable = HOSTILE_SPAWN //are you sure about this?? /mob/living/simple_animal/hostile/headcrab/proc/Infect(mob/living/carbon/victim) var/obj/item/organ/body_egg/changeling_egg/egg = new(victim) From d5eef89e132f02b6d03ed45ed4b9eeb0fd0ef8bc Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sun, 26 Nov 2017 21:26:35 -0500 Subject: [PATCH 11/11] Update parrot.dm --- code/modules/mob/living/simple_animal/parrot.dm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index 0bb72ef5cf..ffbeb1f503 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -59,13 +59,9 @@ friendly = "grooms" mob_size = MOB_SIZE_SMALL movement_type = FLYING -<<<<<<< HEAD - gold_core_spawnable = 2 + gold_core_spawnable = FRIENDLY_SPAWN devourable = TRUE no_vore = FALSE -======= - gold_core_spawnable = FRIENDLY_SPAWN ->>>>>>> 2abae67... Cleans up goldcore defines (#33090) var/parrot_damage_upper = 10 var/parrot_state = PARROT_WANDER //Hunt for a perch when created