Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Disabling Regal Rat till its fixed #14437

Merged
JamieD1 merged 2 commits into from
Jun 26, 2022
Merged

Disabling Regal Rat till its fixed #14437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4a8a7c
Update mouse.dm
JamieD1 Jun 14, 2022
23b9e0b
fuck off
JamieD1 Jun 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/controllers/subsystem/minor_mapping.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
20 changes: 10 additions & 10 deletions code/modules/mob/living/simple_animal/friendly/mouse.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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


/**
Expand Down Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/living/simple_animal/hostile/regalrat.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down