From 475197ee1e7b8af7504a9fa81a560e70cc8ecd16 Mon Sep 17 00:00:00 2001 From: Twinmold93 Date: Mon, 20 Jun 2016 02:51:47 -0500 Subject: [PATCH] Fixes Resisting Borers (#4729) This changes the captive brain's resist connection back to resist() from resist_borer() (an invalid verb). Makes it so you can once again resist borers. Reposted due to number of files adjusted from merging of conflicting files and inconsistencies to prevent breaking other code. :cl: Twinmold Fix: You can once again resist borer control with the Resist verb. /:cl: --- code/game/gamemodes/miniantags/borer/borer.dm | 2 +- code/modules/mob/living/living.dm | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/code/game/gamemodes/miniantags/borer/borer.dm b/code/game/gamemodes/miniantags/borer/borer.dm index 50dcc0d62d1..91c2bddb74c 100644 --- a/code/game/gamemodes/miniantags/borer/borer.dm +++ b/code/game/gamemodes/miniantags/borer/borer.dm @@ -33,7 +33,7 @@ return 0 return B.host.say_understands(other, speaking) -/mob/living/captive_brain/resist_borer() +/mob/living/captive_brain/resist() var/mob/living/simple_animal/borer/B = loc to_chat(src, "You begin doggedly resisting the parasite's control (this will take approximately sixty seconds).") diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index f3c48bce39a..bd360456009 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -588,9 +588,6 @@ visible_message("[src] resists!") return 1 -/mob/living/proc/resist_borer() - return - /mob/living/proc/resist_buckle() spawn(0) resist_muzzle()