ikarrus 6dbdc37e04 Resolved Conflicts: ...

code/modules/events/immovable_rod.dm

2014-05-17 18:46:53 -06:00

..

__DEFINES

Merge pull request #3418 from VistaPOWA/pr_announce

2014-04-18 19:05:44 -07:00

__HELPERS

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

2014-05-13 14:03:42 -05:00

_globalvars

Security fixes for PR announcer

2014-04-21 10:51:04 +02:00

_onclick

Merge pull request #3525 from Menshin/adjacent_check_fix

2014-05-05 07:55:56 +02:00

ATMOSPHERICS

Removes the wrench subtype "W"

2014-04-30 15:44:16 -03:00

controllers

Should be auto-mergable again

2014-05-14 08:57:52 -06:00

datums

Merge pull request #3543 from paprka/stechupdate

2014-05-14 10:51:46 +01:00

defines

Merge pull request #3521 from phil235/BeartrapIconFix

2014-05-14 10:46:55 +01:00

game

Merge pull request #3509 from Cheridan/MeteorsSuck

2014-05-17 18:42:16 -05:00

js

…

LINDA

Added more stuff to the status panel for admins, air related, these are only temporal (hehehe)

2014-04-17 21:37:06 -03:00

modules

Resolved Conflicts:

2014-05-17 18:46:53 -06:00

unused

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

WorkInProgress

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

_compile_options.dm

This is for discussion of things that need to be changed to move away from purely stun based combat. Please only comment if you have something to contribute, rather than just saying you like or dislike it.

2014-02-27 10:56:06 -08:00

hub.dm

Updated hub.dm to be slightly more descriptive.

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

world.dm

Fixed world/topic() administrator counter for the HUB, banners and other admin tools

2014-05-04 17:29:35 +01:00