Razharas a589387ccf Fixing merge conflicts ...

THis is getting harder and harder

2014-02-06 22:26:16 +04:00

..

__DEFINES

Repurposes the outdated BE_MONKEY into BE_BLOB and seperates the alien and blob pools so people can prefer to be one or the other or both or neither. An annoucement should be made when this goes live so people are aware they have a new flag to set.

2014-01-29 10:54:00 -05:00

__HELPERS

Merge branch 'master' of https://github.com/tgstation/-tg-station into CraftingTable

2014-01-23 04:08:10 +04:00

_globalvars

Merge pull request #2540 from Incoming5643/blobjob

2014-02-03 10:34:31 -08:00

_onclick

Merge branch 'master' of https://github.com/tgstation/-tg-station into attack_override

2014-02-03 18:07:45 +02:00

ATMOSPHERICS

Merge branch 'master' of https://github.com/tgstation/-tg-station into SayYiffYiffIfYouAreMachineFucker

2014-02-06 22:05:39 +04:00

controllers

Many changes

2014-02-04 22:49:38 -08:00

datums

Update supplypacks.dm

2014-02-04 21:50:54 -05:00

defines

Attack sounds for all melee weapons

2014-01-28 22:46:41 +13:00

FEA

…

game

Fixing merge conflicts

2014-02-06 22:26:16 +04:00

js

…

LINDA

Disabled the game using set background by making all instances of it use a define, which can be changed in code/_compile_options.dm

2014-01-10 18:32:28 +00:00

modules

Fixing merge conflicts

2014-02-06 22:26:16 +04:00

unused

Many changes

2014-02-04 22:49:38 -08:00

WorkInProgress

Fixes #2566.

2014-02-01 22:04:22 +00:00

_compile_options.dm

Disabled the game using set background by making all instances of it use a define, which can be changed in code/_compile_options.dm

2014-01-10 18:32:28 +00:00

hub.dm

…

world.dm

Big(gish) map reorganization.

2014-01-13 22:38:11 +00:00