From a4e374d1178cb3b9e8296823b2dabc92bc4f14a2 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Wed, 13 Jul 2016 19:48:08 -0300 Subject: [PATCH] Removing flashes and stun rounds from zipguns (#556) Zipguns won't start with flash and stun rounds anymore, since it is a one shoot weapon and those rounds do little in that situation, just making them more useless. --- .../projectiles/guns/projectile/pistol.dm | 4 --- html/changelogs/alberyk-PR-556.yml | 36 +++++++++++++++++++ 2 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 html/changelogs/alberyk-PR-556.yml diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm index 7e0fdc99a31..0867200494d 100644 --- a/code/modules/projectiles/guns/projectile/pistol.dm +++ b/code/modules/projectiles/guns/projectile/pistol.dm @@ -176,8 +176,6 @@ var/global/list/ammo_types = list( /obj/item/ammo_casing/a357 = ".357", - /obj/item/ammo_casing/c9mmf = "9mm", - /obj/item/ammo_casing/c45f = ".45", /obj/item/ammo_casing/a12mm = "12mm", /obj/item/ammo_casing/shotgun = "12 gauge", /obj/item/ammo_casing/shotgun = "12 gauge", @@ -185,8 +183,6 @@ /obj/item/ammo_casing/shotgun/pellet = "12 gauge", /obj/item/ammo_casing/shotgun/pellet = "12 gauge", /obj/item/ammo_casing/shotgun/beanbag = "12 gauge", - /obj/item/ammo_casing/shotgun/stunshell = "12 gauge", - /obj/item/ammo_casing/shotgun/flash = "12 gauge", /obj/item/ammo_casing/a762 = "7.62mm", /obj/item/ammo_casing/a556 = "5.56mm" ) diff --git a/html/changelogs/alberyk-PR-556.yml b/html/changelogs/alberyk-PR-556.yml new file mode 100644 index 00000000000..3ebda638c86 --- /dev/null +++ b/html/changelogs/alberyk-PR-556.yml @@ -0,0 +1,36 @@ +################################ +# 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 +################################# + +# Your name. +author: Alberyk + +# 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: "Zipguns should not start with flash and stun rounds anymore."