Just deleted about 400 bot accounts and a bunch of spam. To mitigate this in the future, we've enabled reCaptcha on signup. Let me know if someone got caught in the crossfire.

Commit 7cdc5cbd authored by d3athrow's avatar d3athrow
Browse files

Merge pull request #3978 from NigglyWiggly/Cafe-Stuff-2-Cafe-Harder

More Cafe stuff
parents a3da7b07 777ec3e8
......@@ -1268,6 +1268,7 @@
#include "code\modules\mob\living\simple_animal\borer.dm"
#include "code\modules\mob\living\simple_animal\constructs.dm"
#include "code\modules\mob\living\simple_animal\parrot.dm"
#include "code\modules\mob\living\simple_animal\puddi.dm"
#include "code\modules\mob\living\simple_animal\shade.dm"
#include "code\modules\mob\living\simple_animal\simple_animal.dm"
#include "code\modules\mob\living\simple_animal\vox.dm"
......
......@@ -1400,6 +1400,33 @@
reagents = list("milk" = 15, "sodiumchloride" = 5)
result = /obj/item/weapon/reagent_containers/food/snacks/gigapuddi/anger
//LIVING PUDDI
//This is a terrible idea.
/datum/recipe/livingpuddi/happy
items = list(
/obj/item/weapon/reagent_containers/food/snacks/gigapuddi/happy,
/obj/item/slime_extract/grey
)
result = /mob/living/simple_animal/puddi/happy
/datum/recipe/livingpuddi/anger
items = list(
/obj/item/weapon/reagent_containers/food/snacks/gigapuddi/anger,
/obj/item/slime_extract/grey
)
result = /mob/living/simple_animal/puddi/anger
/datum/recipe/livingpuddi
items = list(
/obj/item/weapon/reagent_containers/food/snacks/gigapuddi,
/obj/item/slime_extract/grey
)
result = /mob/living/simple_animal/puddi
// END OF LIVING PUDDI SHIT THAT PROBABLY WON'T WORK
/datum/recipe/flan
reagents = list("milk" = 5)
items = list(
......@@ -1418,6 +1445,10 @@
reagents = list("rice" = 5, "ketchup" = 5, "sugar" = 5)
result = /obj/item/weapon/reagent_containers/food/snacks/omurice/heart
/datum/recipe/omurice/face
reagents = list("rice" = 5, "ketchup" = 5, "sodiumchloride" = 5)
result = /obj/item/weapon/reagent_containers/food/snacks/omurice/face
/datum/recipe/bluespace
reagents = list("milk" = 5, "flour" = 5)
items = list(
......@@ -1470,6 +1501,38 @@
)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pumpkinbread
/datum/recipe/corndog
reagents = list("flour" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/sausage,
/obj/item/weapon/reagent_containers/food/snacks/grown/corn)
result = /obj/item/weapon/reagent_containers/food/snacks/corndog
/datum/recipe/cornydog
items = list(
/obj/item/weapon/reagent_containers/food/snacks/grown/corn,
/obj/item/weapon/reagent_containers/food/snacks/meat/corgi,
/obj/item/stack/rods)
result = /obj/item/weapon/reagent_containers/food/snacks/cornydog
/datum/recipe/higashikata
reagents = list("cream" = 20, "watermelonjuice" = 10, "slimejelly" = 10, "ice" = 20, "milk" = 10)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/watermelonslice,
/obj/item/weapon/reagent_containers/food/snacks/watermelonslice,
/obj/item/weapon/reagent_containers/food/snacks/watermelonslice,
/obj/item/weapon/reagent_containers/food/snacks/watermelonslice,
/obj/item/weapon/reagent_containers/food/snacks/watermelonslice,
/obj/item/weapon/reagent_containers/food/snacks/grown/corn
)
result = /obj/item/weapon/reagent_containers/food/snacks/higashikata
/datum/recipe/sundae
reagents = list("cream" = 10, "ice" = 10, "milk" = 5)
items = list(/obj/item/weapon/reagent_containers/food/snacks/chocolatebar)
result = /obj/item/weapon/reagent_containers/food/snacks/sundae
// Currently Disabled //////////////////////////////////////////
/*
......
/mob/living/simple_animal/puddi
name = "Living Puddi"
desc = "It's jigglier than usual!"
icon_state = "livingpuddi"
icon_living = "livingpuddi"
icon_dead = "livingpuddi-dead"
health = 30
maxHealth = 30
speak = list("Puddi!")
speak_emote = list("shouts")
emote_hear = list("shouts")
emote_see = list("shouts")
speak_chance = 1
turns_per_move = 10
response_help = "pats"
response_disarm = "squishes"
response_harm = "slaps"
/mob/living/simple_animal/puddi/happy
icon_state = "livingpuddi-happy"
icon_living = "livingpuddi-happy"
icon_dead = "livingpuddi-happy-dead"
/mob/living/simple_animal/puddi/anger
icon_state = "livingpuddi-anger"
icon_living = "livingpuddi-anger"
icon_dead = "livingpuddi-anger-dead"
speak = list("PUDDI!")
response_harm = "stomps"
\ No newline at end of file
......@@ -289,7 +289,7 @@ USE THIS CHEMISTRY DISPENSER FOR MAPS SO THEY START AT 100 ENERGY
/obj/machinery/chem_dispenser/booze_dispenser
name = "Booze Dispenser"
icon_state = "booze_dispenser"
dispensable_reagents = list("beer", "whiskey", "tequila", "vodka", "vermouth", "rum", "cognac", "wine", "kahlua", "ale", "ice")
dispensable_reagents = list("beer", "whiskey", "tequila", "vodka", "vermouth", "rum", "cognac", "wine", "kahlua", "ale", "ice", "water", "gin", "sodawater", "cola", "cream","tomatojuice","orangejuice","limejuice","tonic")
/obj/machinery/chem_dispenser/booze_dispenser/mapping
max_energy = 100
......
......@@ -4590,6 +4590,11 @@ var/global/list/chifir_doesnt_remove=list(
id = "plasmatea"
description = "Probably not the safest beverage."
/datum/reagent/drink/tea/greytea
name = "Tide"
id = "greytea"
description = "This probably shouldn't even be considered tea..."
/datum/reagent/drink/coffee/espresso
name = "Espresso"
id = "espresso"
......
......@@ -2537,4 +2537,10 @@ datum
id = "tank"
result = "etank"
required_reagents = list("coffee" = 1, "iron" = 1, "lithium" = 1, "fuel" = 1, "aluminum" = 1)
result_amount = 5
\ No newline at end of file
result_amount = 5
greytea
name = "Tide"
id = "greytea"
result = "greytea"
required_reagents = list("water" = 5, "fuel" = 5)
\ No newline at end of file
......@@ -605,6 +605,10 @@
icon_state = "etank"
name = "Recharger"
desc = "Helps you get back on your feet after a long day of robot maintenance. Can also be used as a substitute for motor oil."
if("greytea")
icon_state = "greytide"
name = "Tide"
desc = "This probably shouldn't be considered tea..."
......
......@@ -3279,6 +3279,9 @@
/obj/item/weapon/reagent_containers/food/snacks/omurice/heart
icon_state = "omuriceheart"
/obj/item/weapon/reagent_containers/food/snacks/omurice/face
icon_state = "omuriceface"
/obj/item/weapon/reagent_containers/food/snacks/muffin/bluespace
name = "Bluespace-berry Muffin"
desc = "Just like a normal blueberry muffin, except with completely unnecessary floaty things!"
......@@ -3350,6 +3353,25 @@
icon_state = "pumpkinbreadslice"
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/corndog
name = "Corndog"
desc = "Battered hotdog on a stick!"
icon_state = "corndog"
New()
..()
reagents.add_reagent("nutriment", 5)
bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/cornydog
name = "CORNY DOG"
desc = "This is just ridiculous."
icon_state = "cornydog"
trash = /obj/item/stack/rods //no fun allowed
New()
..()
reagents.add_reagent("nutriment", 15)
bitesize = 5
////////////////SLIDERS////////////////
/obj/item/weapon/reagent_containers/food/snacks/slider
......@@ -3438,3 +3460,26 @@
////////////////SLIDERS END////////////////
/obj/item/weapon/reagent_containers/food/snacks/higashikata
name = "Higashikata Special"
desc = "9 layer parfait, very expensive."
icon_state = "higashikata"
New()
..()
reagents.add_reagent("nutriment", 10)
reagents.add_reagent("sugar", 10)
reagents.add_reagent("ice", 10)
reagents.add_reagent("melonjuice", 5)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/sundae
name = "Sundae"
desc = "A colorful ice cream treat."
icon_state = "sundae"
New()
..()
reagents.add_reagent("nutriment", 5)
reagents.add_reagent("sugar", 5)
reagents.add_reagent("ice", 5)
bitesize = 3
No preview for this file type
No preview for this file type
No preview for this file type
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment