cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-19 20:06:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source 
# Conflicts:
#	code/controllers/subsystems/initialization/misc_early.dm
#	config/example/config.txt
#	maps/aurora/aurora-1_centcomm.dmm
#	maps/aurora/aurora-4_mainlevel.dmm
This commit is contained in:
skull132
2017-11-11 20:57:28 +02:00
parent 73a10d20e2 7f0aca683a
commit 7dc02be204
68 changed files with 276321 additions and 133747 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_xeno.dm
+1 -1
View File
@@ -76,7 +76,7 @@
m_chains["blue-jeweled bands"] = /obj/item/clothing/ears/skrell/bluejeweled_band
m_chains["silver bands"] = /obj/item/clothing/ears/skrell/silver_band
m_chains["blue cloth"] = /obj/item/clothing/ears/skrell/blue_skrell_cloth_band_male
m_chains["blue cloth"] = /obj/item/clothing/ears/skrell/purple_skrell_cloth_male
m_chains["purple cloth"] = /obj/item/clothing/ears/skrell/purple_skrell_cloth_male
gear_tweaks += new/datum/gear_tweak/path(m_chains)
//vaurca items