diff --git a/code/defines/atom.dm b/code/defines/atom.dm index 23b4cadd9d0..60668d07052 100644 --- a/code/defines/atom.dm +++ b/code/defines/atom.dm @@ -18,7 +18,7 @@ ///Chemistry. //Detective Work, used for the duplicate data points kept in the scanners - var/atom/original_atom = null + var/atom/movable/original_atom = null proc/assume_air(datum/air_group/giver) del(giver) diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm index 2b3176ec271..41a4a1885ff 100644 --- a/code/game/objects/items/weapons/manuals.dm +++ b/code/game/objects/items/weapons/manuals.dm @@ -725,37 +725,37 @@ author = "NanoTrasen" dat = {" - - - - -

Detective Work

+ + + + +

Detective Work

-Between your bouts of self-narration, and drinking whiskey on the rocks, you might get a case or two to solve.
-To have the best chance to solve your case, follow these directions: -

-

    -
  1. Go to the crime scene.
    2. -
  2. Take your scanner and scan EVERYTHING (Yes, the doors, the tables, even the dog.)
    3. -
  3. Once you are reasonably certain you have every scrap of evidence you can use, find all possible entry points and scan them, too.
    4. -
  4. Return to your office.
    5. -
  5. Using your forensic scanning computer, scan your Scanner to upload all of your evidence into the database.
    6. -
  6. Browse through the resulting dossiers, looking for the one that either has the most complete set of prints, or the most suspicious items handled.
    7. -
  7. If you have 80% or more of the print (The print is displayed) go to step 10, otherwise continue to step 8.
    8. -
  8. Look for clues from the suit fibres you found on your perp, and go about looking for more evidence with this new information, scanning as you go.
    9. -
  9. Try to get a fingerprint card of your perp, as if used in the computer, the prints will be completed on their dossier.
    10. -
  10. Assuming you have enough of a print to see it, grab the biggest complete piece of the print and search the security records for it.
    11. -
  11. Since you now have both your dossier and the name of the person, print both out as evidence, and get security to nab your baddie.
    12. -
  12. Give yourself a pat on the back and a bottle of the ships finest vodka, you did it!.
    13. -
-

-It really is that easy! Good luck! + Between your bouts of self-narration, and drinking whiskey on the rocks, you might get a case or two to solve.
+ To have the best chance to solve your case, follow these directions: +

+

    +
  1. Go to the crime scene.
    2. +
  2. Take your scanner and scan EVERYTHING (Yes, the doors, the tables, even the dog.)
    3. +
  3. Once you are reasonably certain you have every scrap of evidence you can use, find all possible entry points and scan them, too.
    4. +
  4. Return to your office.
    5. +
  5. Using your forensic scanning computer, scan your Scanner to upload all of your evidence into the database.
    6. +
  6. Browse through the resulting dossiers, looking for the one that either has the most complete set of prints, or the most suspicious items handled.
    7. +
  7. If you have 80% or more of the print (The print is displayed) go to step 10, otherwise continue to step 8.
    8. +
  8. Look for clues from the suit fibres you found on your perp, and go about looking for more evidence with this new information, scanning as you go.
    9. +
  9. Try to get a fingerprint card of your perp, as if used in the computer, the prints will be completed on their dossier.
    10. +
  10. Assuming you have enough of a print to see it, grab the biggest complete piece of the print and search the security records for it.
    11. +
  11. Since you now have both your dossier and the name of the person, print both out as evidence, and get security to nab your baddie.
    12. +
  12. Give yourself a pat on the back and a bottle of the ships finest vodka, you did it!.
    13. +
+

+ It really is that easy! Good luck! - -"} \ No newline at end of file + + "} \ No newline at end of file diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index a41ddedcc4e..b56e0c10599 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -245,7 +245,7 @@ proc/check_panel(mob/M) M << "\red [my_target] flails around wildly." my_target.show_message("\red [src] has been attacked by [my_target] ", 1) //Lazy. - //src.health -= P.power + src.health -= P.force return @@ -258,12 +258,13 @@ proc/check_panel(mob/M) O << "\red [my_target] stumbles around." New() + ..() spawn(300) if(my_target) my_target.hallucinations -= src del(src) step_away(src,my_target,2) - proccess() + processing_objects.Add(src) proc/updateimage() @@ -285,8 +286,7 @@ proc/check_panel(mob/M) my_target << currentimage - proc/proccess() - if(!my_target) spawn(5) .() + process() if(src.health < 0) collapse() return @@ -314,7 +314,6 @@ proc/check_panel(mob/M) if(prob(15)) step_away(src,my_target,2) - spawn(5) .() proc/collapse() collapse = 1