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

Merge pull request #7356 from Trilbyspaceclone/WT-550

Browse Source 
Hopefully this will add in the missing WT-550 Toxin Ammo for sec
This commit is contained in:
deathride58
2018-07-10 02:03:08 -04:00
committed by GitHub
parent 1145a66ec3 fb9f85f6fc
commit 914967f081
7 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/projectiles/projectile/bullets/smg.dm
View File

@@ -23,4 +23,4 @@
/obj/item/projectile/bullet/incendiary/c46x30mm
name = "4.6x30mm incendiary bullet"
damage = 10
fire_stacks = 1
fire_stacks = 1

5
modular_citadel/code/modules/projectiles/ammunition/ballistic/smg/smg.dm Normal file
View File

@@ -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

3
modular_citadel/code/modules/projectiles/boxes_magazines/external/smg/smg.dm vendored Normal file
View File

@@ -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

4
modular_citadel/code/modules/projectiles/bullets/bullets/smg.dm Normal file
View File

@@ -0,0 +1,4 @@
/obj/item/projectile/bullet/c46x30mm_tx
name = "toxin tipped 4.6x30mm bullet"
damage = 15
damage_type = TOX

7
modular_citadel/code/modules/research/designs/weapon_designs/weapon_designs.dm Normal file
View File

@@ -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

3
modular_citadel/code/modules/research/techweb/all_nodes.dm
View File

@@ -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")

4
tgstation.dme
View File

@@ -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"