diff --git a/code/game/dna.dm b/code/game/dna.dm index 13f41a0f241..1e6f2b1cf51 100644 --- a/code/game/dna.dm +++ b/code/game/dna.dm @@ -574,6 +574,15 @@ //Foreach goto(154) src.add_fingerprint(user) //G = null + + // search for ghosts, if the corpse is empty and the scanner is connected to a cloner + if(locate(/obj/machinery/computer/cloning, get_step(src, EAST))) + + if (!M.client) + for(var/mob/dead/observer/ghost in world) + if(ghost.corpse == M && ghost.client) + ghost << "Your corpse has been placed into a cloning scanner. Return to your body if you want to be ressurected/cloned! (Verbs -> Ghost -> Re-enter corpse)" + break del(G) return diff --git a/code/modules/chemical/Chemistry-Recipes.dm b/code/modules/chemical/Chemistry-Recipes.dm index 617cfe5bdad..fe2faa6146c 100644 --- a/code/modules/chemical/Chemistry-Recipes.dm +++ b/code/modules/chemical/Chemistry-Recipes.dm @@ -561,7 +561,7 @@ datum required_other = 2 on_reaction(var/datum/reagents/holder, var/created_volume) var/location = get_turf(holder.my_atom) - new /obj/item/weapon/syntiflesh(location) + new /obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh(location) return metroidenzyme @@ -608,7 +608,8 @@ datum name = "Metroid Teleport" id = "m_tele" result = null - required_reagents = list("plasma" = 1, "pacid" = 2, "mutagen" = 3) + required_reagents = list("pacid" = 2, "mutagen" = 2) + required_catalysts = list("plasma" = 1) result_amount = 1 required_container = /obj/item/metroid_core required_other = 4 @@ -664,7 +665,8 @@ datum name = "Metroid Crit" id = "m_tele" result = null - required_reagents = list("cryoxadone" = 1, "plasma" = 1, "mutagen" = 1, "uranium" = 1, "blood" = 1) + required_reagents = list("acid" = 1, "blood" = 1) + required_catalysts = list("plasma" = 1, "mutagen" = 1) result_amount = 1 required_container = /obj/item/metroid_core required_other = 4 @@ -844,7 +846,7 @@ datum result_amount = 1 on_reaction(var/datum/reagents/holder, var/created_volume) var/location = get_turf(holder.my_atom) - new /obj/item/weapon/syntiflesh(location) + new /obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh(location) return hot_ramen diff --git a/code/modules/food/food.dm b/code/modules/food/food.dm index ab80cde888e..7f7b7a01f77 100644 --- a/code/modules/food/food.dm +++ b/code/modules/food/food.dm @@ -136,8 +136,12 @@ reagents.add_reagent("nutriment", 3) src.bitesize = 3 +/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh + name = "synthetic meat" + desc = "A synthetic slab of flesh." + /obj/item/weapon/reagent_containers/food/snacks/appendix //yes, this is the same as meat. I might do something different in future - name = "Appendix" + name = "appendix" desc = "An appendix which looks perfectly healthy." icon_state = "appendix" New() @@ -146,7 +150,7 @@ src.bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/appendixinflamed - name = "Inflamed Appendix" + name = "inflamed appendix" desc = "An appendix which appears to be inflamed." icon_state = "appendixinflamed" New() diff --git a/icons/mob/screen1.dmi b/icons/mob/screen1.dmi index 077a9fd8fe6..475dcb99b6d 100644 Binary files a/icons/mob/screen1.dmi and b/icons/mob/screen1.dmi differ diff --git a/icons/mob/screen1_old.dmi b/icons/mob/screen1_old.dmi index 93d03e44ab3..65218ab28af 100644 Binary files a/icons/mob/screen1_old.dmi and b/icons/mob/screen1_old.dmi differ