From d7e91ed2ee34f6cc6bb6656cf14dbaf92f39f803 Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Tue, 26 Nov 2013 07:35:50 -0500 Subject: [PATCH] Sec levels + dodgeball work --- code/modules/admin/verbs/onlyoneteam.dm | 6 ++-- .../mob/living/carbon/carbon_defenses.dm | 32 +++++++++--------- .../modules/mob/living/silicon/robot/robot.dm | 2 +- .../security levels/security levels.dm | 4 ++- icons/obj/basketball.dmi | Bin 1147 -> 1222 bytes 5 files changed, 23 insertions(+), 21 deletions(-) diff --git a/code/modules/admin/verbs/onlyoneteam.dm b/code/modules/admin/verbs/onlyoneteam.dm index 0c197b0aea6..f450ae834d0 100644 --- a/code/modules/admin/verbs/onlyoneteam.dm +++ b/code/modules/admin/verbs/onlyoneteam.dm @@ -67,14 +67,14 @@ /obj/item/weapon/beach_ball/dodgeball/throw_impact(atom/hit_atom) if((ishuman(hit_atom))) var/mob/living/carbon/M = hit_atom - if(dir&get_dir(src,M)) + if(!dir&get_dir(src,M)) if(M.in_throw_mode && !M.get_active_hand()) //empty active hand and we're in throw mode if(M.canmove && !M.restrained()) M.hitby(src) else playsound(src, 'sound/items/dodgeball.ogg', 50, 1) visible_message("\red [M] HAS BEEN ELIMINATED!!", 3) - spawn(0) +/* spawn(0) var/mobloc = get_turf(M.loc) var/atom/movable/overlay/animation = new /atom/movable/overlay( mobloc ) animation.name = "water" @@ -84,4 +84,4 @@ animation.icon_state = "liquify" animation.layer = 5 // animation.master = holder - del(M) \ No newline at end of file + del(M)*/ \ No newline at end of file diff --git a/code/modules/mob/living/carbon/carbon_defenses.dm b/code/modules/mob/living/carbon/carbon_defenses.dm index 1749179bbdf..07552faaf09 100644 --- a/code/modules/mob/living/carbon/carbon_defenses.dm +++ b/code/modules/mob/living/carbon/carbon_defenses.dm @@ -1,17 +1,17 @@ -/mob/living/carbon/hitby(atom/movable/AM, skip) - if(!skip) //ugly, but easy - message_admins("Skip Check Passed") - if(in_throw_mode && !get_active_hand()) //empty active hand and we're in throw mode - message_admins("In Throw Mode and active hand check passed") - if(canmove && !restrained()) - message_admins("Restrained/moving check passed") - if(istype(AM, /obj/item)) - message_admins("Item check passed") - var/obj/item/I = AM - if(isturf(I.loc)) - message_admins("Turf check passed") - put_in_active_hand(I) - visible_message("[src] catches [I]!") - throw_mode_off() - return +/mob/living/carbon/hitby(atom/movable/AM) +// if(!skip) //ugly, but easy +// message_admins("Skip Check Passed") + if(in_throw_mode && !get_active_hand()) //empty active hand and we're in throw mode + message_admins("In Throw Mode and active hand check passed") + if(canmove && !restrained()) + message_admins("Restrained/moving check passed") + if(istype(AM, /obj/item)) + message_admins("Item check passed") + var/obj/item/I = AM + if(isturf(I.loc)) + message_admins("Turf check passed") + put_in_active_hand(I) + visible_message("[src] catches [I]!") + throw_mode_off() + return ..() \ No newline at end of file diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 2d489b65885..9f8017b57ed 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -152,7 +152,7 @@ return var/list/modules = list("Standard", "Engineering", "Medical", "Miner", "Janitor", "Service", "Security") - if(security_level == SEC_LEVEL_RED) + if(security_level >= SEC_LEVEL_RED) src << "\red Crisis mode active. Combat module available." modules+="Combat" if(mmi != null && mmi.alien) diff --git a/code/modules/security levels/security levels.dm b/code/modules/security levels/security levels.dm index fe3a9a11f45..a4b53d44f2e 100644 --- a/code/modules/security levels/security levels.dm +++ b/code/modules/security levels/security levels.dm @@ -2,7 +2,9 @@ //0 = code green //1 = code blue //2 = code red -//3 = code delta +//3 = gamma +//4 = epsilon +//5 = code delta //config.alert_desc_blue_downto diff --git a/icons/obj/basketball.dmi b/icons/obj/basketball.dmi index fd48de1ea36184df8a0c8b8c7f919e277c6038b4..425d7994e99e6538a42dbd8e9c320cb85be5d2cf 100644 GIT binary patch delta 800 zcmV+*1K<4n2*wGJ7Ybkq0{{R3)kcR3u^})40fLiK0d{|C9I8rX1y?^8uu}nO-7>Zv z*lRif00PoUL_t(&f$f)zSK2TX#`}QSu`%7Va}SNo$)m^p(y{2)QCj=WPqm6NuvP?elkGU3p43D4bU$NbcVkK zpfD#UAohPBkN_ZmC#TQ$r2t^}VlhDctqwv!Ob2MiKt@_XKmY*$8C*k#QM!JkTuuof z!vlcu7seJhSJ%+3+jmy)-n-8PB#fyx4`AK{WIjOa4<9`)J=sVF07Cc-V1E{16K|PD z1wY+>wzGj4fW(`uU39<%l&c6EsJgxL{KYP20QP@0?d2b7+8zx6ANBmG5~>KbNJ?%0R{j(5AUxW)!)~V z`Jsd`uc!u!**_Mbls{IXh05BeUCv!2fMPKNz$|ZmuAAl|<^nPu5ggLd7o%Fo`~%9^ z0qB40H-x`u*&xYJR1U}iIpALa5@Kzt*n3GN*qZoBsA7p;u$-)@i2=mQ$%=v)K&+gc zsW4#qdNR8W@gr(1J@aaj6pMGzP?x;5P^Ut+6$3!IN&}iiEI_)490fF+R;z7yC`1TI zF{Tkf)9Loyey@M*L-MDOv!GoD;w04eX)Yw-yQE6wSha z{LZtF2-Fmf#+`uB8rsJcAUGohLSgU{r}HY6nxe_r@1FR!cWMu83UIzQasP#?2;hh1 zcRk;APwk&icZmZ+G%&a?k}G)rs2v=N2E-EVEKR3 zcE{oXvUUIj=WJ{_?396o-fn2#Rwb=Pyn$OGk z(tKXNm*n&Fy(FKX@8$S0`Cg76lkesDG5KDOACvFp_%ZojlF!fgl6-!?m*p$Gd@s+> el`GdJ)o(GU%lZ!LLLC4A002ovPDBK*LSTY7dV9+N delta 724 zcmV;_0xSK-3Hu0;7YaZK0{{R3(&~adu^})40f3WI0d{}SIAsM_KNql50ce#nvwq{~ zn*aa;iAh93R9J=W*9%wEFcbjbKGsmD6MR;DK$u7sd`&3$)~#FDt)tuMh7SM#|L~@j zu{CMawCFi%FPy<4H~F~f%}yps|4qoT5FO_OinfD@eDv^ zA(%kwKX88u0Qo!FefIdJ0I<5Ig~acwAOcbtA0F2t^N6Rn{aUxJ?i(r$EKIx`~lQ*bf1rVRV zApC!|$O61^Zj?X?l)#?=IM>=-*WSM*1WOa&30dq$FPKhdG{gY0bTXqN28gATJrxGB z=ab%Tif>UfbI;2fNfxi5DQ7&jkSD|4Rt$i2nFd-USU|pq90yu0yWMfR6cGVA+B62V z++N=s^asaoOdxr(I3QDi?fJw0s6Xh_K+bLYGRvcLX0000