MrStonedOne eb7d5fefa5 Merge remote-tracking branch 'upstream/master' into step-aside-aran-im-here-to-touch-your-precious ...

Conflicts:
	code/controllers/subsystem/ticker.dm

2015-05-02 03:03:29 -07:00

..

admin

Merge remote-tracking branch 'upstream/master' into step-aside-aran-im-here-to-touch-your-precious

2015-05-02 03:03:29 -07:00

assembly

more spans

2015-04-24 20:52:00 +03:00

awaymissions

…

client

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

2015-04-27 00:11:49 +02:00

clothing

Merge pull request #9205 from phil235/SpiderKnifeFixes

2015-04-29 08:23:10 -05:00

crafting

more spans

2015-04-24 20:52:00 +03:00

detectivework

"You hear something" set to italics.

2015-04-24 21:06:16 +03:00

emoji

…

events

Merge remote-tracking branch 'upstream/master' into step-aside-aran-im-here-to-touch-your-precious

2015-05-02 03:03:29 -07:00

flufftext

Fixes #9066, removes description on Noslips

2015-04-27 14:03:51 -05:00

food&drinks

Merge pull request #9205 from phil235/SpiderKnifeFixes

2015-04-29 08:23:10 -05:00

holiday

"You hear something" set to italics.

2015-04-24 21:06:16 +03:00

hydroponics

Fixes a runtime with pod plants, this should fix the unharvestable podplant issue.

2015-04-26 17:30:07 +02:00

library

Remove kitchen/utensil/spoon. Changes /kitchen/utensil stuff to simply be /kitchen.

2015-04-27 23:54:28 +02:00

lighting

Massive MC and subsystem rewrite

2015-04-29 02:00:25 -07:00

mining

Merge pull request #9135 from Incoming5643/validsalid

2015-04-25 19:14:34 +10:00

mob

Merge remote-tracking branch 'upstream/master' into step-aside-aran-im-here-to-touch-your-precious

2015-05-02 03:03:29 -07:00

nano

Air alarm template still needs a tweak, but it's functional now.

2015-04-25 05:22:00 +01:00

ninja

More visible.message span classes removed.

2015-04-24 21:24:21 +03:00

paperwork

More visible.message span classes removed.

2015-04-24 21:24:21 +03:00

power

Fixes a minor goof in powernets from fixing merge conflicts

2015-04-29 02:24:07 -07:00

procedural mapping

…

projectiles

Merge remote-tracking branch 'upstream/master' into step-aside-aran-im-here-to-touch-your-precious

2015-05-02 03:03:29 -07:00

reagents

Massive MC and subsystem rewrite

2015-04-29 02:00:25 -07:00

recycling

More visible.message span classes removed.

2015-04-24 21:24:21 +03:00

research

Merge pull request #9205 from phil235/SpiderKnifeFixes

2015-04-29 08:23:10 -05:00

scripting

…

security levels

more spans

2015-04-24 20:52:00 +03:00

shuttle

Merge remote-tracking branch 'upstream/master' into step-aside-aran-im-here-to-touch-your-precious

2015-05-02 03:03:29 -07:00

surgery

Remove kitchen/utensil/spoon. Changes /kitchen/utensil stuff to simply be /kitchen.

2015-04-27 23:54:28 +02:00

telesci

span fixes

2015-04-24 20:52:01 +03:00