cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-24 04:28:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16885 from TheCaramelion/virology

Browse Source 
Virology Update #2
This commit is contained in:
Cameron Lennox
2025-01-14 15:46:17 -05:00
committed by GitHub
parent 49bae6a3c1 3f327232f1
commit 1497af0573
28 changed files with 454 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers/virology.dm
+40
View File
@@ -24,3 +24,43 @@
diseases += new /datum/disease/advance/flu
data["viruses"] = diseases
reagents.add_reagent(REAGENT_ID_BLOOD, 10, data)
/obj/item/reagent_containers/glass/bottle/culture/blobspores
name = "blob spores culture"
desc = "A bottle with blob spores"
/obj/item/reagent_containers/glass/bottle/culture/blobspores/Initialize()
. = ..()
diseases += new /datum/disease/advance/blobspores
data["viruses"] = diseases
reagents.add_reagent(REAGENT_ID_BLOOD, 10, data)
/obj/item/reagent_containers/glass/bottle/culture/macrophages
name = "macrophages culture"
desc = "A bottle with giant viruses"
/obj/item/reagent_containers/glass/bottle/culture/macrophages/Initialize()
. = ..()
diseases += new /datum/disease/advance/macrophage
data["viruses"] = diseases
reagents.add_reagent(REAGENT_ID_BLOOD, 10, data)
/obj/item/reagent_containers/glass/bottle/culture/random_virus
name = "experimental disease culture bottle"
desc = "A small bottle. Contains an untested viral culture."
/obj/item/reagent_containers/glass/bottle/culture/random_virus/Initialize()
. = ..()
diseases += new /datum/disease/advance/random
data["viruses"] = diseases
reagents.add_reagent(REAGENT_ID_BLOOD, 10, data)
/obj/item/reagent_containers/glass/bottle/culture/random_virus/minor
name = "minor experimental disease culture bottle"
desc = "A small bottle. Contains a weak version of an untested viral culture."
/obj/item/reagent_containers/glass/bottle/culture/random_virus/minor/Initialize()
. = ..()
diseases += new /datum/disease/advance/random/minor
data["viruses"] = diseases
reagents.add_reagent(REAGENT_ID_BLOOD, 10, data)
code/modules/reagents/reagents/other.dm
+7
View File
@@ -445,6 +445,10 @@
var/mob/living/carbon/C = M
C.clean_blood(TRUE)
if(istype(M, /mob/living/simple_mob/vore/aggressive/macrophage)) // Big ouch for viruses
var/mob/living/simple_mob/macrophage = M
macrophage.adjustToxLoss(20)
/datum/reagent/space_cleaner/touch_obj(var/obj/O)
..()
O.clean_blood()
@@ -463,6 +467,9 @@
for(var/mob/living/simple_mob/slime/M in T)
M.adjustToxLoss(rand(5, 10))
for(var/mob/living/simple_mob/vore/aggressive/macrophage/virus in T)
virus.adjustToxLoss(rand(5, 10))
/datum/reagent/space_cleaner/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)
if(M.r_hand)
M.r_hand.clean_blood()