cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 13:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Wireless and spawn_sync tweaks

Browse Source 
Modified spawn_sync to include the spawning code, thus simplifying it's usage.
Modified spawn_sync to use actual time for failsafes.
A couple of sensibility tweaks for the wireless controller.
Cleaned up devices.dm to use new spawn_sync code.
Suggestions courtesy of @mwerezak

Added a changelog
This commit is contained in:
Loganbacca
2015-11-24 23:00:58 +13:00
parent da7a4a78d8
commit d7602a2cd5
4 changed files with 98 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/wireless/devices.dm
+39 -76
View File
@@ -1,53 +1,3 @@
//-------------------------------
// Doors
// Sender: sends an open/close request to all connected /door receivers. Utilises spawn_sync to trigger all doors to
// open at approximately the same time. Waits until all doors have finished opening before returning.
// Receiver: will try to open/close the parent door when activate/deactivate is called.
//-------------------------------
/datum/wifi/sender/door/proc/open()
var/datum/spawn_sync/S = new()
for(var/datum/wifi/receiver/button/door/D in connected_devices)
S.open()
spawn()
try
D.activate()
catch
S.close()
S.finalize()
while(S.check())
sleep(1)
return
/datum/wifi/sender/door/proc/close()
var/datum/spawn_sync/S = new()
for(var/datum/wifi/receiver/button/door/D in connected_devices)
S.open()
spawn()
try
D.deactivate()
catch
S.close()
S.finalize()
while(S.check())
sleep(1)
return
/datum/wifi/receiver/button/door/activate()
var/obj/machinery/door/D = parent
if(istype(D) && D.can_open())
D.open()
/datum/wifi/receiver/button/door/deactivate()
var/obj/machinery/door/D = parent
if(istype(D) && D.can_close())
D.close()
//-------------------------------
// Buttons
// Sender: intended to be used by buttons, when the button is pressed it will call activate() on all connected /button
@@ -68,6 +18,38 @@
/datum/wifi/receiver/button/proc/deactivate(mob/living/user)
activate(user) //override this if you want deactivate to actually do something
//-------------------------------
// Doors
// Sender: sends an open/close request to all connected /door receivers. Utilises spawn_sync to trigger all doors to
// open at approximately the same time. Waits until all doors have finished opening before returning.
// Receiver: will try to open/close the parent door when activate/deactivate is called.
//-------------------------------
/datum/wifi/sender/door/proc/open()
var/datum/spawn_sync/S = new()
for(var/datum/wifi/receiver/button/door/D in connected_devices)
S.start_worker(D, "activate")
S.wait_until_done()
return
/datum/wifi/sender/door/proc/close()
var/datum/spawn_sync/S = new()
for(var/datum/wifi/receiver/button/door/D in connected_devices)
S.start_worker(D, "deactivate")
S.wait_until_done()
return
/datum/wifi/receiver/button/door/activate()
var/obj/machinery/door/D = parent
if(istype(D) && D.can_open())
D.open()
/datum/wifi/receiver/button/door/deactivate()
var/obj/machinery/door/D = parent
if(istype(D) && D.can_close())
D.close()
//-------------------------------
// Emitter
// Activates/deactivates the parent emitter.
@@ -156,42 +138,23 @@
//tell all doors to open
for(var/datum/wifi/receiver/button/door/D in connected_devices)
S.open()
spawn()
try
D.activate()
catch
S.close()
S.finalize()
//wait until they have all opened to continue
while(S.check())
sleep(1)
S.start_worker(D, "activate")
S.wait_until_done()
S.reset()
//tell all mass drivers to launch
for(var/datum/wifi/receiver/button/mass_driver/M in connected_devices)
if(istype(M))
spawn()
M.activate()
spawn()
M.activate()
sleep(20)
//tell all doors to close
S.reset()
for(var/datum/wifi/receiver/button/door/D in connected_devices)
S.open()
spawn()
try
D.deactivate()
catch
S.start_worker(D, "deactivate")
S.wait_until_done()
S.close()
S.finalize()
//wait until they have all closed to continue
while(S.check())
sleep(1)
return
/datum/wifi/receiver/button/mass_driver/activate(mob/living/user)