diff --git a/GainStation13/code/game/objects/effects/posters.dm b/GainStation13/code/game/objects/effects/posters.dm index c1e72484a7..29ed3e5cbd 100644 --- a/GainStation13/code/game/objects/effects/posters.dm +++ b/GainStation13/code/game/objects/effects/posters.dm @@ -28,6 +28,31 @@ icon_state = "poster2_legit" icon = 'GainStation13/icons/obj/contraband.dmi' +/obj/structure/sign/poster/official/hoverchair + name = "Take A Load Off Poster" + desc = "A poster advertising freely available wheelchairs and hoverchairs, not only for the disabled, but for horizontally tall too." + icon_state = "poster36_legit" + icon = 'GainStation13/icons/obj/contraband.dmi' + +/obj/structure/sign/poster/official/calorite + name = "Calorite Warning Poster" + desc = "A poster warning workers of the dangers of calorite. Be wary when making contact with this mass-multiplicating material!" + icon_state = "poster37_legit" + icon = 'GainStation13/icons/obj/contraband.dmi' + +/obj/structure/sign/poster/official/fatorays + name = "NutriTech Weapons Poster" + desc = "An informative poster showing off a line of weapon designs from the NutriTech design line." + icon_state = "poster38_legit" + icon = 'GainStation13/icons/obj/contraband.dmi' + +/obj/structure/sign/poster/official/waddle + name = "Waddle Poster" + desc = "A poster enticing GATO employees to enjoy the free benefit of a mobility support exoskeleton." + icon_state = "poster39_legit" + icon = 'GainStation13/icons/obj/contraband.dmi' + + /obj/structure/sign/poster/contraband/corn_oil name = "Corn Oil Poster" desc = "A strange poster advertising corn oil beverage. Who would want to drink that...?" @@ -64,6 +89,17 @@ icon_state = "poster50" icon = 'GainStation13/icons/obj/contraband.dmi' +/obj/structure/sign/poster/contraband/gulp + name = "Just Gulp Poster" + desc = "Keep that hose strapped to your mouth and let your worries melt away. Just keep gulping." + icon_state = "poster51" + icon = 'GainStation13/icons/obj/contraband.dmi' + +/obj/structure/sign/poster/contraband/loosen + name = "Loosen Poster" + desc = "A broken belt is a sign progress - so loosen up!" + icon_state = "poster51" + icon = 'GainStation13/icons/obj/contraband.dmi' //recoloring of propaganda posters - from NT blue to GT pink /obj/structure/sign/poster/gato/safety diff --git a/GainStation13/code/game/plushes.dm b/GainStation13/code/game/plushes.dm index d0874694a3..e9dd55fc16 100644 --- a/GainStation13/code/game/plushes.dm +++ b/GainStation13/code/game/plushes.dm @@ -87,3 +87,9 @@ desc = "A plush of a pale demon twink." icon_state = "kot" attack_verb = list("squished", "hugged", "kissed") + +/obj/item/toy/plush/gs13/gatito + name = "Gatito plushie" + desc = "Cutie kitty meow meow gatito plushie! Corporate flavor!!" + icon_state = "kot" + attack_verb = list("squished", "hugged", "meowed") diff --git a/GainStation13/code/modules/gym/gym.dm b/GainStation13/code/modules/gym/gym.dm index bf8e2feb55..0b64bdb059 100644 --- a/GainStation13/code/modules/gym/gym.dm +++ b/GainStation13/code/modules/gym/gym.dm @@ -35,8 +35,8 @@ /obj/machinery/treadmill name = "treadmill" desc = "A treadmil, for losing weight!" - icon = 'icons/obj/recycling.dmi' - icon_state = "conveyor0" + icon = 'GainStation13/icons/obj/structure/treadmill.dmi' + icon_state = "treadmill" circuit = /obj/item/circuitboard/machine/treadmill var/fatloss = -10 diff --git a/GainStation13/code/modules/reagents/chemistry/reagents/fatty_drinks.dm b/GainStation13/code/modules/reagents/chemistry/reagents/fatty_drinks.dm index 30b19ff574..cfadc2296a 100644 --- a/GainStation13/code/modules/reagents/chemistry/reagents/fatty_drinks.dm +++ b/GainStation13/code/modules/reagents/chemistry/reagents/fatty_drinks.dm @@ -157,3 +157,53 @@ glass_desc = "Nothing better than cream AND cocoa!" shot_glass_icon_state = "shotglassbrown" use_gs_icon = TRUE + + +/datum/reagent/consumable/oreo_milky + name = "Oreo 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_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) + M.dizziness = max(0,M.dizziness-5) + M.drowsyness = max(0,M.drowsyness-3) + if(M && M?.client?.prefs.weight_gain_food) // GS13 + M.nutrition += 15 * REAGENTS_METABOLISM + else + M.nutrition += 1 + ..() + +/datum/reagent/consumable/oreo_classic + name = "Oreo 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_desc = "For when you feel like pouring cookies down your throat." + shot_glass_icon_state = "shotglassbrown" + use_gs_icon = TRUE + +/datum/reagent/consumable/oreo_classic/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 + M.nutrition += 15 * REAGENTS_METABOLISM + else + M.nutrition += 1 + ..() + +/obj/structure/reagent_dispensers/keg/lipoifier //gs13 + name = "keg of lipoifier" + desc = "Good luck downing that and not getting beached." + icon_state = "orangekeg" + reagent_id = /datum/reagent/consumable/lipoifier + tank_volume = 300 diff --git a/GainStation13/code/modules/reagents/chemistry/recipes/fatdrinks.dm b/GainStation13/code/modules/reagents/chemistry/recipes/fatdrinks.dm index b053f71d19..15c957af32 100644 --- a/GainStation13/code/modules/reagents/chemistry/recipes/fatdrinks.dm +++ b/GainStation13/code/modules/reagents/chemistry/recipes/fatdrinks.dm @@ -54,9 +54,45 @@ results = list(/datum/reagent/consumable/milkshake_chocolate = 3) required_reagents = list(/datum/reagent/consumable/milk/chocolate_milk = 1, /datum/reagent/consumable/cream = 1, /datum/reagent/consumable/coco = 1) -/obj/structure/reagent_dispensers/keg/lipoifier //gs13 - name = "keg of lipoifier" - desc = "Good luck downing that and not getting beached." - icon_state = "orangekeg" - reagent_id = /datum/reagent/consumable/lipoifier - tank_volume = 300 +/datum/chemical_reaction/heavy_cafe1 + name = "Heavy Cafe" + id = /datum/reagent/consumable/heavy_cafe + 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 + name = "Heavy Cafe" + id = /datum/reagent/consumable/oreo_classic + results = list(/datum/reagent/consumable/oreo_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 + name = "Heavy Cafe" + id = /datum/reagent/consumable/oreo_milky + results = list(/datum/reagent/consumable/oreo_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" + desc = "Are you out of your fucking mind?" + icon = 'GainStation13/icons/obj/food/food64x64.dmi' + icon_state = "oreo_huge" + pixel_x = -16 + pixel_y = -16 + inhand_x_dimension = 64 + inhand_y_dimension = 64 + bonus_reagents = list(/datum/reagent/consumable/nutriment = 20, /datum/reagent/consumable/sugar = 20) + list_reagents = list(/datum/reagent/consumable/nutriment = 200, /datum/reagent/consumable/sugar = 100, /datum/reagent/consumable/milk = 50) + tastes = list("sugar" = 1, "sugar shock" = 1, "syrup" = 1, "slop" = 1, "overwhelming surge of calories" = 10) + foodtype = DAIRY| JUNKFOOD + +/datum/crafting_recipe/food/hugeoreo + name = "GlucoBomb Oreo Cookieshake" + reqs = list( + /obj/item/reagent_containers/food/snacks/store/cake/cheese = 2, + /datum/reagent/consumable/sugar = 100, + /datum/reagent/consumable/milk = 100, + /datum/reagent/consumable/cream = 50 + ) + result = /obj/item/reagent_containers/food/snacks/hugeoreo + subcategory = CAT_CAKE diff --git a/GainStation13/code/modules/research/designs/nutri_designs.dm b/GainStation13/code/modules/research/designs/nutri_designs.dm index 90aa4d546e..180d9fd9ac 100644 --- a/GainStation13/code/modules/research/designs/nutri_designs.dm +++ b/GainStation13/code/modules/research/designs/nutri_designs.dm @@ -25,7 +25,7 @@ departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_SECURITY /datum/design/alter_ray_metabolism - name = "AL-T-Ray: Metabolism" + name = "AlteRay: Metabolism" id = "alter_ray_metabolism" build_type = PROTOLATHE materials = list(/datum/material/iron = 10000, /datum/material/glass = 8000, /datum/material/calorite = 26000) @@ -36,7 +36,7 @@ /datum/design/alter_ray_reverser - name = "AL-T-Ray: Reverser" + name = "AlteRay: Reverser" id = "alter_ray_reverser" build_type = PROTOLATHE materials = list(/datum/material/iron = 10000, /datum/material/glass = 8000, /datum/material/calorite = 26000) diff --git a/GainStation13/code/obj/weapons/alter_rays.dm b/GainStation13/code/obj/weapons/alter_rays.dm index 76245e1bec..22f26d40f0 100644 --- a/GainStation13/code/obj/weapons/alter_rays.dm +++ b/GainStation13/code/obj/weapons/alter_rays.dm @@ -4,8 +4,8 @@ /obj/item/gun/energy/laser/alter_ray name = "alter-ray" - icon = 'icons/obj/guns/energy.dmi' - icon_state = "lasernew" + icon = 'GainStation13/icons/obj/weapon/alter_ray.dmi' + icon_state = "alter_ray" desc = "This weapon is capable of altering one's body capabilities." item_state = null selfcharge = EGUN_SELFCHARGE @@ -14,7 +14,7 @@ clumsy_check = 1 /obj/item/gun/energy/laser/alter_ray/gainrate - name = "AL-T-Ray: Metabolism" + name = "AlteRay: Metabolism" desc = "This weapon is capable of altering one's body capabilities. This model appears to be capable of altering one's weight gain and loss rate by 10%." ammo_type = list(/obj/item/ammo_casing/energy/laser/gainrate_decrease, /obj/item/ammo_casing/energy/laser/gainrate_increase, /obj/item/ammo_casing/energy/laser/lossrate_decrease, /obj/item/ammo_casing/energy/laser/lossrate_increase) @@ -70,7 +70,7 @@ //wg rate increase /obj/item/projectile/alter_ray/gainrate_increase/on_hit(atom/target, blocked) . = ..() - + var/mob/living/carbon/gainer = target if(iscarbon(gainer)) @@ -85,7 +85,7 @@ //wg rate decrease /obj/item/projectile/alter_ray/gainrate_decrease/on_hit(atom/target, blocked) . = ..() - + var/mob/living/carbon/gainer = target if(iscarbon(gainer)) @@ -100,7 +100,7 @@ //wl rate increase /obj/item/projectile/alter_ray/lossrate_increase/on_hit(atom/target, blocked) . = ..() - + var/mob/living/carbon/gainer = target if(iscarbon(gainer)) @@ -114,7 +114,7 @@ //wl rate decrease /obj/item/projectile/alter_ray/lossrate_decrease/on_hit(atom/target, blocked) . = ..() - + var/mob/living/carbon/gainer = target if(iscarbon(gainer)) @@ -123,7 +123,7 @@ return TRUE if(gainer.weight_loss_rate <= 0.1) return FALSE - + return FALSE //ammo casings - these are needed to allow guns to switch between firing modes @@ -148,7 +148,7 @@ //ALTRay for making someone gain from weight loss /obj/item/gun/energy/laser/alter_ray/noloss - name = "AL-T-Ray: Reverser" + name = "AlteRay: Reverser" desc = "This weapon is capable of altering one's body capabilities. This one reverse's ones body functions, to make it so weight loss results in weight gain." ammo_type = list(/obj/item/ammo_casing/energy/laser/lossrate_reverse) @@ -162,7 +162,7 @@ /obj/item/projectile/alter_ray/lossrate_reverse/on_hit(atom/target, blocked) . = ..() - + var/mob/living/carbon/gainer = target if(iscarbon(gainer)) diff --git a/GainStation13/icons/obj/structure/treadmill.dmi b/GainStation13/icons/obj/structure/treadmill.dmi index bee6ca436c..d4b4cec4d3 100644 Binary files a/GainStation13/icons/obj/structure/treadmill.dmi and b/GainStation13/icons/obj/structure/treadmill.dmi differ diff --git a/GainStation13/icons/obj/weapons/alter_ray.dmi b/GainStation13/icons/obj/weapons/alter_ray.dmi new file mode 100644 index 0000000000..c6bee3bfbd Binary files /dev/null and b/GainStation13/icons/obj/weapons/alter_ray.dmi differ