diff --git a/code/modules/projectiles/guns/energy/blaster.dm b/code/modules/projectiles/guns/energy/blaster.dm index 4c3570ada9d..f6584a204bf 100644 --- a/code/modules/projectiles/guns/energy/blaster.dm +++ b/code/modules/projectiles/guns/energy/blaster.dm @@ -4,7 +4,7 @@ icon_state = "blaster_pistol" item_state = "blaster_pistol" fire_sound = 'sound/weapons/Laser.ogg' - slot_flags = SLOT_BELT + slot_flags = SLOT_BELT|SLOT_HOLSTER w_class = 3 force = 5 origin_tech = list(TECH_COMBAT = 2, TECH_MAGNET = 2) @@ -74,4 +74,4 @@ if(wielded) toggle_scope(2.0, usr) else - usr << "You can't look through the scope without stabilizing the rifle!" \ No newline at end of file + usr << "You can't look through the scope without stabilizing the rifle!" diff --git a/html/changelogs/Schevblasterpistolfix-24JAN2019.yml b/html/changelogs/Schevblasterpistolfix-24JAN2019.yml new file mode 100644 index 00000000000..46ae7788db0 --- /dev/null +++ b/html/changelogs/Schevblasterpistolfix-24JAN2019.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: Scheveningen + +# 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: "Fixes TCFL blaster pistols not fitting in holsters."