shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7228 from improvedname/rubber-shot-edition!

Browse Source 
adds rubbershot versions for sec rifless
This commit is contained in:
deathride58
2018-06-26 14:08:25 -04:00
committed by GitHub
parent e2234a7fc4 7dec7223c2
commit 5c2b858e4c
4 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/projectiles/guns/ballistic/rifles.dm
+18
View File
@@ -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
modular_citadel/code/modules/research/designs/weapon_designs.dm
+7
View File
@@ -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
modular_citadel/code/modules/research/techweb/all_nodes.dm
+4
View File
@@ -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"
tgstation.dme
+1
View File
@@ -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"