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

Merge remote-tracking branch 'upstream/master' into cool-ipcs

Browse Source
This commit is contained in:
Timothy Teakettle
2020-09-16 05:12:20 +01:00
parent 0d8374a328 604020c4bc
commit 12bf3aebda
635 changed files with 23608 additions and 12861 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
View File

@@ -2280,6 +2280,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
quality = RACE_DRINK
else
C.adjust_disgust(disgust)
return ..()
/datum/reagent/consumable/ethanol/species_drink/coldscales
name = "Coldscales"
@@ -2289,7 +2290,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "coldscales"
glass_name = "glass of Coldscales"
glass_desc = "A soft green drink that looks inviting!"
species_required = "lizard"
/datum/reagent/consumable/ethanol/species_drink/oil_drum
@@ -2301,7 +2301,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "oil_drum"
glass_name = "Drum of oil"
glass_desc = "A gray can of booze and oil..."
species_required = "robot"
/datum/reagent/consumable/ethanol/species_drink/nord_king
@@ -2312,7 +2311,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "nord_king"
glass_name = "Keg of Nord King"
glass_desc = "A dripping keg of red mead."
species_required = "basic"
/datum/reagent/consumable/ethanol/species_drink/velvet_kiss
@@ -2324,7 +2322,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "velvet_kiss"
glass_name = "glass of Velvet Kiss"
glass_desc = "Red and white drink for the upper classes or undead."
species_required = "undead"
/datum/reagent/consumable/ethanol/species_drink/abduction_fruit
@@ -2336,7 +2333,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "abduction_fruit"
glass_name = "glass of Abduction Fruit"
glass_desc = "Mixed fruits that were never meant to be mixed..."
species_required = "alien"
/datum/reagent/consumable/ethanol/species_drink/bug_zapper
@@ -2348,7 +2344,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "bug_zapper"
glass_name = "glass of Bug Zapper"
glass_desc = "An odd mix of copper, lemon juice and power meant for non-human consumption."
species_required = "bug"
/datum/reagent/consumable/ethanol/species_drink/mush_crush
@@ -2360,7 +2355,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "mush_crush"
glass_name = "glass of Mush Crush"
glass_desc = "Popular among people that want to grow their own food rather than drink the soil."
species_required = "plant"
/datum/reagent/consumable/ethanol/species_drink/darkbrew
@@ -2372,7 +2366,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "darkbrew"
glass_name = "glass of Darkbrew"
glass_desc = "A pitch black drink that's commonly confused with a type of coffee."
species_required = "shadow"
/datum/reagent/consumable/ethanol/species_drink/hollow_bone
@@ -2384,7 +2377,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "hollow_bone"
glass_name = "skull of Hollow Bone"
glass_desc = "Mixing of milk and bone hurting juice for the enjoyment of rather skinny people."
species_required = "skeleton"
/datum/reagent/consumable/ethanol/species_drink/frisky_kitty
@@ -2396,7 +2388,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "frisky_kitty"
glass_name = "cup of Drisky Kitty"
glass_desc = "Warm milk and some catnip."
species_required = "furry"
/datum/reagent/consumable/ethanol/species_drink/jell_wyrm
@@ -2408,7 +2399,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "jell_wyrm"
glass_name = "glass of Jell Wyrm"
glass_desc = "A bubbly drink that is rather inviting to those that don't know who it's meant for."
species_required = "jelly"
/datum/reagent/consumable/ethanol/species_drink/laval_spit //Yes Laval
@@ -2420,7 +2410,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "laval_spit"
glass_name = "glass of Laval Spit"
glass_desc = "Piping hot drink for those who can stomach the heat of lava."
species_required = "golem"
///////////////

12
code/modules/reagents/chemistry/reagents/drink_reagents.dm
View File

@@ -329,7 +329,7 @@
color = "#101000" // rgb: 16, 16, 0
nutriment_factor = 0
taste_description = "sweet red tea"
glass_icon_state = "teaglass"
glass_icon_state = "tea_red"
glass_name = "glass of red tea"
glass_desc = "A piping hot tea that helps with the digestion of food."
@@ -340,6 +340,7 @@
M.drowsyness = max(0,M.drowsyness-1)
M.jitteriness = max(0,M.jitteriness-3)
M.adjust_bodytemperature(23 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, BODYTEMP_NORMAL)
..()
. = 1
/datum/reagent/consumable/tea/green
@@ -348,7 +349,7 @@
color = "#101000" // rgb: 16, 16, 0
nutriment_factor = 0
taste_description = "tart green tea"
glass_icon_state = "teaglass"
glass_icon_state = "tea_green"
glass_name = "glass of tea"
glass_desc = "A calming glass of green tea to help get you through the day."
@@ -358,6 +359,7 @@
M.drowsyness = max(0,M.drowsyness-1)
M.jitteriness = max(0,M.jitteriness-3)
M.adjust_bodytemperature(15 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, BODYTEMP_NORMAL)
..()
. = 1
/datum/reagent/consumable/tea/forest
@@ -367,7 +369,7 @@
nutriment_factor = 0
quality = DRINK_NICE
taste_description = "sweet tea"
glass_icon_state = "teaglass"
glass_icon_state = "tea_forest"
glass_name = "glass of forest tea"
glass_desc = "A lovely glass of tea and honey."
@@ -379,6 +381,7 @@
M.drowsyness = max(0,M.drowsyness-1)
M.jitteriness = max(0,M.jitteriness-3)
M.adjust_bodytemperature(15 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, BODYTEMP_NORMAL)
..()
. = 1
/datum/reagent/consumable/tea/mush
@@ -388,7 +391,7 @@
nutriment_factor = 0
quality = DRINK_NICE
taste_description = "fungal infections"
glass_icon_state = "teaglass"
glass_icon_state = "tea_mush"
glass_name = "glass of mush tea"
glass_desc = "A cold merky brown tea."
@@ -398,6 +401,7 @@
M.Dizzy(10)
if(prob(10))
M.disgust = 0
..()
. = 1
/datum/reagent/consumable/lemonade

55
code/modules/reagents/chemistry/reagents/other_reagents.dm
View File

@@ -2220,6 +2220,7 @@
color = "#f7685e"
metabolization_rate = REAGENTS_METABOLISM * 0.25
/datum/reagent/wittel
name = "Wittel"
description = "An extremely rare metallic-white substance only found on demon-class planets."
@@ -2281,6 +2282,7 @@
/datum/reagent/gravitum/on_mob_end_metabolize(mob/living/L)
L.RemoveElement(/datum/element/forced_gravity, 0)
//body bluids
/datum/reagent/consumable/semen
name = "Semen"
@@ -2457,3 +2459,56 @@ datum/reagent/eldritch
return
..()
/datum/reagent/red_ichor
name = "Red Ichor"
can_synth = FALSE
description = "A unknown red liquid, linked to healing of most moral wounds."
color = "#c10000"
metabolization_rate = REAGENTS_METABOLISM * 2.5
/datum/reagent/red_ichor/on_mob_life(mob/living/carbon/M)
M.adjustBruteLoss(-50)
M.adjustOxyLoss(-50)
M.adjustBruteLoss(-50)
M.adjustFireLoss(-50)
M.adjustToxLoss(-50, TRUE) //heals TOXINLOVERs
M.adjustCloneLoss(-50)
M.adjustStaminaLoss(-50)
..()
/datum/reagent/green_ichor
name = "Green Ichor"
can_synth = FALSE
description = "A unknown green liquid, linked to healing of most internal wounds."
color = "#158c00"
metabolization_rate = REAGENTS_METABOLISM * 2.5
/datum/reagent/green_ichor/on_mob_life(mob/living/carbon/M)
M.adjustOrganLoss(ORGAN_SLOT_LUNGS, -100)
M.adjustOrganLoss(ORGAN_SLOT_HEART, -100)
M.adjustOrganLoss(ORGAN_SLOT_LIVER, -100)
M.adjustOrganLoss(ORGAN_SLOT_EARS, -100)
M.adjustOrganLoss(ORGAN_SLOT_STOMACH, -100)
M.adjustOrganLoss(ORGAN_SLOT_TONGUE, -100)
M.adjustOrganLoss(ORGAN_SLOT_EYES, -100)
..()
/datum/reagent/blue_ichor
name = "Blue Ichor"
can_synth = FALSE
description = "A unknown blue liquid, linked to healing the mind."
color = "#0914e0"
metabolization_rate = REAGENTS_METABOLISM * 2.5
/datum/reagent/blue_ichor/on_mob_life(mob/living/carbon/M)
M.adjustOrganLoss(ORGAN_SLOT_BRAIN, -100)
M.cure_all_traumas(TRAUMA_RESILIENCE_MAGIC)
M.hallucination = 0
M.dizziness = 0
M.disgust = 0
M.drowsyness = 0
M.stuttering = 0
M.confused = 0
M.SetSleeping(0, 0)
..()

1
code/modules/reagents/reagent_containers.dm
View File

@@ -70,7 +70,6 @@
return
/obj/item/reagent_containers/attack(mob/living/M, mob/living/user, attackchain_flags = NONE, damage_multiplier = 1)
. = ..()
if(user.a_intent == INTENT_HARM)
return ..()

17
code/modules/reagents/reagent_containers/bottle.dm
View File

@@ -416,3 +416,20 @@
/obj/item/reagent_containers/glass/bottle/bromine
name = "bromine bottle"
list_reagents = list(/datum/reagent/bromine = 30)
//Ichors
/obj/item/reagent_containers/glass/bottle/ichor
possible_transfer_amounts = list(1)
volume = 1
/obj/item/reagent_containers/glass/bottle/ichor/red
name = "healing potion"
list_reagents = list(/datum/reagent/red_ichor = 1)
/obj/item/reagent_containers/glass/bottle/ichor/blue
name = "blue potion"
list_reagents = list(/datum/reagent/blue_ichor = 1)
/obj/item/reagent_containers/glass/bottle/ichor/green
name = "green potion"
list_reagents = list(/datum/reagent/green_ichor = 1)