PsiOmega 5e34d12877 Merge remote-tracking branch 'upstream/dev' into RoboCircuit ...

Conflicts:
	code/modules/mob/living/carbon/brain/posibrain.dm
	maps/exodus-1.dmm

2014-11-30 10:47:36 +01:00

..

dead

Merge pull request #7164 from Amunak/chat-shenanigans

2014-11-29 16:07:35 +01:00

living

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

2014-11-30 10:47:36 +01:00

new_player

Merge pull request #7165 from PsiOmegaDelta/Joining

2014-11-30 00:56:42 +03:00

death.dm

Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev

2014-09-29 06:19:26 +09: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

Fixes #7095

2014-11-25 18:18:39 -05:00

holder.dm

…

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

Updates whispering messages

2014-11-23 19:46:10 -05:00

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

Dead chat will get announcements when someone joins or leaves it.

2014-11-28 13:05:26 +01:00

mob_movement.dm

Fixes robot movement caused by non-self using power

2014-11-13 14:52:13 +00:00

mob_transformation_simple.dm

Readded transform procs for xenos.

2014-09-30 16:07:47 +09:30

mob.dm

Merge pull request #7166 from PsiOmegaDelta/TurfClick

2014-11-30 00:56:25 +03:00

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

…