cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-08-30 08:07:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Sandstorm-Station:master' into master

Browse Source
This commit is contained in:
BongaTheProto
2022-03-01 17:19:50 -06:00
committed by GitHub
parent 3848ce7e69 0fa5987105
commit 28778e7aa9
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences.dm
+2
View File
@@ -2385,6 +2385,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/datum/sprite_accessory/S = instance
if(!show_mismatched_markings && S.recommended_species && !S.recommended_species.Find(pref_species.id))
continue
if(S.ignore)
continue
if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(user.client.ckey)))
snowflake_taur_list[S.name] = path
var/new_taur
code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm
+1 -1
View File
@@ -29,7 +29,7 @@
if(path == prototype && skip_prototype)
continue
var/datum/sprite_accessory/P = path
if((roundstart && initial(P.locked)) || initial(P.ignore))
if((roundstart && initial(P.locked)))
continue
var/datum/sprite_accessory/D = new path()
code/modules/mob/living/carbon/human/innate_abilities/customization.dm
+2
View File
@@ -136,6 +136,8 @@
var/datum/sprite_accessory/taur/instance = GLOB.taur_list[path]
if(istype(instance, /datum/sprite_accessory))
var/datum/sprite_accessory/S = instance
if(S.ignore)
continue
if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(H.client.ckey)))
snowflake_taur_list[S.name] = path
var/new_taur