Merge pull request #9688 from Ghommie/Ghommie-cit306

Fixing gibspawner runtimes and improving them, how gruesome...
2019-11-14 15:51:20 -07:00
parent a4e47df4bb e02849fab7
commit 8f08e1017e
19 changed files with 47 additions and 53 deletions
@@ -1,8 +1,9 @@
-/mob/living/carbon/alien/spawn_gibs(with_bodyparts)
+/mob/living/carbon/alien/spawn_gibs(with_bodyparts, atom/loc_override)
+	var/location = loc_override ? loc_override.drop_location() : drop_location()
 	if(with_bodyparts)
-		new /obj/effect/gibspawner/xeno(drop_location())
+		new /obj/effect/gibspawner/xeno(location, src)
 	else
-		new /obj/effect/gibspawner/xeno/bodypartless(drop_location())
+		new /obj/effect/gibspawner/xeno/bodypartless(location, src)

 /mob/living/carbon/alien/gib_animation()
 	new /obj/effect/temp_visual/gib_animation(loc, "gibbed-a")
@@ -6,11 +6,12 @@

 	update_icons()

-/mob/living/carbon/alien/larva/spawn_gibs(with_bodyparts)
+/mob/living/carbon/alien/larva/spawn_gibs(with_bodyparts, atom/loc_override)
+	var/location = loc_override ? loc_override.drop_location() : drop_location()
 	if(with_bodyparts)
-		new /obj/effect/gibspawner/larva(drop_location())
+		new /obj/effect/gibspawner/larva(location, src)
 	else
-		new /obj/effect/gibspawner/larva/bodypartless(drop_location())
+		new /obj/effect/gibspawner/larva/bodypartless(location, src)

 /mob/living/carbon/alien/larva/gib_animation()
 	new /obj/effect/temp_visual/gib_animation(loc, "gibbed-l")
@@ -4,36 +4,21 @@
 /mob/living/carbon/human/dust_animation()
 	new /obj/effect/temp_visual/dust_animation(loc, "dust-h")

-/mob/living/carbon/human/spawn_gibs(with_bodyparts)
-	if(isjellyperson(src))
-		if(with_bodyparts)
-			new /obj/effect/gibspawner/slime(drop_location(), dna, get_static_viruses())
+/mob/living/carbon/human/spawn_gibs(with_bodyparts, atom/loc_override)
+	var/location = loc_override ? loc_override.drop_location() : drop_location()
+	if(dna?.species?.gib_types)
+		var/datum/species/S = dna.species
+		var/length = length(S.gib_types)
+		if(length)
+			var/path = (with_bodyparts && length > 1) ? S.gib_types[2] : S.gib_types[1]
+			new path(location, src, get_static_viruses())
 		else
-			new /obj/effect/gibspawner/slime/bodypartless(drop_location(), dna, get_static_viruses())
-
-	if(isipcperson(src))
-		if(with_bodyparts)
-			new /obj/effect/gibspawner/ipc(drop_location(), dna, get_static_viruses())
-		else
-			new /obj/effect/gibspawner/ipc/bodypartless(drop_location(), dna, get_static_viruses())
-
-	if(isxenoperson(src))
-		if(with_bodyparts)
-			new /obj/effect/gibspawner/xeno/xenoperson(drop_location(), dna, get_static_viruses())
-		else
-			new /obj/effect/gibspawner/xeno/xenoperson/bodypartless(drop_location(), dna, get_static_viruses())
-
-	if(islizard(src))
-		if(with_bodyparts)
-			new /obj/effect/gibspawner/lizard(drop_location(), dna, get_static_viruses())
-		else
-			new /obj/effect/gibspawner/lizard/bodypartless(drop_location(), dna, get_static_viruses())
-
+			new S.gib_types(location, src, get_static_viruses())
 	else
 		if(with_bodyparts)
-			new /obj/effect/gibspawner/human(drop_location(), dna, get_static_viruses())
+			new /obj/effect/gibspawner/human(location, src, get_static_viruses())
 		else
-			new /obj/effect/gibspawner/human/bodypartless(drop_location(), dna, get_static_viruses())
+			new /obj/effect/gibspawner/human/bodypartless(location, src, get_static_viruses())

 /mob/living/carbon/human/spawn_dust(just_ash = FALSE)
 	if(just_ash)
@@ -43,6 +43,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 	var/exotic_blood = ""	// If your race wants to bleed something other than bog standard blood, change this to reagent id.
 	var/exotic_bloodtype = "" //If your race uses a non standard bloodtype (A+, O-, AB-, etc)
 	var/meat = /obj/item/reagent_containers/food/snacks/meat/slab/human //What the species drops on gibbing
+	var/list/gib_types = list(/obj/effect/gibspawner/human, /obj/effect/gibspawner/human/bodypartless)
 	var/skinned_type
 	var/liked_food = NONE
 	var/disliked_food = GROSS
@@ -6,6 +6,7 @@
 	inherent_traits = list(TRAIT_RESISTHEAT,TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_RADIMMUNE,TRAIT_NOFIRE,TRAIT_PIERCEIMMUNE,TRAIT_NOHUNGER,TRAIT_LIMBATTACHMENT)
 	inherent_biotypes = list(MOB_ROBOTIC, MOB_HUMANOID)
 	meat = null
+	gib_types = /obj/effect/gibspawner/robot
 	damage_overlay_type = "synth"
 	mutanttongue = /obj/item/organ/tongue/robot
 	limbs_id = "synth"
@@ -17,4 +17,5 @@
 	use_skintones = 0
 	species_traits = list(NOBLOOD,EYECOLOR,NOGENITALS)
 	inherent_traits = list(TRAIT_RADIMMUNE,TRAIT_VIRUSIMMUNE,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER,TRAIT_NOLIMBDISABLE,TRAIT_NOHUNGER)
-	sexes = 0
+	sexes = 0
+	gib_types = /obj/effect/gibspawner/robot
@@ -64,6 +64,7 @@
 	attack_sound = 'sound/weapons/slash.ogg'
 	miss_sound = 'sound/weapons/slashmiss.ogg'
 	meat = /obj/item/reagent_containers/food/snacks/meat/slab/xeno
+	gib_types = list(/obj/effect/gibspawner/xeno/xenoperson, /obj/effect/gibspawner/xeno/xenoperson/bodypartless)
 	skinned_type = /obj/item/stack/sheet/animalhide/xeno
 	exotic_bloodtype = "X*"
 	damage_overlay_type = "xeno"
@@ -11,6 +11,7 @@
 	mutant_bodyparts = list("ipc_screen", "ipc_antenna")
 	default_features = list("ipc_screen" = "Blank", "ipc_antenna" = "None")
 	meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/ipc
+	gib_types = list(/obj/effect/gibspawner/ipc, /obj/effect/gibspawner/ipc/bodypartless)
 	mutanttongue = /obj/item/organ/tongue/robot/ipc
 	mutant_heart = /obj/item/organ/heart/ipc
 	exotic_bloodtype = "HF"
@@ -11,6 +11,7 @@
 	default_features = list("mcolor" = "FFF", "mam_tail" = "None", "mam_ears" = "None", "mam_snouts" = "None", "taur" = "None", "deco_wings" = "None") //CIT CHANGE
 	inherent_traits = list(TRAIT_TOXINLOVER)
 	meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/slime
+	gib_types = list(/obj/effect/gibspawner/slime, /obj/effect/gibspawner/slime/bodypartless)
 	exotic_blood = "jellyblood"
 	exotic_bloodtype = "GEL"
 	damage_overlay_type = ""
@@ -18,6 +18,7 @@
 	attack_sound = 'sound/weapons/slash.ogg'
 	miss_sound = 'sound/weapons/slashmiss.ogg'
 	meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard
+	gib_types = list(/obj/effect/gibspawner/lizard, /obj/effect/gibspawner/lizard/bodypartless)
 	skinned_type = /obj/item/stack/sheet/animalhide/lizard
 	exotic_bloodtype = "L"
 	disliked_food = GRAIN | DAIRY
@@ -9,6 +9,7 @@
 	dangerous_existence = 1
 	blacklisted = 1
 	meat = null
+	gib_types = /obj/effect/gibspawner/robot
 	damage_overlay_type = "synth"
 	limbs_id = "synth"
 	var/list/initial_species_traits = list(NOTRANSSTING) //for getting these values back for assume_disguise()
@@ -23,8 +23,12 @@
 /mob/living/proc/gib_animation()
 	return

-/mob/living/proc/spawn_gibs()
-	new /obj/effect/gibspawner/generic(drop_location(), null, get_static_viruses())
+/mob/living/proc/spawn_gibs(with_bodyparts, atom/loc_override)
+	var/location = loc_override ? loc_override.drop_location() : drop_location()
+	if(MOB_ROBOTIC in mob_biotypes)
+		new /obj/effect/gibspawner/robot(location, src, get_static_viruses())
+	else
+		new /obj/effect/gibspawner/generic(location, src, get_static_viruses())

 /mob/living/proc/spill_organs()
 	return
@@ -1,5 +1,5 @@
-/mob/living/silicon/spawn_gibs()
-	new /obj/effect/gibspawner/robot(drop_location())
+/mob/living/silicon/spawn_gibs(with_bodyparts, atom/loc_override)
+	new /obj/effect/gibspawner/robot(loc_override ? loc_override.drop_location() : drop_location(), src)

 /mob/living/silicon/spawn_dust()
 	new /obj/effect/decal/remains/robot(loc)
@@ -95,7 +95,7 @@
 		if(M)
 			playsound(src, 'sound/magic/demon_consume.ogg', 50, 1)
 			M.adjustBruteLoss(60)
-			new /obj/effect/gibspawner/generic(get_turf(M))
+			M.spawn_gibs()
 			if(M.stat == DEAD)
 				var/mob/living/simple_animal/hostile/netherworld/blankbody/blank
 				blank = new(loc)