phil235 2d04cbc39c Fixing the merge conflicts.

2014-11-07 22:31:26 +01:00

..

__DEFINES

defines

2014-10-31 19:00:50 -07:00

__HELPERS

Merge pull request #5512 from RemieRichards/AcidBurns

2014-11-03 18:11:49 -08:00

_globalvars

Botcall Fix for MC lag + Tweak to floorbots

2014-11-02 19:01:43 -06:00

_onclick

Merge pull request #5642 from phil235/AttackAnimation

2014-11-07 18:39:27 +00:00

ATMOSPHERICS

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

2014-11-04 18:55:07 +01:00

controllers

Merge pull request #5632 from GunHog/Botcall_Lagfix_TryTwo

2014-11-03 17:35:16 -08:00

datums

Merge pull request #5541 from xxalpha/cigarettes

2014-11-03 18:49:29 -08:00

defines

Merge pull request #5137 from paprka/holosignoff

2014-10-10 17:41:41 +01:00

game

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

2014-11-07 21:47:18 +01:00

js

…

LINDA

Removing the fourth argument (air_group) of CanPass() everywhere, because it isn't used anywhere.

2014-10-15 18:03:06 +02:00

modules

Fixing the merge conflicts.

2014-11-07 22:31:26 +01:00

unused

Finishes repathing flashes

2014-10-22 19:09:43 +01:00

WorkInProgress

Fix cyborg flashes being useable in flashers and cyborg heads.

2014-10-19 04:35:10 +01:00

_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