cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-20 04:26:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2104 from Giacom/gulag_therevenge

Browse Source 
[MAP] The Gulag: The Revenge: Part 2.5
This commit is contained in:
Aranclanos
2013-12-21 15:05:57 -08:00
parent e7579e2aa8 65efc13beb
commit f00c80bd43
6 changed files with 79 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/laborcamp/laborstacker.dm
+11 -5
View File
@@ -94,15 +94,21 @@
if(href_list["choice"] == "station")
var/datum/shuttle_manager/s = shuttles["laborcamp"]
if(s.location == /area/shuttle/laborcamp/outpost)
if (s.move_shuttle())
usr << "\blue Shuttle recieved message and will be sent shortly."
if(alone_in_area(get_area(loc), usr))
if (s.move_shuttle(0)) // No delay, to stop people from getting on while it is departing.
usr << "\blue Shuttle recieved message and will be sent shortly."
else
usr << "\blue Shuttle is already moving."
else
usr << "\blue Shuttle is already moving."
usr << "\red Prisoners are only allowed to be released while alone."
else
usr << "\blue Shuttle is already on-station."
if(href_list["choice"] == "release")
if(release_door.density)
release_door.open()
if(alone_in_area(get_area(loc), usr))
if(release_door.density)
release_door.open()
else
usr << "\red Prisoners are only allowed to be released while alone."
src.updateUsrDialog()
return
code/modules/shuttle/shuttle.dm
+2 -2
View File
@@ -10,10 +10,10 @@ datum/shuttle_manager/New(var/area, var/delay) //Create a new shuttle manager fo
tickstomove = delay
datum/shuttle_manager/proc/move_shuttle()
datum/shuttle_manager/proc/move_shuttle(var/override_delay)
if(moving) return 0
moving = 1
spawn(tickstomove*10)
spawn(override_delay == null ? tickstomove*10 : override_delay)
var/area/shuttle/fromArea
var/area/shuttle/toArea
fromArea = locate(location) //the location of the shuttle