cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-17 10:57:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7264 from Zuhayr/master

Browse Source 
Fixes, death refactor.
This commit is contained in:
Ccomp5950
2014-12-07 19:38:21 -05:00
parent 5b6d3ab55a b556609e27
commit b4becaa587
38 changed files with 210 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/WorkInProgress/computer3/component.dm
+10 -7
View File
@@ -192,9 +192,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
@@ -203,16 +206,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)