diff --git a/code/game/machinery/kitchen/microwave.dm b/code/game/machinery/kitchen/microwave.dm index d25e1ecc14..0c45afb409 100644 --- a/code/game/machinery/kitchen/microwave.dm +++ b/code/game/machinery/kitchen/microwave.dm @@ -43,6 +43,11 @@ if (recipe.items) max_n_of_items = max(max_n_of_items,recipe.items.len) + // This will do until I can think of a fun recipe to use dionaea in - + // will also allow anything using the holder item to be microwaved into + // impure carbon. ~Z + acceptable_items |= /obj/item/weapon/holder + /******************* * Item Adding ********************/ diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 9bd93713b2..7b18520f3a 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -736,7 +736,7 @@ ////// Black Dress - Lillian Amsel - PapaDrow /obj/item/clothing/under/fluff/lillian_amsel_1 name = "Black Dress" - desc = "A knee-length, dark gray and black dress made of a sfot, velvety material." + desc = "A knee-length, dark gray and black dress made of a soft, velvety material." icon = 'icons/obj/custom_items.dmi' icon_state = "lillian_dress" item_state = "lillian_dress" diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index 705200241c..8228520cb8 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -33,6 +33,15 @@ I said no! ) result = /obj/item/weapon/reagent_containers/food/snacks/boiledegg +/datum/recipe/dionaroast + reagents = list("radium" = 5) + items = list( + /obj/item/weapon/holder/diona, + /obj/item/weapon/reagent_containers/food/snacks/grown/apple + ) + result = /obj/item/weapon/reagent_containers/food/snacks/dionaroast + + /* /datum/recipe/bananaphone reagents = list("psilocybin" = 5) //Trippin' balls, man. diff --git a/code/modules/mob/living/carbon/monkey/diona.dm b/code/modules/mob/living/carbon/monkey/diona.dm index 3f98e3b694..e26f2df722 100644 --- a/code/modules/mob/living/carbon/monkey/diona.dm +++ b/code/modules/mob/living/carbon/monkey/diona.dm @@ -2,8 +2,12 @@ Tiny babby plant critter plus procs. */ -//Helper object for picking dionaea up. -/obj/item/weapon/diona_holder +//Helper object for picking dionaea (and other creatures) up. +/obj/item/weapon/holder + name = "holder" + desc = "You shouldn't ever see this." + +/obj/item/weapon/holder/diona name = "diona nymph" desc = "It's a tiny plant critter." @@ -12,24 +16,28 @@ slot_flags = SLOT_HEAD origin_tech = "magnets=3;biotech=5" -/obj/item/weapon/diona_holder/New() +/obj/item/weapon/holder/New() ..() processing_objects.Add(src) - -/obj/item/weapon/diona_holder/Del() +/obj/item/weapon/holder/Del() + //Hopefully this will stop the icon from remaining on human mobs. + if(istype(loc,/mob/living)) + var/mob/living/A = src.loc + src.loc = null + A.update_icons() processing_objects.Remove(src) ..() -/obj/item/weapon/diona_holder/process() +/obj/item/weapon/holder/process() if(!loc) return - if(!istype(loc,/mob/living)) + if(istype(loc,/turf) || !(contents.len)) for(var/mob/M in contents) M.loc = get_turf(src) del(src) -/obj/item/weapon/diona_holder/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/weapon/holder/attackby(obj/item/weapon/W as obj, mob/user as mob) for(var/mob/M in src.contents) M.attackby(W,user) @@ -46,7 +54,7 @@ //Let people pick the little buggers up. if(M.a_intent == "help") - var/obj/item/weapon/diona_holder/D = new(loc) + var/obj/item/weapon/holder/diona/D = new(loc) src.loc = D D.name = loc.name D.attack_hand(M) @@ -127,8 +135,8 @@ var/mob/living/carbon/human/adult = new(get_turf(src.loc)) adult.set_species("Diona") - if(istype(loc,/obj/item/weapon/diona_holder/)) - var/obj/item/weapon/diona_holder/L = loc + if(istype(loc,/obj/item/weapon/holder/diona)) + var/obj/item/weapon/holder/diona/L = loc src.loc = L.loc del(L) @@ -175,8 +183,11 @@ if(donors.len == 5) ready_evolve = 1 src << "\green You feel ready to move on to your next stage of growth." - else if(donors.len == 3) + else if(donors.len == 2) + universal_understand = 1 + src << "\green You feel your awareness expand, and realize you know how to understand the creatures around you." + else if(donors.len == 4) universal_speak = 1 - src << "\green You feel your awareness expand, and realize you know how to speak to the meat-creatures around you." + src << "\green You feel your awareness expand, and realize you know how to speak with the creatures around you." else src << "\green The blood seeps into your small form, and you draw out the echoes of memories and personality from it, working them into your budding mind." \ No newline at end of file diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index baceaa2073..29b06d14a9 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -434,6 +434,13 @@ var/mob/living/L = usr + //Getting out of someone's inventory. + if(istype(src.loc,/obj/item/weapon/holder)) + var/obj/item/weapon/holder/H = src.loc + src.loc = get_turf(src.loc) + del(H) + return + //Resisting control by an alien mind. if(istype(src.loc,/mob/living/simple_animal/borer)) var/mob/living/simple_animal/borer/B = src.loc diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 5d22bdf8a0..ef45f7a664 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -2455,3 +2455,14 @@ /obj/item/pizzabox/meat/New() pizza = new /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/meatpizza(src) boxtag = "Meatlover's Supreme" + +/obj/item/weapon/reagent_containers/food/snacks/dionaroast + name = "roast diona" + desc = "It's like an enormous, leathery carrot. With an eye." + icon_state = "dionaroast" + trash = /obj/item/trash/plate + New() + ..() + reagents.add_reagent("nutriment", 6) + reagents.add_reagent("radium", 2) + bitesize = 2 \ No newline at end of file diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index 96f50c2df3..a0bfb172ea 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ