From 3cf0d1607efa6720b71773b37c026012987074d9 Mon Sep 17 00:00:00 2001 From: Casper3667 <8396443+Casper3667@users.noreply.github.com> Date: Fri, 5 Jun 2026 23:32:01 +0200 Subject: [PATCH] A bunch of smaller bugfixes (#22618) Fixes: - https://github.com/Aurorastation/Aurora.3/issues/22592 - https://github.com/Aurorastation/Aurora.3/issues/22369 - https://github.com/Aurorastation/Aurora.3/issues/22398 - https://github.com/Aurorastation/Aurora.3/issues/22358 - https://github.com/Aurorastation/Aurora.3/issues/22432 - https://github.com/Aurorastation/Aurora.3/issues/22591 - https://github.com/Aurorastation/Aurora.3/issues/22411 - And the sound when putting items into metal briefcases, crime scene kits and pill bottles - As well as the sprites for the two boonie hats for taj --- .../objects/items/devices/radio/intercom.dm | 2 +- .../items/weapons/storage/briefcase.dm | 1 + .../items/weapons/storage/pill_bottle.dm | 1 + .../structures/machinery/biogenerator.dm | 3 ++- .../structures/machinery/doors/airlock.dm | 14 +++++++------- code/game/objects/structures/noticeboard.dm | 3 +-- .../loadout/items/augments.dm | 2 ++ code/modules/clothing/head/wide_hats.dm | 2 ++ code/modules/detectivework/tools/crimekit.dm | 1 + html/changelogs/TGWCleansUp.yml | 14 ++++++++++++++ icons/mob/species/tajaran/helmet.dmi | Bin 8302 -> 8551 bytes icons/obj/vending.dmi | Bin 114668 -> 120952 bytes 12 files changed, 32 insertions(+), 11 deletions(-) create mode 100644 html/changelogs/TGWCleansUp.yml diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index dbc3600e5dd..b1b07164e57 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -4,7 +4,7 @@ pixel_y = 20; #define PRESET_SOUTH \ dir = SOUTH; \ -pixel_y = -6; +pixel_y = -2; #define PRESET_WEST \ dir = WEST; \ diff --git a/code/game/objects/items/weapons/storage/briefcase.dm b/code/game/objects/items/weapons/storage/briefcase.dm index 11120702657..bccb17704f2 100644 --- a/code/game/objects/items/weapons/storage/briefcase.dm +++ b/code/game/objects/items/weapons/storage/briefcase.dm @@ -33,6 +33,7 @@ use_sound = 'sound/items/storage/toolbox.ogg' drop_sound = 'sound/items/drop/toolbox.ogg' pickup_sound = 'sound/items/pickup/toolbox.ogg' + rustle_sound = 'sound/items/rustle/toolbox.ogg' /obj/item/storage/briefcase/nt name = "\improper NT briefcase" diff --git a/code/game/objects/items/weapons/storage/pill_bottle.dm b/code/game/objects/items/weapons/storage/pill_bottle.dm index 378401015ee..30b6da75758 100644 --- a/code/game/objects/items/weapons/storage/pill_bottle.dm +++ b/code/game/objects/items/weapons/storage/pill_bottle.dm @@ -13,6 +13,7 @@ use_sound = 'sound/items/storage/pillbottle.ogg' drop_sound = 'sound/items/drop/pillbottle.ogg' pickup_sound = 'sound/items/pickup/pillbottle.ogg' + rustle_sound = 'sound/items/pickup/pillbottle.ogg' max_storage_space = DEFAULT_BOX_STORAGE /obj/item/storage/pill_bottle/attack_self(mob/living/user) diff --git a/code/game/objects/structures/machinery/biogenerator.dm b/code/game/objects/structures/machinery/biogenerator.dm index 42824879b73..e9b97eff581 100644 --- a/code/game/objects/structures/machinery/biogenerator.dm +++ b/code/game/objects/structures/machinery/biogenerator.dm @@ -124,7 +124,8 @@ FOODSTUFFS /singleton/biorecipe/food/bio_vitamin name = "Flavored Vitamin" object = /obj/item/reagent_containers/pill/bio_vitamin - amount = list(1,5,10,25,50) + // Pill bottles can at most hold 14 pills + amount = list(1,3,5,10,14) /singleton/biorecipe/food/liquidfood name = "Food Ration" diff --git a/code/game/objects/structures/machinery/doors/airlock.dm b/code/game/objects/structures/machinery/doors/airlock.dm index f38d1a04bf8..9a7530daa70 100644 --- a/code/game/objects/structures/machinery/doors/airlock.dm +++ b/code/game/objects/structures/machinery/doors/airlock.dm @@ -1089,13 +1089,13 @@ About the new airlock wires panel: stripe_overlay = new(stripe_file) stripe_overlay.Blend(stripe_color, ICON_MULTIPLY) SSicon_cache.airlock_icon_cache["[ikey]"] = stripe_overlay - if(!glass) - var/ikey2 = "[airlock_type]-[stripe_color]-fillstripe" - stripe_filling_overlay = SSicon_cache.airlock_icon_cache["[ikey2]"] - if(!stripe_filling_overlay) - stripe_filling_overlay = new(stripe_fill_file) - stripe_filling_overlay.Blend(stripe_color, ICON_MULTIPLY) - SSicon_cache.airlock_icon_cache["[ikey2]"] = stripe_filling_overlay + + var/ikey2 = "[airlock_type]-[stripe_color]-fillstripe" + stripe_filling_overlay = SSicon_cache.airlock_icon_cache["[ikey2]"] + if(!stripe_filling_overlay) + stripe_filling_overlay = new(stripe_fill_file) + stripe_filling_overlay.Blend(stripe_color, ICON_MULTIPLY) + SSicon_cache.airlock_icon_cache["[ikey2]"] = stripe_filling_overlay if(arePowerSystemsOn()) switch(state) diff --git a/code/game/objects/structures/noticeboard.dm b/code/game/objects/structures/noticeboard.dm index 2f7e84d50e9..927e6c22348 100644 --- a/code/game/objects/structures/noticeboard.dm +++ b/code/game/objects/structures/noticeboard.dm @@ -90,8 +90,7 @@ if(href_list["read"]) var/obj/item/paper/P = locate(href_list["read"]) if((P && P.loc == src)) - usr << browse("
oFKthoW~f?(oyzF2rXn&W2BJ|vkFj#(l&nREWB%cN@)8;1yY
zwq~7h!^u`$TPnwTdVc{jY+hONf&H