From b77b667044bdd9d2659e9f56046dfe0e677ae9bf Mon Sep 17 00:00:00 2001 From: desven <45808369+desvenlafaxine@users.noreply.github.com> Date: Thu, 19 Aug 2021 23:09:30 -0500 Subject: [PATCH] Fixes the can of pineapple rings having the same sounds and descriptions as a regular can (#12354) --- code/game/objects/items/weapons/storage/misc.dm | 4 ++++ html/changelogs/desven-pineapples.yml | 6 ++++++ 2 files changed, 10 insertions(+) create mode 100644 html/changelogs/desven-pineapples.yml diff --git a/code/game/objects/items/weapons/storage/misc.dm b/code/game/objects/items/weapons/storage/misc.dm index c8efe6c2f37..1febfd26c75 100644 --- a/code/game/objects/items/weapons/storage/misc.dm +++ b/code/game/objects/items/weapons/storage/misc.dm @@ -43,6 +43,10 @@ icon = 'icons/obj/storage.dmi' icon_state = "pineapple_rings" name = "can of pineapple rings" + desc = "An aluminium can with fresh pineapple slices." + use_sound = 'sound/items/pickup/soda.ogg' + drop_sound = 'sound/items/drop/soda.ogg' + pickup_sound = 'sound/items/pickup/wirecutter.ogg' starts_with = list(/obj/item/reagent_containers/food/snacks/pineapple_ring = 6) can_hold = list(/obj/item/reagent_containers/food/snacks/pineapple_ring) diff --git a/html/changelogs/desven-pineapples.yml b/html/changelogs/desven-pineapples.yml new file mode 100644 index 00000000000..3e468cd01c1 --- /dev/null +++ b/html/changelogs/desven-pineapples.yml @@ -0,0 +1,6 @@ +author: Desven + +delete-after: True + +changes: + - bugfix: "Fixes the pineapple rings having the same description and sounds than a regular box."