mirror of
https://github.com/vgstation-coders/vgstation13.git
synced 2025-12-10 10:21:11 +00:00
Cloning:
Whenever you're a ghost and your corpse is inserted into a DNA scanner attached to a cloning computer, you will receive a message notifying you.
Chemistry:
Minor changes, such as synthetic meat reactions have been changed to make an actual meat subtype instead of /obj/item/weapon/syntimeat, which is a pain in the ass and you can't even eat it raw.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2263 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -574,6 +574,15 @@
|
|||||||
//Foreach goto(154)
|
//Foreach goto(154)
|
||||||
src.add_fingerprint(user)
|
src.add_fingerprint(user)
|
||||||
//G = null
|
//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 << "<b><font color = #330033>Your corpse has been placed into a cloning scanner. Return to your body if you want to be ressurected/cloned!</b> (Verbs -> Ghost -> Re-enter corpse)</font color>"
|
||||||
|
break
|
||||||
del(G)
|
del(G)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|||||||
@@ -561,7 +561,7 @@ datum
|
|||||||
required_other = 2
|
required_other = 2
|
||||||
on_reaction(var/datum/reagents/holder, var/created_volume)
|
on_reaction(var/datum/reagents/holder, var/created_volume)
|
||||||
var/location = get_turf(holder.my_atom)
|
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
|
return
|
||||||
|
|
||||||
metroidenzyme
|
metroidenzyme
|
||||||
@@ -608,7 +608,8 @@ datum
|
|||||||
name = "Metroid Teleport"
|
name = "Metroid Teleport"
|
||||||
id = "m_tele"
|
id = "m_tele"
|
||||||
result = null
|
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
|
result_amount = 1
|
||||||
required_container = /obj/item/metroid_core
|
required_container = /obj/item/metroid_core
|
||||||
required_other = 4
|
required_other = 4
|
||||||
@@ -664,7 +665,8 @@ datum
|
|||||||
name = "Metroid Crit"
|
name = "Metroid Crit"
|
||||||
id = "m_tele"
|
id = "m_tele"
|
||||||
result = null
|
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
|
result_amount = 1
|
||||||
required_container = /obj/item/metroid_core
|
required_container = /obj/item/metroid_core
|
||||||
required_other = 4
|
required_other = 4
|
||||||
@@ -844,7 +846,7 @@ datum
|
|||||||
result_amount = 1
|
result_amount = 1
|
||||||
on_reaction(var/datum/reagents/holder, var/created_volume)
|
on_reaction(var/datum/reagents/holder, var/created_volume)
|
||||||
var/location = get_turf(holder.my_atom)
|
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
|
return
|
||||||
|
|
||||||
hot_ramen
|
hot_ramen
|
||||||
|
|||||||
@@ -136,8 +136,12 @@
|
|||||||
reagents.add_reagent("nutriment", 3)
|
reagents.add_reagent("nutriment", 3)
|
||||||
src.bitesize = 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
|
/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."
|
desc = "An appendix which looks perfectly healthy."
|
||||||
icon_state = "appendix"
|
icon_state = "appendix"
|
||||||
New()
|
New()
|
||||||
@@ -146,7 +150,7 @@
|
|||||||
src.bitesize = 3
|
src.bitesize = 3
|
||||||
|
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/appendixinflamed
|
/obj/item/weapon/reagent_containers/food/snacks/appendixinflamed
|
||||||
name = "Inflamed Appendix"
|
name = "inflamed appendix"
|
||||||
desc = "An appendix which appears to be inflamed."
|
desc = "An appendix which appears to be inflamed."
|
||||||
icon_state = "appendixinflamed"
|
icon_state = "appendixinflamed"
|
||||||
New()
|
New()
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 140 KiB After Width: | Height: | Size: 142 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 118 KiB After Width: | Height: | Size: 118 KiB |
Reference in New Issue
Block a user