MoModularized, plz don't yell at me

2018-07-06 17:33:07 -04:00
parent 5698720335
commit 71c259b0c4
7 changed files with 27 additions and 5 deletions
@@ -16,11 +16,6 @@
 	desc = "A 4.6x30mm incendiary bullet casing."
 	projectile_type = /obj/item/projectile/bullet/incendiary/c46x30mm

-/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
-
 // .45 (M1911 + C20r)

 /obj/item/ammo_casing/c45
@@ -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
@@ -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
@@ -0,0 +1,4 @@
+/obj/item/projectile/bullet/c46x30mm_tx
+	name = "toxin tipped 4.6x30mm bullet"
+	damage = 15
+	damage_type = TOX
@@ -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
@@ -18,3 +18,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")
@@ -2307,6 +2307,7 @@
 #include "code\modules\projectiles\guns\misc\syringe_gun.dm"
 #include "code\modules\projectiles\projectile\beams.dm"
 #include "code\modules\projectiles\projectile\bullets.dm"
+#include "code\modules\projectiles\projectile\energy.dm"
 #include "code\modules\projectiles\projectile\magic.dm"
 #include "code\modules\projectiles\projectile\megabuster.dm"
 #include "code\modules\projectiles\projectile\plasma.dm"
@@ -2829,7 +2830,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.dm"
 #include "modular_citadel\code\modules\projectiles\boxes_magazines\ammo_boxes.dm"
+#include "modular_citadel\code\modules\projectiles\boxes_magazines\external\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"
@@ -2852,6 +2856,7 @@
 #include "modular_citadel\code\modules\research\designs\autoylathe_designs.dm"
 #include "modular_citadel\code\modules\research\designs\machine_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"