mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-24 04:27:35 +01:00
Late-join features and bug fixes:
- Merged 'Game' and 'Lobby' tabs during pre-game into one tab. - Late-joiners now see round duration. - Late-joiners are warned if the shuttle is not recallable or has already left to Centcomm. - Added the little red X to the top corner of the late-join job list window - Supply shuttle derp fix - Removed duplicate mining shuttle code that was inside atmos computer stuff - - This should fix the player seeing both the 'Shuttle has been sent' and 'The shuttle is already moving' messages. - Updated changelog git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3433 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
johnsonmt88@gmail.com
@@ -39,31 +39,4 @@
|
||||
var/area/A2 = T2.loc
|
||||
if ( istype(A2) && A2.master && A2.master == A )
|
||||
SCRUBBER.on = scrubber_state
|
||||
SCRUBBER.update_icon()
|
||||
|
||||
|
||||
|
||||
|
||||
/obj/machinery/computer/mining_shuttle/attack_hand(user as mob)
|
||||
src.add_fingerprint(usr)
|
||||
var/dat
|
||||
dat = text("<center>Mining shuttle:<br> <b><A href='?src=\ref[src];move=[1]'>Send</A></b></center>")
|
||||
user << browse("[dat]", "window=miningshuttle;size=200x100")
|
||||
|
||||
/obj/machinery/computer/mining_shuttle/Topic(href, href_list)
|
||||
if(..())
|
||||
return
|
||||
usr.machine = src
|
||||
src.add_fingerprint(usr)
|
||||
if(href_list["move"])
|
||||
if(ticker.mode.name == "blob")
|
||||
if(ticker.mode:declared)
|
||||
usr << "Under directive 7-10, [station_name()] is quarantined until further notice."
|
||||
return
|
||||
|
||||
if (!mining_shuttle_moving)
|
||||
usr << "\blue Shuttle recieved message and will be sent shortly."
|
||||
move_mining_shuttle()
|
||||
else
|
||||
usr << "\blue Shuttle is already moving."
|
||||
|
||||
SCRUBBER.update_icon()
|
||||
@@ -154,24 +154,26 @@ var/ordernum=0
|
||||
//Check for mobs
|
||||
for(var/mob/living/M in world)
|
||||
var/area/A = get_area(M)
|
||||
if(!A.type) continue
|
||||
if(A && A.type == /area/supply/station)
|
||||
if(!A || !A.type) continue
|
||||
if(A.type == /area/supply/station)
|
||||
return 0
|
||||
//Check for beacons
|
||||
for(var/obj/item/device/radio/beacon/B in world)
|
||||
var/area/A = get_area(B)
|
||||
if(!A.type) continue
|
||||
if(A && A.type == /area/supply/station)
|
||||
if(!A || !A.type) continue
|
||||
if(A.type == /area/supply/station)
|
||||
return 0
|
||||
//Check for mechs. I think this was added because people were somehow on centcomm and bringing back centcomm mechs.
|
||||
for(var/obj/mecha/Mech in world)
|
||||
var/area/A = get_area(Mech)
|
||||
if(A && A.type == /area/supply/station)
|
||||
if(!A || !A.type) continue
|
||||
if(A.type == /area/supply/station)
|
||||
return 0
|
||||
//Check for nuke disk This also prevents multiple nuke disks from being made -Nodrak
|
||||
for(var/obj/item/weapon/disk/nuclear/N)
|
||||
var/area/A = get_area(N)
|
||||
if(A && A.type == /area/supply/station)
|
||||
if(!A || !A.type) continue
|
||||
if(A.type == /area/supply/station)
|
||||
return 0
|
||||
return 1
|
||||
/*
|
||||
|
||||
@@ -3,6 +3,8 @@
|
||||
datum/preferences/preferences = null
|
||||
ready = 0
|
||||
spawning = 0//Referenced when you want to delete the new_player later on in the code.
|
||||
totalPlayers = 0 //Player counts for the Lobby tab
|
||||
totalPlayersReady = 0
|
||||
|
||||
invisibility = 101
|
||||
|
||||
@@ -147,8 +149,8 @@
|
||||
Stat()
|
||||
..()
|
||||
|
||||
statpanel("Game")
|
||||
if(client.statpanel=="Game" && ticker)
|
||||
statpanel("Lobby")
|
||||
if(client.statpanel=="Lobby" && ticker)
|
||||
if(ticker.hide_mode)
|
||||
stat("Game Mode:", "Secret")
|
||||
else
|
||||
@@ -159,11 +161,14 @@
|
||||
if((ticker.current_state == GAME_STATE_PREGAME) && !going)
|
||||
stat("Time To Start:", "DELAYED")
|
||||
|
||||
statpanel("Lobby")
|
||||
if(client.statpanel=="Lobby" && ticker)
|
||||
if(ticker.current_state == GAME_STATE_PREGAME)
|
||||
stat("Players: [totalPlayers]", "Players Ready: [totalPlayersReady]")
|
||||
totalPlayers = 0
|
||||
totalPlayersReady = 0
|
||||
for(var/mob/new_player/player in world)
|
||||
stat("[player.key]", (player.ready)?("(Playing)"):(null))
|
||||
totalPlayers++
|
||||
if(player.ready)totalPlayersReady++
|
||||
|
||||
Topic(href, href_list[])
|
||||
if(!client) return 0
|
||||
@@ -344,13 +349,27 @@
|
||||
|
||||
|
||||
proc/LateChoices()
|
||||
var/dat = "<html><body>"
|
||||
var/mills = world.time // 1/10 of a second, not real milliseconds but whatever
|
||||
//var/secs = ((mills % 36000) % 600) / 10 //Not really needed, but I'll leave it here for refrence.. or something
|
||||
var/mins = (mills % 36000) / 600
|
||||
var/hours = mills / 36000
|
||||
|
||||
var/dat = "<html><body><center>"
|
||||
dat += "Round Duration: [round(hours)]h [round(mins)]m<br>"
|
||||
|
||||
if(emergency_shuttle) //In case Nanotrasen decides reposess CentComm's shuttles.
|
||||
if(emergency_shuttle.direction == 2) //Shuttle is going to centcomm, not recalled
|
||||
dat += "<font color='red'><b>The station has been evacuated.</b></font><br>"
|
||||
if(emergency_shuttle.direction == 1 && emergency_shuttle.timeleft() < 300) //Shuttle is past the point of no recall
|
||||
dat += "<font color='red'>The station is currently undergoing evacuation procedures.</font><br>"
|
||||
|
||||
dat += "Choose from the following open positions:<br>"
|
||||
for(var/datum/job/job in job_master.occupations)
|
||||
if(job && IsJobAvailable(job.title))
|
||||
dat += "<a href='byond://?src=\ref[src];SelectedJob=[job.title]'>[job.title]</a><br>"
|
||||
|
||||
src << browse(dat, "window=latechoices;size=300x640;can_close=0")
|
||||
dat += "</center>"
|
||||
src << browse(dat, "window=latechoices;size=300x640;can_close=1")
|
||||
|
||||
|
||||
proc/create_character()
|
||||
|
||||
@@ -146,7 +146,7 @@ datum/preferences
|
||||
dat += "<b>Ghost sight:</b> <a href=\"byond://?src=\ref[user];preferences=1;ghost_sight=input\"><b>[ghost_sight == 0 ? "Nearest Creatures" : "All Emotes"]</b></a><br>"
|
||||
|
||||
if(config.allow_Metadata)
|
||||
dat += "<b>OOC Notes/ERP Preferences:</b> <a href='byond://?src=\ref[user];preferences=1;OOC=input'> Edit </a><br>"
|
||||
dat += "<b>OOC Notes:</b> <a href='byond://?src=\ref[user];preferences=1;OOC=input'> Edit </a><br>"
|
||||
|
||||
if((user.client) && (user.client.holder) && (user.client.holder.rank) && (user.client.holder.level >= 5))
|
||||
dat += "<hr><b>OOC</b><br>"
|
||||
|
||||
@@ -106,6 +106,15 @@ should be listed in the changelog upon commit tho. Thanks. -->
|
||||
<BR><BR>•How they're classified: They're contraband, so it's perfectly okay for security officers to confiscate them. Punishment for contraband-providers (or end-users, if you want to go full nazi) is up to the situational commanding officers.
|
||||
|
||||
</ul>
|
||||
<h3 class="author">Nodrak updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="tweak">Merged 'Game' and 'Lobby' tabs during pre-game into one tab</li>
|
||||
<li class="rscadd">Added the little red x to the late-join job list</li>
|
||||
<li class="rscadd">Late-joiners are warned if the shuttle is past the point of recall, and if the shuttle has already left the station</li>
|
||||
<li class="rscadd">Late-joiners now see how long the round has been going on.</li>
|
||||
<li class="bugfix">Mining shuttle computer no longer spits out both 'Shuttle has been sent' and 'The shuttle is already moving' every time.</li>
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="commit sansserif">
|
||||
|
||||
Reference in New Issue
Block a user