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
@@ -12,6 +12,7 @@
throw_speed = 3
throw_range = 6
container_type = INJECTABLE_1
grind_results = list()
var/Uses = 1 // uses before it goes inert
var/qdel_timer = null // deletion timer, for delayed reactions
@@ -29,6 +30,10 @@
. = ..()
create_reagents(100)
/obj/item/slime_extract/on_grind()
if(Uses)
grind_results["slimejelly"] = 20
/obj/item/slime_extract/grey
name = "grey slime extract"
icon_state = "grey slime extract"