Mloc-Argent 712e209ab6 Merge remote-tracking branch 'upstream/master' into dev ...

Conflicts:
	code/__HELPERS/text.dm
	code/game/machinery/podmen.dm
	code/game/machinery/vending.dm
	code/game/objects/items/candle.dm
	code/game/objects/items/devices/PDA/cart.dm
	code/modules/clothing/suits/jobs.dm

2014-09-10 22:14:37 +01:00

..

area

Includes mwerezak's fore solar area changes.

2014-09-02 12:29:57 +02:00

dna

Cables are now stacks

2014-08-25 18:54:35 +04:00

gamemodes

Fixes a bug where people who were in the lobby but not observers were considered non-survivors in shift-end feedback.

2014-09-05 11:00:47 +02:00

jobs

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

2014-09-10 22:14:37 +01:00

machinery

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

2014-09-10 22:14:37 +01:00

magic

…

mecha

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

2014-09-10 22:14:37 +01:00

objects

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

2014-09-10 22:14:37 +01:00

turfs

Merge pull request #6289 from comma/overmap

2014-09-08 11:21:37 +09:30

vehicles

…

verbs

adds trim() to OOC and LOOC

2014-07-20 06:57:57 +02:00

asteroid.dm

…

atoms_movable.dm

Thrown items can be targeted, has miss chance...

2014-07-15 01:14:04 -04:00

atoms.dm

fixes #5907

2014-08-21 15:41:28 +02:00

json.dm

…

response_team.dm

Merge pull request #6075 from MrSnapwalk/ertv3

2014-08-22 05:01:02 -05:00

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

Noted a wall-deletion optimization made over at -tg. Credit to @Aranclanos.

2014-08-19 10:50:17 +02:00

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

Sound fixes

2014-07-28 14:09:16 -04:00

supplyshuttle.dm

Stack update

2014-09-02 09:59:32 +04:00