From c41b1b72a1fea2e4658fb369483ad28ed9795b7b Mon Sep 17 00:00:00 2001 From: Mykhailo Bykhovtsev Date: Wed, 22 May 2019 14:10:58 -0700 Subject: [PATCH] Making bullets and tachyon penetrate closets (#6449) This Pr makes any bullet or tachyon projectiles penetrate closets. Upon penetration each mob inside of locker will get damaged by the projectile. --- .../structures/crates_lockers/closets.dm | 5 +++ html/changelogs/Sindorman-changes.yml | 41 +++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 html/changelogs/Sindorman-changes.yml diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 8937bd339cc..59221d1425c 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -209,6 +209,11 @@ var/proj_damage = Proj.get_structure_damage() if(!proj_damage) return + + if(Proj.penetrating || istype(Proj, /obj/item/projectile/bullet)) + var/distance = get_dist(Proj.starting, get_turf(loc)) + for(var/mob/living/L in contents) + Proj.attack_mob(L, distance) ..() damage(proj_damage) diff --git a/html/changelogs/Sindorman-changes.yml b/html/changelogs/Sindorman-changes.yml new file mode 100644 index 00000000000..60303eee4d3 --- /dev/null +++ b/html/changelogs/Sindorman-changes.yml @@ -0,0 +1,41 @@ +################################ +# 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 +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: PoZe + +# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "Bullets and tachyon beams can now penetrate closets if their projectile collides. Upon penetration any living mob inside the locker recieves damage from the bullet."