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

Conflicts:
	code/game/machinery/computer/crew.dm

2014-12-11 08:18:58 +01:00

..

dead

Fixed the message for admins when they use 'ghost'.

2014-12-04 12:58:32 +01:00

living

Topic fix.

2014-12-11 05:01:06 +03:00

new_player

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

death.dm

Amendments to previous commit.

2014-12-08 03:29:03 +10:30

emote.dm

Dead chat now uses a single proc for broadcast. Improved dchat formatting, added chattags

2014-11-28 12:23:59 +01:00

hear_say.dm

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

2014-12-11 08:18:58 +01:00

holder.dm

Bunch of diona nymph tweaks/fixes.

2014-12-09 20:52:41 +10:30

inventory.dm

Fixes a bug with stationary turrets. Removes quotes in path-name to ensure type always exists. Includes code review suggestions.

2014-10-24 07:23:48 +02:00

language.dm

Fixes #7262

2014-12-07 21:20:24 +10:30

login.dm

webclient support

2014-11-01 16:17:23 +00:00

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

Fixes AIs seeing runes in the Alt+Click panel

2014-11-28 19:36:27 +01:00

mob_grab.dm

Alien attack_hand() conflicts out the wazoo. I thought I already did these but that may have been on an unmerged branch. Burn that bridge when I come to it.

2014-10-12 11:48:54 +10:30

mob_helpers.dm

Ghosts/observers now have the option to be anonymous in deadchat.

2014-12-04 11:46:31 +01:00

mob_movement.dm

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

mob_transformation_simple.dm

…

mob.dm

Merge resolution.

2014-12-08 13:01:04 +10:30

say.dm

Dead chat now uses a single proc for broadcast. Improved dchat formatting, added chattags

2014-11-28 12:23:59 +01:00

transform_procs.dm

Robots can now be rebuilt after destruction.

2014-11-27 08:58:29 +01:00

typing_indicator.dm

Merge

2014-10-11 13:58:16 -04:00

update_icons.dm

…