cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 20:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

removes the test-merge only code from the combat mode commit (#56634)

Browse Source 
Co-authored-by: Mothblocks <35135081+Jared-Fogle@users.noreply.github.com>
This commit is contained in:
Qustinnus
2021-02-03 19:55:38 -08:00
committed by GitHub
co-authored by Mothblocks
parent 35fada74b2
commit 63399f90ee
5 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/melee/misc.dm
+1 -1
View File
@@ -173,7 +173,7 @@
/obj/item/melee/classic_baton
name = "police baton"
desc = "A wooden truncheon for beating criminal scum."
desc = "A wooden truncheon for beating criminal scum. Left click to stun, right click to harm."
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "classic_baton"
inhand_icon_state = "classic_baton"
code/game/objects/items/stunbaton.dm
+2 -2
View File
@@ -1,6 +1,6 @@
/obj/item/melee/baton
name = "stun baton"
desc = "A stun baton for incapacitating people with. Left click to harm, right click to stun."
desc = "A stun baton for incapacitating people with. Left click to stun, right click to harm."
icon_state = "stunbaton"
inhand_icon_state = "baton"
@@ -279,7 +279,7 @@
//Makeshift stun baton. Replacement for stun gloves.
/obj/item/melee/baton/cattleprod
name = "stunprod"
desc = "An improvised stun baton. Left click to harm, right click to stun."
desc = "An improvised stun baton. Left click to stun, right click to harm."
icon_state = "stunprod"
inhand_icon_state = "prod"
worn_icon_state = null