SinTwo a2b24d64b7 TG_Port_2 ...

Conflicts:
	code/game/objects/items/weapons/storage/backpack.dm
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
	code/game/objects/structures/crates_lockers/closets/wardrobe.dm
	code/modules/client/preferences_gear.dm
	code/modules/clothing/under/accessories/accessory.dm

2015-10-11 00:36:13 -04:00

..

client defines.dm

…

client procs.dm

Merge with master.

2015-08-18 11:31:10 -07:00

preferences_factions.dm

…

preferences_gear.dm

TG_Port_2

2015-10-11 00:36:13 -04:00

preferences_savefile.dm

Fixes savefile issue.

2015-10-11 00:24:48 -04:00

preferences_spawnpoints.dm

…

preferences_toggles.dm

HUD cleanup, human/monkey HUD now turns correctly with client.dir

2015-08-18 18:21:25 +01:00

preferences.dm

Adds socks.

2015-10-11 00:13:33 -04:00

ui_style.dm

HUD cleanup, human/monkey HUD now turns correctly with client.dir

2015-08-18 18:21:25 +01:00