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

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229

Browse Source
This commit is contained in:
Ghommie
2020-02-05 04:34:54 +01:00
parent a726f09201 038f78bbcd
commit 5dc1de1d04
146 changed files with 1190 additions and 1257 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/projectiles/boxes_magazines/external/pistol.dm
Vendored
+2 -2
View File
@@ -74,7 +74,7 @@
desc = "A revolver speedloader."
id = "sl357"
build_type = PROTOLATHE
materials = list(MAT_METAL = 30000)
materials = list(/datum/material/iron = 30000)
build_path = /obj/item/ammo_box/a357
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -84,7 +84,7 @@
desc = "A revolver speedloader. Cuts through like a hot knife through butter."
id = "sl357ap"
build_type = PROTOLATHE
materials = list(MAT_METAL = 30000, MAT_TITANIUM = 45000)
materials = list(/datum/material/iron = 30000, /datum/material/titanium = 45000)
build_path = /obj/item/ammo_box/a357/ap
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY