cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-02 05:23:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'smallchanges' of https://github.com/Iamgoofball/Baystation12 into smallchanges

Browse Source 
Conflicts:
	code/modules/research/designs.dm
This commit is contained in:
Iamgoofball
2013-11-20 15:00:36 -08:00
parent e36f0c3fac ab43cc9cd6
commit b024087119
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/research/designs.dm
View File

@@ -1859,8 +1859,12 @@ datum/design/cart_traitor
req_tech = list("syndicate" = 2, "powerstorage" = 3)
build_type = PROTOLATHE
materials = list("$metal" = 50, "$glass" = 50)
<<<<<<< HEAD
<<<<<<< HEAD
build_path = "/obj/item/weapon/cartridge/syndicate"
=======
build_path = "/obj/item/weapon/cartridge/syndicate"
>>>>>>> 60f644c4014e7ae0ca8267e271c8985574039f2b
=======
build_path = "/obj/item/weapon/cartridge/syndicate"
>>>>>>> ab43cc9cd6179a50395854c59eccfb43a651641b