From b07ac3f533f43ac2bf67fa94deb61fc8c3118a11 Mon Sep 17 00:00:00 2001 From: HanSolo1519 <72716882+HanSolo1519@users.noreply.github.com> Date: Sat, 24 Aug 2024 15:11:53 -0400 Subject: [PATCH] Bugfix - Pill bottle name (#19816) Nicotine pill bottle was incorrectly labled 10u, while only having 5u pills. Whoops. Thanks Ofna01 for letting me know. --------- Signed-off-by: HanSolo1519 <72716882+HanSolo1519@users.noreply.github.com> --- .../items/weapons/storage/pill_bottle.dm | 2 +- html/changelogs/pillbottlewhoopsie.yml | 58 +++++++++++++++++++ 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/pillbottlewhoopsie.yml diff --git a/code/game/objects/items/weapons/storage/pill_bottle.dm b/code/game/objects/items/weapons/storage/pill_bottle.dm index 5cc9514c2af..d796d4d503c 100644 --- a/code/game/objects/items/weapons/storage/pill_bottle.dm +++ b/code/game/objects/items/weapons/storage/pill_bottle.dm @@ -187,7 +187,7 @@ starts_with = list(/obj/item/reagent_containers/pill/caffeine = 7) /obj/item/storage/pill_bottle/nicotine - name = "bottle of 10u Nicotine pills" + name = "bottle of 5u Nicotine pills" desc = "Contains pills used to treat nicotine addiction." starts_with = list(/obj/item/reagent_containers/pill/nicotine = 7) diff --git a/html/changelogs/pillbottlewhoopsie.yml b/html/changelogs/pillbottlewhoopsie.yml new file mode 100644 index 00000000000..acc9b1aa2e2 --- /dev/null +++ b/html/changelogs/pillbottlewhoopsie.yml @@ -0,0 +1,58 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: HanSolo1519 + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - spellcheck: "Correctly lables the 5u Nicotine pill bottle"