From 4f48a518abe93de4a006500dcb046a0b96cd785b Mon Sep 17 00:00:00 2001 From: Ren Erthilo Date: Thu, 26 Apr 2012 18:35:15 +0100 Subject: [PATCH] Merge fixes. --- code/game/jobs/job_controller.dm | 2 +- code/modules/DetectiveWork/detective_work.dm | 33 ++++++++++---------- code/modules/chemical/Chemistry-Reagents.dm | 4 +-- code/modules/flufftext/Hallucination.dm | 4 +-- code/modules/mob/living/carbon/human/life.dm | 3 +- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index 45a6ecd0fdf..46502b1e550 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -190,7 +190,7 @@ var/global/datum/controller/occupations/job_master //Other jobs are now checked Debug("DO, Running Standard Check") for(var/level = 1 to 3) - for(var/datum/job/job in occupations) + for(var/datum/job/job in occupations2) Debug("Checking job: [job]") if(!job) continue diff --git a/code/modules/DetectiveWork/detective_work.dm b/code/modules/DetectiveWork/detective_work.dm index 0d2d586d37d..70a7b60401d 100644 --- a/code/modules/DetectiveWork/detective_work.dm +++ b/code/modules/DetectiveWork/detective_work.dm @@ -549,7 +549,7 @@ obj/machinery/computer/forensic_scanning for(var/n = 2, n <= perp_list.len, n++) //Lets see if it is already in the database var/list/target = perp_list[n] var/atom/atom_checker = target[1] - var/atom_checker_scan = (A.original_atom.len ? atom_checker.original_atom[1] == A.original_atom[1] : 0) + var/atom_checker_scan = (A.original_atom ? atom_checker.original_atom[1] == A.original_atom[1] : 0) if(atom_checker.original_atom[1] == A || atom_checker_scan) //Found the original object! found2 = 1 var/list/prints = target[2] @@ -718,23 +718,24 @@ obj/effect/decal/cleanable/var turf/Exited(mob/living/carbon/human/M) if(istype(M,/mob/living) && !istype(M,/mob/living/carbon/metroid)) - var/dofoot = 1 - if(istype(M,/mob/living/simple_animal)) - if(!(istype(M,/mob/living/simple_animal/cat) || istype(M,/mob/living/simple_animal/corgi) || istype(M,/mob/living/simple_animal/constructwraith))) - dofoot = 0 + if(!istype(src, /turf/space)) // Bloody tracks code starts here + var/dofoot = 1 + if(istype(M,/mob/living/simple_animal)) + if(!(istype(M,/mob/living/simple_animal/cat) || istype(M,/mob/living/simple_animal/corgi) || istype(M,/mob/living/simple_animal/constructwraith))) + dofoot = 0 - if(dofoot) + if(dofoot) - if(!istype(src, /turf/space)) // Bloody tracks code starts here - if(M.track_blood > 0) - M.track_blood-- - src.add_bloody_footprints(M.track_blood_mob,1,M.dir,get_tracks(M),M.track_blood_type) - else if(istype(M,/mob/living/carbon/human)) - if(M.shoes) - if(M.shoes.track_blood > 0) - M.shoes.track_blood-- - src.add_bloody_footprints(M.shoes.track_blood_mob,1,M.dir,M.shoes.name,M.shoes.track_blood_type) // And bloody tracks end here - . = ..() + if(!istype(src, /turf/space)) // Bloody tracks code starts here + if(M.track_blood > 0) + M.track_blood-- + src.add_bloody_footprints(M.track_blood_mob,1,M.dir,get_tracks(M),M.track_blood_type) + else if(istype(M,/mob/living/carbon/human)) + if(M.shoes) + if(M.shoes.track_blood > 0) + M.shoes.track_blood-- + src.add_bloody_footprints(M.shoes.track_blood_mob,1,M.dir,M.shoes.name,M.shoes.track_blood_type) // And bloody tracks end here + . = ..() turf/Entered(mob/living/carbon/human/M) if(istype(M,/mob/living) && !istype(M,/mob/living/carbon/metroid)) var/dofoot = 1 diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm index 5c9936c152a..dbe506380c2 100644 --- a/code/modules/chemical/Chemistry-Reagents.dm +++ b/code/modules/chemical/Chemistry-Reagents.dm @@ -1045,7 +1045,7 @@ datum color = "#660000" // rgb: 102, 0, 0 //Commenting this out as it's horribly broken. It's a neat effect though, so it might be worth making a new reagent (that is less common) with similar effects. -Pete -/* +// Sort of fixed by creating plasma instead. reaction_obj(var/obj/O, var/volume) src = null var/turf/the_turf = get_turf(O) @@ -1067,7 +1067,7 @@ datum M:adjustToxLoss(1) ..() return -*/ + space_cleaner name = "Space cleaner" diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 1aa5520c6aa..8750adbc0c0 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -156,8 +156,8 @@ mob/living/carbon/proc/handle_hallucinations() halbody = image('human.dmi',target,"husk_s",TURF_LAYER) if(4) halbody = image('alien.dmi',target,"alienother",TURF_LAYER) - // if(5) - // halbody = image('xcomalien.dmi',target,"chryssalid",TURF_LAYER) + if(5) + halbody = image('xcomalien.dmi',target,"chryssalid",TURF_LAYER) if(client) client.images += halbody spawn(rand(50,80)) //Only seen for a brief moment. diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 6fbfe0db907..4279085a460 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -962,8 +962,7 @@ lying = 1 stat = 0 if (paralysis > 0) - if(sleeping > 0) - handle_dreams() + handle_dreams() AdjustParalysis(-1) blinded = 1 lying = 1