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

Merge branch 'master' into glassware

Browse Source
This commit is contained in:
Trilbyspaceclone
2020-01-02 20:30:20 -05:00
committed by GitHub
parent 5fbe7fcc2b 312d569039
commit 2931cb6757
510 changed files with 26975 additions and 15945 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/projectiles/boxes_magazines/external/pistol.dm
Vendored
+11 -1
View File
@@ -50,7 +50,7 @@
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
/datum/design/m45 //Kinda NT in throey
/datum/design/m45 //Kinda NT in theory
name = "handgun magazine (.45)"
id = "m45"
build_type = PROTOLATHE
@@ -68,3 +68,13 @@
build_path = /obj/item/ammo_box/magazine/pistolm9mm
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
/datum/design/sl357
name = "revolver speedloader (.357)"
desc = "A revolver speedloader."
id = "sl357"
build_type = PROTOLATHE
materials = list(MAT_METAL = 30000)
build_path = /obj/item/ammo_box/a357
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY