PsiOmega 9a65b478c9 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm

2015-01-21 08:53:27 +01:00

..

dead

Fixes #7726

2015-01-09 06:44:09 +10:30

living

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

2015-01-21 08:53:27 +01:00

new_player

Moved several globals into the config controller, updated eample config appropriately.

2014-12-25 21:10:30 +10:30

death.dm

Refactors and fixes a fair bit of organ transplanting/reattachment/gibbing code. Also fixes an issue with species HUDs.

2014-12-24 16:06:00 +10:30

emote.dm

Moved several globals into the config controller, updated eample config appropriately.

2014-12-25 21:10:30 +10:30

hear_say.dm

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

2014-12-13 23:13:40 +10:30

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

Merge pull request #7581 from Baystation12/dev-freeze

2014-12-30 18:53:20 +10:30

login.dm

webclient support

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

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

Overhauls SSD mechanic.

2014-12-27 09:16:50 -08: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

Merge resolution.

2015-01-12 07:17:02 +10:30

mob_movement.dm

More cargo train fixes

2015-01-03 01:27:10 +13:00

mob_transformation_simple.dm

Readded transform procs for xenos.

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

mob.dm

Fixes #7684

2015-01-09 04:18:42 +10:30

say.dm

Reverted "say" error helper

2015-01-09 03:56:58 +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

…