Virus2 Refactoring, Part I - Machinery.

-Removed functions already defined in parent classes. -Replaced checks in Topic() with parent class ones. -Removed two unused files (there are duplicates in unused folder anyway) -Removed commented out lines, mostly pre-antibody curing code. -Shuffled code around for better readability (like antibody list) -Moved various devices and items defines to separate file.
2025-12-10 18:22:39 +00:00 · 2013-06-08 17:36:12 +04:00
parent 405dff19b8
commit 1820a227a1
9 changed files with 257 additions and 515 deletions
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -1251,6 +1251,13 @@
 #include "code\modules\surgery\ribcage.dm"
 #include "code\modules\surgery\robolimbs.dm"
 #include "code\modules\surgery\surgery.dm"
+#include "code\modules\virus2\analyser.dm"
+#include "code\modules\virus2\antibodies.dm"
+#include "code\modules\virus2\base.dm"
+#include "code\modules\virus2\curer.dm"
+#include "code\modules\virus2\diseasesplicer.dm"
+#include "code\modules\virus2\dishincubator.dm"
+#include "code\modules\virus2\isolator.dm"
 #include "code\WorkInProgress\autopsy.dm"
 #include "code\WorkInProgress\buildmode.dm"
 #include "code\WorkInProgress\explosion_particles.dm"
@@ -1306,13 +1313,6 @@
 #include "code\WorkInProgress\SkyMarshal\officer_stuff.dm"
 #include "code\WorkInProgress\SkyMarshal\Ultralight_procs.dm"
 #include "code\WorkInProgress\Susan\susan_desert_turfs.dm"
-#include "code\WorkInProgress\virus2\analyser.dm"
-#include "code\WorkInProgress\virus2\antibodies.dm"
-#include "code\WorkInProgress\virus2\base.dm"
-#include "code\WorkInProgress\virus2\curer.dm"
-#include "code\WorkInProgress\virus2\diseasesplicer.dm"
-#include "code\WorkInProgress\virus2\dishincubator.dm"
-#include "code\WorkInProgress\virus2\isolator.dm"
 #include "code\ZAS\Airflow.dm"
 #include "code\ZAS\Connection.dm"
 #include "code\ZAS\Debug.dm"
--- a/code/modules/virus2/analyser.dm
+++ b/code/modules/virus2/analyser.dm
@@ -14,19 +14,14 @@
 	if(istype(I,/obj/item/weapon/virusdish))
 		var/mob/living/carbon/c = user
 		if(!dish)
-
 			dish = I
 			c.drop_item()
 			I.loc = src
 			for(var/mob/M in viewers(src))
 				if(M == user)	continue
 				M.show_message("\blue [user.name] inserts the [dish.name] in the [src.name]", 3)
-
-
 		else
 			user << "There is already a dish inserted"
-
-	//else
 	return


@@ -34,8 +29,6 @@
 	if(stat & (NOPOWER|BROKEN))
 		return
 	use_power(500)
-	//src.updateDialog()
-

 	if(scanning)
 		scanning -= 1
@@ -46,10 +39,8 @@
 			r += "<BR>Progress Speed : [dish.virus2.stageprob * 10]"
 			for(var/datum/disease2/effectholder/E in dish.virus2.effects)
 				r += "<BR>Effect:[E.effect.name]. Strength : [E.multiplier * 8]. Verosity : [E.chance * 15]. Type : [5-E.stage]."
-			// display the antigens
-			var/code = ""
-			for(var/V in ANTIGENS) if(text2num(V) & dish.virus2.antigen) code += ANTIGENS[V]
-			r += "<BR>Antigen pattern: [code]"
+
+			r += "<BR>Antigen pattern: [antigens2string(dish.virus2.antigen)]"

 			var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(src.loc)
 			P.info = r
@@ -59,8 +50,8 @@
 			dish = null
 			icon_state = "analyser"

-			for(var/mob/O in hearers(src, null))
-				O.show_message("\icon[src] \blue The [src.name] prints a sheet of paper", 3)
+			M.state("\The [src.name] prints a sheet of paper")
+
 	else if(dish && !scanning && !pause)
 		if(dish.virus2 && dish.growth > 50)
 			dish.growth -= 10
@@ -71,8 +62,6 @@
 			spawn(25)
 				dish.loc = src.loc
 				dish = null
-				for(var/mob/M in viewers(src))
-					M.show_message("\icon[src] \blue The [src.name] buzzes", 2)
+				M.state("\The [src.name] buzzes")
 				pause = 0
-
 	return
--- a/code/modules/virus2/antibodies.dm
+++ b/code/modules/virus2/antibodies.dm
@@ -1,23 +1,5 @@
 //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:33

-// pure concentrated antibodies
-datum/reagent/antibodies
-	data = new/list("antibodies"=0)
-	name = "Antibodies"
-	id = "antibodies"
-	reagent_state = LIQUID
-	color = "#0050F0"
-
-	reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
-		if(istype(M,/mob/living/carbon))
-			if(src.data && method == INGEST)
-				if(M:virus2) if(src.data["antibodies"] & M:virus2.antigen)
-					M:virus2.dead = 1
-			// if the virus is killed this way it immunizes
-			//		M:antibodies |= M:virus2.antigen
-				M:antibodies |= src.data["antibodies"]
-		return
-
 // reserving some numbers for later special antigens
 var/global/const/ANTIGEN_A  = 1
 var/global/const/ANTIGEN_B  = 2
@@ -33,26 +15,38 @@ var/global/const/ANTIGEN_N  = 1024
 var/global/const/ANTIGEN_P  = 2048
 var/global/const/ANTIGEN_O  = 4096

-var/global/list/ANTIGENS = list("[ANTIGEN_A]" = "A", "[ANTIGEN_B]" = "B", "[ANTIGEN_RH]" = "RH", "[ANTIGEN_Q]" = "Q",
-								      "[ANTIGEN_U]" = "U", "[ANTIGEN_V]" = "V", "[ANTIGEN_Z]" = "Z", "[ANTIGEN_M]" = "M",
-								      "[ANTIGEN_N]" = "N", "[ANTIGEN_P]" = "P", "[ANTIGEN_O]" = "O")
+var/global/list/ANTIGENS = list(
+"[ANTIGEN_A]" = "A",
+"[ANTIGEN_B]" = "B",
+"[ANTIGEN_RH]" = "RH",
+"[ANTIGEN_Q]" = "Q",
+"[ANTIGEN_U]" = "U",
+"[ANTIGEN_V]" = "V",
+"[ANTIGEN_Z]" = "Z",
+"[ANTIGEN_M]" = "M",
+"[ANTIGEN_N]" = "N",
+"[ANTIGEN_P]" = "P",
+"[ANTIGEN_O]" = "O"
+)

+// pure concentrated antibodies
+datum/reagent/antibodies
+	data = list("antibodies"=0)
+	name = "Antibodies"
+	id = "antibodies"
+	reagent_state = LIQUID
+	color = "#0050F0"

+	reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
+		if(istype(M,/mob/living/carbon))
+			if(src.data && method == INGEST)
+				if(M:virus2) if(src.data["antibodies"] & M:virus2.antigen)
+					M:virus2.dead = 1
+				M:antibodies |= src.data["antibodies"]
+		return

-/obj/item/device/antibody_scanner
-	name = "Antibody Scanner"
-	desc = "Used to scan living beings for antibodies in their blood."
-	icon_state = "health"
-	w_class = 2.0
-	item_state = "electronic"
-	flags = FPRINT | TABLEPASS | CONDUCT | USEDELAY
-
-
-/obj/item/device/antibody_scanner/attack(mob/living/carbon/human/M as mob, mob/user as mob)
-	if(! istype(M, /mob/living/carbon) || !M:antibodies)
-		user << "Unable to detect antibodies.."
-	else
-		// iterate over the list of antigens and see what matches
+// iterate over the list of antigens and see what matches
+/proc/antigens2string(var/antigens)
 	var/code = ""
-		for(var/V in ANTIGENS) if(text2num(V) & M.antibodies) code += ANTIGENS[V]
-		user << text("\blue [src] The antibody scanner displays a cryptic set of data: [code]")
+	for(var/V in ANTIGENS) if(text2num(V) & antigens) code += ANTIGENS[V]
+	return code
--- a/code/modules/virus2/cureimplanter.dm
+++ b/code/modules/virus2/cureimplanter.dm
@@ -1,43 +0,0 @@
-/obj/item/weapon/cureimplanter
-	name = "Hypospray injector"
-	icon = 'items.dmi'
-	icon_state = "implanter1"
-	var/datum/disease2/resistance/resistance = null
-	var/works = 0
-	var/datum/disease2/disease/virus2 = null
-	item_state = "syringe_0"
-	throw_speed = 1
-	throw_range = 5
-	w_class = 2.0
-
-
-/obj/item/weapon/cureimplanter/attack(mob/target as mob, mob/user as mob)
-	if(ismob(target))
-		for(var/mob/O in viewers(world.view, user))
-			if (target != user)
-				O.show_message(text("\red <B>[] is trying to inject [] with [src.name]!</B>", user, target), 1)
-			else
-				O.show_message("\red <B>[user] is trying to inject themselves with [src.name]!</B>", 1)
-		if(!do_mob(user, target,60)) return
-
-
-		for(var/mob/O in viewers(world.view, user))
-			if (target != user)
-				O.show_message(text("\red [] injects [] with [src.name]!", user, target), 1)
-			else
-				O.show_message("\red [user] injects themself with [src.name]!", 1)
-
-
-		var/mob/living/carbon/M = target
-
-		if(works == 0)
-			M.resistances2 += resistance
-			//M.immunevirus2 += M.virus2.getcopy()
-			if(M.virus2)
-				M.virus2.cure_added(resistance)
-		else if(works == 1)
-			M.adjustToxLoss(60)
-		else if(works == 2)
-			M.gib()
-		else if(works == 3)
-			infect_virus2(M,virus2,1)
--- a/code/modules/virus2/curer.dm
+++ b/code/modules/virus2/curer.dm
@@ -9,31 +9,7 @@

 /obj/machinery/computer/curer/attackby(var/obj/I as obj, var/mob/user as mob)
 	if(istype(I, /obj/item/weapon/screwdriver))
-		playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
-		if(do_after(user, 20))
-			if (src.stat & BROKEN)
-				user << "\blue The broken glass falls out."
-				var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
-				new /obj/item/weapon/shard( src.loc )
-				//var/obj/item/weapon/circuitboard/curer/M = new /obj/item/weapon/circuitboard/curer( A )
-				for (var/obj/C in src)
-					C.loc = src.loc
-				//A.circuit = M
-				A.state = 3
-				A.icon_state = "3"
-				A.anchored = 1
-				del(src)
-			else
-				user << "\blue You disconnect the monitor."
-				var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
-				//var/obj/item/weapon/circuitboard/curer/M = new /obj/item/weapon/circuitboard/curer( A )
-				for (var/obj/C in src)
-					C.loc = src.loc
-				//A.circuit = M
-				A.state = 4
-				A.icon_state = "4"
-				A.anchored = 1
-				del(src)
+		return ..(I,user)
 	if(istype(I,/obj/item/weapon/reagent_containers))
 		var/mob/living/carbon/C = user
 		if(!container)
@@ -55,7 +31,6 @@

 		state("The [src.name] Buzzes", "blue")
 		return
-	//else
 	src.attack_hand(user)
 	return

@@ -102,7 +77,6 @@
 	if(stat & (NOPOWER|BROKEN))
 		return
 	use_power(500)
-	//src.updateDialog()

 	if(curing)
 		curing -= 1
@@ -114,7 +88,6 @@
 /obj/machinery/computer/curer/Topic(href, href_list)
 	if(..())
 		return
-	if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon)))
 	usr.machine = src

 	if (href_list["antibody"])
@@ -137,11 +110,4 @@
 	data["antibodies"] = B.data["antibodies"]
 	product.reagents.add_reagent("antibodies",30,data)

-	state("The [src.name] Buzzes", "blue")
-/*
-/obj/machinery/computer/curer/proc/createvirus(var/datum/disease2/disease/virus2)
-	var/obj/item/weapon/cureimplanter/implanter = new /obj/item/weapon/cureimplanter(src.loc)
-	implanter.name = "Viral implanter (MAJOR BIOHAZARD)"
-	implanter.works = 3
-	state("The [src.name] Buzzes", "blue")
-*/
+	state("\The [src.name] buzzes", "blue")
--- a/code/modules/virus2/diseasesplicer.dm
+++ b/code/modules/virus2/diseasesplicer.dm
@@ -13,31 +13,7 @@

 /obj/machinery/computer/diseasesplicer/attackby(var/obj/I as obj, var/mob/user as mob)
 	if(istype(I, /obj/item/weapon/screwdriver))
-		playsound(src.loc, 'Screwdriver.ogg', 50, 1)
-		if(do_after(user, 20))
-			if (src.stat & BROKEN)
-				user << "\blue The broken glass falls out."
-				var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
-				new /obj/item/weapon/shard( src.loc )
-				//var/obj/item/weapon/circuitboard/diseasesplicer/M = new /obj/item/weapon/circuitboard/diseasesplicer( A )
-				for (var/obj/C in src)
-					C.loc = src.loc
-				//A.circuit = M
-				A.state = 3
-				A.icon_state = "3"
-				A.anchored = 1
-				del(src)
-			else
-				user << "\blue You disconnect the monitor."
-				var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
-				//var/obj/item/weapon/circuitboard/diseasesplicer/M = new /obj/item/weapon/circuitboard/diseasesplicer( A )
-				for (var/obj/C in src)
-					C.loc = src.loc
-				//A.circuit = M
-				A.state = 4
-				A.icon_state = "4"
-				A.anchored = 1
-				del(src)
+		return ..(I,user)
 	if(istype(I,/obj/item/weapon/virusdish))
 		var/mob/living/carbon/c = user
 		if(!dish)
@@ -49,8 +25,6 @@
 		user << "You upload the contents of the disk into the buffer"
 		memorybank = I:effect

-
-	//else
 	src.attack_hand(user)
 	return

@@ -117,7 +91,6 @@
 	if(stat & (NOPOWER|BROKEN))
 		return
 	use_power(500)
-	//src.updateDialog()

 	if(scanning)
 		scanning -= 1
@@ -143,8 +116,6 @@
 /obj/machinery/computer/diseasesplicer/Topic(href, href_list)
 	if(..())
 		return
-	if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon)))
-		usr.machine = src

 	if (href_list["grab"])
 		memorybank = locate(href_list["grab"])
@@ -171,16 +142,3 @@
 	src.add_fingerprint(usr)
 	src.updateUsrDialog()
 	return
-
-/obj/item/weapon/diseasedisk
-	name = "Blank GNA disk"
-	icon = 'cloning.dmi'
-	icon_state = "datadisk0"
-	var/datum/disease2/effectholder/effect = null
-	var/stage = 1
-
-/obj/item/weapon/diseasedisk/premade/New()
-	name = "Blank GNA disk (stage: [5-stage])"
-	effect = new /datum/disease2/effectholder
-	effect.effect = new /datum/disease2/effect/invisible
-	effect.stage = stage
--- a/code/modules/virus2/dishincubator.dm
+++ b/code/modules/virus2/dishincubator.dm
@@ -14,25 +14,8 @@
 	var/foodsupply = 0
 	var/toxins = 0

-	ex_act(severity)
-		switch(severity)
-			if(1.0)
-				del(src)
-				return
-			if(2.0)
-				if (prob(50))
-					del(src)
-					return

-	blob_act()
-		if (prob(25))
-			del(src)
-
-	meteorhit()
-		del(src)
-		return
-
-	attackby(var/obj/B as obj, var/mob/user as mob)
+/obj/machinery/disease2/incubator/attackby(var/obj/B as obj, var/mob/user as mob)
 	if(istype(B, /obj/item/weapon/reagent_containers/glass) || istype(B,/obj/item/weapon/reagent_containers/syringe))

 		if(src.beaker)
@@ -64,10 +47,9 @@
 				user << "You add the dish to the machine!"
 				src.updateUsrDialog()

-	Topic(href, href_list)
-		if(stat & BROKEN) return
-		if(usr.stat || usr.restrained()) return
-		if(!in_range(src, usr)) return
+/obj/machinery/disease2/incubator/Topic(href, href_list)
+	if(..()) return
+
 	if (href_list["ejectchem"])
 		if(beaker)
 			beaker.loc = src.loc
@@ -92,11 +74,10 @@
 		toxins = 0
 		foodsupply = 0

-
 	src.add_fingerprint(usr)
 	src.updateUsrDialog()

-	attack_hand(mob/user as mob)
+/obj/machinery/disease2/incubator/attack_hand(mob/user as mob)
 	if(stat & BROKEN)
 		return
 	user.machine = src
@@ -127,11 +108,7 @@
 	onclose(user, "incubator")
 	return

-
-
-
-	process()
-
+/obj/machinery/disease2/incubator/process()
 	if(dish && on && dish.virus2)
 		use_power(50,EQUIP)
 		if(!powered(EQUIP))
@@ -161,7 +138,6 @@
 		on = 0
 		icon_state = "incubator"

-
 	if(beaker)
 		if(!beaker.reagents.remove_reagent("virusfood",5))
 			foodsupply += 10
--- a/code/modules/virus2/isolator.dm
+++ b/code/modules/virus2/isolator.dm
@@ -8,27 +8,11 @@
 	var/isolating = 0
 	var/beaker = null

-	ex_act(severity)
-		switch(severity)
-			if(1.0)
-				del(src)
-				return
-			if(2.0)
-				if (prob(50))
-					del(src)
+/obj/machinery/disease2/isolator/attackby(var/W as obj, var/mob/user)
+	if(!istype(W,/obj/item/weapon/reagent_containers/syringe))
 		return

-	blob_act()
-		if (prob(25))
-			del(src)
-
-	meteorhit()
-		del(src)
-		return
-
-	attackby(var/obj/item/weapon/reagent_containers/glass/B as obj, var/mob/user as mob)
-		if(!istype(B,/obj/item/weapon/reagent_containers/syringe))
-			return
+	var/obj/item/weapon/reagent_containers/syringe/B = W

 	if(src.beaker)
 		user << "A syringe is already loaded into the machine."
@@ -42,10 +26,8 @@
 		src.updateUsrDialog()
 		icon_state = "isolator_in"

-	Topic(href, href_list)
-		if(stat & BROKEN) return
-		if(usr.stat || usr.restrained()) return
-		if(!in_range(src, usr)) return
+/obj/machinery/disease2/isolator/Topic(href, href_list)
+	if(..()) return

 	usr.machine = src
 	if(!beaker) return
@@ -75,7 +57,7 @@
 		src.updateUsrDialog()
 		return

-	attack_hand(mob/user as mob)
+/obj/machinery/disease2/isolator/attack_hand(mob/user as mob)
 	if(stat & BROKEN)
 		return
 	user.machine = src
@@ -101,10 +83,7 @@
 	onclose(user, "isolator")
 	return

-
-
-
-	process()
+/obj/machinery/disease2/isolator/process()
 	if(isolating > 0)
 		isolating -= 1
 		if(isolating == 0)
@@ -112,50 +91,3 @@
 			d.virus2 = virus2.getcopy()
 			virus2 = null
 			icon_state = "isolator_in"
-
-
-
-
-/obj/item/weapon/virusdish
-	name = "Virus containment/growth dish"
-	icon = 'items.dmi'
-	icon_state = "implantcase-b"
-	var/datum/disease2/disease/virus2 = null
-	var/growth = 0
-	var/info = 0
-	var/analysed = 0
-
-	reagents = list()
-
-/obj/item/weapon/virusdish/random
-	name = "Virus Sample"
-
-/obj/item/weapon/virusdish/random/New()
-	..()
-	// add a random virus to this dish
-	src.virus2 = new /datum/disease2/disease
-	src.virus2.makerandom()
-	growth = rand(5, 50)
-
-/obj/item/weapon/virusdish/attackby(var/obj/item/weapon/W as obj,var/mob/living/carbon/user as mob)
-	if(istype(W,/obj/item/weapon/hand_labeler) || istype(W,/obj/item/weapon/reagent_containers/syringe))
-		return
-	..()
-	if(prob(50))
-		user << "The dish shatters"
-		if(virus2.infectionchance > 0)
-			for(var/mob/living/carbon/target in view(null, src)) if(!target.virus2)
-				if(airborne_can_reach(src.loc, target.loc))
-					if(target.get_infection_chance())
-						infect_virus2(target,src.virus2)
-		del src
-
-/obj/item/weapon/virusdish/examine()
-	usr << "This is a virus containment dish"
-	if(src.info)
-		usr << "It has the following information about its contents"
-		usr << src.info
-
-/obj/machinery/proc/state(var/msg)
-	for(var/mob/O in hearers(src, null))
-		O.show_message("\icon[src] \blue [msg]", 2)
--- a/code/modules/virus2/monkeydispensor.dm
+++ b/code/modules/virus2/monkeydispensor.dm
@@ -1,30 +0,0 @@
-/obj/machinery/disease2/monkeycloner
-	name = "Monkey dispensor"
-	icon = 'cloning.dmi'
-	icon_state = "pod_0"
-	density = 1
-	anchored = 1
-
-	var/cloning = 0
-
-/obj/machinery/disease2/monkeycloner/attack_hand()
-	if(!cloning)
-		cloning = 150
-
-		icon_state = "pod_g"
-
-/obj/machinery/disease2/monkeycloner/process()
-	if(stat & (NOPOWER|BROKEN))
-		return
-	use_power(500)
-	//src.updateDialog()
-
-	if(cloning)
-		cloning -= 1
-		if(!cloning)
-			new /mob/living/carbon/monkey(src.loc)
-			icon_state = "pod_0"
-
-
-
-	return