cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2843 from Kilakk/master

Browse Source 
Telescopic baton extend/collapse message fix
This commit is contained in:
Chinsky
2013-05-23 13:46:47 -07:00
parent 5c26b1ea79 ef2c7af6a0
commit 4f293e5000
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/game/objects/items/weapons/swords_axes_etc.dm
View File

@@ -120,8 +120,8 @@
/obj/item/weapon/melee/telebaton/attack_self(mob/user as mob) /obj/item/weapon/melee/telebaton/attack_self(mob/user as mob)
on = !on on = !on
if(on) if(on)
user.visible_message("\red You extend the baton.",\ user.visible_message("\red With a flick of their wrist, [user] extends their telescopic baton.",\
"\red With a flick of their wrist, [user] extends their telescopic baton.",\ "\red You extend the baton.",\
"You hear an ominous click.") "You hear an ominous click.")
icon_state = "telebaton_1" icon_state = "telebaton_1"
item_state = "telebaton_1" item_state = "telebaton_1"
@@ -129,8 +129,8 @@
force = 15//quite robust force = 15//quite robust
attack_verb = list("smacked", "struck", "slapped") attack_verb = list("smacked", "struck", "slapped")
else else
user.visible_message("\blue You collapse the baton.",\ user.visible_message("\blue [user] collapses their telescopic baton.",\
"\blue [user] collapses their telescopic baton.",\ "\blue You collapse the baton.",\
"You hear a click.") "You hear a click.")
icon_state = "telebaton_0" icon_state = "telebaton_0"
item_state = "telebaton_0" item_state = "telebaton_0"