From 7398ab010dbc94ebbe45e5322ccb8b0f59672d37 Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Mon, 6 Jun 2016 19:10:39 -0700 Subject: [PATCH 1/8] revstuns --- code/modules/assembly/flash.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/assembly/flash.dm b/code/modules/assembly/flash.dm index e93d4224748..432d2a158b2 100644 --- a/code/modules/assembly/flash.dm +++ b/code/modules/assembly/flash.dm @@ -150,6 +150,7 @@ if(!isloyal(M)) if(user.mind in ticker.mode.head_revolutionaries) if(ticker.mode.add_revolutionary(M.mind)) + M.Stun(3) times_used -- //Flashes less likely to burn out for headrevs when used for conversion else resisted = 1 From e3d3dc9e2ac9f8f758b5f8dd9b117a5e063367c9 Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Mon, 6 Jun 2016 19:23:23 -0700 Subject: [PATCH 2/8] bugfixes --- code/modules/power/apc.dm | 4 ++++ code/modules/projectiles/guns/energy/special.dm | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 6bf97bb6cb2..25bc758c9c1 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -802,6 +802,8 @@ /obj/machinery/power/apc/proc/malfhacked(mob/living/silicon/ai/malf) if(!istype(malf)) return + malf.malfhack = null + malf.malfhacking = FALSE if(src && !src.aidisabled) malf.malfhack = null malf.malfhacking = FALSE @@ -813,6 +815,8 @@ malf << "Hack complete. The APC is now under your exclusive control." update_icon() + else + malf << "Hack aborted. The designated APC has stopped responding and no longer exists on the power network." /obj/machinery/power/apc/proc/malfoccupy(mob/living/silicon/ai/malf) if(!istype(malf)) diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 3aef3af11d1..d4452b1b680 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -189,6 +189,14 @@ else icon_state = initial(icon_state) +/obj/item/weapon/gun/energy/kinetic_accelerator/burn() + var/obj/item/weapon/stock_parts/cell/C = power_supply + qdel(C) + var/obj/item/device/firing_pin/P = pin + qdel(P) + SSobj.burning -= src + qdel(src) + /obj/item/weapon/gun/energy/kinetic_accelerator/crossbow name = "mini energy crossbow" desc = "A weapon favored by syndicate stealth specialists." From b963d23ede583fa2b1f453c4c46fbbf05f01c980 Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Mon, 6 Jun 2016 19:36:40 -0700 Subject: [PATCH 3/8] ratvar'sfixes --- code/game/gamemodes/clock_cult/clock_items.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/game/gamemodes/clock_cult/clock_items.dm b/code/game/gamemodes/clock_cult/clock_items.dm index dce3ff01418..84b9a79101f 100644 --- a/code/game/gamemodes/clock_cult/clock_items.dm +++ b/code/game/gamemodes/clock_cult/clock_items.dm @@ -445,6 +445,9 @@ if(C.l_hand && C.r_hand) C << "You require a free hand to utilize [src]'s power!" return 0 + if(istype(C.l_hand, /obj/item/weapon/ratvars_flame)||istype(C.r_hand, /obj/item/weapon/ratvars_flame)) + C << "The [src] is already projecting Ratvar's Flames! It is not powerful enough to maintain two!" + return 0 C.visible_message("[C]'s hand is enveloped in violet flames!", "You harness [src]'s power. Direct it at a tile on harm intent to unleash it, or use the action button again to dispel it.") var/obj/item/weapon/ratvars_flame/R = new(get_turf(C)) flame = R From 7237231021a58862d1178cbe342963ea7181e401 Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Mon, 6 Jun 2016 19:47:34 -0700 Subject: [PATCH 4/8] nvm --- code/game/gamemodes/clock_cult/clock_items.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/game/gamemodes/clock_cult/clock_items.dm b/code/game/gamemodes/clock_cult/clock_items.dm index 84b9a79101f..dce3ff01418 100644 --- a/code/game/gamemodes/clock_cult/clock_items.dm +++ b/code/game/gamemodes/clock_cult/clock_items.dm @@ -445,9 +445,6 @@ if(C.l_hand && C.r_hand) C << "You require a free hand to utilize [src]'s power!" return 0 - if(istype(C.l_hand, /obj/item/weapon/ratvars_flame)||istype(C.r_hand, /obj/item/weapon/ratvars_flame)) - C << "The [src] is already projecting Ratvar's Flames! It is not powerful enough to maintain two!" - return 0 C.visible_message("[C]'s hand is enveloped in violet flames!", "You harness [src]'s power. Direct it at a tile on harm intent to unleash it, or use the action button again to dispel it.") var/obj/item/weapon/ratvars_flame/R = new(get_turf(C)) flame = R From 71240ab52f2bc8486c73f0bb88cb8717fa47f3d5 Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Mon, 6 Jun 2016 20:34:19 -0700 Subject: [PATCH 5/8] duplicates --- code/modules/power/apc.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 25bc758c9c1..1c7167abcfa 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -805,8 +805,6 @@ malf.malfhack = null malf.malfhacking = FALSE if(src && !src.aidisabled) - malf.malfhack = null - malf.malfhacking = FALSE malf.malf_picker.processing_time += 10 malfai = malf.parent || malf From 31de8f4ec27ffa57ffe595030cd85f73bc7b0d8d Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Thu, 9 Jun 2016 18:53:06 -0700 Subject: [PATCH 6/8] allgunsnowburnright --- code/modules/projectiles/gun.dm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index cc2ebdaa18c..046181be65f 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -503,3 +503,12 @@ obj/item/weapon/gun/proc/newshot() if(zoomable) azoom = new() azoom.gun = src + + +/obj/item/weapon/gun/burn() + if(pin) + qdel(pin) + if(power_supply) + qdel(power_supply) + SSobj.burning -= src + qdel(src) From c4b8dd4bc761e964229c6cd84276321d0bb53e80 Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Thu, 9 Jun 2016 18:53:42 -0700 Subject: [PATCH 7/8] . --- code/modules/projectiles/guns/energy/special.dm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index d4452b1b680..3aef3af11d1 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -189,14 +189,6 @@ else icon_state = initial(icon_state) -/obj/item/weapon/gun/energy/kinetic_accelerator/burn() - var/obj/item/weapon/stock_parts/cell/C = power_supply - qdel(C) - var/obj/item/device/firing_pin/P = pin - qdel(P) - SSobj.burning -= src - qdel(src) - /obj/item/weapon/gun/energy/kinetic_accelerator/crossbow name = "mini energy crossbow" desc = "A weapon favored by syndicate stealth specialists." From cb907d1adaac4a8696f968ab85b86f79830738ec Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Thu, 9 Jun 2016 18:55:25 -0700 Subject: [PATCH 8/8] itworksedition --- code/modules/projectiles/gun.dm | 5 +---- code/modules/projectiles/guns/energy.dm | 7 ++++++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 046181be65f..a9f383c0ca7 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -508,7 +508,4 @@ obj/item/weapon/gun/proc/newshot() /obj/item/weapon/gun/burn() if(pin) qdel(pin) - if(power_supply) - qdel(power_supply) - SSobj.burning -= src - qdel(src) + .=..() diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index b4e7ac59683..e13d7e48874 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -164,4 +164,9 @@ SSobj.processing |= src else SSobj.processing -= src - ..() \ No newline at end of file + ..() + +/obj/item/weapon/gun/energy/burn() + if(power_supply) + qdel(power_supply) + .=..() \ No newline at end of file