mirror of
https://github.com/CHOMPstation/CHOMPstation.git
synced 2026-08-31 07:56:25 +01:00
Polaris sync
This commit is contained in:
killer653
@@ -32,7 +32,7 @@
|
||||
desc = "An advanced nanite and chemical synthesizer and injection system, designed for heavy-duty medical equipment. This type is capable of safely bypassing \
|
||||
thick materials that other hyposprays would struggle with."
|
||||
bypass_protection = TRUE // Because mercs tend to be in spacesuits.
|
||||
reagent_ids = list("healing_nanites", "hyperzine", "tramadol", "oxycodone", "spaceacillin", "peridaxon", "osteodaxon", "myelamine")
|
||||
reagent_ids = list("healing_nanites", "hyperzine", "tramadol", "oxycodone", "spaceacillin", "peridaxon", "osteodaxon", "myelamine", "synthblood")
|
||||
|
||||
/obj/item/weapon/reagent_containers/borghypo/New()
|
||||
..()
|
||||
@@ -132,7 +132,7 @@
|
||||
recharge_time = 3
|
||||
volume = 60
|
||||
possible_transfer_amounts = list(5, 10, 20, 30)
|
||||
reagent_ids = list("ale", "beer", "berryjuice", "coffee", "cognac", "cola", "dr_gibb", "egg", "gin", "gingerale", "hot_coco", "ice", "icetea", "kahlua", "lemonjuice", "lemon_lime", "limejuice", "mead", "milk", "mint", "orangejuice", "rum", "sake", "sodawater", "soymilk", "space_up", "spacemountainwind", "specialwhiskey", "sugar", "tea", "tequilla", "tomatojuice", "tonic", "vermouth", "vodka", "water", "watermelonjuice", "whiskey", "wine")
|
||||
reagent_ids = list("ale", "beer", "berryjuice", "bitters", "coffee", "cognac", "cola", "dr_gibb", "egg", "gin", "gingerale", "hot_coco", "ice", "icetea", "kahlua", "lemonjuice", "lemon_lime", "limejuice", "mead", "milk", "mint", "orangejuice", "rum", "sake", "sodawater", "soymilk", "space_up", "spacemountainwind", "specialwhiskey", "sugar", "tea", "tequilla", "tomatojuice", "tonic", "vermouth", "vodka", "water", "watermelonjuice", "whiskey", "wine")
|
||||
|
||||
/obj/item/weapon/reagent_containers/borghypo/service/attack(var/mob/M, var/mob/user)
|
||||
return
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
new /obj/item/weapon/reagent_containers/food/drinks/glass2/pint(src)
|
||||
new /obj/item/weapon/reagent_containers/food/drinks/glass2/mug(src)
|
||||
new /obj/item/weapon/reagent_containers/food/drinks/glass2/wine(src)
|
||||
new /obj/item/weapon/reagent_containers/food/drinks/metaglass(src)
|
||||
|
||||
/obj/item/weapon/storage/box/glasses
|
||||
name = "box of glasses"
|
||||
@@ -55,6 +56,10 @@
|
||||
name = "box of wine glasses"
|
||||
glass_type = /obj/item/weapon/reagent_containers/food/drinks/glass2/wine
|
||||
|
||||
/obj/item/weapon/storage/box/glasses/meta
|
||||
name = "box of half-pint metamorphic glasses"
|
||||
glass_type = /obj/item/weapon/reagent_containers/food/drinks/metaglass
|
||||
|
||||
/obj/item/weapon/storage/box/glass_extras
|
||||
name = "box of cocktail garnishings"
|
||||
var/extra_type = /obj/item/weapon/glass_extra
|
||||
|
||||
@@ -0,0 +1,502 @@
|
||||
/obj/item/weapon/reagent_containers/food/drinks/metaglass
|
||||
name = "metamorphic glass"
|
||||
desc = "This glass changes shape and form depending on the drink inside... fancy!"
|
||||
icon_state = "glass_empty"
|
||||
amount_per_transfer_from_this = 5
|
||||
volume = 30
|
||||
unacidable = 1 //glass
|
||||
center_of_mass = list("x"=16, "y"=10)
|
||||
matter = list("glass" = 500)
|
||||
icon = 'icons/obj/drinks.dmi'
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/drinks/metaglass/on_reagent_change()
|
||||
if (reagents.reagent_list.len > 0)
|
||||
var/datum/reagent/R = reagents.get_master_reagent()
|
||||
|
||||
if(R.glass_icon_state)
|
||||
icon_state = R.glass_icon_state
|
||||
else
|
||||
icon_state = "glass_brown"
|
||||
|
||||
if(R.glass_name)
|
||||
name = R.glass_name
|
||||
else
|
||||
name = "Glass of.. what?"
|
||||
|
||||
if(R.glass_desc)
|
||||
desc = R.glass_desc
|
||||
else
|
||||
desc = "You can't really tell what this is."
|
||||
|
||||
if(R.glass_center_of_mass)
|
||||
center_of_mass = R.glass_center_of_mass
|
||||
else
|
||||
center_of_mass = list("x"=16, "y"=10)
|
||||
|
||||
if(R.price_tag)
|
||||
price_tag = R.price_tag
|
||||
else
|
||||
price_tag = null
|
||||
else
|
||||
icon_state = "glass_empty"
|
||||
name = "metamorphic glass"
|
||||
desc = "This glass changes shape and form depending on the drink inside... fancy!"
|
||||
center_of_mass = list("x"=16, "y"=10)
|
||||
return
|
||||
|
||||
|
||||
/*
|
||||
Drinks Data
|
||||
*/
|
||||
|
||||
/datum/reagent
|
||||
var/glass_icon_state = null
|
||||
var/glass_center_of_mass = null
|
||||
|
||||
/datum/reagent/adminordrazine
|
||||
glass_icon_state = "golden_cup"
|
||||
|
||||
/datum/reagent/chloralhydrate/beer2
|
||||
glass_icon_state = "beerglass"
|
||||
glass_center_of_mass = list("x"=16, "y"=8)
|
||||
|
||||
/datum/reagent/blood
|
||||
glass_icon_state = "glass_red"
|
||||
|
||||
/datum/reagent/water
|
||||
glass_icon_state = "glass_clear"
|
||||
|
||||
/datum/reagent/fuel
|
||||
glass_icon_state = "dr_gibb_glass"
|
||||
|
||||
/datum/reagent/ethanol
|
||||
glass_icon_state = "glass_clear"
|
||||
|
||||
/datum/reagent/sugar
|
||||
glass_icon_state = "iceglass"
|
||||
|
||||
/datum/reagent/drink/juice/banana
|
||||
glass_icon_state = "banana"
|
||||
|
||||
/datum/reagent/drink/juice/berry
|
||||
glass_icon_state = "berryjuice"
|
||||
|
||||
/datum/reagent/drink/juice/carrot
|
||||
glass_icon_state = "carrotjuice"
|
||||
|
||||
/datum/reagent/drink/juice/
|
||||
glass_icon_state = "grapejuice"
|
||||
|
||||
/datum/reagent/drink/juice/lemon
|
||||
glass_icon_state = "lemonjuice"
|
||||
|
||||
/datum/reagent/drink/juice/lime
|
||||
glass_icon_state = "glass_green"
|
||||
|
||||
/datum/reagent/drink/juice/orange
|
||||
glass_icon_state = "glass_orange"
|
||||
|
||||
/datum/reagent/toxin/poisonberryjuice
|
||||
glass_icon_state = "poisonberryjuice"
|
||||
|
||||
/datum/reagent/drink/juice/potato
|
||||
glass_icon_state = "glass_brown"
|
||||
|
||||
/datum/reagent/drink/juice/tomato
|
||||
glass_icon_state = "glass_red"
|
||||
|
||||
/datum/reagent/drink/juice/watermelon
|
||||
glass_icon_state = "glass_red"
|
||||
|
||||
/datum/reagent/drink/milk
|
||||
glass_icon_state = "glass_white"
|
||||
|
||||
/datum/reagent/drink/chocolate
|
||||
glass_icon_state = "glass_brown"
|
||||
|
||||
/datum/reagent/drink/tea
|
||||
glass_icon_state = "bigteacup"
|
||||
|
||||
/datum/reagent/drink/tea/icetea
|
||||
glass_icon_state = "icedteaglass"
|
||||
glass_center_of_mass = list("x"=15, "y"=10)
|
||||
|
||||
/datum/reagent/drink/coffee
|
||||
glass_icon_state = "hot_coffee"
|
||||
|
||||
/datum/reagent/drink/icecoffee
|
||||
glass_icon_state = "icedcoffeeglass"
|
||||
|
||||
/datum/reagent/drink/soy_latte
|
||||
glass_icon_state = "soy_latte"
|
||||
glass_center_of_mass = list("x"=15, "y"=9)
|
||||
|
||||
/datum/reagent/drink/cafe_latte
|
||||
glass_icon_state = "cafe_latte"
|
||||
glass_center_of_mass = list("x"=15, "y"=9)
|
||||
|
||||
/datum/reagent/drink/hot_coco
|
||||
glass_icon_state = "chocolateglass"
|
||||
|
||||
/datum/reagent/drink/soda/sodawater
|
||||
glass_icon_state = "glass_clear"
|
||||
|
||||
/datum/reagent/drink/soda/grapesoda
|
||||
glass_icon_state = "gsodaglass"
|
||||
|
||||
/datum/reagent/drink/soda/tonic
|
||||
glass_icon_state = "glass_clear"
|
||||
|
||||
/datum/reagent/drink/soda/lemonade
|
||||
glass_icon_state = "lemonadeglass"
|
||||
|
||||
/datum/reagent/drink/soda/kiraspecial
|
||||
glass_icon_state = "kiraspecial"
|
||||
glass_center_of_mass = list("x"=16, "y"=12)
|
||||
|
||||
/datum/reagent/drink/soda/brownstar
|
||||
glass_icon_state = "brownstar"
|
||||
|
||||
/datum/reagent/drink/milkshake
|
||||
glass_icon_state = "milkshake"
|
||||
glass_center_of_mass = list("x"=16, "y"=7)
|
||||
|
||||
/datum/reagent/drink/rewriter
|
||||
glass_icon_state = "rewriter"
|
||||
glass_center_of_mass = list("x"=16, "y"=9)
|
||||
|
||||
/datum/reagent/drink/soda/nuka_cola
|
||||
glass_icon_state = "nuka_colaglass"
|
||||
glass_center_of_mass = list("x"=16, "y"=6)
|
||||
|
||||
/datum/reagent/drink/grenadine
|
||||
glass_icon_state = "grenadineglass"
|
||||
glass_center_of_mass = list("x"=17, "y"=6)
|
||||
|
||||
/datum/reagent/drink/soda/space_cola
|
||||
glass_icon_state = "glass_brown"
|
||||
|
||||
/datum/reagent/drink/soda/spacemountainwind
|
||||
glass_icon_state = "Space_mountain_wind_glass"
|
||||
|
||||
/datum/reagent/drink/soda/dr_gibb
|
||||
glass_icon_state = "dr_gibb_glass"
|
||||
|
||||
/datum/reagent/drink/soda/space_up
|
||||
glass_icon_state = "space-up_glass"
|
||||
|
||||
/datum/reagent/drink/soda/lemon_lime
|
||||
glass_icon_state = "lemonlime"
|
||||
|
||||
/datum/reagent/drink/doctor_delight
|
||||
glass_icon_state = "doctorsdelightglass"
|
||||
glass_center_of_mass = list("x"=16, "y"=8)
|
||||
|
||||
/datum/reagent/drink/ice
|
||||
glass_icon_state = "iceglass"
|
||||
|
||||
/datum/reagent/drink/nothing
|
||||
glass_icon_state = "nothing"
|
||||
|
||||
/datum/reagent/ethanol/absinthe
|
||||
glass_icon_state = "absintheglass"
|
||||
glass_center_of_mass = list("x"=16, "y"=5)
|
||||
|
||||
/datum/reagent/ethanol/ale
|
||||
glass_icon_state = "aleglass"
|
||||
glass_center_of_mass = list("x"=16, "y"=8)
|
||||
|
||||
/datum/reagent/ethanol/beer
|
||||
glass_icon_state = "beerglass"
|
||||
glass_center_of_mass = list("x"=16, "y"=8)
|
||||
|
||||
/datum/reagent/ethanol/bluecuracao
|
||||
glass_icon_state = "curacaoglass"
|
||||
glass_center_of_mass = list("x"=16, "y"=5)
|
||||
|
||||
/datum/reagent/ethanol/cognac
|
||||
glass_icon_state = "cognacglass"
|
||||
glass_center_of_mass = list("x"=16, "y"=6)
|
||||
|
||||
/datum/reagent/ethanol/deadrum
|
||||
glass_icon_state = "rumglass"
|
||||
glass_center_of_mass = list("x"=16, "y"=12)
|
||||
|
||||
/datum/reagent/ethanol/gin
|
||||
glass_icon_state = "ginvodkaglass"
|
||||
glass_center_of_mass = list("x"=16, "y"=12)
|
||||
|
||||
/datum/reagent/ethanol/coffee/kahlua
|
||||
glass_icon_state = "kahluaglass"
|
||||
glass_center_of_mass = list("x"=15, "y"=7)
|
||||
|
||||
/datum/reagent/ethanol/melonliquor
|
||||
glass_icon_state = "emeraldglass"
|
||||
glass_center_of_mass = list("x"=16, "y"=5)
|
||||
|
||||
/datum/reagent/ethanol/rum
|
||||
glass_icon_state = "rumglass"
|
||||
glass_center_of_mass = list("x"=16, "y"=12)
|
||||
|
||||
/datum/reagent/ethanol/sake
|
||||
glass_icon_state = "ginvodkaglass"
|
||||
glass_center_of_mass = list("x"=16, "y"=12)
|
||||
|
||||
/datum/reagent/ethanol/tequila
|
||||
glass_icon_state = "tequillaglass"
|
||||
glass_center_of_mass = list("x"=16, "y"=12)
|
||||
|
||||
/datum/reagent/ethanol/thirteenloko
|
||||
glass_icon_state = "thirteen_loko_glass"
|
||||
|
||||
/datum/reagent/ethanol/vermouth
|
||||
glass_icon_state = "vermouthglass"
|
||||
glass_center_of_mass = list("x"=16, "y"=12)
|
||||
|
||||
/datum/reagent/ethanol/vodka
|
||||
glass_icon_state = "ginvodkaglass"
|
||||
glass_center_of_mass = list("x"=16, "y"=12)
|
||||
|
||||
/datum/reagent/ethanol/whiskey
|
||||
glass_icon_state = "whiskeyglass"
|
||||
glass_center_of_mass = list("x"=16, "y"=12)
|
||||
|
||||
/datum/reagent/ethanol/wine
|
||||
glass_icon_state = "wineglass"
|
||||
glass_center_of_mass = list("x"=15, "y"=7)
|
||||
|
||||
/datum/reagent/ethanol/acid_spit
|
||||
glass_icon_state = "acidspitglass"
|
||||
glass_center_of_mass = list("x"=16, "y"=7)
|
||||
|
||||
/datum/reagent/ethanol/alliescocktail
|
||||
glass_icon_state = "alliescocktail"
|
||||
glass_center_of_mass = list("x"=17, "y"=8)
|
||||
|
||||
/datum/reagent/ethanol/aloe
|
||||
glass_icon_state = "aloe"
|
||||
glass_center_of_mass = list("x"=17, "y"=8)
|
||||
|
||||
/datum/reagent/ethanol/amasec
|
||||
glass_icon_state = "amasecglass"
|
||||
glass_center_of_mass = list("x"=16, "y"=9)
|
||||
|
||||
/datum/reagent/ethanol/andalusia
|
||||
glass_icon_state = "andalusia"
|
||||
glass_center_of_mass = list("x"=16, "y"=9)
|
||||
|
||||
/datum/reagent/ethanol/antifreeze
|
||||
glass_icon_state = "antifreeze"
|
||||
glass_center_of_mass = list("x"=16, "y"=8)
|
||||
|
||||
/datum/reagent/ethanol/atomicbomb
|
||||
glass_icon_state = "atomicbombglass"
|
||||
glass_center_of_mass = list("x"=15, "y"=7)
|
||||
|
||||
/datum/reagent/ethanol/b52
|
||||
glass_icon_state = "b52glass"
|
||||
|
||||
/datum/reagent/ethanol/bahama_mama
|
||||
glass_icon_state = "bahama_mama"
|
||||
glass_center_of_mass = list("x"=16, "y"=5)
|
||||
|
||||
/datum/reagent/ethanol/bananahonk
|
||||
glass_icon_state = "bananahonkglass"
|
||||
glass_center_of_mass = list("x"=16, "y"=8)
|
||||
|
||||
/datum/reagent/ethanol/barefoot
|
||||
glass_icon_state = "b&p"
|
||||
glass_center_of_mass = list("x"=17, "y"=8)
|
||||
|
||||
/datum/reagent/ethanol/beepsky_smash
|
||||
glass_icon_state = "beepskysmashglass"
|
||||
glass_center_of_mass = list("x"=18, "y"=10)
|
||||
|
||||
/datum/reagent/ethanol/bilk
|
||||
glass_icon_state = "glass_brown"
|
||||
|
||||
/datum/reagent/ethanol/black_russian
|
||||
glass_icon_state = "blackrussianglass"
|
||||
glass_center_of_mass = list("x"=16, "y"=9)
|
||||
|
||||
/datum/reagent/ethanol/bloody_mary
|
||||
glass_icon_state = "bloodymaryglass"
|
||||
|
||||
/datum/reagent/ethanol/booger
|
||||
glass_icon_state = "booger"
|
||||
|
||||
/datum/reagent/ethanol/coffee/brave_bull
|
||||
glass_icon_state = "bravebullglass"
|
||||
glass_center_of_mass = list("x"=15, "y"=8)
|
||||
|
||||
/datum/reagent/ethanol/changelingsting
|
||||
glass_icon_state = "changelingsting"
|
||||
|
||||
/datum/reagent/ethanol/martini
|
||||
glass_icon_state = "martiniglass"
|
||||
glass_center_of_mass = list("x"=17, "y"=8)
|
||||
|
||||
/datum/reagent/ethanol/cuba_libre
|
||||
glass_icon_state = "cubalibreglass"
|
||||
glass_center_of_mass = list("x"=16, "y"=8)
|
||||
|
||||
/datum/reagent/ethanol/demonsblood
|
||||
glass_icon_state = "demonsblood"
|
||||
glass_center_of_mass = list("x"=16, "y"=2)
|
||||
|
||||
/datum/reagent/ethanol/devilskiss
|
||||
glass_icon_state = "devilskiss"
|
||||
glass_center_of_mass = list("x"=16, "y"=8)
|
||||
|
||||
/datum/reagent/ethanol/driestmartini
|
||||
glass_icon_state = "driestmartiniglass"
|
||||
glass_center_of_mass = list("x"=17, "y"=8)
|
||||
|
||||
/datum/reagent/ethanol/ginfizz
|
||||
glass_icon_state = "ginfizzglass"
|
||||
glass_center_of_mass = list("x"=16, "y"=7)
|
||||
|
||||
/datum/reagent/ethanol/grog
|
||||
glass_icon_state = "grogglass"
|
||||
|
||||
/datum/reagent/ethanol/erikasurprise
|
||||
glass_icon_state = "erikasurprise"
|
||||
glass_center_of_mass = list("x"=16, "y"=9)
|
||||
|
||||
/datum/reagent/ethanol/gargle_blaster
|
||||
glass_icon_state = "gargleblasterglass"
|
||||
glass_center_of_mass = list("x"=17, "y"=6)
|
||||
|
||||
/datum/reagent/ethanol/gintonic
|
||||
glass_icon_state = "gintonicglass"
|
||||
|
||||
/datum/reagent/ethanol/goldschlager
|
||||
glass_icon_state = "ginvodkaglass"
|
||||
glass_center_of_mass = list("x"=16, "y"=12)
|
||||
|
||||
/datum/reagent/ethanol/hippies_delight
|
||||
glass_icon_state = "hippiesdelightglass"
|
||||
glass_center_of_mass = list("x"=16, "y"=8)
|
||||
|
||||
/datum/reagent/ethanol/hooch
|
||||
glass_icon_state = "glass_brown2"
|
||||
|
||||
/datum/reagent/ethanol/iced_beer
|
||||
glass_icon_state = "iced_beerglass"
|
||||
glass_center_of_mass = list("x"=16, "y"=7)
|
||||
|
||||
/datum/reagent/ethanol/irishcarbomb
|
||||
glass_icon_state = "irishcarbomb"
|
||||
glass_center_of_mass = list("x"=16, "y"=8)
|
||||
|
||||
/datum/reagent/ethanol/coffee/irishcoffee
|
||||
glass_icon_state = "irishcoffeeglass"
|
||||
glass_center_of_mass = list("x"=15, "y"=10)
|
||||
|
||||
/datum/reagent/ethanol/irish_cream
|
||||
glass_icon_state = "irishcreamglass"
|
||||
glass_center_of_mass = list("x"=16, "y"=9)
|
||||
|
||||
/datum/reagent/ethanol/longislandicedtea
|
||||
glass_icon_state = "longislandicedteaglass"
|
||||
glass_center_of_mass = list("x"=16, "y"=8)
|
||||
|
||||
/datum/reagent/ethanol/manhattan
|
||||
glass_icon_state = "manhattanglass"
|
||||
glass_center_of_mass = list("x"=17, "y"=8)
|
||||
|
||||
/datum/reagent/ethanol/manhattan_proj
|
||||
glass_icon_state = "proj_manhattanglass"
|
||||
glass_center_of_mass = list("x"=17, "y"=8)
|
||||
|
||||
/datum/reagent/ethanol/manly_dorf
|
||||
glass_icon_state = "manlydorfglass"
|
||||
|
||||
/datum/reagent/ethanol/margarita
|
||||
glass_icon_state = "margaritaglass"
|
||||
glass_center_of_mass = list("x"=16, "y"=8)
|
||||
|
||||
/datum/reagent/ethanol/mead
|
||||
glass_icon_state = "meadglass"
|
||||
glass_center_of_mass = list("x"=17, "y"=10)
|
||||
|
||||
/datum/reagent/ethanol/moonshine
|
||||
glass_icon_state = "glass_clear"
|
||||
|
||||
/datum/reagent/ethanol/neurotoxin
|
||||
glass_icon_state = "neurotoxinglass"
|
||||
glass_center_of_mass = list("x"=16, "y"=8)
|
||||
|
||||
/datum/reagent/ethanol/patron
|
||||
glass_icon_state = "patronglass"
|
||||
glass_center_of_mass = list("x"=7, "y"=8)
|
||||
|
||||
/datum/reagent/ethanol/pwine
|
||||
glass_icon_state = "pwineglass"
|
||||
glass_center_of_mass = list("x"=16, "y"=5)
|
||||
|
||||
/datum/reagent/ethanol/red_mead
|
||||
glass_icon_state = "red_meadglass"
|
||||
glass_center_of_mass = list("x"=17, "y"=10)
|
||||
|
||||
/datum/reagent/ethanol/sbiten
|
||||
glass_icon_state = "sbitenglass"
|
||||
glass_center_of_mass = list("x"=17, "y"=8)
|
||||
|
||||
/datum/reagent/ethanol/screwdrivercocktail
|
||||
glass_icon_state = "screwdriverglass"
|
||||
glass_center_of_mass = list("x"=15, "y"=10)
|
||||
|
||||
/datum/reagent/ethanol/silencer
|
||||
glass_icon_state = "silencerglass"
|
||||
glass_center_of_mass = list("x"=16, "y"=9)
|
||||
|
||||
/datum/reagent/ethanol/singulo
|
||||
glass_icon_state = "singulo"
|
||||
glass_center_of_mass = list("x"=17, "y"=4)
|
||||
|
||||
/datum/reagent/ethanol/snowwhite
|
||||
glass_icon_state = "snowwhite"
|
||||
glass_center_of_mass = list("x"=16, "y"=8)
|
||||
|
||||
/datum/reagent/ethanol/suidream
|
||||
glass_icon_state = "sdreamglass"
|
||||
glass_center_of_mass = list("x"=16, "y"=5)
|
||||
|
||||
/datum/reagent/ethanol/syndicatebomb
|
||||
glass_icon_state = "syndicatebomb"
|
||||
glass_center_of_mass = list("x"=16, "y"=4)
|
||||
|
||||
/datum/reagent/ethanol/tequilla_sunrise
|
||||
glass_icon_state = "tequillasunriseglass"
|
||||
|
||||
/datum/reagent/ethanol/threemileisland
|
||||
glass_icon_state = "threemileislandglass"
|
||||
glass_center_of_mass = list("x"=16, "y"=2)
|
||||
|
||||
/datum/reagent/ethanol/toxins_special
|
||||
glass_icon_state = "toxinsspecialglass"
|
||||
|
||||
/datum/reagent/ethanol/vodkamartini
|
||||
glass_icon_state = "martiniglass"
|
||||
glass_center_of_mass = list("x"=17, "y"=8)
|
||||
|
||||
/datum/reagent/ethanol/vodkatonic
|
||||
glass_icon_state = "vodkatonicglass"
|
||||
glass_center_of_mass = list("x"=16, "y"=7)
|
||||
|
||||
/datum/reagent/ethanol/white_russian
|
||||
glass_icon_state = "whiterussianglass"
|
||||
glass_center_of_mass = list("x"=16, "y"=9)
|
||||
|
||||
/datum/reagent/ethanol/whiskey_cola
|
||||
glass_icon_state = "whiskeycolaglass"
|
||||
glass_center_of_mass = list("x"=16, "y"=9)
|
||||
|
||||
/datum/reagent/ethanol/whiskeysoda
|
||||
glass_icon_state = "whiskeysodaglass2"
|
||||
glass_center_of_mass = list("x"=16, "y"=9)
|
||||
|
||||
/datum/reagent/ethanol/specialwhiskey
|
||||
glass_icon_state = "whiskeyglass"
|
||||
glass_center_of_mass = list("x"=16, "y"=12)
|
||||
@@ -59,6 +59,7 @@ var/list/lunchables_drink_reagents_ = list(/datum/reagent/drink/nothing,
|
||||
/datum/reagent/drink/hell_ramen,
|
||||
/datum/reagent/drink/hot_ramen,
|
||||
/datum/reagent/drink/soda/nuka_cola)
|
||||
|
||||
|
||||
// This default list is a bit different, it contains items we don't want
|
||||
var/list/lunchables_ethanol_reagents_ = list(/datum/reagent/ethanol/acid_spit,
|
||||
@@ -72,7 +73,10 @@ var/list/lunchables_ethanol_reagents_ = list(/datum/reagent/ethanol/acid_spit,
|
||||
/datum/reagent/ethanol/neurotoxin,
|
||||
/datum/reagent/ethanol/pwine,
|
||||
/datum/reagent/ethanol/threemileisland,
|
||||
/datum/reagent/ethanol/toxins_special)
|
||||
/datum/reagent/ethanol/toxins_special,
|
||||
/datum/reagent/ethanol/voxdelight,
|
||||
/datum/reagent/ethanol/soemmerfire,
|
||||
/datum/reagent/ethanol/slimeshot)
|
||||
|
||||
/proc/lunchables_lunches()
|
||||
if(!(lunchables_lunches_[lunchables_lunches_[1]]))
|
||||
|
||||
@@ -29,7 +29,8 @@
|
||||
|
||||
//Placeholder for effect that trigger on eating that aren't tied to reagents.
|
||||
/obj/item/weapon/reagent_containers/food/snacks/proc/On_Consume(var/mob/M)
|
||||
if(!usr) return
|
||||
if(!usr)
|
||||
usr = M
|
||||
if(!reagents.total_volume)
|
||||
M.visible_message("<span class='notice'>[M] finishes eating \the [src].</span>","<span class='notice'>You finish eating \the [src].</span>")
|
||||
usr.drop_from_inventory(src) //so icons update :[
|
||||
@@ -69,7 +70,7 @@
|
||||
return
|
||||
|
||||
// Vorestation edits in this section.
|
||||
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) //puts a limit on how fast people can eat/drink things
|
||||
user.setClickCooldown(user.get_attack_speed(src)) //puts a limit on how fast people can eat/drink things
|
||||
if (fullness <= 50)
|
||||
M << "<span class='danger'>You hungrily chew out a piece of [src] and gobble it!</span>"
|
||||
if (fullness > 50 && fullness <= 150)
|
||||
@@ -115,7 +116,7 @@
|
||||
return 0*/
|
||||
user.visible_message("<span class='danger'>[user] attempts to feed [M] [src].</span>") // Vorestation edit
|
||||
|
||||
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
|
||||
user.setClickCooldown(user.get_attack_speed(src))
|
||||
if(!do_mob(user, M)) return
|
||||
|
||||
M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been fed [src.name] by [user.name] ([user.ckey]) Reagents: [reagentlist(src)]</font>")
|
||||
@@ -238,7 +239,7 @@
|
||||
return
|
||||
user.visible_message("<b>[user]</b> nibbles away at \the [src].","You nibble away at \the [src].")
|
||||
bitecount++
|
||||
if(reagents && user.reagents)
|
||||
if(reagents)
|
||||
reagents.trans_to_mob(user, bitesize, CHEM_INGEST)
|
||||
spawn(5)
|
||||
if(!src && !user.client)
|
||||
|
||||
@@ -54,62 +54,72 @@
|
||||
if(!..(user, 2))
|
||||
return
|
||||
if(reagents && reagents.reagent_list.len)
|
||||
user << "<span class='notice'>It contains [reagents.total_volume] units of liquid.</span>"
|
||||
to_chat(user, "<span class='notice'>It contains [reagents.total_volume] units of liquid.</span>")
|
||||
else
|
||||
user << "<span class='notice'>It is empty.</span>"
|
||||
to_chat(user, "<span class='notice'>It is empty.</span>")
|
||||
if(!is_open_container())
|
||||
user << "<span class='notice'>Airtight lid seals it completely.</span>"
|
||||
to_chat(user, "<span class='notice'>Airtight lid seals it completely.</span>")
|
||||
|
||||
/obj/item/weapon/reagent_containers/glass/attack_self()
|
||||
..()
|
||||
if(is_open_container())
|
||||
usr << "<span class = 'notice'>You put the lid on \the [src].</span>"
|
||||
to_chat(usr, "<span class = 'notice'>You put the lid on \the [src].</span>")
|
||||
flags ^= OPENCONTAINER
|
||||
else
|
||||
usr << "<span class = 'notice'>You take the lid off \the [src].</span>"
|
||||
to_chat(usr, "<span class = 'notice'>You take the lid off \the [src].</span>")
|
||||
flags |= OPENCONTAINER
|
||||
update_icon()
|
||||
|
||||
/obj/item/weapon/reagent_containers/glass/do_surgery(mob/living/carbon/M, mob/living/user)
|
||||
if(user.a_intent != I_HELP) //in case it is ever used as a surgery tool
|
||||
return ..()
|
||||
afterattack(M, user, 1)
|
||||
return 1
|
||||
/obj/item/weapon/reagent_containers/glass/attack(mob/M as mob, mob/user as mob, def_zone)
|
||||
if(force && !(flags & NOBLUDGEON) && user.a_intent == I_HURT)
|
||||
return ..()
|
||||
|
||||
if(standard_feed_mob(user, M))
|
||||
return
|
||||
|
||||
return 0
|
||||
|
||||
/obj/item/weapon/reagent_containers/glass/standard_feed_mob(var/mob/user, var/mob/target)
|
||||
if(!is_open_container())
|
||||
to_chat(user, "<span class='notice'>You need to open \the [src] first.</span>")
|
||||
return 1
|
||||
if(user.a_intent == I_HURT)
|
||||
return 1
|
||||
return ..()
|
||||
|
||||
/obj/item/weapon/reagent_containers/glass/self_feed_message(var/mob/user)
|
||||
to_chat(user, "<span class='notice'>You swallow a gulp from \the [src].</span>")
|
||||
|
||||
/obj/item/weapon/reagent_containers/glass/afterattack(var/obj/target, var/mob/user, var/proximity)
|
||||
|
||||
if(!is_open_container() || !proximity) //Is the container open & are they next to whatever they're clicking?
|
||||
return //If not, do nothing.
|
||||
|
||||
return 1 //If not, do nothing.
|
||||
for(var/type in can_be_placed_into) //Is it something it can be placed into?
|
||||
if(istype(target, type))
|
||||
return
|
||||
|
||||
return 1
|
||||
if(standard_dispenser_refill(user, target)) //Are they clicking a water tank/some dispenser?
|
||||
return
|
||||
|
||||
return 1
|
||||
if(standard_pour_into(user, target)) //Pouring into another beaker?
|
||||
return
|
||||
|
||||
if(user.a_intent == I_HURT) //Harm intent?
|
||||
if(standard_splash_mob(user, target)) //If harm intent and can splash a mob, go ahead.
|
||||
return
|
||||
if(reagents && reagents.total_volume) //Otherwise? Splash the floor.
|
||||
user << "<span class='notice'>You splash the solution onto [target].</span>"
|
||||
if(user.a_intent == I_HURT)
|
||||
if(standard_splash_mob(user,target))
|
||||
return 1
|
||||
if(reagents && reagents.total_volume)
|
||||
to_chat(user, "<span class='notice'>You splash the solution onto [target].</span>") //They are on harm intent, aka wanting to spill it.
|
||||
reagents.splash(target, reagents.total_volume)
|
||||
return
|
||||
return 1
|
||||
..()
|
||||
|
||||
/obj/item/weapon/reagent_containers/glass/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
||||
if(istype(W, /obj/item/weapon/pen) || istype(W, /obj/item/device/flashlight/pen))
|
||||
var/tmp_label = sanitizeSafe(input(user, "Enter a label for [name]", "Label", label_text), MAX_NAME_LEN)
|
||||
if(length(tmp_label) > 50)
|
||||
user << "<span class='notice'>The label can be at most 50 characters long.</span>"
|
||||
to_chat(user, "<span class='notice'>The label can be at most 50 characters long.</span>")
|
||||
else if(length(tmp_label) > 10)
|
||||
user << "<span class='notice'>You set the label.</span>"
|
||||
to_chat(user, "<span class='notice'>You set the label.</span>")
|
||||
label_text = tmp_label
|
||||
update_name_label()
|
||||
else
|
||||
user << "<span class='notice'>You set the label to \"[tmp_label]\".</span>"
|
||||
to_chat(user, "<span class='notice'>You set the label to \"[tmp_label]\".</span>")
|
||||
label_text = tmp_label
|
||||
update_name_label()
|
||||
if(istype(W,/obj/item/weapon/storage/bag))
|
||||
@@ -255,10 +265,10 @@
|
||||
return
|
||||
else if(istype(D, /obj/item/weapon/mop) || istype(D, /obj/item/weapon/soap) || istype(D, /obj/item/weapon/reagent_containers/glass/rag)) //VOREStation Edit - "Allows soap and rags to be used on buckets"
|
||||
if(reagents.total_volume < 1)
|
||||
user << "<span class='warning'>\The [src] is empty!</span>"
|
||||
to_chat(user, "<span class='warning'>\The [src] is empty!</span>")
|
||||
else
|
||||
reagents.trans_to_obj(D, 5)
|
||||
user << "<span class='notice'>You wet \the [D] in \the [src].</span>"
|
||||
to_chat(user, "<span class='notice'>You wet \the [D] in \the [src].</span>")
|
||||
playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
|
||||
return
|
||||
else
|
||||
@@ -296,10 +306,10 @@ obj/item/weapon/reagent_containers/glass/bucket/wood
|
||||
return
|
||||
else if(istype(D, /obj/item/weapon/mop))
|
||||
if(reagents.total_volume < 1)
|
||||
user << "<span class='warning'>\The [src] is empty!</span>"
|
||||
to_chat(user, "<span class='warning'>\The [src] is empty!</span>")
|
||||
else
|
||||
reagents.trans_to_obj(D, 5)
|
||||
user << "<span class='notice'>You wet \the [D] in \the [src].</span>"
|
||||
to_chat(user, "<span class='notice'>You wet \the [D] in \the [src].</span>")
|
||||
playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
|
||||
return
|
||||
else
|
||||
|
||||
@@ -51,7 +51,7 @@
|
||||
|
||||
user.visible_message("<span class='warning'>[user] attempts to force [M] to swallow \the [src].</span>")
|
||||
|
||||
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
|
||||
user.setClickCooldown(user.get_attack_speed(src))
|
||||
if(!do_mob(user, M))
|
||||
return
|
||||
|
||||
|
||||
@@ -198,12 +198,4 @@
|
||||
|
||||
/obj/item/weapon/reagent_containers/spray/plantbgone/New()
|
||||
..()
|
||||
reagents.add_reagent("plantbgone", 100)
|
||||
|
||||
/obj/item/weapon/reagent_containers/spray/plantbgone/afterattack(atom/A as mob|obj, mob/user as mob, proximity)
|
||||
if(!proximity) return
|
||||
|
||||
if(istype(A, /obj/effect/blob)) // blob damage in blob code
|
||||
return
|
||||
|
||||
..()
|
||||
reagents.add_reagent("plantbgone", 100)
|
||||
Reference in New Issue
Block a user