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

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-05-27 22:30:33 -04:00
committed by GitHub
parent 9f9382f472
commit 2e073a6f5a
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
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, MAT_COPPER = 15)
||||||| parent of 21658b8d85... Merge pull request #10401 from VOREStation/upstream-merge-8075
id = "weapon"
materials = list(DEFAULT_WALL_MATERIAL = 700, "glass" = 50, MAT_COPPER = 15)
=======
id = "weapon"
materials = list(DEFAULT_WALL_MATERIAL = 700, "glass" = 50)
>>>>>>> 21658b8d85... Merge pull request #10401 from VOREStation/upstream-merge-8075
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, MAT_COPPER = 15)
materials = list(DEFAULT_WALL_MATERIAL = 700, "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, MAT_COPPER = 50)
materials = list(DEFAULT_WALL_MATERIAL = 1400, "glass" = 1400, "gold" = 150, "silver" = 150)
build_path = /obj/item/weapon/cell/device/hyper
category = list("Misc")
sort_string = "BAABD"