From 19db0df4b5efe0a232f336e511c331b47227df73 Mon Sep 17 00:00:00 2001 From: Segrain Date: Tue, 27 Aug 2013 19:50:35 +0300 Subject: [PATCH 1/3] Fix for hiding cyborgs from upload console. --- code/__HELPERS/unsorted.dm | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index e878616cf61..07110db9fea 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -350,20 +350,11 @@ Turf and target are seperate in case you want to teleport some distance from a t //When an AI is activated, it can choose from a list of non-slaved borgs to have as a slave. /proc/freeborg() var/select = null - var/list/names = list() var/list/borgs = list() - var/list/namecounts = list() for (var/mob/living/silicon/robot/A in player_list) - var/name = A.real_name - if (A.stat == 2) + if (A.stat == 2 || A.connected_ai || A.scrambledcodes) continue - if (A.connected_ai) - continue - else - if(A.module) - name += " ([A.module.name])" - names.Add(name) - namecounts[name] = 1 + var/name = "[A.real_name] ([A.modtype] [A.braintype])" borgs[name] = A if (borgs.len) From 7a319904e437abc05c0e77951503f5c075379655 Mon Sep 17 00:00:00 2001 From: Erthilo Date: Tue, 27 Aug 2013 22:51:24 +0100 Subject: [PATCH 2/3] Reverts gender checks as it was breaking with NEUTER and breaking facial hair. --- code/__HELPERS/mobs.dm | 12 ++++++++---- code/modules/client/preferences.dm | 12 +++++++++--- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index 7d345e1ea28..324cfad6323 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -4,9 +4,11 @@ proc/random_hair_style(gender, species = "Human") var/list/valid_hairstyles = list() for(var/hairstyle in hair_styles_list) var/datum/sprite_accessory/S = hair_styles_list[hairstyle] - if(gender != S.gender && S.gender != NEUTER) + if(gender == MALE && S.gender == FEMALE) continue - if(!(species in S.species_allowed)) + if(gender == FEMALE && S.gender == MALE) + continue + if( !(species in S.species_allowed)) continue valid_hairstyles[hairstyle] = hair_styles_list[hairstyle] @@ -21,9 +23,11 @@ proc/random_facial_hair_style(gender, species = "Human") var/list/valid_facialhairstyles = list() for(var/facialhairstyle in facial_hair_styles_list) var/datum/sprite_accessory/S = facial_hair_styles_list[facialhairstyle] - if(gender != S.gender && S.gender != NEUTER) + if(gender == MALE && S.gender == FEMALE) continue - if(!(species in S.species_allowed)) + if(gender == FEMALE && S.gender == MALE) + continue + if( !(species in S.species_allowed)) continue valid_facialhairstyles[facialhairstyle] = facial_hair_styles_list[facialhairstyle] diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index c15bfb3f8da..cdf4e8e20ff 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -822,7 +822,9 @@ datum/preferences var/list/valid_hairstyles = list() for(var/hairstyle in hair_styles_list) var/datum/sprite_accessory/S = hair_styles_list[hairstyle] - if(gender != S.gender && S.gender != NEUTER) + if(gender == MALE && S.gender == FEMALE) + continue + if(gender == FEMALE && S.gender == MALE) continue if( !(species in S.species_allowed)) continue @@ -838,7 +840,9 @@ datum/preferences var/list/valid_facialhairstyles = list() for(var/facialhairstyle in facial_hair_styles_list) var/datum/sprite_accessory/S = facial_hair_styles_list[facialhairstyle] - if(gender != S.gender && S.gender != NEUTER) + if(gender == MALE && S.gender == FEMALE) + continue + if(gender == FEMALE && S.gender == MALE) continue if( !(species in S.species_allowed)) continue @@ -921,7 +925,9 @@ datum/preferences var/list/valid_facialhairstyles = list() for(var/facialhairstyle in facial_hair_styles_list) var/datum/sprite_accessory/S = facial_hair_styles_list[facialhairstyle] - if(gender != S.gender && S.gender != NEUTER) + if(gender == MALE && S.gender == FEMALE) + continue + if(gender == FEMALE && S.gender == MALE) continue if( !(species in S.species_allowed)) continue From 66071c81ba799ecc8eb809de66739b84e825fc42 Mon Sep 17 00:00:00 2001 From: Philip Date: Tue, 27 Aug 2013 16:38:07 -0600 Subject: [PATCH 3/3] Update door_control.dm The var desiredstate doesn't update when the airlock closes automatically and so most of the time players have to hit the button twice. This keeps all functionality but with one button press. --- code/game/machinery/door_control.dm | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm index c4e9fd0230d..63251c2b688 100644 --- a/code/game/machinery/door_control.dm +++ b/code/game/machinery/door_control.dm @@ -80,12 +80,16 @@ if(normaldoorcontrol) for(var/obj/machinery/door/airlock/D in range(range)) if(D.id_tag == src.id) + if(specialfunctions & OPEN) + if (D.density) + spawn(0) + D.open() + return + else + spawn(0) + D.close() + return if(desiredstate == 1) - if(specialfunctions & OPEN) - if (D.density) - spawn( 0 ) - D.open() - return if(specialfunctions & IDSCAN) D.aiDisabledIdScanner = 1 if(specialfunctions & BOLTS) @@ -95,13 +99,7 @@ D.secondsElectrified = -1 if(specialfunctions & SAFE) D.safe = 0 - else - if(specialfunctions & OPEN) - if (!D.density) - spawn( 0 ) - D.close() - return if(specialfunctions & IDSCAN) D.aiDisabledIdScanner = 0 if(specialfunctions & BOLTS) @@ -186,4 +184,4 @@ icon_state = "launcherbtt" active = 0 - return \ No newline at end of file + return