cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-17 21:52:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	code/modules/research/designs.dm
This commit is contained in:
Iamgoofball
2013-11-20 14:59:33 -08:00
parent 7fa80e799a 60f644c401
commit e36f0c3fac
25 changed files with 477 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1611,6 +1611,16 @@ datum/design/bag_holding
reliability_base = 80
build_path = "/obj/item/weapon/storage/backpack/holding"
datum/design/bluespace_crystal
name = "Artificial Bluespace Crystal"
desc = "A small blue crystal with mystical properties."
id = "bluespace_crystal"
req_tech = list("bluespace" = 5, "materials" = 7)
build_type = PROTOLATHE
materials = list("$gold" = 1500, "$diamond" = 3000, "$plasma" = 1500)
reliability_base = 100
build_path = "/obj/item/bluespace_crystal/artificial"
/////////////////////////////////////////
/////////////////HUDs////////////////////
/////////////////////////////////////////
@@ -1849,4 +1859,8 @@ datum/design/cart_traitor
req_tech = list("syndicate" = 2, "powerstorage" = 3)
build_type = PROTOLATHE
materials = list("$metal" = 50, "$glass" = 50)
<<<<<<< HEAD
build_path = "/obj/item/weapon/cartridge/syndicate"
=======
build_path = "/obj/item/weapon/cartridge/syndicate"
>>>>>>> 60f644c4014e7ae0ca8267e271c8985574039f2b