From 710acf77e58a153875d31aa9be954362f05b477a Mon Sep 17 00:00:00 2001 From: "quartz235@gmail.com" Date: Fri, 10 Aug 2012 20:03:24 +0000 Subject: [PATCH] Fixed issue 695 - Syringe overlay layer is no longer above the blackout screen layer Fixed issue 704 - Shades (and all simple animals) can no longer pick up paper bins/donut boxes with clickdragging (were there any other objects you could pick up with onmousedrop?) Fixed issue 737 - Dead/unconscious cultists no longer count towards cultist count on rune use (such as sacrifice, nar-sie, etc) git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4360 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/magic/cultist/runes.dm | 18 +++++++++--------- code/game/objects/items/food.dm | 2 +- code/modules/chemical/Chemistry-Tools.dm | 2 +- code/modules/paperwork/paperbin.dm | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/code/game/magic/cultist/runes.dm b/code/game/magic/cultist/runes.dm index 5a5f9243d68..2b0683775e8 100644 --- a/code/game/magic/cultist/runes.dm +++ b/code/game/magic/cultist/runes.dm @@ -59,7 +59,7 @@ var/list/sacrificed = list() user.take_overall_damage(5, 0) del(src) for(var/mob/living/carbon/C in orange(1,src)) - if(iscultist(C)) + if(iscultist(C) && !C.stat) culcount++ if(culcount>=3) user.say("Sas[pick("'","`")]so c'arta forbici tarem!") @@ -126,7 +126,7 @@ var/list/sacrificed = list() tearreality() var/cultist_count = 0 for(var/mob/M in range(1,src)) - if(iscultist(M)) + if(iscultist(M) && !M.stat) M.say("Tok-lyr rqa'nap g[pick("'","`")]lt-ulotf!") cultist_count += 1 if(cultist_count >= 9) @@ -541,7 +541,7 @@ var/list/sacrificed = list() if(!(iscultist(V))) victims += V for(var/mob/living/carbon/C in orange(1,src)) - if(iscultist(C)) + if(iscultist(C) && !C.stat) cultsinrange += C C.say("Barhah hra zar[pick("'","`")]garis!") for(var/mob/H in victims) @@ -715,7 +715,7 @@ var/list/sacrificed = list() cultists+=H.current var/list/mob/living/carbon/users = new for(var/mob/living/carbon/C in orange(1,src)) - if(iscultist(C)) + if(iscultist(C) && !C.stat) users+=C if(users.len>=3) var/mob/cultist = input("Choose the one who you want to free", "Followers of Geometer") as null|anything in (cultists - users) @@ -765,7 +765,7 @@ var/list/sacrificed = list() cultists+=H.current var/list/mob/living/carbon/users = new for(var/mob/living/carbon/C in orange(1,src)) - if(iscultist(C)) + if(iscultist(C) && !C.stat) users+=C if(users.len>=3) var/mob/cultist = input("Choose the one who you want to summon", "Followers of Geometer") as null|anything in (cultists - user) @@ -780,7 +780,7 @@ var/list/sacrificed = list() cultist.lying = 1 cultist.regenerate_icons() for(var/mob/living/carbon/human/C in orange(1,src)) - if(iscultist(C)) + if(iscultist(C) && !C.stat) C.say("N'ath reth sh'yro eth d[pick("'","`")]rekkathnor!") C.take_overall_damage(25, 0) user.visible_message("\red Rune disappears with a flash of red light, and in its place now a body lies.", \ @@ -883,7 +883,7 @@ var/list/sacrificed = list() var/culcount = 0 //also, wording for it is old wording for obscure rune, which is now hide-see-blood. // var/list/cultboil = list(cultists-usr) //and for this words are destroy-see-blood. for(var/mob/living/carbon/C in orange(1,src)) - if(iscultist(C)) + if(iscultist(C) && !C.stat) culcount++ if(culcount>=3) for(var/mob/living/carbon/M in viewers(usr)) @@ -901,7 +901,7 @@ var/list/sacrificed = list() if(prob(10)) explosion(R.loc, -1, 0, 1, 5) for(var/mob/living/carbon/human/C in orange(1,src)) - if(iscultist(C)) + if(iscultist(C) && !C.stat) C.say("Dedo ol[pick("'","`")]btoh!") C.take_overall_damage(15, 0) del(src) @@ -914,7 +914,7 @@ var/list/sacrificed = list() burningblood() var/culcount = 0 for(var/mob/living/carbon/C in orange(1,src)) - if(iscultist(C)) + if(iscultist(C) && !C.stat) culcount++ if(culcount >= 5) for(var/obj/effect/rune/R in world) diff --git a/code/game/objects/items/food.dm b/code/game/objects/items/food.dm index 00ac01c1c24..87cc5682b12 100644 --- a/code/game/objects/items/food.dm +++ b/code/game/objects/items/food.dm @@ -43,7 +43,7 @@ MONKEY CUBE BOX /obj/item/kitchen/donut_box/MouseDrop(mob/living/user as mob) if ((user == usr && (!( usr.restrained() ) && (!( usr.stat ) && (usr.contents.Find(src) || in_range(src, usr)))))) - if(!istype(user, /mob/living/carbon/metroid)) + if(!istype(user, /mob/living/carbon/metroid) && !istype(user, /mob/living/simple_animal)) if( !usr.get_active_hand() ) src.attack_hand(usr, usr.hand, 1) return diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm index 63cc30de497..143049269ca 100644 --- a/code/modules/chemical/Chemistry-Tools.dm +++ b/code/modules/chemical/Chemistry-Tools.dm @@ -1002,7 +1002,7 @@ finalcolor = rgb(rgbcolor[1], rgbcolor[2], rgbcolor[3]) overlay.icon += finalcolor - if(!istype(src.loc, /turf)) overlay.layer = 30 + if(!istype(src.loc, /turf)) overlay.layer = 17 overlays += overlay diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm index aa66d942815..850a2ba3679 100644 --- a/code/modules/paperwork/paperbin.dm +++ b/code/modules/paperwork/paperbin.dm @@ -16,9 +16,9 @@ MouseDrop(mob/user as mob) if ((user == usr && (!( usr.restrained() ) && (!( usr.stat ) && (usr.contents.Find(src) || in_range(src, usr)))))) - - if( !usr.get_active_hand() ) //if active hand is empty - attack_hand(usr, 1, 1) + if(!istype(usr, /mob/living/carbon/metroid) && !istype(usr, /mob/living/simple_animal)) + if( !usr.get_active_hand() ) //if active hand is empty + attack_hand(usr, 1, 1) return