diff --git a/code/game/objects/items/tanks/watertank.dm b/code/game/objects/items/tanks/watertank.dm index 631512d7122..972a22ff515 100644 --- a/code/game/objects/items/tanks/watertank.dm +++ b/code/game/objects/items/tanks/watertank.dm @@ -162,14 +162,45 @@ lefthand_file = 'icons/mob/inhands/equipment/mister_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/mister_righthand.dmi' amount_per_transfer_from_this = 5 - possible_transfer_amounts = list(5,10) + possible_transfer_amounts = list(5, 10) current_range = 5 /obj/item/watertank/janitor/make_noz() return new /obj/item/reagent_containers/spray/mister/janitor(src) /obj/item/reagent_containers/spray/mister/janitor/mode_change_message(mob/user) - to_chat(user, span_notice("You [amount_per_transfer_from_this == 10 ? "remove" : "fix"] the nozzle. You'll now use [amount_per_transfer_from_this] units per spray.")) + to_chat(user, span_notice("You [amount_per_transfer_from_this == 10 ? "remove" : "affix"] the nozzle. You'll now use [amount_per_transfer_from_this] units per spray.")) + +//Security tank +/obj/item/watertank/pepperspray + name = "ANTI-TIDER-2500 suppression backpack" + desc = "The ultimate crowd-control device; this tool allows the user to quickly and efficiently pacify groups of hostile targets." + icon = 'icons/obj/hydroponics/equipment.dmi' + icon_state = "pepperbackpacksec" + inhand_icon_state = "pepperbackpacksec" + custom_price = PAYCHECK_MEDIUM * 2 + +/obj/item/watertank/pepperspray/Initialize() + . = ..() + reagents.add_reagent(/datum/reagent/consumable/condensedcapsaicin, 500) + +/obj/item/reagent_containers/spray/mister/pepperspray + name = "security spray nozzle" + desc = "A pacifying spray nozzle attached to a pepperspray tank, designed to silence perps." + icon = 'icons/obj/hydroponics/equipment.dmi' + icon_state = "mistersec" + inhand_icon_state = "mistersec" + lefthand_file = 'icons/mob/inhands/equipment/mister_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/mister_righthand.dmi' + amount_per_transfer_from_this = 5 + possible_transfer_amounts = list(5, 10) + current_range = 6 + +/obj/item/watertank/pepperspray/make_noz() + return new /obj/item/reagent_containers/spray/mister/pepperspray(src) + +/obj/item/reagent_containers/spray/mister/pepperspray/mode_change_message(mob/user) + to_chat(user, span_notice("You [amount_per_transfer_from_this == 10 ? "remove" : "affix"] the nozzle. You'll now use [amount_per_transfer_from_this] units per spray.")) //ATMOS FIRE FIGHTING BACKPACK diff --git a/code/modules/vending/security.dm b/code/modules/vending/security.dm index 0f8f7ad3228..d642f27dae4 100644 --- a/code/modules/vending/security.dm +++ b/code/modules/vending/security.dm @@ -21,7 +21,8 @@ /obj/item/clothing/head/helmet/blueshirt = 1, /obj/item/clothing/suit/armor/vest/blueshirt = 1, /obj/item/clothing/gloves/tackler = 5, - /obj/item/grenade/stingbang = 1) + /obj/item/grenade/stingbang = 1, + /obj/item/watertank/pepperspray = 2) refill_canister = /obj/item/vending_refill/security default_price = PAYCHECK_MEDIUM extra_price = PAYCHECK_HARD * 1.5 diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi index 79a4473aff7..09b69094adf 100644 Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ diff --git a/icons/mob/inhands/equipment/backpack_lefthand.dmi b/icons/mob/inhands/equipment/backpack_lefthand.dmi index ac282acfedb..22c9b923e38 100644 Binary files a/icons/mob/inhands/equipment/backpack_lefthand.dmi and b/icons/mob/inhands/equipment/backpack_lefthand.dmi differ diff --git a/icons/mob/inhands/equipment/backpack_righthand.dmi b/icons/mob/inhands/equipment/backpack_righthand.dmi index dd3d59762b0..11748e4ef9c 100644 Binary files a/icons/mob/inhands/equipment/backpack_righthand.dmi and b/icons/mob/inhands/equipment/backpack_righthand.dmi differ diff --git a/icons/mob/inhands/equipment/mister_lefthand.dmi b/icons/mob/inhands/equipment/mister_lefthand.dmi index 408b7275838..71347954e0e 100644 Binary files a/icons/mob/inhands/equipment/mister_lefthand.dmi and b/icons/mob/inhands/equipment/mister_lefthand.dmi differ diff --git a/icons/mob/inhands/equipment/mister_righthand.dmi b/icons/mob/inhands/equipment/mister_righthand.dmi index 2b5746aac34..44f394363df 100644 Binary files a/icons/mob/inhands/equipment/mister_righthand.dmi and b/icons/mob/inhands/equipment/mister_righthand.dmi differ diff --git a/icons/obj/hydroponics/equipment.dmi b/icons/obj/hydroponics/equipment.dmi index 019f52b9721..6dbde015374 100644 Binary files a/icons/obj/hydroponics/equipment.dmi and b/icons/obj/hydroponics/equipment.dmi differ