Merge pull request #12466 from phil235/BugFixBoogalooH

Bugfixes: soulstone, reagent runtimes, etc

code/game/gamemodes/cult/runes.dm

@@ -398,8 +398,11 @@ var/list/teleport_other_runes = list()
 						M << "<span class='cult'>\"I accept this meager sacrifice.\"</span>"
 		if(T.mind)
 			var/obj/item/device/soulstone/stone = new /obj/item/device/soulstone(get_turf(src))
+			stone.invisibility = INVISIBILITY_MAXIMUM //so it's not picked up during transfer_soul()
 			if(!stone.transfer_soul("FORCE", T, usr)) //If it cannot be added
 				qdel(stone)
+			if(stone)
+				stone.invisibility = 0
 			if(!T)
 				rune_in_use = 0
 				return

code/game/gamemodes/wizard/soulstone.dm

@@ -101,93 +101,88 @@
 ////////////////////////////Proc for moving soul in and out off stone//////////////////////////////////////
 
 
-/obj/item/device/soulstone/proc/transfer_soul(choice as text, target, mob/U).
+/obj/item/device/soulstone/proc/transfer_soul(choice as text, target, mob/user).
 	switch(choice)
 		if("FORCE")
 			if(!iscarbon(target))		//TO-DO: Add sacrifice stoning for non-organics, just because you have no body doesnt mean you dont have a soul
 				return 0
+			if(contents.len)
+				return 0
 			var/mob/living/carbon/T = target
-			var/obj/item/device/soulstone/C = src
 			if(T.client != null)
-				if(C.contents.len)
-					return 0
-				else
-					for(var/obj/item/W in T)
-						T.unEquip(W)
-				init_shade(C, T, U)
+				for(var/obj/item/W in T)
+					T.unEquip(W)
+				init_shade(src, T, user)
 				return 1
 			else
-				U << "<span class='userdanger'>Capture failed!</span>: The soul has already fled it's mortal frame. You attempt to bring it back..."
-				getCultGhost(C,T,U)
-			return 0
+				user << "<span class='userdanger'>Capture failed!</span>: The soul has already fled it's mortal frame. You attempt to bring it back..."
+				return getCultGhost(src,T,user)
+
 		if("VICTIM")
 			var/mob/living/carbon/human/T = target
-			var/obj/item/device/soulstone/C = src
 			if(ticker.mode.name == "cult" && T.mind == ticker.mode:sacrifice_target)
-				if(iscultist(U))
-					U << "<span class='danger'>The Geometer of blood wants this mortal sacrificed with the rune.</span>"
+				if(iscultist(user))
+					user << "<span class='danger'>The Geometer of blood wants this mortal sacrificed with the rune.</span>"
 				else
-					U << "<span class='danger'>The soul stone doesn't work for no apparent reason.</span>"
+					user << "<span class='danger'>The soul stone doesn't work for no apparent reason.</span>"
 				return 0
-			if(C.imprinted != "empty")
-				U << "<span class='userdanger'>Capture failed!</span>: The soul stone has already been imprinted with [C.imprinted]'s mind!"
+			if(imprinted != "empty")
+				user << "<span class='userdanger'>Capture failed!</span>: The soul stone has already been imprinted with [imprinted]'s mind!"
 			else
 				if (T.stat == 0)
-					U << "<span class='userdanger'>Capture failed!</span>: Kill or maim the victim first!"
+					user << "<span class='userdanger'>Capture failed!</span>: Kill or maim the victim first!"
 				else
 					if(T.client == null)
-						U << "<span class='userdanger'>Capture failed!</span>: The soul has already fled it's mortal frame. You attempt to bring it back..."
-						getCultGhost(C,T,U)
+						user << "<span class='userdanger'>Capture failed!</span>: The soul has already fled it's mortal frame. You attempt to bring it back..."
+						getCultGhost(src,T,user)
 					else
-						if(C.contents.len)
-							U << "<span class='userdanger'>Capture failed!</span>: The soul stone is full! Use or free an existing soul to make room."
+						if(contents.len)
+							user << "<span class='userdanger'>Capture failed!</span>: The soul stone is full! Use or free an existing soul to make room."
 						else
 							for(var/obj/item/W in T)
 								T.unEquip(W)
-							init_shade(C, T, U, vic = 1)
+							init_shade(src, T, user, vic = 1)
 							qdel(T)
 		if("SHADE")
 			var/mob/living/simple_animal/shade/T = target
-			var/obj/item/device/soulstone/C = src
 			if (T.stat == DEAD)
-				U << "<span class='userdanger'>Capture failed!</span>: The shade has already been banished!"
+				user << "<span class='userdanger'>Capture failed!</span>: The shade has already been banished!"
 			else
-				if(C.contents.len)
-					U << "<span class='userdanger'>Capture failed!</span>: The soul stone is full! Use or free an existing soul to make room."
+				if(contents.len)
+					user << "<span class='userdanger'>Capture failed!</span>: The soul stone is full! Use or free an existing soul to make room."
 				else
-					if(T.name != C.imprinted)
-						U << "<span class='userdanger'>Capture failed!</span>: The soul stone has already been imprinted with [C.imprinted]'s mind!"
+					if(T.name != imprinted)
+						user << "<span class='userdanger'>Capture failed!</span>: The soul stone has already been imprinted with [imprinted]'s mind!"
 					else
-						T.loc = C //put shade in stone
+						T.loc = src //put shade in stone
 						T.status_flags |= GODMODE
 						T.canmove = 0
 						T.health = T.maxHealth
-						C.icon_state = "soulstone2"
+						icon_state = "soulstone2"
 						T << "Your soul has been recaptured by the soul stone, its arcane energies are reknitting your ethereal form"
-						if(U != T)
-							U << "<span class='info'><b>Capture successful!</b>:</span> [T.name]'s has been recaptured and stored within the soul stone."
+						if(user != T)
+							user << "<span class='info'><b>Capture successful!</b>:</span> [T.name]'s has been recaptured and stored within the soul stone."
 		if("CONSTRUCT")
 			var/obj/structure/constructshell/T = target
-			var/obj/item/device/soulstone/C = src
-			var/mob/living/simple_animal/shade/A = locate() in C
+			var/mob/living/simple_animal/shade/A = locate() in src
 			if(A)
-				var/construct_class = alert(U, "Please choose which type of construct you wish to create.",,"Juggernaut","Wraith","Artificer")
+				var/construct_class = alert(user, "Please choose which type of construct you wish to create.",,"Juggernaut","Wraith","Artificer")
 				if(!T || !T.loc)
 					return
 				switch(construct_class)
 					if("Juggernaut")
-						makeNewConstruct(/mob/living/simple_animal/construct/armored, A, U)
+						makeNewConstruct(/mob/living/simple_animal/construct/armored, A, user)
 
 					if("Wraith")
-						makeNewConstruct(/mob/living/simple_animal/construct/wraith, A, U)
+						makeNewConstruct(/mob/living/simple_animal/construct/wraith, A, user)
 
 					if("Artificer")
-						makeNewConstruct(/mob/living/simple_animal/construct/builder, A, U)
+						makeNewConstruct(/mob/living/simple_animal/construct/builder, A, user)
 
 				qdel(T)
-				qdel(C)
+				qdel(src)
 			else
-				U << "<span class='userdanger'>Creation failed!</span>: The soul stone is empty! Go kill someone!"
+				user << "<span class='userdanger'>Creation failed!</span>: The soul stone is empty! Go kill someone!"
 	return
 
 
@@ -261,6 +256,10 @@
 
 	sleep(50)
 
+	if(!T) //target mob got soulstoned or gibbed during sleep(50)
+		return 0
+	listclearnulls(consenting_candidates) //some candidates might have left during sleep(50)
+
 	if(consenting_candidates.len)
 		var/client/ghost = null
 		ghost = pick(consenting_candidates)
@@ -272,5 +271,7 @@
 			T.unEquip(W)
 		init_shade(C, T, U)
 		qdel(T)
+		return 1
 	else
 		U << "<span class='danger'>The ghost has fled beyond your grasp.</span>"
+		return 0

code/game/objects/effects/spiders.dm

@@ -219,6 +219,9 @@
 				if(!src)
 					return
 
+				listclearnulls(consenting_candidates) //some candidates might have left during sleep(50)
+
+
 				if(consenting_candidates.len)
 					var/client/C = null
 					C = pick(consenting_candidates)

code/game/objects/items/weapons/grenades/chem_grenade.dm

@@ -156,7 +156,7 @@
 		nadeassembly.on_found(finder)
 
 /obj/item/weapon/grenade/chem_grenade/prime()
-	if(stage != READY)
+	if(stage != READY || !reagents)
 		return
 
 	var/has_reagents

code/modules/clothing/spacesuits/hardsuit.dm

@@ -274,8 +274,6 @@
 	armor = list(melee = 40, bullet = 40, laser = 40, energy = 20, bomb = 35, bio = 100, rad = 50)
 	heat_protection = HEAD												//Uncomment to enable firesuit protection
 	max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT
-	unacidable = 1
-
 
 /obj/item/clothing/suit/space/hardsuit/wizard
 	icon_state = "hardsuit-wiz"
@@ -289,7 +287,6 @@
 	allowed = list(/obj/item/weapon/teleportation_scroll,/obj/item/weapon/tank/internals)
 	heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS					//Uncomment to enable firesuit protection
 	max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT
-	unacidable = 1
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/wizard
 
 

code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm

@@ -106,6 +106,8 @@ Doesn't work on other aliens/AI.*/
 	for(var/mob/living/Ms in oview(user))
 		options += Ms
 	var/mob/living/M = input("Select who to whisper to:","Whisper to?",null) as null|mob in options
+	if(!M)
+		return 0
 	var/msg = sanitize(input("Message:", "Alien Whisper") as text|null)
 	if(msg)
 		log_say("AlienWhisper: [key_name(user)]->[M.key] : [msg]")

code/modules/mob/living/carbon/alien/special/alien_embryo.dm

@@ -73,7 +73,7 @@ var/const/ALIEN_AFK_BRACKET = 450 // 45 seconds
 	// To stop clientless larva, we will check that our host has a client
 	// if we find no ghosts to become the alien. If the host has a client
 	// he will become the alien but if he doesn't then we will set the stage
-	// to 2, so we don't do a process heavy check everytime.
+	// to 4, so we don't do a process heavy check everytime.
 
 	if(candidates.len)
 		C = pick(candidates)
@@ -85,16 +85,20 @@ var/const/ALIEN_AFK_BRACKET = 450 // 45 seconds
 
 	var/overlay = image('icons/mob/alien.dmi', loc = owner, icon_state = "burst_lie")
 	owner.overlays += overlay
-	spawn(6)
-		var/atom/xeno_loc = owner
-		if(!gib_on_success)
-			xeno_loc = get_turf(xeno_loc)
 
-		var/mob/living/carbon/alien/larva/new_xeno = new(xeno_loc)
-		new_xeno.key = C.key
-		new_xeno << sound('sound/voice/hiss5.ogg',0,0,0,100)	//To get the player's attention
+	var/atom/xeno_loc = get_turf(owner)
+	var/mob/living/carbon/alien/larva/new_xeno = new(xeno_loc)
+	new_xeno.key = C.key
+	new_xeno << sound('sound/voice/hiss5.ogg',0,0,0,100)	//To get the player's attention
+	new_xeno.canmove = 0 //so we don't move during the bursting animation
+	new_xeno.notransform = 1
+	new_xeno.invisibility = INVISIBILITY_MAXIMUM
+	spawn(6)
+		if(new_xeno)
+			new_xeno.canmove = 1
+			new_xeno.notransform = 0
+			new_xeno.invisibility = 0
 		if(gib_on_success)
-			owner.stomach_contents += new_xeno
 			owner.gib()
 		else
 			owner.adjustBruteLoss(40)

code/modules/mob/living/carbon/human/human_defense.dm

@@ -299,7 +299,7 @@ emp_act
 /mob/living/carbon/human/attack_animal(mob/living/simple_animal/M)
 	if(..())
 		var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
-		if(check_shields(damage, "the [M.name]", "", "", M.armour_penetration))
+		if(check_shields(damage, "the [M.name]", null, 0, M.armour_penetration))
 			return 0
 		var/dam_zone = pick("chest", "l_hand", "r_hand", "l_leg", "r_leg")
 		var/obj/item/organ/limb/affecting = get_organ(ran_zone(dam_zone))

code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm

@@ -429,8 +429,8 @@
 	id = "corn_syrup"
 	description = "Decays into sugar."
 	color = "#C8A5DC"
+	metabolization_rate = 3 * REAGENTS_METABOLISM
 
 /datum/reagent/consumable/corn_syrup/on_mob_life(mob/living/M)
-	M.reagents.add_reagent("sugar", 3)
-	M.reagents.remove_reagent("corn_syrup", 1)
+	holder.add_reagent("sugar", 3)
 	..()

code/modules/reagents/Chemistry-Reagents/Other-Reagents.dm

@@ -188,6 +188,7 @@
 			M.jitteriness = 0
 			M.stuttering = 0
 			M.confused = 0
+			return
 	holder.remove_reagent(src.id, 0.4)	//fixed consumption to prevent balancing going out of whack
 	return
 

code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm

@@ -377,9 +377,10 @@
 
 /datum/reagent/toxin/formaldehyde/on_mob_life(mob/living/M)
 	if(prob(5))
-		M.reagents.add_reagent("histamine",pick(5,15))
-		M.reagents.remove_reagent("formaldehyde",1)
-	..()
+		holder.add_reagent("histamine", pick(5,15))
+		holder.remove_reagent("formaldehyde", 1.2)
+	else
+		..()
 
 /datum/reagent/toxin/venom
 	name = "Venom"
@@ -394,9 +395,10 @@
 	toxpwr = 0.2*volume
 	M.adjustBruteLoss((0.3*volume)*REM)
 	if(prob(15))
-		M.reagents.add_reagent("histamine",pick(5,10))
-		M.reagents.remove_reagent("venom",1)
-	..()
+		M.reagents.add_reagent("histamine", pick(5,10))
+		M.reagents.remove_reagent("venom", 1.1)
+	else
+		..()
 
 /datum/reagent/toxin/neurotoxin2
 	name = "Neurotoxin"
@@ -467,7 +469,8 @@
 		M.adjustBruteLoss(0.2*REM)
 	if(prob(3))
 		M.reagents.add_reagent("histamine",rand(1,3))
-		M.reagents.remove_reagent("itching_powder",1)
+		M.reagents.remove_reagent("itching_powder",1.2)
+		return
 	..()
 
 /datum/reagent/toxin/initropidril

code/modules/research/xenobiology/xenobiology.dm

@@ -204,6 +204,8 @@
 	if(!src)
 		return
 
+	listclearnulls(consenting_candidates) //some candidates might have left during sleep(50)
+
 	if(consenting_candidates.len)
 		var/client/C = null
 		C = pick(consenting_candidates)