diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm index 4e8565cee50..7ffa1f2be3d 100644 --- a/code/modules/projectiles/projectile/energy.dm +++ b/code/modules/projectiles/projectile/energy.dm @@ -197,6 +197,7 @@ damage = 30 check_armor = "laser" damage_type = BURN + damage_flags = DAM_LASER pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE muzzle_type = /obj/effect/projectile/muzzle/bolt hit_effect = /obj/effect/temp_visual/blaster_effect @@ -216,7 +217,6 @@ pass_flags = PASSTABLE muzzle_type = /obj/effect/projectile/muzzle/bolt - /obj/item/projectile/energy/blaster/heavy damage = 35 diff --git a/html/changelogs/mattatlas-lmaosecurity.yml b/html/changelogs/mattatlas-lmaosecurity.yml new file mode 100644 index 00000000000..2ab8fd2f4d2 --- /dev/null +++ b/html/changelogs/mattatlas-lmaosecurity.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: 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, 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: + - bugfix: "Lethal blaster bolts now correctly go through laser armor."