shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into TGUI-4

Browse Source
This commit is contained in:
Letter N
2020-08-06 18:26:04 +08:00
parent 8f0f30f6f7 32805fc7c2
commit 333ca2cc7b
222 changed files with 2630 additions and 1031 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/drinks/drinks.dm
+25
View File
@@ -299,6 +299,31 @@
desc = "An insult to Duke Purple is an insult to the Space Queen! Any proper gentleman will fight you, if you sully this tea."
list_reagents = list(/datum/reagent/consumable/tea = 30)
/obj/item/reagent_containers/food/drinks/mug/tea/red
name = "Dutchess Red tea"
icon_state = "tea"
desc = "Duchess Red's personal blend of red tea leaves and hot water. Great addition to any meal."
list_reagents = list(/datum/reagent/consumable/tea/red = 30)
/obj/item/reagent_containers/food/drinks/mug/tea/green
name = "Prince Green tea"
icon_state = "tea"
desc = "Prince Green's brew of tea. The blend may be different from time to time, but Prince Green swears by it!"
list_reagents = list(/datum/reagent/consumable/tea/green = 30)
/obj/item/reagent_containers/food/drinks/mug/tea/forest
name = "Royal Forest tea"
icon_state = "tea"
desc = "Tea fit for anyone with a sweet tooth like Royal Forest."
list_reagents = list(/datum/reagent/consumable/tea/forest = 30)
/obj/item/reagent_containers/food/drinks/mug/tea/mush
name = "Rebel Mush tea"
icon_state = "tea"
desc = "Rebel Mush, a hallucinogenic tea to help people find their inner self."
list_reagents = list(/datum/reagent/consumable/tea/mush = 30)
/obj/item/reagent_containers/food/drinks/mug/coco
name = "Dutch hot coco"
desc = "Made in Space South America."
code/modules/food_and_drinks/drinks/drinks/bottle.dm
+1 -1
View File
@@ -87,7 +87,7 @@
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("stabbed", "slashed", "attacked")
var/icon/broken_outline = icon('icons/obj/drinks.dmi', "broken")
sharpness = IS_SHARP
sharpness = SHARP_EDGED
/obj/item/broken_bottle/Initialize()
. = ..()
code/modules/food_and_drinks/food/snacks.dm
+2 -14
View File
@@ -249,21 +249,9 @@ All foods are distributed among various categories. Use common sense.
to_chat(user, "<span class='warning'>You cannot slice [src] here! You need a table or at least a tray.</span>")
return FALSE
var/slices_lost = 0
if (accuracy >= IS_SHARP_ACCURATE)
user.visible_message( \
"[user] slices [src].", \
"<span class='notice'>You slice [src].</span>" \
)
else
user.visible_message( \
"[user] inaccurately slices [src] with [W]!", \
"<span class='notice'>You inaccurately slice [src] with your [W]!</span>" \
)
slices_lost = rand(1,min(1,round(slices_num/2)))
user.visible_message("[user] slices [src].", "<span class='notice'>You slice [src].</span>")
var/reagents_per_slice = reagents.total_volume/slices_num
for(var/i=1 to (slices_num-slices_lost))
for(var/i=1 to slices_num)
var/obj/item/reagent_containers/food/snacks/slice = new slice_path (loc)
initialize_slice(slice, reagents_per_slice)
qdel(src)
code/modules/food_and_drinks/recipes/drinks_recipes.dm
+70 -25
View File
@@ -18,12 +18,6 @@
results = list(/datum/reagent/consumable/ethanol/bilk = 2)
required_reagents = list(/datum/reagent/consumable/milk = 1, /datum/reagent/consumable/ethanol/beer = 1)
/datum/chemical_reaction/icetea
name = "Iced Tea"
id = /datum/reagent/consumable/icetea
results = list(/datum/reagent/consumable/icetea = 4)
required_reagents = list(/datum/reagent/consumable/ice = 1, /datum/reagent/consumable/tea = 3)
/datum/chemical_reaction/icecoffee
name = "Iced Coffee"
id = /datum/reagent/consumable/icecoffee
@@ -581,13 +575,6 @@
required_reagents = list(/datum/reagent/consumable/lemonjuice = 2, /datum/reagent/water = 2, /datum/reagent/consumable/sugar = 1, /datum/reagent/consumable/ice = 1)
mix_message = "You're suddenly reminded of home."
/datum/chemical_reaction/arnold_palmer
name = "Arnold Palmer"
id = /datum/reagent/consumable/tea/arnold_palmer
results = list(/datum/reagent/consumable/tea/arnold_palmer = 2)
required_reagents = list(/datum/reagent/consumable/tea = 1, /datum/reagent/consumable/lemonade = 1)
mix_message = "The smells of fresh green grass and sand traps waft through the air as the mixture turns a friendly yellow-orange."
/datum/chemical_reaction/chocolate_milk
name = "chocolate milk"
id = /datum/reagent/consumable/milk/chocolate_milk
@@ -756,12 +743,6 @@
results = list(/datum/reagent/consumable/pinkmilk = 2)
required_reagents = list(/datum/reagent/consumable/strawberryjuice = 1, /datum/reagent/consumable/milk = 1)
/datum/chemical_reaction/pinktea
name = "Strawberry Tea"
id = /datum/reagent/consumable/pinktea
results = list(/datum/reagent/consumable/pinktea = 5)
required_reagents = list(/datum/reagent/consumable/strawberryjuice = 1, /datum/reagent/consumable/tea/arnold_palmer = 1, /datum/reagent/consumable/sugar = 1)
/datum/chemical_reaction/blank_paper
name = "Blank Paper"
id = /datum/reagent/consumable/ethanol/blank_paper
@@ -903,12 +884,6 @@
results = list(/datum/reagent/consumable/ethanol/mauna_loa = 5)
required_reagents = list(/datum/reagent/consumable/capsaicin = 2, /datum/reagent/consumable/ethanol/kahlua = 1, /datum/reagent/consumable/ethanol/bahama_mama = 2)
/datum/chemical_reaction/catnip_tea
name = "Catnip Tea"
id = /datum/reagent/consumable/catnip_tea
results = list(/datum/reagent/consumable/catnip_tea = 3)
required_reagents = list(/datum/reagent/consumable/tea = 5, /datum/reagent/pax/catnip = 2)
/datum/chemical_reaction/commander_and_chief
name = "Commander and Chief"
id = /datum/reagent/consumable/ethanol/commander_and_chief
@@ -916,6 +891,76 @@
required_reagents = list(/datum/reagent/consumable/ethanol/alliescocktail = 50, /datum/reagent/consumable/ethanol/champagne = 20, /datum/reagent/consumable/doctor_delight = 10, /datum/reagent/consumable/ethanol/quintuple_sec = 10, /datum/reagent/consumable/ethanol/screwdrivercocktail = 10)
mix_message = "When your powers combine, I am Captain Pl-..."
////////////////////////////////////////// Tea Base Drinks //////////////////////////////////////
/datum/chemical_reaction/mush
name = "Mush Tea"
id = /datum/reagent/consumable/tea/mush
results = list(/datum/reagent/consumable/tea/mush = 3)
required_reagents = list(/datum/reagent/drug/mushroomhallucinogen = 3, /datum/reagent/consumable/tea = 3)
/datum/chemical_reaction/foresttea1
name = "Forest Tea"
id = /datum/reagent/consumable/tea/forest
results = list(/datum/reagent/consumable/tea/forest = 3)
required_reagents = list(/datum/reagent/consumable/buzz_fuzz= 3, /datum/reagent/consumable/tea = 3)
/datum/chemical_reaction/foresttea2
name = "Forest Tea"
id = /datum/reagent/consumable/tea/forest
results = list(/datum/reagent/consumable/tea/forest = 3)
required_reagents = list(/datum/reagent/consumable/honey = 1, /datum/reagent/consumable/tea = 3)
/datum/chemical_reaction/redtea1
name = "Red Tea"
id = /datum/reagent/consumable/tea/red
results = list(/datum/reagent/consumable/tea/red = 3)
required_reagents = list(/datum/reagent/colorful_reagent/crayonpowder/red = 1, /datum/reagent/consumable/tea = 3)
/datum/chemical_reaction/greentea1
name = "Green Tea"
id = /datum/reagent/consumable/tea/green
results = list(/datum/reagent/consumable/tea/green = 3)
required_reagents = list(/datum/reagent/colorful_reagent/crayonpowder/green = 1, /datum/reagent/consumable/tea = 3)
/datum/chemical_reaction/redtea2
name = "Red Tea"
id = /datum/reagent/consumable/tea/red
results = list(/datum/reagent/consumable/tea/red = 3)
required_reagents = list(/datum/reagent/toxin/teapowder/red = 1, /datum/reagent/water = 3)
/datum/chemical_reaction/greentea2
name = "Green Tea"
id = /datum/reagent/consumable/tea/green
results = list(/datum/reagent/consumable/tea/green = 3)
required_reagents = list(/datum/reagent/toxin/teapowder/green = 1, /datum/reagent/water = 3)
/datum/chemical_reaction/arnold_palmer
name = "Arnold Palmer"
id = /datum/reagent/consumable/tea/arnold_palmer
results = list(/datum/reagent/consumable/tea/arnold_palmer = 2)
required_reagents = list(/datum/reagent/consumable/tea = 1, /datum/reagent/consumable/lemonade = 1)
mix_message = "The smells of fresh green grass and sand traps waft through the air as the mixture turns a friendly yellow-orange."
/datum/chemical_reaction/icetea
name = "Iced Tea"
id = /datum/reagent/consumable/icetea
results = list(/datum/reagent/consumable/icetea = 4)
required_reagents = list(/datum/reagent/consumable/ice = 1, /datum/reagent/consumable/tea = 3)
/datum/chemical_reaction/pinktea
name = "Strawberry Tea"
id = /datum/reagent/consumable/pinktea
results = list(/datum/reagent/consumable/pinktea = 5)
required_reagents = list(/datum/reagent/consumable/strawberryjuice = 1, /datum/reagent/consumable/tea/arnold_palmer = 1, /datum/reagent/consumable/sugar = 1)
/datum/chemical_reaction/catnip_tea
name = "Catnip Tea"
id = /datum/reagent/consumable/catnip_tea
results = list(/datum/reagent/consumable/catnip_tea = 3)
required_reagents = list(/datum/reagent/consumable/tea = 5, /datum/reagent/pax/catnip = 2)
////////////////////////////////////////// Race Base Drinks //////////////////////////////////////
/datum/chemical_reaction/coldscales