Cleans up goldcore defines

2017-11-26 17:51:54 -05:00
parent 4eb9e28fb4
commit 4a22fed89d
38 changed files with 122 additions and 60 deletions
@@ -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"
@@ -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)
@@ -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"
@@ -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"
@@ -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)
@@ -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
@@ -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
@@ -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.
@@ -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"
@@ -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"
@@ -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
+	gold_core_spawnable = NO_SPAWN
@@ -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"
@@ -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
@@ -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
@@ -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

@@ -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)
@@ -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()
 	. = ..()
@@ -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
@@ -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)
@@ -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)

@@ -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
@@ -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"
@@ -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)
 	. = ..()
@@ -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})

@@ -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
@@ -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()
 	. = ..()
@@ -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
@@ -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
@@ -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!"
@@ -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()
@@ -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})
@@ -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'

@@ -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

@@ -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)
@@ -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