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

Merge remote-tracking branch 'citadel/master' into combat_v7

Browse Source
This commit is contained in:
silicons
2021-06-07 16:47:11 -07:00
parent d67c4d9fa8 e24ecea492
commit 40f2c06f2e
247 changed files with 7302 additions and 2875 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/machinery/pandemic.dm
+1 -1
View File
@@ -210,7 +210,7 @@
to_chat(usr, "<span class='warning'>ERROR: Cannot replicate virus strain.</span>")
return
A = A.Copy()
var/list/data = list("viruses" = list(A))
var/list/data = list("donor"=null,"viruses"=list(A),"blood_DNA"="REPLICATED", "bloodcolor" = BLOOD_COLOR_SYNTHETIC, "blood_type"="SY","resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"factions"=null)
var/obj/item/reagent_containers/glass/bottle/B = new(drop_location())
B.name = "[A.name] culture bottle"
B.desc = "A small bottle. Contains [A.agent] culture in synthblood medium."
code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+75
View File
@@ -360,6 +360,18 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_desc = "A fine drink originally made to prevent waste by using the leftovers from winemaking."
pH = 3.5
/datum/reagent/consumable/ethanol/amaretto
name = "Amaretto"
description = "A gentle drink that carries a sweet aroma."
color = "#E17600"
boozepwr = 25
taste_description = "fruity and nutty sweetness"
glass_icon_state = "amarettoglass"
shot_glass_icon_state = "shotglassgold"
glass_name = "glass of amaretto"
glass_desc = "A sweet and syrupy-looking drink."
pH = 3.5
/datum/reagent/consumable/ethanol/cognac
name = "Cognac"
description = "A sweet and strongly alcoholic drink, made after numerous distillations and years of maturing. Classy as fornication."
@@ -1490,6 +1502,25 @@ All effects don't start immediately, but rather get worse over time; the rate is
M.stuttering = min(M.stuttering + 3, 3)
..()
/datum/reagent/consumable/ethanol/pinotmort
name = "Pinot Mort"
description = "If you just can't get enough of lavaland."
color = rgb(167, 36, 36)
boozepwr = 20
quality = DRINK_FANTASTIC
taste_description = "death, ash and lizards"
glass_icon_state = "pinotmort"
glass_name = "Pinot Mort"
glass_desc = "The taste of Lavaland served in a legion skull. You feel like you might regret drinking this."
value = REAGENT_VALUE_UNCOMMON
/datum/reagent/consumable/ethanol/pinotmort/on_mob_life(mob/living/carbon/M)
if((islizard(M) && M.mind.assigned_role == "Ash Walker") || ispodperson(M) && M.mind.assigned_role == "Lifebringer" || isgolem(M))
M.heal_bodypart_damage(1, 1)
M.adjustBruteLoss(-2,0)
. = 1
return ..()
/datum/reagent/consumable/ethanol/triple_sec
name = "Triple Sec"
description = "A sweet and vibrant orange liqueur."
@@ -1771,6 +1802,50 @@ All effects don't start immediately, but rather get worse over time; the rate is
to_chat(L,"<span class='notice'>You notice [mighty_shield] looks worn again. Weird.</span>")
..()
/datum/reagent/consumable/ethanol/amaretto_alexander
name = "Amaretto Alexander"
description = "A weaker version of the Alexander, what it lacks in strength it makes up for in flavor."
color = "#DBD5AE"
boozepwr = 35
quality = DRINK_VERYGOOD
taste_description = "sweet, creamy cacao"
glass_icon_state = "alexanderam"
glass_name = "Amaretto Alexander"
glass_desc = "A creamy, indulgent delight that is in fact as gentle as it seems."
/datum/reagent/consumable/ethanol/ginger_amaretto
name = "Ginger Amaretto"
description = "A delightfully simple cocktail that pleases the senses."
boozepwr = 30
color = "#EFB42A"
quality = DRINK_GOOD
taste_description = "sweetness followed by a soft sourness and warmth"
glass_icon_state = "gingeramaretto"
glass_name = "Ginger Amaretto"
glass_desc = "The sprig of rosemary adds a nice aroma to the drink, and isn't just to be pretentious afterall!"
/datum/reagent/consumable/ethanol/godfather
name = "Godfather"
description = "A rough cocktail with illegal connections."
boozepwr = 50
color = "#E68F00"
quality = DRINK_GOOD
taste_description = "a delightful softened punch"
glass_icon_state = "godfather"
glass_name = "Godfather"
glass_desc = "A classic from old Italy and enjoyed by gangsters, pray the orange peel doesnt end up in your mouth."
/datum/reagent/consumable/ethanol/godmother
name = "Godmother"
description = "A twist on a classic, liked more by mature women."
boozepwr = 50
color = "#E68F00"
quality = DRINK_GOOD
taste_description = "sweetness and a zesty twist"
glass_icon_state = "godmother"
glass_name = "Godmother"
glass_desc = "A lovely fresh-smelling cocktail, a true Sicilian delight."
/datum/reagent/consumable/ethanol/sidecar
name = "Sidecar"
description = "The one ride you'll gladly give up the wheel for."
code/modules/reagents/reagent_containers.dm
+1 -1
View File
@@ -26,7 +26,7 @@
create_reagents(volume, reagent_flags, reagent_value)
if(spawned_disease)
var/datum/disease/F = new spawned_disease()
var/list/data = list("blood_DNA" = "UNKNOWN DNA", "blood_type" = "SY","viruses"= list(F))
var/list/data = list("donor"=null,"viruses"=list(F),"blood_DNA"="REPLICATED", "bloodcolor" = BLOOD_COLOR_SYNTHETIC, "blood_type"="SY","resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"factions"=null)
reagents.add_reagent(/datum/reagent/blood, disease_amount, data)
add_initial_reagents()
code/modules/reagents/reagent_containers/bottle.dm
+20
View File
@@ -44,6 +44,26 @@
desc = "A small bottle. Contains epinephrine - used to stabilize patients."
list_reagents = list(/datum/reagent/medicine/epinephrine = 30)
/obj/item/reagent_containers/glass/bottle/bicaridine
name = "bicaridine bottle"
desc = "A small bottle. Contains bicaridine - used to treat brute damage."
list_reagents = list(/datum/reagent/medicine/bicaridine = 30)
/obj/item/reagent_containers/glass/bottle/kelotane
name = "kelotane bottle"
desc = "A small bottle. Contains kelotane - used to treat burn damage."
list_reagents = list(/datum/reagent/medicine/kelotane = 30)
/obj/item/reagent_containers/glass/bottle/antitoxin
name = "anti-toxin bottle"
desc = "A small bottle. Contains anti-toxin - used to treat minor poisoning."
list_reagents = list(/datum/reagent/medicine/antitoxin = 30)
/obj/item/reagent_containers/glass/bottle/dexalin
name = "dexalin bottle"
desc = "A small bottle. Contains dexalin - used to treat minor suffocation."
list_reagents = list(/datum/reagent/medicine/dexalin = 30)
/obj/item/reagent_containers/glass/bottle/toxin
name = "toxin bottle"
desc = "A small bottle of toxins. Do not drink, it is poisonous."