dubious quality code

shiptest-ss13 · Sep 8, 2024 · ed77dc4 · ed77dc4
1 parent 3abd470
commit ed77dc4
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 13 deletions.
diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm
@@ -71,23 +71,26 @@
 	lifetime = 80
 	amount = 0 //no spread
 	slippery_foam = FALSE
+	color = "#A6FAFF55"
+
 
 /obj/effect/particle_effect/foam/antirad/process()
 	..()
 
 	var/turf/open/T = get_turf(src)
 	var/obj/effect/radiation/rads = (locate(/obj/effect/radiation) in T)
 	if(rads && istype(T))
-		qdel(rads)
+		rads.rad_power = rads.rad_power * rand(0.8, 0.95)
+		if (rads.rad_power <= RAD_BACKGROUND_RADIATION)
+			qdel(rads)
+	for(var/obj/things in get_turf(src))
+		things.wash(CLEAN_RAD)
 
 /obj/effect/particle_effect/foam/antirad/kill_foam()
 	STOP_PROCESSING(SSfastprocess, src)
 	flick("[icon_state]-disolve", src)
 	QDEL_IN(src, 5)
 
-/obj/effect/particle_effect/foam/antirad/foam_mob(mob/living/L)
-	for()
-
 /obj/effect/particle_effect/foam/metal
 	name = "aluminium foam"
 	metal = ALUMINIUM_FOAM

diff --git a/code/game/objects/items/tanks/watertank.dm b/code/game/objects/items/tanks/watertank.dm
@@ -175,6 +175,39 @@
 	amount_per_transfer_from_this = (amount_per_transfer_from_this == 10 ? 5 : 10)
 	to_chat(user, "<span class='notice'>You [amount_per_transfer_from_this == 10 ? "remove" : "fix"] the nozzle. You'll now use [amount_per_transfer_from_this] units per spray.</span>")
 
+//radiation cleanup pack
+
+/obj/item/watertank/anti_rad
+	name = "radiation foam pack"
+	desc = "A pressurized backpack tank with sprayer nozzle, intended to clean up radioactive hazards."
+	item_state = "waterbackpackatmos"
+	icon_state = "waterbackpackatmos"
+	volume = 200
+	slowdown = 0.3
+
+/obj/item/watertank/anti_rad/Initialize()
+	. = ..()
+	reagents.add_reagent(/datum/reagent/anti_radiation_foam, 200)
+
+
+/obj/item/reagent_containers/spray/mister/anti_rad
+	name = "spray nozzle"
+	desc = "A heavy duty nozzle attached to a radiation foam tank."
+	icon_state = "atmos_nozzle"
+	item_state = "nozzleatmos"
+	amount_per_transfer_from_this = 5
+	possible_transfer_amounts = list()
+	current_range = 6
+	spray_range = 6
+
+
+/obj/item/watertank/anti_rad/make_noz()
+	return new /obj/item/reagent_containers/spray/mister/anti_rad(src)
+
+/obj/item/reagent_containers/spray/mister/anti_rad/attack_self(mob/user)
+	amount_per_transfer_from_this = (amount_per_transfer_from_this == 10 ? 5 : 10)
+	to_chat(user, "<span class='notice'>You [amount_per_transfer_from_this == 10 ? "tigten" : "loosen"] the nozzle. You'll now use [amount_per_transfer_from_this] units per spray.</span>")
+
 //ATMOS FIRE FIGHTING BACKPACK
 
 #define EXTINGUISHER 0

diff --git a/code/modules/cargo/packs/tools.dm b/code/modules/cargo/packs/tools.dm
@@ -140,3 +140,14 @@
 	contains = list(/obj/structure/reagent_dispensers/foamtank)
 	crate_name = "foam tank crate"
 	crate_type = /obj/structure/closet/crate/large
+
+/datum/supply_pack/tools/radfoamtank
+	name = "Radiation Foam Tank Crate"
+	desc = "Contains a tank of anti-radiation foam. Pressurized sprayer included!"
+	cost = 1500
+	contains = list(
+		/obj/item/watertank/anti_rad,
+		/obj/structure/reagent_dispensers/foamtank/antirad
+	)
+	crate_name = "foam tank crate"
+	crate_type = /obj/structure/closet/crate/large
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -2539,7 +2539,7 @@
 	color = "#A6FAFF55"
 	taste_description = "the inside of a fire extinguisher"
 
-/datum/reagent/firefighting_foam/expose_turf(turf/open/T, reac_volume)
+/datum/reagent/anti_radiation_foam/expose_turf(turf/open/T, reac_volume)
 	if (!istype(T))
 		return
 
@@ -2548,16 +2548,12 @@
 		if(!F)
 			F = new(T)
 		else if(istype(F))
-			F.lifetime = initial(F.lifetime) //reduce object churn a little bit when using smoke by keeping existing foam alive a bit longer
+			F.lifetime = initial(F.lifetime) //the foam is what does the cleaning here
 
-	var/obj/effect/radiation/rads = (locate(/obj/effect/radiation) in T)
-	if(rads && istype(T))
-		qdel(rads)
-
-/datum/reagent/firefighting_foam/expose_obj(obj/O, reac_volume)
+/datum/reagent/anti_radiation_foam/expose_obj(obj/O, reac_volume)
 	O.wash(CLEAN_RAD)
 
-/datum/reagent/firefighting_foam/expose_mob(mob/living/M, method=TOUCH, reac_volume)
+/datum/reagent/anti_radiation_foam/expose_mob(mob/living/M, method=TOUCH, reac_volume)
 	if(method in list(TOUCH))
 		M.radiation = M.radiation - rand(max(M.radiation * 0.95, M.radiation)) //get the hose
 		M.ExtinguishMob()

diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm
@@ -58,6 +58,10 @@
 	reagent_id = /datum/reagent/firefighting_foam
 	tank_volume = 500
 
+/obj/structure/reagent_dispensers/foamtank/antirad
+	reagent_id = /datum/reagent/anti_radiation_foam
+	tank_volume = 1000
+
 /obj/structure/reagent_dispensers/fueltank
 	name = "fuel tank"
 	desc = "A tank full of industrial welding fuel. Do not consume."

diff --git a/shiptest.dme b/shiptest.dme
@@ -1944,7 +1944,6 @@
 #include "code\modules\cargo\packs\gun.dm"
 #include "code\modules\cargo\packs\machinery.dm"
 #include "code\modules\cargo\packs\material.dm"
-#include "code\modules\cargo\packs\mechs.dm"
 #include "code\modules\cargo\packs\medical.dm"
 #include "code\modules\cargo\packs\sec_supply.dm"
 #include "code\modules\cargo\packs\spacesuit_armor.dm"