cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-01 04:52:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fake-master' into development

Browse Source 
# Conflicts:
#	code/ATMOSPHERICS/atmospherics.dm
#	code/defines/procs/announce.dm
#	maps/aurora/aurora-3_sublevel.dmm
This commit is contained in:
skull132
2017-12-09 00:08:21 +02:00
parent e0ce06ddaf abde5f29c0
commit d536d9f4aa
35 changed files with 9515 additions and 9309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/client/preference_setup/loadout/loadout_xeno.dm
View File

@@ -154,7 +154,7 @@
display_name = "toe-less jackboots"
path = /obj/item/clothing/shoes/jackboots/unathi
sort_category = "Xenowear"
whitelisted = list("Vaurca Worker", "Unathi", "Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
whitelisted = list("Vaurca Worker", "Vaurca Warrior", "Unathi", "Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
/datum/gear/shoes/workboots_toeless
display_name = "toeless workboots"