Fixed Issue 504

-Door controls now check if the bolt wire is cut and if the door is powered

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4326 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
ericgfwong@hotmail.com
2012-08-06 17:09:29 +00:00
parent d897798d5c
commit a2ee0a24c3
3 changed files with 6020 additions and 6017 deletions

View File

@@ -68,8 +68,9 @@
if(specialfunctions & IDSCAN) if(specialfunctions & IDSCAN)
D.aiDisabledIdScanner = 0 D.aiDisabledIdScanner = 0
if(specialfunctions & BOLTS) if(specialfunctions & BOLTS)
D.locked = 0 if(!D.isWireCut(4) && D.arePowerSystemsOn())
D.update_icon() D.locked = 0
D.update_icon()
if(specialfunctions & SHOCK) if(specialfunctions & SHOCK)
D.secondsElectrified = 0 D.secondsElectrified = 0
if(specialfunctions & SAFE) if(specialfunctions & SAFE)

View File

@@ -62,6 +62,7 @@ should be listed in the changelog upon commit tho. Thanks. -->
<ul class="changes bgimages16"> <ul class="changes bgimages16">
<li class="tweak">Changes to Med-Sci south and surrounding maintenance areas. Virology is more isolated and Science gets a new Misc. Research Lab.</li> <li class="tweak">Changes to Med-Sci south and surrounding maintenance areas. Virology is more isolated and Science gets a new Misc. Research Lab.</li>
<li class="tweak">Atmos techs get construction access now to do their little projects in.</li> <li class="tweak">Atmos techs get construction access now to do their little projects in.</li>
<li class="tweak">Transformation Stings now work on living humans.</li>
</ul> </ul>
</div> </div>

File diff suppressed because it is too large Load Diff