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

Merge pull request #10924 from phil235/ProtolatheInsertFix

Browse Source 
Fixes being able to insert sheets into the protolathe from a distance
This commit is contained in:
Cheridan
2015-07-31 02:01:55 -05:00
parent a35770928d e670cec521
commit 7b94435e9c
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/protolathe.dm
+5 -8
View File
@@ -165,18 +165,16 @@ Note: Must be placed west/left of and R&D console to function.
var/obj/item/stack/sheet/stack = O
var/amount = round(input("How many sheets do you want to add?") as num)//No decimals
if(!stack || stack.amount <= 0 || amount <= 0)
if(!stack || stack.amount <= 0 || amount <= 0 || !in_range(src, stack) || !user.Adjacent(src))
return
if(amount > stack.amount)
amount = stack.amount
if(max_material_storage - TotalMaterials() < (amount*stack.perunit))//Can't overfill
amount = min(stack.amount, round((max_material_storage-TotalMaterials())/stack.perunit))
icon_state = "protolathe"
busy = 1
use_power(max(1000, (MINERAL_MATERIAL_AMOUNT*amount/10)))
user << "<span class='notice'>You add [amount] sheets to the [src.name].</span>"
icon_state = "protolathe"
if(istype(stack, /obj/item/stack/sheet/metal))
m_amount += amount * MINERAL_MATERIAL_AMOUNT
else if(istype(stack, /obj/item/stack/sheet/glass))
@@ -196,11 +194,10 @@ Note: Must be placed west/left of and R&D console to function.
else if(istype(stack, /obj/item/stack/sheet/mineral/adamantine))
adamantine_amount += amount * MINERAL_MATERIAL_AMOUNT
stack.use(amount)
busy = 0
src.updateUsrDialog()
updateUsrDialog()
src.overlays += "protolathe_[stack.name]"
overlays += "protolathe_[stack.name]"
sleep(10)
src.overlays -= "protolathe_[stack.name]"
overlays -= "protolathe_[stack.name]"
busy = 0
return