[MIRROR] Makes it clear whether (in)complete golem shells are free or servant (#857)

* Makes it clear whether (in)complete golem shells are free or servant

* resolves rej file
This commit is contained in:
CitadelStationBot
2017-05-18 04:40:12 -05:00
committed by Poojawa
parent 2ee5ff82a2
commit ff9928fdd7
3 changed files with 15 additions and 10 deletions
@@ -337,7 +337,7 @@ GLOBAL_LIST_INIT(snow_recipes, list ( \
* Adamantine
*/
GLOBAL_LIST_INIT(adamantine_recipes, list(
new /datum/stack_recipe("artificial golem shell", /obj/item/golem_shell/artificial, req_amount=1, res_amount=1),
new /datum/stack_recipe("incomplete servant golem shell", /obj/item/golem_shell/servant, req_amount=1, res_amount=1),
))
/obj/item/stack/sheet/mineral/adamantine
@@ -385,4 +385,4 @@ GLOBAL_LIST_INIT(abductor_recipes, list ( \
/obj/item/stack/sheet/mineral/abductor/Initialize(mapload, new_amount, merge = TRUE)
recipes = GLOB.abductor_recipes
..()
..()