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-27 23:47:16 +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/game/objects/structures/props/projectile_lock.dm
+1 -1
View File
@@ -48,7 +48,7 @@
if(timing)
return PROJECTILE_IMPACT_DELETE
if(istype(proj, /obj/projectile/beam/heavylaser/cannon) || istype(proj, /obj/projectile/beam/emitter) || (proj.damage_force >= 80 && proj.damtype == BURN))
if(istype(proj, /obj/projectile/beam/heavylaser/cannon) || istype(proj, /obj/projectile/beam/emitter) || (proj.damage_force >= 80 && proj.damtype == DAMAGE_TYPE_BURN))
toggle_lock()
visible_message("<span class='notice'>\The [src] [enabled ? "disengages" : "engages"] its locking mechanism.</span>")
code/game/objects/structures/props/puzzledoor.dm
+1 -1
View File
@@ -77,7 +77,7 @@
else if(src.density && (user.a_intent == INTENT_HARM))
var/obj/item/W = C
user.setClickCooldown(user.get_attack_speed(W))
if(W.damtype == BRUTE || W.damtype == BURN)
if(W.damtype == DAMAGE_TYPE_BRUTE || W.damtype == DAMAGE_TYPE_BURN)
user.do_attack_animation(src)
user.visible_message("<span class='danger'>\The [user] hits \the [src] with \the [W] with no visible effect.</span>")