From 90bf157f5e65a21276dcab47e0ad03da370bf1ba Mon Sep 17 00:00:00 2001
From: Ghommie <42542238+Ghommie@users.noreply.github.com>
Date: Fri, 8 May 2020 17:17:33 +0200
Subject: [PATCH] Fixing some runtimes and issues.

---
 code/modules/clothing/head/helmet.dm                        | 2 +-
 code/modules/clothing/spacesuits/hardsuit.dm                | 2 +-
 code/modules/mob/living/living_defense.dm                   | 2 +-
 .../research/xenobiology/crossbreeding/stabilized.dm        | 2 +-
 modular_citadel/code/modules/arousal/arousal.dm             | 2 +-
 modular_citadel/code/modules/arousal/genitals.dm            | 6 +++---
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index 3d744effb0..25ef367b48 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -273,7 +273,7 @@
 
 //LightToggle
 
-/obj/item/clothing/head/helment/ComponentInitialize()
+/obj/item/clothing/head/helmet/ComponentInitialize()
 	. = ..()
 	AddElement(/datum/element/update_icon_updates_onmob)
 
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index bc0aaf23f8..2e72c154d9 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -41,7 +41,7 @@
 
 /obj/item/clothing/head/helmet/space/hardsuit/dropped(mob/user)
 	..()
-	if(suit)
+	if(suit && !ismob(loc)) //equipped() will handle mob cases, so it doesn't disengage twice.
 		suit.RemoveHelmet()
 		soundloop.stop(user)
 
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 3e4fbd9625..f5780881af 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -340,7 +340,7 @@
 		if(M.is_muzzled() || (M.wear_mask && M.wear_mask.flags_cover & MASKCOVERSMOUTH))
 			to_chat(M, "<span class='warning'>You can't bite with your mouth covered!</span>")
 			return FALSE
-		if(run_block(M, 0, "the [M.name]", ATTACK_TYPE_MELEE | ATTACK_TYPE_UNARMED, M, check_zone(M.zone_selected)) & BLOCK_SUCCESS)
+		if(run_block(M, 0, "the [M.name]", ATTACK_TYPE_MELEE | ATTACK_TYPE_UNARMED, 0, M, check_zone(M.zone_selected)) & BLOCK_SUCCESS)
 			return FALSE
 		M.do_attack_animation(src, ATTACK_EFFECT_BITE)
 		if (prob(75))
diff --git a/code/modules/research/xenobiology/crossbreeding/stabilized.dm b/code/modules/research/xenobiology/crossbreeding/stabilized.dm
index 1912ca6476..8fbe841828 100644
--- a/code/modules/research/xenobiology/crossbreeding/stabilized.dm
+++ b/code/modules/research/xenobiology/crossbreeding/stabilized.dm
@@ -158,7 +158,7 @@ Stabilized extracts:
 
 /obj/item/slimecross/stabilized/rainbow/attackby(obj/item/O, mob/user)
 	var/obj/item/slimecross/regenerative/regen = O
-	if(istype(O) && !regencore)
+	if(istype(regen) && !regencore)
 		to_chat(user, "<span class='notice'>You place the [O] in the [src], prepping the extract for automatic application!</span>")
 		regencore = regen
 		regen.forceMove(src)
diff --git a/modular_citadel/code/modules/arousal/arousal.dm b/modular_citadel/code/modules/arousal/arousal.dm
index 44eafc5fc6..c9b2690784 100644
--- a/modular_citadel/code/modules/arousal/arousal.dm
+++ b/modular_citadel/code/modules/arousal/arousal.dm
@@ -63,7 +63,7 @@
 	if(!target || !R)
 		return
 	var/turfing = isturf(target)
-	G.generate_fluid()
+	G.generate_fluid(R)
 	if(spill && R.total_volume >= 5)
 		R.reaction(turfing ? target : target.loc, TOUCH, 1, 0)
 	if(!turfing)
diff --git a/modular_citadel/code/modules/arousal/genitals.dm b/modular_citadel/code/modules/arousal/genitals.dm
index 731c69a457..fb254a2dcc 100644
--- a/modular_citadel/code/modules/arousal/genitals.dm
+++ b/modular_citadel/code/modules/arousal/genitals.dm
@@ -159,10 +159,10 @@
 	if(fluid_id && CHECK_BITFIELD(genital_flags, GENITAL_FUID_PRODUCTION))
 		time_since_last_orgasm++
 
-/obj/item/organ/genital/proc/generate_fluid()
+/obj/item/organ/genital/proc/generate_fluid(datum/reagents/R)
 	var/amount = clamp(fluid_rate * time_since_last_orgasm * fluid_mult,0,fluid_max_volume)
-	reagents.clear_reagents()
-	reagents.add_reagent(fluid_id,amount)
+	R.clear_reagents()
+	R.add_reagent(fluid_id,amount)
 	return TRUE
 
 /obj/item/organ/genital/proc/update_link()