From 9a2245fe6548dcc93a16b6db18732def321ed6b8 Mon Sep 17 00:00:00 2001 From: Mustafa Kalash Date: Fri, 1 Jan 2016 15:05:22 -0500 Subject: [PATCH 1/7] Fixes #11864 --- code/game/machinery/doors/windowdoor.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 88eda4c7741..f14f6fd379c 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -77,7 +77,7 @@ return if (src.operating) return - if (src.density && !issmall(M) && src.allowed(AM)) + if (src.density && (!issmall(M) || ishuman(M)) && src.allowed(AM)) open() if(src.check_access(null)) sleep(50) From be753497d0b71b64835f25f3f79a1b16efecb095 Mon Sep 17 00:00:00 2001 From: Mustafa Kalash Date: Fri, 1 Jan 2016 15:33:10 -0500 Subject: [PATCH 2/7] Fixes #11801. --- code/modules/mob/new_player/new_player.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index a6cfa0813b2..cfe98efb6fa 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -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)) + 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() From 82e793ae917ddf70e35dbec415c6277ce3fe289f Mon Sep 17 00:00:00 2001 From: Mustafa Kalash Date: Fri, 1 Jan 2016 15:52:35 -0500 Subject: [PATCH 3/7] Fixes #11783 --- code/modules/admin/player_panel.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm index 9d9919e4ed5..83a2f3b370a 100644 --- a/code/modules/admin/player_panel.dm +++ b/code/modules/admin/player_panel.dm @@ -290,7 +290,7 @@ - [M_name] - [M_rname] - [M_key] ([M_job]) + [M_name] - [M_rname] - [M_key] ([M_job])
From 6e23584e69604d85c8fb95d6e76ee8c5953301b2 Mon Sep 17 00:00:00 2001 From: Mustafa Kalash Date: Fri, 1 Jan 2016 16:20:02 -0500 Subject: [PATCH 4/7] Fixes #11776. Fixes error in be75349. --- code/modules/games/boardgame.dm | 11 +++++++---- code/modules/mob/new_player/new_player.dm | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/code/modules/games/boardgame.dm b/code/modules/games/boardgame.dm index a5c11902889..20fdf57f1b5 100644 --- a/code/modules/games/boardgame.dm +++ b/code/modules/games/boardgame.dm @@ -60,19 +60,22 @@ obj/item/weapon/board/attackby(obj/item/I as obj, mob/user as mob) dat += "'#66CCFF'>" else dat += "'#252536'>" - dat += "= 0) + if(selected >= 0 && !isobserver(user)) dat += "
Remove Selected Piece" user << browse(dat,"window=boardgame;size=500x500") onclose(usr, "boardgame") diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index cfe98efb6fa..d5bcfb06859 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -144,11 +144,11 @@ return 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 & CAN_JOIN)) src << alert("Your current species, [client.prefs.species], is not available for play on the station.") return 0 From 73436d6cfd11fd1b66ef20260292767f16dad714 Mon Sep 17 00:00:00 2001 From: Mustafa Kalash Date: Fri, 1 Jan 2016 16:31:04 -0500 Subject: [PATCH 5/7] Fixes another problem with be75349. Should be for real this time. --- code/modules/mob/new_player/new_player.dm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index d5bcfb06859..b66042dcff5 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -167,15 +167,14 @@ usr << "The station is currently exploding. Joining would go poorly." 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 From de6779c6a86024779e9d64d9560fd372d7b2bc07 Mon Sep 17 00:00:00 2001 From: Mustafa Kalash Date: Fri, 1 Jan 2016 16:32:59 -0500 Subject: [PATCH 6/7] Continuation of 6e23584. --- code/modules/games/boardgame.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/games/boardgame.dm b/code/modules/games/boardgame.dm index 20fdf57f1b5..eeab2566dc2 100644 --- a/code/modules/games/boardgame.dm +++ b/code/modules/games/boardgame.dm @@ -61,10 +61,12 @@ obj/item/weapon/board/attackby(obj/item/I as obj, mob/user as mob) else dat += "'#252536'>" if(!isobserver(user)) - dat += "" + dat += " Date: Fri, 1 Jan 2016 17:17:33 -0500 Subject: [PATCH 7/7] Finishes 6e23584. --- code/modules/games/boardgame.dm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/code/modules/games/boardgame.dm b/code/modules/games/boardgame.dm index eeab2566dc2..cb25dabdb24 100644 --- a/code/modules/games/boardgame.dm +++ b/code/modules/games/boardgame.dm @@ -61,15 +61,13 @@ obj/item/weapon/board/attackby(obj/item/I as obj, mob/user as mob) else dat += "'#252536'>" if(!isobserver(user)) - dat += "