Lo6a4evskiy 98e04ca52e Merge remote-tracking branch 'upstream/master' into Armor_stripping_delay ...

Conflicts:
	code/modules/clothing/spacesuits/miscellaneous.dm

2014-10-08 16:45:22 +04:00

..

__DEFINES

…

__HELPERS

First iteration of constructable transit tubes

2014-10-04 21:18:41 -03:00

_globalvars

Merge pull request #4960 from Incoming5643/zlevel

2014-09-29 10:42:49 -05:00

_onclick

Merge pull request #5097 from phil235/Msg1Fix

2014-10-07 12:09:01 -05:00

ATMOSPHERICS

Merge to master - sole conflicting file was ninja.dm FUCK NINJAS

2014-10-04 01:45:39 -07:00

controllers

Merge pull request #5097 from phil235/Msg1Fix

2014-10-07 12:09:01 -05:00

datums

Merge pull request #5097 from phil235/Msg1Fix

2014-10-07 12:09:01 -05:00

defines

Merge pull request #4900 from MrStonedOne/erroageinjudgement

2014-09-26 23:41:37 +01:00

game

Merge remote-tracking branch 'upstream/master' into Armor_stripping_delay

2014-10-08 16:45:22 +04:00

js

…

LINDA

…

modules

Merge remote-tracking branch 'upstream/master' into Armor_stripping_delay

2014-10-08 16:45:22 +04:00

unused

…

WorkInProgress

…

_compile_options.dm

Edited comment and added delay to roman armor

2014-10-06 22:07:11 +04:00

hub.dm

…

world.dm

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00