cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-25 09:31:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ports the radiation subsystem and cleans up damage flags. (#15715)

Browse Source
This commit is contained in:
Matt Atlas
2023-02-07 13:22:47 +01:00
committed by GitHub
parent 5527fc0810
commit 31c73ead85
198 changed files with 981 additions and 649 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/spell_system/artifacts/items/poppet.dm
View File

@@ -109,7 +109,7 @@
if(W.edge)
to_chat(H, "<span class='warning'>You stab \the [src] with \the [W]!</span>")
H.apply_damage(2, BRUTE, target_zone, damage_flags = DAM_EDGE)
H.apply_damage(2, DAMAGE_BRUTE, target_zone, damage_flags = DAMAGE_FLAG_EDGE)
playsound(get_turf(H), 'sound/weapons/bladeslice.ogg', 50, 1, -1)
if(H.can_feel_pain())
var/obj/item/organ/external/organ = H.get_organ(target_zone)
@@ -141,7 +141,7 @@
/obj/item/poppet/bullet_act(var/obj/item/projectile/Proj)
var/mob/living/carbon/human/H = target.resolve()
if(H)
H.apply_damage(Proj.damage, PAIN)
H.apply_damage(Proj.damage, DAMAGE_PAIN)
/obj/item/poppet/fire_act()
var/mob/living/carbon/human/H = target.resolve()