Chinsky 6c78188007 Merge pull request #5175 from Hubblenaut/master ...

Fixes some printouts causing a runtime error when photocopied

2014-06-08 18:40:21 +04:00

..

area

Fixes #4816 and nothing else. Cherry picked from #5036.

2014-05-22 23:12:50 +02:00

dna

Merge remote-tracking branch 'upstream/master' into dev-freeze

2014-05-31 00:17:56 +01:00

gamemodes

Removes explosive implants from nuke ops

2014-06-01 20:15:39 +02:00

jobs

Serithi's request, taj and unathi spawn with sandals.

2014-06-04 00:56:17 +09:30

machinery

Fixes some printouts causing a runtime error when photocopied

2014-06-07 18:27:22 +02:00

magic

…

mecha

Readds tator fab to drone bay

2014-06-03 20:01:16 -04:00

objects

Health analyzers display blood type

2014-06-05 18:09:31 +10:00

turfs

Merge remote-tracking branch 'upstream/master' into dev

2014-05-03 16:56:19 +01:00

vehicles

…

verbs

color change ( http://i.imgur.com/6SAj7OT.png )

2014-06-02 23:17:23 -07:00

asteroid.dm

…

atoms_movable.dm

…

atoms.dm

Merge remote-tracking branch 'upstream/dev' into bs12-zuhweapons

2014-05-11 13:48:51 +00:00

communications.dm

…

json.dm

…

response_team.dm

…

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

socket_talk.dm

Code for new bots allowing admins to PM Players via IRC and vice versa.

2014-04-16 23:14:17 -05:00

sound.dm

…

supplyshuttle.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2014-05-31 00:17:56 +01:00