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

Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/setup.dm

2015-06-07 10:30:27 +02:00

..

dead

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

2015-06-07 10:30:27 +02:00

freelook

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into newmalf-merge

2015-05-11 07:46:51 +02:00

language

…

living

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

2015-06-07 10:30:27 +02:00

new_player

Fixes #9336

2015-05-18 07:58:41 +03:00

animations.dm

Clean up world print

2015-05-20 00:35:26 -04:00

death.dm

…

emote.dm

…

hear_say.dm

…

holder.dm

…

inventory.dm

Items again have their loc set just before dropped() is called.

2015-05-21 17:55:31 +02:00

login.dm

…

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

Moves admin attack log helpers to admin module, makes admin_attack_log more resilient against null arguments

2015-06-06 11:53:12 -04:00

mob_grab.dm

Missed one baddie

2015-05-21 03:22:20 +03:00

mob_helpers.dm

Compilation fixes.

2015-05-08 08:33:41 +02:00

mob_movement.dm

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

2015-05-12 14:39:21 +02:00

mob_transformation_simple.dm

…

mob.dm

Merge pull request #9390 from mwerezak/attack-animation

2015-05-21 06:52:30 +02:00

say.dm

…

transform_procs.dm

Fixes #9244.

2015-05-18 19:15:28 +02:00

typing_indicator.dm

Fixes corpses and unconscious people still showing typing indicators.

2015-05-30 03:13:45 +03:00

update_icons.dm

…