Mloc-Argent a18c147c37 Merge remote-tracking branch 'upstream/master' into dev ...

Conflicts:
	code/ATMOSPHERICS/pipes.dm
	icons/atmos/pipes.dmi

2014-10-15 14:40:42 +01:00

..

__HELPERS

Merg resolution.

2014-10-02 02:33:06 +09:30

_onclick

Merge

2014-10-11 13:58:16 -04:00

ATMOSPHERICS

fixes #6299

2014-10-13 20:35:56 +01:00

controllers

Makes the number of load/storable character slots a configurable value.

2014-10-14 10:05:22 +02:00

datums

Merge

2014-10-11 13:58:16 -04:00

defines

Merge

2014-10-11 13:58:16 -04:00

FEA

…

game

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

2014-10-15 14:40:42 +01:00

js

…

modules

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

2014-10-15 14:40:42 +01:00

TriDimension

Merge pull request #6275 from RavingManiac/dev

2014-09-09 17:54:53 +04:00

unused

Alien attack_hand() conflicts out the wazoo. I thought I already did these but that may have been on an unmerged branch. Burn that bridge when I come to it.

2014-10-12 11:48:54 +10:30

WorkInProgress

Alien attack_hand() conflicts out the wazoo. I thought I already did these but that may have been on an unmerged branch. Burn that bridge when I come to it.

2014-10-12 11:48:54 +10:30

ZAS

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

2014-10-15 14:40:42 +01:00

global.dm

Non-drone silicons now have access to a basic security xor medical hud.

2014-08-28 20:01:43 +02:00

hub.dm

…

names.dm

…

setup.dm

Moved radiation and light processing to organs.

2014-09-30 11:58:40 +09:30

stylesheet.dm

Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev

2014-09-29 06:19:26 +09:30

world.dm

…