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

Merge pull request #5171 from Fox-McCloud/apply-damage

Browse Source 
Fixes up apply_damage
This commit is contained in:
TheDZD
2016-07-26 13:28:43 -04:00
committed by GitHub
parent 25931f525c 25c01ef3ba
commit bcfa4d1863
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/face.dm
+1 -1
View File
@@ -128,7 +128,7 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message("<span class='warning'> [user]'s hand slips, tearing skin on [target]'s face with \the [tool]!</span>", \
"<span class='warning'> Your hand slips, tearing skin on [target]'s face with \the [tool]!</span>")
target.apply_damage(10, BRUTE, affected, sharp=1, sharp=1)
target.apply_damage(10, BRUTE, affected, sharp=1, edge=1)
return 0
/datum/surgery_step/face/cauterize
code/modules/surgery/other.dm
+2 -2
View File
@@ -256,11 +256,11 @@
if(iscarbon(user))
var/mob/living/carbon/C = user
C.Weaken(6)
C.apply_damage(20, "brute", "chest")
C.apply_damage(20, BRUTE, "chest")
else if(issilicon(user))
var/mob/living/silicon/S = user
S.Weaken(8)
S.apply_damage(20, "brute")
S.apply_damage(20, BRUTE)
playsound(S, 'sound/effects/bang.ogg', 50, 1)
return 0
user.visible_message("[user] shines light onto the tumor in [target]'s head!", "<span class='notice'>You cleanse the contamination from [target]'s brain!</span>")