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 218b65e99a..9369fcb132 100644 Binary files a/GainStation13/icons/obj/drinks.dmi and b/GainStation13/icons/obj/drinks.dmi differ diff --git a/GainStation13/icons/obj/food/food64x64.dmi b/GainStation13/icons/obj/food/food64x64.dmi index a10bae712c..4501f15838 100644 Binary files a/GainStation13/icons/obj/food/food64x64.dmi and b/GainStation13/icons/obj/food/food64x64.dmi differ 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 5cfaf4418c..a4a1bcc0dd 100644 Binary files a/GainStation13/sound/misc/vote_started.ogg and b/GainStation13/sound/misc/vote_start.ogg differ 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"