From ff31569b14d9e0b490a29bbdc49c1b0b438bc3ea Mon Sep 17 00:00:00 2001
From: Seris02 <49109742+Seris02@users.noreply.github.com>
Date: Wed, 13 Oct 2021 13:33:49 +0800
Subject: [PATCH] no more regal rat runtimes, and, cheeeeeeeeeeeese can now be
 eaten by it (#62032)

---
 code/game/objects/items/food/misc.dm                      | 2 +-
 code/modules/mob/living/simple_animal/hostile/regalrat.dm | 2 +-
 code/modules/power/cable.dm                               | 2 +-
 code/modules/recycling/disposal/bin.dm                    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/game/objects/items/food/misc.dm b/code/game/objects/items/food/misc.dm
index 3d0936e31f6..372cd63ac85 100644
--- a/code/game/objects/items/food/misc.dm
+++ b/code/game/objects/items/food/misc.dm
@@ -41,7 +41,7 @@
 	. = ..()
 	RegisterSignal(src, COMSIG_RAT_INTERACT, .proc/on_rat_eat)
 
-/obj/item/food/cheese/proc/on_rat_eat(mob/living/simple_animal/hostile/regalrat/king)
+/obj/item/food/cheese/proc/on_rat_eat(datum/source, mob/living/simple_animal/hostile/regalrat/king)
 	SIGNAL_HANDLER
 
 	king.cheese_heal(src, rat_heal, span_green("You eat [src], restoring some health."))
diff --git a/code/modules/mob/living/simple_animal/hostile/regalrat.dm b/code/modules/mob/living/simple_animal/hostile/regalrat.dm
index 455bbda5447..b8dabe892e6 100644
--- a/code/modules/mob/living/simple_animal/hostile/regalrat.dm
+++ b/code/modules/mob/living/simple_animal/hostile/regalrat.dm
@@ -101,7 +101,7 @@
 	if (QDELETED(target))
 		return
 
-	if (target.reagents && target.is_injectable(src, allowmobs = TRUE))
+	if (target.reagents && target.is_injectable(src, allowmobs = TRUE) && !istype(target, /obj/item/food/cheese))
 		src.visible_message(span_warning("[src] starts licking [target] passionately!"),span_notice("You start licking [target]..."))
 		if (do_mob(src, target, 2 SECONDS, interaction_key = "regalrat"))
 			target.reagents.add_reagent(/datum/reagent/rat_spit,rand(1,3),no_react = TRUE)
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index 42d21c56ee6..20ee76d7774 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -48,7 +48,7 @@ GLOBAL_LIST_INIT(wire_node_generating_types, typecacheof(list(/obj/structure/gri
 	AddElement(/datum/element/undertile, TRAIT_T_RAY_VISIBLE)
 	RegisterSignal(src, COMSIG_RAT_INTERACT, .proc/on_rat_eat)
 
-/obj/structure/cable/proc/on_rat_eat(mob/living/simple_animal/hostile/regalrat/king)
+/obj/structure/cable/proc/on_rat_eat(datum/source, mob/living/simple_animal/hostile/regalrat/king)
 	SIGNAL_HANDLER
 
 	if(avail())
diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm
index 41e9cc0c31f..1fa0b2530aa 100644
--- a/code/modules/recycling/disposal/bin.dm
+++ b/code/modules/recycling/disposal/bin.dm
@@ -522,7 +522,7 @@
 	H.destinationTag = 1
 
 
-/obj/machinery/disposal/proc/on_rat_rummage(mob/living/simple_animal/hostile/regalrat/king)
+/obj/machinery/disposal/proc/on_rat_rummage(datum/source, mob/living/simple_animal/hostile/regalrat/king)
 	SIGNAL_HANDLER
 
 	INVOKE_ASYNC(src, /obj/machinery/disposal/.proc/rat_rummage, king)