cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-29 15:08:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

additional mergefixes, including tg map updates

Browse Source 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2012-10-09 23:22:51 +10:00
parent c6916f678d
commit 6365459bde
5 changed files with 16874 additions and 6411 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/new_player/new_player.dm
+10 -7
View File
@@ -188,7 +188,7 @@
if(href_list["late_join"])
if(!ticker || ticker.current_state != GAME_STATE_PLAYING)
usr << "/red The round is either not ready, or has already finished..."
usr << "\red The round is either not ready, or has already finished..."
return
if(preferences.species != "Human")
@@ -302,13 +302,16 @@
src.poll_player(pollid)
return
if(href_list["votepollid"] && href_list["voteoptionid"])
usr << "\red DB usage has been disabled and that option should not have been available."
return
if(href_list["votepollid"] && href_list["votetype"])
var/pollid = text2num(href_list["votepollid"])
var/optionid = text2num(href_list["voteoptionid"])
vote_on_poll(pollid, optionid)
var/votetype = href_list["votetype"]
switch(votetype)
if("OPTION")
var/optionid = text2num(href_list["voteoptionid"])
vote_on_poll(pollid, optionid)
if("TEXT")
var/replytext = href_list["replytext"]
log_text_poll_reply(pollid, replytext)
proc/IsJobAvailable(rank)
var/datum/job/job = job_master.GetJob(rank)