cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Forgot something.

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2334 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
mport2004@gmail.com
2011-10-08 10:57:34 +00:00
parent 62e28c2abf
commit c01574181d
2 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
code/game/objects/items/weapons/medical.dm
View File

@@ -46,22 +46,14 @@ MEDICAL
if (istype(M, /mob/living/carbon/human)) if (istype(M, /mob/living/carbon/human))
var/mob/living/carbon/human/H = M var/mob/living/carbon/human/H = M
var/datum/organ/external/affecting = H.organs["chest"] var/datum/organ/external/affecting = H.get_organ("chest")
if (istype(user, /mob/living/carbon/human)) if(istype(user, /mob/living/carbon/human))
var/mob/living/carbon/human/user2 = user var/mob/living/carbon/human/user2 = user
var/t = user2.zone_sel.selecting affecting = H.get_organ(check_zone(user2.zone_sel.selecting))
if (t in list("eyes", "mouth"))
t = "head"
if (H.organs[t])
affecting = H.organs[t]
else else
if (!istype(affecting, /datum/organ/external) || affecting:burn_dam <= 0) if(!istype(affecting, /datum/organ/external) || affecting:burn_dam <= 0)
affecting = H.organs["head"] affecting = H.get_organ("head")
if (!istype(affecting, /datum/organ/external) || affecting:burn_dam <= 0)
affecting = H.organs["groin"]
if (affecting.heal_damage(src.heal_brute, src.heal_burn)) if (affecting.heal_damage(src.heal_brute, src.heal_burn))
H.UpdateDamageIcon() H.UpdateDamageIcon()

1
code/modules/mob/living/carbon/human/human_defense.dm
View File

@@ -76,7 +76,6 @@ emp_act
visible_message("\red <B>[src] has been attacked in the [hit_area] with [I.name] by [user]!</B>") visible_message("\red <B>[src] has been attacked in the [hit_area] with [I.name] by [user]!</B>")
if(check_shields(I.force, "the [I.name]")) if(check_shields(I.force, "the [I.name]"))
world << "SHIELDS"
return 0 return 0
var/armor = run_armor_check(affecting, "melee", "Your armor has protected you from a hit to the [hit_area].", "Your armor has softened hit to your [hit_area].") var/armor = run_armor_check(affecting, "melee", "Your armor has protected you from a hit to the [hit_area].", "Your armor has softened hit to your [hit_area].")
if(armor >= 2) return 0 if(armor >= 2) return 0