From ba036675dae039328ba19973ca05638d0c7a6b2e Mon Sep 17 00:00:00 2001 From: "entrian.tration@gmail.com" Date: Thu, 10 Jan 2013 21:14:34 +0000 Subject: [PATCH] Firedoors now more like window doors. They are see-through and only block movement in one direction. They probably need a new icon. The new one is kinda ugly and, since its red, may blend in with the fire alarm effect too much. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5509 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/machinery/doors/firedoor.dm | 29 ++++++++++++++++---------- icons/obj/doors/edge_Doorfire.dmi | Bin 0 -> 1856 bytes 2 files changed, 18 insertions(+), 11 deletions(-) create mode 100644 icons/obj/doors/edge_Doorfire.dmi diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index d1322f40908..6621d21f62d 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -84,20 +84,27 @@ -//border_only fire doors are special when it comes to air groups /obj/machinery/door/firedoor/border_only + icon = 'icons/obj/doors/edge_Doorfire.dmi' + glass = 1 //There is a glass window so you can see through the door + //This is needed due to BYOND limitations in controlling visibility CanPass(atom/movable/mover, turf/target, height=0, air_group=0) - if(air_group) - var/direction = get_dir(src,target) - return (dir != direction) - else if(density) - if(!height) - var/direction = get_dir(src,target) - return (dir != direction) - else - return 0 - return 1 + if(istype(mover) && mover.checkpass(PASSGLASS)) + return 1 + if(get_dir(loc, target) == dir) //Make sure looking at appropriate border + if(air_group) return 0 + return !density + else + return 1 + + CheckExit(atom/movable/mover as mob|obj, turf/target as turf) + if(istype(mover) && mover.checkpass(PASSGLASS)) + return 1 + if(get_dir(loc, target) == dir) + return !density + else + return 1 update_nearby_tiles(need_rebuild) diff --git a/icons/obj/doors/edge_Doorfire.dmi b/icons/obj/doors/edge_Doorfire.dmi new file mode 100644 index 0000000000000000000000000000000000000000..4930940d76c2621005b80addc84f96ca0a5b41e7 GIT binary patch literal 1856 zcmV-G2fz4XRhD=WDAxq#yo0L;>ci{&Ppo&W#_7D+@wRCt{2onKPhFc8Me3^RT$2^WaX1#EKw zl9ZkRbAr<6ym9?nftg}StakOSolPQ5hyHSMx2qZe0`*})um<#N$Q)49 zv}o(Xb!}MXmu_&Pof%-6@xf(JDWNxQ+8ym7ygZeO_yTY!+G6d+ufaYq* z98gz-8zZKV1RQr-?DhlFhXI$^si|AeAYh~h)b-SZ9Vei=o_cKI22|Bk4|d#us(O{HNu)>poY%jT@iqZ^d;9bI^;Hgp zxD|spq(Gu&zeI*a%l>2;Li`+!46&Cz2Z&r{3?Rw20Y4>hfJ6iJbM%2gKSv)3yeYo| zAkfd5qo|?BmRXA0R));gkU1c8J2mL%%#$I&&$)scG6w|uIrHq)ri%I;c53RDl>;Qv zvw*0Z`jY@rk3Ae9iCe+~LNg@slUP6(nIW#96aq!;7||+=*fF99!`rRYse?n z7pH&D*ALq%;O)*$(E}NfG#6f+o(3ZI!)`i-93VPFCjg?BEeD96vP_`wmMsT})aL`m zmn|RY8+{HCwQM;+q&@;PK4moE`z% z`x#2t5Dk>BAsQ&7sFwxWJ3j~ka(dM%bAAxA%A8&`Lp_+GUOPk9YRDjvv7Op&jL=Tq zgFAItL+!c)Gt{YmFSA!e_JF{mR^AxhPL17ujQVTasYOq!ks6Xc=`xC1WG+O2M0ySo znjv){iJ!B`lu7)Y7?4QM2jclT-vcrA0Z_z_k@z_=J4U2;cFf(q@O;lCz)0|n=!fmS zf4*q-KnEo4lh>Ec>iLb-C(ed!?|oxE1w;m90Ff7z17t2kWDT4mL!_U>03t6a2Z;1@ z7(k>x2DE;pfv7P8wd({Bsn5w!3MiGKs|QNf(D?(c!6{QOYH*cp^nt8p$XpGX11dXp z3h2@@REjzYWNl+K2Q+_Ci_C#Y4TYbe0)HYe+pqB0p!2 zqW0|=nV%EdF*1F`j`2sr&yl|`Ce#N5eb)!o2P5HDBm<)QV3Z7{hPezS3?}(YkSGu} z(0~P~02QDDRDcRl0V+TR=p2EBkG|0BSu8#Ju8+E2=vD*))%7Jq)-x0owP=+@>=aZV z_(@bij-f>BGtL)@Pp^1`G#7FXt0dftB#`>~qElxmm@+g&WDPNZf@6hbKn4(czDU%6 zhyyg|`J!NOfJi;~55?@5CC?WfUpRx_H$(dmZ9PEu zN*?q!71~{A=S?98h|Un$T_*wNQ~#kHAkq&)`wvBcTIe{l>)C+3 z-oC57*V|#Bu7w%^>^dK4-$F;?T>}85MZ&%hGL)<#8VGD6kyF$Q1EEvaV2w!jjrNpv z8>m&wuG7v?DeC2ctnJkHYRFoK?A1^Kni=RCcWTkIJlf2LGi4&TV+kNML!$0F93Zs+ zkVwx3TCD#NA84WeLm^OT$B6tOwExid`2UyD{iqioNbkJrmf}O+NLRYZ^$ZPXSf$lQ9ujlekLyWV^%T1s*>CG`+&lWG6Bt z)FTZcXQ?5iWhSeJr1}e7_R2s=W7^Nz&)%t{dZcylJQ)It+FlJE{(n@{n*%}`(_Tjn zAsPBuulZ9J)tlQGFA*qzr;h2Notkq$B-ID2jJTl+0)7pvrT3?dy5;mo?0yE-hc!gp ul=~xE1E?PV)}dTO7q#rK<5Ak09rF*wg0{}dKM?=`0000