From e4a8a7c903a2296b9aa1af405c6617dbdb067ee8 Mon Sep 17 00:00:00 2001 From: Jamie D <993128+JamieD1@users.noreply.github.com> Date: Tue, 14 Jun 2022 21:33:16 +0100 Subject: [PATCH 1/2] Update mouse.dm --- .../living/simple_animal/friendly/mouse.dm | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index d87e59f03f16..ab0a0b3205c7 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -92,9 +92,9 @@ GLOBAL_VAR_INIT(mouse_killed, 0) if(!stat) var/mob/M = AM to_chat(M, span_notice("[icon2html(src, M)] Squeak!")) - if(istype(AM, /obj/item/reagent_containers/food/snacks/royalcheese)) - evolve() - qdel(AM) + //if(istype(AM, /obj/item/reagent_containers/food/snacks/royalcheese)) + // evolve() + // qdel(AM) ..() /mob/living/simple_animal/mouse/handle_automated_action() @@ -116,10 +116,10 @@ GLOBAL_VAR_INIT(mouse_killed, 0) be_fruitful() qdel(cheese) return - for(var/obj/item/reagent_containers/food/snacks/royalcheese/bigcheese in range(1, src)) - qdel(bigcheese) - evolve() - return + //for(var/obj/item/reagent_containers/food/snacks/royalcheese/bigcheese in range(1, src)) + // qdel(bigcheese) + // evolve() + // return /** @@ -261,9 +261,9 @@ GLOBAL_VAR_INIT(mouse_killed, 0) var/list/cheeses = list(/obj/item/reagent_containers/food/snacks/cheesewedge, /obj/item/reagent_containers/food/snacks/cheesewheel, /obj/item/reagent_containers/food/snacks/store/cheesewheel, /obj/item/reagent_containers/food/snacks/customizable/cheesewheel, /obj/item/reagent_containers/food/snacks/cheesiehonkers) //all cheeses - royal - if(istype(F, /obj/item/reagent_containers/food/snacks/royalcheese)) - evolve() - return + //if(istype(F, /obj/item/reagent_containers/food/snacks/royalcheese)) + // evolve() + // return if(istype(F, /obj/item/grown/bananapeel/bluespace)) var/obj/item/grown/bananapeel/bluespace/B var/teleport_radius = max(round(B.seed.potency / 10), 1) From 23b9e0bb3cca4f54810dbfd72e96074dec59d041 Mon Sep 17 00:00:00 2001 From: Jamie D <993128+JamieD1@users.noreply.github.com> Date: Wed, 15 Jun 2022 22:41:11 +0100 Subject: [PATCH 2/2] fuck off --- code/controllers/subsystem/minor_mapping.dm | 2 +- code/modules/mob/living/simple_animal/hostile/regalrat.dm | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/controllers/subsystem/minor_mapping.dm b/code/controllers/subsystem/minor_mapping.dm index d9e137bf2299..2c50afeb811f 100644 --- a/code/controllers/subsystem/minor_mapping.dm +++ b/code/controllers/subsystem/minor_mapping.dm @@ -1,4 +1,4 @@ -#define REGAL_RAT_CHANCE 2 +#define REGAL_RAT_CHANCE 0 #define PLAGUE_RAT_CHANCE 0 SUBSYSTEM_DEF(minor_mapping) name = "Minor Mapping" diff --git a/code/modules/mob/living/simple_animal/hostile/regalrat.dm b/code/modules/mob/living/simple_animal/hostile/regalrat.dm index ac2f67960266..7e3d5c0568c6 100644 --- a/code/modules/mob/living/simple_animal/hostile/regalrat.dm +++ b/code/modules/mob/living/simple_animal/hostile/regalrat.dm @@ -45,6 +45,7 @@ var/title = pick("King","Lord","Prince","Emperor","Supreme","Overlord","Master","Shogun","Bojar","Tsar","Hetman") name = "[kingdom] [title]" language_holder += new /datum/language_holder/mouse(src) + qdel(src) /mob/living/simple_animal/hostile/regalrat/handle_automated_action() if(prob(20))