Changes some stuff Giacom provided input on. Thanks Aranclanos and Kaze Espada for the help.

This commit is contained in:
AstralSerpent
2013-10-06 07:21:19 +11:00
parent 113d6c0193
commit 73d4b247a2
3 changed files with 7 additions and 35 deletions
+1 -24
View File
@@ -3,10 +3,6 @@
colour = "#DA0000"
shadeColour = "#810C0C"
colourName = "red"
New()
..()
spawn(5)
reagents.add_reagent("redcrayonpowder", 10)
/obj/item/toy/crayon/orange
@@ -14,10 +10,6 @@
colour = "#FF9300"
shadeColour = "#A55403"
colourName = "orange"
New()
..()
spawn(5)
reagents.add_reagent("orangecrayonpowder", 10)
/obj/item/toy/crayon/yellow
@@ -25,10 +17,6 @@
colour = "#FFF200"
shadeColour = "#886422"
colourName = "yellow"
New()
..()
spawn(5)
reagents.add_reagent("yellowcrayonpowder", 10)
@@ -37,10 +25,6 @@
colour = "#A8E61D"
shadeColour = "#61840F"
colourName = "green"
New()
..()
spawn(5)
reagents.add_reagent("greencrayonpowder", 10)
/obj/item/toy/crayon/blue
@@ -48,10 +32,6 @@
colour = "#00B7EF"
shadeColour = "#0082A8"
colourName = "blue"
New()
..()
spawn(5)
reagents.add_reagent("bluecrayonpowder", 10)
/obj/item/toy/crayon/purple
@@ -59,10 +39,7 @@
colour = "#DA00FF"
shadeColour = "#810CFF"
colourName = "purple"
New()
..()
spawn(5)
reagents.add_reagent("purplecrayonpowder", 10)
/obj/item/toy/crayon/mime
-1
View File
@@ -419,7 +419,6 @@
return (BRUTELOSS|OXYLOSS)
New()
name = "[colourName] crayon" //Makes crayons identifiable in things like grinders
create_reagents(10) //creates the reagents container with a capacity of 10
/*
* Snap pops
*/
+6 -10
View File
@@ -953,7 +953,7 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime)
return 1
return 0
/obj/machinery/reagentgrinder/proc/get_allowed_by_id(var/obj/item/weapon/grown/O)
/obj/machinery/reagentgrinder/proc/get_allowed_by_id(var/obj/item/O)
for (var/i in blend_items)
if (istype(O, i))
return blend_items[i]
@@ -1098,7 +1098,8 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime)
remove_object(O)
//Crayons
//Crayons
//With some input from aranclanos, now 30% less shoddily copypasta
for (var/obj/item/toy/crayon/O in holdingitems)
if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
break
@@ -1106,15 +1107,10 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime)
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), space))
else
beaker.reagents.add_reagent(r_id,min(amount, space))
if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
beaker.reagents.add_reagent(r_id,min(amount, space))
if (space < amount)
break
remove_object(O)
remove_object(O)
//Everything else - Transfers reagents from it into beaker
for (var/obj/item/weapon/reagent_containers/O in holdingitems)