Greys yearn for this PR, Replaces borg extinguishers with a Firefighting Foam variant. (#29327)

* adds a cyborg FE that starts with FFF, and replaces the old extinuishers, except for the syndicate ones.

* allows syndicate medical borg to refill their extinguisher, whoops

* Update code/game/objects/items/weapons/extinguisher.dm

grammar

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: YoureNotTheSharpest <107788621+YoureNotTheSharpest@users.noreply.github.com>

* adds spaces to comments as requested

---------

Signed-off-by: YoureNotTheSharpest <107788621+YoureNotTheSharpest@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

code/game/objects/items/weapons/extinguisher.dm

@@ -58,6 +58,14 @@
 	reagent_capacity = 30
 	dog_fashion = null
 
+/obj/item/extinguisher/mini/cyborg
+	name = "integrated fire extinguisher"
+	desc = "A miniature fire extinguisher designed to store firefighting foam."
+	icon_state = "cyborgFE0"
+	item_state = "cyborgFE"
+	base_icon_state = "cyborgFE"
+	reagent_id = "firefighting_foam"
+
 /obj/item/extinguisher/examine(mob/user)
 	. = ..()
 	if(has_safety)
@@ -164,7 +172,7 @@
 		INVOKE_ASYNC(water, TYPE_PROC_REF(/obj/effect/particle_effect/water, extinguish_move), new_target)
 
 /obj/item/extinguisher/cyborg_recharge(coeff, emagged)
-	reagents.check_and_add("water", reagent_capacity, 5 * coeff)
+	reagents.check_and_add(reagent_id, reagent_capacity, 5 * coeff)
 
 /obj/item/extinguisher/proc/buckled_speed_move(obj/structure/chair/buckled_to, direction) // Buckled_to may not be a chair here, but we're assuming so because it makes it easier to typecheck
 	var/movementdirection = turn(direction, 180)

code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -347,7 +347,7 @@
 		/obj/item/bonesetter,
 		/obj/item/bonegel,
 		/obj/item/fix_o_vein,
-		/obj/item/extinguisher/mini,
+		/obj/item/extinguisher/mini/cyborg,
 		/obj/item/reagent_containers/glass/beaker/large,
 		/obj/item/reagent_containers/dropper,
 		/obj/item/reagent_containers/syringe,
@@ -360,7 +360,7 @@
 	)
 	malf_modules = list(/obj/item/gun/syringemalf)
 	special_rechargables = list(
-		/obj/item/extinguisher/mini,
+		/obj/item/extinguisher/mini/cyborg,
 		/obj/item/gun/syringemalf
 	)
 
@@ -452,6 +452,7 @@
 		/obj/item/flash/cyborg,
 		/obj/item/rpd,
 		/obj/item/extinguisher,
+		/obj/item/extinguisher/mini/cyborg, // Give them the option of BOTH extinguishers
 		/obj/item/weldingtool/largetank/cyborg,
 		/obj/item/screwdriver/cyborg,
 		/obj/item/wrench/cyborg,
@@ -478,7 +479,7 @@
 	emag_modules = list(/obj/item/melee/baton/loaded/borg_stun_arm, /obj/item/restraints/handcuffs/cable/zipties/cyborg, /obj/item/rcd/borg)
 	override_modules = list(/obj/item/gun/energy/emitter/cyborg/proto)
 	malf_modules = list(/obj/item/gun/energy/emitter/cyborg)
-	special_rechargables = list(/obj/item/extinguisher, /obj/item/weldingtool/largetank/cyborg, /obj/item/gun/energy/emitter/cyborg)
+	special_rechargables = list(/obj/item/extinguisher, /obj/item/extinguisher/mini/cyborg, /obj/item/weldingtool/largetank/cyborg, /obj/item/gun/energy/emitter/cyborg)
 
 /obj/item/robot_module/engineering/handle_death(mob/living/silicon/robot/R, gibbed)
 	var/obj/item/gripper/engineering/G = locate(/obj/item/gripper/engineering) in modules
@@ -536,7 +537,7 @@
 		/obj/item/mop/advanced/cyborg,
 		/obj/item/lightreplacer/cyborg,
 		/obj/item/holosign_creator/janitor,
-		/obj/item/extinguisher/mini,
+		/obj/item/extinguisher/mini/cyborg,
 		/obj/item/melee/flyswatter
 	)
 	emag_override_modules = list(/obj/item/reagent_containers/spray/cyborg_lube)
@@ -546,7 +547,7 @@
 		/obj/item/lightreplacer,
 		/obj/item/reagent_containers/spray/cyborg_lube,
 		/obj/item/reagent_containers/spray/cyborg_facid,
-		/obj/item/extinguisher/mini
+		/obj/item/extinguisher/mini/cyborg
 	)
 
 /obj/item/robot_module/janitor/handle_death(mob/living/silicon/robot/R, gibbed)
@@ -705,7 +706,7 @@
 		/obj/item/pickaxe/drill/cyborg,
 		/obj/item/shovel,
 		/obj/item/weldingtool/mini,
-		/obj/item/extinguisher/mini,
+		/obj/item/extinguisher/mini/cyborg,
 		/obj/item/t_scanner/adv_mining_scanner/cyborg,
 		/obj/item/gun/energy/kinetic_accelerator/cyborg,
 		/obj/item/gps/cyborg,
@@ -713,7 +714,7 @@
 	)
 	emag_modules = list(/obj/item/pickaxe/drill/jackhammer)
 	malf_modules = list(/obj/item/gun/energy/kinetic_accelerator/cyborg/malf)
-	special_rechargables = list(/obj/item/extinguisher/mini, /obj/item/weldingtool/mini)
+	special_rechargables = list(/obj/item/extinguisher/mini/cyborg, /obj/item/weldingtool/mini)
 
 /obj/item/robot_module/miner/handle_death(mob/living/silicon/robot/R, gibbed)
 	var/obj/item/gripper/mining/G = locate(/obj/item/gripper/mining) in modules
@@ -857,7 +858,7 @@
 		/obj/item/stack/medical/splint/cyborg/syndicate,
 		/obj/item/stack/nanopaste/cyborg/syndicate,
 		/obj/item/gun/medbeam,
-		/obj/item/extinguisher/mini,
+		/obj/item/extinguisher/mini, // Why the hell would the syndicate care about greys?
 		/obj/item/gripper/medical,
 	)
 	special_rechargables = list(/obj/item/extinguisher/mini)
@@ -880,7 +881,7 @@
 		/obj/item/flash/cyborg,
 		/obj/item/rcd/borg/syndicate,
 		/obj/item/rpd,
-		/obj/item/extinguisher,
+		/obj/item/extinguisher, // Syndicate dont care about no greys.
 		/obj/item/weldingtool/largetank/cyborg,
 		/obj/item/screwdriver/cyborg,
 		/obj/item/wrench/cyborg,
@@ -929,12 +930,12 @@
 		/obj/item/melee/baton/loaded, // secondary weapon, for things immune to burn, immune to ranged weapons, or for arresting low-grade threats
 		/obj/item/restraints/handcuffs/cable/zipties/cyborg,
 		/obj/item/pickaxe/drill/jackhammer, // for breaking walls to execute flanking moves
-		/obj/item/extinguisher/mini // for friendly fire from their immolator gun.
+		/obj/item/extinguisher/mini/cyborg // for friendly fire from their immolator gun.
 	)
 	special_rechargables = list(
 		/obj/item/melee/baton/loaded,
 		/obj/item/gun/energy/immolator/multi/cyborg,
-		/obj/item/extinguisher/mini
+		/obj/item/extinguisher/mini/cyborg
 	)
 
 // Destroyer security module.