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-29 22:17:34 +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/charge_pylon.dm
+1 -1
View File
@@ -29,7 +29,7 @@
H.nutrition = 400
return
if(isrobot(user))
user.apply_damage(80, BURN, def_zone = BP_TORSO)
user.apply_damage(80, DAMAGE_TYPE_BURN, def_zone = BP_TORSO)
visible_message("<span class='danger'>Electricity arcs off [user] as it touches \the [src]!</span>")
to_chat(user, "<span class='danger'><b>You detect damage to your components!</b></span>")
else if(istype(H) && H.species.get_species_id() != SPECIES_ID_ADHERENT)
code/game/objects/structures/cliff.dm
+1 -1
View File
@@ -211,7 +211,7 @@ two tiles on initialization, and which way a cliff is facing may change during m
var/blocked = L.run_armor_check(target_zone, "melee") * harm
var/soaked = L.get_armor_soak(target_zone, "melee") * harm
L.apply_damage(damage * harm, BRUTE, target_zone, blocked, soaked, used_weapon=src)
L.apply_damage(damage * harm, DAMAGE_TYPE_BRUTE, target_zone, blocked, soaked, used_weapon=src)
// Now fall off more cliffs below this one if they exist.
var/obj/structure/cliff/bottom_cliff = locate() in T
code/game/objects/structures/crates_lockers/crates.dm
+1 -1
View File
@@ -262,7 +262,7 @@
..()
/obj/structure/closet/crate/secure/on_bullet_act(obj/projectile/proj, impact_flags, list/bullet_act_args)
if(!(proj.damage_type == BRUTE || proj.damage_type == BURN))
if(!(proj.damage_type == DAMAGE_TYPE_BRUTE || proj.damage_type == DAMAGE_TYPE_BURN))
return ..()
if(locked && tamper_proof && integrity <= proj.damage_force)
code/game/objects/structures/femur_breaker.dm
+1 -1
View File
@@ -75,7 +75,7 @@
/obj/structure/femur_breaker/proc/damage_leg(mob/living/carbon/human/H)
var/where_we_snappin_boys = pick(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)
H.emote("scream")
H.apply_damage(150, BRUTE, where_we_snappin_boys)
H.apply_damage(150, DAMAGE_TYPE_BRUTE, where_we_snappin_boys)
var/obj/item/bodypart/cracka = H.get_bodypart(where_we_snappin_boys)
if(cracka)
var/datum/wound/blunt/critical/cracka_lackin = new
code/game/objects/structures/guillotine.dm
+1 -1
View File
@@ -142,7 +142,7 @@
addtimer(CALLBACK(C, TYPE_PROC_REF(/mob, emote), "clap"), delay_offset * 0.3)
delay_offset++
else
H.apply_damage(15 * blade_sharpness, BRUTE, head)
H.apply_damage(15 * blade_sharpness, DAMAGE_TYPE_BRUTE, head)
log_combat(user, H, "dropped the blade on", src, " non-fatally")
H.emote("scream")
code/game/objects/structures/medical_stand_vr.dm
+2 -2
View File
@@ -155,7 +155,7 @@
if(!do_mob(usr, target, 50))
usr.visible_message("<span class='notice'>\The [usr]'s hand slips and pricks \the [target].</span>",
"<span class='notice'>Your hand slips and pricks \the [target].</span>")
target.apply_damage(3, BRUTE, pick(BP_R_ARM, BP_L_ARM))
target.apply_damage(3, DAMAGE_TYPE_BRUTE, pick(BP_R_ARM, BP_L_ARM))
return
usr.visible_message("<span class='notice'>\The [usr] hooks \the [target] up to \the [src].</span>",
"<span class='notice'>You hook \the [target] up to \the [src].</span>")
@@ -393,7 +393,7 @@
if(attached)
if(!Adjacent(attached))
visible_message("The needle is ripped out of [src.attached], doesn't that hurt?")
attached.apply_damage(3, BRUTE, pick(BP_R_ARM, BP_L_ARM))
attached.apply_damage(3, DAMAGE_TYPE_BRUTE, pick(BP_R_ARM, BP_L_ARM))
attached = null
update_icon()
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>")
code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+2 -2
View File
@@ -290,7 +290,7 @@
occupant.apply_effect(6, STUN, blocked)
occupant.apply_effect(6, WEAKEN, blocked)
occupant.apply_effect(6, STUTTER, blocked)
occupant.apply_damage(10, BRUTE, def_zone, blocked, soaked)
occupant.apply_damage(10, DAMAGE_TYPE_BRUTE, def_zone, blocked, soaked)
playsound(src.loc, 'sound/weapons/punch1.ogg', 50, 1, -1)
if(istype(A, /mob/living))
var/mob/living/victim = A
@@ -300,7 +300,7 @@
victim.apply_effect(6, STUN, blocked)
victim.apply_effect(6, WEAKEN, blocked)
victim.apply_effect(6, STUTTER, blocked)
victim.apply_damage(10, BRUTE, def_zone, blocked, soaked)
victim.apply_damage(10, DAMAGE_TYPE_BRUTE, def_zone, blocked, soaked)
occupant.visible_message("<span class='danger'>[occupant] crashed into \the [A]!</span>")
/obj/structure/bed/chair/office/light
code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm
+2 -2
View File
@@ -140,7 +140,7 @@
occupant.apply_effect(6, STUN, blocked)
occupant.apply_effect(6, WEAKEN, blocked)
occupant.apply_effect(6, STUTTER, blocked)
occupant.apply_damage(10, BRUTE, def_zone, soaked)
occupant.apply_damage(10, DAMAGE_TYPE_BRUTE, def_zone, soaked)
playsound(src.loc, 'sound/weapons/punch1.ogg', 50, 1, -1)
if(istype(A, /mob/living))
var/mob/living/victim = A
@@ -150,7 +150,7 @@
victim.apply_effect(6, STUN, blocked)
victim.apply_effect(6, WEAKEN, blocked)
victim.apply_effect(6, STUTTER, blocked)
victim.apply_damage(10, BRUTE, def_zone, soaked)
victim.apply_damage(10, DAMAGE_TYPE_BRUTE, def_zone, soaked)
if(pulling_along)
occupant.visible_message("<span class='danger'>[pulling_along] has thrusted \the [name] into \the [A], throwing \the [occupant] out of it!</span>")