From 9606d98f232838eda26af49a90de85bebc676160 Mon Sep 17 00:00:00 2001
From: Killian <49700375+KillianKirilenko@users.noreply.github.com>
Date: Mon, 22 May 2023 19:09:45 +0100
Subject: [PATCH] Update stunbaton.dm
---
code/game/objects/items/weapons/stunbaton.dm | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm
index 579e8a7419a..8feb3b2c92b 100644
--- a/code/game/objects/items/weapons/stunbaton.dm
+++ b/code/game/objects/items/weapons/stunbaton.dm
@@ -23,6 +23,7 @@
var/hitcost = 240
var/use_external_power = FALSE //only used to determine if it's a cyborg baton
var/grip_safety = TRUE
+ var/taped_safety = FALSE
/obj/item/weapon/melee/baton/New()
..()
@@ -100,7 +101,7 @@
/obj/item/weapon/melee/baton/dropped()
..()
- if(status && grip_safety)
+ if(status && grip_safety && !taped_safety)
status = 0
visible_message("\The [src]'s grip safety engages!")
update_icon()
@@ -109,6 +110,8 @@
. = ..()
if(Adjacent(user))
+ if(taped_safety)
+ . += "Someone has wrapped tape around the grip!"
if(bcell)
. += "The baton is [round(bcell.percent())]% charged."
if(!bcell)
@@ -129,6 +132,17 @@
to_chat(user, "[src] already has a cell.")
else
to_chat(user, "This cell is not fitted for [src].")
+ if(istype(W, /obj/item/weapon/tape_roll) || istype(W, /obj/item/taperoll))
+ if(grip_safety && !taped_safety) //no point letting people wrap tape around the grips of batons without a safety
+ to_chat(user, "You firmly wrap tape around the baton's grip, disabling the safety system.")
+ playsound(src, 'sound/effects/tape.ogg',25)
+ taped_safety = TRUE
+ else if(grip_safety && taped_safety)
+ to_chat(user, "The grip safety has already been taped down.")
+ if(istype(W, /obj/item/weapon/tool/screwdriver))
+ if(taped_safety)
+ to_chat(user, "You painstakingly scrape away the tape over the grip safety.")
+ taped_safety = FALSE
/obj/item/weapon/melee/baton/attack_hand(mob/user as mob)
if(user.get_inactive_hand() == src)