cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Better Viro (#9421)

Browse Source 
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2024-11-06 16:45:37 -07:00
committed by GitHub
parent b76e8aa897
commit 6c05f5da45
116 changed files with 4191 additions and 1774 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/reagents/reagent_containers/glass.dm
View File

@@ -39,11 +39,9 @@
/obj/item/storage/secure/safe,
/obj/machinery/iv_drip,
/obj/structure/medical_stand, //VOREStation Add,
/obj/machinery/disease2/incubator,
/obj/machinery/disposal,
/mob/living/simple_mob/animal/passive/cow,
/mob/living/simple_mob/animal/goat,
/obj/machinery/computer/centrifuge,
/obj/machinery/sleeper,
/obj/machinery/smartfridge/,
/obj/machinery/biogenerator,
@@ -51,6 +49,7 @@
/obj/machinery/radiocarbon_spectrometer,
/obj/machinery/portable_atmospherics/powered/reagent_distillery,
/obj/machinery/feeder,
/obj/machinery/computer/pandemic,
/obj/machinery/chemical_synthesizer, //CHOMPedit,
/obj/machinery/food_replicator // CHOMPAdd
)

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

@@ -395,5 +395,4 @@
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/contaminated/do_injection(mob/living/carbon/human/H, mob/living/user)
. = ..()
if(.) // Will occur if successfully injected.
infect_mob_random_lesser(H)
add_attack_logs(user, H, "Infected \the [H] with \the [src], by \the [user].")

12
code/modules/reagents/reagent_containers/syringes.dm
View File

@@ -34,7 +34,7 @@
var/used = FALSE
var/dirtiness = 0
var/list/targets
var/list/datum/disease2/disease/viruses
var/list/datum/disease/viruses
drop_sound = 'sound/items/drop/glass.ogg'
pickup_sound = 'sound/items/pickup/glass.ogg'
@@ -407,10 +407,10 @@
targets |= hash
//Grab any viruses they have
if(iscarbon(target) && LAZYLEN(target.virus2.len))
if(iscarbon(target) && LAZYLEN(target.viruses.len))
LAZYINITLIST(viruses)
var/datum/disease2/disease/virus = pick(target.virus2.len)
viruses[hash] = virus.getcopy()
var/datum/disease/virus = pick(target.viruses.len)
viruses[hash] = virus.Copy()
//Dirtiness should be very low if you're the first injectee. If you're spam-injecting 4 people in a row around you though,
//This gives the last one a 30% chance of infection.
@@ -426,8 +426,8 @@
if(LAZYLEN(viruses) && prob(75))
var/old_hash = pick(viruses)
if(hash != old_hash) //Same virus you already had?
var/datum/disease2/disease/virus = viruses[old_hash]
infect_virus2(target,virus.getcopy())
var/datum/disease/virus = viruses[old_hash]
target.ContractDisease(virus)
if(!used)
START_PROCESSING(SSobj, src)

26
code/modules/reagents/reagent_containers/virology.dm Normal file
View File

@@ -0,0 +1,26 @@
/obj/item/reagent_containers/glass/bottle/culture
name = "virus culture"
desc = "A bottle with a virus culture"
icon_state = "bottle-1"
var/list/data = list("donor" = null, "viruses" = null, "blood_DNA" = null, "blood_type" = null, "resistances" = null, "trace_chems" = null)
var/list/diseases = list()
/obj/item/reagent_containers/glass/bottle/culture/cold
name = "cold virus culture"
desc = "A bottle with the common cold culture"
/obj/item/reagent_containers/glass/bottle/culture/cold/Initialize()
. = ..()
diseases += new /datum/disease/advance/cold
data["viruses"] = diseases
reagents.add_reagent("blood", 10, data)
/obj/item/reagent_containers/glass/bottle/culture/flu
name = "flu virus culture"
desc = "A bottle with the flu culture"
/obj/item/reagent_containers/glass/bottle/culture/flu/Initialize()
. = ..()
diseases += new /datum/disease/advance/flu
data["viruses"] = diseases
reagents.add_reagent("blood", 10, data)