Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Factional Cargo Part 3: Magazines now come unloaded + Commissioner and Other Weapons in cargo #3893

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions code/game/objects/items/storage/filled_guncases.dm
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,10 @@
gun_type = /obj/item/gun/ballistic/automatic/assault/hydra/dmr
mag_type = /obj/item/ammo_box/magazine/m556_42_hydra/small

/obj/item/storage/guncase/saw80
gun_type = /obj/item/gun/ballistic/automatic/assault/hydra/lmg
mag_type = /obj/item/ammo_box/magazine/m556_42_hydra/extended

/obj/item/storage/guncase/taipan
gun_type = /obj/item/gun/ballistic/automatic/marksman/taipan
mag_type = /obj/item/ammo_box/magazine/sniper_rounds
Expand Down
48 changes: 45 additions & 3 deletions code/modules/cargo/packs/gun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
cost = 750
contains = list(/obj/item/storage/guncase/pistol/commander)
faction = /datum/faction/nt
faction_discount = 20

/datum/supply_pack/gun/ringneck
name = "Ringneck Pistol Crate"
Expand All @@ -61,6 +62,15 @@
faction_discount = 0
faction_locked = TRUE

/datum/supply_pack/gun/commissioner
name = "Commissioner Pistol Crate"
desc = "Contains a modified Commander pistol, adjusted to fit the IRMG's standards and painted in the brown and gold of all IRMG firearms."
cost = 750
contains = list(/obj/item/storage/guncase/commissioner)
faction = /datum/faction/inteq
faction_discount = 0
faction_locked = TRUE

/datum/supply_pack/gun/candors
name = "Candor Pistol Crate"
desc = "Contains a Candor pistol, the trusty sidearm of any spacer, produced by Hunter's Pride and chambered in .45 ACP."
Expand Down Expand Up @@ -351,11 +361,11 @@
faction_locked = TRUE

/datum/supply_pack/gun/wt550
name = "WT-550 Auto Rifle Crate"
name = "WT-550 PDW Crate"
desc = "Contains a high-powered, automatic personal defense weapon chambered in 4.6x30mm."
cost = 4000
cost = 3000
contains = list(/obj/item/storage/guncase/wt550)
crate_name = "auto rifle crate"
crate_name = "PDW crate"
faction_discount = 10
faction = /datum/faction/nt

Expand Down Expand Up @@ -454,6 +464,7 @@
contains = list(/obj/item/storage/guncase/winchester)
crate_name = "rifle crate"
faction = /datum/faction/srm
faction_discount = 20

/datum/supply_pack/gun/absolution
name = "Absolution Lever Action Rifle Crate"
Expand Down Expand Up @@ -496,6 +507,16 @@
faction_discount = 0
faction_locked = TRUE

/datum/supply_pack/gun/gar
name = "Solarian 'GAR' Automatic Rifle"
desc = "A modern solarian military rifle, chambered in ferromagnetic lances. Not for export."
cost = 5000
contains = list(/obj/item/storage/guncase/gar)
crate_name = "auto rifle crate"
faction = /datum/faction/solgov
faction_discount = 0
faction_locked = TRUE

/datum/supply_pack/gun/hades
name = "SL AL-655 'Hades' energy rifle"
desc = "Contains a high-energy, automatic laser rifle. For NT employee use only."
Expand Down Expand Up @@ -536,6 +557,27 @@
faction_discount = 0
faction_locked = TRUE

/* Heavy */

/datum/supply_pack/gun/cm40
name = "CM-40 Squad Automatic Weapon"
desc = "Contains a CM-40 Squad Automatic Weapon, a CLIP-produced LMG for Minuteman usage in situations that require heavy firepower. For Minuteman use only."
cost = 6000
contains = list(/obj/item/storage/guncase/cm40)
crate_name = "LMG crate"
faction = /datum/faction/clip
faction_discount = 0
faction_locked = TRUE

/datum/supply_pack/gun/saw80
name = "SAW-80 Squad Automatic Weapon"
desc = "Contains one of the rarely-produced SAW-80 Squad Automatic Weapon platforms, exclusively for licensed buyers. Remember, short controlled bursts!"
cost = 6000
contains = list(/obj/item/storage/guncase/saw80)
crate_name = "LMG crate"
faction = /datum/faction/syndicate/scarborough_arms
faction_discount = 0
faction_locked = TRUE

/* Marksman Rifles */

Expand Down
Loading
Loading