From cff1fab89a7e9f27ca17e54ffaec7c7399751dff Mon Sep 17 00:00:00 2001 From: AveryThePanda <41716744+AveryThePanda@users.noreply.github.com> Date: Sat, 25 Apr 2020 10:06:33 -0400 Subject: [PATCH] IACDefense (#8528) --- code/datums/outfits/ert/iac.dm | 10 +++-- html/changelogs/averythepanda-changelog.yml | 43 +++++++++++++++++++++ 2 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 html/changelogs/averythepanda-changelog.yml diff --git a/code/datums/outfits/ert/iac.dm b/code/datums/outfits/ert/iac.dm index fe56971210d..ae58505bfbf 100644 --- a/code/datums/outfits/ert/iac.dm +++ b/code/datums/outfits/ert/iac.dm @@ -22,7 +22,9 @@ /obj/item/storage/firstaid/surgery = 1, /obj/item/storage/box/gloves = 1, /obj/item/storage/box/syringes = 1, - /obj/item/device/flashlight/pen = 1 + /obj/item/device/flashlight/pen = 1, + /obj/item/gun/energy/pistol = 1, + /obj/item/clothing/accessory/holster/armpit = 1 ) belt_contents = list( @@ -73,7 +75,7 @@ ) belt_contents = list( - /obj/item/ammo_magazine/c45x = 2, + /obj/item/ammo_magazine/c45x = 3, /obj/item/device/flash = 1, /obj/item/handcuffs/ziptie = 2, /obj/item/melee/baton/loaded = 1, @@ -93,5 +95,7 @@ /obj/item/device/healthanalyzer = 1, /obj/item/storage/firstaid/adv = 2, /obj/item/storage/firstaid/o2 = 1, - /obj/item/storage/box/syringes = 1 + /obj/item/storage/box/syringes = 1, + /obj/item/gun/energy/pistol = 1, + /obj/item/clothing/accessory/holster/armpit = 1 ) diff --git a/html/changelogs/averythepanda-changelog.yml b/html/changelogs/averythepanda-changelog.yml new file mode 100644 index 00000000000..99f5749e022 --- /dev/null +++ b/html/changelogs/averythepanda-changelog.yml @@ -0,0 +1,43 @@ +################################ +# 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: ReadThisNamePlz + +# 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: + - rscadd: "Adds an extra pistol magazine for the IAC Guard" + - rscadd: "Adds energy pistols and holsters to the IAC Doctor and IAC Paramedic" + \ No newline at end of file