cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-17 21:52:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev-freeze' into dev

Browse Source 
Conflicts:
	code/modules/admin/topic.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/nano/modules/atmos_control.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/designs.dm
This commit is contained in:
PsiOmega
2015-07-17 23:19:34 +02:00
parent ae47726450 a9f2d83664
commit 34b0517578
12 changed files with 175 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
code/modules/research/circuitprinter.dm
View File

@@ -91,14 +91,14 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid).
/obj/machinery/r_n_d/circuit_imprinter/dismantle()
for(var/obj/I in component_parts)
if(istype(I, /obj/item/weapon/reagent_containers/glass/beaker))
reagents.trans_to_obj(I, reagents.total_volume)
if(istype(I, /obj/item/weapon/reagent_containers/glass/beaker))
reagents.trans_to_obj(I, reagents.total_volume)
for(var/f in materials)
if(materials[f] >= SHEET_MATERIAL_AMOUNT)
var/path = getMaterialType(f)
if(path)
var/obj/item/stack/S = new f(loc)
S.amount = round(materials[f] / SHEET_MATERIAL_AMOUNT)
S.amount = round(materials[f] / SHEET_MATERIAL_AMOUNT)
..()
/obj/machinery/r_n_d/circuit_imprinter/attackby(var/obj/item/O as obj, var/mob/user as mob)
@@ -120,17 +120,17 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid).
if(!linked_console)
user << "\The [src] must be linked to an R&D console first."
return 1
if(O.is_open_container())
return 0
if(O.is_open_container())
return 0
if(!istype(O, /obj/item/stack/material/glass) && !istype(O, /obj/item/stack/material/gold) && !istype(O, /obj/item/stack/material/diamond) && !istype(O, /obj/item/stack/material/uranium))
user << "<span class='notice'>You cannot insert this item into \the [src].</span>"
return 1
return 1
if(stat)
return 1
if(TotalMaterials() + SHEET_MATERIAL_AMOUNT > max_material_storage)
user << "<span class='notice'>\The [src]'s material bin is full. Please remove material before adding more.</span>"
return 1
return 1
var/obj/item/stack/stack = O
@@ -149,16 +149,17 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid).
var/stacktype = stack.type
var/t = getMaterialName(stacktype)
if(t)
if(do_after(usr, 16))
if(do_after(usr, 16))
if(stack.use(amount))
user << "<span class='notice'>You add [amount] sheets to \the [src].</span>"
materials[t] += amount * SHEET_MATERIAL_AMOUNT
busy = 0
updateUsrDialog()
return
/obj/machinery/r_n_d/circuit_imprinter/proc/addToQueue(var/datum/design/D)
queue += D
return
return
/obj/machinery/r_n_d/circuit_imprinter/proc/removeFromQueue(var/index)
queue.Cut(index, index + 1)
@@ -204,4 +205,4 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid).
if(mat_efficiency != 1) // No matter out of nowhere
if(new_item.matter && new_item.matter.len > 0)
for(var/i in new_item.matter)
new_item.matter[i] = new_item.matter[i] * mat_efficiency
new_item.matter[i] = new_item.matter[i] * mat_efficiency

12
code/modules/research/designs.dm
View File

@@ -321,6 +321,12 @@ other types of metals and chemistry for reagents).
materials = list("metal" = 3000, "glass" = 1000, "diamond" = 2000)
build_path = /obj/item/weapon/pickaxe/diamonddrill
sort_string = "KAAAE"
///////////////////////////////////
/////////Shield Generators/////////
///////////////////////////////////
datum/design/circuit/shield
req_tech = list("bluespace" = 4, "phorontech" = 3)
materials = list("$glass" = 2000, "sacid" = 20, "$phoron" = 10000, "$diamond" = 5000, "$gold" = 10000)
/datum/design/item/medical
materials = list("metal" = 30, "glass" = 20)
@@ -367,7 +373,7 @@ other types of metals and chemistry for reagents).
/datum/design/item/beaker/AssembleDesignName()
name = "Beaker prototype ([item_name])"
/datum/design/item/beaker/noreact
name = "cryostasis"
desc = "A cryostasis beaker that allows for chemical storage without reactions. Can hold up to 50 units."
@@ -375,7 +381,7 @@ other types of metals and chemistry for reagents).
req_tech = list(TECH_MATERIAL = 2)
materials = list("metal" = 3000)
build_path = /obj/item/weapon/reagent_containers/glass/beaker/noreact
sort_string = "MADAA"
sort_string = "MADAA"
/datum/design/item/beaker/bluespace
name = TECH_BLUESPACE
@@ -1647,4 +1653,4 @@ datum/design/rust_injector
build_type = IMPRINTER
materials = list("glass" = 2000, "sacid" = 20, "phoron" = 3000, "uranium" = 2000)
build_path = "/obj/item/weapon/circuitboard/rust_core"
*/
*/