Zuhayr 56131e1053 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into devupdate ...

Conflicts:
	code/modules/clothing/clothing.dm

2015-08-22 03:17:16 +09:30

..

effects

Merge branch 'dev' into ofClicksAndCooldowns

2015-08-21 16:15:07 +03:00

items

Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into devupdate

2015-08-22 03:17:16 +09:30

random

Final tweaks to recipe availability and material inheritance.

2015-05-17 18:22:21 +09:30

structures

Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into devupdate

2015-08-22 03:17:16 +09:30

buckling.dm

…

empulse.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-08-11 08:21:06 +02:00

explosion_recursive.dm

…

explosion.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-07-10 12:57:46 +02:00

items.dm

Merge branch 'dev' into ofClicksAndCooldowns

2015-08-21 16:15:07 +03:00

objs.dm

Merge pull request #9851 from mwerezak/armourpen

2015-08-22 02:22:17 +09:30

structures.dm

Ports /tg/'s meteor implementation.

2015-06-05 14:58:35 +02:00

weapons.dm

…