Chinsky 8427947bd7 Merge branch 'master' of https://github.com/Baystation12/Baystation12 ...

Conflicts:
	code/datums/organs/organ_external.dm
	code/modules/mob/living/carbon/human/human.dm

2012-10-14 20:39:26 +04:00

..

dead

Merge remote-tracking branch 'remotes/git-svn' 4847 into bs12_with_tgport

2012-10-12 17:53:17 +10:00

living

Merge branch 'master' of https://github.com/Baystation12/Baystation12

2012-10-14 20:39:26 +04:00

new_player

Merge pull request #1760 from DarkTechnomancer/master

2012-10-13 20:10:18 -07:00

simple_animal

Reorganized and updated Simple Animals.

2012-08-24 00:00:02 +01:00

death.dm

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

emote.dm

…

inventory.dm

Revert "Revert's cib's BS12 merge by XSI's orders"

2012-10-11 14:31:31 -07:00

login.dm

fix for admins not being applied successfully on round startup, added some resource caching i forgot about before

2012-10-09 23:54:31 +10:00

logout.dm

…

mob_cleanup.dm

Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport

2012-10-05 22:21:26 +10:00

mob_defines.dm

Fixed flavor text

2012-10-13 19:27:43 -04:00

mob_grab.dm

Added attack logging, some moderator groundwork, fixed alien species and save files.

2012-09-23 21:49:25 +01:00

mob_helpers.dm

Merge pull request #1738 from CIB/master

2012-10-12 09:42:31 -07:00

mob_movement.dm

Reverts "world.time -> world.timeofday" in mob movement code. Hopefully this stops people freezing at midnight GMT.

2012-10-06 13:24:34 +00:00

mob_transformation_simple.dm

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

mob.dm

Fixed flavor text

2012-10-13 19:27:43 -04:00

say.dm

readded speech bubbles, tested on humans only. also pre-emptively fixed (?) a bug with alien languages

2012-10-12 17:43:21 +10:00

screen.dm

- Fixes issue 984. Clicking the internals button will now attempt to equip your internals even when you are buckled. It will not succeed if you are buckled and restrained tho, not that you could hold anything in that state...

2012-10-02 21:50:33 +00:00

transform_procs.dm

More and yet more fixes from the piratepad.

2012-10-12 14:25:54 -07:00

update_icons.dm

…