From 952cb0fb207476682493108410dc81c1be6822d6 Mon Sep 17 00:00:00 2001 From: firebudgy <153147550+firebudgy@users.noreply.github.com> Date: Fri, 29 Nov 2024 23:58:23 -0800 Subject: [PATCH 1/7] initial commit --- .../objects/items/storage/filled_guncases.dm | 10 +++++ code/modules/cargo/packs/gun.dm | 42 ++++++++++++++++++- code/modules/cargo/packs/magazines.dm | 42 +++++++++++++++---- .../hostile/mining_mobs/hivelord_outfits.dm | 2 +- .../projectiles/ammunition/energy/laser.dm | 8 ++-- .../projectiles/ammunition/energy/stun.dm | 6 +-- code/modules/projectiles/projectile/beams.dm | 4 ++ 7 files changed, 98 insertions(+), 16 deletions(-) diff --git a/code/game/objects/items/storage/filled_guncases.dm b/code/game/objects/items/storage/filled_guncases.dm index c61a56114973..49e487072087 100644 --- a/code/game/objects/items/storage/filled_guncases.dm +++ b/code/game/objects/items/storage/filled_guncases.dm @@ -216,6 +216,12 @@ /obj/item/storage/guncase/energy/egun gun_type = /obj/item/gun/energy/e_gun +/obj/item/storage/guncase/energy/ultima + gun_type = /obj/item/gun/energy/e_gun/iot + +/obj/item/storage/guncase/energy/etar + gun_type = /obj/item/gun/energy/e_gun/smg + /obj/item/storage/guncase/energy/iongun gun_type = /obj/item/gun/energy/ionrifle @@ -267,6 +273,10 @@ gun_type = /obj/item/gun/ballistic/shotgun/cm15 mag_type = /obj/item/ammo_box/magazine/cm15_12g +/obj/item/storage/guncase/cm24 + gun_type = /obj/item/gun/ballistic/automatic/assault/skm/cm24 + mag_type = /obj/item/ammo_box/magazine/skm_762_40 + /obj/item/storage/guncase/cmf90 gun_type = /obj/item/gun/ballistic/automatic/marksman/f90 mag_type = /obj/item/ammo_box/magazine/f90 diff --git a/code/modules/cargo/packs/gun.dm b/code/modules/cargo/packs/gun.dm index e364a73032ed..a63f2ebd55f6 100644 --- a/code/modules/cargo/packs/gun.dm +++ b/code/modules/cargo/packs/gun.dm @@ -142,6 +142,15 @@ faction_discount = 0 faction_locked = TRUE +/datum/supply_pack/gun/cm357 + name = "CM-357 Automag Pistol Crate" + desc = "Contains a magazine-fed .357 handgun, produced for the CMM-BARD division and available for requisition in small numbers to the Minutemen." + cost = 3000 + contains = list(/obj/item/storage/guncase/pistol/cm357) + faction = /datum/faction/clip + faction_discount = 0 + faction_locked = TRUE + /* Energy */ @@ -200,7 +209,7 @@ /datum/supply_pack/gun/laser/bg16 name = "Etherbor BG-16 Beam Rifle Crate" desc = "Contains a single BG-16 Beam Rifle, a military-grade automatic developed in the PGF and manufactured by Etherbor Industries for use within the Marine Corps." - cost = 3000 + cost = 3500 contains = list(/obj/item/storage/guncase/energy/bg16) crate_name = "beam rifle crate" faction = /datum/faction/pgf @@ -298,6 +307,16 @@ faction_discount = 0 faction_locked = TRUE +/datum/supply_pack/gun/ultima + name = "E-SG 500 Energy Shotgun Crate" + desc = "Contains an energy-based shotgun equipped with dual kill/disable modes, ideal for short range. The on-board computer is notoriously unreliable. For NT employee use only." + cost = 3000 + contains = list(/obj/item/storage/guncase/ultima) + crate_name = "shotgun crate" + faction = /datum/faction/nt + faction_discount = 0 + faction_locked = TRUE + /* SMGs */ @@ -350,6 +369,16 @@ faction_discount = 0 faction_locked = TRUE +/datum/supply_pack/gun/etar + name = "E-TAR Dual-Mode Energy SMG Crate" + desc = "Contains a compact energy-based PDW platform, ideal for suppressing threats at mid-range. For NT employee use only." + cost = 2000 + contains = list(/obj/item/storage/guncase/etar) + crate_name = "SMG crate" + faction = /datum/faction/nt + faction_discount = 0 + faction_locked = TRUE + /datum/supply_pack/gun/firestorm name = "Firestorm SMG Crate" desc = "Contains a Hunter's Pride SMG, intended for internal use by hunters and chambered in .45" @@ -497,6 +526,17 @@ faction_discount = 0 faction_locked = TRUE +/datum/supply_pack/gun/cm24 + name = "CM-24 Surplus Stockpile Rifle" + desc = "Contains a higher-powered rifle chambered in 7.62x40 CLIP based on the SKM-24 platform, formerly the main service rifle of the CMM. This one has been pulled from reservist stockpiles." + cost = 5000 + contains = list(/obj/item/storage/guncase/cm82) + crate_name = "rifle crate" + faction = /datum/faction/clip + faction_discount = 0 + faction_locked = TRUE + + /* Marksman Rifles */ /datum/supply_pack/gun/cmf4 diff --git a/code/modules/cargo/packs/magazines.dm b/code/modules/cargo/packs/magazines.dm index a29ed2403d37..074eea61af24 100644 --- a/code/modules/cargo/packs/magazines.dm +++ b/code/modules/cargo/packs/magazines.dm @@ -162,6 +162,34 @@ /* CM Lancaster */ +/datum/supply_pack/magazine/cm23_mag + name = "CM-23 Magazine Crate" + desc = "Contains a 10mm magazine for the CM-23 handgun." + contains = list(/obj/item/ammo_box/magazine/cm23) + cost = 500 + faction = /datum/faction/clip + +/datum/supply_pack/magazine/cm70_mag + name = "CM-70 Magazine Crate" + desc = "Contains a 9mm magazine for the CM-70 machinepistol." + contains = list(/obj/item/ammo_box/magazine/m9mm_cm70) + cost = 750 + faction = /datum/faction/clip + +/datum/supply_pack/magazine/cm357_mag + name = "CM-357 Magazine Crate" + desc = "Contains a .357 magazine for the CM-357 automag pistol." + contains = list(/obj/item/ammo_box/magazine/cm357) + cost = 1000 + faction = /datum/faction/clip + +/datum/supply_pack/magazine/cm5_mag + name = "CM-5 Magazine Crate" + desc = "Contains a 9mm magazine for the CM-5 SMG." + contains = list(/obj/item/ammo_box/magazine/cm5_9mm) + cost = 750 + faction = /datum/faction/clip + /datum/supply_pack/magazine/cm82_mag name = "CM-82 Magazine Crate" desc = "Contains a 5.56mm magazine for the CM-82 rifle, containing thirty rounds. Notably, these are also compatable with the P-16 rifle." @@ -189,6 +217,13 @@ cost = 1000 faction = /datum/faction/clip +/datum/supply_pack/magazine/cm15 + name = "CM-15 Magazine Crate" + desc = "Contains an 8-round 12ga magazine for the CM-15 Automatic Shotgun." + contains = list(/obj/item/ammo_box/magazine/cm15_12g) + cost = 1500 + faction = /datum/faction/clip + /* NT */ /datum/supply_pack/magazine/wt550_mag @@ -247,13 +282,6 @@ /* Shotguns */ -/datum/supply_pack/magazine/cm15 - name = "CM-15 Magazine Crate" - desc = "Contains an 8-round 12ga magazine for the CM-15 Automatic Shotgun." - contains = list(/obj/item/ammo_box/magazine/cm15_12g) - cost = 1500 - faction = /datum/faction/clip - /datum/supply_pack/magazine/bulldog name = "Bulldog Magazine Crate" desc = "Contains an 8-round 12ga box magazine for the Bulldog weapons platform." diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm index e20bb4382d55..34a8cb32c1ac 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm @@ -453,7 +453,7 @@ if(prob(75)) r_pocket = pick(/obj/item/flashlight/seclite, /obj/item/assembly/flash/handheld, /obj/item/restraints/handcuffs) if(prob(50)) - suit_store = pick(/obj/item/gun/energy/e_gun, /obj/item/gun/energy/e_gun/smg, /obj/item/gun/energy/e_gun/iot) + suit_store = pick(/obj/item/gun/energy/e_gun, /obj/item/gun/energy/e_gun/smg) for(var/i = 1 to 3) if(prob(75)) backpack_contents += pick_weight(list( diff --git a/code/modules/projectiles/ammunition/energy/laser.dm b/code/modules/projectiles/ammunition/energy/laser.dm index 9411382ed0cd..4997f53cf126 100644 --- a/code/modules/projectiles/ammunition/energy/laser.dm +++ b/code/modules/projectiles/ammunition/energy/laser.dm @@ -56,10 +56,10 @@ select_name = "scatter" /obj/item/ammo_casing/energy/laser/ultima - projectile_type = /obj/projectile/beam/laser/weak/negative_ap/low_range - pellets = 3 - variance = 35 - e_cost = 2000 + projectile_type = /obj/projectile/beam/weak + pellets = 6 + variance = 25 + e_cost = 1000 select_name = "kill" /obj/item/ammo_casing/energy/laser/ultima/alt diff --git a/code/modules/projectiles/ammunition/energy/stun.dm b/code/modules/projectiles/ammunition/energy/stun.dm index 1f74196eb83b..7b59e9f4a11b 100644 --- a/code/modules/projectiles/ammunition/energy/stun.dm +++ b/code/modules/projectiles/ammunition/energy/stun.dm @@ -35,10 +35,10 @@ fire_sound = 'sound/weapons/taser.ogg' /obj/item/ammo_casing/energy/disabler/scatter/ultima - projectile_type = /obj/projectile/beam/disabler/weak/negative_ap/low_range + projectile_type = /obj/projectile/beam/disabler/weak/negative_ap pellets = 4 - variance = 35 - e_cost = 2000 + variance = 25 + e_cost = 500 /obj/item/ammo_casing/energy/disabler/scatter/ultima/alt select_name = "blast" diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 50664b86966e..b0942a242cac 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -83,6 +83,10 @@ /obj/projectile/beam/weaker damage = 10 +/obj/projectile/beam/weak/low_range + damage = 10 + range = 9 + /obj/projectile/beam/weak/penetrator armour_penetration = 50 From 6d374ec25d8c8ca7ab114e6b6649e148c1066558 Mon Sep 17 00:00:00 2001 From: firebudgy <153147550+firebudgy@users.noreply.github.com> Date: Sat, 30 Nov 2024 00:00:44 -0800 Subject: [PATCH 2/7] additional eedit --- code/modules/cargo/packs/magazines.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cargo/packs/magazines.dm b/code/modules/cargo/packs/magazines.dm index 074eea61af24..40c2182f4433 100644 --- a/code/modules/cargo/packs/magazines.dm +++ b/code/modules/cargo/packs/magazines.dm @@ -286,7 +286,7 @@ name = "Bulldog Magazine Crate" desc = "Contains an 8-round 12ga box magazine for the Bulldog weapons platform." contains = list(/obj/item/ammo_box/magazine/m12g_bulldog) - cost = 1500 + cost = 1000 faction = /datum/faction/syndicate/scarborough_arms From 9c103f02ec7e751b8ad7d26aa527398dd1e0f71e Mon Sep 17 00:00:00 2001 From: firebudgy <153147550+firebudgy@users.noreply.github.com> Date: Sat, 30 Nov 2024 00:09:17 -0800 Subject: [PATCH 3/7] undoes stuff from the wrong branch --- .../hostile/mining_mobs/hivelord_outfits.dm | 2 +- code/modules/projectiles/ammunition/energy/laser.dm | 9 ++++----- code/modules/projectiles/ammunition/energy/stun.dm | 7 +++---- code/modules/projectiles/projectile/beams.dm | 4 ---- 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm index 34a8cb32c1ac..1856639a6d74 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm @@ -453,7 +453,7 @@ if(prob(75)) r_pocket = pick(/obj/item/flashlight/seclite, /obj/item/assembly/flash/handheld, /obj/item/restraints/handcuffs) if(prob(50)) - suit_store = pick(/obj/item/gun/energy/e_gun, /obj/item/gun/energy/e_gun/smg) + suit_store = pick(/obj/item/gun/energy/e_gun, /obj/item/gun/energy/e_gun/smg, /obj/item/gun/energy/laser/iot/lethal) for(var/i = 1 to 3) if(prob(75)) backpack_contents += pick_weight(list( diff --git a/code/modules/projectiles/ammunition/energy/laser.dm b/code/modules/projectiles/ammunition/energy/laser.dm index 4997f53cf126..762b0bb0b9fc 100644 --- a/code/modules/projectiles/ammunition/energy/laser.dm +++ b/code/modules/projectiles/ammunition/energy/laser.dm @@ -56,11 +56,10 @@ select_name = "scatter" /obj/item/ammo_casing/energy/laser/ultima - projectile_type = /obj/projectile/beam/weak - pellets = 6 - variance = 25 - e_cost = 1000 - select_name = "kill" + projectile_type = /obj/projectile/beam/laser/weak/negative_ap/low_range + pellets = 3 + variance = 35 + e_cost = 2000 /obj/item/ammo_casing/energy/laser/ultima/alt select_name = "scatter" diff --git a/code/modules/projectiles/ammunition/energy/stun.dm b/code/modules/projectiles/ammunition/energy/stun.dm index 7b59e9f4a11b..45cc5eb0060e 100644 --- a/code/modules/projectiles/ammunition/energy/stun.dm +++ b/code/modules/projectiles/ammunition/energy/stun.dm @@ -35,11 +35,10 @@ fire_sound = 'sound/weapons/taser.ogg' /obj/item/ammo_casing/energy/disabler/scatter/ultima - projectile_type = /obj/projectile/beam/disabler/weak/negative_ap + projectile_type = /obj/projectile/beam/disabler/weak/negative_ap/low_range pellets = 4 - variance = 25 - e_cost = 500 - + variance = 35 + e_cost = 2000 /obj/item/ammo_casing/energy/disabler/scatter/ultima/alt select_name = "blast" diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index b0942a242cac..50664b86966e 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -83,10 +83,6 @@ /obj/projectile/beam/weaker damage = 10 -/obj/projectile/beam/weak/low_range - damage = 10 - range = 9 - /obj/projectile/beam/weak/penetrator armour_penetration = 50 From 0d79335eac2e5a6603c42d7f4b283f5a38093b63 Mon Sep 17 00:00:00 2001 From: firebudgy <153147550+firebudgy@users.noreply.github.com> Date: Sat, 30 Nov 2024 00:15:26 -0800 Subject: [PATCH 4/7] Update hivelord_outfits.dm webedit fix Signed-off-by: firebudgy <153147550+firebudgy@users.noreply.github.com> --- .../simple_animal/hostile/mining_mobs/hivelord_outfits.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm index 1856639a6d74..e20bb4382d55 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm @@ -453,7 +453,7 @@ if(prob(75)) r_pocket = pick(/obj/item/flashlight/seclite, /obj/item/assembly/flash/handheld, /obj/item/restraints/handcuffs) if(prob(50)) - suit_store = pick(/obj/item/gun/energy/e_gun, /obj/item/gun/energy/e_gun/smg, /obj/item/gun/energy/laser/iot/lethal) + suit_store = pick(/obj/item/gun/energy/e_gun, /obj/item/gun/energy/e_gun/smg, /obj/item/gun/energy/e_gun/iot) for(var/i = 1 to 3) if(prob(75)) backpack_contents += pick_weight(list( From 68cf44e52f38f98518a3800c934cb33d5cf12f1b Mon Sep 17 00:00:00 2001 From: firebudgy <153147550+firebudgy@users.noreply.github.com> Date: Sat, 30 Nov 2024 00:16:11 -0800 Subject: [PATCH 5/7] Update laser.dm revert 2 Signed-off-by: firebudgy <153147550+firebudgy@users.noreply.github.com> --- code/modules/projectiles/ammunition/energy/laser.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/projectiles/ammunition/energy/laser.dm b/code/modules/projectiles/ammunition/energy/laser.dm index 762b0bb0b9fc..9411382ed0cd 100644 --- a/code/modules/projectiles/ammunition/energy/laser.dm +++ b/code/modules/projectiles/ammunition/energy/laser.dm @@ -60,6 +60,7 @@ pellets = 3 variance = 35 e_cost = 2000 + select_name = "kill" /obj/item/ammo_casing/energy/laser/ultima/alt select_name = "scatter" From cdad3749647172505aa27d32aaff6d16bd5e4010 Mon Sep 17 00:00:00 2001 From: firebudgy <153147550+firebudgy@users.noreply.github.com> Date: Sat, 30 Nov 2024 00:16:27 -0800 Subject: [PATCH 6/7] Update stun.dm revert 3 Signed-off-by: firebudgy <153147550+firebudgy@users.noreply.github.com> --- code/modules/projectiles/ammunition/energy/stun.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/projectiles/ammunition/energy/stun.dm b/code/modules/projectiles/ammunition/energy/stun.dm index 45cc5eb0060e..1f74196eb83b 100644 --- a/code/modules/projectiles/ammunition/energy/stun.dm +++ b/code/modules/projectiles/ammunition/energy/stun.dm @@ -39,6 +39,7 @@ pellets = 4 variance = 35 e_cost = 2000 + /obj/item/ammo_casing/energy/disabler/scatter/ultima/alt select_name = "blast" From 5ca855a8787005e0702c20cbe5dd372e5b95ddce Mon Sep 17 00:00:00 2001 From: firebudgy <153147550+firebudgy@users.noreply.github.com> Date: Sat, 30 Nov 2024 01:16:42 -0800 Subject: [PATCH 7/7] oops --- code/modules/cargo/packs/gun.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/cargo/packs/gun.dm b/code/modules/cargo/packs/gun.dm index a63f2ebd55f6..299af1eb929b 100644 --- a/code/modules/cargo/packs/gun.dm +++ b/code/modules/cargo/packs/gun.dm @@ -311,7 +311,7 @@ name = "E-SG 500 Energy Shotgun Crate" desc = "Contains an energy-based shotgun equipped with dual kill/disable modes, ideal for short range. The on-board computer is notoriously unreliable. For NT employee use only." cost = 3000 - contains = list(/obj/item/storage/guncase/ultima) + contains = list(/obj/item/storage/guncase/energy/ultima) crate_name = "shotgun crate" faction = /datum/faction/nt faction_discount = 0 @@ -373,7 +373,7 @@ name = "E-TAR Dual-Mode Energy SMG Crate" desc = "Contains a compact energy-based PDW platform, ideal for suppressing threats at mid-range. For NT employee use only." cost = 2000 - contains = list(/obj/item/storage/guncase/etar) + contains = list(/obj/item/storage/guncase/energy/etar) crate_name = "SMG crate" faction = /datum/faction/nt faction_discount = 0