mirror of
https://github.com/KabKebab/GS13.git
synced 2026-07-12 00:20:55 +01:00
Merge pull request #317 from Chemlight/Make-Virology-Great-Again
Reverse Engineering Virology from Beeviro
This commit is contained in:
@@ -611,16 +611,13 @@
|
||||
nutriment_factor = 15 * REAGENTS_METABOLISM
|
||||
metabolization_rate = 1 * REAGENTS_METABOLISM
|
||||
taste_description = "sweetness"
|
||||
var/power = 0
|
||||
|
||||
/datum/reagent/consumable/honey/on_mob_life(mob/living/carbon/M)
|
||||
if(power == 0)
|
||||
M.reagents.add_reagent(/datum/reagent/consumable/sugar,3)
|
||||
if(prob(55))
|
||||
M.adjustBruteLoss(-1*REM+power, 0)
|
||||
M.adjustFireLoss(-1*REM+power, 0)
|
||||
M.adjustOxyLoss(-1*REM+power, 0)
|
||||
M.adjustToxLoss(-1*REM+power, 0)
|
||||
M.adjustBruteLoss(-1*REM, 0)
|
||||
M.adjustFireLoss(-1*REM, 0)
|
||||
M.adjustOxyLoss(-1*REM, 0)
|
||||
M.adjustToxLoss(-1*REM, 0)
|
||||
..()
|
||||
|
||||
/datum/reagent/consumable/honey/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
|
||||
@@ -631,12 +628,6 @@
|
||||
S.success_multiplier = max(0.6, S.success_multiplier) // +60% success probability on each step, compared to bacchus' blessing's ~46%
|
||||
..()
|
||||
|
||||
/datum/reagent/consumable/honey/special
|
||||
name = "Royal Honey"
|
||||
id = "royalhoney"
|
||||
description = "A special honey which heals the imbiber far faster than normal honey"
|
||||
power = 1
|
||||
|
||||
/datum/reagent/consumable/mayonnaise
|
||||
name = "Mayonnaise"
|
||||
id = "mayonnaise"
|
||||
|
||||
@@ -1582,25 +1582,6 @@
|
||||
taste_description = "rainbows"
|
||||
var/no_mob_color = FALSE
|
||||
|
||||
/datum/reagent/consumable/laughter/laughtervirusfood
|
||||
name = "anomolous virus food"
|
||||
color = "#ffa6ff" //rgb: 255,166,255
|
||||
taste_description = "a bad idea"
|
||||
id = "laughtervirusfood"
|
||||
|
||||
/datum/reagent/consumable/virus_food/advvirusfood
|
||||
name = "highly unstable virus food"
|
||||
color = "#ffffff" //rgb: 255,255,255 ITS PURE WHITE CMON
|
||||
taste_description = "an EXTREMELY bad idea"
|
||||
id = "advvirusfood"
|
||||
|
||||
/datum/reagent/consumable/virus_food/viralbase
|
||||
name = "Experimental viral base"
|
||||
description = "Recently discovered by Nanotrasen's top scientists after years of research, this substance can be used as the base for extremely rare and extremely dangerous viruses once exposed to uranium."
|
||||
color = "#fff0da"
|
||||
taste_description = "tears of scientists"
|
||||
id = "viralbase"
|
||||
|
||||
/datum/reagent/colorful_reagent/on_mob_life(mob/living/carbon/M)
|
||||
if(!no_mob_color)
|
||||
M.add_atom_colour(pick(random_color_list), WASHABLE_COLOUR_PRIORITY)
|
||||
|
||||
@@ -230,19 +230,6 @@
|
||||
if(D)
|
||||
D.Evolve(level_min, level_max)
|
||||
|
||||
/datum/chemical_reaction/virus_food_laughter
|
||||
name = "Anomolous virus food"
|
||||
id = "virusfood_laughter"
|
||||
results = list("laughtervirusfood" = 1)
|
||||
required_reagents = list("laughter" = 5, "virusfood" = 1)
|
||||
|
||||
/datum/chemical_reaction/virus_food_admin
|
||||
name = "Highly unstable virus Food"
|
||||
id = "virusfood_admin"
|
||||
results = list("advvirusfood" = 1)
|
||||
required_reagents = list("viralbase" = 1, "uranium" = 20)
|
||||
mix_message = "The mixture turns every colour of the rainbow, soon settling on a bright white. There's no way this isn't a good idea."
|
||||
|
||||
/datum/chemical_reaction/mix_virus/mix_virus_2
|
||||
|
||||
name = "Mix Virus 2"
|
||||
@@ -330,23 +317,6 @@
|
||||
required_reagents = list("uraniumplasmavirusfood_stable" = 1)
|
||||
level_min = 8
|
||||
level_max = 8
|
||||
|
||||
/datum/chemical_reaction/mix_virus/mix_virus_13
|
||||
|
||||
name = "Mix Virus 13"
|
||||
id = "mixvirus13"
|
||||
required_reagents = list("laughtervirusfood" = 1)
|
||||
level_min = 0
|
||||
level_max = 0
|
||||
|
||||
/datum/chemical_reaction/mix_virus/mix_virus_14
|
||||
|
||||
name = "Mix Virus 14"
|
||||
id = "mixvirus14"
|
||||
required_reagents = list("advvirusfood" = 1)
|
||||
level_min = 9
|
||||
level_max = 9
|
||||
|
||||
|
||||
/datum/chemical_reaction/mix_virus/rem_virus
|
||||
|
||||
|
||||
@@ -126,11 +126,6 @@
|
||||
/obj/item/reagent_containers/glass/beaker/on_reagent_change(changetype)
|
||||
update_icon()
|
||||
|
||||
/obj/item/reagent_containers/glass/bottle/viralbase
|
||||
name = "Highly potent Viral Base Bottle"
|
||||
desc = "A small bottle. Contains a trace amount of a substance found by scientists that can be used to create extremely advanced diseases once exposed to uranium."
|
||||
list_reagents = list("viralbase" = 1)
|
||||
|
||||
/obj/item/reagent_containers/glass/beaker/update_icon()
|
||||
if(!cached_icon)
|
||||
cached_icon = icon_state
|
||||
|
||||
Reference in New Issue
Block a user