mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2026-01-03 05:52:17 +00:00
Meteors have been updated to the slightlynewer health system
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2432 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -618,13 +618,12 @@
|
||||
if ((M.client && !( M.blinded )))
|
||||
M.show_message(text("\red [] has been hit by []", src, O), 1)
|
||||
if (health > 0)
|
||||
var/dam_zone = pick("chest", "chest", "chest", "head", "groin")
|
||||
if (istype(organs[dam_zone], /datum/organ/external))
|
||||
var/datum/organ/external/temp = organs[dam_zone]
|
||||
if (istype(O, /obj/effect/immovablerod))
|
||||
temp.take_damage(101, 0)
|
||||
else
|
||||
temp.take_damage((istype(O, /obj/effect/meteor/small) ? 10 : 25), 30)
|
||||
var/datum/organ/external/affecting = get_organ(pick("chest", "chest", "chest", "head"))
|
||||
if(!affecting) return
|
||||
if (istype(O, /obj/effect/immovablerod))
|
||||
affecting.take_damage(101, 0)
|
||||
else
|
||||
affecting.take_damage((istype(O, /obj/effect/meteor/small) ? 10 : 25), 30)
|
||||
UpdateDamageIcon()
|
||||
updatehealth()
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user