From bcde3d2205ae0dbb0817ae93dd4f502fe2865880 Mon Sep 17 00:00:00 2001 From: W0LF-101 Date: Fri, 3 Mar 2023 14:25:48 +0000 Subject: [PATCH 1/4] energy revolver & laser changes Changed energy revolver to no longer selfcharge and take more power to fire lethal and taser shots (10% & 20% vs 5% and 13%) changed SC-1 laser gun to take less power to fire laser shots (from 6% to 5%) --- code/modules/projectiles/ammunition/energy/laser.dm | 7 +++++-- modular_skyrat/modules/blueshield/code/special.dm | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/code/modules/projectiles/ammunition/energy/laser.dm b/code/modules/projectiles/ammunition/energy/laser.dm index 9225b33a630..8fa606fd0b4 100644 --- a/code/modules/projectiles/ammunition/energy/laser.dm +++ b/code/modules/projectiles/ammunition/energy/laser.dm @@ -2,7 +2,10 @@ projectile_type = /obj/projectile/beam/laser e_cost = 83 select_name = "kill" - +/obj/item/ammo_casing/energy/laser/revolver + projectile_type = /obj/projectile/beam/laser + e_cost = 100 + select_name = "kill" /obj/item/ammo_casing/energy/laser/hellfire projectile_type = /obj/projectile/beam/laser/hellfire e_cost = 100 @@ -13,7 +16,7 @@ /obj/item/ammo_casing/energy/lasergun projectile_type = /obj/projectile/beam/laser - e_cost = 62.5 + e_cost = 50 select_name = "kill" /obj/item/ammo_casing/energy/lasergun/old diff --git a/modular_skyrat/modules/blueshield/code/special.dm b/modular_skyrat/modules/blueshield/code/special.dm index 941f9aa7068..b1920dd1560 100644 --- a/modular_skyrat/modules/blueshield/code/special.dm +++ b/modular_skyrat/modules/blueshield/code/special.dm @@ -2,7 +2,7 @@ name = "energy revolver" desc = "An advanced energy revolver with the capacity to shoot both electrodes and lasers." force = 7 - ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser) + ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser/revolver) ammo_x_offset = 1 charge_sections = 4 fire_delay = 4 @@ -14,11 +14,11 @@ obj_flags = UNIQUE_RENAME cell_type = /obj/item/stock_parts/cell/blueshield pin = /obj/item/firing_pin/implant/mindshield - selfcharge = TRUE + selfcharge = FALSE /obj/item/stock_parts/cell/blueshield name = "internal revolver power cell" - maxcharge = 1500 + maxcharge = 1000 chargerate = 300 /obj/item/gun/energy/e_gun/revolver/pdw9 //The chad gun. From 666083f3f7cb6f0845d406a8367c4d54926d06b1 Mon Sep 17 00:00:00 2001 From: ReturnToZender <110273561+ReturnToZender@users.noreply.github.com> Date: Fri, 10 Mar 2023 02:55:56 -0600 Subject: [PATCH 2/4] Update code/modules/projectiles/ammunition/energy/laser.dm Co-authored-by: Cyprex <35031555+Cyprex@users.noreply.github.com> --- code/modules/projectiles/ammunition/energy/laser.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/projectiles/ammunition/energy/laser.dm b/code/modules/projectiles/ammunition/energy/laser.dm index 8fa606fd0b4..0485132cb13 100644 --- a/code/modules/projectiles/ammunition/energy/laser.dm +++ b/code/modules/projectiles/ammunition/energy/laser.dm @@ -3,7 +3,6 @@ e_cost = 83 select_name = "kill" /obj/item/ammo_casing/energy/laser/revolver - projectile_type = /obj/projectile/beam/laser e_cost = 100 select_name = "kill" /obj/item/ammo_casing/energy/laser/hellfire From 8fcdd0afaf228abadd049eab01c3c0ff8c0c8085 Mon Sep 17 00:00:00 2001 From: ReturnToZender <110273561+ReturnToZender@users.noreply.github.com> Date: Fri, 10 Mar 2023 02:56:05 -0600 Subject: [PATCH 3/4] Update code/modules/projectiles/ammunition/energy/laser.dm Co-authored-by: Cyprex <35031555+Cyprex@users.noreply.github.com> --- code/modules/projectiles/ammunition/energy/laser.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/projectiles/ammunition/energy/laser.dm b/code/modules/projectiles/ammunition/energy/laser.dm index 0485132cb13..08b684f80be 100644 --- a/code/modules/projectiles/ammunition/energy/laser.dm +++ b/code/modules/projectiles/ammunition/energy/laser.dm @@ -4,7 +4,6 @@ select_name = "kill" /obj/item/ammo_casing/energy/laser/revolver e_cost = 100 - select_name = "kill" /obj/item/ammo_casing/energy/laser/hellfire projectile_type = /obj/projectile/beam/laser/hellfire e_cost = 100 From b8784e82f256a3386d18de37928122059da18d70 Mon Sep 17 00:00:00 2001 From: W0LF-101 <123177092+W0LF-101@users.noreply.github.com> Date: Sun, 26 Mar 2023 17:14:45 +0100 Subject: [PATCH 4/4] Update modular_skyrat/modules/blueshield/code/special.dm Co-authored-by: projectkepler-RU <99981766+projectkepler-ru@users.noreply.github.com> --- modular_skyrat/modules/blueshield/code/special.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_skyrat/modules/blueshield/code/special.dm b/modular_skyrat/modules/blueshield/code/special.dm index b1920dd1560..187b193c865 100644 --- a/modular_skyrat/modules/blueshield/code/special.dm +++ b/modular_skyrat/modules/blueshield/code/special.dm @@ -14,7 +14,7 @@ obj_flags = UNIQUE_RENAME cell_type = /obj/item/stock_parts/cell/blueshield pin = /obj/item/firing_pin/implant/mindshield - selfcharge = FALSE + selfcharge = TRUE /obj/item/stock_parts/cell/blueshield name = "internal revolver power cell"