shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

.

Browse Source
This commit is contained in:
Ghommie
2019-06-12 23:16:27 +02:00
parent a29095cbe1
commit 2edef99b08
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stunbaton.dm
+2 -3
View File
@@ -22,11 +22,10 @@
var/preload_cell_type //if not empty the baton starts with this type of cell var/preload_cell_type //if not empty the baton starts with this type of cell
/obj/item/melee/baton/get_cell() /obj/item/melee/baton/get_cell()
var/obj/item/stock_parts/cell/our_cell = cell . = cell
if(iscyborg(loc)) if(iscyborg(loc))
var/mob/living/silicon/robot/R = loc var/mob/living/silicon/robot/R = loc
our_cell = R.get_cell() . = R.get_cell()
return our_cell
/obj/item/melee/baton/suicide_act(mob/user) /obj/item/melee/baton/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is putting the live [name] in [user.p_their()] mouth! It looks like [user.p_theyre()] trying to commit suicide!</span>") user.visible_message("<span class='suicide'>[user] is putting the live [name] in [user.p_their()] mouth! It looks like [user.p_theyre()] trying to commit suicide!</span>")