Merge pull request #3418 from X0-11/unsc-cargo-weapons

adds the weapons from #3417 to the ONI arsenal too
HaloSpaceStation · Jul 28, 2023 · baead8f · baead8f
2 parents 708d36b + da57286
commit baead8f
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 7 deletions.
diff --git 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"
+	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"
diff --git 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)
 	..()
diff --git 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'

diff --git a/code/modules/halo/weapons/spartan_laser.dm b/code/modules/halo/weapons/spartan_laser.dm
@@ -15,8 +15,8 @@
 
 	one_hand_penalty = -1
 	self_recharge = 1
-	recharge_time = 150
-	max_shots = 8
+	recharge_time = 200
+	max_shots = 4
 	is_charged_weapon = TRUE
 
 	arm_time = 25 //Deciseconds