From 35eea8841c3a6dbef89c84015c4a83c9bfbb0522 Mon Sep 17 00:00:00 2001 From: paprka Date: Sat, 31 Jan 2015 18:18:24 -0800 Subject: [PATCH 1/6] adds baton charge loss --- code/game/objects/items/weapons/stunbaton.dm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index daec4abc4b9..fa50fff7c08 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -44,7 +44,25 @@ else return 0 +/obj/item/weapon/melee/baton/proc/update_process() + if(status) + SSobj.processing.Add(src) + else if(!bcell) + SSobj.processing.Remove(src) + else + SSobj.processing.Remove(src) + +/obj/item/weapon/melee/baton/process() + if(bcell) + if(bcell.charge < hitcost) + status = 0 + update_icon() + if(status) + bcell.use(5) + update_icon() + /obj/item/weapon/melee/baton/update_icon() + update_process() if(status) icon_state = "[initial(name)]_active" else if(!bcell) From e0f492c104ae01052e1329feeb07e071b6737a85 Mon Sep 17 00:00:00 2001 From: paprka Date: Mon, 2 Feb 2015 21:20:00 -0800 Subject: [PATCH 2/6] un-hardcodes loss per tick --- code/game/objects/items/weapons/stunbaton.dm | 3 ++- html/changelogs/Paprka-batonshit.yml | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/Paprka-batonshit.yml diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index fa50fff7c08..2e04d271ed9 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -13,6 +13,7 @@ var/status = 0 var/obj/item/weapon/stock_parts/cell/high/bcell = null var/hitcost = 1000 + var/losspertick = 5 /obj/item/weapon/melee/baton/suicide_act(mob/user) user.visible_message("[user] is putting the live [name] in \his mouth! It looks like \he's trying to commit suicide.") @@ -58,7 +59,7 @@ status = 0 update_icon() if(status) - bcell.use(5) + bcell.use(losspertick) update_icon() /obj/item/weapon/melee/baton/update_icon() diff --git a/html/changelogs/Paprka-batonshit.yml b/html/changelogs/Paprka-batonshit.yml new file mode 100644 index 00000000000..6253da0f1e6 --- /dev/null +++ b/html/changelogs/Paprka-batonshit.yml @@ -0,0 +1,6 @@ +author: Paprka + +delete-after: True + +changes: + - tweak: "Batons now slowly lose power when left on." \ No newline at end of file From 8150750a4da941e5cf6ba1c4415be30e85f61f74 Mon Sep 17 00:00:00 2001 From: paprka Date: Mon, 9 Feb 2015 10:29:59 -0800 Subject: [PATCH 3/6] removes unnecessary else if( --- code/game/objects/items/weapons/stunbaton.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index 2e04d271ed9..8ae2906fa5f 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -48,8 +48,6 @@ /obj/item/weapon/melee/baton/proc/update_process() if(status) SSobj.processing.Add(src) - else if(!bcell) - SSobj.processing.Remove(src) else SSobj.processing.Remove(src) From 46d21ae2c218a2f86897b4d71970787cb5a5bfd4 Mon Sep 17 00:00:00 2001 From: paprka Date: Fri, 13 Feb 2015 17:48:58 -0800 Subject: [PATCH 4/6] robots lose power from their cell for leaving their baton active --- code/game/objects/items/weapons/stunbaton.dm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index 8ae2906fa5f..81ad1f2f4c9 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -57,7 +57,12 @@ status = 0 update_icon() if(status) - bcell.use(losspertick) + if(isrobot(loc)) + var/mob/living/silicon/robot/R = loc + if(R && R.cell) + R.cell.use(losspertick) + else + bcell.use(losspertick) update_icon() /obj/item/weapon/melee/baton/update_icon() From 24cef3c30aef26510baefd0b86627776207e7e4b Mon Sep 17 00:00:00 2001 From: paprka Date: Sat, 14 Feb 2015 12:41:37 -0800 Subject: [PATCH 5/6] fixes baton looping --- code/game/objects/items/weapons/stunbaton.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index 81ad1f2f4c9..af8bd82ca5d 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -63,16 +63,15 @@ R.cell.use(losspertick) else bcell.use(losspertick) - update_icon() /obj/item/weapon/melee/baton/update_icon() - update_process() if(status) icon_state = "[initial(name)]_active" else if(!bcell) icon_state = "[initial(name)]_nocell" else icon_state = "[initial(name)]" + update_process() /obj/item/weapon/melee/baton/examine(mob/user) ..() From 743af3a5b2391c5378356f8738bb547ff9f3dd43 Mon Sep 17 00:00:00 2001 From: paprka Date: Sat, 14 Feb 2015 19:43:27 -0800 Subject: [PATCH 6/6] processing |= --- code/game/objects/items/weapons/stunbaton.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index af8bd82ca5d..0a4f729b1d8 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -47,7 +47,7 @@ /obj/item/weapon/melee/baton/proc/update_process() if(status) - SSobj.processing.Add(src) + SSobj.processing |= src else SSobj.processing.Remove(src)