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

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into bone_fixer

Browse Source 
# Conflicts:
#	icons/obj/abductor.dmi
This commit is contained in:
Anewbe
2017-09-25 20:35:19 -05:00
parent b47b1ce1f1 c262cd91c2
commit caa4fecd8b
108 changed files with 1024 additions and 1402 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/designs.dm
+12 -12
View File
@@ -648,14 +648,14 @@ other types of metals and chemistry for reagents).
/datum/design/item/weapon/slimebation
id = "slimebation"
req_tech = list(TECH_MATERIAL = 2, TECH_BIO = 3, TECH_POWER = 3, TECH_COMBAT = 3)
req_tech = list(TECH_MATERIAL = 2, TECH_BIO = 2, TECH_POWER = 3, TECH_COMBAT = 3)
materials = list(DEFAULT_WALL_MATERIAL = 5000)
build_path = /obj/item/weapon/melee/baton/slime
sort_string = "TBAAB"
/datum/design/item/weapon/slimetaser
id = "slimetaser"
req_tech = list(TECH_MATERIAL = 3, TECH_BIO = 4, TECH_POWER = 4, TECH_COMBAT = 4)
req_tech = list(TECH_MATERIAL = 3, TECH_BIO = 3, TECH_POWER = 4, TECH_COMBAT = 4)
materials = list(DEFAULT_WALL_MATERIAL = 5000)
build_path = /obj/item/weapon/gun/energy/taser/xeno
sort_string = "TBAAC"
@@ -744,6 +744,16 @@ other types of metals and chemistry for reagents).
build_path = /obj/item/device/aicard
sort_string = "VACAA"
/datum/design/item/dronebrain
name = "Robotic intelligence circuit"
id = "dronebrain"
req_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 5, TECH_DATA = 4)
build_type = PROTOLATHE | PROSFAB
materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 1000, "silver" = 1000, "gold" = 500)
build_path = /obj/item/device/mmi/digital/robot
category = "Misc"
sort_string = "VACAC"
/datum/design/item/posibrain
name = "Positronic brain"
id = "posibrain"
@@ -764,16 +774,6 @@ other types of metals and chemistry for reagents).
category = "Misc"
sort_string = "VACBA"
/datum/design/item/mmi_radio
name = "Radio-enabled man-machine interface"
id = "mmi_radio"
req_tech = list(TECH_DATA = 2, TECH_BIO = 4)
build_type = PROTOLATHE | PROSFAB
materials = list(DEFAULT_WALL_MATERIAL = 1200, "glass" = 500)
build_path = /obj/item/device/mmi/radio_enabled
category = "Misc"
sort_string = "VACBB"
/datum/design/item/beacon
name = "Bluespace tracking beacon design"
id = "beacon"