cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-07-09 22:53:31 -04:00
committed by GitHub
parent 7ddc05bfda
commit a768e3a8f9
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,16 +66,8 @@
/datum/design/item/powercell/advance_device
name = "device, advanced"
build_type = PROTOLATHE
<<<<<<< HEAD
id = "advance_device"
materials = list(DEFAULT_WALL_MATERIAL = 700, "glass" = 50)
||||||| parent of 8ab34365f1... Merge pull request #10852 from VOREStation/Arokha/matdefs
id = "weapon"
materials = list(DEFAULT_WALL_MATERIAL = 700, "glass" = 50)
=======
id = "weapon"
materials = list(MAT_STEEL = 700, MAT_GLASS = 50)
>>>>>>> 8ab34365f1... Merge pull request #10852 from VOREStation/Arokha/matdefs
build_path = /obj/item/weapon/cell/device/weapon
category = list("Misc")
sort_string = "BAABB"
@@ -84,7 +76,7 @@
name = "device, super"
id = "super_device"
req_tech = list(TECH_POWER = 3, TECH_MATERIAL = 2)
materials = list(DEFAULT_WALL_MATERIAL = 700, "glass" = 70, "gold" = 50, "silver" = 20)
materials = list(MAT_STEEL = 700, MAT_GLASS = 70, "gold" = 50, "silver" = 20)
build_path = /obj/item/weapon/cell/device/super
category = list("Misc")
sort_string = "BAABC"
@@ -93,7 +85,7 @@
name = "device, hyper"
id = "hyper_device"
req_tech = list(TECH_POWER = 5, TECH_MATERIAL = 4)
materials = list(DEFAULT_WALL_MATERIAL = 1400, "glass" = 1400, "gold" = 150, "silver" = 150)
materials = list(MAT_STEEL = 1400, MAT_GLASS= 1400, "gold" = 150, "silver" = 150)
build_path = /obj/item/weapon/cell/device/hyper
category = list("Misc")
sort_string = "BAABD"
@@ -103,7 +95,7 @@
req_tech = list(TECH_POWER = 8, TECH_MATERIAL = 7, TECH_ARCANE = 2, TECH_PHORON = 4, TECH_PRECURSOR = 2)
build_type = PROTOLATHE
id = "omni-device"
materials = list(DEFAULT_WALL_MATERIAL = 1700, "glass" = 550, MAT_DURASTEEL = 230, MAT_MORPHIUM = 320, MAT_METALHYDROGEN = 600, MAT_URANIUM = 60, MAT_VERDANTIUM = 150, MAT_PHORON = 900)
materials = list(MAT_STEEL = 1700, MAT_GLASS = 550, MAT_DURASTEEL = 230, MAT_MORPHIUM = 320, MAT_METALHYDROGEN = 600, MAT_URANIUM = 60, MAT_VERDANTIUM = 150, MAT_PHORON = 900)
build_path = /obj/item/weapon/cell/device/weapon/recharge/alien/omni
category = list("Misc")
sort_string = "BAABE"