cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 02:54:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3758 from Fox-McCloud/remove-halloss

Browse Source 
Removes Halloss
This commit is contained in:
TheDZD
2016-03-05 22:39:19 -05:00
parent ab490f7fd9 c98e2ff7ce
commit 4b610d8dda
17 changed files with 19 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/cargoprofile.dm
+2 -2
View File
@@ -771,7 +771,7 @@
playsound(master.loc, "punch", 25, 1, -1)
master.visible_message("\red <B>\The [src] has punched [M]!</B>")
if(!master.emagged)
M.apply_damage(damage, HALLOSS, affecting, armor_block) // Clean fight
M.apply_damage(damage, STAMINA, affecting, armor_block) // Clean fight
else
M.apply_damage(damage, BRUTE, affecting, armor_block) // Foul! Foooul!
@@ -789,7 +789,7 @@
inlet_reaction(var/atom/W,var/turf/S,var/remaining)
//stolen from boxing gloves code
var/mob/living/carbon/human/M = W
if((M.lying || (M.health - M.halloss < 25))&& !master.emagged)
if((M.lying || (M.health - M.staminaloss < 25))&& !master.emagged)
M << "\The [src] gives you a break."
master.sleep+=5
return 0 // Be polite