Mark9013100 488ebc89b2 Balances fm-t2, nerfs burstfire ...

Conflicts:
	code/modules/projectiles/guns/projectile/automatic.dm

2015-10-11 00:42:26 -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

…

FEA

…

game

Merges f-card box and evidence bag box

2015-10-11 00:41:46 -04:00

js

…

modules

Balances fm-t2, nerfs burstfire

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

ZAS

…

_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