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

Merge pull request #33165 from MrStonedOne/revert-33062-ore_stacking

Browse Source 
Revert "Ore Stacking"
This commit is contained in:
Leo
2017-12-02 18:00:45 -02:00
committed by GitHub
parent a97b4a07a8 8c4885cf6e
commit 80aad8cef0
54 changed files with 265 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/circuitprinter.dm
+2 -2
View File
@@ -33,7 +33,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
/obj/machinery/rnd/circuit_imprinter/Initialize()
materials = AddComponent(/datum/component/material_container, list(MAT_GLASS, MAT_GOLD, MAT_DIAMOND, MAT_METAL, MAT_BLUESPACE),
FALSE, list(/obj/item/stack), CALLBACK(src, .proc/is_insertion_ready))
FALSE, list(/obj/item/stack, /obj/item/ore/bluespace_crystal), CALLBACK(src, .proc/is_insertion_ready))
materials.precise_insertion = TRUE
create_reagents(0)
return ..()
@@ -89,7 +89,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
return
var/lit = M.last_inserted_type
var/stack_name
if(ispath(lit, /obj/item/stack/ore/bluespace_crystal))
if(ispath(lit, /obj/item/ore/bluespace_crystal))
stack_name = "bluespace"
use_power(MINERAL_MATERIAL_AMOUNT / 10)
else
code/modules/research/designs/bluespace_designs.dm
+1 -1
View File
@@ -30,7 +30,7 @@
id = "bluespace_crystal"
build_type = PROTOLATHE
materials = list(MAT_DIAMOND = 1500, MAT_PLASMA = 1500)
build_path = /obj/item/stack/ore/bluespace_crystal/artificial
build_path = /obj/item/ore/bluespace_crystal/artificial
category = list("Bluespace Designs")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
code/modules/research/protolathe.dm
+5 -5
View File
@@ -37,7 +37,7 @@ Note: Must be placed west/left of and R&D console to function.
create_reagents(0)
materials = AddComponent(/datum/component/material_container,
list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM, MAT_BLUESPACE),
FALSE, list(/obj/item/stack, /obj/item/stack/ore/bluespace_crystal), CALLBACK(src, .proc/is_insertion_ready))
FALSE, list(/obj/item/stack, /obj/item/ore/bluespace_crystal), CALLBACK(src, .proc/is_insertion_ready))
materials.precise_insertion = TRUE
return ..()
@@ -88,13 +88,13 @@ Note: Must be placed west/left of and R&D console to function.
return
var/lit = M.last_inserted_type
var/stack_name
if(ispath(lit, /obj/item/stack/ore/bluespace_crystal))
if(ispath(lit, /obj/item/ore/bluespace_crystal))
stack_name = "bluespace"
use_power(min(1000, MINERAL_MATERIAL_AMOUNT * M.last_amount_inserted / 10))
use_power(MINERAL_MATERIAL_AMOUNT / 10)
else
var/obj/item/stack/S = lit
stack_name = initial(S.name)
use_power(min(1000, (MINERAL_MATERIAL_AMOUNT * M.last_amount_inserted / 10)))
use_power(max(1000, (MINERAL_MATERIAL_AMOUNT * M.last_amount_inserted / 10)))
add_overlay("protolathe_[stack_name]")
addtimer(CALLBACK(src, /atom/proc/cut_overlay, "protolathe_[stack_name]"), 10)
@@ -148,6 +148,6 @@ Note: Must be placed west/left of and R&D console to function.
message_admins("[ADMIN_LOOKUPFLW(usr)] has built [amount] of [path] at a protolathe")
for(var/i in 1 to amount)
var/obj/item/I = new path(get_turf(src))
if(!istype(I, /obj/item/stack/sheet) && !istype(I, /obj/item/stack/ore/bluespace_crystal))
if(!istype(I, /obj/item/stack/sheet) && !istype(I, /obj/item/ore/bluespace_crystal))
I.materials = matlist.Copy()
SSblackbox.record_feedback("nested_tally", "item_printed", amount, list("[type]", "[path]"))