cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 03:55:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #66 from TheDZD/Slime-People

Browse Source 
Properly Removes Slime Person Ventcrawl
This commit is contained in:
Fox-McCloud
2014-12-12 17:46:32 -05:00
parent 114f37715b 8e1d0855df
commit e657ee93a8
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/abilities.dm
+4 -3
View File
@@ -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."
src << "This should not be happening. At all."
*/
code/modules/mob/living/carbon/human/human.dm
+1 -2
View File
@@ -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)