mirror of
https://github.com/vgstation-coders/vgstation13.git
synced 2025-12-10 18:32:03 +00:00
Adds Greyshirt vodka
This commit is contained in:
@@ -317,6 +317,8 @@
|
|||||||
#define FISHBLEACH "fishbleach"
|
#define FISHBLEACH "fishbleach"
|
||||||
#define CHEESYGLOOP "cheesy_gloop"
|
#define CHEESYGLOOP "cheesy_gloop"
|
||||||
#define MAPLESYRUP "maple_syrup"
|
#define MAPLESYRUP "maple_syrup"
|
||||||
|
#define ROACHSHELL "roach_shell"
|
||||||
|
#define GREYVODKA "grey_vodka"
|
||||||
|
|
||||||
#define TUNGSTEN "tungsten"
|
#define TUNGSTEN "tungsten"
|
||||||
#define LITHIUMSODIUMTUNGSTATE "lithiumsodiumtungstate"
|
#define LITHIUMSODIUMTUNGSTATE "lithiumsodiumtungstate"
|
||||||
@@ -335,6 +337,6 @@
|
|||||||
|
|
||||||
//Pulse related bullshit
|
//Pulse related bullshit
|
||||||
var/list/tachycardics = list(COFFEE, INAPROVALINE, HYPERZINE, NITROGLYCERIN, THIRTEENLOKO, NICOTINE) //increase heart rate
|
var/list/tachycardics = list(COFFEE, INAPROVALINE, HYPERZINE, NITROGLYCERIN, THIRTEENLOKO, NICOTINE) //increase heart rate
|
||||||
var/list/bradycardics = list(NEUROTOXIN, CRYOXADONE, CLONEXADONE, SPACE_DRUGS, STOXIN) //decrease heart rate
|
var/list/bradycardics = list(NEUROTOXIN, CRYOXADONE, CLONEXADONE, SPACE_DRUGS, STOXIN, GREYVODKA) //decrease heart rate
|
||||||
var/list/heartstopper = list(/*"potassium_phorochloride",*/ ZOMBIEPOWDER) //this stops the heart
|
var/list/heartstopper = list(/*"potassium_phorochloride",*/ ZOMBIEPOWDER) //this stops the heart
|
||||||
var/list/cheartstopper = list(/*"potassium_chloride",*/ CHEESYGLOOP) //this stops the heart when overdose is met -- c = conditional
|
var/list/cheartstopper = list(/*"potassium_chloride",*/ CHEESYGLOOP) //this stops the heart when overdose is met -- c = conditional
|
||||||
|
|||||||
@@ -5508,7 +5508,7 @@ var/global/list/tonio_doesnt_remove=list("tonio", "blood")
|
|||||||
volume = holder.maximum_volume
|
volume = holder.maximum_volume
|
||||||
holder.update_total()
|
holder.update_total()
|
||||||
|
|
||||||
datum/reagent/fishbleach
|
/datum/reagent/fishbleach
|
||||||
name = "Fish Bleach"
|
name = "Fish Bleach"
|
||||||
id = FISHBLEACH
|
id = FISHBLEACH
|
||||||
description = "Just looking at this liquid makes you feel tranquil and peaceful. You aren't sure if you want to drink any however."
|
description = "Just looking at this liquid makes you feel tranquil and peaceful. You aren't sure if you want to drink any however."
|
||||||
@@ -5520,3 +5520,24 @@ datum/reagent/fishbleach
|
|||||||
return 1
|
return 1
|
||||||
H.color = "#12A7C9"
|
H.color = "#12A7C9"
|
||||||
return
|
return
|
||||||
|
|
||||||
|
/datum/reagent/roach_shell
|
||||||
|
name = "Cockroach chitin"
|
||||||
|
id = ROACHSHELL
|
||||||
|
description = "Looks like somebody's been shelling peanuts."
|
||||||
|
reagent_state = SOLID
|
||||||
|
color = "#8B4513"
|
||||||
|
|
||||||
|
/datum/reagent/ethanol/deadrum/greyvodka
|
||||||
|
name = "Greyshirt vodka"
|
||||||
|
id = GREYVODKA
|
||||||
|
description = "Made presumably from whatever scrapings you can get out of maintenance. Don't think, just drink."
|
||||||
|
reagent_state = LIQUID
|
||||||
|
color = "#DEF7F5"
|
||||||
|
alpha = 64
|
||||||
|
|
||||||
|
/datum/reagent/ethanol/deadrum/greyvodka/on_mob_life(var/mob/living/carbon/human/H)
|
||||||
|
if(..())
|
||||||
|
return 1
|
||||||
|
H.radiation = max(H.radiation - 5 * REM, 0)
|
||||||
|
H.rad_tick = max(H.rad_tick - 3 * REM, 0)
|
||||||
|
|||||||
@@ -2208,6 +2208,13 @@
|
|||||||
required_catalysts = list(ENZYME = 5)
|
required_catalysts = list(ENZYME = 5)
|
||||||
result_amount = 10
|
result_amount = 10
|
||||||
|
|
||||||
|
/datum/chemical_reaction/greyvodka
|
||||||
|
name = "Greyshirt Vodka"
|
||||||
|
id = GREYVODKA
|
||||||
|
result = GREYVODKA
|
||||||
|
required_reagents = list(POTATO = 2, WATER = 2, ROACHSHELL = 1)
|
||||||
|
result_amount = 5
|
||||||
|
|
||||||
/datum/chemical_reaction/sake
|
/datum/chemical_reaction/sake
|
||||||
name = "Sake"
|
name = "Sake"
|
||||||
id = SAKE
|
id = SAKE
|
||||||
|
|||||||
@@ -1124,6 +1124,19 @@
|
|||||||
..()
|
..()
|
||||||
reagents.add_reagent(LIMEJUICE, 100)
|
reagents.add_reagent(LIMEJUICE, 100)
|
||||||
|
|
||||||
|
/obj/item/weapon/reagent_containers/food/drinks/bottle/greyvodka
|
||||||
|
name = "Greyshirt vodka"
|
||||||
|
desc = "Experts spent a long time squatting around a mixing bench to bring you this."
|
||||||
|
icon_state = "grey_vodka"
|
||||||
|
vending_cat = "spirits"
|
||||||
|
starting_materials = null
|
||||||
|
isGlass = 1
|
||||||
|
molotov = -1
|
||||||
|
|
||||||
|
/obj/item/weapon/reagent_containers/food/drinks/bottle/greyvodka/New()
|
||||||
|
..()
|
||||||
|
reagents.add_reagent(GREYVODKA, 100)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -542,6 +542,11 @@
|
|||||||
item_state = DANS_WHISKEY
|
item_state = DANS_WHISKEY
|
||||||
name = "Discount Dan's 'Malt' Whiskey"
|
name = "Discount Dan's 'Malt' Whiskey"
|
||||||
desc = "The very cheapest and most sickening method of liver failure."
|
desc = "The very cheapest and most sickening method of liver failure."
|
||||||
|
if(GREYVODKA)
|
||||||
|
icon_state = "ginvodkaglass"
|
||||||
|
item_state = "ginvodkaglass"
|
||||||
|
name = "glass of Grey vodka"
|
||||||
|
desc = "A questionable concoction of objects found within maintenance. Tastes just like you'd expect."
|
||||||
else
|
else
|
||||||
icon_state ="glass_colour"
|
icon_state ="glass_colour"
|
||||||
item_state ="glass_colour"
|
item_state ="glass_colour"
|
||||||
|
|||||||
Reference in New Issue
Block a user