mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 18:53:06 +00:00
Okay, there's a couple things up with this revision:
Metroids:
No, they're not working yet, and I planned on committing this when they were finished, but the basic framework is there. The Metroid in xenobiology now moves around, I guess, kinda like a monkey. ADMINS: !! DO NOT TRY TO POSSESS/CONTROL A METROID, unless you're willing to take a risk! I haven't tested it thoroughly yet, it might have some glitchy results!
Turrets:
Fixed some lingering bugs with the targetting system. Hopefully these should be pretty stable now.
Reagents/Chemicals:
I fixed some problems with virus combinations and weird stuff with the PANDEMIC machine.
There's probably some other stuff people requested I fix on IRC that I didn't mention, I can't remember anything else though. Hopefully this should stabilize some of the more annoying bugs with reagents!
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1759 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -281,6 +281,10 @@ datum
|
||||
var/list/that = data["viruses"]
|
||||
this += that // combine the two
|
||||
|
||||
for(var/datum/disease/D in this) // makes sure no two viruses are in the reagent at the same time
|
||||
for(var/datum/disease/d in this)
|
||||
d.cure(0)
|
||||
|
||||
return 0
|
||||
|
||||
for(var/A in typesof(/datum/reagent) - /datum/reagent)
|
||||
|
||||
@@ -769,6 +769,9 @@
|
||||
return
|
||||
|
||||
if(ismob(target))//Blood!
|
||||
if(istype(src, /mob/living/carbon/metroid))
|
||||
user << "\red You are unable to locate any blood."
|
||||
return
|
||||
if(src.reagents.has_reagent("blood"))
|
||||
user << "\red There is already a blood sample in this syringe"
|
||||
return
|
||||
@@ -795,7 +798,7 @@
|
||||
B.data["viruses"] = list()
|
||||
|
||||
|
||||
B.data["virus"] += new D.type
|
||||
B.data["viruses"] += new D.type
|
||||
|
||||
B.data["blood_DNA"] = copytext(T.dna.unique_enzymes,1,0)
|
||||
if(T.resistances&&T.resistances.len)
|
||||
|
||||
Reference in New Issue
Block a user