cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 06:29:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/tgstation into idigtilmyshoveltellsasecretsweartotheearththatiwillkeepitbrushoffthedirtandletmychangeofheartoccur

Browse Source 
Conflicts:
	code/game/objects/structures/grille.dm
	icons/effects/beam.dmi
This commit is contained in:
Joan Lung
2016-09-12 17:14:39 -04:00
parent 5592d46594 bec196b6e7
commit 179b0b532d
413 changed files with 6746 additions and 5764 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/designs/mechfabricator_designs.dm
+7 -7
View File
@@ -3,7 +3,7 @@
name = "Cyborg Endoskeleton"
id = "borg_suit"
build_type = MECHFAB
build_path = /obj/item/robot_parts/robot_suit
build_path = /obj/item/robot_suit
materials = list(MAT_METAL=15000)
construction_time = 500
category = list("Cyborg")
@@ -12,7 +12,7 @@
name = "Cyborg Torso"
id = "borg_chest"
build_type = MECHFAB
build_path = /obj/item/robot_parts/chest
build_path = /obj/item/bodypart/chest/robot
materials = list(MAT_METAL=40000)
construction_time = 350
category = list("Cyborg")
@@ -21,7 +21,7 @@
name = "Cyborg Head"
id = "borg_head"
build_type = MECHFAB
build_path = /obj/item/robot_parts/head
build_path = /obj/item/bodypart/head/robot
materials = list(MAT_METAL=5000)
construction_time = 350
category = list("Cyborg")
@@ -30,7 +30,7 @@
name = "Cyborg Left Arm"
id = "borg_l_arm"
build_type = MECHFAB
build_path = /obj/item/robot_parts/l_arm
build_path = /obj/item/bodypart/l_arm/robot
materials = list(MAT_METAL=10000)
construction_time = 200
category = list("Cyborg")
@@ -39,7 +39,7 @@
name = "Cyborg Right Arm"
id = "borg_r_arm"
build_type = MECHFAB
build_path = /obj/item/robot_parts/r_arm
build_path = /obj/item/bodypart/r_arm/robot
materials = list(MAT_METAL=10000)
construction_time = 200
category = list("Cyborg")
@@ -48,7 +48,7 @@
name = "Cyborg Left Leg"
id = "borg_l_leg"
build_type = MECHFAB
build_path = /obj/item/robot_parts/l_leg
build_path = /obj/item/bodypart/l_leg/robot
materials = list(MAT_METAL=10000)
construction_time = 200
category = list("Cyborg")
@@ -57,7 +57,7 @@
name = "Cyborg Right Leg"
id = "borg_r_leg"
build_type = MECHFAB
build_path = /obj/item/robot_parts/r_leg
build_path = /obj/item/bodypart/r_leg/robot
materials = list(MAT_METAL=10000)
construction_time = 200
category = list("Cyborg")