diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index d3aa10ebe4c..9845389d9af 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -60770,7 +60770,6 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/reagent_containers/spray/cleaner, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -65729,7 +65728,6 @@ }, /obj/item/storage/box/bodybags, /obj/item/pen, -/obj/item/reagent_containers/spray/cleaner, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ dir = 4; @@ -65811,7 +65809,6 @@ pixel_x = 3 }, /obj/item/screwdriver, -/obj/item/reagent_containers/spray/cleaner, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel/white, /area/medical/medbay) @@ -68967,10 +68964,6 @@ pixel_x = 5; pixel_y = 5 }, -/obj/item/reagent_containers/spray/cleaner{ - desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; - name = "Surgery Cleaner" - }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 931b2884883..3f090580ff5 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -40044,9 +40044,6 @@ pixel_x = -4; pixel_y = 4 }, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = 8 - }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -41953,10 +41950,6 @@ /obj/structure/table/reinforced, /obj/item/clothing/glasses/science, /obj/item/clothing/glasses/science, -/obj/item/reagent_containers/spray/cleaner{ - desc = "Someone has crossed out the 'Space' from Space Cleaner and written in Chemistry. Scrawled on the back is, 'Okay, whoever filled this with polytrinic acid, it was only funny the first time. It was hard enough replacing the CMO's first cat!'"; - name = "Chemistry Cleaner" - }, /obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the 'Space' from Space Cleaner and written in Chemistry. Scrawled on the back is, 'Okay, whoever filled this with polytrinic acid, it was only funny the first time. It was hard enough replacing the CMO's first cat!'"; name = "Chemistry Cleaner" diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm index daf4b6d1b94..8633aedf15b 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm @@ -1632,8 +1632,8 @@ /obj/structure/rack{ dir = 8 }, -/obj/item/reagent_containers/spray/cleaner, -/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner/advanced, +/obj/item/reagent_containers/spray/cleaner/advanced, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -2376,7 +2376,7 @@ /obj/structure/table/glass, /obj/item/reagent_containers/syringe/antiviral, /obj/item/reagent_containers/dropper, -/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner/advanced, /obj/machinery/light{ dir = 4 }, @@ -4138,7 +4138,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner/advanced, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurple" @@ -4592,7 +4592,7 @@ /obj/item/screwdriver/nuke{ pixel_y = 18 }, -/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner/advanced, /obj/structure/cable{ d1 = 1; d2 = 2; diff --git a/_maps/map_files/cerestation/cerestation.dmm b/_maps/map_files/cerestation/cerestation.dmm index f997e40a823..1988cd67235 100644 --- a/_maps/map_files/cerestation/cerestation.dmm +++ b/_maps/map_files/cerestation/cerestation.dmm @@ -57905,7 +57905,6 @@ name = "east bump" }, /obj/structure/table/glass, -/obj/item/reagent_containers/spray/cleaner, /obj/item/storage/box/masks{ pixel_y = 5 }, diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 2aabccab658..a253eae3cb4 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -32365,10 +32365,6 @@ pixel_x = -4; pixel_y = 5 }, -/obj/item/reagent_containers/spray/cleaner{ - desc = "Someone has crossed out the 'Space' from Space Cleaner and written in Chemistry. Scrawled on the back is, 'Okay, whoever filled this with polytrinic acid, it was only funny the first time. It was hard enough replacing the CMO's first cat!'"; - name = "Chemistry Cleaner" - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -45138,10 +45134,6 @@ /area/medical/cmostore) "ckC" = ( /obj/structure/rack, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = -3; - pixel_y = 3 - }, /obj/item/reagent_containers/spray/cleaner{ pixel_x = 2 }, @@ -46626,9 +46618,6 @@ /area/blueshield) "coZ" = ( /obj/structure/table, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = -3 - }, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -46751,7 +46740,6 @@ pixel_y = 10 }, /obj/item/soap/nanotrasen, -/obj/item/reagent_containers/spray/cleaner, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -49278,9 +49266,6 @@ /obj/machinery/defibrillator_mount/loaded{ pixel_y = -30 }, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = -3 - }, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -59553,7 +59538,6 @@ "cZy" = ( /obj/structure/table/glass, /obj/item/clothing/gloves/color/latex, -/obj/item/reagent_containers/spray/cleaner, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurple" @@ -70605,11 +70589,6 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/reagent_containers/spray/cleaner{ - desc = "Someone has crossed out the 'Space' from Space Cleaner and written in Chemistry. Scrawled on the back is, 'Okay, whoever filled this with polytrinic acid, it was only funny the first time. It was hard enough replacing the CMO's first cat!'"; - name = "Chemistry Cleaner"; - pixel_x = -8 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "purple" @@ -80930,9 +80909,6 @@ }, /obj/structure/table/glass, /obj/item/storage/box/bodybags, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = -3 - }, /obj/structure/cable{ d1 = 4; d2 = 8; diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index a9029ca4929..4f2d9fbbc78 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -200,7 +200,7 @@ /obj/item/storage/belt/utility/full/multitool = 150, /obj/item/clothing/gloves/combat = 100, /obj/item/clothing/glasses/welding = 50, - /obj/item/reagent_containers/spray/cleaner = 100, + /obj/item/reagent_containers/spray/cleaner/advanced = 100, /obj/item/clothing/shoes/magboots = 50, /obj/item/soap = 50, /obj/item/clothing/under/syndicate/combat = 50, diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm index 7a9afec639c..5c00040836d 100644 --- a/code/game/objects/items/weapons/mop.dm +++ b/code/game/objects/items/weapons/mop.dm @@ -12,7 +12,7 @@ resistance_flags = FLAMMABLE var/mopping = 0 var/mopcount = 0 - var/mopcap = 5 + var/mopcap = 6 var/mopspeed = 30 /obj/item/mop/New() @@ -33,7 +33,7 @@ janicart_insert(user, o) return - o.reagents.trans_to(src, 5) + o.reagents.trans_to(src, 6) to_chat(user, "You wet [src] in [o].") playsound(loc, 'sound/effects/slosh.ogg', 25, 1) diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 9b818215b4d..a5f78b174c2 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -444,7 +444,7 @@ /obj/item/storage/belt/janitor/full/populate_contents() new /obj/item/lightreplacer(src) new /obj/item/holosign_creator/janitor(src) - new /obj/item/reagent_containers/spray/cleaner(src) + new /obj/item/reagent_containers/spray/cleaner/advanced(src) new /obj/item/soap(src) new /obj/item/grenade/chem_grenade/cleaner(src) new /obj/item/grenade/chem_grenade/cleaner(src) diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm index 708fd2a7756..29bc3650a59 100644 --- a/code/game/objects/items/weapons/tanks/watertank.dm +++ b/code/game/objects/items/weapons/tanks/watertank.dm @@ -182,15 +182,18 @@ icon = 'icons/obj/watertank.dmi' icon_state = "misterjani" item_state = "misterjani" - amount_per_transfer_from_this = 5 + spray_maxrange = 4 + spray_currentrange = 4 + amount_per_transfer_from_this = 10 possible_transfer_amounts = null /obj/item/watertank/janitor/make_noz() return new /obj/item/reagent_containers/spray/mister/janitor(src) /obj/item/reagent_containers/spray/mister/janitor/attack_self(mob/user) - amount_per_transfer_from_this = (amount_per_transfer_from_this == 10 ? 5 : 10) - to_chat(user, "You [amount_per_transfer_from_this == 10 ? "remove" : "fix"] the nozzle. You'll now use [amount_per_transfer_from_this] units per spray.") + amount_per_transfer_from_this = (amount_per_transfer_from_this == 5 ? 10 : 5) + spray_currentrange = (spray_currentrange == 2 ? spray_maxrange : 2) + to_chat(user, "You [amount_per_transfer_from_this == 5 ? "remove" : "fix"] the nozzle. You'll now use [amount_per_transfer_from_this] units per spray.") //ATMOS FIRE FIGHTING BACKPACK diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 5bed9d373e8..781de699bf9 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -474,14 +474,6 @@ cleaned_human.clean_blood() to_chat(cleaned_human, "[src] cleans your face!") -/obj/item/reagent_containers/spray/cyborg_lube - name = "Lube spray" - list_reagents = list("lube" = 250) - -/obj/item/reagent_containers/spray/cyborg_lube/cyborg_recharge(coeff, emagged) - if(emagged) - reagents.check_and_add("lube", volume, 2 * coeff) - // Service cyborg module. /obj/item/robot_module/butler name = "service robot module" diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index dd7abdbf74f..94f51185e39 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -112,9 +112,27 @@ //space cleaner /obj/item/reagent_containers/spray/cleaner name = "space cleaner" - desc = "BLAM!-brand non-foaming space cleaner!" + desc = "Your standard spritz cleaner bottle designed to keep ALL of your workplaces spotless." + spray_maxrange = 2 + spray_currentrange = 2 + amount_per_transfer_from_this = 10 list_reagents = list("cleaner" = 250) +/obj/item/reagent_containers/spray/cleaner/attack_self(mob/user) + amount_per_transfer_from_this = (amount_per_transfer_from_this == 5 ? 10 : 5) + spray_currentrange = (spray_currentrange == 1 ? spray_maxrange : 1) + to_chat(user, "You [amount_per_transfer_from_this == 5 ? "remove" : "fix"] the nozzle. You'll now use [amount_per_transfer_from_this] units per spray.") + +/obj/item/reagent_containers/spray/cleaner/advanced + name = "advanced space cleaner" + desc = "BLAM!-brand non-foaming space cleaner!" + icon_state = "adv_cleaner" + item_state = "adv_cleaner" + volume = 500 + spray_maxrange = 3 + spray_currentrange = 3 + list_reagents = list("cleaner" = 500) + /obj/item/reagent_containers/spray/cleaner/safety desc = "BLAM!-brand non-foaming space cleaner! This spray bottle can only accept space cleaner." @@ -131,12 +149,23 @@ /obj/item/reagent_containers/spray/cleaner/drone name = "space cleaner" desc = "BLAM!-brand non-foaming space cleaner!" + spray_maxrange = 3 + spray_currentrange = 3 + amount_per_transfer_from_this = 5 volume = 50 list_reagents = list("cleaner" = 50) /obj/item/reagent_containers/spray/cleaner/drone/cyborg_recharge(coeff, emagged) reagents.check_and_add("cleaner", volume, 3 * coeff) +/obj/item/reagent_containers/spray/cyborg_lube + name = "lube spray" + list_reagents = list("lube" = 250) + +/obj/item/reagent_containers/spray/cyborg_lube/cyborg_recharge(coeff, emagged) + if(emagged) + reagents.check_and_add("lube", volume, 2 * coeff) + //spray tan /obj/item/reagent_containers/spray/spraytan name = "spray tan" diff --git a/code/modules/response_team/ert_outfits.dm b/code/modules/response_team/ert_outfits.dm index a3561ae27bc..47a41cc5ee3 100644 --- a/code/modules/response_team/ert_outfits.dm +++ b/code/modules/response_team/ert_outfits.dm @@ -491,7 +491,7 @@ l_pocket = /obj/item/melee/classic_baton/telescopic backpack_contents = list( /obj/item/grenade/chem_grenade/antiweed = 2, - /obj/item/reagent_containers/spray/cleaner = 1, + /obj/item/reagent_containers/spray/cleaner/advanced = 1, /obj/item/storage/bag/trash = 1, /obj/item/storage/box/lights/mixed = 1, /obj/item/melee/flyswatter = 1) @@ -533,7 +533,7 @@ /obj/item/grenade/clusterbuster/cleaner = 1, /obj/item/storage/box/lights/mixed = 1, /obj/item/storage/bag/trash/bluespace = 1, - /obj/item/reagent_containers/spray/cleaner = 1, + /obj/item/reagent_containers/spray/cleaner/advanced = 1, /obj/item/melee/flyswatter = 1 ) diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi index a742170d01a..b964ac39670 100644 Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi index ec7f599a6ac..3ac1bdfba12 100644 Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ diff --git a/icons/obj/janitor.dmi b/icons/obj/janitor.dmi index 65a688c8543..5e70d452c91 100644 Binary files a/icons/obj/janitor.dmi and b/icons/obj/janitor.dmi differ