From d7d4cc0a9a30898b19699574cff7976274aa0ee2 Mon Sep 17 00:00:00 2001 From: Matt Atlas Date: Sat, 16 Nov 2024 20:52:34 +0100 Subject: [PATCH] Projectiles now gib limbs instead of slicing them off. (#20178) title means that when you go past max_damage on a limb you'll gib it instead of just delimbing it Co-authored-by: Matt Atlas --- code/modules/organs/organ_external.dm | 4 +- .../mattatlas-projectileheadgibs.yml | 58 +++++++++++++++++++ 2 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/mattatlas-projectileheadgibs.yml diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index b58339be8b6..aca8eb09566 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -521,8 +521,8 @@ /// Certain limbs like zombie limbs have an integrated maiming bonus that make them easier to delimb. Add that. var/maim_bonus_to_add = src.maim_bonus - if(isitem(used_weapon)) - var/obj/item/W = used_weapon + if(isobj(used_weapon)) + var/obj/W = used_weapon dam_flags = W.damage_flags() if(isprojectile(W)) var/obj/projectile/P = W diff --git a/html/changelogs/mattatlas-projectileheadgibs.yml b/html/changelogs/mattatlas-projectileheadgibs.yml new file mode 100644 index 00000000000..4814fc17f05 --- /dev/null +++ b/html/changelogs/mattatlas-projectileheadgibs.yml @@ -0,0 +1,58 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: MattAtlas + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Projectiles now gib limbs instead of slicing them off."