cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-17 02:47:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11868 from hockeygoalie5/fixes

Browse Source 
Fixes
This commit is contained in:
PsiOmegaDelta
2016-01-01 23:29:45 +01:00
parent e947862886 7d67efa381
commit ebdd394e4f
4 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/player_panel.dm
+1 -1
View File
@@ -290,7 +290,7 @@
<a id='link[i]'
onmouseover='expand("item[i]","[M_job]","[M_name]","[M_rname]","--unused--","[M_key]","[M.lastKnownIP]",[is_antagonist],"\ref[M]")'
>
<span id='search><b>[i]'>[M_name] - [M_rname] - [M_key] ([M_job])</b></span>
<span id='search[i]'><b>[M_name] - [M_rname] - [M_key] ([M_job])</b></span>
</a>
<br><span id='item[i]'></span>
</td>
code/modules/games/boardgame.dm
+8 -5
View File
@@ -60,19 +60,22 @@ obj/item/weapon/board/attackby(obj/item/I as obj, mob/user as mob)
dat += "'#66CCFF'>"
else
dat += "'#252536'>"
dat += "<A href='?src=\ref[src];select=[i]'"
if(!isobserver(user))
dat += "<A href='?src=\ref[src];select=[i]' style='display:block;text-decoration:none;'>"
if(board["[i]"])
var/obj/item/I = board["[i]"]
user << browse_rsc(board_icons["[I.icon] [I.icon_state]"],"[I.icon_state].png")
dat += "><image src='[I.icon_state].png' style='border-style: none'>"
dat += "<image src='[I.icon_state].png' style='border-style: none'>"
else
dat += "style='display:block;text-decoration:none;'>&nbsp;"
dat += "&nbsp;"
dat += "</A></td>"
if(!isobserver(user))
dat += "</A>"
dat += "</td>"
dat += "</table><br>"
if(selected >= 0)
if(selected >= 0 && !isobserver(user))
dat += "<br><A href='?src=\ref[src];remove=0'>Remove Selected Piece</A>"
user << browse(dat,"window=boardgame;size=500x500")
onclose(usr, "boardgame")
code/modules/mob/new_player/new_player.dm
+12 -13
View File
@@ -143,14 +143,14 @@
usr << "\red The round is either not ready, or has already finished..."
return
if(client.prefs.species != "Human" && !check_rights(R_ADMIN, 0))
if(!is_alien_whitelisted(src, client.prefs.species) && config.usealienwhitelist)
if(!check_rights(R_ADMIN, 0))
var/datum/species/S = all_species[client.prefs.species]
if((S.spawn_flags & IS_WHITELISTED) && !is_alien_whitelisted(src, client.prefs.species) && config.usealienwhitelist)
src << alert("You are currently not whitelisted to play [client.prefs.species].")
return 0
var/datum/species/S = all_species[client.prefs.species]
if(!(S.spawn_flags & IS_WHITELISTED))
src << alert("Your current species,[client.prefs.species], is not available for play on the station.")
if(!(S.spawn_flags & CAN_JOIN))
src << alert("Your current species, [client.prefs.species], is not available for play on the station.")
return 0
LateChoices()
@@ -167,15 +167,14 @@
usr << "<span class='danger'>The station is currently exploding. Joining would go poorly.</span>"
return
if(client.prefs.species != "Human")
if(!is_alien_whitelisted(src, client.prefs.species) && config.usealienwhitelist)
src << alert("You are currently not whitelisted to play [client.prefs.species].")
return 0
var/datum/species/S = all_species[client.prefs.species]
if((S.spawn_flags & IS_WHITELISTED) && !is_alien_whitelisted(src, client.prefs.species) && config.usealienwhitelist)
src << alert("You are currently not whitelisted to play [client.prefs.species].")
return 0
var/datum/species/S = all_species[client.prefs.species]
if(!(S.spawn_flags & CAN_JOIN))
src << alert("Your current species, [client.prefs.species], is not available for play on the station.")
return 0
if(!(S.spawn_flags & CAN_JOIN))
src << alert("Your current species, [client.prefs.species], is not available for play on the station.")
return 0
AttemptLateSpawn(href_list["SelectedJob"],client.prefs.spawnpoint)
return