From 8e1d0855df512c4d4e772d72a15c3d9377463111 Mon Sep 17 00:00:00 2001 From: DZD Date: Wed, 10 Dec 2014 21:45:05 -0500 Subject: [PATCH] Properly Removes Slime Person Ventcrawl Commit #535 on https://github.com/ZomgPonies/Paradise had not properly removed the addition of the ventcrawl verb to Slime People, this is fixed. --- code/modules/mob/abilities.dm | 7 ++++--- code/modules/mob/living/carbon/human/human.dm | 3 +-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/abilities.dm b/code/modules/mob/abilities.dm index ca992d86061..83aa4362f29 100644 --- a/code/modules/mob/abilities.dm +++ b/code/modules/mob/abilities.dm @@ -4,8 +4,8 @@ Creature-level abilities. /var/global/list/ability_verbs = list( ) - -/mob/living/carbon/human/slime/proc/slimepeople_ventcrawl() +/* +/mob/living/carbon/human/slime/proc/slimepeople_ventcrawl() // Slime people ventcrawling commented out set category = "Abilities" set name = "Ventcrawl (Slime People)" @@ -34,4 +34,5 @@ Creature-level abilities. M.handle_ventcrawl() else - src << "This should not be happening. At all." \ No newline at end of file + src << "This should not be happening. At all." +*/ diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 904cc91cdc9..6d74e0c411e 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -46,7 +46,6 @@ /mob/living/carbon/human/slime/New(var/new_loc) ..(new_loc, "Slime People") - verbs += /mob/living/carbon/human/slime/proc/slimepeople_ventcrawl /mob/living/carbon/human/grey/New(var/new_loc) ..(new_loc, "Grey") @@ -391,7 +390,7 @@ var/dam_zone = pick("chest", "l_hand", "r_hand", "l_leg", "r_leg") var/datum/organ/external/affecting = get_organ(ran_zone(dam_zone)) var/armor = run_armor_check(affecting, "melee") - + var/datum/organ/external/affected = src.get_organ(dam_zone) affected.add_autopsy_data(M.name, damage) // Add the mob's name to the autopsy data apply_damage(damage, BRUTE, affecting, armor, M.name)