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

Makes it a bit better.

Browse Source
This commit is contained in:
Neerti
2015-04-14 08:55:09 -04:00
parent fb4543c179
commit 67723de79a
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
code/game/machinery/hologram.dm
View File

@@ -145,18 +145,6 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
clear_holo(master)
continue
// if((HOLOPAD_MODE == RANGE_BASED && (get_dist(master.eyeobj, src) > holo_range)))
// clear_holo(master)
// continue
if(HOLOPAD_MODE == AREA_BASED)
var/area/holo_area = get_area(src)
var/area/eye_area = get_area(master.eyeobj)
if(!(eye_area in holo_area.master.related))
clear_holo(master)
continue
use_power(power_per_hologram)
return 1
@@ -168,6 +156,14 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
masters[user] = H
if((HOLOPAD_MODE == RANGE_BASED && (get_dist(H, src) > holo_range)))
clear_holo(user)
if(HOLOPAD_MODE == AREA_BASED)
var/area/holopad_area = get_area(src)
var/area/hologram_area = get_area(H)
if(!(hologram_area in holopad_area.master.related))
clear_holo(user)
return 1
/*