Merge pull request #4377 from Citadel-Station-13/upstream-merge-33181

[MIRROR] All-In-One grinder results are now defined by type, not by huge lists
This commit is contained in:
LetterJay
2017-12-17 21:26:08 -06:00
committed by GitHub
48 changed files with 376 additions and 425 deletions
+3 -1
View File
@@ -23,6 +23,7 @@
throw_range = 7
materials = list(MAT_METAL=10)
pressure_resistance = 2
grind_results = list("iron" = 2, "iodine" = 1)
var/colour = "black" //what colour the ink is!
var/traitor_unlock_degrees = 0
var/degrees = 0
@@ -174,7 +175,8 @@
reagents.trans_to(M, reagents.total_volume)
/obj/item/pen/sleepy/New()
/obj/item/pen/sleepy/Initialize()
. = ..()
create_reagents(45)
reagents.add_reagent("chloralhydrate2", 20)
reagents.add_reagent("mutetoxin", 15)
+1
View File
@@ -391,5 +391,6 @@
/obj/item/device/toner
name = "toner cartridge"
icon_state = "tonercartridge"
grind_results = list("iodine" = 40, "iron" = 10)
var/charges = 5
var/max_charges = 5
+1
View File
@@ -33,6 +33,7 @@
w_class = WEIGHT_CLASS_TINY
resistance_flags = FLAMMABLE
max_integrity = 50
grind_results = list("iodine" = 4)
var/icon/img //Big photo image
var/scribble //Scribble on the back.
var/blueprints = 0 //Does it include the blueprints?