cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 12:29:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source 
# Conflicts:
#	html/changelogs/.all_changelog.yml
#	maps/aurora/aurora-4_mainlevel.dmm
#	maps/aurora/aurora-7_roof.dmm
This commit is contained in:
skull132
2018-10-07 01:33:20 +03:00
parent cb90c11a8a b9ce0fea8e
commit 16eae6c246
50 changed files with 6490 additions and 6249 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_uniform.dm
+1 -1
View File
@@ -192,7 +192,7 @@
pants["blue track pants"] = /obj/item/clothing/under/pants/track/blue
pants["green track pants"] = /obj/item/clothing/under/pants/track/green
pants["white track pants"] = /obj/item/clothing/under/pants/track/white
pants["red track pants"] = /obj/item/clothing/under/pants/track/blue
pants["red track pants"] = /obj/item/clothing/under/pants/track/red
pants["camo pants"] = /obj/item/clothing/under/pants/camo
pants["athletic shorts, black"] = /obj/item/clothing/under/shorts
pants["athletic shorts, red"] = /obj/item/clothing/under/shorts/red