cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11316 from atlantiscze/apc-fix

Browse Source 
Fixes #11149
This commit is contained in:
Zuhayr
2015-12-02 09:57:26 +10:30
parent 3dcbfa028d e33ae21f75
commit c2a4ee22cf
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/modules/power/apc.dm
View File

@@ -479,8 +479,6 @@
user << "<span class='warning'>There is nothing to secure.</span>" user << "<span class='warning'>There is nothing to secure.</span>"
return return
update_icon() update_icon()
else if(emagged)
user << "The interface is broken."
else else
wiresexposed = !wiresexposed wiresexposed = !wiresexposed
user << "The wires have been [wiresexposed ? "exposed" : "unexposed"]" user << "The wires have been [wiresexposed ? "exposed" : "unexposed"]"
@@ -625,8 +623,9 @@
qdel(W) qdel(W)
stat &= ~BROKEN stat &= ~BROKEN
// Malf AI, removes the APC from AI's hacked APCs list. // Malf AI, removes the APC from AI's hacked APCs list.
if(hacker && hacker.hacked_apcs && src in hacker.hacked_apcs) if(hacker && hacker.hacked_apcs && (src in hacker.hacked_apcs))
hacker.hacked_apcs -= src hacker.hacked_apcs -= src
hacker = null
if (opened==2) if (opened==2)
opened = 1 opened = 1
update_icon() update_icon()
@@ -749,7 +748,7 @@
return return
var/list/data = list( var/list/data = list(
"locked" = locked, "locked" = (locked && !emagged) ? 1 : 0,
"isOperating" = operating, "isOperating" = operating,
"externalPower" = main_status, "externalPower" = main_status,
"powerCellStatus" = cell ? cell.percent() : null, "powerCellStatus" = cell ? cell.percent() : null,
@@ -862,7 +861,7 @@
user << "<span class='danger'>\The [src] have AI control disabled!</span>" user << "<span class='danger'>\The [src] have AI control disabled!</span>"
return 0 return 0
else else
if ((!in_range(src, user) || !istype(src.loc, /turf) || hacker)) // AI-hacked APCs cannot be controlled by other AIs, unlinked cyborgs or humans. if (!in_range(src, user) || !istype(src.loc, /turf))
return 0 return 0
var/mob/living/carbon/human/H = user var/mob/living/carbon/human/H = user
if (istype(H)) if (istype(H))
@@ -881,7 +880,7 @@
if(!can_use(usr, 1)) if(!can_use(usr, 1))
return 1 return 1
if(!istype(usr, /mob/living/silicon) && locked) if(!istype(usr, /mob/living/silicon) && (locked && !emagged))
// Shouldn't happen, this is here to prevent href exploits // Shouldn't happen, this is here to prevent href exploits
usr << "You must unlock the panel to use this!" usr << "You must unlock the panel to use this!"
return 1 return 1