cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-19 22:13:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Syntax fix

Browse Source
This commit is contained in:
botka4aet
2021-09-23 18:12:13 +03:00
parent d84290b28c
commit 2c4cf6db3d
1 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
code/modules/reagents/chemistry/machinery/reagentgrinder.dm
View File

@@ -249,10 +249,10 @@
for (var/obj/item/O in holdingitems)
processing_chamber += "\A [html_encode(O.name)]<BR>"
if (!processing_chamber)
if(!processing_chamber)
is_chamber_empty = 1
processing_chamber = "Nothing."
if (!beaker)
if(!beaker)
beaker_contents = "<B>No beaker attached.</B><br>"
else
is_beaker_ready = 1
@@ -270,12 +270,12 @@
[processing_chamber]<br>
[beaker_contents]<hr>
"}
if (is_beaker_ready && !is_chamber_empty && !(stat & (NOPOWER|BROKEN)))
if(is_beaker_ready && !is_chamber_empty && !(stat & (NOPOWER|BROKEN)))
dat += "<A href='?src=[src.UID()];action=grind'>Grind the reagents</a><BR>"
dat += "<A href='?src=[src.UID()];action=juice'>Juice the reagents</a><BR><BR>"
if(holdingitems && holdingitems.len > 0)
dat += "<A href='?src=[src.UID()];action=eject'>Eject the reagents</a><BR>"
if (beaker)
if(beaker)
dat += "<A href='?src=[src.UID()];action=detach'>Detach the beaker</a><BR>"
else
dat += "Please wait..."
@@ -294,19 +294,19 @@
updateUsrDialog()
return
switch(href_list["action"])
if ("grind")
if("grind")
grind()
if("juice")
juice()
if("eject")
eject()
if ("detach")
if("detach")
detach()
/obj/machinery/reagentgrinder/proc/detach()
if (usr.stat != 0)
if(usr.stat != 0)
return
if (!beaker)
if(!beaker)
return
beaker.loc = src.loc
beaker = null
@@ -314,9 +314,9 @@
updateUsrDialog()
/obj/machinery/reagentgrinder/proc/eject()
if (usr.stat != 0)
if(usr.stat != 0)
return
if (holdingitems && holdingitems.len == 0)
if(holdingitems && holdingitems.len == 0)
return
for(var/obj/item/O in holdingitems)
@@ -333,7 +333,7 @@
/obj/machinery/reagentgrinder/proc/get_allowed_by_id(obj/item/O)
for (var/i in blend_items)
if (istype(O, i))
if(istype(O, i))
return blend_items[i]
/obj/machinery/reagentgrinder/proc/get_allowed_snack_by_id(obj/item/reagent_containers/food/snacks/O)
@@ -347,17 +347,17 @@
return juice_items[i]
/obj/machinery/reagentgrinder/proc/get_grownweapon_amount(obj/item/grown/O)
if (!istype(O) || !O.seed)
if(!istype(O) || !O.seed)
return 5
else if (O.seed.potency == -1)
else if(O.seed.potency == -1)
return 5
else
return round(O.seed.potency)
/obj/machinery/reagentgrinder/proc/get_juice_amount(obj/item/reagent_containers/food/snacks/grown/O)
if (!istype(O) || !O.seed)
if(!istype(O) || !O.seed)
return 5
else if (O.seed.potency == -1)
else if(O.seed.potency == -1)
return 5
else
return round(5*sqrt(O.seed.potency))
@@ -370,7 +370,7 @@
power_change()
if(stat & (NOPOWER|BROKEN))
return
if (!beaker || (beaker && beaker.reagents.total_volume >= beaker.reagents.maximum_volume))
if(!beaker || (beaker && beaker.reagents.total_volume >= beaker.reagents.maximum_volume))
return
playsound(src.loc, 'sound/machines/juicer.ogg', 20, 1)
var/offset = prob(50) ? -2 : 2
@@ -384,7 +384,7 @@
//Snacks
for (var/obj/item/reagent_containers/food/snacks/O in holdingitems)
if (beaker.reagents.holder_full())
if(beaker.reagents.holder_full())
break
var/allowed = get_allowed_juice_by_id(O)
@@ -396,9 +396,9 @@
var/space = beaker.reagents.maximum_volume - beaker.reagents.total_volume
var/amount = get_juice_amount(O)
beaker.reagents.add_reagent(r_id, min(amount*efficiency, space))
beaker.reagents.add_reagent(r_id, min(amount * efficiency, space))
if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
if(beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
break
remove_object(O)
@@ -408,7 +408,7 @@
power_change()
if(stat & (NOPOWER|BROKEN))
return
if (!beaker || (beaker && beaker.reagents.holder_full()))
if(!beaker || (beaker && beaker.reagents.holder_full()))
return
playsound(src.loc, 'sound/machines/blender.ogg', 50, 1)
var/offset = prob(50) ? -2 : 2
@@ -422,7 +422,7 @@
//Snacks and Plants
for (var/obj/item/reagent_containers/food/snacks/O in holdingitems)
if (beaker.reagents.holder_full())
if(beaker.reagents.holder_full())
break
var/allowed = get_allowed_snack_by_id(O)
@@ -435,25 +435,25 @@
var/amount = allowed[r_id]
if(amount <= 0)
if(amount == 0)
if (O.reagents != null && O.reagents.has_reagent("nutriment"))
beaker.reagents.add_reagent(r_id, min(O.reagents.get_reagent_amount("nutriment")*efficiency, space))
if(O.reagents != null && O.reagents.has_reagent("nutriment"))
beaker.reagents.add_reagent(r_id, min(O.reagents.get_reagent_amount("nutriment") * efficiency, space))
O.reagents.remove_reagent("nutriment", min(O.reagents.get_reagent_amount("nutriment"), space))
if (O.reagents != null && O.reagents.has_reagent("plantmatter"))
beaker.reagents.add_reagent(r_id, min(O.reagents.get_reagent_amount("plantmatter")*efficiency, space))
if(O.reagents != null && O.reagents.has_reagent("plantmatter"))
beaker.reagents.add_reagent(r_id, min(O.reagents.get_reagent_amount("plantmatter") * efficiency, space))
O.reagents.remove_reagent("plantmatter", min(O.reagents.get_reagent_amount("plantmatter"), space))
else
if (O.reagents != null && O.reagents.has_reagent("nutriment"))
beaker.reagents.add_reagent(r_id, min(round(O.reagents.get_reagent_amount("nutriment")*abs(amount)*efficiency), space))
if(O.reagents != null && O.reagents.has_reagent("nutriment"))
beaker.reagents.add_reagent(r_id, min(round(O.reagents.get_reagent_amount("nutriment") * abs(amount) * efficiency), space))
O.reagents.remove_reagent("nutriment", min(O.reagents.get_reagent_amount("nutriment"), space))
if (O.reagents != null && O.reagents.has_reagent("plantmatter"))
beaker.reagents.add_reagent(r_id, min(round(O.reagents.get_reagent_amount("plantmatter")*abs(amount)*efficiency), space))
if(O.reagents != null && O.reagents.has_reagent("plantmatter"))
beaker.reagents.add_reagent(r_id, min(round(O.reagents.get_reagent_amount("plantmatter") * abs(amount) * efficiency), space))
O.reagents.remove_reagent("plantmatter", min(O.reagents.get_reagent_amount("plantmatter"), space))
else
O.reagents.trans_id_to(beaker, r_id, min(amount, space))
if (beaker.reagents.holder_full())
if(beaker.reagents.holder_full())
break
if(O.reagents.reagent_list.len == 0)
@@ -461,7 +461,7 @@
//Sheets and rods(!)
for (var/obj/item/stack/O in holdingitems)
if (beaker.reagents.holder_full())
if(beaker.reagents.holder_full())
break
var/allowed = get_allowed_by_id(O)
@@ -469,51 +469,51 @@
break
var/space = beaker.reagents.maximum_volume - beaker.reagents.total_volume
while(O.amount) //Work untill hold something
while(O.amount) //Grind until there's no more reagents
if(O.amount < 1)
remove_object(O)
break
if (!space) //if no free space - exit
if(!space) //if no free space - exit
break
O.amount -= 1 //remove one from stack
for (var/r_id in allowed)
var/spaceused = min(allowed[r_id]*efficiency, space)
var/spaceused = min(allowed[r_id] * efficiency, space)
space -= spaceused
beaker.reagents.add_reagent(r_id,spaceused)
beaker.reagents.add_reagent(r_id, spaceused)
//Plants
for (var/obj/item/grown/O in holdingitems)
if (beaker.reagents.holder_full())
if(beaker.reagents.holder_full())
break
var/allowed = get_allowed_by_id(O)
for (var/r_id in allowed)
var/space = beaker.reagents.maximum_volume - beaker.reagents.total_volume
var/amount = allowed[r_id]
if (amount == 0)
if (O.reagents != null && O.reagents.has_reagent(r_id))
beaker.reagents.add_reagent(r_id,min(O.reagents.get_reagent_amount(r_id)*efficiency, space))
if(amount == 0)
if(O.reagents != null && O.reagents.has_reagent(r_id))
beaker.reagents.add_reagent(r_id,min(O.reagents.get_reagent_amount(r_id) * efficiency, space))
else
beaker.reagents.add_reagent(r_id,min(amount*efficiency, space))
beaker.reagents.add_reagent(r_id,min(amount * efficiency, space))
if (beaker.reagents.holder_full())
if(beaker.reagents.holder_full())
break
remove_object(O)
//Slime Extractis
for (var/obj/item/slime_extract/O in holdingitems)
if (beaker.reagents.holder_full())
if(beaker.reagents.holder_full())
break
var/space = beaker.reagents.maximum_volume - beaker.reagents.total_volume
if (O.reagents != null)
if(O.reagents != null)
var/amount = O.reagents.total_volume
O.reagents.trans_to(beaker, min(amount, space))
if (O.Uses > 0)
beaker.reagents.add_reagent("slimejelly",min(20*efficiency, space))
if(O.Uses > 0)
beaker.reagents.add_reagent("slimejelly",min(20 * efficiency, space))
remove_object(O)
//Everything else - Transfers reagents from it into beaker
for (var/obj/item/reagent_containers/O in holdingitems)
if (beaker.reagents.holder_full())
if(beaker.reagents.holder_full())
break
var/amount = O.reagents.total_volume
O.reagents.trans_to(beaker, amount)