From 2edef99b0861e3649d12da5752db2c3d5a2a90d4 Mon Sep 17 00:00:00 2001 From: Ghommie Date: Wed, 12 Jun 2019 23:16:27 +0200 Subject: [PATCH] . --- code/game/objects/items/stunbaton.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm index 6dcda74aaa..dae9545fbb 100644 --- a/code/game/objects/items/stunbaton.dm +++ b/code/game/objects/items/stunbaton.dm @@ -22,11 +22,10 @@ var/preload_cell_type //if not empty the baton starts with this type of cell /obj/item/melee/baton/get_cell() - var/obj/item/stock_parts/cell/our_cell = cell + . = cell if(iscyborg(loc)) var/mob/living/silicon/robot/R = loc - our_cell = R.get_cell() - return our_cell + . = R.get_cell() /obj/item/melee/baton/suicide_act(mob/user) user.visible_message("[user] is putting the live [name] in [user.p_their()] mouth! It looks like [user.p_theyre()] trying to commit suicide!")