KazeEspada 45dd35d1a7 Merge branch 'master' of https://github.com/tgstation/-tg-station into nukeops ...

Conflicts:
	_maps/map_files/tgstation.2.1.2.dmm

Resolved

2014-02-04 01:41:27 -07: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 nukeops

2014-02-04 01:41:27 -07:00

_globalvars

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

2014-02-04 01:41:27 -07:00

_onclick

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

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

ATMOSPHERICS

Ported the MiniStation branch.

2014-01-29 22:36:10 +00:00

controllers

Outright removed toggle admin jump,spawn and revive buttons

2014-01-27 16:10:19 +11:00

datums

Prevents the airlock deny animation when the airlock is open (eg. when pulsing

2014-01-31 06:55:27 +01:00

defines

Attack sounds for all melee weapons

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

FEA

…

game

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

2014-02-04 01:41:27 -07:00

js

…

LINDA

…

modules

Merge pull request #2569 from Tenebrosity/box2550Away-update

2014-02-03 23:34:45 -08:00

unused

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

2014-01-31 05:20:59 +04:00

WorkInProgress

Fixes #2566.

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

_compile_options.dm

…

hub.dm

…

world.dm

…