cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-19 22:51:20 +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

12
code/modules/blob/blob.dm
View File

@@ -178,7 +178,7 @@
/obj/effect/blob/proc/attack_living(var/mob/living/L)
if(!L)
return
var/blob_damage = pick(BRUTE, BURN)
var/blob_damage = pick(DAMAGE_BRUTE, DAMAGE_BURN)
attack_msg(L)
L.apply_damage(rand(damage_min, damage_max), blob_damage, used_weapon = "blob tendril")
@@ -195,9 +195,9 @@
return
switch(Proj.damage_type)
if(BRUTE)
if(DAMAGE_BRUTE)
take_damage(Proj.damage / brute_resist)
if(BURN)
if(DAMAGE_BURN)
take_damage((Proj.damage / laser_resist) / fire_resist)
return FALSE
@@ -218,11 +218,11 @@
var/damage = 0
switch(W.damtype)
if(BURN)
if(DAMAGE_BURN)
damage = (W.force / fire_resist)
if(W.iswelder())
playsound(get_turf(src), 'sound/items/Welder.ogg', 100, TRUE)
if(BRUTE)
if(DAMAGE_BRUTE)
damage = (W.force / brute_resist)
take_damage(damage)
@@ -391,7 +391,7 @@
origin_tech = list(TECH_MATERIAL = 2, TECH_BIO = 2)
if(TENDRIL_FIRE)
desc = "A tendril removed from an asteroclast. It's hot to the touch."
damtype = BURN
damtype = DAMAGE_BURN
force = 15
color = COLOR_AMBER
origin_tech = list(TECH_POWER = 2, TECH_BIO = 2)