diff --git a/code/modules/projectiles/projectile/bullets/smg.dm b/code/modules/projectiles/projectile/bullets/smg.dm index 50532a5977..4044a9629c 100644 --- a/code/modules/projectiles/projectile/bullets/smg.dm +++ b/code/modules/projectiles/projectile/bullets/smg.dm @@ -23,4 +23,4 @@ /obj/item/projectile/bullet/incendiary/c46x30mm name = "4.6x30mm incendiary bullet" damage = 10 - fire_stacks = 1 + fire_stacks = 1 \ No newline at end of file diff --git a/modular_citadel/code/modules/projectiles/ammunition/ballistic/smg/smg.dm b/modular_citadel/code/modules/projectiles/ammunition/ballistic/smg/smg.dm new file mode 100644 index 0000000000..7a2f69de5a --- /dev/null +++ b/modular_citadel/code/modules/projectiles/ammunition/ballistic/smg/smg.dm @@ -0,0 +1,5 @@ + +/obj/item/ammo_casing/c46x30mm/tx + name = "Toxin Tipped 4.6x30mm bullet casing." + desc = "A Toxin Tipped 4.6x30mm bullet casing." + projectile_type = /obj/item/projectile/bullet/c46x30mm diff --git a/modular_citadel/code/modules/projectiles/boxes_magazines/external/smg/smg.dm b/modular_citadel/code/modules/projectiles/boxes_magazines/external/smg/smg.dm new file mode 100644 index 0000000000..fb385234bd --- /dev/null +++ b/modular_citadel/code/modules/projectiles/boxes_magazines/external/smg/smg.dm @@ -0,0 +1,3 @@ +/obj/item/ammo_box/magazine/wt550m9/wttx + name = "wt550 magazine (Toxin Tipped 4.6x30mm)" + ammo_type = /obj/item/ammo_casing/c46x30mm/tx \ No newline at end of file diff --git a/modular_citadel/code/modules/projectiles/bullets/bullets/smg.dm b/modular_citadel/code/modules/projectiles/bullets/bullets/smg.dm new file mode 100644 index 0000000000..f069a73fe8 --- /dev/null +++ b/modular_citadel/code/modules/projectiles/bullets/bullets/smg.dm @@ -0,0 +1,4 @@ +/obj/item/projectile/bullet/c46x30mm_tx + name = "toxin tipped 4.6x30mm bullet" + damage = 15 + damage_type = TOX \ No newline at end of file diff --git a/modular_citadel/code/modules/research/designs/weapon_designs/weapon_designs.dm b/modular_citadel/code/modules/research/designs/weapon_designs/weapon_designs.dm new file mode 100644 index 0000000000..0db3bb9b1d --- /dev/null +++ b/modular_citadel/code/modules/research/designs/weapon_designs/weapon_designs.dm @@ -0,0 +1,7 @@ +/datum/design/mag_oldsmg/tx_mag + name = "WT-550 Auto Gun Uranium Magazine (4.6x30mm TX)" + desc = "A 20 round uranium tipped magazine for the out of date security WT-550 Auto Rifle" + id = "mag_oldsmg_tx" + materials = list(MAT_METAL = 6000, MAT_SILVER = 600, MAT_URANIUM = 2000) + build_path = /obj/item/ammo_box/magazine/wt550m9/wttx + departmental_flags = DEPARTMENTAL_FLAG_SECURITY \ No newline at end of file diff --git a/modular_citadel/code/modules/research/techweb/all_nodes.dm b/modular_citadel/code/modules/research/techweb/all_nodes.dm index e890b3a07a..0af69860de 100644 --- a/modular_citadel/code/modules/research/techweb/all_nodes.dm +++ b/modular_citadel/code/modules/research/techweb/all_nodes.dm @@ -22,3 +22,6 @@ design_ids = list("arcade_battle", "arcade_orion", "slotmachine", "autoylathe") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1000) export_price = 5000 + +/datum/techweb_node/ballistic_weapons + design_ids = list("mag_oldsmg", "mag_oldsmg_ap", "mag_oldsmg_ic", "mag_oldsmg_tx") diff --git a/tgstation.dme b/tgstation.dme index 65a0274e81..18b0c6470d 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -2840,7 +2840,10 @@ #include "modular_citadel\code\modules\power\lighting.dm" #include "modular_citadel\code\modules\projectiles\gun.dm" #include "modular_citadel\code\modules\projectiles\ammunition\caseless.dm" +#include "modular_citadel\code\modules\projectiles\ammunition\ballistic\smg\smg.dm" #include "modular_citadel\code\modules\projectiles\boxes_magazines\ammo_boxes.dm" +#include "modular_citadel\code\modules\projectiles\boxes_magazines\external\smg\smg.dm" +#include "modular_citadel\code\modules\projectiles\bullets\bullets\smg.dm" #include "modular_citadel\code\modules\projectiles\guns\pumpenergy.dm" #include "modular_citadel\code\modules\projectiles\guns\toys.dm" #include "modular_citadel\code\modules\projectiles\guns\ballistic\flechette.dm" @@ -2864,6 +2867,7 @@ #include "modular_citadel\code\modules\research\designs\machine_designs.dm" #include "modular_citadel\code\modules\research\designs\weapon_designs.dm" #include "modular_citadel\code\modules\research\designs\xenobio_designs.dm" +#include "modular_citadel\code\modules\research\designs\weapon_designs\weapon_designs.dm" #include "modular_citadel\code\modules\research\techweb\_techweb.dm" #include "modular_citadel\code\modules\research\techweb\all_nodes.dm" #include "modular_citadel\code\modules\research\xenobiology\xenobio_camera.dm"