cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Baystation12/Baystation12

Browse Source
This commit is contained in:
Zuhayr
2013-08-28 20:40:19 -07:00
parent 0444f6ec7c fa36451ec5
commit 0dba5c14b4
4 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/__HELPERS/mobs.dm
View File

@@ -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]

13
code/__HELPERS/unsorted.dm
View File

@@ -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)

22
code/game/machinery/door_control.dm
View File

@@ -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
return

12
code/modules/client/preferences.dm
View File

@@ -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