shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5390 from Citadel-Station-13/upstream-merge-35463

Browse Source 
[MIRROR] Cell blueprints now use the /empty variants
This commit is contained in:
deathride58
2018-02-10 04:00:08 +00:00
committed by GitHub
parent 62eea2161a 1d63b0bc6f
commit a46fdf8750
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/cell.dm
+4
View File
@@ -158,6 +158,10 @@
return 0 return 0
/* Cell variants*/ /* Cell variants*/
/obj/item/stock_parts/cell/empty/Initialize()
. = ..()
charge = 0
/obj/item/stock_parts/cell/crap /obj/item/stock_parts/cell/crap
name = "\improper Nanotrasen brand rechargeable AA battery" name = "\improper Nanotrasen brand rechargeable AA battery"
desc = "You can't top the plasma top." //TOTALLY TRADEMARK INFRINGEMENT desc = "You can't top the plasma top." //TOTALLY TRADEMARK INFRINGEMENT
code/modules/research/designs/power_designs.dm
+5 -5
View File
@@ -9,7 +9,7 @@
build_type = PROTOLATHE | AUTOLATHE |MECHFAB build_type = PROTOLATHE | AUTOLATHE |MECHFAB
materials = list(MAT_METAL = 700, MAT_GLASS = 50) materials = list(MAT_METAL = 700, MAT_GLASS = 50)
construction_time=100 construction_time=100
build_path = /obj/item/stock_parts/cell build_path = /obj/item/stock_parts/cell/empty
category = list("Misc","Power Designs","Machinery","initial") category = list("Misc","Power Designs","Machinery","initial")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING
@@ -20,7 +20,7 @@
build_type = PROTOLATHE | AUTOLATHE | MECHFAB build_type = PROTOLATHE | AUTOLATHE | MECHFAB
materials = list(MAT_METAL = 700, MAT_GLASS = 60) materials = list(MAT_METAL = 700, MAT_GLASS = 60)
construction_time=100 construction_time=100
build_path = /obj/item/stock_parts/cell/high build_path = /obj/item/stock_parts/cell/high/empty
category = list("Misc","Power Designs") category = list("Misc","Power Designs")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING
@@ -31,7 +31,7 @@
build_type = PROTOLATHE | MECHFAB build_type = PROTOLATHE | MECHFAB
materials = list(MAT_METAL = 700, MAT_GLASS = 70) materials = list(MAT_METAL = 700, MAT_GLASS = 70)
construction_time=100 construction_time=100
build_path = /obj/item/stock_parts/cell/super build_path = /obj/item/stock_parts/cell/super/empty
category = list("Misc","Power Designs") category = list("Misc","Power Designs")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING
@@ -42,7 +42,7 @@
build_type = PROTOLATHE | MECHFAB build_type = PROTOLATHE | MECHFAB
materials = list(MAT_METAL = 700, MAT_GOLD = 150, MAT_SILVER = 150, MAT_GLASS = 80) materials = list(MAT_METAL = 700, MAT_GOLD = 150, MAT_SILVER = 150, MAT_GLASS = 80)
construction_time=100 construction_time=100
build_path = /obj/item/stock_parts/cell/hyper build_path = /obj/item/stock_parts/cell/hyper/empty
category = list("Misc","Power Designs") category = list("Misc","Power Designs")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING
@@ -53,7 +53,7 @@
build_type = PROTOLATHE | MECHFAB build_type = PROTOLATHE | MECHFAB
materials = list(MAT_METAL = 800, MAT_GOLD = 120, MAT_GLASS = 160, MAT_DIAMOND = 160, MAT_TITANIUM = 300, MAT_BLUESPACE = 100) materials = list(MAT_METAL = 800, MAT_GOLD = 120, MAT_GLASS = 160, MAT_DIAMOND = 160, MAT_TITANIUM = 300, MAT_BLUESPACE = 100)
construction_time=100 construction_time=100
build_path = /obj/item/stock_parts/cell/bluespace build_path = /obj/item/stock_parts/cell/bluespace/empty
category = list("Misc","Power Designs") category = list("Misc","Power Designs")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING