tkdrg 359c5896ed Merge remote-tracking branch 'upstream/master' into meido ...

Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi

2014-12-22 16:19:43 -03:00

..

__DEFINES

Merge pull request #6363 from phil235/HeadCoverBitflagFix

2014-12-15 16:23:29 -08:00

__HELPERS

Fixes AI not being able to use maintenance APCs

2014-12-21 19:16:58 -03:00

_globalvars

…

_onclick

Fixes being able to remove clothing and inventory stuff while straightjacketed or handcuffed by clicking the inventory slot, not the worn item itself.

2014-12-14 18:03:49 +01:00

ATMOSPHERICS

Fixes monkey being able to ventcrawl if stunned after the ventcrawl action is initiated. Also changes ventcrawl messages to use visible_message() and audible_message().

2014-12-14 19:18:13 +01:00

controllers

Reserve PascalCase inits

2014-12-16 12:29:04 +02:00

datums

Merge pull request #6411 from wild-billy/master

2014-12-18 02:30:08 -06:00

defines

…

game

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

2014-12-22 16:19:43 -03:00

js

…

LINDA

…

modules

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

2014-12-22 16:19:43 -03:00

_compile_options.dm

…

hub.dm

…

world.dm

Reserve PascalCase inits

2014-12-16 12:29:04 +02:00