cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-04 14:33:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge resolution.

Browse Source
This commit is contained in:
Zuhayr
2014-12-08 13:01:04 +10:30
parent d6640771b1 b4becaa587
commit 3c66bd3920
48 changed files with 350 additions and 585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
code/WorkInProgress/computer3/component.dm
View File

@@ -215,9 +215,12 @@
if(reader)
reader.loc = loc
if(istype(L) && !L.get_active_hand())
L.put_in_hands(reader)
if(istype(L,/mob/living/carbon/human))
L.put_in_hands(reader)
else
reader.loc = get_turf(computer)
else
reader.loc = computer.loc
reader.loc = get_turf(computer)
reader = null
return 1
return 0
@@ -226,16 +229,16 @@
if(writer && dualslot)
writer.loc = loc
if(istype(L) && !L.get_active_hand())
L.put_in_hands(writer)
if(istype(L,/mob/living/carbon/human))
L.put_in_hands(writer)
else
writer.loc = get_turf(computer)
else
writer.loc = computer.loc
writer.loc = get_turf(computer)
writer = null
return 1
return 0
// Authorizes the user based on the computer's requirements
proc/authenticate()
return computer.check_access(reader)