From 889a477798e00fd189cdc3fe7c103ec3863e9379 Mon Sep 17 00:00:00 2001 From: garnascus Date: Fri, 7 Apr 2023 08:13:34 -0400 Subject: [PATCH] Tranquilizer box fix (#16165) * Tranquilizer box fix * tranquilizer-box-fix * Update html/changelogs/Garnascus-tranquilizerboxfix.yml Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> * Update html/changelogs/Garnascus-tranquilizerboxfix.yml Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> --------- Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> --- .../objects/items/weapons/storage/boxes.dm | 6 ++- .../Garnascus-tranquilizerboxfix.yml | 42 +++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/Garnascus-tranquilizerboxfix.yml diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 8983bdb0baa..fa6554ccc11 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -903,7 +903,11 @@ /obj/item/storage/box/tranquilizer name = "box of tranquilizer darts" desc = "It has a picture of a tranquilizer dart and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death." - icon_state = "incendiaryshot_box" + icon_state = "shellbox" + item_state = "shellbox" + illustration = "incendiaryshot" + drop_sound = 'sound/items/drop/ammobox.ogg' + pickup_sound = 'sound/items/pickup/ammobox.ogg' starts_with = list(/obj/item/ammo_casing/tranq = 8) /obj/item/storage/box/toothpaste diff --git a/html/changelogs/Garnascus-tranquilizerboxfix.yml b/html/changelogs/Garnascus-tranquilizerboxfix.yml new file mode 100644 index 00000000000..6cb02942f5e --- /dev/null +++ b/html/changelogs/Garnascus-tranquilizerboxfix.yml @@ -0,0 +1,42 @@ +################################ +# 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: Garnascus + +# 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: "Changes the tranquilizer dart box to use the shellbox sprite." +