cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-26 06:40:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Faltered & Dormant diseases update (#10985)

Browse Source 
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-06-01 03:01:58 +02:00
committed by GitHub
co-authored by Guti Cameron Lennox
parent c8f4469b94
commit 05b57277bf
25 changed files with 267 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reactions/instant/virology.dm
+63 -1
View File
@@ -40,9 +40,37 @@
required_reagents = list(REAGENT_ID_INAPROVALINE = 1, REAGENT_ID_MUTAGENVIRUSFOOD = 1)
result_amount = 2
/decl/chemical_reaction/instant/virus_food_uranium
name = REAGENT_URANIUMVIRUSFOOD
id = REAGENT_ID_URANIUMVIRUSFOOD
result = REAGENT_ID_URANIUMVIRUSFOOD
required_reagents = list(REAGENT_ID_URANIUM = 1, REAGENT_ID_VIRUSFOOD = 1)
result_amount = 1
/decl/chemical_reaction/instant/virus_food_uranium_unstable
name = REAGENT_UNSTABLEURANIUMVIRUSFOOD
id = REAGENT_ID_UNSTABLEURANIUMVIRUSFOOD
result = REAGENT_ID_UNSTABLEURANIUMVIRUSFOOD
required_reagents = list(REAGENT_ID_URANIUM = 1, REAGENT_ID_PHORONVIRUSFOOD = 1)
result_amount = 1
/decl/chemical_reaction/instant/virus_food_uranium_stable
name = REAGENT_STABLEURANIUMVIRUSFOOD
id = REAGENT_ID_STABLEURANIUMVIRUSFOOD
result = REAGENT_ID_STABLEURANIUMVIRUSFOOD
required_reagents = list(REAGENT_ID_PHORON = 5, REAGENT_ID_URANIUM = 5, REAGENT_ID_SILVER = 5)
result_amount = 1
/decl/chemical_reaction/instant/virus_food_uranium_stable_alt
name = REAGENT_STABLEURANIUMVIRUSFOOD_ALT
id = REAGENT_ID_STABLEURANIUMVIRUSFOOD_ALT
result = REAGENT_ID_STABLEURANIUMVIRUSFOOD
required_reagents = list(REAGENT_ID_PHORON = 5, REAGENT_ID_URANIUM = 5, REAGENT_ID_GOLD = 5)
result_amount = 1
/decl/chemical_reaction/instant/virus_food_size
name = REAGENT_SIZEVIRUSFOOD
id = "sizeoxadonevirusfood"
id = REAGENT_ID_SIZEVIRUSFOOD
result = REAGENT_ID_SIZEVIRUSFOOD
required_reagents = list(REAGENT_ID_SIZEOXADONE = 1, REAGENT_ID_PHORONVIRUSFOOD = 1)
result_amount = 2
@@ -129,6 +157,27 @@
level_min = 1
level_max = 1
/decl/chemical_reaction/instant/mix_virus/mix_virus_10
name = "Mix Virus 10"
id = "mixvirus10"
required_reagents = list(REAGENT_ID_URANIUMVIRUSFOOD = 1)
level_min = 6
level_max = 7
/decl/chemical_reaction/instant/mix_virus/mix_virus_11
name = "Mix Virus 11"
id = "mixvirus11"
required_reagents = list(REAGENT_ID_UNSTABLEURANIUMVIRUSFOOD = 1)
level_min = 7
level_max = 7
/decl/chemical_reaction/instant/mix_virus/mix_virus_12
name = "Mix Virus 12"
id = "mixvirus12"
required_reagents = list(REAGENT_ID_STABLEURANIUMVIRUSFOOD = 1)
level_min = 8
level_max = 8
/decl/chemical_reaction/instant/mix_virus/picky/size
name = "Mix Virus Size"
id = "mixvirussize"
@@ -172,3 +221,16 @@
var/datum/disease/advance/D = locate(/datum/disease/advance) in B.data["viruses"]
if(D)
D.Neuter()
/decl/chemical_reaction/instant/falter_virus
name = "Falter Virus"
id = "faltervirus"
required_reagents = list(REAGENT_ID_SPACEACILLIN = 1)
catalysts = list(REAGENT_ID_BLOOD = 1)
/decl/chemical_reaction/instant/falter_virus/on_reaction(var/datum/reagents/holder)
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.Falter()
code/modules/reagents/reagent_containers/syringes.dm
+11 -1
View File
@@ -38,7 +38,6 @@
drop_sound = 'sound/items/drop/glass.ogg'
pickup_sound = 'sound/items/pickup/glass.ogg'
/obj/item/reagent_containers/syringe/Initialize(mapload)
. = ..()
update_icon()
@@ -496,6 +495,17 @@
icon_state = "[rounded_vol]"
item_state = "syringe_[rounded_vol]"
/obj/item/reagent_containers/syringe/old
name = "old syringe"
desc = "An old, broken syringe. Are you sure it's a good idea to pick it up without gloves?"
mode = SYRINGE_BROKEN
/obj/item/reagent_containers/syringe/old/Initialize(mapload)
. = ..()
if(prob(75))
var/datum/disease/advance/new_disease = new /datum/disease/advance/random(rand(1, 3), rand(7, 9), 2)
src.viruses += new_disease
#undef SYRINGE_DRAW
#undef SYRINGE_INJECT
#undef SYRINGE_BROKEN
code/modules/reagents/reagents/virology.dm
+17
View File
@@ -48,6 +48,23 @@
description = "Mutates viruses when mixed in blood. This one seems to have been weakened, but still strong."
color = "#CEC3C6"
/datum/reagent/uranium/uraniumvirusfood
name = REAGENT_URANIUMVIRUSFOOD
id = REAGENT_ID_URANIUMVIRUSFOOD
description = "Mutates viruses when mixed in blood. This one seems to glow lightly."
color = "#D18AA5"
/datum/reagent/uranium/uraniumvirusfood/unstable
name = REAGENT_UNSTABLEURANIUMVIRUSFOOD
id = REAGENT_ID_UNSTABLEURANIUMVIRUSFOOD
description = "Mutates viruses when mixed in blood. This one seems be lightly warm."
color = "#D18AA5"
/datum/reagent/uranium/uraniumvirusfood/stable
name = REAGENT_STABLEURANIUMVIRUSFOOD
id = REAGENT_ID_STABLEURANIUMVIRUSFOOD
description = "Mutates viruses when mixed in blood. This one seems to be stable."
/datum/reagent/toxin/phoron/phoronvirusfood/sizevirusfood
name = REAGENT_SIZEVIRUSFOOD
id = REAGENT_ID_SIZEVIRUSFOOD