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

Update Sleeper.dm

Browse Source
This commit is contained in:
Novacat
2020-04-05 09:30:27 -04:00
committed by GitHub
parent ba2f4c76dc
commit 5e2716f564
1 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/game/machinery/Sleeper.dm
View File

@@ -24,26 +24,13 @@
return ..() return ..()
/obj/machinery/sleep_console/proc/findsleeper() /obj/machinery/sleep_console/proc/findsleeper()
<<<<<<< HEAD
spawn(5)
var/obj/machinery/sleeper/sleepernew = null
for(dir in list(NORTH, EAST, SOUTH, WEST)) // Loop through every direction
sleepernew = locate(/obj/machinery/sleeper, get_step(src, dir)) // Try to find a scanner in that direction
if(sleepernew)
// VOREStation Edit Start
sleeper = sleepernew
sleepernew.console = src
break
// VOREStation Edit End
=======
var/obj/machinery/sleeper/sleepernew = null var/obj/machinery/sleeper/sleepernew = null
for(var/direction in GLOB.cardinal) // Loop through every direction for(var/direction in GLOB.cardinal) // Loop through every direction
sleepernew = locate(/obj/machinery/sleeper, get_step(src, direction)) // Try to find a scanner in that direction sleepernew = locate(/obj/machinery/sleeper, get_step(src, direction)) // Try to find a scanner in that direction
if(sleepernew) if(sleepernew)
sleeper = sleepernew sleeper = sleepernew
sleepernew.console = src sleepernew.console = src
set_dir(get_dir(src, sleepernew)) break //VOREStation Edit
>>>>>>> 70534c3... Merge pull request #6920 from Neerti/medical_qol
/obj/machinery/sleep_console/attack_ai(var/mob/user) /obj/machinery/sleep_console/attack_ai(var/mob/user)