Revert "lol"

This reverts commit 7f6a1a6fda.
This commit is contained in:
Sishen
2019-11-28 23:00:13 -07:00
parent 7f6a1a6fda
commit 3a1e4dec5a
6 changed files with 46 additions and 3 deletions
+1
View File
@@ -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)
@@ -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)
@@ -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"
@@ -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)
@@ -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"
+2 -1
View File
@@ -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