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
2019-12-21 15:41:45 -05:00
committed by GitHub
parent ddd3676903 fac4c01d10
commit 0b63e79098
202 changed files with 2411 additions and 1480 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm
+12 -4
View File
@@ -130,11 +130,19 @@
category = list("hacked", "Security")
/datum/design/a357
name = "Speed Loader (.357)"
name = "Revolver Bullet (.357)"
id = "a357"
build_type = AUTOLATHE
materials = list(MAT_METAL = 30000)
build_path = /obj/item/ammo_box/a357
materials = list(MAT_METAL = 4000)
build_path = /obj/item/ammo_casing/a357
category = list("hacked", "Security")
/datum/design/a762
name = "Rifle Bullet (7.62mm)"
id = "a762"
build_type = AUTOLATHE
materials = list(MAT_METAL = 5000) //need seclathe for clips
build_path = /obj/item/ammo_casing/a762
category = list("hacked", "Security")
/datum/design/c10mm
@@ -183,4 +191,4 @@
build_type = AUTOLATHE
materials = list(MAT_METAL = 5500)
build_path = /obj/item/clothing/head/foilhat
category = list("hacked", "Misc")
category = list("hacked", "Misc")