From fbce3cba4b3847ceeb95fb272dd9f91b02ff6369 Mon Sep 17 00:00:00 2001 From: GinjaNinja32 Date: Sun, 23 Nov 2014 18:57:42 +0000 Subject: [PATCH] Fix neaera cubes, change monkeycube eat varfind method to not create nullspace monkeys --- .../reagents/reagent_containers/food/snacks.dm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index a86bd3fe85..f964147f73 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -1563,12 +1563,11 @@ if (istype(M, /mob/living/carbon/human)) //Do not try to understand. var/obj/item/weapon/surprise = new/obj/item/weapon(M) - var/mob/living/carbon/monkey/ook = new monkey_type(null) //no other way to get access to the vars, alas - surprise.icon = ook.icon - surprise.icon_state = ook.icon_state - surprise.name = "malformed [ook.name]" - surprise.desc = "Looks like \a very deformed [ook.name], a little small for its kind. It shows no signs of life." - del(ook) //rip nullspace monkey + var/mob/ook = monkey_type + surprise.icon = initial(ook.icon) + surprise.icon_state = initial(ook.icon_state) + surprise.name = "malformed [initial(ook.name)]" + surprise.desc = "Looks like \a very deformed [initial(ook.name)], a little small for its kind. It shows no signs of life." surprise.transform *= 0.6 surprise.add_blood(M) var/mob/living/carbon/human/H = M @@ -1629,7 +1628,7 @@ /obj/item/weapon/reagent_containers/food/snacks/monkeycube/neaeracube name = "neaera cube" - monkey_type ="skrell" + monkey_type = /mob/living/carbon/monkey/skrell /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/neaeracube name = "neaera cube" monkey_type =/mob/living/carbon/monkey/skrell