cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-29 19:43:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2563 from Baystation12/bleeding-edge-freeze

Browse Source 
All commits in BEF are just fixes
This commit is contained in:
Christian Bielert
2013-03-18 08:47:08 -07:00
parent 729e187ae6 05f4aba49f
commit 48e1a7dfdc
3 changed files with 1506 additions and 1453 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mob/living/living.dm
View File

@@ -239,7 +239,7 @@
src.updatehealth()
// damage MANY external organs, in random order
/mob/living/proc/take_overall_damage(var/brute, var/burn)
/mob/living/proc/take_overall_damage(var/brute, var/burn, var/used_weapon = null)
adjustBruteLoss(brute)
adjustFireLoss(burn)
src.updatehealth()

4
code/modules/surgery/braincore.dm
View File

@@ -102,7 +102,7 @@
// BRAIN DAMAGE FIXING //
//////////////////////////////////////////////////////////////////
/datum/surgery_step/brain/cut_brain
/datum/surgery_step/brain/fix_brain
required_tool = /obj/item/weapon/hemostat
allowed_tools = list(/obj/item/weapon/wirecutters, /obj/item/weapon/kitchen/utensil/fork)
@@ -114,7 +114,7 @@
begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
user.visible_message("[user] starts mending ruptured vessels in [target]'s brain with \the [tool].", \
"You start mending [target]'s brainwith \the [tool].")
"You start mending [target]'s brain with \the [tool].")
..()
end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)