From cfaada473b67b045517d3d3a8029cea89a97d434 Mon Sep 17 00:00:00 2001 From: Yoshax Date: Sun, 14 Aug 2016 16:10:07 +0100 Subject: [PATCH 1/5] Fixes change appearance not working for other species --- code/game/antagonist/antagonist_update.dm | 5 ++++- code/modules/mob/living/carbon/human/appearance.dm | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/code/game/antagonist/antagonist_update.dm b/code/game/antagonist/antagonist_update.dm index dbbae8a5e12..3db7cd4fbb6 100644 --- a/code/game/antagonist/antagonist_update.dm +++ b/code/game/antagonist/antagonist_update.dm @@ -14,7 +14,10 @@ if(!preserve_appearance && (flags & ANTAG_SET_APPEARANCE)) spawn(3) var/mob/living/carbon/human/H = player.current - if(istype(H)) H.change_appearance(APPEARANCE_ALL, H.loc, H, valid_species, state = z_state) + if(istype(H)) + for(var/I in valid_species) + world << "Species: [I]" + H.change_appearance(APPEARANCE_ALL, H.loc, H, species_whitelist = valid_species, state = z_state) return player.current /datum/antagonist/proc/update_access(var/mob/living/player) diff --git a/code/modules/mob/living/carbon/human/appearance.dm b/code/modules/mob/living/carbon/human/appearance.dm index c3813000bbb..2d236bae305 100644 --- a/code/modules/mob/living/carbon/human/appearance.dm +++ b/code/modules/mob/living/carbon/human/appearance.dm @@ -149,10 +149,10 @@ continue if(blacklist.len && (current_species_name in blacklist)) continue - if((current_species.spawn_flags & SPECIES_IS_WHITELISTED) && !is_alien_whitelisted(src, current_species_name)) + if((current_species.spawn_flags & SPECIES_IS_WHITELISTED) && !is_alien_whitelisted(src, current_species)) continue - valid_species += current_species_name + valid_species += current_species return valid_species From de6d2a4a313120df2cd23f1c765fe63eda62c24b Mon Sep 17 00:00:00 2001 From: PsiOmegaDelta Date: Sun, 31 Jul 2016 18:05:19 +0200 Subject: [PATCH 2/5] Fixes check_rights runtiming for non-holders. Fixes all kinds of errors. --- code/modules/admin/holder2.dm | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/code/modules/admin/holder2.dm b/code/modules/admin/holder2.dm index 6fe8f0c6f05..9ee3d10b6b3 100644 --- a/code/modules/admin/holder2.dm +++ b/code/modules/admin/holder2.dm @@ -62,21 +62,22 @@ NOTE: It checks usr by default. Supply the "user" argument if you wish to check if(ismob(C)) var/mob/M = C C = M.client + if(!C) + return FALSE + if(!C.holder) + if(show_msg) + C << "Error: You are not an admin." + return FALSE - if(C) - if(rights_required) - if(rights_required & C.holder.rights) - return 1 - else - if(show_msg) - C << "Error: You do not have sufficient rights to do that. You require one of the following flags:[rights2text(rights_required," ")]." + if(rights_required) + if(rights_required & C.holder.rights) + return TRUE else - if(C.holder) - return 1 - else - if(show_msg) - C << "Error: You are not an admin." - return 0 + if(show_msg) + C << "Error: You do not have sufficient rights to do that. You require one of the following flags:[rights2text(rights_required," ")]." + return FALSE + else + return TRUE //probably a bit iffy - will hopefully figure out a better solution /proc/check_if_greater_rights_than(client/other) From 5426efcb3962cde9b1ef3129ff81d8d8d77a0146 Mon Sep 17 00:00:00 2001 From: Yoshax Date: Sun, 14 Aug 2016 17:13:41 +0100 Subject: [PATCH 3/5] Fixes valid_species having datums --- code/game/antagonist/antagonist_update.dm | 2 -- code/modules/mob/living/carbon/human/appearance.dm | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/code/game/antagonist/antagonist_update.dm b/code/game/antagonist/antagonist_update.dm index 3db7cd4fbb6..7cf17b5640a 100644 --- a/code/game/antagonist/antagonist_update.dm +++ b/code/game/antagonist/antagonist_update.dm @@ -15,8 +15,6 @@ spawn(3) var/mob/living/carbon/human/H = player.current if(istype(H)) - for(var/I in valid_species) - world << "Species: [I]" H.change_appearance(APPEARANCE_ALL, H.loc, H, species_whitelist = valid_species, state = z_state) return player.current diff --git a/code/modules/mob/living/carbon/human/appearance.dm b/code/modules/mob/living/carbon/human/appearance.dm index 2d236bae305..30cab2256ef 100644 --- a/code/modules/mob/living/carbon/human/appearance.dm +++ b/code/modules/mob/living/carbon/human/appearance.dm @@ -152,7 +152,7 @@ if((current_species.spawn_flags & SPECIES_IS_WHITELISTED) && !is_alien_whitelisted(src, current_species)) continue - valid_species += current_species + valid_species += current_species_name return valid_species From e08a40eb769dd236a8e63409feeb4ab85a62a17a Mon Sep 17 00:00:00 2001 From: Yoshax Date: Sun, 14 Aug 2016 17:16:16 +0100 Subject: [PATCH 4/5] Adds changelog --- html/changelogs/Yoshax - whtielistissues.yml | 36 ++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 html/changelogs/Yoshax - whtielistissues.yml diff --git a/html/changelogs/Yoshax - whtielistissues.yml b/html/changelogs/Yoshax - whtielistissues.yml new file mode 100644 index 00000000000..83a62d918c4 --- /dev/null +++ b/html/changelogs/Yoshax - whtielistissues.yml @@ -0,0 +1,36 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Yoshax + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "The change appearance window provided to antagoniss such as mercenaries, heisters or suchlike (including traders!) will now properly allow people to select species they are whitelisted for." From 02c11fe87f836e9d5ce5f65bcae0c5478bf03a37 Mon Sep 17 00:00:00 2001 From: Yoshax Date: Sun, 14 Aug 2016 17:24:58 +0100 Subject: [PATCH 5/5] Updates the valid species list to have all species --- code/game/antagonist/antagonist.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/antagonist/antagonist.dm b/code/game/antagonist/antagonist.dm index 9bf83d2d6d7..cbfb17adf09 100644 --- a/code/game/antagonist/antagonist.dm +++ b/code/game/antagonist/antagonist.dm @@ -50,7 +50,7 @@ var/flags = 0 // Various runtime options. // Used for setting appearance. - var/list/valid_species = list("Unathi","Tajara","Skrell","Human") + var/list/valid_species = list("Unathi","Tajara","Skrell","Human","Diona","Teshari") // Runtime vars. var/datum/mind/leader // Current leader, if any.