From 1d06932da64e5e0ca5fd54481f47e45f174c2471 Mon Sep 17 00:00:00 2001 From: X0-11 Date: Thu, 27 Jul 2023 18:42:50 +0100 Subject: [PATCH 1/7] adds them to the oni arsenal too --- code/modules/halo/unsc/supply/specweapons.dm | 35 +++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/code/modules/halo/unsc/supply/specweapons.dm b/code/modules/halo/unsc/supply/specweapons.dm index 0c03b62290b01..6785f0bb897c1 100644 --- a/code/modules/halo/unsc/supply/specweapons.dm +++ b/code/modules/halo/unsc/supply/specweapons.dm @@ -25,4 +25,37 @@ name = "M6 Grindell/Galilean Nonlinear Rifle" cost = 1500 contains = list(/obj/item/weapon/gun/energy/spartanlaser = 1) - containername = "\improper M6 G/GNR crate" \ No newline at end of file + containername = "\improper M6 G/GNR crate" + +/**/ +/* ONI - Need a separate category for faction lock code. */ +/**/ + +/decl/hierarchy/supply_pack/oni_weapons_special + name = "ONI Experimental Weapons" + faction_lock = "ONI" + containertype = /obj/structure/closet/crate/secure/weapon + +/decl/hierarchy/supply_pack/oni_weapons_special/railgun + name = "ARC-920 Experimental Railgun" + cost = 1000 + contains = list(/obj/item/weapon/gun/projectile/railrifle = 1,/obj/item/ammo_box/railrifle = 6) + containername = "\improper ARC-920 crate" + +/decl/hierarchy/supply_pack/oni_weapons_special/railgun_ammo + name = "ARC-920 HE Slugs" + cost = 50 + contains = list(/obj/item/ammo_box/railrifle = 6) + containername = "\improper ARC-920 HE ammo crate" + +/decl/hierarchy/supply_pack/oni_weapons_special/railgun_ammo_ap + name = "ARC-920 AP Slugs" + cost = 150 + contains = list(/obj/item/ammo_box/railrifle/AP = 3) + containername = "\improper ARC-920 AP ammo crate" + +/decl/hierarchy/supply_pack/oni_weapons_special/spartanlaser + name = "M6 Grindell/Galilean Nonlinear Rifle" + cost = 1500 + contains = list(/obj/item/weapon/gun/energy/spartanlaser = 1) + containername = "\improper M6 G/GNR crate" From 485252559fcb2d2abbc1984fc2b8259c7927630e Mon Sep 17 00:00:00 2001 From: X0-11 Date: Thu, 27 Jul 2023 19:57:17 +0100 Subject: [PATCH 2/7] splaser shotcount tweak --- code/modules/halo/weapons/spartan_laser.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/halo/weapons/spartan_laser.dm b/code/modules/halo/weapons/spartan_laser.dm index 0fd6931d15468..6dec051fb0253 100644 --- a/code/modules/halo/weapons/spartan_laser.dm +++ b/code/modules/halo/weapons/spartan_laser.dm @@ -16,7 +16,7 @@ one_hand_penalty = -1 self_recharge = 1 recharge_time = 150 - max_shots = 8 + max_shots = 4 is_charged_weapon = TRUE arm_time = 25 //Deciseconds From c4667cc2d5c2928fecec1071fbc1185b5c19a3e3 Mon Sep 17 00:00:00 2001 From: X0-11 Date: Thu, 27 Jul 2023 19:58:53 +0100 Subject: [PATCH 3/7] railrifle weight tweak --- code/modules/halo/weapons/railrifle.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/halo/weapons/railrifle.dm b/code/modules/halo/weapons/railrifle.dm index ead90b0caa85d..41e58c2b0e7e9 100644 --- a/code/modules/halo/weapons/railrifle.dm +++ b/code/modules/halo/weapons/railrifle.dm @@ -28,4 +28,4 @@ w_class = ITEM_SIZE_LARGE matter = list(DEFAULT_WALL_MATERIAL = 2000) ammo_type = /obj/item/ammo_casing/railslug - slowdown_general = 0.5 \ No newline at end of file + slowdown_general = 0.4//Slightly lighter than an lmg. \ No newline at end of file From 7b27089454b0a6808dc716609cb1322ddb17b166 Mon Sep 17 00:00:00 2001 From: X0-11 Date: Thu, 27 Jul 2023 20:08:07 +0100 Subject: [PATCH 4/7] splaser --- code/modules/halo/weapons/spartan_laser.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/halo/weapons/spartan_laser.dm b/code/modules/halo/weapons/spartan_laser.dm index 6dec051fb0253..8e4ee89d56da9 100644 --- a/code/modules/halo/weapons/spartan_laser.dm +++ b/code/modules/halo/weapons/spartan_laser.dm @@ -15,7 +15,7 @@ one_hand_penalty = -1 self_recharge = 1 - recharge_time = 150 + recharge_time = 200 max_shots = 4 is_charged_weapon = TRUE From 2e1b33e68dafdcbdce0d32810336af62fcbfeb74 Mon Sep 17 00:00:00 2001 From: X0-11 Date: Thu, 27 Jul 2023 20:52:05 +0100 Subject: [PATCH 5/7] back to lmg weight --- code/modules/halo/weapons/railrifle.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/halo/weapons/railrifle.dm b/code/modules/halo/weapons/railrifle.dm index 41e58c2b0e7e9..ead90b0caa85d 100644 --- a/code/modules/halo/weapons/railrifle.dm +++ b/code/modules/halo/weapons/railrifle.dm @@ -28,4 +28,4 @@ w_class = ITEM_SIZE_LARGE matter = list(DEFAULT_WALL_MATERIAL = 2000) ammo_type = /obj/item/ammo_casing/railslug - slowdown_general = 0.4//Slightly lighter than an lmg. \ No newline at end of file + slowdown_general = 0.5 \ No newline at end of file From a5840c4bbb7daad7dd90841f8cbbd44d56f5e5a4 Mon Sep 17 00:00:00 2001 From: X0-11 Date: Thu, 27 Jul 2023 20:58:22 +0100 Subject: [PATCH 6/7] HE slug tweak --- code/modules/halo/weapons/ammo_railslug.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/halo/weapons/ammo_railslug.dm b/code/modules/halo/weapons/ammo_railslug.dm index b1abd5c072b2e..1607081c21496 100644 --- a/code/modules/halo/weapons/ammo_railslug.dm +++ b/code/modules/halo/weapons/ammo_railslug.dm @@ -34,11 +34,11 @@ steps_between_delays = 6 /obj/item/projectile/bullet/railslug/HE - damage = 65 - armor_penetration = 50 + damage = 60 + armor_penetration = 60 shield_damage = 175 penetrating = 0 /obj/item/projectile/bullet/railslug/HE/on_impact(var/atom/target) - explosion(get_turf(target), 0, 1, 2, 4,guaranteed_damage = 35,guaranteed_damage_range = 1) + explosion(get_turf(target), -1, 1, 2, 4,guaranteed_damage = 20,guaranteed_damage_range = 1) ..() From da57286455438dd2b43f15e2fa52307be4de0a03 Mon Sep 17 00:00:00 2001 From: X0-11 Date: Thu, 27 Jul 2023 21:01:17 +0100 Subject: [PATCH 7/7] conctweak --- code/modules/halo/weapons/covenant/ammo.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/halo/weapons/covenant/ammo.dm b/code/modules/halo/weapons/covenant/ammo.dm index 596c299d7d3d3..134a4dc805cd2 100644 --- a/code/modules/halo/weapons/covenant/ammo.dm +++ b/code/modules/halo/weapons/covenant/ammo.dm @@ -359,7 +359,7 @@ /obj/item/projectile/bullet/covenant/concussion_rifle name = "heavy plasma round" damage = 50 - armor_penetration = 40 + armor_penetration = 50 shield_damage = 50 step_delay = 0.75 //slower than most icon = 'code/modules/halo/weapons/icons/Covenant_Projectiles.dmi'