From 8de4e217f7589b17837d37a588f563a2944d20b2 Mon Sep 17 00:00:00 2001 From: evilew <116174240+evilew@users.noreply.github.com> Date: Thu, 14 Aug 2025 15:16:09 -0500 Subject: [PATCH] fixes for trademarked names and vote sound volume - removed oreo naming - swapped the vote start sound with a more quiet version --- .../chemistry/reagents/fatty_drinks.dm | 18 ++++++++-------- .../reagents/chemistry/recipes/fatdrinks.dm | 20 +++++++++--------- GainStation13/icons/obj/drinks.dmi | Bin 7085 -> 7087 bytes GainStation13/icons/obj/food/food64x64.dmi | Bin 5646 -> 5652 bytes .../misc/{vote_started.ogg => vote_start.ogg} | Bin 33484 -> 33484 bytes code/controllers/subsystem/vote.dm | 2 +- tgstation.dme | 2 +- 7 files changed, 21 insertions(+), 21 deletions(-) rename GainStation13/sound/misc/{vote_started.ogg => vote_start.ogg} (99%) diff --git a/GainStation13/code/modules/reagents/chemistry/reagents/fatty_drinks.dm b/GainStation13/code/modules/reagents/chemistry/reagents/fatty_drinks.dm index cfadc2296a..b95428e770 100644 --- a/GainStation13/code/modules/reagents/chemistry/reagents/fatty_drinks.dm +++ b/GainStation13/code/modules/reagents/chemistry/reagents/fatty_drinks.dm @@ -159,19 +159,19 @@ use_gs_icon = TRUE -/datum/reagent/consumable/oreo_milky - name = "Oreo Milkshake" +/datum/reagent/consumable/cookiecream_milky + name = "Cookies and Cream Milkshake" description = "For when you feel like pouring cookies down your throat." color = "#c4ac95ff" taste_description = "cookies, milk and sugar" quality = DRINK_GOOD - glass_icon_state = "oreo_milky" - glass_name = "milky oreo shake" + glass_icon_state = "cookiecream_milky" + glass_name = "milky cookiecream shake" glass_desc = "For when you feel like pouring cookies down your throat." shot_glass_icon_state = "shotglassbrown" use_gs_icon = TRUE -/datum/reagent/consumable/oreo_milky/on_mob_life(mob/living/carbon/M) +/datum/reagent/consumable/cookiecream_milky/on_mob_life(mob/living/carbon/M) M.dizziness = max(0,M.dizziness-5) M.drowsyness = max(0,M.drowsyness-3) if(M && M?.client?.prefs.weight_gain_food) // GS13 @@ -180,14 +180,14 @@ M.nutrition += 1 ..() -/datum/reagent/consumable/oreo_classic - name = "Oreo Cookieshake" +/datum/reagent/consumable/cookiecream_classic + name = "Creamy Cookieshake" description = "For when you feel like pouring cookies down your throat." color = "#584532ff" taste_description = "cookies and sugar" quality = DRINK_GOOD - glass_icon_state = "oreo_classic" - glass_name = "oreo shake" + glass_icon_state = "cookiecream_classic" + glass_name = "cookiecream shake" glass_desc = "For when you feel like pouring cookies down your throat." shot_glass_icon_state = "shotglassbrown" use_gs_icon = TRUE diff --git a/GainStation13/code/modules/reagents/chemistry/recipes/fatdrinks.dm b/GainStation13/code/modules/reagents/chemistry/recipes/fatdrinks.dm index 81a350a3ee..6ba7c3ae90 100644 --- a/GainStation13/code/modules/reagents/chemistry/recipes/fatdrinks.dm +++ b/GainStation13/code/modules/reagents/chemistry/recipes/fatdrinks.dm @@ -60,23 +60,23 @@ results = list(/datum/reagent/consumable/heavy_cafe = 3) required_reagents = list(/datum/reagent/consumable/cafe_latte = 1, /datum/reagent/consumable/sugar = 1, /datum/reagent/consumable/cream = 1) -/datum/chemical_reaction/oreo_classic +/datum/chemical_reaction/cookiecream_classic name = "Oreo Classic" - id = /datum/reagent/consumable/oreo_classic - results = list(/datum/reagent/consumable/oreo_classic = 3) + id = /datum/reagent/consumable/cookiecream_classic + results = list(/datum/reagent/consumable/cookiecream_classic = 3) required_reagents = list(/datum/reagent/consumable/flour = 2, /datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/coco = 1) -/datum/chemical_reaction/oreo_milky +/datum/chemical_reaction/cookiecream_milky name = "Oreo Milky" - id = /datum/reagent/consumable/oreo_milky - results = list(/datum/reagent/consumable/oreo_milky = 3) + id = /datum/reagent/consumable/cookiecream_milky + results = list(/datum/reagent/consumable/cookiecream_milky = 3) required_reagents = list(/datum/reagent/consumable/flour = 2, /datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/milk = 1) -/obj/item/reagent_containers/food/snacks/store/cake/hugeoreo - name = "GlucoBomb Oreo Cookieshake" +/obj/item/reagent_containers/food/snacks/store/cake/hugecookiecream + name = "GlucoBomb Cookies and Cream Cakeshake" desc = "Are you out of your fucking mind?" icon = 'GainStation13/icons/obj/food/food64x64.dmi' - icon_state = "oreo_huge" + icon_state = "cookiecream_huge" pixel_x = -16 pixel_y = -16 inhand_x_dimension = 64 @@ -94,5 +94,5 @@ /datum/reagent/consumable/milk = 100, /datum/reagent/consumable/cream = 50 ) - result = /obj/item/reagent_containers/food/snacks/store/cake/hugeoreo + result = /obj/item/reagent_containers/food/snacks/store/cake/hugecookiecream subcategory = CAT_CAKE diff --git a/GainStation13/icons/obj/drinks.dmi b/GainStation13/icons/obj/drinks.dmi index 218b65e99aafcc472bd00a816fd825e1129dda04..9369fcb13205be3dbf520c3b2a4b3de38a625759 100644 GIT binary patch delta 304 zcmV-00nh%eH?KF4B!3xtR9JLGWpiV4X>fFDZ*Bkpc$|%q!EVAZ42I9mQ$%o$rmclz zFB53u0Iv`^sY|RnWJ&@kJpB$xqlZ=5EtbB|zwNB$=l<((lDp$U+%P5z7un0r+q-D) zG-M}x*|nl^NN1OyMaqy-_Hs4S<8i0QN;Ct-BzyTGnlXaM=YRW`OCe;JkaHak#6<@f zQWLi3Gi24pC*m#u15t7fYj4#pJiA(sCnWphm#qxJ|x zm3IiYqAiU0H`>1D+N$mB{P9XT>5NeSfeTD%C@&<;Ht$rYI@P^YPdp_D6Y3jWh`Ap2 zGOPfFDZ*Bkpc$|%q!EVAZ42I9mQ&@1Vrmclz zFB53u0Iv`^txK#rWJ&@kJpB$xqlZ=5&6Ym<_wRoVpZl-F33kVWx>1PiFVMl}?Oj!O z9+HI)+D28D_-xa&i3t-y2dj}Ek2^nBsv0;%=-@+DV?amG`hS;;-X|MLQW^CuS$iB~ zkvvQOwmj%4=p2P2Z%8C-BOcSj@{Otn63oy+Q#W-}&#W5p#$@d<dmQO+w0YgNt+%uHhbyP36Ja@l3r=J>Ehx;Kw{=^$b^981EK{^Nk-p)DMap8Y ziQf9&3ogmdb0QDqwPTse@AZMa?geAyehFT~{fFDZ*Bkpc${^M!3u*g5CzZKuXyOav>?6Z zQX(Y>{RIiSb(f+kNm{|L??LFTw;7nJacl3shwD6jIAx71ESl4q%%)QjSX>)2!a7Si zB$rSa7F7|BE5CH#Lq%rNlwolp^GIRggMaN9<5PJ|9F{@eGZOzBYP7wB>pXn{SD!2H LW-Pekv9Dhhc>zZb delta 151 zcmV;I0BHY|ERHOYB!7Z>R9JLGWpiV4X>fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5; z&r`5fFwryM;w;ZhDalZ<|ROwTBRaEeP3OHvhV6_iRcQuFgt3o@&!5|y|( zQ!Jp@xj55`5_3}_Y`EI|qSXBOjMDT}Tq>0nT>V@WTnv0Yxc~*ADIvU&6rZuR FUlmQUL@NLQ diff --git a/GainStation13/sound/misc/vote_started.ogg b/GainStation13/sound/misc/vote_start.ogg similarity index 99% rename from GainStation13/sound/misc/vote_started.ogg rename to GainStation13/sound/misc/vote_start.ogg index 5cfaf4418c3cb3e4ad466b3a234870c58d22d831..a4a1bcc0dde28681e4c07bdc6554a4b8d32f82cb 100644 GIT binary patch delta 107 zcmX@p%5>cix@VC*OsyZ06r!q1poj5 delta 107 zcmX@p%5H&IHD2gGLt^51`X*|sqxk{>JpQoXk? o=KSWJ{0FSSBFsRMi%FfUH@A8nGXjgS07V*%ml|viuPtQ-0FL=4DF6Tf diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 8dcb56ca3f..3d3ddad639 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -438,7 +438,7 @@ SUBSYSTEM_DEF(vote) to_chat(usr, "A vote was initiated recently, you must wait [DisplayTimeText(next_allowed_time-world.time)] before a new vote can be started!") return FALSE - SEND_SOUND(world, sound('GainStation13/sound/misc/vote_started.ogg')) //gs13 - our own more noticeable version + SEND_SOUND(world, sound('GainStation13/sound/misc/vote_start.ogg')) //gs13 - our own more noticeable version reset() display_votes = display //CIT CHANGE - adds obfuscated votes switch(vote_type) diff --git a/tgstation.dme b/tgstation.dme index 6f85efb10e..4b8781085f 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3982,8 +3982,8 @@ #include "GainStation13\code\game\objects\structures\false_walls.dm" #include "GainStation13\code\game\objects\structures\medikit.dm" #include "GainStation13\code\game\objects\structures\sofa.dm" -#include "GainStation13\code\game\objects\structures\statues.dm" #include "GainStation13\code\game\objects\structures\spawner.dm" +#include "GainStation13\code\game\objects\structures\statues.dm" #include "GainStation13\code\game\objects\structures\table_frames.dm" #include "GainStation13\code\game\objects\structures\table_racks.dm" #include "GainStation13\code\game\objects\structures\beds_chairs\bed.dm"