Tastyfish 75ddaeb9f9 Merge remote-tracking branch 'upstream/master'

2011-12-17 21:52:05 -05:00

..

blob

Merge pull request #94 from headswe/master

2011-12-11 00:25:00 -08:00

changeling

Merge branch 'master' of git://github.com/Abi79/tgstation13-git

2011-12-07 07:53:20 +10:30

cult

everyone cult!, paper label

2011-12-05 23:19:39 -05:00

events

Replaced an accidentially blanked part of flavor text

2011-12-08 14:25:24 -07:00

extended

Did a bit of work on assemblies.

2011-09-09 06:15:38 +00:00

malfunction

we work for NanoTrasen! Also, we don't have enough people for your fancy

2011-11-29 00:19:37 -05:00

meteor

Fixed a small bug with meteors.

2011-11-03 19:07:56 +00:00

nuclear

we work for NanoTrasen! Also, we don't have enough people for your fancy

2011-11-29 00:19:37 -05:00

revolution

Merge branch 'master' of git://github.com/Abi79/tgstation13-git

2011-12-07 07:53:20 +10:30

sandbox

Made sandbox not votable

2011-12-16 22:25:02 +10:30

traitor

Made security able to be traitors (AI and cyborg still can't)

2011-12-01 07:52:40 +10:30

wizard

Update to feedback gathering:

2011-10-30 18:42:19 +00:00

events.dm

carve books, remove immovable rod/gr3y t1de

2011-12-17 20:46:42 -05:00

game_mode.dm

Uncommented erro's code, reticked erro's code.

2011-12-05 02:02:35 +00:00

gameticker.dm

This should lower the hideous number of runtimes we've been having lately.

2011-12-17 23:49:20 +10:30

intercept_report.dm

Fixed the map/code issues that the body bags caused.

2011-10-03 10:28:57 +00:00

objective.dm

Merge pull request #82 from SkyMarshal/3319b22adf33c757fc42aa515bc05db894fd0e90

2011-12-10 01:43:34 -08:00

setupgame.dm

Fixed the map/code issues that the body bags caused.

2011-10-03 10:28:57 +00:00