Merge pull request #2026 from clusterfack/Mommi-APC

Fix for long-distance cell removal
This commit is contained in:
d3athrow
2014-12-01 00:54:31 -06:00
2 changed files with 6 additions and 2 deletions

View File

@@ -602,7 +602,7 @@
if(!isobserver(user))
src.add_fingerprint(user)
if(usr == user && opened)
if(cell)
if(cell && get_dist(src,user)<=1)
if(issilicon(user) && !isMoMMI(user)) // MoMMIs can hold one item in their tool slot.
cell.loc=src.loc // Drop it, whoops.
else
@@ -1298,4 +1298,4 @@ obj/machinery/power/apc/proc/autoset(var/val, var/on)
else
return 0
#undef APC_UPDATE_ICON_COOLDOWN
#undef APC_UPDATE_ICON_COOLDOWN

View File

@@ -0,0 +1,4 @@
author: Clusterfack
delete-after: true
changes:
- bugfix: Added a range check for silicons trying to remove APC cells, cannot be done from anywhere in view now