Simple Animal Spawn Refactor

2026-07-13 08:03:43 +01:00 · 2016-04-04 00:30:10 -04:00
parent 49f8ab674c
commit 3bd37ec757
35 changed files with 141 additions and 126 deletions
@@ -18,6 +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

 /mob/living/simple_animal/butterfly/New()
 	..()
@@ -20,6 +20,7 @@
 	response_help  = "pets"
 	response_disarm = "gently pushes aside"
 	response_harm   = "kicks"
+	gold_core_spawnable = 2

 //RUNTIME IS ALIVE! SQUEEEEEEEE~
 /mob/living/simple_animal/pet/cat/Runtime
@@ -32,6 +33,7 @@
 	gender = FEMALE
 	var/turns_since_scan = 0
 	var/mob/living/simple_animal/mouse/movement_target
+	gold_core_spawnable = 0

 /mob/living/simple_animal/pet/cat/Runtime/handle_automated_action()
 	..()
@@ -96,4 +98,5 @@
 	flags = NO_BREATHE
 	faction = list("syndicate")
 	var/turns_since_scan = 0
-	var/mob/living/simple_animal/mouse/movement_target
+	var/mob/living/simple_animal/mouse/movement_target
+	gold_core_spawnable = 0
@@ -26,6 +26,7 @@
 	var/obj/item/inventory_head
 	var/obj/item/inventory_back
 	var/facehugger
+	gold_core_spawnable = 2

 /mob/living/simple_animal/pet/corgi/New()
 	..()
@@ -397,6 +398,7 @@
 	response_help  = "pets"
 	response_disarm = "bops"
 	response_harm   = "kicks"
+	gold_core_spawnable = 0

 /mob/living/simple_animal/pet/corgi/Ian/process_ai()
 	..()
@@ -553,6 +555,7 @@
 	response_harm   = "kicks"
 	var/turns_since_scan = 0
 	var/puppies = 0
+	gold_core_spawnable = 0

 //Lisa already has a cute bow!
 /mob/living/simple_animal/pet/corgi/Lisa/Topic(href, href_list)
@@ -22,6 +22,7 @@
 	var/obj/item/inventory_mask
 	can_hide = 1
 	can_collar = 1
+	gold_core_spawnable = 2

 /mob/living/simple_animal/crab/handle_automated_movement()
 	//CRAB movement
@@ -46,6 +47,7 @@
 	response_help  = "pets"
 	response_disarm = "gently pushes aside"
 	response_harm   = "stomps"
+	gold_core_spawnable = 0

 //LOOK AT THIS - ..()??
 /*/mob/living/simple_animal/crab/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
@@ -14,4 +14,5 @@
 	response_help = "pets"
 	response_disarm = "gently pushes aside"
 	response_harm = "kicks"
-	can_collar = 1
+	can_collar = 1
+	gold_core_spawnable = 2
@@ -111,6 +111,7 @@
 	health = 50
 	var/milk_content = 0
 	can_collar = 1
+	gold_core_spawnable = 2

 /mob/living/simple_animal/cow/New()
 	..()
@@ -178,6 +179,7 @@
 	small = 1
 	can_hide = 1
 	can_collar = 1
+	gold_core_spawnable = 2

 /mob/living/simple_animal/chick/New()
 	..()
@@ -220,6 +222,7 @@ var/global/chicken_count = 0
 	small = 1
 	can_hide = 1
 	can_collar = 1
+	gold_core_spawnable = 2

 /mob/living/simple_animal/chicken/New()
 	..()
@@ -297,6 +300,7 @@ var/global/chicken_count = 0
 	attacktext = "kicks"
 	health = 50
 	can_collar = 1
+	gold_core_spawnable = 2

 /mob/living/simple_animal/turkey
 	name = "turkey"
@@ -318,6 +322,7 @@ var/global/chicken_count = 0
 	attacktext = "pecks"
 	health = 50
 	can_collar = 1
+	gold_core_spawnable = 2

 /mob/living/simple_animal/goose
 	name = "goose"
@@ -339,6 +344,7 @@ var/global/chicken_count = 0
 	attacktext = "kicks"
 	health = 50
 	can_collar = 1
+	gold_core_spawnable = 2

 /mob/living/simple_animal/seal
 	name = "seal"
@@ -360,6 +366,7 @@ var/global/chicken_count = 0
 	attacktext = "kicks"
 	health = 50
 	can_collar = 1
+	gold_core_spawnable = 2

 /mob/living/simple_animal/walrus
 	name = "walrus"
@@ -381,3 +388,4 @@ var/global/chicken_count = 0
 	attacktext = "kicks"
 	health = 50
 	can_collar = 1
+	gold_core_spawnable = 2
@@ -17,11 +17,13 @@
 	response_help = "pets"
 	response_disarm = "gently pushes aside"
 	response_harm = "kicks"
+	gold_core_spawnable = 2

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

 //Syndi fox
 /mob/living/simple_animal/pet/fox/Syndifox
@@ -33,3 +35,4 @@
 	icon_resting = "Syndifox_rest"
 	flags = NO_BREATHE
 	faction = list("syndicate")
+	gold_core_spawnable = 0
@@ -22,3 +22,4 @@
 	can_hide = 1
 	butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat = 1)
 	can_collar = 1
+	gold_core_spawnable = 2
@@ -31,6 +31,7 @@
 	can_hide = 1
 	holder_type = /obj/item/weapon/holder/mouse
 	can_collar = 1
+	gold_core_spawnable = 2

 /mob/living/simple_animal/mouse/handle_automated_speech()
 	..()
@@ -144,3 +145,4 @@
 	response_help  = "pets"
 	response_disarm = "gently pushes aside"
 	response_harm   = "splats"
+	gold_core_spawnable = 0
@@ -17,6 +17,7 @@
 	response_disarm = "bops"
 	response_harm   = "kicks"
 	see_in_dark = 5
+	gold_core_spawnable = 2

 /mob/living/simple_animal/pet/pug/process_ai()
 	..()
@@ -14,4 +14,5 @@
 	response_harm   = "smacks the"
 	harm_intent_damage = 5
 	pass_flags = PASSTABLE
-	can_hide = 1
+	can_hide = 1
+	gold_core_spawnable = 2
@@ -29,6 +29,7 @@
 	see_in_dark = 8
 	see_invisible = SEE_INVISIBLE_MINIMUM
 	heat_damage_per_tick = 20
+	gold_core_spawnable = 1


 /mob/living/simple_animal/hostile/alien/drone
@@ -127,6 +128,7 @@
 	move_to_delay = 4
 	maxHealth = 400
 	health = 400
+	gold_core_spawnable = 0

 /obj/item/projectile/neurotox
 	name = "neurotoxin"
@@ -151,6 +153,7 @@
 	icon_state = "maid"
 	icon_living = "maid"
 	icon_dead = "maid_dead"
+	gold_core_spawnable = 0 //no fun allowed

 /mob/living/simple_animal/hostile/alien/maid/AttackingTarget()
 	if(istype(target, /atom/movable))
@@ -29,6 +29,7 @@

 	faction = list("scarybat")
 	var/mob/living/owner
+	gold_core_spawnable = 1

 /mob/living/simple_animal/hostile/scarybat/New(loc, mob/living/L as mob)
 	..()
@@ -31,6 +31,7 @@
 	var/stance_step = 0

 	faction = list("russian")
+	gold_core_spawnable = 1

 //SPACE BEARS! SQUEEEEEEEE~     OW! FUCK! IT BIT MY HAND OFF!!
 /mob/living/simple_animal/hostile/bear/Hudson
@@ -33,6 +33,7 @@

 	faction = list("carp")
 	flying = 1
+	gold_core_spawnable = 1

 /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
@@ -53,6 +54,7 @@
 	icon_state = "holocarp"
 	icon_living = "holocarp"
 	maxbodytemp = INFINITY
+	gold_core_spawnable = 0

 /mob/living/simple_animal/hostile/carp/holocarp/death()
 	..()
@@ -13,4 +13,5 @@
 	attacktext = "chomps"
 	attack_sound = 'sound/weapons/bite.ogg'
 	faction = list("creature")
+	gold_core_spawnable = 1

@@ -25,6 +25,7 @@
 	speed = 4

 	faction = list("faithless")
+	gold_core_spawnable = 1

 /mob/living/simple_animal/hostile/faithless/Process_Spacemove(var/movement_dir = 0)
 	return 1
@@ -49,6 +49,7 @@
 	move_to_delay = 6
 	attacktext = "bites"
 	attack_sound = 'sound/weapons/bite.ogg'
+	gold_core_spawnable = 1

 //nursemaids - these create webs and eggs
 /mob/living/simple_animal/hostile/poison/giant_spider/nurse
@@ -21,6 +21,7 @@
 	ventcrawler = 2
 	var/datum/mind/origin
 	var/egg_lain = 0
+	gold_core_spawnable = 1

 /mob/living/simple_animal/hostile/headcrab/proc/Infect(mob/living/carbon/victim)
 	var/obj/item/organ/internal/body_egg/changeling_egg/egg = new(victim)
@@ -21,6 +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

 /mob/living/simple_animal/hostile/hivebot/range
 	name = "Hivebot"
@@ -30,6 +30,7 @@

 	layer = 3.1		//so they can stay hidde under the /obj/structure/bush
 	var/stalk_tick_delay = 3
+	gold_core_spawnable = 1

 /mob/living/simple_animal/hostile/panther/ListTargets()
 	var/list/targets = list()
@@ -87,6 +88,7 @@

 	layer = 3.1		//so they can stay hidde under the /obj/structure/bush
 	var/stalk_tick_delay = 3
+	gold_core_spawnable = 1

 /mob/living/simple_animal/hostile/snake/ListTargets()
 	var/list/targets = list()
@@ -30,6 +30,7 @@
 	move_to_delay = 9

 	var/is_electronic = 0
+	gold_core_spawnable = 1

 /mob/living/simple_animal/hostile/mimic/FindTarget()
 	. = ..()
@@ -139,6 +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

 /mob/living/simple_animal/hostile/mimic/copy/New(loc, var/obj/copy, var/mob/living/creator, var/destroy_original = 0)
 	..(loc)
@@ -24,6 +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

 /mob/living/simple_animal/hostile/poison/bees/Process_Spacemove(var/check_drift = 0)
 	return 1
@@ -132,6 +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

 /mob/living/simple_animal/hostile/viscerator/death()
 	..()
@@ -28,6 +28,7 @@
 	minbodytemp = 0

 	faction = list("hostile", "winter")
+	gold_core_spawnable = 1

 /mob/living/simple_animal/hostile/tree/FindTarget()
 	. = ..()
@@ -33,6 +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


 /mob/living/simple_animal/hostile/winter/snowman/death()
@@ -63,6 +64,7 @@

 	melee_damage_lower = 5
 	melee_damage_upper = 10
+	gold_core_spawnable = 1

 /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
@@ -82,6 +82,7 @@

 	//Parrots are kleptomaniacs. This variable ... stores the item a parrot is holding.
 	var/obj/item/held_item = null
+	gold_core_spawnable = 2


 /mob/living/simple_animal/parrot/New()
@@ -272,13 +273,13 @@

 	//Sprite and AI update for when a parrot gets pulled
 	if(pulledby && stat == CONSCIOUS)
-		icon_state = "parrot_fly"	
+		icon_state = "parrot_fly"

 /mob/living/simple_animal/parrot/process_ai()
 	if(pulledby)
 		parrot_state = PARROT_WANDER
 		return
-	
+
 	if(!isturf(src.loc) || !canmove || buckled)
 		return //If it can't move, dont let it move. (The buckled check probably isn't necessary thanks to canmove)

@@ -682,6 +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

 /mob/living/simple_animal/parrot/Poly/New()
 	ears = new /obj/item/device/radio/headset/headset_eng(src)
@@ -67,6 +67,8 @@
 	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/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

@@ -695,4 +697,4 @@
 		. |= collar.GetAccess()

 /mob/living/simple_animal/proc/sentience_act() //Called when a simple animal gains sentience via gold slime potion
-	return
+	return