cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-24 17:11:22 +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/mining/drilling/drill.dm
View File

@@ -493,12 +493,12 @@
connected.system_error("Unexpected user interface error.")
return
else
H.apply_damage(25, BRUTE, damage_flags = DAM_SHARP|DAM_EDGE)
H.apply_damage(25, DAMAGE_BRUTE, damage_flags = DAMAGE_FLAG_SHARP|DAMAGE_FLAG_EDGE)
connected.system_error("Unexpected user interface error.")
return
else
var/mob/living/M = user
M.apply_damage(25, BRUTE, damage_flags = DAM_SHARP|DAM_EDGE)
M.apply_damage(25, DAMAGE_BRUTE, damage_flags = DAMAGE_FLAG_SHARP|DAMAGE_FLAG_EDGE)
if(default_deconstruction_screwdriver(user, W))
return

2
code/modules/mining/mine_items.dm
View File

@@ -1095,7 +1095,7 @@ var/list/total_extraction_beacons = list()
if(creator)
add_logs(creator, L, "used a resonator field on", "resonator")
to_chat(L, SPAN_DANGER("\The [src] ruptured with you in it!"))
L.apply_damage(resonance_damage, BRUTE)
L.apply_damage(resonance_damage, DAMAGE_BRUTE)
qdel(src)