diff --git a/modular_citadel/code/modules/projectiles/guns/ballistic/rifles.dm b/modular_citadel/code/modules/projectiles/guns/ballistic/rifles.dm index e503b37386..2e4d9a60e1 100644 --- a/modular_citadel/code/modules/projectiles/guns/ballistic/rifles.dm +++ b/modular_citadel/code/modules/projectiles/guns/ballistic/rifles.dm @@ -16,6 +16,24 @@ spread = 30 //should be 40 for XCOM memes, but since its adminspawn only, might as well make it useable recoil = 1 +///////security rifles special ammo/////// + +/obj/item/ammo_casing/c46x30mm/rubber + name = "4.6x30mm rubberbullet casing" + desc = "A 4.6x30mm rubberbullet casing." + caliber = "4.6x30mm" + projectile_type = /obj/item/projectile/bullet/c46x30mm/rubber + +/obj/item/ammo_box/magazine/wt550m9/wtrubber + name = "wt550 magazine (Rubber bullets 4.6x30mm)" + icon_state = "46x30mmtA-20" + ammo_type = /obj/item/ammo_casing/c46x30mm/rubber + +/obj/item/projectile/bullet/c46x30mm/rubber + name = "4.6x30mm bullet" + damage = 5 + stamina = 20 + ///toy memes/// /obj/item/ammo_box/magazine/toy/x9 diff --git a/modular_citadel/code/modules/research/designs/weapon_designs.dm b/modular_citadel/code/modules/research/designs/weapon_designs.dm new file mode 100644 index 0000000000..bdb77170ed --- /dev/null +++ b/modular_citadel/code/modules/research/designs/weapon_designs.dm @@ -0,0 +1,7 @@ +/datum/design/mag_oldsmg/rubber_mag + name = "WT-550 Auto Gun rubberbullets Magazine (4.6x30mm rubber)" + desc = "A 20 round rubber shots magazine for the out of date security WT-550 Auto Rifle" + id = "mag_oldsmg_rubber" + materials = list(MAT_METAL = 6000) + build_path = /obj/item/ammo_box/magazine/wt550m9/wtrubber + 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 113d4115ac..e890b3a07a 100644 --- a/modular_citadel/code/modules/research/techweb/all_nodes.dm +++ b/modular_citadel/code/modules/research/techweb/all_nodes.dm @@ -10,6 +10,10 @@ . = ..() design_ids += "xenobio_slimeadv" +/datum/techweb_node/ballistic_weapons/New() + . = ..() + design_ids += "mag_oldsmg_rubber" + /datum/techweb_node/computer_board_gaming id = "computer_board_gaming" display_name = "Games and Toys" diff --git a/tgstation.dme b/tgstation.dme index a6cfa0dc43..6ca71acb86 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -2856,6 +2856,7 @@ #include "modular_citadel\code\modules\research\designs\autolathe_designs.dm" #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\weapon_designs.dm" #include "modular_citadel\code\modules\research\designs\xenobio_designs.dm" #include "modular_citadel\code\modules\research\techweb\_techweb.dm" #include "modular_citadel\code\modules\research\techweb\all_nodes.dm"