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

Merge pull request #1986 from Citadel-Station-13/upstream-merge-28556

Browse Source 
[MIRROR] [Seriously, it's ready]Virology Rework: The Thresholdening
This commit is contained in:
LetterJay
2017-07-19 06:29:06 -05:00
committed by GitHub
parent 0563e8b2f3 92e967d904
commit 85f1b25bcd
37 changed files with 1205 additions and 608 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
+2 -1
View File
@@ -442,7 +442,8 @@
/obj/item/weapon/reagent_containers/glass/bottle/flu_virion = 1,
/obj/item/weapon/reagent_containers/glass/bottle/mutagen = 1,
/obj/item/weapon/reagent_containers/glass/bottle/plasma = 1,
/obj/item/weapon/reagent_containers/glass/bottle/synaptizine = 1)
/obj/item/weapon/reagent_containers/glass/bottle/synaptizine = 1,
/obj/item/weapon/reagent_containers/glass/bottle/formaldehyde = 1)
// ----------------------------
// Disk """fridge"""
code/modules/reagents/chemistry/recipes/others.dm
+16 -1
View File
@@ -291,7 +291,7 @@
results = list("blood" = 1)
required_reagents = list("virusfood" = 1)
required_catalysts = list("blood" = 1)
var/level_min = 0
var/level_min = 1
var/level_max = 2
/datum/chemical_reaction/mix_virus/on_reaction(datum/reagents/holder, created_volume)
@@ -406,6 +406,21 @@
if(D)
D.Devolve()
/datum/chemical_reaction/mix_virus/neuter_virus
name = "Neuter Virus"
id = "neutervirus"
required_reagents = list("formaldehyde" = 1)
required_catalysts = list("blood" = 1)
/datum/chemical_reaction/mix_virus/neuter_virus/on_reaction(datum/reagents/holder, created_volume)
var/datum/reagent/blood/B = locate(/datum/reagent/blood) in holder.reagent_list
if(B && B.data)
var/datum/disease/advance/D = locate(/datum/disease/advance) in B.data["viruses"]
if(D)
D.Neuter()
////////////////////////////////// foam and foam precursor ///////////////////////////////////////////////////
code/modules/reagents/reagent_containers/bottle.dm
+6
View File
@@ -101,6 +101,12 @@
icon_state = "bottle20"
list_reagents = list("synaptizine" = 30)
/obj/item/weapon/reagent_containers/glass/bottle/formaldehyde
name = "formaldehyde bottle"
desc = "A small bottle of formaldehyde."
icon_state = "bottle20"
list_reagents = list("formaldehyde" = 30)
/obj/item/weapon/reagent_containers/glass/bottle/ammonia
name = "ammonia bottle"
desc = "A small bottle of ammonia."