From daf498ccbb99130b0e0993b9889213422f376782 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Thu, 18 Apr 2019 09:21:18 -0800 Subject: [PATCH 1/2] Merge pull request #6097 from Heroman3003/mice-for-goo Fixes promethean mice lunchboxes --- .../living/carbon/human/species/station/prometheans.dm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species/station/prometheans.dm b/code/modules/mob/living/carbon/human/species/station/prometheans.dm index 89a2943831..7bf92177dd 100644 --- a/code/modules/mob/living/carbon/human/species/station/prometheans.dm +++ b/code/modules/mob/living/carbon/human/species/station/prometheans.dm @@ -116,10 +116,18 @@ var/datum/species/shapeshifter/promethean/prometheans prometheans = src /datum/species/shapeshifter/promethean/equip_survival_gear(var/mob/living/carbon/human/H) - var/boxtype = pick(typesof(/obj/item/weapon/storage/toolbox/lunchbox)) + var/boxtype = pick(list(/obj/item/weapon/storage/toolbox/lunchbox, + /obj/item/weapon/storage/toolbox/lunchbox/heart, + /obj/item/weapon/storage/toolbox/lunchbox/cat, + /obj/item/weapon/storage/toolbox/lunchbox/nt, + /obj/item/weapon/storage/toolbox/lunchbox/mars, + /obj/item/weapon/storage/toolbox/lunchbox/cti, + /obj/item/weapon/storage/toolbox/lunchbox/nymph, + /obj/item/weapon/storage/toolbox/lunchbox/syndicate)) //Only pick the empty types var/obj/item/weapon/storage/toolbox/lunchbox/L = new boxtype(get_turf(H)) var/mob/living/simple_mob/animal/passive/mouse/mouse = new (L) var/obj/item/weapon/holder/holder = new (L) + holder.held_mob = mouse mouse.forceMove(holder) holder.sync(mouse) if(H.backbag == 1)