mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-22 12:29:46 +01:00
Ports the radiation subsystem and cleans up damage flags. (#15715)
This commit is contained in:
@@ -49,7 +49,7 @@
|
||||
damage_coef -= 0.2
|
||||
return
|
||||
|
||||
if(H.apply_damage(25 * damage_coef, BRUTE, affecting))
|
||||
if(H.apply_damage(25 * damage_coef, DAMAGE_BRUTE, affecting))
|
||||
H.updatehealth()
|
||||
|
||||
if(H.can_feel_pain())
|
||||
|
||||
@@ -54,7 +54,7 @@
|
||||
for(var/thing in O.implants)
|
||||
var/obj/S = thing
|
||||
usr.visible_message("<span class='notice'>[usr] starts carefully digging out something in [H == usr ? "themselves" : H]...</span>")
|
||||
O.take_damage(8, 0, DAM_SHARP|DAM_EDGE, src)
|
||||
O.take_damage(8, 0, DAMAGE_FLAG_SHARP|DAMAGE_FLAG_EDGE, src)
|
||||
H.custom_pain("<font size=3><span class='danger'>It burns!</span></font>", 50)
|
||||
if(do_mob(usr, H, 100))
|
||||
H.remove_implant(S, FALSE)
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
return FALSE
|
||||
|
||||
/obj/item/material/sword/perform_technique(var/mob/living/carbon/human/target, var/mob/living/carbon/human/user, var/target_zone)
|
||||
var/armor_reduction = target.get_blocked_ratio(target_zone, BRUTE, DAM_EDGE|DAM_SHARP, damage = force)*100
|
||||
var/armor_reduction = target.get_blocked_ratio(target_zone, DAMAGE_BRUTE, DAMAGE_FLAG_EDGE|DAMAGE_FLAG_SHARP, damage = force)*100
|
||||
var/obj/item/organ/external/affecting = target.get_organ(target_zone)
|
||||
if(!affecting)
|
||||
return
|
||||
|
||||
@@ -605,7 +605,7 @@
|
||||
icon_state = "flag_hegemony0"
|
||||
base_icon = "flag_hegemony"
|
||||
contained_sprite = TRUE
|
||||
damtype = BURN
|
||||
damtype = DAMAGE_BURN
|
||||
|
||||
/obj/item/material/twohanded/pike/silver/Initialize(newloc, material_key)
|
||||
. = ..(newloc, MATERIAL_SILVER)
|
||||
|
||||
Reference in New Issue
Block a user