Lo6a4evskiy 01ae516481 Merge remote-tracking branch 'upstream/master' into Armor_stripping_delay ...

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

2014-10-07 12:38:47 +04:00

..

__DEFINES

Resolved conflicts and addressed maintainer feedback.

2014-09-21 15:30:54 -06:00

__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 #4516 from MrPerson/examinate_the_doctor

2014-10-05 23:37:34 -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 #5082 from Menshin/space_transitions_fixes

2014-10-06 14:14:01 +01:00

datums

fixing conflicts manually

2014-10-06 19:40:20 -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-07 12:38:47 +04:00

js

- Added href getter datum. Returns either what you want or null.

2011-10-11 20:24:14 +00:00

LINDA

The rest of the junk

2014-09-05 18:14:02 +04:00

modules

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

2014-10-07 12:38:47 +04:00

unused

Merge pull request #4889 from Jordie0608/orwecouldpathplasmasheetsasfire

2014-09-24 16:58:23 +02:00

WorkInProgress

The rest of the junk

2014-09-05 18:14:02 +04:00

_compile_options.dm

Edited comment and added delay to roman armor

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

hub.dm

Updated hub.dm to be slightly more descriptive.

2013-02-17 21:12:16 +00:00

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