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

Allow magazines for guns (legally) purchasable from cargo to be fabricated in the security techfab. #14

Open
wants to merge 5 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
6 changes: 6 additions & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -5465,4 +5465,10 @@
#include "modular_skyrat\modules\xenoarch\code\modules\research\xenoarch\xenoarch_reward.dm"
#include "modular_skyrat\modules\xenoarch\code\modules\research\xenoarch\xenoarch_tool.dm"
#include "z__modular_aculastation\aculastation.dme"
#include "z__modular_aculastation\modules\no_horny\feather.dm"
#include "z__modular_aculastation\modules\no_horny\helper_procs.dm"
#include "z__modular_aculastation\modules\no_horny\qdel_horny.dm"
#include "z__modular_aculastation\modules\no_horny\z_axis.dm"
#include "z__modular_aculastation\modules\weapons\magfab\magazines.dm"
#include "z__modular_aculastation\modules\weapons\magfab\weapon_designs.dm"
// END_INCLUDE
16 changes: 16 additions & 0 deletions z__modular_aculastation/modules/weapons/magfab/magazines.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
//Empty variants of magazines for production in security protolathes/techfabs.
//Magazines are for guns that are purchasable legally from cargo.

/obj/item/ammo_box/magazine/multi_sprite/croon/empty //Magazine for the DT-4 Croon SMG.
start_empty = TRUE

/obj/item/ammo_box/magazine/pepperball/empty //Magazine for the Armadyne Pepperball AHG
start_empty = TRUE

/obj/item/ammo_box/magazine/multi_sprite/makarov/empty //Magazine for the R-C Makarov pistol (not the traitor Makarov)
start_empty = TRUE

//Empty magazine for the Wildcat not included here because it already exists in Skyrat code.

/obj/item/ammo_box/magazine/wt550m9/empty //Magazine for the WT-550/security auto rifle.
start_empty = TRUE
60 changes: 60 additions & 0 deletions z__modular_aculastation/modules/weapons/magfab/weapon_designs.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
//Designs for empty magazines for security protolathes/techfabs.
//Magazines are for guns that are purchasable legally from cargo.

/datum/design/croonmag
name = "Empty Croon Magazine (6.3mm)"
id = "croonmag"
build_type = PROTOLATHE | AWAY_LATHE
materials = list(/datum/material/iron = 3000)
build_path = /obj/item/ammo_box/magazine/multi_sprite/croon/empty
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY

/datum/design/pepperballmag
name = "Empty Pepperball Magazine"
id = "pepperballmag"
build_type = PROTOLATHE | AWAY_LATHE
materials = list(/datum/material/iron = 3000)
build_path = /obj/item/ammo_box/magazine/pepperball/empty
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY

/datum/design/wildcatmag
name = "Empty Wildcat Magazine (.32)"
id = "wildcatmag"
build_type = PROTOLATHE | AWAY_LATHE
materials = list(/datum/material/iron = 3000)
build_path = /obj/item/ammo_box/magazine/multi_sprite/cfa_wildcat/empty
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY

/datum/design/rcmakarovmag
name = "Empty R-C Makarov Magazine (10mm)"
id = "rcmakarovmag"
build_type = PROTOLATHE | AWAY_LATHE
materials = list(/datum/material/iron = 3000)
build_path = /obj/item/ammo_box/magazine/multi_sprite/makarov/empty
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY

/datum/design/wt550mag
name = "Empty WT-550 Magazine (4.6x30mm)"
id = "wt550mag"
build_type = PROTOLATHE | AWAY_LATHE
materials = list(/datum/material/iron = 3000)
build_path = /obj/item/ammo_box/magazine/wt550m9/empty
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY

/datum/techweb_node/basic_mags
id = "basic_mags"
starting_node = TRUE
display_name = "Magazine Fabrication"
description = "Designs for magazines of various commercially sold guns commonly seen on stations. Actual guns and ammo (that isn't already available in the ammunition workbench) not included."
design_ids = list(
"croonmag",
"pepperballmag",
"rcmakarovmag",
"wildcatmag",
"wt550mag",
)