diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm
index 601533acc3..1ff6815be4 100644
--- a/code/datums/supplypacks.dm
+++ b/code/datums/supplypacks.dm
@@ -132,7 +132,8 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/obj/item/weapon/storage/fancy/cigarettes/dromedaryco,
/obj/item/weapon/lipstick/random,
/obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale = 2,
- /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer = 4
+ /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer = 4,
+ /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass = 4
)
cost = 20
containertype = /obj/structure/closet/crate
diff --git a/code/game/machinery/autolathe_datums.dm b/code/game/machinery/autolathe_datums.dm
index 4736096c1c..bedf855ec8 100644
--- a/code/game/machinery/autolathe_datums.dm
+++ b/code/game/machinery/autolathe_datums.dm
@@ -36,11 +36,16 @@
path = /obj/item/weapon/reagent_containers/glass/bucket
category = "General"
-/datum/autolathe/recipe/bucket/drinkingglass
+/datum/autolathe/recipe/drinkingglass
name = "drinking glass"
path = /obj/item/weapon/reagent_containers/food/drinks/drinkingglass
category = "General"
+/datum/autolathe/recipe/shotglass/
+ name = "shot glass"
+ path = /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass
+ category = "General"
+
/datum/autolathe/recipe/flashlight
name = "flashlight"
path = /obj/item/device/flashlight
diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index fd0996e2bc..94bb1fd84e 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -695,24 +695,40 @@
/obj/machinery/vending/boozeomat
name = "Booze-O-Mat"
desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one."
- icon_state = "boozeomat" //////////////18 drink entities below, plus the glasses, in case someone wants to edit the number of bottles
+ icon_state = "boozeomat"
icon_deny = "boozeomat-deny"
- products = list(/obj/item/weapon/reagent_containers/food/drinks/bottle/gin = 5,/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey = 5,
- /obj/item/weapon/reagent_containers/food/drinks/bottle/tequilla = 5,/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka = 5,
- /obj/item/weapon/reagent_containers/food/drinks/bottle/vermouth = 5,/obj/item/weapon/reagent_containers/food/drinks/bottle/rum = 5,
- /obj/item/weapon/reagent_containers/food/drinks/bottle/wine = 5,/obj/item/weapon/reagent_containers/food/drinks/bottle/cognac = 5,
- /obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua = 5,/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer = 6,
- /obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale = 6,/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice = 4,
- /obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice = 4,/obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice = 4,
- /obj/item/weapon/reagent_containers/food/drinks/bottle/cream = 4,/obj/item/weapon/reagent_containers/food/drinks/cans/tonic = 8,
- /obj/item/weapon/reagent_containers/food/drinks/bottle/cola = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/space_up = 5,
- /obj/item/weapon/reagent_containers/food/drinks/bottle/space_mountain_wind = 5, /obj/item/weapon/reagent_containers/food/drinks/cans/sodawater = 15,
- /obj/item/weapon/reagent_containers/food/drinks/flask/barflask = 2, /obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask = 2,
- /obj/item/weapon/reagent_containers/food/drinks/drinkingglass = 30,/obj/item/weapon/reagent_containers/food/drinks/ice = 9,
- /obj/item/weapon/reagent_containers/food/drinks/bottle/melonliquor = 2,/obj/item/weapon/reagent_containers/food/drinks/bottle/bluecuracao = 2,
- /obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe = 2,/obj/item/weapon/reagent_containers/food/drinks/bottle/grenadine = 5,
- /obj/item/weapon/reagent_containers/food/drinks/bottle/specialwhiskey = 4)
- contraband = list(/obj/item/weapon/reagent_containers/food/drinks/tea = 10)
+ products = list(/obj/item/weapon/reagent_containers/food/drinks/bottle/gin = 5,
+ /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey = 5,
+ /obj/item/weapon/reagent_containers/food/drinks/bottle/tequilla = 5,
+ /obj/item/weapon/reagent_containers/food/drinks/bottle/vodka = 5,
+ /obj/item/weapon/reagent_containers/food/drinks/bottle/vermouth = 5,
+ /obj/item/weapon/reagent_containers/food/drinks/bottle/rum = 5,
+ /obj/item/weapon/reagent_containers/food/drinks/bottle/wine = 5,
+ /obj/item/weapon/reagent_containers/food/drinks/bottle/cognac = 5,
+ /obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua = 5,
+ /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer = 15,
+ /obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale = 15,
+ /obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice = 5,
+ /obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice = 5,
+ /obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice = 5,
+ /obj/item/weapon/reagent_containers/food/drinks/bottle/cream = 5,
+ /obj/item/weapon/reagent_containers/food/drinks/cans/tonic = 15,
+ /obj/item/weapon/reagent_containers/food/drinks/bottle/cola = 5,
+ /obj/item/weapon/reagent_containers/food/drinks/bottle/space_up = 5,
+ /obj/item/weapon/reagent_containers/food/drinks/bottle/space_mountain_wind = 5,
+ /obj/item/weapon/reagent_containers/food/drinks/cans/sodawater = 15,
+ /obj/item/weapon/reagent_containers/food/drinks/flask/barflask = 5,
+ /obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask = 5,
+ /obj/item/weapon/reagent_containers/food/drinks/drinkingglass = 30,
+ /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass = 30,
+ /obj/item/weapon/reagent_containers/food/drinks/ice = 10,
+ /obj/item/weapon/reagent_containers/food/drinks/bottle/melonliquor = 5,
+ /obj/item/weapon/reagent_containers/food/drinks/bottle/bluecuracao = 5,
+ /obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe = 5,
+ /obj/item/weapon/reagent_containers/food/drinks/bottle/grenadine = 5,
+ /obj/item/weapon/reagent_containers/food/drinks/bottle/specialwhiskey = 5,
+ /obj/item/weapon/reagent_containers/food/drinks/tea = 15)
+ contraband = list()
vend_delay = 15
idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan.
product_slogans = "I hope nobody asks me for a bloody cup o' tea...;Alcohol is humanity's friend. Would you abandon a friend?;Quite delighted to serve you!;Is nobody thirsty on this station?"
diff --git a/code/modules/reagents/reagent_containers/blood_pack.dm b/code/modules/reagents/reagent_containers/blood_pack.dm
index 4f4981b4d8..558e860913 100644
--- a/code/modules/reagents/reagent_containers/blood_pack.dm
+++ b/code/modules/reagents/reagent_containers/blood_pack.dm
@@ -2,7 +2,8 @@
name = "blood packs bags"
desc = "This box contains blood packs."
icon_state = "sterile"
- New()
+
+/obj/item/weapon/storage/box/bloodpacks/New()
..()
new /obj/item/weapon/reagent_containers/blood/empty(src)
new /obj/item/weapon/reagent_containers/blood/empty(src)
@@ -21,22 +22,22 @@
var/blood_type = null
- New()
- ..()
- if(blood_type != null)
- name = "BloodPack [blood_type]"
- reagents.add_reagent("blood", 200, list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=blood_type,"resistances"=null,"trace_chem"=null))
- update_icon()
-
- on_reagent_change()
+/obj/item/weapon/reagent_containers/blood/New()
+ ..()
+ if(blood_type != null)
+ name = "BloodPack [blood_type]"
+ reagents.add_reagent("blood", 200, list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=blood_type,"resistances"=null,"trace_chem"=null))
update_icon()
+/obj/item/weapon/reagent_containers/blood/on_reagent_change()
update_icon()
- var/percent = round((reagents.total_volume / volume) * 100)
- switch(percent)
- if(0 to 9) icon_state = "empty"
- if(10 to 50) icon_state = "half"
- if(51 to INFINITY) icon_state = "full"
+
+/obj/item/weapon/reagent_containers/blood/update_icon()
+ var/percent = round((reagents.total_volume / volume) * 100)
+ switch(percent)
+ if(0 to 9) icon_state = "empty"
+ if(10 to 50) icon_state = "half"
+ if(51 to INFINITY) icon_state = "full"
/obj/item/weapon/reagent_containers/blood/APlus
blood_type = "A+"
diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm
index e605683de7..36a8b40fef 100644
--- a/code/modules/reagents/reagent_containers/dropper.dm
+++ b/code/modules/reagents/reagent_containers/dropper.dm
@@ -12,88 +12,88 @@
slot_flags = SLOT_EARS
volume = 5
- afterattack(var/obj/target, var/mob/user, var/flag)
- if(!target.reagents || !flag) return
+/obj/item/weapon/reagent_containers/dropper/afterattack(var/obj/target, var/mob/user, var/flag)
+ if(!target.reagents || !flag) return
- if(reagents.total_volume)
+ if(reagents.total_volume)
- if(!target.reagents.get_free_space())
- user << "[target] is full."
+ if(!target.reagents.get_free_space())
+ user << "[target] is full."
+ return
+
+ if(!target.is_open_container() && !ismob(target) && !istype(target, /obj/item/weapon/reagent_containers/food) && !istype(target, /obj/item/clothing/mask/smokable/cigarette)) //You can inject humans and food but you cant remove the shit.
+ user << "You cannot directly fill this object."
+ return
+
+ var/trans = 0
+
+ if(ismob(target))
+
+ var/time = 20 //2/3rds the time of a syringe
+ user.visible_message("[user] is trying to squirt something into [target]'s eyes!")
+
+ if(!do_mob(user, target, time))
return
- if(!target.is_open_container() && !ismob(target) && !istype(target, /obj/item/weapon/reagent_containers/food) && !istype(target, /obj/item/clothing/mask/smokable/cigarette)) //You can inject humans and food but you cant remove the shit.
- user << "You cannot directly fill this object."
- return
+ if(istype(target, /mob/living/carbon/human))
+ var/mob/living/carbon/human/victim = target
- var/trans = 0
+ var/obj/item/safe_thing = null
+ if(victim.wear_mask)
+ if (victim.wear_mask.body_parts_covered & EYES)
+ safe_thing = victim.wear_mask
+ if(victim.head)
+ if (victim.head.body_parts_covered & EYES)
+ safe_thing = victim.head
+ if(victim.glasses)
+ if (!safe_thing)
+ safe_thing = victim.glasses
- if(ismob(target))
-
- var/time = 20 //2/3rds the time of a syringe
- user.visible_message("[user] is trying to squirt something into [target]'s eyes!")
-
- if(!do_mob(user, target, time))
+ if(safe_thing)
+ trans = reagents.trans_to_obj(safe_thing, amount_per_transfer_from_this)
+ user.visible_message("[user] tries to squirt something into [target]'s eyes, but fails!", "You transfer [trans] units of the solution.")
return
- if(istype(target, /mob/living/carbon/human))
- var/mob/living/carbon/human/victim = target
+ var/mob/living/M = target
+ var/contained = reagentlist()
+ M.attack_log += text("\[[time_stamp()]\] Has been squirted with [name] by [user.name] ([user.ckey]). Reagents: [contained]")
+ user.attack_log += text("\[[time_stamp()]\] Used the [name] to squirt [M.name] ([M.key]). Reagents: [contained]")
+ msg_admin_attack("[user.name] ([user.ckey]) squirted [M.name] ([M.key]) with [name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)")
- var/obj/item/safe_thing = null
- if(victim.wear_mask)
- if (victim.wear_mask.body_parts_covered & EYES)
- safe_thing = victim.wear_mask
- if(victim.head)
- if (victim.head.body_parts_covered & EYES)
- safe_thing = victim.head
- if(victim.glasses)
- if (!safe_thing)
- safe_thing = victim.glasses
-
- if(safe_thing)
- trans = reagents.trans_to_obj(safe_thing, amount_per_transfer_from_this)
- user.visible_message("[user] tries to squirt something into [target]'s eyes, but fails!", "You transfer [trans] units of the solution.")
- return
-
- var/mob/living/M = target
- var/contained = reagentlist()
- M.attack_log += text("\[[time_stamp()]\] Has been squirted with [name] by [user.name] ([user.ckey]). Reagents: [contained]")
- user.attack_log += text("\[[time_stamp()]\] Used the [name] to squirt [M.name] ([M.key]). Reagents: [contained]")
- msg_admin_attack("[user.name] ([user.ckey]) squirted [M.name] ([M.key]) with [name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)")
-
- trans = reagents.trans_to_mob(target, reagents.total_volume, CHEM_INGEST)
- user.visible_message("[user] squirts something into [target]'s eyes!", "You transfer [trans] units of the solution.")
+ trans = reagents.trans_to_mob(target, reagents.total_volume, CHEM_INGEST)
+ user.visible_message("[user] squirts something into [target]'s eyes!", "You transfer [trans] units of the solution.")
- return
+ return
- else
- trans = reagents.trans_to(target, amount_per_transfer_from_this) //sprinkling reagents on generic non-mobs
- user << "You transfer [trans] units of the solution."
-
- else // Taking from something
-
- if(!target.is_open_container() && !istype(target,/obj/structure/reagent_dispensers))
- user << "You cannot directly remove reagents from [target]."
- return
-
- if(!target.reagents || !target.reagents.total_volume)
- user << "[target] is empty."
- return
-
- var/trans = target.reagents.trans_to_obj(src, amount_per_transfer_from_this)
-
- user << "You fill the dropper with [trans] units of the solution."
-
- return
-
- on_reagent_change()
- update_icon()
-
- update_icon()
- if(reagents.total_volume)
- icon_state = "dropper1"
else
- icon_state = "dropper0"
+ trans = reagents.trans_to(target, amount_per_transfer_from_this) //sprinkling reagents on generic non-mobs
+ user << "You transfer [trans] units of the solution."
+
+ else // Taking from something
+
+ if(!target.is_open_container() && !istype(target,/obj/structure/reagent_dispensers))
+ user << "You cannot directly remove reagents from [target]."
+ return
+
+ if(!target.reagents || !target.reagents.total_volume)
+ user << "[target] is empty."
+ return
+
+ var/trans = target.reagents.trans_to_obj(src, amount_per_transfer_from_this)
+
+ user << "You fill the dropper with [trans] units of the solution."
+
+ return
+
+/obj/item/weapon/reagent_containers/dropper/on_reagent_change()
+ update_icon()
+
+/obj/item/weapon/reagent_containers/dropper/update_icon()
+ if(reagents.total_volume)
+ icon_state = "dropper1"
+ else
+ icon_state = "dropper0"
/obj/item/weapon/reagent_containers/dropper/industrial
name = "Industrial Dropper"
diff --git a/code/modules/reagents/reagent_containers/food/cans.dm b/code/modules/reagents/reagent_containers/food/cans.dm
index 7d72b8bf51..4597c5bd71 100644
--- a/code/modules/reagents/reagent_containers/food/cans.dm
+++ b/code/modules/reagents/reagent_containers/food/cans.dm
@@ -10,43 +10,48 @@
desc = "Cola. in space."
icon_state = "cola"
center_of_mass = list("x"=16, "y"=10)
- New()
- ..()
- reagents.add_reagent("cola", 30)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/cola/New()
+ ..()
+ reagents.add_reagent("cola", 30)
/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle
name = "bottled water"
desc = "Introduced to the vending machines by Skrellian request, this water comes straight from the Martian poles."
icon_state = "waterbottle"
center_of_mass = list("x"=15, "y"=8)
- New()
- ..()
- reagents.add_reagent("water", 30)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle/New()
+ ..()
+ reagents.add_reagent("water", 30)
/obj/item/weapon/reagent_containers/food/drinks/cans/space_mountain_wind
name = "\improper Space Mountain Wind"
desc = "Blows right through you like a space wind."
icon_state = "space_mountain_wind"
center_of_mass = list("x"=16, "y"=10)
- New()
- ..()
- reagents.add_reagent("spacemountainwind", 30)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/space_mountain_wind/New()
+ ..()
+ reagents.add_reagent("spacemountainwind", 30)
/obj/item/weapon/reagent_containers/food/drinks/cans/thirteenloko
name = "\improper Thirteen Loko"
desc = "The CMO has advised crew members that consumption of Thirteen Loko may result in seizures, blindness, drunkeness, or even death. Please Drink Responsibly."
icon_state = "thirteen_loko"
center_of_mass = list("x"=16, "y"=8)
- New()
- ..()
- reagents.add_reagent("thirteenloko", 30)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/thirteenloko/New()
+ ..()
+ reagents.add_reagent("thirteenloko", 30)
/obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb
name = "\improper Dr. Gibb"
desc = "A delicious mixture of 42 different flavors."
icon_state = "dr_gibb"
center_of_mass = list("x"=16, "y"=10)
- New()
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb/New()
..()
reagents.add_reagent("dr_gibb", 30)
@@ -55,60 +60,67 @@
desc = "The taste of a star in liquid form. And, a bit of tuna...?"
icon_state = "starkist"
center_of_mass = list("x"=16, "y"=10)
- New()
- ..()
- reagents.add_reagent("brownstar", 30)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/starkist/New()
+ ..()
+ reagents.add_reagent("brownstar", 30)
/obj/item/weapon/reagent_containers/food/drinks/cans/space_up
name = "\improper Space-Up"
desc = "Tastes like a hull breach in your mouth."
icon_state = "space-up"
center_of_mass = list("x"=16, "y"=10)
- New()
- ..()
- reagents.add_reagent("space_up", 30)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/space_up/New()
+ ..()
+ reagents.add_reagent("space_up", 30)
/obj/item/weapon/reagent_containers/food/drinks/cans/lemon_lime
name = "\improper Lemon-Lime"
desc = "You wanted ORANGE. It gave you Lemon Lime."
icon_state = "lemon-lime"
center_of_mass = list("x"=16, "y"=10)
- New()
- ..()
- reagents.add_reagent("lemon_lime", 30)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/lemon_lime/New()
+ ..()
+ reagents.add_reagent("lemon_lime", 30)
/obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea
name = "\improper Vrisk Serket Iced Tea"
desc = "That sweet, refreshing southern earthy flavor. That's where it's from, right? South Earth?"
icon_state = "ice_tea_can"
center_of_mass = list("x"=16, "y"=10)
- New()
- ..()
- reagents.add_reagent("icetea", 30)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea/New()
+ ..()
+ reagents.add_reagent("icetea", 30)
/obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice
name = "\improper Grapel Juice"
desc = "500 pages of rules of how to appropriately enter into a combat with this juice!"
icon_state = "purple_can"
center_of_mass = list("x"=16, "y"=10)
- New()
- ..()
- reagents.add_reagent("grapejuice", 30)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice/New()
+ ..()
+ reagents.add_reagent("grapejuice", 30)
/obj/item/weapon/reagent_containers/food/drinks/cans/tonic
name = "\improper T-Borg's Tonic Water"
desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away."
icon_state = "tonic"
center_of_mass = list("x"=16, "y"=10)
- New()
- ..()
- reagents.add_reagent("tonic", 50)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/tonic/New()
+ ..()
+ reagents.add_reagent("tonic", 50)
/obj/item/weapon/reagent_containers/food/drinks/cans/sodawater
name = "soda water"
desc = "A can of soda water. Still water's more refreshing cousin."
icon_state = "sodawater"
center_of_mass = list("x"=16, "y"=10)
- New()
- ..()
- reagents.add_reagent("sodawater", 50)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/sodawater/New()
+ ..()
+ reagents.add_reagent("sodawater", 50)
diff --git a/code/modules/reagents/reagent_containers/food/condiment.dm b/code/modules/reagents/reagent_containers/food/condiment.dm
index d449d25195..ce26cdda50 100644
--- a/code/modules/reagents/reagent_containers/food/condiment.dm
+++ b/code/modules/reagents/reagent_containers/food/condiment.dm
@@ -15,147 +15,152 @@
center_of_mass = list("x"=16, "y"=6)
volume = 50
- attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+/obj/item/weapon/reagent_containers/food/condiment/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+ return
+
+/obj/item/weapon/reagent_containers/food/condiment/attack_self(var/mob/user as mob)
+ return
+
+/obj/item/weapon/reagent_containers/food/condiment/attack(var/mob/M as mob, var/mob/user as mob, var/def_zone)
+ if(standard_feed_mob(user, M))
return
- attack_self(var/mob/user as mob)
+/obj/item/weapon/reagent_containers/food/condiment/afterattack(var/obj/target, var/mob/user, var/flag)
+ if(standard_dispenser_refill(user, target))
+ return
+ if(standard_pour_into(user, target))
return
- attack(var/mob/M as mob, var/mob/user as mob, var/def_zone)
- if(standard_feed_mob(user, M))
+ if(istype(target, /obj/item/weapon/reagent_containers/food/snacks)) // These are not opencontainers but we can transfer to them
+ if(!reagents || !reagents.total_volume)
+ user << "There is no condiment left in \the [src]."
return
- afterattack(var/obj/target, var/mob/user, var/flag)
- if(standard_dispenser_refill(user, target))
- return
- if(standard_pour_into(user, target))
+ if(!target.reagents.get_free_space())
+ user << "You can't add more condiment to \the [target]."
return
- if(istype(target, /obj/item/weapon/reagent_containers/food/snacks)) // These are not opencontainers but we can transfer to them
- if(!reagents || !reagents.total_volume)
- user << "There is no condiment left in \the [src]."
- return
+ var/trans = reagents.trans_to_obj(target, amount_per_transfer_from_this)
+ user << "You add [trans] units of the condiment to \the [target]."
+ else
+ ..()
- if(!target.reagents.get_free_space())
- user << "You can't add more condiment to \the [target]."
- return
+/obj/item/weapon/reagent_containers/food/condiment/feed_sound(var/mob/user)
+ playsound(user.loc, 'sound/items/drink.ogg', rand(10, 50), 1)
- var/trans = reagents.trans_to_obj(target, amount_per_transfer_from_this)
- user << "You add [trans] units of the condiment to \the [target]."
- else
- ..()
+/obj/item/weapon/reagent_containers/food/condiment/self_feed_message(var/mob/user)
+ user << "You swallow some of contents of \the [src]."
- feed_sound(var/mob/user)
- playsound(user.loc, 'sound/items/drink.ogg', rand(10, 50), 1)
-
- self_feed_message(var/mob/user)
- user << "You swallow some of contents of \the [src]."
-
- on_reagent_change()
- if(reagents.reagent_list.len > 0)
- switch(reagents.get_master_reagent_id())
- if("ketchup")
- name = "Ketchup"
- desc = "You feel more American already."
- icon_state = "ketchup"
- center_of_mass = list("x"=16, "y"=6)
- if("capsaicin")
- name = "Hotsauce"
- desc = "You can almost TASTE the stomach ulcers now!"
- icon_state = "hotsauce"
- center_of_mass = list("x"=16, "y"=6)
- if("enzyme")
- name = "Universal Enzyme"
- desc = "Used in cooking various dishes."
- icon_state = "enzyme"
- center_of_mass = list("x"=16, "y"=6)
- if("soysauce")
- name = "Soy Sauce"
- desc = "A salty soy-based flavoring."
- icon_state = "soysauce"
- center_of_mass = list("x"=16, "y"=6)
- if("frostoil")
- name = "Coldsauce"
- desc = "Leaves the tongue numb in its passage."
- icon_state = "coldsauce"
- center_of_mass = list("x"=16, "y"=6)
- if("sodiumchloride")
- name = "Salt Shaker"
- desc = "Salt. From space oceans, presumably."
- icon_state = "saltshaker"
- center_of_mass = list("x"=16, "y"=10)
- if("blackpepper")
- name = "Pepper Mill"
- desc = "Often used to flavor food or make people sneeze."
- icon_state = "peppermillsmall"
- center_of_mass = list("x"=16, "y"=10)
- if("cornoil")
- name = "Corn Oil"
- desc = "A delicious oil used in cooking. Made from corn."
- icon_state = "oliveoil"
- center_of_mass = list("x"=16, "y"=6)
- if("sugar")
- name = "Sugar"
- desc = "Tastey space sugar!"
- center_of_mass = list("x"=16, "y"=6)
+/obj/item/weapon/reagent_containers/food/condiment/on_reagent_change()
+ if(reagents.reagent_list.len > 0)
+ switch(reagents.get_master_reagent_id())
+ if("ketchup")
+ name = "Ketchup"
+ desc = "You feel more American already."
+ icon_state = "ketchup"
+ center_of_mass = list("x"=16, "y"=6)
+ if("capsaicin")
+ name = "Hotsauce"
+ desc = "You can almost TASTE the stomach ulcers now!"
+ icon_state = "hotsauce"
+ center_of_mass = list("x"=16, "y"=6)
+ if("enzyme")
+ name = "Universal Enzyme"
+ desc = "Used in cooking various dishes."
+ icon_state = "enzyme"
+ center_of_mass = list("x"=16, "y"=6)
+ if("soysauce")
+ name = "Soy Sauce"
+ desc = "A salty soy-based flavoring."
+ icon_state = "soysauce"
+ center_of_mass = list("x"=16, "y"=6)
+ if("frostoil")
+ name = "Coldsauce"
+ desc = "Leaves the tongue numb in its passage."
+ icon_state = "coldsauce"
+ center_of_mass = list("x"=16, "y"=6)
+ if("sodiumchloride")
+ name = "Salt Shaker"
+ desc = "Salt. From space oceans, presumably."
+ icon_state = "saltshaker"
+ center_of_mass = list("x"=16, "y"=10)
+ if("blackpepper")
+ name = "Pepper Mill"
+ desc = "Often used to flavor food or make people sneeze."
+ icon_state = "peppermillsmall"
+ center_of_mass = list("x"=16, "y"=10)
+ if("cornoil")
+ name = "Corn Oil"
+ desc = "A delicious oil used in cooking. Made from corn."
+ icon_state = "oliveoil"
+ center_of_mass = list("x"=16, "y"=6)
+ if("sugar")
+ name = "Sugar"
+ desc = "Tastey space sugar!"
+ center_of_mass = list("x"=16, "y"=6)
+ else
+ name = "Misc Condiment Bottle"
+ if (reagents.reagent_list.len==1)
+ desc = "Looks like it is [reagents.get_master_reagent_name()], but you are not sure."
else
- name = "Misc Condiment Bottle"
- if (reagents.reagent_list.len==1)
- desc = "Looks like it is [reagents.get_master_reagent_name()], but you are not sure."
- else
- desc = "A mixture of various condiments. [reagents.get_master_reagent_name()] is one of them."
- icon_state = "mixedcondiments"
- center_of_mass = list("x"=16, "y"=6)
- else
- icon_state = "emptycondiment"
- name = "Condiment Bottle"
- desc = "An empty condiment bottle."
- center_of_mass = list("x"=16, "y"=6)
- return
+ desc = "A mixture of various condiments. [reagents.get_master_reagent_name()] is one of them."
+ icon_state = "mixedcondiments"
+ center_of_mass = list("x"=16, "y"=6)
+ else
+ icon_state = "emptycondiment"
+ name = "Condiment Bottle"
+ desc = "An empty condiment bottle."
+ center_of_mass = list("x"=16, "y"=6)
+ return
/obj/item/weapon/reagent_containers/food/condiment/enzyme
name = "Universal Enzyme"
desc = "Used in cooking various dishes."
icon_state = "enzyme"
- New()
- ..()
- reagents.add_reagent("enzyme", 50)
-/obj/item/weapon/reagent_containers/food/condiment/sugar
- New()
- ..()
- reagents.add_reagent("sugar", 50)
+/obj/item/weapon/reagent_containers/food/condiment/enzyme/New()
+ ..()
+ reagents.add_reagent("enzyme", 50)
+
+/obj/item/weapon/reagent_containers/food/condiment/sugar/New()
+ ..()
+ reagents.add_reagent("sugar", 50)
/obj/item/weapon/reagent_containers/food/condiment/small
possible_transfer_amounts = list(1,20)
amount_per_transfer_from_this = 1
volume = 20
center_of_mass = list()
- on_reagent_change() return
+
+/obj/item/weapon/reagent_containers/food/condiment/small/on_reagent_change()
+ return
/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker //Seperate from above since it's a small shaker rather then
name = "salt shaker" // a large one.
desc = "Salt. From space oceans, presumably."
icon_state = "saltshakersmall"
- New()
- ..()
- reagents.add_reagent("sodiumchloride", 20)
+
+/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker/New()
+ ..()
+ reagents.add_reagent("sodiumchloride", 20)
/obj/item/weapon/reagent_containers/food/condiment/small/peppermill
name = "pepper mill"
desc = "Often used to flavor food or make people sneeze."
icon_state = "peppermillsmall"
- New()
- ..()
- reagents.add_reagent("blackpepper", 20)
+
+/obj/item/weapon/reagent_containers/food/condiment/small/peppermill/New()
+ ..()
+ reagents.add_reagent("blackpepper", 20)
/obj/item/weapon/reagent_containers/food/condiment/small/sugar
name = "sugar"
desc = "Sweetness in a bottle"
icon_state = "sugarsmall"
- New()
- ..()
- reagents.add_reagent("sugar", 20)
+
+/obj/item/weapon/reagent_containers/food/condiment/small/sugar/New()
+ ..()
+ reagents.add_reagent("sugar", 20)
/obj/item/weapon/reagent_containers/food/condiment/flour
name = "flour sack"
@@ -163,9 +168,12 @@
icon = 'icons/obj/food.dmi'
icon_state = "flour"
item_state = "flour"
- on_reagent_change() return
- New()
- ..()
- reagents.add_reagent("flour", 30)
- src.pixel_x = rand(-10.0, 10)
- src.pixel_y = rand(-10.0, 10)
+
+/obj/item/weapon/reagent_containers/food/condiment/flour/on_reagent_change()
+ return
+
+/obj/item/weapon/reagent_containers/food/condiment/flour/New()
+ ..()
+ reagents.add_reagent("flour", 30)
+ src.pixel_x = rand(-10.0, 10)
+ src.pixel_y = rand(-10.0, 10)
diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm
index 7fd9bec3a2..c934343e77 100644
--- a/code/modules/reagents/reagent_containers/food/drinks.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks.dm
@@ -10,70 +10,70 @@
amount_per_transfer_from_this = 5
volume = 50
- on_reagent_change()
+/obj/item/weapon/reagent_containers/food/drinks/on_reagent_change()
return
- attack_self(mob/user as mob)
- if(!is_open_container())
- open(user)
+/obj/item/weapon/reagent_containers/food/drinks/attack_self(mob/user as mob)
+ if(!is_open_container())
+ open(user)
- proc/open(mob/user)
- playsound(loc,'sound/effects/canopen.ogg', rand(10,50), 1)
- user << "You open [src] with an audible pop!"
- flags |= OPENCONTAINER
+/obj/item/weapon/reagent_containers/food/drinks/proc/open(mob/user)
+ playsound(loc,'sound/effects/canopen.ogg', rand(10,50), 1)
+ user << "You open [src] with an audible pop!"
+ flags |= OPENCONTAINER
- attack(mob/M as mob, mob/user as mob, def_zone)
- if(standard_feed_mob(user, M))
- return
-
- return 0
+/obj/item/weapon/reagent_containers/food/drinks/attack(mob/M as mob, mob/user as mob, def_zone)
+ if(standard_feed_mob(user, M))
+ return
- afterattack(obj/target, mob/user, proximity)
- if(!proximity) return
+ return 0
- if(standard_dispenser_refill(user, target))
- return
- if(standard_pour_into(user, target))
- return
- return ..()
+/obj/item/weapon/reagent_containers/food/drinks/afterattack(obj/target, mob/user, proximity)
+ if(!proximity) return
- standard_feed_mob(var/mob/user, var/mob/target)
- if(!is_open_container())
- user << "You need to open [src]!"
- return 1
- return ..()
+ if(standard_dispenser_refill(user, target))
+ return
+ if(standard_pour_into(user, target))
+ return
+ return ..()
- standard_dispenser_refill(var/mob/user, var/obj/structure/reagent_dispensers/target)
- if(!is_open_container())
- user << "You need to open [src]!"
- return 1
- return ..()
+/obj/item/weapon/reagent_containers/food/drinks/standard_feed_mob(var/mob/user, var/mob/target)
+ if(!is_open_container())
+ user << "You need to open [src]!"
+ return 1
+ return ..()
- standard_pour_into(var/mob/user, var/atom/target)
- if(!is_open_container())
- user << "You need to open [src]!"
- return 1
- return ..()
+/obj/item/weapon/reagent_containers/food/drinks/standard_dispenser_refill(var/mob/user, var/obj/structure/reagent_dispensers/target)
+ if(!is_open_container())
+ user << "You need to open [src]!"
+ return 1
+ return ..()
- self_feed_message(var/mob/user)
- user << "You swallow a gulp from \the [src]."
+/obj/item/weapon/reagent_containers/food/drinks/standard_pour_into(var/mob/user, var/atom/target)
+ if(!is_open_container())
+ user << "You need to open [src]!"
+ return 1
+ return ..()
- feed_sound(var/mob/user)
- playsound(user.loc, 'sound/items/drink.ogg', rand(10, 50), 1)
+/obj/item/weapon/reagent_containers/food/drinks/self_feed_message(var/mob/user)
+ user << "You swallow a gulp from \the [src]."
- examine(mob/user)
- if(!..(user, 1))
- return
- if(!reagents || reagents.total_volume == 0)
- user << "\The [src] is empty!"
- else if (reagents.total_volume <= volume * 0.25)
- user << "\The [src] is almost empty!"
- else if (reagents.total_volume <= volume * 0.66)
- user << "\The [src] is half full!"
- else if (reagents.total_volume <= volume * 0.90)
- user << "\The [src] is almost full!"
- else
- user << "\The [src] is full!"
+/obj/item/weapon/reagent_containers/food/drinks/feed_sound(var/mob/user)
+ playsound(user.loc, 'sound/items/drink.ogg', rand(10, 50), 1)
+
+/obj/item/weapon/reagent_containers/food/drinks/examine(mob/user)
+ if(!..(user, 1))
+ return
+ if(!reagents || reagents.total_volume == 0)
+ user << "\The [src] is empty!"
+ else if (reagents.total_volume <= volume * 0.25)
+ user << "\The [src] is almost empty!"
+ else if (reagents.total_volume <= volume * 0.66)
+ user << "\The [src] is half full!"
+ else if (reagents.total_volume <= volume * 0.90)
+ user << "\The [src] is almost full!"
+ else
+ user << "\The [src] is full!"
////////////////////////////////////////////////////////////////////////////////
@@ -108,9 +108,10 @@
icon_state = "milk"
item_state = "carton"
center_of_mass = list("x"=16, "y"=9)
- New()
- ..()
- reagents.add_reagent("milk", 50)
+
+/obj/item/weapon/reagent_containers/food/drinks/milk/New()
+ ..()
+ reagents.add_reagent("milk", 50)
/obj/item/weapon/reagent_containers/food/drinks/soymilk
name = "SoyMilk"
@@ -118,18 +119,18 @@
icon_state = "soymilk"
item_state = "carton"
center_of_mass = list("x"=16, "y"=9)
- New()
- ..()
- reagents.add_reagent("soymilk", 50)
+/obj/item/weapon/reagent_containers/food/drinks/soymilk/New()
+ ..()
+ reagents.add_reagent("soymilk", 50)
/obj/item/weapon/reagent_containers/food/drinks/coffee
name = "Robust Coffee"
desc = "Careful, the beverage you're about to enjoy is extremely hot."
icon_state = "coffee"
center_of_mass = list("x"=15, "y"=10)
- New()
- ..()
- reagents.add_reagent("coffee", 30)
+/obj/item/weapon/reagent_containers/food/drinks/coffee/New()
+ ..()
+ reagents.add_reagent("coffee", 30)
/obj/item/weapon/reagent_containers/food/drinks/tea
name = "Duke Purple Tea"
@@ -137,18 +138,19 @@
icon_state = "teacup"
item_state = "coffee"
center_of_mass = list("x"=16, "y"=14)
- New()
- ..()
- reagents.add_reagent("tea", 30)
+
+/obj/item/weapon/reagent_containers/food/drinks/tea/New()
+ ..()
+ reagents.add_reagent("tea", 30)
/obj/item/weapon/reagent_containers/food/drinks/ice
name = "Ice Cup"
desc = "Careful, cold ice, do not chew."
icon_state = "coffee"
center_of_mass = list("x"=15, "y"=10)
- New()
- ..()
- reagents.add_reagent("ice", 30)
+/obj/item/weapon/reagent_containers/food/drinks/ice/New()
+ ..()
+ reagents.add_reagent("ice", 30)
/obj/item/weapon/reagent_containers/food/drinks/h_chocolate
name = "Dutch Hot Coco"
@@ -156,19 +158,19 @@
icon_state = "hot_coco"
item_state = "coffee"
center_of_mass = list("x"=15, "y"=13)
- New()
- ..()
- reagents.add_reagent("hot_coco", 30)
+
+/obj/item/weapon/reagent_containers/food/drinks/h_chocolate/New()
+ ..()
+ reagents.add_reagent("hot_coco", 30)
/obj/item/weapon/reagent_containers/food/drinks/dry_ramen
name = "Cup Ramen"
desc = "Just add 10ml water, self heats! A taste that reminds you of your school years."
icon_state = "ramen"
center_of_mass = list("x"=16, "y"=11)
- New()
- ..()
- reagents.add_reagent("dry_ramen", 30)
-
+/obj/item/weapon/reagent_containers/food/drinks/dry_ramen/New()
+ ..()
+ reagents.add_reagent("dry_ramen", 30)
/obj/item/weapon/reagent_containers/food/drinks/sillycup
name = "Paper Cup"
@@ -177,13 +179,14 @@
possible_transfer_amounts = null
volume = 10
center_of_mass = list("x"=16, "y"=12)
- New()
- ..()
- on_reagent_change()
- if(reagents.total_volume)
- icon_state = "water_cup"
- else
- icon_state = "water_cup_e"
+/obj/item/weapon/reagent_containers/food/drinks/sillycup/New()
+ ..()
+
+/obj/item/weapon/reagent_containers/food/drinks/sillycup/on_reagent_change()
+ if(reagents.total_volume)
+ icon_state = "water_cup"
+ else
+ icon_state = "water_cup_e"
//////////////////////////drinkingglass and shaker//
diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
index c53d91675b..a9e55b26fe 100644
--- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
@@ -193,7 +193,6 @@
//Keeping this here for now, I'll ask if I should keep it here.
/obj/item/weapon/broken_bottle
-
name = "Broken Bottle"
desc = "A bottle with a sharp broken bottom."
icon = 'icons/obj/drinks.dmi'
@@ -212,204 +211,225 @@
playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1)
return ..()
-
/obj/item/weapon/reagent_containers/food/drinks/bottle/gin
name = "Griffeater Gin"
desc = "A bottle of high quality gin, produced in the New London Space Station."
icon_state = "ginbottle"
center_of_mass = list("x"=16, "y"=4)
- New()
- ..()
- reagents.add_reagent("gin", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/gin/New()
+ ..()
+ reagents.add_reagent("gin", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey
name = "Uncle Git's Special Reserve"
desc = "A premium single-malt whiskey, gently matured inside the tunnels of a nuclear shelter. TUNNEL WHISKEY RULES."
icon_state = "whiskeybottle"
center_of_mass = list("x"=16, "y"=3)
- New()
- ..()
- reagents.add_reagent("whiskey", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey/New()
+ ..()
+ reagents.add_reagent("whiskey", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/specialwhiskey
name = "Special Blend Whiskey"
desc = "Just when you thought regular station whiskey was good... This silky, amber goodness has to come along and ruin everything."
icon_state = "whiskeybottle2"
center_of_mass = list("x"=16, "y"=3)
- New()
- ..()
- reagents.add_reagent("specialwhiskey", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/specialwhiskey/New()
+ ..()
+ reagents.add_reagent("specialwhiskey", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka
name = "Tunguska Triple Distilled"
desc = "Aah, vodka. Prime choice of drink AND fuel by Russians worldwide."
icon_state = "vodkabottle"
center_of_mass = list("x"=17, "y"=3)
- New()
- ..()
- reagents.add_reagent("vodka", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka/New()
+ ..()
+ reagents.add_reagent("vodka", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/tequilla
name = "Caccavo Guaranteed Quality Tequilla"
desc = "Made from premium petroleum distillates, pure thalidomide and other fine quality ingredients!"
icon_state = "tequillabottle"
center_of_mass = list("x"=16, "y"=3)
- New()
- ..()
- reagents.add_reagent("tequilla", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/tequilla/New()
+ ..()
+ reagents.add_reagent("tequilla", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing
name = "Bottle of Nothing"
desc = "A bottle filled with nothing"
icon_state = "bottleofnothing"
center_of_mass = list("x"=17, "y"=5)
- New()
- ..()
- reagents.add_reagent("nothing", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing/New()
+ ..()
+ reagents.add_reagent("nothing", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/patron
name = "Wrapp Artiste Patron"
desc = "Silver laced tequilla, served in space night clubs across the galaxy."
icon_state = "patronbottle"
center_of_mass = list("x"=16, "y"=6)
- New()
- ..()
- reagents.add_reagent("patron", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/patron/New()
+ ..()
+ reagents.add_reagent("patron", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/rum
name = "Captain Pete's Cuban Spiced Rum"
desc = "This isn't just rum, oh no. It's practically GRIFF in a bottle."
icon_state = "rumbottle"
center_of_mass = list("x"=16, "y"=8)
- New()
- ..()
- reagents.add_reagent("rum", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/rum/New()
+ ..()
+ reagents.add_reagent("rum", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater
name = "Flask of Holy Water"
desc = "A flask of the chaplain's holy water."
icon_state = "holyflask"
center_of_mass = list("x"=17, "y"=10)
- New()
- ..()
- reagents.add_reagent("holywater", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater/New()
+ ..()
+ reagents.add_reagent("holywater", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/vermouth
name = "Goldeneye Vermouth"
desc = "Sweet, sweet dryness~"
icon_state = "vermouthbottle"
center_of_mass = list("x"=17, "y"=3)
- New()
- ..()
- reagents.add_reagent("vermouth", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/vermouth/New()
+ ..()
+ reagents.add_reagent("vermouth", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua
name = "Robert Robust's Coffee Liqueur"
desc = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936, HONK"
icon_state = "kahluabottle"
center_of_mass = list("x"=17, "y"=3)
- New()
- ..()
- reagents.add_reagent("kahlua", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua/New()
+ ..()
+ reagents.add_reagent("kahlua", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/goldschlager
name = "College Girl Goldschlager"
desc = "Because they are the only ones who will drink 100 proof cinnamon schnapps."
icon_state = "goldschlagerbottle"
center_of_mass = list("x"=15, "y"=3)
- New()
- ..()
- reagents.add_reagent("goldschlager", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/goldschlager/New()
+ ..()
+ reagents.add_reagent("goldschlager", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/cognac
name = "Chateau De Baton Premium Cognac"
desc = "A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. You might as well not scream 'SHITCURITY' this time."
icon_state = "cognacbottle"
center_of_mass = list("x"=16, "y"=6)
- New()
- ..()
- reagents.add_reagent("cognac", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/cognac/New()
+ ..()
+ reagents.add_reagent("cognac", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/wine
name = "Doublebeard Bearded Special Wine"
desc = "A faint aura of unease and asspainery surrounds the bottle."
icon_state = "winebottle"
center_of_mass = list("x"=16, "y"=4)
- New()
- ..()
- reagents.add_reagent("wine", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/wine/New()
+ ..()
+ reagents.add_reagent("wine", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe
name = "Jailbreaker Verte"
desc = "One sip of this and you just know you're gonna have a good time."
icon_state = "absinthebottle"
center_of_mass = list("x"=16, "y"=6)
- New()
- ..()
- reagents.add_reagent("absinthe", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe/New()
+ ..()
+ reagents.add_reagent("absinthe", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/melonliquor
name = "Emeraldine Melon Liquor"
desc = "A bottle of 46 proof Emeraldine Melon Liquor. Sweet and light."
icon_state = "alco-green" //Placeholder.
center_of_mass = list("x"=16, "y"=6)
- New()
- ..()
- reagents.add_reagent("melonliquor", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/melonliquor/New()
+ ..()
+ reagents.add_reagent("melonliquor", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/bluecuracao
name = "Miss Blue Curacao"
desc = "A fruity, exceptionally azure drink. Does not allow the imbiber to use the fifth magic."
icon_state = "alco-blue" //Placeholder.
center_of_mass = list("x"=16, "y"=6)
- New()
- ..()
- reagents.add_reagent("bluecuracao", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/bluecuracao/New()
+ ..()
+ reagents.add_reagent("bluecuracao", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/grenadine
name = "Briar Rose Grenadine Syrup"
desc = "Sweet and tangy, a bar syrup used to add color or flavor to drinks."
icon_state = "grenadinebottle"
center_of_mass = list("x"=16, "y"=6)
- New()
- ..()
- reagents.add_reagent("grenadine", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/grenadine/New()
+ ..()
+ reagents.add_reagent("grenadine", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/cola
name = "\improper Space Cola"
desc = "Cola. in space"
icon_state = "colabottle"
center_of_mass = list("x"=16, "y"=6)
- New()
- ..()
- reagents.add_reagent("cola", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/cola/New()
+ ..()
+ reagents.add_reagent("cola", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/space_up
name = "\improper Space-Up"
desc = "Tastes like a hull breach in your mouth."
icon_state = "space-up_bottle"
center_of_mass = list("x"=16, "y"=6)
- New()
- ..()
- reagents.add_reagent("space_up", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/space_up/New()
+ ..()
+ reagents.add_reagent("space_up", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/space_mountain_wind
name = "\improper Space Mountain Wind"
desc = "Blows right through you like a space wind."
icon_state = "space_mountain_wind_bottle"
center_of_mass = list("x"=16, "y"=6)
- New()
- ..()
- reagents.add_reagent("spacemountainwind", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/space_mountain_wind/New()
+ ..()
+ reagents.add_reagent("spacemountainwind", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/pwine
name = "Warlock's Velvet"
desc = "What a delightful packaging for a surely high quality wine! The vintage must be amazing!"
icon_state = "pwinebottle"
center_of_mass = list("x"=16, "y"=4)
- New()
- ..()
- reagents.add_reagent("pwine", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/pwine/New()
+ ..()
+ reagents.add_reagent("pwine", 100)
//////////////////////////JUICES AND STUFF ///////////////////////
@@ -420,9 +440,10 @@
item_state = "carton"
center_of_mass = list("x"=16, "y"=7)
isGlass = 0
- New()
- ..()
- reagents.add_reagent("orangejuice", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice/New()
+ ..()
+ reagents.add_reagent("orangejuice", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/cream
name = "Milk Cream"
@@ -431,9 +452,10 @@
item_state = "carton"
center_of_mass = list("x"=16, "y"=8)
isGlass = 0
- New()
- ..()
- reagents.add_reagent("cream", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/cream/New()
+ ..()
+ reagents.add_reagent("cream", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice
name = "Tomato Juice"
@@ -442,9 +464,10 @@
item_state = "carton"
center_of_mass = list("x"=16, "y"=8)
isGlass = 0
- New()
- ..()
- reagents.add_reagent("tomatojuice", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice/New()
+ ..()
+ reagents.add_reagent("tomatojuice", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice
name = "Lime Juice"
@@ -453,9 +476,10 @@
item_state = "carton"
center_of_mass = list("x"=16, "y"=8)
isGlass = 0
- New()
- ..()
- reagents.add_reagent("limejuice", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice/New()
+ ..()
+ reagents.add_reagent("limejuice", 100)
//Small bottles
/obj/item/weapon/reagent_containers/food/drinks/bottle/small
@@ -469,9 +493,10 @@
desc = "Contains only water, malt and hops."
icon_state = "beer"
center_of_mass = list("x"=16, "y"=12)
- New()
- ..()
- reagents.add_reagent("beer", 30)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer/New()
+ ..()
+ reagents.add_reagent("beer", 30)
/obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale
name = "\improper Magm-Ale"
@@ -479,6 +504,7 @@
icon_state = "alebottle"
item_state = "beer"
center_of_mass = list("x"=16, "y"=10)
- New()
- ..()
- reagents.add_reagent("ale", 30)
\ No newline at end of file
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale/New()
+ ..()
+ reagents.add_reagent("ale", 30)
\ No newline at end of file
diff --git a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
index 9141efbc1e..cdf495405f 100644
--- a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
@@ -108,3 +108,28 @@
..()
reagents.add_reagent("cola", 50)
on_reagent_change()
+
+/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass
+ name = "shot glass"
+ desc = "No glasses were shot in the making of this glass."
+ icon_state = "shotglass"
+ amount_per_transfer_from_this = 10
+ volume = 10
+ matter = list("glass" = 175)
+
+/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass/on_reagent_change()
+ overlays.Cut()
+
+ if(reagents.total_volume)
+ var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]1")
+
+ switch(reagents.total_volume)
+ if(0 to 3) filling.icon_state = "[icon_state]1"
+ if(4 to 7) filling.icon_state = "[icon_state]5"
+ if(8 to INFINITY) filling.icon_state = "[icon_state]12"
+
+ filling.color += reagents.get_color()
+ overlays += filling
+ name = "shot glass of " + reagents.get_master_reagent_name() //No matter what, the glass will tell you the reagent's name. Might be too abusable in the future.
+ else
+ name = "shot glass"
diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm
index 3041ec9957..98ce8751aa 100644
--- a/code/modules/reagents/reagent_containers/food/snacks.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks.dm
@@ -252,12 +252,12 @@
filling_color = "#468C00"
center_of_mass = list("x"=17, "y"=11)
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- reagents.add_reagent("doctorsdelight", 8)
- reagents.add_reagent("tricordrazine", 8)
- bitesize = 3
+/obj/item/weapon/reagent_containers/food/snacks/aesirsalad/New()
+ ..()
+ reagents.add_reagent("nutriment", 8)
+ reagents.add_reagent("doctorsdelight", 8)
+ reagents.add_reagent("tricordrazine", 8)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy
name = "candy"
@@ -267,22 +267,22 @@
filling_color = "#7D5F46"
center_of_mass = list("x"=15, "y"=15)
- New()
- ..()
- reagents.add_reagent("nutriment", 1)
- reagents.add_reagent("sugar", 3)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/candy/New()
+ ..()
+ reagents.add_reagent("nutriment", 1)
+ reagents.add_reagent("sugar", 3)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/candy/donor
name = "Donor Candy"
desc = "A little treat for blood donors."
trash = /obj/item/trash/candy
- New()
- ..()
- reagents.add_reagent("nutriment", 10)
- reagents.add_reagent("sugar", 3)
- bitesize = 5
+/obj/item/weapon/reagent_containers/food/snacks/candy/donor/New()
+ ..()
+ reagents.add_reagent("nutriment", 10)
+ reagents.add_reagent("sugar", 3)
+ bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/candy_corn
name = "candy corn"
@@ -291,11 +291,11 @@
filling_color = "#FFFCB0"
center_of_mass = list("x"=14, "y"=10)
- New()
- ..()
- reagents.add_reagent("nutriment", 4)
- reagents.add_reagent("sugar", 2)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/candy_corn/New()
+ ..()
+ reagents.add_reagent("nutriment", 4)
+ reagents.add_reagent("sugar", 2)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/chips
name = "chips"
@@ -305,10 +305,10 @@
filling_color = "#E8C31E"
center_of_mass = list("x"=15, "y"=15)
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- bitesize = 1
+/obj/item/weapon/reagent_containers/food/snacks/chips/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/cookie
name = "cookie"
@@ -317,10 +317,10 @@
filling_color = "#DBC94F"
center_of_mass = list("x"=17, "y"=18)
- New()
- ..()
- reagents.add_reagent("nutriment", 5)
- bitesize = 1
+/obj/item/weapon/reagent_containers/food/snacks/cookie/New()
+ ..()
+ reagents.add_reagent("nutriment", 5)
+ bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar
name = "Chocolate Bar"
@@ -329,12 +329,12 @@
filling_color = "#7D5F46"
center_of_mass = list("x"=15, "y"=15)
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- reagents.add_reagent("sugar", 2)
- reagents.add_reagent("coco", 2)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/chocolatebar/New()
+ ..()
+ reagents.add_reagent("nutriment", 2)
+ reagents.add_reagent("sugar", 2)
+ reagents.add_reagent("coco", 2)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/chocolateegg
name = "Chocolate Egg"
@@ -343,12 +343,12 @@
filling_color = "#7D5F46"
center_of_mass = list("x"=16, "y"=13)
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("sugar", 2)
- reagents.add_reagent("coco", 2)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/chocolateegg/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ reagents.add_reagent("sugar", 2)
+ reagents.add_reagent("coco", 2)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/donut
name = "donut"
@@ -362,17 +362,18 @@
name = "donut"
desc = "Goes great with Robust Coffee."
icon_state = "donut1"
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("sprinkles", 1)
- src.bitesize = 3
- if(prob(30))
- src.icon_state = "donut2"
- src.overlay_state = "box-donut2"
- src.name = "frosted donut"
- reagents.add_reagent("sprinkles", 2)
- center_of_mass = list("x"=19, "y"=16)
+
+/obj/item/weapon/reagent_containers/food/snacks/donut/normal/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ reagents.add_reagent("sprinkles", 1)
+ src.bitesize = 3
+ if(prob(30))
+ src.icon_state = "donut2"
+ src.overlay_state = "box-donut2"
+ src.name = "frosted donut"
+ reagents.add_reagent("sprinkles", 2)
+ center_of_mass = list("x"=19, "y"=16)
/obj/item/weapon/reagent_containers/food/snacks/donut/chaos
name = "Chaos Donut"
@@ -380,39 +381,38 @@
icon_state = "donut1"
filling_color = "#ED11E6"
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- reagents.add_reagent("sprinkles", 1)
- bitesize = 10
- var/chaosselect = pick(1,2,3,4,5,6,7,8,9,10)
- switch(chaosselect)
- if(1)
- reagents.add_reagent("nutriment", 3)
- if(2)
- reagents.add_reagent("capsaicin", 3)
- if(3)
- reagents.add_reagent("frostoil", 3)
- if(4)
- reagents.add_reagent("sprinkles", 3)
- if(5)
- reagents.add_reagent("phoron", 3)
- if(6)
- reagents.add_reagent("coco", 3)
- if(7)
- reagents.add_reagent("slimejelly", 3)
- if(8)
- reagents.add_reagent("banana", 3)
- if(9)
- reagents.add_reagent("berryjuice", 3)
- if(10)
- reagents.add_reagent("tricordrazine", 3)
- if(prob(30))
- src.icon_state = "donut2"
- src.overlay_state = "box-donut2"
- src.name = "Frosted Chaos Donut"
- reagents.add_reagent("sprinkles", 2)
-
+/obj/item/weapon/reagent_containers/food/snacks/donut/chaos/New()
+ ..()
+ reagents.add_reagent("nutriment", 2)
+ reagents.add_reagent("sprinkles", 1)
+ bitesize = 10
+ var/chaosselect = pick(1,2,3,4,5,6,7,8,9,10)
+ switch(chaosselect)
+ if(1)
+ reagents.add_reagent("nutriment", 3)
+ if(2)
+ reagents.add_reagent("capsaicin", 3)
+ if(3)
+ reagents.add_reagent("frostoil", 3)
+ if(4)
+ reagents.add_reagent("sprinkles", 3)
+ if(5)
+ reagents.add_reagent("phoron", 3)
+ if(6)
+ reagents.add_reagent("coco", 3)
+ if(7)
+ reagents.add_reagent("slimejelly", 3)
+ if(8)
+ reagents.add_reagent("banana", 3)
+ if(9)
+ reagents.add_reagent("berryjuice", 3)
+ if(10)
+ reagents.add_reagent("tricordrazine", 3)
+ if(prob(30))
+ src.icon_state = "donut2"
+ src.overlay_state = "box-donut2"
+ src.name = "Frosted Chaos Donut"
+ reagents.add_reagent("sprinkles", 2)
/obj/item/weapon/reagent_containers/food/snacks/donut/jelly
name = "Jelly Donut"
@@ -421,17 +421,17 @@
filling_color = "#ED1169"
center_of_mass = list("x"=16, "y"=11)
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("sprinkles", 1)
- reagents.add_reagent("berryjuice", 5)
- bitesize = 5
- if(prob(30))
- src.icon_state = "jdonut2"
- src.overlay_state = "box-donut2"
- src.name = "Frosted Jelly Donut"
- reagents.add_reagent("sprinkles", 2)
+/obj/item/weapon/reagent_containers/food/snacks/donut/jelly/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ reagents.add_reagent("sprinkles", 1)
+ reagents.add_reagent("berryjuice", 5)
+ bitesize = 5
+ if(prob(30))
+ src.icon_state = "jdonut2"
+ src.overlay_state = "box-donut2"
+ src.name = "Frosted Jelly Donut"
+ reagents.add_reagent("sprinkles", 2)
/obj/item/weapon/reagent_containers/food/snacks/donut/slimejelly
name = "Jelly Donut"
@@ -440,17 +440,17 @@
filling_color = "#ED1169"
center_of_mass = list("x"=16, "y"=11)
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("sprinkles", 1)
- reagents.add_reagent("slimejelly", 5)
- bitesize = 5
- if(prob(30))
- src.icon_state = "jdonut2"
- src.overlay_state = "box-donut2"
- src.name = "Frosted Jelly Donut"
- reagents.add_reagent("sprinkles", 2)
+/obj/item/weapon/reagent_containers/food/snacks/donut/slimejelly/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ reagents.add_reagent("sprinkles", 1)
+ reagents.add_reagent("slimejelly", 5)
+ bitesize = 5
+ if(prob(30))
+ src.icon_state = "jdonut2"
+ src.overlay_state = "box-donut2"
+ src.name = "Frosted Jelly Donut"
+ reagents.add_reagent("sprinkles", 2)
/obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly
name = "Jelly Donut"
@@ -459,17 +459,17 @@
filling_color = "#ED1169"
center_of_mass = list("x"=16, "y"=11)
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("sprinkles", 1)
- reagents.add_reagent("cherryjelly", 5)
- bitesize = 5
- if(prob(30))
- src.icon_state = "jdonut2"
- src.overlay_state = "box-donut2"
- src.name = "Frosted Jelly Donut"
- reagents.add_reagent("sprinkles", 2)
+/obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ reagents.add_reagent("sprinkles", 1)
+ reagents.add_reagent("cherryjelly", 5)
+ bitesize = 5
+ if(prob(30))
+ src.icon_state = "jdonut2"
+ src.overlay_state = "box-donut2"
+ src.name = "Frosted Jelly Donut"
+ reagents.add_reagent("sprinkles", 2)
/obj/item/weapon/reagent_containers/food/snacks/egg
name = "egg"
@@ -545,12 +545,12 @@
filling_color = "#FFDF78"
center_of_mass = list("x"=16, "y"=14)
- New()
- ..()
- reagents.add_reagent("protein", 3)
- reagents.add_reagent("sodiumchloride", 1)
- reagents.add_reagent("blackpepper", 1)
- bitesize = 1
+/obj/item/weapon/reagent_containers/food/snacks/friedegg/New()
+ ..()
+ reagents.add_reagent("protein", 3)
+ reagents.add_reagent("sodiumchloride", 1)
+ reagents.add_reagent("blackpepper", 1)
+ bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/boiledegg
name = "Boiled egg"
@@ -558,9 +558,9 @@
icon_state = "egg"
filling_color = "#FFFFFF"
- New()
- ..()
- reagents.add_reagent("protein", 2)
+/obj/item/weapon/reagent_containers/food/snacks/boiledegg/New()
+ ..()
+ reagents.add_reagent("protein", 2)
/obj/item/weapon/reagent_containers/food/snacks/organ
name = "organ"
@@ -570,11 +570,11 @@
filling_color = "#E00D34"
center_of_mass = list("x"=16, "y"=16)
- New()
- ..()
- reagents.add_reagent("protein", rand(3,5))
- reagents.add_reagent("toxin", rand(1,3))
- src.bitesize = 3
+/obj/item/weapon/reagent_containers/food/snacks/organ/New()
+ ..()
+ reagents.add_reagent("protein", rand(3,5))
+ reagents.add_reagent("toxin", rand(1,3))
+ src.bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/tofu
name = "Tofu"
@@ -583,10 +583,10 @@
filling_color = "#FFFEE0"
center_of_mass = list("x"=17, "y"=10)
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- src.bitesize = 3
+/obj/item/weapon/reagent_containers/food/snacks/tofu/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ src.bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/tofurkey
name = "Tofurkey"
@@ -595,11 +595,11 @@
filling_color = "#FFFEE0"
center_of_mass = list("x"=16, "y"=8)
- New()
- ..()
- reagents.add_reagent("nutriment", 12)
- reagents.add_reagent("stoxin", 3)
- bitesize = 3
+/obj/item/weapon/reagent_containers/food/snacks/tofurkey/New()
+ ..()
+ reagents.add_reagent("nutriment", 12)
+ reagents.add_reagent("stoxin", 3)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/stuffing
name = "Stuffing"
@@ -608,10 +608,10 @@
filling_color = "#C9AC83"
center_of_mass = list("x"=16, "y"=10)
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- bitesize = 1
+/obj/item/weapon/reagent_containers/food/snacks/stuffing/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/carpmeat
name = "carp fillet"
@@ -620,11 +620,11 @@
filling_color = "#FFDEFE"
center_of_mass = list("x"=17, "y"=13)
- New()
- ..()
- reagents.add_reagent("protein", 3)
- reagents.add_reagent("carpotoxin", 3)
- src.bitesize = 6
+/obj/item/weapon/reagent_containers/food/snacks/carpmeat/New()
+ ..()
+ reagents.add_reagent("protein", 3)
+ reagents.add_reagent("carpotoxin", 3)
+ src.bitesize = 6
/obj/item/weapon/reagent_containers/food/snacks/fishfingers
name = "Fish Fingers"
@@ -633,11 +633,11 @@
filling_color = "#FFDEFE"
center_of_mass = list("x"=16, "y"=13)
- New()
- ..()
- reagents.add_reagent("protein", 4)
- reagents.add_reagent("carpotoxin", 3)
- bitesize = 3
+/obj/item/weapon/reagent_containers/food/snacks/fishfingers/New()
+ ..()
+ reagents.add_reagent("protein", 4)
+ reagents.add_reagent("carpotoxin", 3)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice
name = "huge mushroom slice"
@@ -646,11 +646,11 @@
filling_color = "#E0D7C5"
center_of_mass = list("x"=17, "y"=16)
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("psilocybin", 3)
- src.bitesize = 6
+/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ reagents.add_reagent("psilocybin", 3)
+ src.bitesize = 6
/obj/item/weapon/reagent_containers/food/snacks/tomatomeat
name = "tomato slice"
@@ -659,10 +659,10 @@
filling_color = "#DB0000"
center_of_mass = list("x"=17, "y"=16)
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- src.bitesize = 6
+/obj/item/weapon/reagent_containers/food/snacks/tomatomeat/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ src.bitesize = 6
/obj/item/weapon/reagent_containers/food/snacks/bearmeat
name = "bear meat"
@@ -671,11 +671,11 @@
filling_color = "#DB0000"
center_of_mass = list("x"=16, "y"=10)
- New()
- ..()
- reagents.add_reagent("protein", 12)
- reagents.add_reagent("hyperzine", 5)
- src.bitesize = 3
+/obj/item/weapon/reagent_containers/food/snacks/bearmeat/New()
+ ..()
+ reagents.add_reagent("protein", 12)
+ reagents.add_reagent("hyperzine", 5)
+ src.bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/xenomeat
name = "meat"
@@ -684,11 +684,11 @@
filling_color = "#43DE18"
center_of_mass = list("x"=16, "y"=10)
- New()
- ..()
- reagents.add_reagent("protein", 6)
- reagents.add_reagent("pacid",6)
- src.bitesize = 6
+/obj/item/weapon/reagent_containers/food/snacks/xenomeat/New()
+ ..()
+ reagents.add_reagent("protein", 6)
+ reagents.add_reagent("pacid",6)
+ src.bitesize = 6
/obj/item/weapon/reagent_containers/food/snacks/meatball
name = "meatball"
@@ -697,10 +697,10 @@
filling_color = "#DB0000"
center_of_mass = list("x"=16, "y"=16)
- New()
- ..()
- reagents.add_reagent("protein", 3)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/meatball/New()
+ ..()
+ reagents.add_reagent("protein", 3)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/sausage
name = "Sausage"
@@ -709,10 +709,44 @@
filling_color = "#DB0000"
center_of_mass = list("x"=16, "y"=16)
- New()
- ..()
- reagents.add_reagent("protein", 6)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/sausage/New()
+ ..()
+ reagents.add_reagent("protein", 6)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/donkpocket
+ name = "Donk-pocket"
+ desc = "The food of choice for the seasoned traitor."
+ icon_state = "donkpocket"
+ filling_color = "#DEDEAB"
+ center_of_mass = list("x"=16, "y"=10)
+ var/warm
+ var/list/heated_reagents
+
+/obj/item/weapon/reagent_containers/food/snacks/donkpocket/New()
+ ..()
+ reagents.add_reagent("nutriment", 2)
+ reagents.add_reagent("protein", 2)
+
+ warm = 0
+ heated_reagents = list("tricordrazine" = 5)
+
+/obj/item/weapon/reagent_containers/food/snacks/donkpocket/proc/heat()
+ warm = 1
+ for(var/reagent in heated_reagents)
+ reagents.add_reagent(reagent, heated_reagents[reagent])
+ bitesize = 6
+ name = "Warm " + name
+ cooltime()
+
+/obj/item/weapon/reagent_containers/food/snacks/donkpocket/proc/cooltime()
+ if (src.warm)
+ spawn(4200)
+ src.warm = 0
+ for(var/reagent in heated_reagents)
+ src.reagents.del_reagent(reagent)
+ src.name = initial(name)
+ return
/obj/item/weapon/reagent_containers/food/snacks/donkpocket/sinpocket
name = "\improper Sin-pocket"
@@ -731,37 +765,6 @@
user << "You think \the [src] is ready to eat about now."
heat()
-/obj/item/weapon/reagent_containers/food/snacks/donkpocket
- name = "Donk-pocket"
- desc = "The food of choice for the seasoned traitor."
- icon_state = "donkpocket"
- filling_color = "#DEDEAB"
- center_of_mass = list("x"=16, "y"=10)
-
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- reagents.add_reagent("protein", 2)
-
- var/warm = 0
- var/list/heated_reagents = list("tricordrazine" = 5)
- proc/heat()
- warm = 1
- for(var/reagent in heated_reagents)
- reagents.add_reagent(reagent, heated_reagents[reagent])
- bitesize = 6
- name = "Warm " + name
- cooltime()
-
- proc/cooltime()
- if (src.warm)
- spawn(4200)
- src.warm = 0
- for(var/reagent in heated_reagents)
- src.reagents.del_reagent(reagent)
- src.name = initial(name)
- return
-
/obj/item/weapon/reagent_containers/food/snacks/brainburger
name = "brainburger"
desc = "A strange looking burger. It looks almost sentient."
@@ -769,11 +772,11 @@
filling_color = "#F2B6EA"
center_of_mass = list("x"=15, "y"=11)
- New()
- ..()
- reagents.add_reagent("protein", 6)
- reagents.add_reagent("alkysine", 6)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/brainburger/New()
+ ..()
+ reagents.add_reagent("protein", 6)
+ reagents.add_reagent("alkysine", 6)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/ghostburger
name = "Ghost Burger"
@@ -782,11 +785,10 @@
filling_color = "#FFF2FF"
center_of_mass = list("x"=16, "y"=11)
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- bitesize = 2
-
+/obj/item/weapon/reagent_containers/food/snacks/ghostburger/New()
+ ..()
+ reagents.add_reagent("nutriment", 2)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/human
var/hname = ""
@@ -798,10 +800,11 @@
desc = "A bloody burger."
icon_state = "hburger"
center_of_mass = list("x"=16, "y"=11)
- New()
- ..()
- reagents.add_reagent("protein", 6)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/human/burger/New()
+ ..()
+ reagents.add_reagent("protein", 6)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/cheeseburger
name = "cheeseburger"
@@ -809,10 +812,10 @@
icon_state = "cheeseburger"
center_of_mass = list("x"=16, "y"=11)
- New()
- ..()
- reagents.add_reagent("protein", 2)
- reagents.add_reagent("nutriment", 2)
+/obj/item/weapon/reagent_containers/food/snacks/cheeseburger/New()
+ ..()
+ reagents.add_reagent("protein", 2)
+ reagents.add_reagent("nutriment", 2)
/obj/item/weapon/reagent_containers/food/snacks/monkeyburger
name = "burger"
@@ -821,11 +824,11 @@
filling_color = "#D63C3C"
center_of_mass = list("x"=16, "y"=11)
- New()
- ..()
- reagents.add_reagent("protein", 3)
- reagents.add_reagent("nutriment", 3)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/monkeyburger/New()
+ ..()
+ reagents.add_reagent("protein", 3)
+ reagents.add_reagent("nutriment", 3)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/fishburger
name = "Fillet -o- Carp Sandwich"
@@ -834,11 +837,11 @@
filling_color = "#FFDEFE"
center_of_mass = list("x"=16, "y"=10)
- New()
- ..()
- reagents.add_reagent("protein", 6)
- reagents.add_reagent("carpotoxin", 3)
- bitesize = 3
+/obj/item/weapon/reagent_containers/food/snacks/fishburger/New()
+ ..()
+ reagents.add_reagent("protein", 6)
+ reagents.add_reagent("carpotoxin", 3)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/tofuburger
name = "Tofu Burger"
@@ -847,10 +850,10 @@
filling_color = "#FFFEE0"
center_of_mass = list("x"=16, "y"=10)
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/tofuburger/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/roburger
name = "roburger"
@@ -859,10 +862,10 @@
filling_color = "#CCCCCC"
center_of_mass = list("x"=16, "y"=11)
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/roburger/New()
+ ..()
+ reagents.add_reagent("nutriment", 2)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/roburgerbig
name = "roburger"
@@ -872,9 +875,9 @@
volume = 100
center_of_mass = list("x"=16, "y"=11)
- New()
- ..()
- bitesize = 0.1
+/obj/item/weapon/reagent_containers/food/snacks/roburgerbig/New()
+ ..()
+ bitesize = 0.1
/obj/item/weapon/reagent_containers/food/snacks/xenoburger
name = "xenoburger"
@@ -883,10 +886,10 @@
filling_color = "#43DE18"
center_of_mass = list("x"=16, "y"=11)
- New()
- ..()
- reagents.add_reagent("protein", 8)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/xenoburger/New()
+ ..()
+ reagents.add_reagent("protein", 8)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/clownburger
name = "Clown Burger"
@@ -895,10 +898,10 @@
filling_color = "#FF00FF"
center_of_mass = list("x"=17, "y"=12)
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/clownburger/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/mimeburger
name = "Mime Burger"
@@ -907,10 +910,10 @@
filling_color = "#FFFFFF"
center_of_mass = list("x"=16, "y"=11)
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/mimeburger/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/omelette
name = "Omelette Du Fromage"
@@ -920,11 +923,10 @@
filling_color = "#FFF9A8"
center_of_mass = list("x"=16, "y"=13)
- //var/herp = 0
- New()
- ..()
- reagents.add_reagent("protein", 8)
- bitesize = 1
+/obj/item/weapon/reagent_containers/food/snacks/omelette/New()
+ ..()
+ reagents.add_reagent("protein", 8)
+ bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/muffin
name = "Muffin"
@@ -933,10 +935,10 @@
filling_color = "#E0CF9B"
center_of_mass = list("x"=17, "y"=4)
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/muffin/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/pie
name = "Banana Cream Pie"
@@ -965,11 +967,11 @@
trash = /obj/item/trash/plate
center_of_mass = list("x"=16, "y"=13)
- New()
- ..()
- reagents.add_reagent("nutriment", 4)
- reagents.add_reagent("berryjuice", 5)
- bitesize = 3
+/obj/item/weapon/reagent_containers/food/snacks/berryclafoutis/New()
+ ..()
+ reagents.add_reagent("nutriment", 4)
+ reagents.add_reagent("berryjuice", 5)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/waffles
name = "waffles"
@@ -979,10 +981,10 @@
filling_color = "#E6DEB5"
center_of_mass = list("x"=15, "y"=11)
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/waffles/New()
+ ..()
+ reagents.add_reagent("nutriment", 8)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/eggplantparm
name = "Eggplant Parmigiana"
@@ -992,10 +994,10 @@
filling_color = "#4D2F5E"
center_of_mass = list("x"=16, "y"=11)
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/eggplantparm/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/soylentgreen
name = "Soylent Green"
@@ -1005,10 +1007,10 @@
filling_color = "#B8E6B5"
center_of_mass = list("x"=15, "y"=11)
- New()
- ..()
- reagents.add_reagent("protein", 10)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/soylentgreen/New()
+ ..()
+ reagents.add_reagent("protein", 10)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/soylenviridians
name = "Soylen Virdians"
@@ -1018,11 +1020,10 @@
filling_color = "#E6FA61"
center_of_mass = list("x"=15, "y"=11)
- New()
- ..()
- reagents.add_reagent("nutriment", 10)
- bitesize = 2
-
+/obj/item/weapon/reagent_containers/food/snacks/soylenviridians/New()
+ ..()
+ reagents.add_reagent("nutriment", 10)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/meatpie
name = "Meat-pie"
@@ -1032,10 +1033,10 @@
filling_color = "#948051"
center_of_mass = list("x"=16, "y"=13)
- New()
- ..()
- reagents.add_reagent("protein", 10)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/meatpie/New()
+ ..()
+ reagents.add_reagent("protein", 10)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/tofupie
name = "Tofu-pie"
@@ -1045,10 +1046,10 @@
filling_color = "#FFFEE0"
center_of_mass = list("x"=16, "y"=13)
- New()
- ..()
- reagents.add_reagent("nutriment", 10)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/tofupie/New()
+ ..()
+ reagents.add_reagent("nutriment", 10)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/amanita_pie
name = "amanita pie"
@@ -1057,12 +1058,12 @@
filling_color = "#FFCCCC"
center_of_mass = list("x"=17, "y"=9)
- New()
- ..()
- reagents.add_reagent("nutriment", 5)
- reagents.add_reagent("amatoxin", 3)
- reagents.add_reagent("psilocybin", 1)
- bitesize = 3
+/obj/item/weapon/reagent_containers/food/snacks/amanita_pie/New()
+ ..()
+ reagents.add_reagent("nutriment", 5)
+ reagents.add_reagent("amatoxin", 3)
+ reagents.add_reagent("psilocybin", 1)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/plump_pie
name = "plump pie"
@@ -1071,17 +1072,17 @@
filling_color = "#B8279B"
center_of_mass = list("x"=17, "y"=9)
- New()
- ..()
- if(prob(10))
- name = "exceptional plump pie"
- desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump pie!"
- reagents.add_reagent("nutriment", 8)
- reagents.add_reagent("tricordrazine", 5)
- bitesize = 2
- else
- reagents.add_reagent("nutriment", 8)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/plump_pie/New()
+ ..()
+ if(prob(10))
+ name = "exceptional plump pie"
+ desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump pie!"
+ reagents.add_reagent("nutriment", 8)
+ reagents.add_reagent("tricordrazine", 5)
+ bitesize = 2
+ else
+ reagents.add_reagent("nutriment", 8)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/xemeatpie
name = "Xeno-pie"
@@ -1091,10 +1092,10 @@
filling_color = "#43DE18"
center_of_mass = list("x"=16, "y"=13)
- New()
- ..()
- reagents.add_reagent("protein", 10)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/xemeatpie/New()
+ ..()
+ reagents.add_reagent("protein", 10)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/wingfangchu
name = "Wing Fang Chu"
@@ -1104,11 +1105,10 @@
filling_color = "#43DE18"
center_of_mass = list("x"=17, "y"=9)
- New()
- ..()
- reagents.add_reagent("protein", 6)
- bitesize = 2
-
+/obj/item/weapon/reagent_containers/food/snacks/wingfangchu/New()
+ ..()
+ reagents.add_reagent("protein", 6)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/human/kabob
name = "-kabob"
@@ -1118,10 +1118,10 @@
filling_color = "#A85340"
center_of_mass = list("x"=17, "y"=15)
- New()
- ..()
- reagents.add_reagent("protein", 8)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/human/kabob/New()
+ ..()
+ reagents.add_reagent("protein", 8)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/monkeykabob
name = "Meat-kabob"
@@ -1131,10 +1131,10 @@
filling_color = "#A85340"
center_of_mass = list("x"=17, "y"=15)
- New()
- ..()
- reagents.add_reagent("protein", 8)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/monkeykabob/New()
+ ..()
+ reagents.add_reagent("protein", 8)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/tofukabob
name = "Tofu-kabob"
@@ -1144,10 +1144,10 @@
filling_color = "#FFFEE0"
center_of_mass = list("x"=17, "y"=15)
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/tofukabob/New()
+ ..()
+ reagents.add_reagent("nutriment", 8)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/cubancarp
name = "Cuban Carp"
@@ -1157,13 +1157,13 @@
filling_color = "#E9ADFF"
center_of_mass = list("x"=12, "y"=5)
- New()
- ..()
- reagents.add_reagent("protein", 3)
- reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("carpotoxin", 3)
- reagents.add_reagent("capsaicin", 3)
- bitesize = 3
+/obj/item/weapon/reagent_containers/food/snacks/cubancarp/New()
+ ..()
+ reagents.add_reagent("protein", 3)
+ reagents.add_reagent("nutriment", 3)
+ reagents.add_reagent("carpotoxin", 3)
+ reagents.add_reagent("capsaicin", 3)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/popcorn
name = "Popcorn"
@@ -1174,17 +1174,17 @@
filling_color = "#FFFAD4"
center_of_mass = list("x"=16, "y"=8)
- New()
- ..()
- unpopped = rand(1,10)
- reagents.add_reagent("nutriment", 2)
- bitesize = 0.1 //this snack is supposed to be eating during looooong time. And this it not dinner food! --rastaf0
- On_Consume()
- if(prob(unpopped)) //lol ...what's the point?
- usr << "\red You bite down on an un-popped kernel!"
- unpopped = max(0, unpopped-1)
- ..()
+/obj/item/weapon/reagent_containers/food/snacks/popcorn/New()
+ ..()
+ unpopped = rand(1,10)
+ reagents.add_reagent("nutriment", 2)
+ bitesize = 0.1 //this snack is supposed to be eating during looooong time. And this it not dinner food! --rastaf0
+/obj/item/weapon/reagent_containers/food/snacks/popcorn/On_Consume()
+ if(prob(unpopped)) //lol ...what's the point?
+ usr << "\red You bite down on an un-popped kernel!"
+ unpopped = max(0, unpopped-1)
+ ..()
/obj/item/weapon/reagent_containers/food/snacks/sosjerky
name = "Scaredy's Private Reserve Beef Jerky"
@@ -1194,7 +1194,7 @@
filling_color = "#631212"
center_of_mass = list("x"=15, "y"=9)
- New()
+/obj/item/weapon/reagent_containers/food/snacks/sosjerky/New()
..()
reagents.add_reagent("protein", 4)
bitesize = 2
@@ -1207,9 +1207,9 @@
filling_color = "#343834"
center_of_mass = list("x"=15, "y"=4)
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
+/obj/item/weapon/reagent_containers/food/snacks/no_raisin/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie
name = "Space Twinkie"
@@ -1218,10 +1218,10 @@
filling_color = "#FFE591"
center_of_mass = list("x"=15, "y"=11)
- New()
- ..()
- reagents.add_reagent("sugar", 4)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie/New()
+ ..()
+ reagents.add_reagent("sugar", 4)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers
name = "Cheesie Honkers"
@@ -1231,10 +1231,10 @@
filling_color = "#FFA305"
center_of_mass = list("x"=15, "y"=9)
- New()
- ..()
- reagents.add_reagent("nutriment", 4)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers/New()
+ ..()
+ reagents.add_reagent("nutriment", 4)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/syndicake
name = "Syndi-Cakes"
@@ -1244,11 +1244,12 @@
center_of_mass = list("x"=16, "y"=10)
trash = /obj/item/trash/syndi_cakes
- New()
- ..()
- reagents.add_reagent("nutriment", 4)
- reagents.add_reagent("doctorsdelight", 5)
- bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/syndicake/New()
+ ..()
+ reagents.add_reagent("nutriment", 4)
+ reagents.add_reagent("doctorsdelight", 5)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato
name = "Loaded Baked Potato"
@@ -1257,11 +1258,11 @@
filling_color = "#9C7A68"
center_of_mass = list("x"=16, "y"=10)
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("protein", 3)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ reagents.add_reagent("protein", 3)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/fries
name = "Space Fries"
@@ -1271,10 +1272,10 @@
filling_color = "#EDDD00"
center_of_mass = list("x"=16, "y"=11)
- New()
- ..()
- reagents.add_reagent("nutriment", 4)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/fries/New()
+ ..()
+ reagents.add_reagent("nutriment", 4)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/soydope
name = "Soy Dope"
@@ -1284,10 +1285,10 @@
filling_color = "#C4BF76"
center_of_mass = list("x"=16, "y"=10)
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/soydope/New()
+ ..()
+ reagents.add_reagent("nutriment", 2)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/spagetti
name = "Spaghetti"
@@ -1296,10 +1297,10 @@
filling_color = "#EDDD00"
center_of_mass = list("x"=16, "y"=16)
- New()
- ..()
- reagents.add_reagent("nutriment", 1)
- bitesize = 1
+/obj/item/weapon/reagent_containers/food/snacks/spagetti/New()
+ ..()
+ reagents.add_reagent("nutriment", 1)
+ bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/cheesyfries
name = "Cheesy Fries"
@@ -1309,11 +1310,11 @@
filling_color = "#EDDD00"
center_of_mass = list("x"=16, "y"=11)
- New()
- ..()
- reagents.add_reagent("protein", 2)
- reagents.add_reagent("nutriment", 4)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/cheesyfries/New()
+ ..()
+ reagents.add_reagent("protein", 2)
+ reagents.add_reagent("nutriment", 4)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/fortunecookie
name = "Fortune cookie"
@@ -1322,10 +1323,10 @@
filling_color = "#E8E79E"
center_of_mass = list("x"=15, "y"=14)
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/fortunecookie/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/badrecipe
name = "Burned mess"
@@ -1334,11 +1335,11 @@
filling_color = "#211F02"
center_of_mass = list("x"=16, "y"=12)
- New()
- ..()
- reagents.add_reagent("toxin", 1)
- reagents.add_reagent("carbon", 3)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/badrecipe/New()
+ ..()
+ reagents.add_reagent("toxin", 1)
+ reagents.add_reagent("carbon", 3)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/meatsteak
name = "Meat steak"
@@ -1348,12 +1349,12 @@
filling_color = "#7A3D11"
center_of_mass = list("x"=16, "y"=13)
- New()
- ..()
- reagents.add_reagent("protein", 4)
- reagents.add_reagent("sodiumchloride", 1)
- reagents.add_reagent("blackpepper", 1)
- bitesize = 3
+/obj/item/weapon/reagent_containers/food/snacks/meatsteak/New()
+ ..()
+ reagents.add_reagent("protein", 4)
+ reagents.add_reagent("sodiumchloride", 1)
+ reagents.add_reagent("blackpepper", 1)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/spacylibertyduff
name = "Spacy Liberty Duff"
@@ -1363,11 +1364,11 @@
filling_color = "#42B873"
center_of_mass = list("x"=16, "y"=8)
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("psilocybin", 6)
- bitesize = 3
+/obj/item/weapon/reagent_containers/food/snacks/spacylibertyduff/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("psilocybin", 6)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/amanitajelly
name = "Amanita Jelly"
@@ -1377,12 +1378,12 @@
filling_color = "#ED0758"
center_of_mass = list("x"=16, "y"=5)
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("amatoxin", 6)
- reagents.add_reagent("psilocybin", 3)
- bitesize = 3
+/obj/item/weapon/reagent_containers/food/snacks/amanitajelly/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("amatoxin", 6)
+ reagents.add_reagent("psilocybin", 3)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/poppypretzel
name = "Poppy pretzel"
@@ -1392,11 +1393,10 @@
filling_color = "#916E36"
center_of_mass = list("x"=16, "y"=10)
- New()
- ..()
- reagents.add_reagent("nutriment", 5)
- bitesize = 2
-
+/obj/item/weapon/reagent_containers/food/snacks/poppypretzel/New()
+ ..()
+ reagents.add_reagent("nutriment", 5)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/meatballsoup
name = "Meatball soup"
@@ -1406,11 +1406,11 @@
filling_color = "#785210"
center_of_mass = list("x"=16, "y"=8)
- New()
- ..()
- reagents.add_reagent("protein", 8)
- reagents.add_reagent("water", 5)
- bitesize = 5
+/obj/item/weapon/reagent_containers/food/snacks/meatballsoup/New()
+ ..()
+ reagents.add_reagent("protein", 8)
+ reagents.add_reagent("water", 5)
+ bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/slimesoup
name = "slime soup"
@@ -1418,11 +1418,11 @@
icon_state = "slimesoup" //nonexistant?
filling_color = "#C4DBA0"
- New()
- ..()
- reagents.add_reagent("slimejelly", 5)
- reagents.add_reagent("water", 10)
- bitesize = 5
+/obj/item/weapon/reagent_containers/food/snacks/slimesoup/New()
+ ..()
+ reagents.add_reagent("slimejelly", 5)
+ reagents.add_reagent("water", 10)
+ bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/bloodsoup
name = "Tomato soup"
@@ -1431,12 +1431,12 @@
filling_color = "#FF0000"
center_of_mass = list("x"=16, "y"=7)
- New()
- ..()
- reagents.add_reagent("protein", 2)
- reagents.add_reagent("blood", 10)
- reagents.add_reagent("water", 5)
- bitesize = 5
+/obj/item/weapon/reagent_containers/food/snacks/bloodsoup/New()
+ ..()
+ reagents.add_reagent("protein", 2)
+ reagents.add_reagent("blood", 10)
+ reagents.add_reagent("water", 5)
+ bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/clownstears
name = "Clown's Tears"
@@ -1445,12 +1445,12 @@
filling_color = "#C4FBFF"
center_of_mass = list("x"=16, "y"=7)
- New()
- ..()
- reagents.add_reagent("nutriment", 4)
- reagents.add_reagent("banana", 5)
- reagents.add_reagent("water", 10)
- bitesize = 5
+/obj/item/weapon/reagent_containers/food/snacks/clownstears/New()
+ ..()
+ reagents.add_reagent("nutriment", 4)
+ reagents.add_reagent("banana", 5)
+ reagents.add_reagent("water", 10)
+ bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/vegetablesoup
name = "Vegetable soup"
@@ -1460,11 +1460,11 @@
filling_color = "#AFC4B5"
center_of_mass = list("x"=16, "y"=8)
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- reagents.add_reagent("water", 5)
- bitesize = 5
+/obj/item/weapon/reagent_containers/food/snacks/vegetablesoup/New()
+ ..()
+ reagents.add_reagent("nutriment", 8)
+ reagents.add_reagent("water", 5)
+ bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/nettlesoup
name = "Nettle soup"
@@ -1474,12 +1474,12 @@
filling_color = "#AFC4B5"
center_of_mass = list("x"=16, "y"=7)
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- reagents.add_reagent("water", 5)
- reagents.add_reagent("tricordrazine", 5)
- bitesize = 5
+/obj/item/weapon/reagent_containers/food/snacks/nettlesoup/New()
+ ..()
+ reagents.add_reagent("nutriment", 8)
+ reagents.add_reagent("water", 5)
+ reagents.add_reagent("tricordrazine", 5)
+ bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/mysterysoup
name = "Mystery soup"
@@ -1489,45 +1489,45 @@
filling_color = "#F082FF"
center_of_mass = list("x"=16, "y"=6)
- New()
- ..()
- var/mysteryselect = pick(1,2,3,4,5,6,7,8,9,10)
- switch(mysteryselect)
- if(1)
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("capsaicin", 3)
- reagents.add_reagent("tomatojuice", 2)
- if(2)
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("frostoil", 3)
- reagents.add_reagent("tomatojuice", 2)
- if(3)
- reagents.add_reagent("nutriment", 5)
- reagents.add_reagent("water", 5)
- reagents.add_reagent("tricordrazine", 5)
- if(4)
- reagents.add_reagent("nutriment", 5)
- reagents.add_reagent("water", 10)
- if(5)
- reagents.add_reagent("nutriment", 2)
- reagents.add_reagent("banana", 10)
- if(6)
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("blood", 10)
- if(7)
- reagents.add_reagent("slimejelly", 10)
- reagents.add_reagent("water", 10)
- if(8)
- reagents.add_reagent("carbon", 10)
- reagents.add_reagent("toxin", 10)
- if(9)
- reagents.add_reagent("nutriment", 5)
- reagents.add_reagent("tomatojuice", 10)
- if(10)
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("tomatojuice", 5)
- reagents.add_reagent("imidazoline", 5)
- bitesize = 5
+/obj/item/weapon/reagent_containers/food/snacks/mysterysoup/New()
+ ..()
+ var/mysteryselect = pick(1,2,3,4,5,6,7,8,9,10)
+ switch(mysteryselect)
+ if(1)
+ reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("capsaicin", 3)
+ reagents.add_reagent("tomatojuice", 2)
+ if(2)
+ reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("frostoil", 3)
+ reagents.add_reagent("tomatojuice", 2)
+ if(3)
+ reagents.add_reagent("nutriment", 5)
+ reagents.add_reagent("water", 5)
+ reagents.add_reagent("tricordrazine", 5)
+ if(4)
+ reagents.add_reagent("nutriment", 5)
+ reagents.add_reagent("water", 10)
+ if(5)
+ reagents.add_reagent("nutriment", 2)
+ reagents.add_reagent("banana", 10)
+ if(6)
+ reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("blood", 10)
+ if(7)
+ reagents.add_reagent("slimejelly", 10)
+ reagents.add_reagent("water", 10)
+ if(8)
+ reagents.add_reagent("carbon", 10)
+ reagents.add_reagent("toxin", 10)
+ if(9)
+ reagents.add_reagent("nutriment", 5)
+ reagents.add_reagent("tomatojuice", 10)
+ if(10)
+ reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("tomatojuice", 5)
+ reagents.add_reagent("imidazoline", 5)
+ bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/wishsoup
name = "Wish Soup"
@@ -1537,13 +1537,13 @@
filling_color = "#D1F4FF"
center_of_mass = list("x"=16, "y"=11)
- New()
- ..()
- reagents.add_reagent("water", 10)
- bitesize = 5
- if(prob(25))
- src.desc = "A wish come true!"
- reagents.add_reagent("nutriment", 8)
+/obj/item/weapon/reagent_containers/food/snacks/wishsoup/New()
+ ..()
+ reagents.add_reagent("water", 10)
+ bitesize = 5
+ if(prob(25))
+ src.desc = "A wish come true!"
+ reagents.add_reagent("nutriment", 8)
/obj/item/weapon/reagent_containers/food/snacks/hotchili
name = "Hot Chili"
@@ -1553,14 +1553,13 @@
filling_color = "#FF3C00"
center_of_mass = list("x"=15, "y"=9)
- New()
- ..()
- reagents.add_reagent("protein", 3)
- reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("capsaicin", 3)
- reagents.add_reagent("tomatojuice", 2)
- bitesize = 5
-
+/obj/item/weapon/reagent_containers/food/snacks/hotchili/New()
+ ..()
+ reagents.add_reagent("protein", 3)
+ reagents.add_reagent("nutriment", 3)
+ reagents.add_reagent("capsaicin", 3)
+ reagents.add_reagent("tomatojuice", 2)
+ bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/coldchili
name = "Cold Chili"
@@ -1570,33 +1569,14 @@
center_of_mass = list("x"=15, "y"=9)
trash = /obj/item/trash/snack_bowl
- New()
- ..()
- reagents.add_reagent("protein", 3)
- reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("frostoil", 3)
- reagents.add_reagent("tomatojuice", 2)
- bitesize = 5
-/* No more of this
-/obj/item/weapon/reagent_containers/food/snacks/telebacon
- name = "Tele Bacon"
- desc = "It tastes a little odd but it is still delicious."
- icon_state = "bacon"
- var/obj/item/device/radio/beacon/bacon/baconbeacon
- bitesize = 2
- center_of_mass = list("x"=18, "y"=13)
-
- New()
- ..()
- reagents.add_reagent("nutriment", 4)
- baconbeacon = new /obj/item/device/radio/beacon/bacon(src)
-
- On_Consume()
- if(!reagents.total_volume)
- baconbeacon.loc = usr
- baconbeacon.digest_delay()
-*/
+/obj/item/weapon/reagent_containers/food/snacks/coldchili/New()
+ ..()
+ reagents.add_reagent("protein", 3)
+ reagents.add_reagent("nutriment", 3)
+ reagents.add_reagent("frostoil", 3)
+ reagents.add_reagent("tomatojuice", 2)
+ bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/monkeycube
name = "monkey cube"
@@ -1610,33 +1590,33 @@
var/wrapped = 0
var/monkey_type = "Monkey"
- New()
- ..()
- reagents.add_reagent("protein", 10)
+/obj/item/weapon/reagent_containers/food/snacks/monkeycube/New()
+ ..()
+ reagents.add_reagent("protein", 10)
- attack_self(mob/user as mob)
- if(wrapped)
- Unwrap(user)
+/obj/item/weapon/reagent_containers/food/snacks/monkeycube/attack_self(mob/user as mob)
+ if(wrapped)
+ Unwrap(user)
- proc/Expand()
- src.visible_message("\The [src] expands!")
- var/mob/living/carbon/human/H = new(get_turf(src))
- H.set_species(monkey_type)
- H.real_name = H.species.get_random_name()
- H.name = H.real_name
- if(ismob(loc))
- var/mob/M = loc
- M.unEquip(src)
- qdel(src)
- return 1
+/obj/item/weapon/reagent_containers/food/snacks/monkeycube/proc/Expand()
+ src.visible_message("\The [src] expands!")
+ var/mob/living/carbon/human/H = new(get_turf(src))
+ H.set_species(monkey_type)
+ H.real_name = H.species.get_random_name()
+ H.name = H.real_name
+ if(ismob(loc))
+ var/mob/M = loc
+ M.unEquip(src)
+ qdel(src)
+ return 1
- proc/Unwrap(mob/user as mob)
- icon_state = "monkeycube"
- desc = "Just add water!"
- user << "You unwrap the cube."
- wrapped = 0
- flags |= OPENCONTAINER
- return
+/obj/item/weapon/reagent_containers/food/snacks/monkeycube/proc/Unwrap(mob/user as mob)
+ icon_state = "monkeycube"
+ desc = "Just add water!"
+ user << "You unwrap the cube."
+ wrapped = 0
+ flags |= OPENCONTAINER
+ return
/obj/item/weapon/reagent_containers/food/snacks/monkeycube/on_reagent_change()
if(reagents.has_reagent("water"))
@@ -1672,17 +1652,16 @@
name = "neaera cube"
monkey_type = "Neaera"
-
/obj/item/weapon/reagent_containers/food/snacks/spellburger
name = "Spell Burger"
desc = "This is absolutely Ei Nath."
icon_state = "spellburger"
filling_color = "#D505FF"
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/spellburger/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/bigbiteburger
name = "Big Bite Burger"
@@ -1691,11 +1670,11 @@
filling_color = "#E3D681"
center_of_mass = list("x"=16, "y"=11)
- New()
- ..()
- reagents.add_reagent("protein", 10)
- reagents.add_reagent("nutriment", 4)
- bitesize = 3
+/obj/item/weapon/reagent_containers/food/snacks/bigbiteburger/New()
+ ..()
+ reagents.add_reagent("protein", 10)
+ reagents.add_reagent("nutriment", 4)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/enchiladas
name = "Enchiladas"
@@ -1705,12 +1684,12 @@
filling_color = "#A36A1F"
center_of_mass = list("x"=16, "y"=13)
- New()
- ..()
- reagents.add_reagent("protein", 6)
- reagents.add_reagent("nutriment",2)
- reagents.add_reagent("capsaicin", 6)
- bitesize = 4
+/obj/item/weapon/reagent_containers/food/snacks/enchiladas/New()
+ ..()
+ reagents.add_reagent("protein", 6)
+ reagents.add_reagent("nutriment",2)
+ reagents.add_reagent("capsaicin", 6)
+ bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/monkeysdelight
name = "monkey's Delight"
@@ -1720,13 +1699,13 @@
filling_color = "#5C3C11"
center_of_mass = list("x"=16, "y"=13)
- New()
- ..()
- reagents.add_reagent("protein", 10)
- reagents.add_reagent("banana", 5)
- reagents.add_reagent("blackpepper", 1)
- reagents.add_reagent("sodiumchloride", 1)
- bitesize = 6
+/obj/item/weapon/reagent_containers/food/snacks/monkeysdelight/New()
+ ..()
+ reagents.add_reagent("protein", 10)
+ reagents.add_reagent("banana", 5)
+ reagents.add_reagent("blackpepper", 1)
+ reagents.add_reagent("sodiumchloride", 1)
+ bitesize = 6
/obj/item/weapon/reagent_containers/food/snacks/baguette
name = "Baguette"
@@ -1735,12 +1714,12 @@
filling_color = "#E3D796"
center_of_mass = list("x"=18, "y"=12)
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("blackpepper", 1)
- reagents.add_reagent("sodiumchloride", 1)
- bitesize = 3
+/obj/item/weapon/reagent_containers/food/snacks/baguette/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("blackpepper", 1)
+ reagents.add_reagent("sodiumchloride", 1)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/fishandchips
name = "Fish and Chips"
@@ -1749,12 +1728,12 @@
filling_color = "#E3D796"
center_of_mass = list("x"=16, "y"=16)
- New()
- ..()
- reagents.add_reagent("protein", 3)
- reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("carpotoxin", 3)
- bitesize = 3
+/obj/item/weapon/reagent_containers/food/snacks/fishandchips/New()
+ ..()
+ reagents.add_reagent("protein", 3)
+ reagents.add_reagent("nutriment", 3)
+ reagents.add_reagent("carpotoxin", 3)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/sandwich
name = "Sandwich"
@@ -1764,11 +1743,11 @@
filling_color = "#D9BE29"
center_of_mass = list("x"=16, "y"=4)
- New()
- ..()
- reagents.add_reagent("protein", 3)
- reagents.add_reagent("nutriment", 3)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/sandwich/New()
+ ..()
+ reagents.add_reagent("protein", 3)
+ reagents.add_reagent("nutriment", 3)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/toastedsandwich
name = "Toasted Sandwich"
@@ -1778,12 +1757,12 @@
filling_color = "#D9BE29"
center_of_mass = list("x"=16, "y"=4)
- New()
- ..()
- reagents.add_reagent("protein", 3)
- reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("carbon", 2)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/toastedsandwich/New()
+ ..()
+ reagents.add_reagent("protein", 3)
+ reagents.add_reagent("nutriment", 3)
+ reagents.add_reagent("carbon", 2)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/grilledcheese
name = "Grilled Cheese Sandwich"
@@ -1792,11 +1771,11 @@
trash = /obj/item/trash/plate
filling_color = "#D9BE29"
- New()
- ..()
- reagents.add_reagent("protein", 4)
- reagents.add_reagent("nutriment", 3)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/grilledcheese/New()
+ ..()
+ reagents.add_reagent("protein", 4)
+ reagents.add_reagent("nutriment", 3)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/tomatosoup
name = "Tomato Soup"
@@ -1806,11 +1785,11 @@
filling_color = "#D92929"
center_of_mass = list("x"=16, "y"=7)
- New()
- ..()
- reagents.add_reagent("nutriment", 5)
- reagents.add_reagent("tomatojuice", 10)
- bitesize = 3
+/obj/item/weapon/reagent_containers/food/snacks/tomatosoup/New()
+ ..()
+ reagents.add_reagent("nutriment", 5)
+ reagents.add_reagent("tomatojuice", 10)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/rofflewaffles
name = "Roffle Waffles"
@@ -1820,11 +1799,11 @@
filling_color = "#FF00F7"
center_of_mass = list("x"=15, "y"=11)
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- reagents.add_reagent("psilocybin", 8)
- bitesize = 4
+/obj/item/weapon/reagent_containers/food/snacks/rofflewaffles/New()
+ ..()
+ reagents.add_reagent("nutriment", 8)
+ reagents.add_reagent("psilocybin", 8)
+ bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/stew
name = "Stew"
@@ -1833,14 +1812,14 @@
filling_color = "#9E673A"
center_of_mass = list("x"=16, "y"=5)
- New()
- ..()
- reagents.add_reagent("protein", 4)
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("tomatojuice", 5)
- reagents.add_reagent("imidazoline", 5)
- reagents.add_reagent("water", 5)
- bitesize = 10
+/obj/item/weapon/reagent_containers/food/snacks/stew/New()
+ ..()
+ reagents.add_reagent("protein", 4)
+ reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("tomatojuice", 5)
+ reagents.add_reagent("imidazoline", 5)
+ reagents.add_reagent("water", 5)
+ bitesize = 10
/obj/item/weapon/reagent_containers/food/snacks/jelliedtoast
name = "Jellied Toast"
@@ -1850,20 +1829,18 @@
filling_color = "#B572AB"
center_of_mass = list("x"=16, "y"=8)
- New()
- ..()
- reagents.add_reagent("nutriment", 1)
- bitesize = 3
+/obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/New()
+ ..()
+ reagents.add_reagent("nutriment", 1)
+ bitesize = 3
-/obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/cherry
- New()
- ..()
- reagents.add_reagent("cherryjelly", 5)
+/obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/cherry/New()
+ ..()
+ reagents.add_reagent("cherryjelly", 5)
-/obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/slime
- New()
- ..()
- reagents.add_reagent("slimejelly", 5)
+/obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/slime/New()
+ ..()
+ reagents.add_reagent("slimejelly", 5)
/obj/item/weapon/reagent_containers/food/snacks/jellyburger
name = "Jelly Burger"
@@ -1872,20 +1849,18 @@
filling_color = "#B572AB"
center_of_mass = list("x"=16, "y"=11)
- New()
- ..()
- reagents.add_reagent("nutriment", 5)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/jellyburger/New()
+ ..()
+ reagents.add_reagent("nutriment", 5)
+ bitesize = 2
-/obj/item/weapon/reagent_containers/food/snacks/jellyburger/slime
- New()
- ..()
- reagents.add_reagent("slimejelly", 5)
+/obj/item/weapon/reagent_containers/food/snacks/jellyburger/slime/New()
+ ..()
+ reagents.add_reagent("slimejelly", 5)
-/obj/item/weapon/reagent_containers/food/snacks/jellyburger/cherry
- New()
- ..()
- reagents.add_reagent("cherryjelly", 5)
+/obj/item/weapon/reagent_containers/food/snacks/jellyburger/cherry/New()
+ ..()
+ reagents.add_reagent("cherryjelly", 5)
/obj/item/weapon/reagent_containers/food/snacks/milosoup
name = "Milosoup"
@@ -1894,11 +1869,11 @@
trash = /obj/item/trash/snack_bowl
center_of_mass = list("x"=16, "y"=7)
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- reagents.add_reagent("water", 5)
- bitesize = 4
+/obj/item/weapon/reagent_containers/food/snacks/milosoup/New()
+ ..()
+ reagents.add_reagent("nutriment", 8)
+ reagents.add_reagent("water", 5)
+ bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat
name = "Stewed Soy Meat"
@@ -1907,10 +1882,10 @@
trash = /obj/item/trash/plate
center_of_mass = list("x"=16, "y"=10)
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat/New()
+ ..()
+ reagents.add_reagent("nutriment", 8)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/boiledspagetti
name = "Boiled Spaghetti"
@@ -1920,10 +1895,10 @@
filling_color = "#FCEE81"
center_of_mass = list("x"=16, "y"=10)
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/boiledspagetti/New()
+ ..()
+ reagents.add_reagent("nutriment", 2)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/boiledrice
name = "Boiled Rice"
@@ -1933,10 +1908,10 @@
filling_color = "#FFFBDB"
center_of_mass = list("x"=17, "y"=11)
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/boiledrice/New()
+ ..()
+ reagents.add_reagent("nutriment", 2)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/ricepudding
name = "Rice Pudding"
@@ -1946,10 +1921,10 @@
filling_color = "#FFFBDB"
center_of_mass = list("x"=17, "y"=11)
- New()
- ..()
- reagents.add_reagent("nutriment", 4)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/ricepudding/New()
+ ..()
+ reagents.add_reagent("nutriment", 4)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/pastatomato
name = "Spaghetti"
@@ -1959,11 +1934,11 @@
filling_color = "#DE4545"
center_of_mass = list("x"=16, "y"=10)
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("tomatojuice", 10)
- bitesize = 4
+/obj/item/weapon/reagent_containers/food/snacks/pastatomato/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("tomatojuice", 10)
+ bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/meatballspagetti
name = "Spaghetti & Meatballs"
@@ -1973,11 +1948,11 @@
filling_color = "#DE4545"
center_of_mass = list("x"=16, "y"=10)
- New()
- ..()
- reagents.add_reagent("protein", 4)
- reagents.add_reagent("nutriment", 4)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/meatballspagetti/New()
+ ..()
+ reagents.add_reagent("protein", 4)
+ reagents.add_reagent("nutriment", 4)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/spesslaw
name = "Spesslaw"
@@ -1986,11 +1961,11 @@
filling_color = "#DE4545"
center_of_mass = list("x"=16, "y"=10)
- New()
- ..()
- reagents.add_reagent("protein", 4)
- reagents.add_reagent("nutriment", 4)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/spesslaw/New()
+ ..()
+ reagents.add_reagent("protein", 4)
+ reagents.add_reagent("nutriment", 4)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/carrotfries
name = "Carrot Fries"
@@ -2000,11 +1975,11 @@
filling_color = "#FAA005"
center_of_mass = list("x"=16, "y"=11)
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("imidazoline", 3)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/carrotfries/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ reagents.add_reagent("imidazoline", 3)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/superbiteburger
name = "Super Bite Burger"
@@ -2013,11 +1988,11 @@
filling_color = "#CCA26A"
center_of_mass = list("x"=16, "y"=3)
- New()
- ..()
- reagents.add_reagent("protein", 25)
- reagents.add_reagent("nutriment", 25)
- bitesize = 10
+/obj/item/weapon/reagent_containers/food/snacks/superbiteburger/New()
+ ..()
+ reagents.add_reagent("protein", 25)
+ reagents.add_reagent("nutriment", 25)
+ bitesize = 10
/obj/item/weapon/reagent_containers/food/snacks/candiedapple
name = "Candied Apple"
@@ -2026,10 +2001,10 @@
filling_color = "#F21873"
center_of_mass = list("x"=15, "y"=13)
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- bitesize = 3
+/obj/item/weapon/reagent_containers/food/snacks/candiedapple/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/applepie
name = "Apple Pie"
@@ -2038,11 +2013,10 @@
filling_color = "#E0EDC5"
center_of_mass = list("x"=16, "y"=13)
- New()
- ..()
- reagents.add_reagent("nutriment", 4)
- bitesize = 3
-
+/obj/item/weapon/reagent_containers/food/snacks/applepie/New()
+ ..()
+ reagents.add_reagent("nutriment", 4)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/cherrypie
name = "Cherry Pie"
@@ -2051,10 +2025,10 @@
filling_color = "#FF525A"
center_of_mass = list("x"=16, "y"=11)
- New()
- ..()
- reagents.add_reagent("nutriment", 4)
- bitesize = 3
+/obj/item/weapon/reagent_containers/food/snacks/cherrypie/New()
+ ..()
+ reagents.add_reagent("nutriment", 4)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/twobread
name = "Two Bread"
@@ -2063,10 +2037,10 @@
filling_color = "#DBCC9A"
center_of_mass = list("x"=15, "y"=12)
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- bitesize = 3
+/obj/item/weapon/reagent_containers/food/snacks/twobread/New()
+ ..()
+ reagents.add_reagent("nutriment", 2)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/jellysandwich
name = "Jelly Sandwich"
@@ -2076,29 +2050,28 @@
filling_color = "#9E3A78"
center_of_mass = list("x"=16, "y"=8)
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- bitesize = 3
+/obj/item/weapon/reagent_containers/food/snacks/jellysandwich/New()
+ ..()
+ reagents.add_reagent("nutriment", 2)
+ bitesize = 3
-/obj/item/weapon/reagent_containers/food/snacks/jellysandwich/slime
- New()
- ..()
- reagents.add_reagent("slimejelly", 5)
+/obj/item/weapon/reagent_containers/food/snacks/jellysandwich/slime/New()
+ ..()
+ reagents.add_reagent("slimejelly", 5)
-/obj/item/weapon/reagent_containers/food/snacks/jellysandwich/cherry
- New()
- ..()
- reagents.add_reagent("cherryjelly", 5)
+/obj/item/weapon/reagent_containers/food/snacks/jellysandwich/cherry/New()
+ ..()
+ reagents.add_reagent("cherryjelly", 5)
/obj/item/weapon/reagent_containers/food/snacks/boiledslimecore
name = "Boiled slime Core"
desc = "A boiled red thing."
icon_state = "boiledslimecore" //nonexistant?
- New()
- ..()
- reagents.add_reagent("slimejelly", 5)
- bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/boiledslimecore/New()
+ ..()
+ reagents.add_reagent("slimejelly", 5)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/mint
name = "mint"
@@ -2107,10 +2080,10 @@
filling_color = "#F2F2F2"
center_of_mass = list("x"=16, "y"=14)
- New()
- ..()
- reagents.add_reagent("mint", 1)
- bitesize = 1
+/obj/item/weapon/reagent_containers/food/snacks/mint/New()
+ ..()
+ reagents.add_reagent("mint", 1)
+ bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/mushroomsoup
name = "chantrelle soup"
@@ -2120,10 +2093,10 @@
filling_color = "#E386BF"
center_of_mass = list("x"=17, "y"=10)
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- bitesize = 3
+/obj/item/weapon/reagent_containers/food/snacks/mushroomsoup/New()
+ ..()
+ reagents.add_reagent("nutriment", 8)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit
name = "plump helmet biscuit"
@@ -2132,17 +2105,17 @@
filling_color = "#CFB4C4"
center_of_mass = list("x"=16, "y"=13)
- New()
- ..()
- if(prob(10))
- name = "exceptional plump helmet biscuit"
- desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump helmet biscuit!"
- reagents.add_reagent("nutriment", 8)
- reagents.add_reagent("tricordrazine", 5)
- bitesize = 2
- else
- reagents.add_reagent("nutriment", 5)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit/New()
+ ..()
+ if(prob(10))
+ name = "exceptional plump helmet biscuit"
+ desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump helmet biscuit!"
+ reagents.add_reagent("nutriment", 8)
+ reagents.add_reagent("tricordrazine", 5)
+ bitesize = 2
+ else
+ reagents.add_reagent("nutriment", 5)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/chawanmushi
name = "chawanmushi"
@@ -2152,10 +2125,10 @@
filling_color = "#F0F2E4"
center_of_mass = list("x"=17, "y"=10)
- New()
- ..()
- reagents.add_reagent("protein", 5)
- bitesize = 1
+/obj/item/weapon/reagent_containers/food/snacks/chawanmushi/New()
+ ..()
+ reagents.add_reagent("protein", 5)
+ bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/beetsoup
name = "beet soup"
@@ -2165,11 +2138,11 @@
filling_color = "#FAC9FF"
center_of_mass = list("x"=15, "y"=8)
- New()
- ..()
- name = pick(list("borsch","bortsch","borstch","borsh","borshch","borscht"))
- reagents.add_reagent("nutriment", 8)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/beetsoup/New()
+ ..()
+ name = pick(list("borsch","bortsch","borstch","borsh","borshch","borscht"))
+ reagents.add_reagent("nutriment", 8)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/tossedsalad
name = "tossed salad"
@@ -2178,10 +2151,11 @@
trash = /obj/item/trash/snack_bowl
filling_color = "#76B87F"
center_of_mass = list("x"=17, "y"=11)
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/tossedsalad/New()
+ ..()
+ reagents.add_reagent("nutriment", 8)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/validsalad
name = "valid salad"
@@ -2191,11 +2165,11 @@
filling_color = "#76B87F"
center_of_mass = list("x"=17, "y"=11)
- New()
- ..()
- reagents.add_reagent("protein", 2)
- reagents.add_reagent("nutriment", 6)
- bitesize = 3
+/obj/item/weapon/reagent_containers/food/snacks/validsalad/New()
+ ..()
+ reagents.add_reagent("protein", 2)
+ reagents.add_reagent("nutriment", 6)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/appletart
name = "golden apple streusel tart"
@@ -2205,11 +2179,11 @@
filling_color = "#FFFF00"
center_of_mass = list("x"=16, "y"=18)
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- reagents.add_reagent("gold", 5)
- bitesize = 3
+/obj/item/weapon/reagent_containers/food/snacks/appletart/New()
+ ..()
+ reagents.add_reagent("nutriment", 8)
+ reagents.add_reagent("gold", 5)
+ bitesize = 3
/////////////////////////////////////////////////Sliceable////////////////////////////////////////
// All the food items that can be sliced into smaller bits like Meatbread and Cheesewheels
@@ -2228,11 +2202,11 @@
filling_color = "#FF7575"
center_of_mass = list("x"=16, "y"=9)
- New()
- ..()
- reagents.add_reagent("protein", 20)
- reagents.add_reagent("nutriment", 10)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/meatbread/New()
+ ..()
+ reagents.add_reagent("protein", 20)
+ reagents.add_reagent("nutriment", 10)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/meatbreadslice
name = "meatbread slice"
@@ -2242,7 +2216,7 @@
filling_color = "#FF7575"
bitesize = 2
center_of_mass = list("x"=16, "y"=13)
-
+
/obj/item/weapon/reagent_containers/food/snacks/meatbreadslice/New()
..()
if(!(reagents.total_volume))
@@ -2258,11 +2232,11 @@
filling_color = "#8AFF75"
center_of_mass = list("x"=16, "y"=9)
- New()
- ..()
- reagents.add_reagent("protein", 20)
- reagents.add_reagent("nutriment", 10)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/xenomeatbread/New()
+ ..()
+ reagents.add_reagent("protein", 20)
+ reagents.add_reagent("nutriment", 10)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/xenomeatbreadslice
name = "xenomeatbread slice"
@@ -2272,7 +2246,7 @@
filling_color = "#8AFF75"
bitesize = 2
center_of_mass = list("x"=16, "y"=13)
-
+
/obj/item/weapon/reagent_containers/food/snacks/xenomeatbreadslice/New()
..()
if(!(reagents.total_volume))
@@ -2288,11 +2262,11 @@
filling_color = "#EDE5AD"
center_of_mass = list("x"=16, "y"=9)
- New()
- ..()
- reagents.add_reagent("banana", 20)
- reagents.add_reagent("nutriment", 20)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/bananabread/New()
+ ..()
+ reagents.add_reagent("banana", 20)
+ reagents.add_reagent("nutriment", 20)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/bananabreadslice
name = "Banana-nut bread slice"
@@ -2302,7 +2276,7 @@
filling_color = "#EDE5AD"
bitesize = 2
center_of_mass = list("x"=16, "y"=8)
-
+
/obj/item/weapon/reagent_containers/food/snacks/bananabreadslice/New()
..()
if(!(reagents.total_volume))
@@ -2318,10 +2292,10 @@
filling_color = "#F7FFE0"
center_of_mass = list("x"=16, "y"=9)
- New()
- ..()
- reagents.add_reagent("nutriment", 30)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/tofubread/New()
+ ..()
+ reagents.add_reagent("nutriment", 30)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/tofubreadslice
name = "Tofubread slice"
@@ -2331,7 +2305,7 @@
filling_color = "#F7FFE0"
bitesize = 2
center_of_mass = list("x"=16, "y"=13)
-
+
/obj/item/weapon/reagent_containers/food/snacks/tofubreadslice/New()
..()
if(!(reagents.total_volume))
@@ -2347,11 +2321,11 @@
filling_color = "#FFD675"
center_of_mass = list("x"=16, "y"=10)
- New()
- ..()
- reagents.add_reagent("nutriment", 25)
- reagents.add_reagent("imidazoline", 10)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/carrotcake/New()
+ ..()
+ reagents.add_reagent("nutriment", 25)
+ reagents.add_reagent("imidazoline", 10)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/carrotcakeslice
name = "Carrot Cake slice"
@@ -2361,7 +2335,7 @@
filling_color = "#FFD675"
bitesize = 2
center_of_mass = list("x"=16, "y"=14)
-
+
/obj/item/weapon/reagent_containers/food/snacks/carrotcakeslice/New()
..()
if(!(reagents.total_volume))
@@ -2377,12 +2351,12 @@
filling_color = "#E6AEDB"
center_of_mass = list("x"=16, "y"=10)
- New()
- ..()
- reagents.add_reagent("protein", 25)
- reagents.add_reagent("nutriment", 5)
- reagents.add_reagent("alkysine", 10)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/braincake/New()
+ ..()
+ reagents.add_reagent("protein", 25)
+ reagents.add_reagent("nutriment", 5)
+ reagents.add_reagent("alkysine", 10)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/braincakeslice
name = "Brain Cake slice"
@@ -2392,7 +2366,7 @@
filling_color = "#E6AEDB"
bitesize = 2
center_of_mass = list("x"=16, "y"=12)
-
+
/obj/item/weapon/reagent_containers/food/snacks/braincakeslice/New()
..()
if(!(reagents.total_volume))
@@ -2409,11 +2383,11 @@
filling_color = "#FAF7AF"
center_of_mass = list("x"=16, "y"=10)
- New()
- ..()
- reagents.add_reagent("protein", 15)
- reagents.add_reagent("nutriment", 10)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesecake/New()
+ ..()
+ reagents.add_reagent("protein", 15)
+ reagents.add_reagent("nutriment", 10)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/cheesecakeslice
name = "Cheese Cake slice"
@@ -2423,7 +2397,7 @@
filling_color = "#FAF7AF"
bitesize = 2
center_of_mass = list("x"=16, "y"=14)
-
+
/obj/item/weapon/reagent_containers/food/snacks/cheesecakeslice/New()
..()
if(!(reagents.total_volume))
@@ -2439,9 +2413,9 @@
filling_color = "#F7EDD5"
center_of_mass = list("x"=16, "y"=10)
- New()
- ..()
- reagents.add_reagent("nutriment", 20)
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/plaincake/New()
+ ..()
+ reagents.add_reagent("nutriment", 20)
/obj/item/weapon/reagent_containers/food/snacks/plaincakeslice
name = "Vanilla Cake slice"
@@ -2451,7 +2425,7 @@
filling_color = "#F7EDD5"
bitesize = 2
center_of_mass = list("x"=16, "y"=14)
-
+
/obj/item/weapon/reagent_containers/food/snacks/plaincakeslice/New()
..()
if(!(reagents.total_volume))
@@ -2466,9 +2440,9 @@
filling_color = "#FADA8E"
center_of_mass = list("x"=16, "y"=10)
- New()
- ..()
- reagents.add_reagent("nutriment", 20)
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/orangecake/New()
+ ..()
+ reagents.add_reagent("nutriment", 20)
/obj/item/weapon/reagent_containers/food/snacks/orangecakeslice
name = "Orange Cake slice"
@@ -2478,7 +2452,7 @@
filling_color = "#FADA8E"
bitesize = 2
center_of_mass = list("x"=16, "y"=14)
-
+
/obj/item/weapon/reagent_containers/food/snacks/orangecakeslice/New()
..()
if(!(reagents.total_volume))
@@ -2493,9 +2467,9 @@
filling_color = "#CBFA8E"
center_of_mass = list("x"=16, "y"=10)
- New()
- ..()
- reagents.add_reagent("nutriment", 20)
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/limecake/New()
+ ..()
+ reagents.add_reagent("nutriment", 20)
/obj/item/weapon/reagent_containers/food/snacks/limecakeslice
name = "Lime Cake slice"
@@ -2505,7 +2479,7 @@
filling_color = "#CBFA8E"
bitesize = 2
center_of_mass = list("x"=16, "y"=14)
-
+
/obj/item/weapon/reagent_containers/food/snacks/limecakeslice/New()
..()
if(!(reagents.total_volume))
@@ -2520,9 +2494,9 @@
filling_color = "#FAFA8E"
center_of_mass = list("x"=16, "y"=10)
- New()
- ..()
- reagents.add_reagent("nutriment", 20)
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/lemoncake/New()
+ ..()
+ reagents.add_reagent("nutriment", 20)
/obj/item/weapon/reagent_containers/food/snacks/lemoncakeslice
name = "Lemon Cake slice"
@@ -2532,7 +2506,7 @@
filling_color = "#FAFA8E"
bitesize = 2
center_of_mass = list("x"=16, "y"=14)
-
+
/obj/item/weapon/reagent_containers/food/snacks/lemoncakeslice/New()
..()
if(!(reagents.total_volume))
@@ -2547,9 +2521,9 @@
filling_color = "#805930"
center_of_mass = list("x"=16, "y"=10)
- New()
- ..()
- reagents.add_reagent("nutriment", 20)
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/chocolatecake/New()
+ ..()
+ reagents.add_reagent("nutriment", 20)
/obj/item/weapon/reagent_containers/food/snacks/chocolatecakeslice
name = "Chocolate Cake slice"
@@ -2559,7 +2533,7 @@
filling_color = "#805930"
bitesize = 2
center_of_mass = list("x"=16, "y"=14)
-
+
/obj/item/weapon/reagent_containers/food/snacks/chocolatecakeslice/New()
..()
if(!(reagents.total_volume))
@@ -2574,10 +2548,10 @@
filling_color = "#FFF700"
center_of_mass = list("x"=16, "y"=10)
- New()
- ..()
- reagents.add_reagent("protein", 20)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesewheel/New()
+ ..()
+ reagents.add_reagent("protein", 20)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
name = "Cheese wedge"
@@ -2596,11 +2570,11 @@
filling_color = "#FFD6D6"
center_of_mass = list("x"=16, "y"=10)
- New()
- ..()
- reagents.add_reagent("nutriment", 20)
- reagents.add_reagent("sprinkles", 10)
- bitesize = 3
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/birthdaycake/New()
+ ..()
+ reagents.add_reagent("nutriment", 20)
+ reagents.add_reagent("sprinkles", 10)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/birthdaycakeslice
name = "Birthday Cake slice"
@@ -2610,7 +2584,7 @@
filling_color = "#FFD6D6"
bitesize = 2
center_of_mass = list("x"=16, "y"=14)
-
+
/obj/item/weapon/reagent_containers/food/snacks/birthdaycakeslice/New()
..()
if(!(reagents.total_volume))
@@ -2626,10 +2600,10 @@
filling_color = "#FFE396"
center_of_mass = list("x"=16, "y"=9)
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/bread/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/breadslice
name = "Bread slice"
@@ -2639,7 +2613,7 @@
filling_color = "#D27332"
bitesize = 2
center_of_mass = list("x"=16, "y"=4)
-
+
/obj/item/weapon/reagent_containers/food/snacks/breadslice/New()
..()
if(!(reagents.total_volume))
@@ -2655,11 +2629,11 @@
filling_color = "#FFF896"
center_of_mass = list("x"=16, "y"=9)
- New()
- ..()
- reagents.add_reagent("protein", 15)
- reagents.add_reagent("nutriment", 5)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/creamcheesebread/New()
+ ..()
+ reagents.add_reagent("protein", 15)
+ reagents.add_reagent("nutriment", 5)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/creamcheesebreadslice
name = "Cream Cheese Bread slice"
@@ -2669,7 +2643,7 @@
filling_color = "#FFF896"
bitesize = 2
center_of_mass = list("x"=16, "y"=13)
-
+
/obj/item/weapon/reagent_containers/food/snacks/creamcheesebreadslice/New()
..()
if(!(reagents.total_volume))
@@ -2683,7 +2657,7 @@
filling_color = "#FF3867"
bitesize = 2
center_of_mass = list("x"=16, "y"=10)
-
+
/obj/item/weapon/reagent_containers/food/snacks/watermelonslice/New()
..()
if(!(reagents.total_volume))
@@ -2698,9 +2672,9 @@
filling_color = "#EBF5B8"
center_of_mass = list("x"=16, "y"=10)
- New()
- ..()
- reagents.add_reagent("nutriment", 15)
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/applecake/New()
+ ..()
+ reagents.add_reagent("nutriment", 15)
/obj/item/weapon/reagent_containers/food/snacks/applecakeslice
name = "Apple Cake slice"
@@ -2710,7 +2684,7 @@
filling_color = "#EBF5B8"
bitesize = 2
center_of_mass = list("x"=16, "y"=14)
-
+
/obj/item/weapon/reagent_containers/food/snacks/applecakeslice/New()
..()
if(!(reagents.total_volume))
@@ -2725,9 +2699,9 @@
filling_color = "#F5B951"
center_of_mass = list("x"=16, "y"=10)
- New()
- ..()
- reagents.add_reagent("nutriment", 15)
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/pumpkinpie/New()
+ ..()
+ reagents.add_reagent("nutriment", 15)
/obj/item/weapon/reagent_containers/food/snacks/pumpkinpieslice
name = "Pumpkin Pie slice"
@@ -2737,7 +2711,7 @@
filling_color = "#F5B951"
bitesize = 2
center_of_mass = list("x"=16, "y"=12)
-
+
/obj/item/weapon/reagent_containers/food/snacks/pumpkinpieslice/New()
..()
if(!(reagents.total_volume))
@@ -2750,11 +2724,9 @@
filling_color = "#F5DEB8"
center_of_mass = list("x"=17, "y"=6)
- New()
- ..()
- reagents.add_reagent("nutriment", 1)
-
-
+/obj/item/weapon/reagent_containers/food/snacks/cracker/New()
+ ..()
+ reagents.add_reagent("nutriment", 1)
/////////////////////////////////////////////////PIZZA////////////////////////////////////////
@@ -2770,12 +2742,12 @@
slices_num = 6
center_of_mass = list("x"=16, "y"=11)
- New()
- ..()
- reagents.add_reagent("nutriment", 35)
- reagents.add_reagent("protein", 5)
- reagents.add_reagent("tomatojuice", 6)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/margherita/New()
+ ..()
+ reagents.add_reagent("nutriment", 35)
+ reagents.add_reagent("protein", 5)
+ reagents.add_reagent("tomatojuice", 6)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/margheritaslice
name = "Margherita slice"
@@ -2784,7 +2756,7 @@
filling_color = "#BAA14C"
bitesize = 2
center_of_mass = list("x"=18, "y"=13)
-
+
/obj/item/weapon/reagent_containers/food/snacks/margheritaslice/New()
..()
if(!(reagents.total_volume))
@@ -2800,11 +2772,11 @@
slices_num = 6
center_of_mass = list("x"=16, "y"=11)
- New()
- ..()
- reagents.add_reagent("protein", 44)
- reagents.add_reagent("tomatojuice", 6)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/meatpizza/New()
+ ..()
+ reagents.add_reagent("protein", 44)
+ reagents.add_reagent("tomatojuice", 6)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/meatpizzaslice
name = "Meatpizza slice"
@@ -2813,7 +2785,7 @@
filling_color = "#BAA14C"
bitesize = 2
center_of_mass = list("x"=18, "y"=13)
-
+
/obj/item/weapon/reagent_containers/food/snacks/meatpizzaslice/New()
..()
if(!(reagents.total_volume))
@@ -2828,11 +2800,11 @@
slices_num = 6
center_of_mass = list("x"=16, "y"=11)
- New()
- ..()
- reagents.add_reagent("nutriment", 35)
- reagents.add_reagent("protein", 5)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/mushroompizza/New()
+ ..()
+ reagents.add_reagent("nutriment", 35)
+ reagents.add_reagent("protein", 5)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/mushroompizzaslice
name = "Mushroompizza slice"
@@ -2841,7 +2813,7 @@
filling_color = "#BAA14C"
bitesize = 2
center_of_mass = list("x"=18, "y"=13)
-
+
/obj/item/weapon/reagent_containers/food/snacks/mushroompizzaslice/New()
..()
if(!(reagents.total_volume))
@@ -2856,13 +2828,13 @@
slices_num = 6
center_of_mass = list("x"=16, "y"=11)
- New()
- ..()
- reagents.add_reagent("nutriment", 25)
- reagents.add_reagent("protein", 5)
- reagents.add_reagent("tomatojuice", 6)
- reagents.add_reagent("imidazoline", 12)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza/New()
+ ..()
+ reagents.add_reagent("nutriment", 25)
+ reagents.add_reagent("protein", 5)
+ reagents.add_reagent("tomatojuice", 6)
+ reagents.add_reagent("imidazoline", 12)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/vegetablepizzaslice
name = "Vegetable pizza slice"
@@ -2871,7 +2843,7 @@
filling_color = "#BAA14C"
bitesize = 2
center_of_mass = list("x"=18, "y"=13)
-
+
/obj/item/weapon/reagent_containers/food/snacks/vegetablepizzaslice/New()
..()
if(!(reagents.total_volume))
@@ -2892,7 +2864,6 @@
var/list/boxes = list() // If the boxes are stacked, they come here
var/boxtag = ""
-
/obj/item/pizzabox/proc/closepizzabox()
if( boxes.len > 0 )
@@ -3074,14 +3045,11 @@
filling_color = "#75754B"
center_of_mass = list("x"=16, "y"=7)
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("radium", 2)
- bitesize = 2
-
-
-
+/obj/item/weapon/reagent_containers/food/snacks/dionaroast/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("radium", 2)
+ bitesize = 2
///////////////////////////////////////////
// new old food stuff from bs12
@@ -3094,10 +3062,10 @@
bitesize = 2
center_of_mass = list("x"=16, "y"=13)
- New()
- ..()
- reagents.add_reagent("protein", 1)
- reagents.add_reagent("nutriment", 3)
+/obj/item/weapon/reagent_containers/food/snacks/dough/New()
+ ..()
+ reagents.add_reagent("protein", 1)
+ reagents.add_reagent("nutriment", 3)
// Dough + rolling pin = flat dough
/obj/item/weapon/reagent_containers/food/snacks/dough/attackby(obj/item/weapon/W as obj, mob/user as mob)
@@ -3116,10 +3084,10 @@
slices_num = 3
center_of_mass = list("x"=16, "y"=16)
- New()
- ..()
- reagents.add_reagent("protein", 1)
- reagents.add_reagent("nutriment", 3)
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough/New()
+ ..()
+ reagents.add_reagent("protein", 1)
+ reagents.add_reagent("nutriment", 3)
/obj/item/weapon/reagent_containers/food/snacks/doughslice
name = "dough slice"
@@ -3131,9 +3099,9 @@
bitesize = 2
center_of_mass = list("x"=17, "y"=19)
- New()
- ..()
- reagents.add_reagent("nutriment", 1)
+/obj/item/weapon/reagent_containers/food/snacks/doughslice/New()
+ ..()
+ reagents.add_reagent("nutriment", 1)
/obj/item/weapon/reagent_containers/food/snacks/bun
name = "bun"
@@ -3143,9 +3111,9 @@
bitesize = 2
center_of_mass = list("x"=16, "y"=12)
- New()
- ..()
- reagents.add_reagent("nutriment", 4)
+/obj/item/weapon/reagent_containers/food/snacks/bun/New()
+ ..()
+ reagents.add_reagent("nutriment", 4)
/obj/item/weapon/reagent_containers/food/snacks/bun/attackby(obj/item/weapon/W as obj, mob/user as mob)
// Bun + meatball = burger
@@ -3198,10 +3166,10 @@
bitesize = 3
center_of_mass = list("x"=21, "y"=12)
- New()
- ..()
- reagents.add_reagent("protein", 3)
- reagents.add_reagent("nutriment", 4)
+/obj/item/weapon/reagent_containers/food/snacks/taco/New()
+ ..()
+ reagents.add_reagent("protein", 3)
+ reagents.add_reagent("nutriment", 4)
/obj/item/weapon/reagent_containers/food/snacks/rawcutlet
name = "raw cutlet"
@@ -3211,9 +3179,9 @@
bitesize = 1
center_of_mass = list("x"=17, "y"=20)
- New()
- ..()
- reagents.add_reagent("protein", 1)
+/obj/item/weapon/reagent_containers/food/snacks/rawcutlet/New()
+ ..()
+ reagents.add_reagent("protein", 1)
/obj/item/weapon/reagent_containers/food/snacks/cutlet
name = "cutlet"
@@ -3223,9 +3191,9 @@
bitesize = 2
center_of_mass = list("x"=17, "y"=20)
- New()
- ..()
- reagents.add_reagent("protein", 2)
+/obj/item/weapon/reagent_containers/food/snacks/cutlet/New()
+ ..()
+ reagents.add_reagent("protein", 2)
/obj/item/weapon/reagent_containers/food/snacks/rawmeatball
name = "raw meatball"
@@ -3235,9 +3203,9 @@
bitesize = 2
center_of_mass = list("x"=16, "y"=15)
- New()
- ..()
- reagents.add_reagent("protein", 2)
+/obj/item/weapon/reagent_containers/food/snacks/rawmeatball/New()
+ ..()
+ reagents.add_reagent("protein", 2)
/obj/item/weapon/reagent_containers/food/snacks/hotdog
name = "hotdog"
@@ -3246,9 +3214,9 @@
bitesize = 2
center_of_mass = list("x"=16, "y"=17)
- New()
- ..()
- reagents.add_reagent("protein", 6)
+/obj/item/weapon/reagent_containers/food/snacks/hotdog/New()
+ ..()
+ reagents.add_reagent("protein", 6)
/obj/item/weapon/reagent_containers/food/snacks/flatbread
name = "flatbread"
@@ -3258,9 +3226,9 @@
bitesize = 2
center_of_mass = list("x"=16, "y"=16)
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
+/obj/item/weapon/reagent_containers/food/snacks/flatbread/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
// potato + knife = raw sticks
/obj/item/weapon/reagent_containers/food/snacks/grown/potato/attackby(obj/item/weapon/W as obj, mob/user as mob)
@@ -3279,9 +3247,9 @@
bitesize = 2
center_of_mass = list("x"=16, "y"=12)
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
+/obj/item/weapon/reagent_containers/food/snacks/rawsticks/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
/obj/item/weapon/reagent_containers/food/snacks/liquidfood
name = "\improper LiquidFood Ration"
@@ -3291,12 +3259,11 @@
filling_color = "#A8A8A8"
center_of_mass = list("x"=16, "y"=15)
- New()
- ..()
- reagents.add_reagent("nutriment", 20)
- reagents.add_reagent("iron", 3)
- bitesize = 4
-
+/obj/item/weapon/reagent_containers/food/snacks/liquidfood/New()
+ ..()
+ reagents.add_reagent("nutriment", 20)
+ reagents.add_reagent("iron", 3)
+ bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/tastybread
name = "bread tube"
@@ -3306,10 +3273,10 @@
filling_color = "#A66829"
center_of_mass = list("x"=17, "y"=16)
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/tastybread/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/skrellsnacks
name = "\improper SkrellSnax"
@@ -3318,7 +3285,7 @@
filling_color = "#A66829"
center_of_mass = list("x"=15, "y"=12)
- New()
- ..()
- reagents.add_reagent("nutriment", 10)
- bitesize = 3
+/obj/item/weapon/reagent_containers/food/snacks/skrellsnacks/New()
+ ..()
+ reagents.add_reagent("nutriment", 10)
+ bitesize = 3
diff --git a/code/modules/reagents/reagent_containers/food/snacks/meat.dm b/code/modules/reagents/reagent_containers/food/snacks/meat.dm
index 7ea52765fc..9e1dc52536 100644
--- a/code/modules/reagents/reagent_containers/food/snacks/meat.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks/meat.dm
@@ -5,10 +5,11 @@
health = 180
filling_color = "#FF1C1C"
center_of_mass = list("x"=16, "y"=14)
- New()
- ..()
- reagents.add_reagent("protein", 9)
- src.bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/meat/New()
+ ..()
+ reagents.add_reagent("protein", 9)
+ src.bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/meat/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W,/obj/item/weapon/material/knife))
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index a5903e744d..44ea628eca 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -44,66 +44,65 @@
/obj/machinery/radiocarbon_spectrometer
)
- New()
- ..()
- base_name = name
+/obj/item/weapon/reagent_containers/glass/New()
+ ..()
+ base_name = name
- examine(var/mob/user)
- if(!..(user, 2))
+/obj/item/weapon/reagent_containers/glass/examine(var/mob/user)
+ if(!..(user, 2))
+ return
+ if(reagents && reagents.reagent_list.len)
+ user << "It contains [reagents.total_volume] units of liquid."
+ else
+ user << "It is empty."
+ if(!is_open_container())
+ user << "Airtight lid seals it completely."
+
+/obj/item/weapon/reagent_containers/glass/attack_self()
+ ..()
+ if(is_open_container())
+ usr << "You put the lid on \the [src]."
+ flags ^= OPENCONTAINER
+ else
+ usr << "You take the lid off \the [src]."
+ flags |= OPENCONTAINER
+ update_icon()
+
+/obj/item/weapon/reagent_containers/glass/afterattack(var/obj/target, var/mob/user, var/flag)
+ if(!is_open_container() || !flag)
+ return
+
+ for(var/type in can_be_placed_into)
+ if(istype(target, type))
return
- if(reagents && reagents.reagent_list.len)
- user << "It contains [reagents.total_volume] units of liquid."
+
+ if(standard_splash_mob(user, target))
+ return
+ if(standard_dispenser_refill(user, target))
+ return
+ if(standard_pour_into(user, target))
+ return
+
+ if(reagents.total_volume)
+ user << "You splash the solution onto [target]."
+ reagents.splash(target, reagents.total_volume)
+ return
+
+/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) > 10)
+ user << "The label can be at most 10 characters long."
else
- user << "It is empty."
- if(!is_open_container())
- user << "Airtight lid seals it completely."
+ user << "You set the label to \"[tmp_label]\"."
+ label_text = tmp_label
+ update_name_label()
- attack_self()
- ..()
- if(is_open_container())
- usr << "You put the lid on \the [src]."
- flags ^= OPENCONTAINER
- else
- usr << "You take the lid off \the [src]."
- flags |= OPENCONTAINER
- update_icon()
-
- afterattack(var/obj/target, var/mob/user, var/flag)
-
- if(!is_open_container() || !flag)
- return
-
- for(var/type in can_be_placed_into)
- if(istype(target, type))
- return
-
- if(standard_splash_mob(user, target))
- return
- if(standard_dispenser_refill(user, target))
- return
- if(standard_pour_into(user, target))
- return
-
- if(reagents.total_volume)
- user << "You splash the solution onto [target]."
- reagents.splash(target, reagents.total_volume)
- return
-
- 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) > 10)
- user << "The label can be at most 10 characters long."
- else
- user << "You set the label to \"[tmp_label]\"."
- label_text = tmp_label
- update_name_label()
-
- proc/update_name_label()
- if(label_text == "")
- name = base_name
- else
- name = "[base_name] ([label_text])"
+/obj/item/weapon/reagent_containers/glass/proc/update_name_label()
+ if(label_text == "")
+ name = base_name
+ else
+ name = "[base_name] ([label_text])"
/obj/item/weapon/reagent_containers/glass/beaker
name = "beaker"
@@ -113,47 +112,47 @@
item_state = "beaker"
matter = list("glass" = 500)
- New()
- ..()
- desc += " Can hold up to [volume] units."
-
- on_reagent_change()
- update_icon()
-
- pickup(mob/user)
- ..()
- update_icon()
-
- dropped(mob/user)
- ..()
- update_icon()
-
- attack_hand()
- ..()
- update_icon()
+/obj/item/weapon/reagent_containers/glass/beaker/New()
+ ..()
+ desc += " Can hold up to [volume] units."
+/obj/item/weapon/reagent_containers/glass/beaker/on_reagent_change()
update_icon()
- overlays.Cut()
- if(reagents.total_volume)
- var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]10")
+/obj/item/weapon/reagent_containers/glass/beaker/pickup(mob/user)
+ ..()
+ update_icon()
- var/percent = round((reagents.total_volume / volume) * 100)
- switch(percent)
- if(0 to 9) filling.icon_state = "[icon_state]-10"
- if(10 to 24) filling.icon_state = "[icon_state]10"
- if(25 to 49) filling.icon_state = "[icon_state]25"
- if(50 to 74) filling.icon_state = "[icon_state]50"
- if(75 to 79) filling.icon_state = "[icon_state]75"
- if(80 to 90) filling.icon_state = "[icon_state]80"
- if(91 to INFINITY) filling.icon_state = "[icon_state]100"
+/obj/item/weapon/reagent_containers/glass/beaker/dropped(mob/user)
+ ..()
+ update_icon()
- filling.color = reagents.get_color()
- overlays += filling
+/obj/item/weapon/reagent_containers/glass/beaker/attack_hand()
+ ..()
+ update_icon()
- if (!is_open_container())
- var/image/lid = image(icon, src, "lid_[initial(icon_state)]")
- overlays += lid
+/obj/item/weapon/reagent_containers/glass/beaker/update_icon()
+ overlays.Cut()
+
+ if(reagents.total_volume)
+ var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]10")
+
+ var/percent = round((reagents.total_volume / volume) * 100)
+ switch(percent)
+ if(0 to 9) filling.icon_state = "[icon_state]-10"
+ if(10 to 24) filling.icon_state = "[icon_state]10"
+ if(25 to 49) filling.icon_state = "[icon_state]25"
+ if(50 to 74) filling.icon_state = "[icon_state]50"
+ if(75 to 79) filling.icon_state = "[icon_state]75"
+ if(80 to 90) filling.icon_state = "[icon_state]80"
+ if(91 to INFINITY) filling.icon_state = "[icon_state]100"
+
+ filling.color = reagents.get_color()
+ overlays += filling
+
+ if (!is_open_container())
+ var/image/lid = image(icon, src, "lid_[initial(icon_state)]")
+ overlays += lid
/obj/item/weapon/reagent_containers/glass/beaker/large
name = "large beaker"
@@ -194,14 +193,12 @@
possible_transfer_amounts = list(5,10,15,25)
flags = OPENCONTAINER
-/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone
- New()
- ..()
- reagents.add_reagent("cryoxadone", 30)
- update_icon()
+/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone/New()
+ ..()
+ reagents.add_reagent("cryoxadone", 30)
+ update_icon()
-/obj/item/weapon/reagent_containers/glass/beaker/sulphuric
- New()
+/obj/item/weapon/reagent_containers/glass/beaker/sulphuric/New()
..()
reagents.add_reagent("sacid", 60)
update_icon()
@@ -221,7 +218,6 @@
unacidable = 0
/obj/item/weapon/reagent_containers/glass/bucket/attackby(var/obj/D, mob/user as mob)
-
if(isprox(D))
user << "You add [D] to [src]."
qdel(D)
@@ -256,35 +252,3 @@
amount_per_transfer_from_this = 20
possible_transfer_amounts = list(10,20,30,60,120)
volume = 120
-
-/*
-/obj/item/weapon/reagent_containers/glass/blender_jug
- name = "Blender Jug"
- desc = "A blender jug, part of a blender."
- icon = 'icons/obj/kitchen.dmi'
- icon_state = "blender_jug_e"
- volume = 100
-
- on_reagent_change()
- switch(src.reagents.total_volume)
- if(0)
- icon_state = "blender_jug_e"
- if(1 to 75)
- icon_state = "blender_jug_h"
- if(76 to 100)
- icon_state = "blender_jug_f"
-
-/obj/item/weapon/reagent_containers/glass/canister //not used apparantly
- desc = "It's a canister. Mainly used for transporting fuel."
- name = "canister"
- icon = 'icons/obj/tank.dmi'
- icon_state = "canister"
- item_state = "canister"
- m_amt = 300
- g_amt = 0
- w_class = 4.0
-
- amount_per_transfer_from_this = 20
- possible_transfer_amounts = list(10,20,30,60)
- volume = 120
-*/
diff --git a/code/modules/reagents/reagent_containers/glass/bottle.dm b/code/modules/reagents/reagent_containers/glass/bottle.dm
index 55dfcc7745..5f22c3f324 100644
--- a/code/modules/reagents/reagent_containers/glass/bottle.dm
+++ b/code/modules/reagents/reagent_containers/glass/bottle.dm
@@ -12,48 +12,48 @@
flags = 0
volume = 60
- on_reagent_change()
- update_icon()
-
- pickup(mob/user)
- ..()
- update_icon()
-
- dropped(mob/user)
- ..()
- update_icon()
-
- attack_hand()
- ..()
- update_icon()
-
- New()
- ..()
- if(!icon_state)
- icon_state = "bottle-[rand(1,4)]"
-
+/obj/item/weapon/reagent_containers/glass/bottle/on_reagent_change()
update_icon()
- overlays.Cut()
- if(reagents.total_volume && (icon_state == "bottle-1" || icon_state == "bottle-2" || icon_state == "bottle-3" || icon_state == "bottle-4"))
- var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]10")
+/obj/item/weapon/reagent_containers/glass/bottle/pickup(mob/user)
+ ..()
+ update_icon()
- var/percent = round((reagents.total_volume / volume) * 100)
- switch(percent)
- if(0 to 9) filling.icon_state = "[icon_state]--10"
- if(10 to 24) filling.icon_state = "[icon_state]-10"
- if(25 to 49) filling.icon_state = "[icon_state]-25"
- if(50 to 74) filling.icon_state = "[icon_state]-50"
- if(75 to 79) filling.icon_state = "[icon_state]-75"
- if(80 to 90) filling.icon_state = "[icon_state]-80"
- if(91 to INFINITY) filling.icon_state = "[icon_state]-100"
+/obj/item/weapon/reagent_containers/glass/bottle/dropped(mob/user)
+ ..()
+ update_icon()
- filling.color = reagents.get_color()
- overlays += filling
+/obj/item/weapon/reagent_containers/glass/bottle/attack_hand()
+ ..()
+ update_icon()
- if (!is_open_container())
- var/image/lid = image(icon, src, "lid_bottle")
- overlays += lid
+/obj/item/weapon/reagent_containers/glass/bottle/New()
+ ..()
+ if(!icon_state)
+ icon_state = "bottle-[rand(1,4)]"
+
+/obj/item/weapon/reagent_containers/glass/bottle/update_icon()
+ overlays.Cut()
+
+ if(reagents.total_volume && (icon_state == "bottle-1" || icon_state == "bottle-2" || icon_state == "bottle-3" || icon_state == "bottle-4"))
+ var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]10")
+
+ var/percent = round((reagents.total_volume / volume) * 100)
+ switch(percent)
+ if(0 to 9) filling.icon_state = "[icon_state]--10"
+ if(10 to 24) filling.icon_state = "[icon_state]-10"
+ if(25 to 49) filling.icon_state = "[icon_state]-25"
+ if(50 to 74) filling.icon_state = "[icon_state]-50"
+ if(75 to 79) filling.icon_state = "[icon_state]-75"
+ if(80 to 90) filling.icon_state = "[icon_state]-80"
+ if(91 to INFINITY) filling.icon_state = "[icon_state]-100"
+
+ filling.color = reagents.get_color()
+ overlays += filling
+
+ if (!is_open_container())
+ var/image/lid = image(icon, src, "lid_bottle")
+ overlays += lid
/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline
@@ -86,12 +86,12 @@
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-3"
+
/obj/item/weapon/reagent_containers/glass/bottle/cyanide/New()
..()
reagents.add_reagent("cyanide", 30) //volume changed to match chloral
update_icon()
-
/obj/item/weapon/reagent_containers/glass/bottle/stoxin
name = "soporific bottle"
desc = "A small bottle of soporific. Just the fumes make you sleepy."
diff --git a/code/modules/reagents/reagent_containers/glass/bottle/robot.dm b/code/modules/reagents/reagent_containers/glass/bottle/robot.dm
index 3a95b3cd1c..2e2d5e4fdd 100644
--- a/code/modules/reagents/reagent_containers/glass/bottle/robot.dm
+++ b/code/modules/reagents/reagent_containers/glass/bottle/robot.dm
@@ -14,10 +14,10 @@
icon_state = "bottle-4"
reagent = "inaprovaline"
- New()
- ..()
- reagents.add_reagent("inaprovaline", 60)
- update_icon()
+/obj/item/weapon/reagent_containers/glass/bottle/robot/inaprovaline/New()
+ ..()
+ reagents.add_reagent("inaprovaline", 60)
+ update_icon()
/obj/item/weapon/reagent_containers/glass/bottle/robot/antitoxin
@@ -27,8 +27,8 @@
icon_state = "bottle-4"
reagent = "anti_toxin"
- New()
- ..()
- reagents.add_reagent("anti_toxin", 60)
- update_icon()
+/obj/item/weapon/reagent_containers/glass/bottle/robot/antitoxin/New()
+ ..()
+ reagents.add_reagent("anti_toxin", 60)
+ update_icon()
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index 7fc7707c28..89598898f8 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -12,82 +12,82 @@
slot_flags = SLOT_EARS
volume = 60
- New()
- ..()
- if(!icon_state)
- icon_state = "pill[rand(1, 20)]"
+/obj/item/weapon/reagent_containers/pill/New()
+ ..()
+ if(!icon_state)
+ icon_state = "pill[rand(1, 20)]"
- attack(mob/M as mob, mob/user as mob, def_zone)
- if(M == user)
-
- if(istype(M, /mob/living/carbon/human))
- var/mob/living/carbon/human/H = M
- if(!H.check_has_mouth())
- user << "Where do you intend to put \the [src]? You don't have a mouth!"
- return
- var/obj/item/blocked = H.check_mouth_coverage()
- if(blocked)
- user << "\The [blocked] is in the way!"
- return
-
- M << "You swallow \the [src]."
- M.drop_from_inventory(src) //icon update
- if(reagents.total_volume)
- reagents.trans_to_mob(M, reagents.total_volume, CHEM_INGEST)
- qdel(src)
- return 1
-
- else if(istype(M, /mob/living/carbon/human))
+/obj/item/weapon/reagent_containers/pill/attack(mob/M as mob, mob/user as mob, def_zone)
+ if(M == user)
+ if(istype(M, /mob/living/carbon/human))
var/mob/living/carbon/human/H = M
if(!H.check_has_mouth())
- user << "Where do you intend to put \the [src]? \The [H] doesn't have a mouth!"
+ user << "Where do you intend to put \the [src]? You don't have a mouth!"
return
var/obj/item/blocked = H.check_mouth_coverage()
if(blocked)
user << "\The [blocked] is in the way!"
return
- user.visible_message("[user] attempts to force [M] to swallow \the [src].")
+ M << "You swallow \the [src]."
+ M.drop_from_inventory(src) //icon update
+ if(reagents.total_volume)
+ reagents.trans_to_mob(M, reagents.total_volume, CHEM_INGEST)
+ qdel(src)
+ return 1
- if(!do_mob(user, M))
- return
+ else if(istype(M, /mob/living/carbon/human))
- user.drop_from_inventory(src) //icon update
- user.visible_message("[user] forces [M] to swallow \the [src].")
+ var/mob/living/carbon/human/H = M
+ if(!H.check_has_mouth())
+ user << "Where do you intend to put \the [src]? \The [H] doesn't have a mouth!"
+ return
+ var/obj/item/blocked = H.check_mouth_coverage()
+ if(blocked)
+ user << "\The [blocked] is in the way!"
+ return
- var/contained = reagentlist()
- M.attack_log += text("\[[time_stamp()]\] Has been fed [name] by [key_name(user)] Reagents: [contained]")
- user.attack_log += text("\[[time_stamp()]\] Fed [name] to [key_name(M)] Reagents: [contained]")
- msg_admin_attack("[key_name_admin(user)] fed [key_name_admin(M)] with [name] Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)")
+ user.visible_message("[user] attempts to force [M] to swallow \the [src].")
- if(reagents.total_volume)
- reagents.trans_to_mob(M, reagents.total_volume, CHEM_INGEST)
- qdel(src)
+ if(!do_mob(user, M))
+ return
- return 1
+ user.drop_from_inventory(src) //icon update
+ user.visible_message("[user] forces [M] to swallow \the [src].")
- return 0
+ var/contained = reagentlist()
+ M.attack_log += text("\[[time_stamp()]\] Has been fed [name] by [key_name(user)] Reagents: [contained]")
+ user.attack_log += text("\[[time_stamp()]\] Fed [name] to [key_name(M)] Reagents: [contained]")
+ msg_admin_attack("[key_name_admin(user)] fed [key_name_admin(M)] with [name] Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)")
- afterattack(obj/target, mob/user, proximity)
- if(!proximity) return
+ if(reagents.total_volume)
+ reagents.trans_to_mob(M, reagents.total_volume, CHEM_INGEST)
+ qdel(src)
- if(target.is_open_container() && target.reagents)
- if(!target.reagents.total_volume)
- user << "[target] is empty. Can't dissolve \the [src]."
- return
- user << "You dissolve \the [src] in [target]."
+ return 1
- user.attack_log += text("\[[time_stamp()]\] Spiked \a [target] with a pill. Reagents: [reagentlist()]")
- msg_admin_attack("[user.name] ([user.ckey]) spiked \a [target] with a pill. Reagents: [reagentlist()] (INTENT: [uppertext(user.a_intent)]) (JMP)")
+ return 0
- reagents.trans_to(target, reagents.total_volume)
- for(var/mob/O in viewers(2, user))
- O.show_message("[user] puts something in \the [target].", 1)
+/obj/item/weapon/reagent_containers/pill/afterattack(obj/target, mob/user, proximity)
+ if(!proximity) return
- qdel(src)
+ if(target.is_open_container() && target.reagents)
+ if(!target.reagents.total_volume)
+ user << "[target] is empty. Can't dissolve \the [src]."
+ return
+ user << "You dissolve \the [src] in [target]."
- return
+ user.attack_log += text("\[[time_stamp()]\] Spiked \a [target] with a pill. Reagents: [reagentlist()]")
+ msg_admin_attack("[user.name] ([user.ckey]) spiked \a [target] with a pill. Reagents: [reagentlist()] (INTENT: [uppertext(user.a_intent)]) (JMP)")
+
+ reagents.trans_to(target, reagents.total_volume)
+ for(var/mob/O in viewers(2, user))
+ O.show_message("[user] puts something in \the [target].", 1)
+
+ qdel(src)
+
+ return
////////////////////////////////////////////////////////////////////////////////
/// Pills. END
@@ -98,163 +98,199 @@
name = "Anti-toxins pill"
desc = "Neutralizes many common toxins."
icon_state = "pill17"
- New()
- ..()
- reagents.add_reagent("anti_toxin", 25)
+
+/obj/item/weapon/reagent_containers/pill/antitox/New()
+ ..()
+ reagents.add_reagent("anti_toxin", 25)
+
/obj/item/weapon/reagent_containers/pill/tox
name = "Toxins pill"
desc = "Highly toxic."
icon_state = "pill5"
- New()
- ..()
- reagents.add_reagent("toxin", 50)
+
+/obj/item/weapon/reagent_containers/pill/tox/New()
+ ..()
+ reagents.add_reagent("toxin", 50)
+
/obj/item/weapon/reagent_containers/pill/cyanide
name = "Cyanide pill"
desc = "Don't swallow this."
icon_state = "pill5"
- New()
- ..()
- reagents.add_reagent("cyanide", 50)
+
+/obj/item/weapon/reagent_containers/pill/cyanide/New()
+ ..()
+ reagents.add_reagent("cyanide", 50)
+
/obj/item/weapon/reagent_containers/pill/adminordrazine
name = "Adminordrazine pill"
desc = "It's magic. We don't have to explain it."
icon_state = "pill16"
- New()
- ..()
- reagents.add_reagent("adminordrazine", 50)
+
+/obj/item/weapon/reagent_containers/pill/adminordrazine/New()
+ ..()
+ reagents.add_reagent("adminordrazine", 50)
/obj/item/weapon/reagent_containers/pill/stox
name = "Sleeping pill"
desc = "Commonly used to treat insomnia."
icon_state = "pill8"
- New()
- ..()
- reagents.add_reagent("stoxin", 15)
+
+/obj/item/weapon/reagent_containers/pill/stox/New()
+ ..()
+ reagents.add_reagent("stoxin", 15)
+
/obj/item/weapon/reagent_containers/pill/kelotane
name = "Kelotane pill"
desc = "Used to treat burns."
icon_state = "pill11"
- New()
- ..()
- reagents.add_reagent("kelotane", 15)
+
+/obj/item/weapon/reagent_containers/pill/kelotane/New()
+ ..()
+ reagents.add_reagent("kelotane", 15)
+
/obj/item/weapon/reagent_containers/pill/paracetamol
name = "Paracetamol pill"
desc = "Tylenol! A painkiller for the ages. Chewables!"
icon_state = "pill8"
- New()
- ..()
- reagents.add_reagent("paracetamol", 15)
+
+/obj/item/weapon/reagent_containers/pill/paracetamol/New()
+ ..()
+ reagents.add_reagent("paracetamol", 15)
+
/obj/item/weapon/reagent_containers/pill/tramadol
name = "Tramadol pill"
desc = "A simple painkiller."
icon_state = "pill8"
- New()
- ..()
- reagents.add_reagent("tramadol", 15)
+
+/obj/item/weapon/reagent_containers/pill/tramadol/New()
+ ..()
+ reagents.add_reagent("tramadol", 15)
/obj/item/weapon/reagent_containers/pill/methylphenidate
name = "Methylphenidate pill"
desc = "Improves the ability to concentrate."
icon_state = "pill8"
- New()
- ..()
- reagents.add_reagent("methylphenidate", 15)
+
+/obj/item/weapon/reagent_containers/pill/methylphenidate/New()
+ ..()
+ reagents.add_reagent("methylphenidate", 15)
+
/obj/item/weapon/reagent_containers/pill/citalopram
name = "Citalopram pill"
desc = "Mild anti-depressant."
icon_state = "pill8"
- New()
- ..()
- reagents.add_reagent("citalopram", 15)
+
+/obj/item/weapon/reagent_containers/pill/citalopram/New()
+ ..()
+ reagents.add_reagent("citalopram", 15)
/obj/item/weapon/reagent_containers/pill/inaprovaline
name = "Inaprovaline pill"
desc = "Used to stabilize patients."
icon_state = "pill20"
- New()
- ..()
- reagents.add_reagent("inaprovaline", 30)
+
+/obj/item/weapon/reagent_containers/pill/inaprovaline/New()
+ ..()
+ reagents.add_reagent("inaprovaline", 30)
+
/obj/item/weapon/reagent_containers/pill/dexalin
name = "Dexalin pill"
desc = "Used to treat oxygen deprivation."
icon_state = "pill16"
- New()
- ..()
- reagents.add_reagent("dexalin", 15)
+
+/obj/item/weapon/reagent_containers/pill/dexalin/New()
+ ..()
+ reagents.add_reagent("dexalin", 15)
+
/obj/item/weapon/reagent_containers/pill/dexalin_plus
name = "Dexalin Plus pill"
desc = "Used to treat extreme oxygen deprivation."
icon_state = "pill8"
- New()
- ..()
- reagents.add_reagent("dexalinp", 15)
+
+/obj/item/weapon/reagent_containers/pill/dexalin_plus/New()
+ ..()
+ reagents.add_reagent("dexalinp", 15)
+
/obj/item/weapon/reagent_containers/pill/dermaline
name = "Dermaline pill"
desc = "Used to treat burn wounds."
icon_state = "pill12"
- New()
- ..()
- reagents.add_reagent("dermaline", 15)
+
+/obj/item/weapon/reagent_containers/pill/dermaline/New()
+ ..()
+ reagents.add_reagent("dermaline", 15)
+
/obj/item/weapon/reagent_containers/pill/dylovene
name = "Dylovene pill"
desc = "A broad-spectrum anti-toxin."
icon_state = "pill13"
- New()
- ..()
- reagents.add_reagent("anti_toxin", 15)
+
+/obj/item/weapon/reagent_containers/pill/dylovene/New()
+ ..()
+ reagents.add_reagent("anti_toxin", 15)
+
/obj/item/weapon/reagent_containers/pill/inaprovaline
name = "Inaprovaline pill"
desc = "Used to stabilize patients."
icon_state = "pill20"
- New()
- ..()
- reagents.add_reagent("inaprovaline", 30)
+
+/obj/item/weapon/reagent_containers/pill/inaprovaline/New()
+ ..()
+ reagents.add_reagent("inaprovaline", 30)
+
/obj/item/weapon/reagent_containers/pill/bicaridine
name = "Bicaridine pill"
desc = "Used to treat physical injuries."
icon_state = "pill18"
- New()
- ..()
- reagents.add_reagent("bicaridine", 20)
+
+/obj/item/weapon/reagent_containers/pill/bicaridine/New()
+ ..()
+ reagents.add_reagent("bicaridine", 20)
+
/obj/item/weapon/reagent_containers/pill/happy
name = "Happy pill"
desc = "Happy happy joy joy!"
icon_state = "pill18"
- New()
- ..()
- reagents.add_reagent("space_drugs", 15)
- reagents.add_reagent("sugar", 15)
+
+/obj/item/weapon/reagent_containers/pill/happy/New()
+ ..()
+ reagents.add_reagent("space_drugs", 15)
+ reagents.add_reagent("sugar", 15)
+
/obj/item/weapon/reagent_containers/pill/zoom
name = "Zoom pill"
desc = "Zoooom!"
icon_state = "pill18"
- New()
- ..()
- reagents.add_reagent("impedrezene", 10)
- reagents.add_reagent("synaptizine", 5)
- reagents.add_reagent("hyperzine", 5)
+
+/obj/item/weapon/reagent_containers/pill/zoom/New()
+ ..()
+ reagents.add_reagent("impedrezene", 10)
+ reagents.add_reagent("synaptizine", 5)
+ reagents.add_reagent("hyperzine", 5)
+
/obj/item/weapon/reagent_containers/pill/spaceacillin
name = "Spaceacillin pill"
desc = "Contains antiviral agents."
icon_state = "pill19"
- New()
- ..()
- reagents.add_reagent("spaceacillin", 15)
+
+/obj/item/weapon/reagent_containers/pill/spaceacillin/New()
+ ..()
+ reagents.add_reagent("spaceacillin", 15)
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index 741e9eccdd..7c291f1906 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -24,260 +24,258 @@
var/visible_name = "a syringe"
var/time = 30
- on_reagent_change()
- update_icon()
-
- pickup(mob/user)
- ..()
- update_icon()
-
- dropped(mob/user)
- ..()
- update_icon()
-
- attack_self(mob/user as mob)
-
- switch(mode)
- if(SYRINGE_DRAW)
- mode = SYRINGE_INJECT
- if(SYRINGE_INJECT)
- mode = SYRINGE_DRAW
- if(SYRINGE_BROKEN)
- return
- update_icon()
-
- attack_hand()
- ..()
- update_icon()
-
- attackby(obj/item/I as obj, mob/user as mob)
- return
-
- afterattack(obj/target, mob/user, proximity)
- if(!proximity || !target.reagents)
- return
-
- if(mode == SYRINGE_BROKEN)
- user << "This syringe is broken!"
- return
-
- if(user.a_intent == I_HURT && ismob(target))
- if((CLUMSY in user.mutations) && prob(50))
- target = user
- syringestab(target, user)
- return
-
-
- switch(mode)
- if(SYRINGE_DRAW)
-
- if(!reagents.get_free_space())
- user << "The syringe is full."
- mode = SYRINGE_INJECT
- return
-
- if(ismob(target))//Blood!
- if(reagents.has_reagent("blood"))
- user << "There is already a blood sample in this syringe."
- return
- if(istype(target, /mob/living/carbon))
- if(istype(target, /mob/living/carbon/slime))
- user << "You are unable to locate any blood."
- return
- var/amount = reagents.get_free_space()
- var/mob/living/carbon/T = target
- if(!T.dna)
- user << "You are unable to locate any blood. (To be specific, your target seems to be missing their DNA datum)."
- return
- if(NOCLONE in T.mutations) //target done been et, no more blood in him
- user << "You are unable to locate any blood."
- return
-
- var/datum/reagent/B
- if(istype(T, /mob/living/carbon/human))
- var/mob/living/carbon/human/H = T
- if(H.species && !H.should_have_organ(O_HEART))
- H.reagents.trans_to_obj(src, amount)
- else
- B = T.take_blood(src, amount)
- else
- B = T.take_blood(src,amount)
-
- if (B)
- reagents.reagent_list += B
- reagents.update_total()
- on_reagent_change()
- reagents.handle_reactions()
- user << "You take a blood sample from [target]."
- for(var/mob/O in viewers(4, user))
- O.show_message("[user] takes a blood sample from [target].", 1)
-
- else //if not mob
- if(!target.reagents.total_volume)
- user << "[target] is empty."
- return
-
- if(!target.is_open_container() && !istype(target, /obj/structure/reagent_dispensers) && !istype(target, /obj/item/slime_extract))
- user << "You cannot directly remove reagents from this object."
- return
-
- var/trans = target.reagents.trans_to_obj(src, amount_per_transfer_from_this)
- user << "You fill the syringe with [trans] units of the solution."
- update_icon()
-
- if(!reagents.get_free_space())
- mode = SYRINGE_INJECT
- update_icon()
-
- if(SYRINGE_INJECT)
- if(!reagents.total_volume)
- user << "The syringe is empty."
- mode = SYRINGE_DRAW
- return
- if(istype(target, /obj/item/weapon/implantcase/chem))
- return
-
- if(!target.is_open_container() && !ismob(target) && !istype(target, /obj/item/weapon/reagent_containers/food) && !istype(target, /obj/item/slime_extract) && !istype(target, /obj/item/clothing/mask/smokable/cigarette) && !istype(target, /obj/item/weapon/storage/fancy/cigarettes))
- user << "You cannot directly fill this object."
- return
- if(!target.reagents.get_free_space())
- user << "[target] is full."
- return
-
- var/mob/living/carbon/human/H = target
- if(istype(H))
- var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting)
- if(!affected)
- user << "\The [H] is missing that limb!"
- return
- else if(affected.status & ORGAN_ROBOT)
- user << "You cannot inject a robotic limb."
- return
-
- if(ismob(target) && target != user)
-
- var/injtime = time //Injecting through a hardsuit takes longer due to needing to find a port.
-
- if(istype(H))
- if(H.wear_suit)
- if(istype(H.wear_suit, /obj/item/clothing/suit/space))
- injtime = injtime * 2
- else if(!H.can_inject(user, 1))
- return
-
- else if(isliving(target))
-
- var/mob/living/M = target
- if(!M.can_inject(user, 1))
- return
-
- if(injtime == time)
- user.visible_message("[user] is trying to inject [target] with [visible_name]!")
- else
- user.visible_message("[user] begins hunting for an injection port on [target]'s suit!")
-
- if(!do_mob(user, target, injtime))
- return
-
- user.visible_message("[user] injects [target] with the syringe!")
-
- var/trans
- if(ismob(target))
- var/contained = reagentlist()
- trans = reagents.trans_to_mob(target, amount_per_transfer_from_this, CHEM_BLOOD)
- admin_inject_log(user, target, src, contained, trans)
- else
- trans = reagents.trans_to(target, amount_per_transfer_from_this)
- user << "You inject [trans] units of the solution. The syringe now contains [src.reagents.total_volume] units."
- if (reagents.total_volume <= 0 && mode == SYRINGE_INJECT)
- mode = SYRINGE_DRAW
- update_icon()
-
- return
-
+/obj/item/weapon/reagent_containers/syringe/on_reagent_change()
update_icon()
- overlays.Cut()
- if(mode == SYRINGE_BROKEN)
- icon_state = "broken"
+/obj/item/weapon/reagent_containers/syringe/pickup(mob/user)
+ ..()
+ update_icon()
+
+/obj/item/weapon/reagent_containers/syringe/dropped(mob/user)
+ ..()
+ update_icon()
+
+/obj/item/weapon/reagent_containers/syringe/attack_self(mob/user as mob)
+ switch(mode)
+ if(SYRINGE_DRAW)
+ mode = SYRINGE_INJECT
+ if(SYRINGE_INJECT)
+ mode = SYRINGE_DRAW
+ if(SYRINGE_BROKEN)
return
+ update_icon()
- var/rounded_vol = round(reagents.total_volume, round(reagents.maximum_volume / 3))
- if(ismob(loc))
- var/injoverlay
- switch(mode)
- if (SYRINGE_DRAW)
- injoverlay = "draw"
- if (SYRINGE_INJECT)
- injoverlay = "inject"
- overlays += injoverlay
- icon_state = "[rounded_vol]"
- item_state = "syringe_[rounded_vol]"
+/obj/item/weapon/reagent_containers/syringe/attack_hand()
+ ..()
+ update_icon()
- if(reagents.total_volume)
- filling = image('icons/obj/reagentfillings.dmi', src, "syringe10")
+/obj/item/weapon/reagent_containers/syringe/attackby(obj/item/I as obj, mob/user as mob)
+ return
- filling.icon_state = "syringe[rounded_vol]"
+/obj/item/weapon/reagent_containers/syringe/afterattack(obj/target, mob/user, proximity)
+ if(!proximity || !target.reagents)
+ return
- filling.color = reagents.get_color()
- overlays += filling
+ if(mode == SYRINGE_BROKEN)
+ user << "This syringe is broken!"
+ return
- proc/syringestab(mob/living/carbon/target as mob, mob/living/carbon/user as mob)
+ if(user.a_intent == I_HURT && ismob(target))
+ if((CLUMSY in user.mutations) && prob(50))
+ target = user
+ syringestab(target, user)
+ return
- if(istype(target, /mob/living/carbon/human))
+
+ switch(mode)
+ if(SYRINGE_DRAW)
+
+ if(!reagents.get_free_space())
+ user << "The syringe is full."
+ mode = SYRINGE_INJECT
+ return
+
+ if(ismob(target))//Blood!
+ if(reagents.has_reagent("blood"))
+ user << "There is already a blood sample in this syringe."
+ return
+ if(istype(target, /mob/living/carbon))
+ if(istype(target, /mob/living/carbon/slime))
+ user << "You are unable to locate any blood."
+ return
+ var/amount = reagents.get_free_space()
+ var/mob/living/carbon/T = target
+ if(!T.dna)
+ user << "You are unable to locate any blood. (To be specific, your target seems to be missing their DNA datum)."
+ return
+ if(NOCLONE in T.mutations) //target done been et, no more blood in him
+ user << "You are unable to locate any blood."
+ return
+
+ var/datum/reagent/B
+ if(istype(T, /mob/living/carbon/human))
+ var/mob/living/carbon/human/H = T
+ if(H.species && !H.should_have_organ(O_HEART))
+ H.reagents.trans_to_obj(src, amount)
+ else
+ B = T.take_blood(src, amount)
+ else
+ B = T.take_blood(src,amount)
+
+ if (B)
+ reagents.reagent_list += B
+ reagents.update_total()
+ on_reagent_change()
+ reagents.handle_reactions()
+ user << "You take a blood sample from [target]."
+ for(var/mob/O in viewers(4, user))
+ O.show_message("[user] takes a blood sample from [target].", 1)
+
+ else //if not mob
+ if(!target.reagents.total_volume)
+ user << "[target] is empty."
+ return
+
+ if(!target.is_open_container() && !istype(target, /obj/structure/reagent_dispensers) && !istype(target, /obj/item/slime_extract))
+ user << "You cannot directly remove reagents from this object."
+ return
+
+ var/trans = target.reagents.trans_to_obj(src, amount_per_transfer_from_this)
+ user << "You fill the syringe with [trans] units of the solution."
+ update_icon()
+
+ if(!reagents.get_free_space())
+ mode = SYRINGE_INJECT
+ update_icon()
+
+ if(SYRINGE_INJECT)
+ if(!reagents.total_volume)
+ user << "The syringe is empty."
+ mode = SYRINGE_DRAW
+ return
+ if(istype(target, /obj/item/weapon/implantcase/chem))
+ return
+
+ if(!target.is_open_container() && !ismob(target) && !istype(target, /obj/item/weapon/reagent_containers/food) && !istype(target, /obj/item/slime_extract) && !istype(target, /obj/item/clothing/mask/smokable/cigarette) && !istype(target, /obj/item/weapon/storage/fancy/cigarettes))
+ user << "You cannot directly fill this object."
+ return
+ if(!target.reagents.get_free_space())
+ user << "[target] is full."
+ return
var/mob/living/carbon/human/H = target
+ if(istype(H))
+ var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting)
+ if(!affected)
+ user << "\The [H] is missing that limb!"
+ return
+ else if(affected.status & ORGAN_ROBOT)
+ user << "You cannot inject a robotic limb."
+ return
- var/target_zone = ran_zone(check_zone(user.zone_sel.selecting, target))
- var/obj/item/organ/external/affecting = H.get_organ(target_zone)
+ if(ismob(target) && target != user)
- if (!affecting || affecting.is_stump())
- user << "They are missing that limb!"
- return
+ var/injtime = time //Injecting through a hardsuit takes longer due to needing to find a port.
- var/hit_area = affecting.name
+ if(istype(H))
+ if(H.wear_suit)
+ if(istype(H.wear_suit, /obj/item/clothing/suit/space))
+ injtime = injtime * 2
+ else if(!H.can_inject(user, 1))
+ return
- if((user != target) && H.check_shields(7, src, user, "\the [src]"))
- return
+ else if(isliving(target))
- if (target != user && H.getarmor(target_zone, "melee") > 5 && prob(50))
- for(var/mob/O in viewers(world.view, user))
- O.show_message(text("\red [user] tries to stab [target] in \the [hit_area] with [src.name], but the attack is deflected by armor!"), 1)
- user.remove_from_mob(src)
- qdel(src)
+ var/mob/living/M = target
+ if(!M.can_inject(user, 1))
+ return
- user.attack_log += "\[[time_stamp()]\] Attacked [target.name] ([target.ckey]) with \the [src] (INTENT: HARM)."
- target.attack_log += "\[[time_stamp()]\] Attacked by [user.name] ([user.ckey]) with [src.name] (INTENT: HARM)."
- msg_admin_attack("[key_name_admin(user)] attacked [key_name_admin(target)] with [src.name] (INTENT: HARM) (JMP)")
+ if(injtime == time)
+ user.visible_message("[user] is trying to inject [target] with [visible_name]!")
+ else
+ user.visible_message("[user] begins hunting for an injection port on [target]'s suit!")
- return
+ if(!do_mob(user, target, injtime))
+ return
- user.visible_message("[user] stabs [target] in \the [hit_area] with [src.name]!")
+ user.visible_message("[user] injects [target] with the syringe!")
- if(affecting.take_damage(3))
- H.UpdateDamageIcon()
+ var/trans
+ if(ismob(target))
+ var/contained = reagentlist()
+ trans = reagents.trans_to_mob(target, amount_per_transfer_from_this, CHEM_BLOOD)
+ admin_inject_log(user, target, src, contained, trans)
+ else
+ trans = reagents.trans_to(target, amount_per_transfer_from_this)
+ user << "You inject [trans] units of the solution. The syringe now contains [src.reagents.total_volume] units."
+ if (reagents.total_volume <= 0 && mode == SYRINGE_INJECT)
+ mode = SYRINGE_DRAW
+ update_icon()
- else
- user.visible_message("[user] stabs [target] with [src.name]!")
- target.take_organ_damage(3)// 7 is the same as crowbar punch
+ return
+
+/obj/item/weapon/reagent_containers/syringe/update_icon()
+ overlays.Cut()
+
+ if(mode == SYRINGE_BROKEN)
+ icon_state = "broken"
+ return
+
+ var/rounded_vol = round(reagents.total_volume, round(reagents.maximum_volume / 3))
+ if(ismob(loc))
+ var/injoverlay
+ switch(mode)
+ if (SYRINGE_DRAW)
+ injoverlay = "draw"
+ if (SYRINGE_INJECT)
+ injoverlay = "inject"
+ overlays += injoverlay
+ icon_state = "[rounded_vol]"
+ item_state = "syringe_[rounded_vol]"
+
+ if(reagents.total_volume)
+ filling = image('icons/obj/reagentfillings.dmi', src, "syringe10")
+
+ filling.icon_state = "syringe[rounded_vol]"
+
+ filling.color = reagents.get_color()
+ overlays += filling
+
+/obj/item/weapon/reagent_containers/syringe/proc/syringestab(mob/living/carbon/target as mob, mob/living/carbon/user as mob)
+ if(istype(target, /mob/living/carbon/human))
+
+ var/mob/living/carbon/human/H = target
+
+ var/target_zone = ran_zone(check_zone(user.zone_sel.selecting, target))
+ var/obj/item/organ/external/affecting = H.get_organ(target_zone)
+
+ if (!affecting || affecting.is_stump())
+ user << "They are missing that limb!"
+ return
+
+ var/hit_area = affecting.name
+
+ if((user != target) && H.check_shields(7, src, user, "\the [src]"))
+ return
+
+ if (target != user && H.getarmor(target_zone, "melee") > 5 && prob(50))
+ for(var/mob/O in viewers(world.view, user))
+ O.show_message(text("\red [user] tries to stab [target] in \the [hit_area] with [src.name], but the attack is deflected by armor!"), 1)
+ user.remove_from_mob(src)
+ qdel(src)
+
+ user.attack_log += "\[[time_stamp()]\] Attacked [target.name] ([target.ckey]) with \the [src] (INTENT: HARM)."
+ target.attack_log += "\[[time_stamp()]\] Attacked by [user.name] ([user.ckey]) with [src.name] (INTENT: HARM)."
+ msg_admin_attack("[key_name_admin(user)] attacked [key_name_admin(target)] with [src.name] (INTENT: HARM) (JMP)")
+
+ return
+
+ user.visible_message("[user] stabs [target] in \the [hit_area] with [src.name]!")
+
+ if(affecting.take_damage(3))
+ H.UpdateDamageIcon()
+
+ else
+ user.visible_message("[user] stabs [target] with [src.name]!")
+ target.take_organ_damage(3)// 7 is the same as crowbar punch
- var/syringestab_amount_transferred = rand(0, (reagents.total_volume - 5)) //nerfed by popular demand
- var/contained_reagents = reagents.get_reagents()
- var/trans = reagents.trans_to_mob(target, syringestab_amount_transferred, CHEM_BLOOD)
- if(isnull(trans)) trans = 0
- admin_inject_log(user, target, src, contained_reagents, trans, violent=1)
- break_syringe(target, user)
+ var/syringestab_amount_transferred = rand(0, (reagents.total_volume - 5)) //nerfed by popular demand
+ var/contained_reagents = reagents.get_reagents()
+ var/trans = reagents.trans_to_mob(target, syringestab_amount_transferred, CHEM_BLOOD)
+ if(isnull(trans)) trans = 0
+ admin_inject_log(user, target, src, contained_reagents, trans, violent=1)
+ break_syringe(target, user)
- proc/break_syringe(mob/living/carbon/target, mob/living/carbon/user)
- desc += " It is broken."
- mode = SYRINGE_BROKEN
- if(target)
- add_blood(target)
- if(user)
- add_fingerprint(user)
- update_icon()
+/obj/item/weapon/reagent_containers/syringe/proc/break_syringe(mob/living/carbon/target, mob/living/carbon/user)
+ desc += " It is broken."
+ mode = SYRINGE_BROKEN
+ if(target)
+ add_blood(target)
+ if(user)
+ add_fingerprint(user)
+ update_icon()
/obj/item/weapon/reagent_containers/syringe/ld50_syringe
name = "Lethal Injection Syringe"
@@ -287,13 +285,13 @@
visible_name = "a giant syringe"
time = 300
- afterattack(obj/target, mob/user, flag)
- if(mode == SYRINGE_DRAW && ismob(target)) // No drawing 50 units of blood at once
- user << "This needle isn't designed for drawing blood."
- return
- if(user.a_intent == "hurt" && ismob(target)) // No instant injecting
- user << "This syringe is too big to stab someone with it."
- ..()
+/obj/item/weapon/reagent_containers/syringe/ld50_syringe/afterattack(obj/target, mob/user, flag)
+ if(mode == SYRINGE_DRAW && ismob(target)) // No drawing 50 units of blood at once
+ user << "This needle isn't designed for drawing blood."
+ return
+ if(user.a_intent == "hurt" && ismob(target)) // No instant injecting
+ user << "This syringe is too big to stab someone with it."
+ ..()
////////////////////////////////////////////////////////////////////////////////
/// Syringes. END
@@ -302,44 +300,47 @@
/obj/item/weapon/reagent_containers/syringe/inaprovaline
name = "Syringe (inaprovaline)"
desc = "Contains inaprovaline - used to stabilize patients."
- New()
- ..()
- reagents.add_reagent("inaprovaline", 15)
- mode = SYRINGE_INJECT
- update_icon()
+
+/obj/item/weapon/reagent_containers/syringe/inaprovaline/New()
+ ..()
+ reagents.add_reagent("inaprovaline", 15)
+ mode = SYRINGE_INJECT
+ update_icon()
/obj/item/weapon/reagent_containers/syringe/antitoxin
name = "Syringe (anti-toxin)"
desc = "Contains anti-toxins."
- New()
- ..()
- reagents.add_reagent("anti_toxin", 15)
- mode = SYRINGE_INJECT
- update_icon()
+
+/obj/item/weapon/reagent_containers/syringe/antitoxin/New()
+ ..()
+ reagents.add_reagent("anti_toxin", 15)
+ mode = SYRINGE_INJECT
+ update_icon()
/obj/item/weapon/reagent_containers/syringe/antiviral
name = "Syringe (spaceacillin)"
desc = "Contains antiviral agents."
- New()
- ..()
- reagents.add_reagent("spaceacillin", 15)
- mode = SYRINGE_INJECT
- update_icon()
+
+/obj/item/weapon/reagent_containers/syringe/antiviral/New()
+ ..()
+ reagents.add_reagent("spaceacillin", 15)
+ mode = SYRINGE_INJECT
+ update_icon()
/obj/item/weapon/reagent_containers/syringe/drugs
name = "Syringe (drugs)"
desc = "Contains aggressive drugs meant for torture."
- New()
- ..()
- reagents.add_reagent("space_drugs", 5)
- reagents.add_reagent("mindbreaker", 5)
- reagents.add_reagent("cryptobiolin", 5)
- mode = SYRINGE_INJECT
- update_icon()
-/obj/item/weapon/reagent_containers/syringe/ld50_syringe/choral
- New()
- ..()
- reagents.add_reagent("chloralhydrate", 50)
- mode = SYRINGE_INJECT
- update_icon()
+/obj/item/weapon/reagent_containers/syringe/drugs/New()
+ ..()
+ reagents.add_reagent("space_drugs", 5)
+ reagents.add_reagent("mindbreaker", 5)
+ reagents.add_reagent("cryptobiolin", 5)
+ mode = SYRINGE_INJECT
+ update_icon()
+
+/obj/item/weapon/reagent_containers/syringe/ld50_syringe/choral/New()
+ ..()
+ reagents.add_reagent("chloralhydrate", 50)
+ mode = SYRINGE_INJECT
+ update_icon()
diff --git a/html/changelogs/yoshax - shotglasses.yml b/html/changelogs/yoshax - shotglasses.yml
new file mode 100644
index 0000000000..5944d8f5c6
--- /dev/null
+++ b/html/changelogs/yoshax - shotglasses.yml
@@ -0,0 +1,36 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# wip (For works in progress)
+# tweak
+# soundadd
+# sounddel
+# rscadd (general adding of nice things)
+# rscdel (general deleting of nice things)
+# imageadd
+# imagedel
+# maptweak
+# spellcheck (typo fixes)
+# experiment
+#################################
+
+# Your name.
+author: Yoshax
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - rscadd: "Added shotglasses. These can contain 10 units. They have their whole contents swalloed in one gulp. They can be produced in the autolathe or found in the booze vending machine in the bar."
diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi
index a85c640d99..24dbb10edc 100644
Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ
diff --git a/icons/obj/reagentfillings.dmi b/icons/obj/reagentfillings.dmi
index 4799249dfc..d6f6ed1707 100644
Binary files a/icons/obj/reagentfillings.dmi and b/icons/obj/reagentfillings.dmi differ