From 7f6a1a6fda46ed94e7229e8987f6ae6619eedf53 Mon Sep 17 00:00:00 2001 From: Sishen Date: Thu, 28 Nov 2019 22:53:39 -0700 Subject: [PATCH 1/3] lol --- code/game/objects/items/storage/belt.dm | 1 - .../drinks/drinks/drinkingglass.dm | 4 --- .../food_and_drinks/recipes/drinks_recipes.dm | 10 ++----- .../mob/living/carbon/monkey/monkey.dm | 2 -- .../chemistry/reagents/drink_reagents.dm | 29 ------------------- code/modules/vending/cola.dm | 3 +- 6 files changed, 3 insertions(+), 46 deletions(-) diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index e6e4b31547..c303badf05 100755 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -392,7 +392,6 @@ /obj/item/reagent_containers/food/drinks/soda_cans/space_up, /obj/item/reagent_containers/food/drinks/soda_cans/pwr_game, /obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime, - /obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola, /obj/item/reagent_containers/food/drinks/drinkingglass/filled/syndicatebomb )) new rig_snacks(src) diff --git a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm index 1e5c2eaf60..5f865093a7 100644 --- a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm +++ b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm @@ -87,10 +87,6 @@ name = "Space Cola" list_reagents = list("cola" = 50) -/obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola - name = "Nuka Cola" - list_reagents = list("nuka_cola" = 50) - /obj/item/reagent_containers/food/drinks/drinkingglass/filled/syndicatebomb name = "Syndicat Bomb" list_reagents = list("syndicatebomb" = 50) diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index 9dbddfb519..60528139b6 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -30,12 +30,6 @@ results = list("icecoffee" = 4) required_reagents = list("ice" = 1, "coffee" = 3) -/datum/chemical_reaction/nuka_cola - name = "Nuka Cola" - id = "nuka_cola" - results = list("nuka_cola" = 6) - required_reagents = list("uranium" = 1, "cola" = 6) - /datum/chemical_reaction/moonshine name = "Moonshine" id = "moonshine" @@ -532,7 +526,7 @@ name = "Fetching Fizz" id = "fetching_fizz" results = list("fetching_fizz" = 3) - required_reagents = list("nuka_cola" = 1, "iron" = 1) //Manufacturable from only the mining station + required_reagents = list("pwr_game" = 1, "iron" = 1) //Manufacturable from only the mining station mix_message = "The mixture slightly vibrates before settling." /datum/chemical_reaction/hearty_punch @@ -734,7 +728,7 @@ name = "Blank Paper" id = "blank_paper" results = list("blank_paper" = 3) - required_reagents = list("silencer" = 1, "nothing" = 1, "nuka_cola" = 1) + required_reagents = list("silencer" = 1, "nothing" = 1, "pwr_game" = 1) /datum/chemical_reaction/wizz_fizz name = "Wizz Fizz" diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index f9c2e2dd3d..025c1a2f75 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -63,8 +63,6 @@ var/amount if(reagents.has_reagent("morphine")) amount = -1 - if(reagents.has_reagent("nuka_cola")) - amount = -1 if(amount) add_movespeed_modifier(MOVESPEED_ID_MONKEY_REAGENT_SPEEDMOD, TRUE, 100, override = TRUE, multiplicative_slowdown = amount) diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm index 80dac84f18..670773e827 100644 --- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm @@ -396,35 +396,6 @@ M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL) ..() -/datum/reagent/consumable/nuka_cola - name = "Nuka Cola" - id = "nuka_cola" - description = "Cola, cola never changes." - color = "#100800" // rgb: 16, 8, 0 - quality = DRINK_VERYGOOD - taste_description = "the future" - glass_icon_state = "nuka_colaglass" - glass_name = "glass of Nuka Cola" - glass_desc = "Don't cry, Don't raise your eye, It's only nuclear wasteland." - -/datum/reagent/consumable/nuka_cola/on_mob_metabolize(mob/living/L) - ..() - L.add_movespeed_modifier(id, update=TRUE, priority=100, multiplicative_slowdown=-1, blacklisted_movetypes=(FLYING|FLOATING)) - -/datum/reagent/consumable/nuka_cola/on_mob_end_metabolize(mob/living/L) - L.remove_movespeed_modifier(id) - ..() - -/datum/reagent/consumable/nuka_cola/on_mob_life(mob/living/carbon/M) - M.Jitter(20) - M.set_drugginess(30) - M.dizziness +=1.5 - M.drowsyness = 0 - M.AdjustSleeping(-40, FALSE) - M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL) - ..() - . = 1 - /datum/reagent/consumable/spacemountainwind name = "SM Wind" id = "spacemountainwind" diff --git a/code/modules/vending/cola.dm b/code/modules/vending/cola.dm index a242d88be4..e26f8624ee 100644 --- a/code/modules/vending/cola.dm +++ b/code/modules/vending/cola.dm @@ -15,8 +15,7 @@ /obj/item/reagent_containers/glass/beaker/waterbottle = 10) contraband = list(/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko = 6, /obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 6) - premium = list(/obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola = 1, - /obj/item/reagent_containers/food/drinks/soda_cans/air = 1, + premium = list(/obj/item/reagent_containers/food/drinks/soda_cans/air = 1, /obj/item/reagent_containers/food/drinks/soda_cans/grey_bull = 1) refill_canister = /obj/item/vending_refill/cola From 3a1e4dec5ade2b52734908744b5fecfc253043dd Mon Sep 17 00:00:00 2001 From: Sishen Date: Thu, 28 Nov 2019 23:00:13 -0700 Subject: [PATCH 2/3] Revert "lol" This reverts commit 7f6a1a6fda46ed94e7229e8987f6ae6619eedf53. --- code/game/objects/items/storage/belt.dm | 1 + .../drinks/drinks/drinkingglass.dm | 4 +++ .../food_and_drinks/recipes/drinks_recipes.dm | 10 +++++-- .../mob/living/carbon/monkey/monkey.dm | 2 ++ .../chemistry/reagents/drink_reagents.dm | 29 +++++++++++++++++++ code/modules/vending/cola.dm | 3 +- 6 files changed, 46 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index c303badf05..e6e4b31547 100755 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -392,6 +392,7 @@ /obj/item/reagent_containers/food/drinks/soda_cans/space_up, /obj/item/reagent_containers/food/drinks/soda_cans/pwr_game, /obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime, + /obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola, /obj/item/reagent_containers/food/drinks/drinkingglass/filled/syndicatebomb )) new rig_snacks(src) diff --git a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm index 5f865093a7..1e5c2eaf60 100644 --- a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm +++ b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm @@ -87,6 +87,10 @@ name = "Space Cola" list_reagents = list("cola" = 50) +/obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola + name = "Nuka Cola" + list_reagents = list("nuka_cola" = 50) + /obj/item/reagent_containers/food/drinks/drinkingglass/filled/syndicatebomb name = "Syndicat Bomb" list_reagents = list("syndicatebomb" = 50) diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index 60528139b6..9dbddfb519 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -30,6 +30,12 @@ results = list("icecoffee" = 4) required_reagents = list("ice" = 1, "coffee" = 3) +/datum/chemical_reaction/nuka_cola + name = "Nuka Cola" + id = "nuka_cola" + results = list("nuka_cola" = 6) + required_reagents = list("uranium" = 1, "cola" = 6) + /datum/chemical_reaction/moonshine name = "Moonshine" id = "moonshine" @@ -526,7 +532,7 @@ name = "Fetching Fizz" id = "fetching_fizz" results = list("fetching_fizz" = 3) - required_reagents = list("pwr_game" = 1, "iron" = 1) //Manufacturable from only the mining station + required_reagents = list("nuka_cola" = 1, "iron" = 1) //Manufacturable from only the mining station mix_message = "The mixture slightly vibrates before settling." /datum/chemical_reaction/hearty_punch @@ -728,7 +734,7 @@ name = "Blank Paper" id = "blank_paper" results = list("blank_paper" = 3) - required_reagents = list("silencer" = 1, "nothing" = 1, "pwr_game" = 1) + required_reagents = list("silencer" = 1, "nothing" = 1, "nuka_cola" = 1) /datum/chemical_reaction/wizz_fizz name = "Wizz Fizz" diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index 025c1a2f75..f9c2e2dd3d 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -63,6 +63,8 @@ var/amount if(reagents.has_reagent("morphine")) amount = -1 + if(reagents.has_reagent("nuka_cola")) + amount = -1 if(amount) add_movespeed_modifier(MOVESPEED_ID_MONKEY_REAGENT_SPEEDMOD, TRUE, 100, override = TRUE, multiplicative_slowdown = amount) diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm index 670773e827..80dac84f18 100644 --- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm @@ -396,6 +396,35 @@ M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL) ..() +/datum/reagent/consumable/nuka_cola + name = "Nuka Cola" + id = "nuka_cola" + description = "Cola, cola never changes." + color = "#100800" // rgb: 16, 8, 0 + quality = DRINK_VERYGOOD + taste_description = "the future" + glass_icon_state = "nuka_colaglass" + glass_name = "glass of Nuka Cola" + glass_desc = "Don't cry, Don't raise your eye, It's only nuclear wasteland." + +/datum/reagent/consumable/nuka_cola/on_mob_metabolize(mob/living/L) + ..() + L.add_movespeed_modifier(id, update=TRUE, priority=100, multiplicative_slowdown=-1, blacklisted_movetypes=(FLYING|FLOATING)) + +/datum/reagent/consumable/nuka_cola/on_mob_end_metabolize(mob/living/L) + L.remove_movespeed_modifier(id) + ..() + +/datum/reagent/consumable/nuka_cola/on_mob_life(mob/living/carbon/M) + M.Jitter(20) + M.set_drugginess(30) + M.dizziness +=1.5 + M.drowsyness = 0 + M.AdjustSleeping(-40, FALSE) + M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL) + ..() + . = 1 + /datum/reagent/consumable/spacemountainwind name = "SM Wind" id = "spacemountainwind" diff --git a/code/modules/vending/cola.dm b/code/modules/vending/cola.dm index e26f8624ee..a242d88be4 100644 --- a/code/modules/vending/cola.dm +++ b/code/modules/vending/cola.dm @@ -15,7 +15,8 @@ /obj/item/reagent_containers/glass/beaker/waterbottle = 10) contraband = list(/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko = 6, /obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 6) - premium = list(/obj/item/reagent_containers/food/drinks/soda_cans/air = 1, + premium = list(/obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola = 1, + /obj/item/reagent_containers/food/drinks/soda_cans/air = 1, /obj/item/reagent_containers/food/drinks/soda_cans/grey_bull = 1) refill_canister = /obj/item/vending_refill/cola From 69e11e4203687902bea2fd946b8408bbe1c6cb18 Mon Sep 17 00:00:00 2001 From: Sishen Date: Thu, 28 Nov 2019 23:01:15 -0700 Subject: [PATCH 3/3] olllll --- code/modules/mob/living/carbon/monkey/monkey.dm | 2 -- code/modules/reagents/chemistry/reagents/drink_reagents.dm | 4 ---- 2 files changed, 6 deletions(-) diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index f9c2e2dd3d..025c1a2f75 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -63,8 +63,6 @@ var/amount if(reagents.has_reagent("morphine")) amount = -1 - if(reagents.has_reagent("nuka_cola")) - amount = -1 if(amount) add_movespeed_modifier(MOVESPEED_ID_MONKEY_REAGENT_SPEEDMOD, TRUE, 100, override = TRUE, multiplicative_slowdown = amount) diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm index 80dac84f18..08594dee5b 100644 --- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm @@ -407,10 +407,6 @@ glass_name = "glass of Nuka Cola" glass_desc = "Don't cry, Don't raise your eye, It's only nuclear wasteland." -/datum/reagent/consumable/nuka_cola/on_mob_metabolize(mob/living/L) - ..() - L.add_movespeed_modifier(id, update=TRUE, priority=100, multiplicative_slowdown=-1, blacklisted_movetypes=(FLYING|FLOATING)) - /datum/reagent/consumable/nuka_cola/on_mob_end_metabolize(mob/living/L) L.remove_movespeed_modifier(id) ..()