From 45be06c854cef87fd0664a8766c45702edb9590c Mon Sep 17 00:00:00 2001 From: OolongCow <61329630+OolongCow@users.noreply.github.com> Date: Tue, 19 Nov 2024 17:03:37 -0600 Subject: [PATCH 1/3] firstaidkitchanges Changes the contents of first aid kits --- .../objects/items/weapons/storage/firstaid.dm | 8 +-- html/changelogs/example copy.yml | 59 +++++++++++++++++++ 2 files changed, 62 insertions(+), 5 deletions(-) create mode 100644 html/changelogs/example copy.yml diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index 4ce267cab1a..408fa9b7c58 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -19,12 +19,10 @@ /obj/item/storage/firstaid/regular starts_with = list( - /obj/item/stack/medical/bruise_pack = 2, - /obj/item/stack/medical/ointment = 2, - /obj/item/storage/pill_bottle/antidexafen = 1, + /obj/item/stack/medical/bruise_pack = 3, + /obj/item/stack/medical/ointment = 3, + /obj/item/storage/pill_bottle/inaprovaline = 1, /obj/item/storage/pill_bottle/perconol = 1, - /obj/item/stack/medical/splint = 1, - /obj/item/device/healthanalyzer = 1 ) /obj/item/storage/firstaid/large diff --git a/html/changelogs/example copy.yml b/html/changelogs/example copy.yml new file mode 100644 index 00000000000..b995b24d517 --- /dev/null +++ b/html/changelogs/example copy.yml @@ -0,0 +1,59 @@ +################################ +# 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: OolongCow + +# 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: + - rscadd: "Adds a pill bottle of inaprovaline and an extra stack of bandages and ointment to basic first aid kits." + - rscdel: "Removes the cough syrup pills, splints, and health analyzer from basic first aid kits." From b0805933b77c74323b4cbad0e6887f8b311d0b9e Mon Sep 17 00:00:00 2001 From: OolongCow <61329630+OolongCow@users.noreply.github.com> Date: Wed, 20 Nov 2024 00:40:20 -0600 Subject: [PATCH 2/3] readds splints --- code/game/objects/items/weapons/storage/firstaid.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index 408fa9b7c58..9e4b372f889 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -20,7 +20,8 @@ /obj/item/storage/firstaid/regular starts_with = list( /obj/item/stack/medical/bruise_pack = 3, - /obj/item/stack/medical/ointment = 3, + /obj/item/stack/medical/ointment = 2, + /obj/item/stack/medical/splint = 1, /obj/item/storage/pill_bottle/inaprovaline = 1, /obj/item/storage/pill_bottle/perconol = 1, ) From d3a43cdedd0507eff2e8e189e88fa79e6a884be2 Mon Sep 17 00:00:00 2001 From: OolongCow <61329630+OolongCow@users.noreply.github.com> Date: Sat, 23 Nov 2024 07:25:45 -0600 Subject: [PATCH 3/3] Update html/changelogs/example copy.yml Co-authored-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com> Signed-off-by: OolongCow <61329630+OolongCow@users.noreply.github.com> --- html/changelogs/example copy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/changelogs/example copy.yml b/html/changelogs/example copy.yml index b995b24d517..1d8b81c7f6b 100644 --- a/html/changelogs/example copy.yml +++ b/html/changelogs/example copy.yml @@ -56,4 +56,4 @@ delete-after: True # 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: - rscadd: "Adds a pill bottle of inaprovaline and an extra stack of bandages and ointment to basic first aid kits." - - rscdel: "Removes the cough syrup pills, splints, and health analyzer from basic first aid kits." + - rscdel: "Removes the cough syrup pills and health analyzer from basic first aid kits."