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

..

__defines

[MISC] Increase number of points for gear loadout

2015-10-11 00:28:12 -04:00

_helpers

Adds socks.

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

_onclick

Adds socks.

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

ATMOSPHERICS

Removes #undefine

2015-08-18 17:20:39 -04:00

controllers

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015

2015-10-10 23:17:26 -04:00

datums

Adds three new hair flower pins - yellow, blue, and pink.

2015-10-11 00:26:54 -04:00

defines

Added the Resomi.

2015-09-04 08:57:03 +09:30

FEA

…

game

TG_Port_2

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

js

…

modules

TG_Port_2

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

ZAS

Merge pull request #10420 from Kearel/sbike

2015-09-07 13:58:25 +09:30

_macros.dm

Compilation fixes.

2015-10-04 17:48:41 +02:00

global.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015

2015-10-10 23:17:26 -04:00

hub.dm

…

names.dm

…

stylesheet.dm

…

world.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015

2015-10-10 23:17:26 -04:00