cyberpresidentvanellope/Citadel-Station-13-RP
1
0
Fork 0
mirror of https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git synced 2026-08-23 07:17:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

regexes damage and wound types (#6735)

Browse Source 
Different semantics demand different defines. It's hard to tell what's
being used where and for what reason right now.

Staging for combat PR.
This commit is contained in:
silicons
2024-09-09 15:13:34 -06:00
committed by GitHub
parent 40ddbc3e86
commit e6f972666c
163 changed files with 607 additions and 641 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/tools/kinetic_accelerator.dm
+2 -2
View File
@@ -197,7 +197,7 @@
name = "kinetic force"
icon_state = null
damage_force = 30
damage_type = BRUTE
damage_type = DAMAGE_TYPE_BRUTE
damage_flag = ARMOR_BOMB
range = WORLD_ICON_SIZE * 4
// log_override = TRUE
@@ -208,7 +208,7 @@
/obj/projectile/kinetic/premium
damage_force = 40
damage_type = BRUTE
damage_type = DAMAGE_TYPE_BRUTE
range = 5
/obj/projectile/kinetic/Destroy()
code/modules/mining/tools/kinetic_crusher.dm
+5 -4
View File
@@ -187,12 +187,12 @@
if(thrown? (get_dir(src, L) & L.dir) : ((user.dir & backstab_dir) && (L.dir & backstab_dir)))
if(!QDELETED(C))
C.total_damage += detonation_damage + backstab_bonus + thrown_bonus //cheat a little and add the total before killing it, so certain mobs don't have much lower chances of giving an item
L.apply_damage(detonation_damage + backstab_bonus + thrown_bonus, BRUTE, blocked = def_check)
L.apply_damage(detonation_damage + backstab_bonus + thrown_bonus, DAMAGE_TYPE_BRUTE, blocked = def_check)
playsound(src, 'sound/weapons/kenetic_accel.ogg', 100, 1) //Seriously who spelled it wrong
else
if(!QDELETED(C))
C.total_damage += detonation_damage + thrown_bonus
L.apply_damage(detonation_damage + thrown_bonus, BRUTE, blocked = def_check)
L.apply_damage(detonation_damage + thrown_bonus, DAMAGE_TYPE_BRUTE, blocked = def_check)
/obj/item/kinetic_crusher/throw_impact(atom/A, datum/thrownthing/TT)
. = ..()
@@ -307,8 +307,9 @@
name = "destabilizing force"
icon_state = "pulse1"
nodamage = TRUE
damage_force = 0 //We're just here to mark people. This is still a melee weapon.
damage_type = BRUTE
// We're just here to mark people. This is still a melee weapon.
damage_force = 0
damage_type = DAMAGE_TYPE_BRUTE
damage_flag = ARMOR_BOMB
range = WORLD_ICON_SIZE * 6
accuracy_disabled = TRUE
code/modules/mining/tools/resonator.dm
+1 -1
View File
@@ -97,7 +97,7 @@
if(creator)
add_attack_logs(creator, L, "used a resonator field on")
to_chat(L, "<span class='danger'>\The [src] ruptured with you in it!</span>")
L.apply_damage(resonance_damage, BRUTE)
L.apply_damage(resonance_damage, DAMAGE_TYPE_BRUTE)
qdel(src)