From 110c53b72440288ecd0c21fa68045e93106d2b0c Mon Sep 17 00:00:00 2001 From: Improvedname Date: Sat, 23 Jun 2018 14:48:00 +0200 Subject: [PATCH 1/2] rubberoo --- .../projectiles/guns/ballistic/rifles.dm | 18 ++++++++++++++++++ .../modules/research/designs/weapon_designs.dm | 7 +++++++ .../code/modules/research/techweb/all_nodes.dm | 4 ++++ tgstation.dme | 1 + 4 files changed, 30 insertions(+) create mode 100644 modular_citadel/code/modules/research/designs/weapon_designs.dm 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..4f1d630bdf --- /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 Incendiary Magazine (4.6x30mm IC)" + desc = "A 20 round armour piercing 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 527db71b8c..53412e7631 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -2851,6 +2851,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" From 7dec7223c26848bfa95ec8da05fa02d39c6deb5b Mon Sep 17 00:00:00 2001 From: Improvedname Date: Sat, 23 Jun 2018 15:06:36 +0200 Subject: [PATCH 2/2] rubber2 --- .../code/modules/research/designs/weapon_designs.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modular_citadel/code/modules/research/designs/weapon_designs.dm b/modular_citadel/code/modules/research/designs/weapon_designs.dm index 4f1d630bdf..bdb77170ed 100644 --- a/modular_citadel/code/modules/research/designs/weapon_designs.dm +++ b/modular_citadel/code/modules/research/designs/weapon_designs.dm @@ -1,6 +1,6 @@ /datum/design/mag_oldsmg/rubber_mag - name = "WT-550 Auto Gun Incendiary Magazine (4.6x30mm IC)" - desc = "A 20 round armour piercing magazine for the out of date security WT-550 Auto Rifle" + 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