cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 12:29:46 +01: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
code/defines/obj/weapon.dm
+3 -3
View File
@@ -73,7 +73,7 @@
var/armorpercent = 0
var/wasblocked = 0
var/shoulddisarm = 0
var/damagetype = PAIN
var/damagetype = DAMAGE_PAIN
var/chargedelay = 4 // 4 half frames = 2 seconds
if(targetIsHuman && targetashuman == user)
@@ -81,11 +81,11 @@
if (user.a_intent == I_HURT)
target_zone = get_zone_with_miss_chance(target_zone, target) //Vary the attack
damagetype = BRUTE
damagetype = DAMAGE_BRUTE
if (targetIsHuman)
var/mob/living/carbon/human/targethuman = target
armorpercent = targethuman.get_blocked_ratio(target_zone, BRUTE, damage = force)*100
armorpercent = targethuman.get_blocked_ratio(target_zone, DAMAGE_BRUTE, damage = force)*100
wasblocked = targethuman.check_shields(force, src, user, target_zone, null)
var/damageamount = force