Cael_Aislinn 9340f70252 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport ...

Conflicts:
	icons/obj/items.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

2012-10-22 19:35:03 +10:00

..

dead

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

2012-10-15 23:17:18 +10:00

living

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

2012-10-22 19:35:03 +10:00

new_player

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

2012-10-21 01:25:04 +10: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

Important!

2012-08-08 20:51:55 +00:00

mob_cleanup.dm

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

2012-10-21 00:25:05 +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

Ported BS12 slur.

2012-10-15 20:14:34 +04: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 nutrition-related messages showing up twice in the examine verb and ported pulling damage back in.

2012-10-16 00:10:40 -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

-Added welding goggles, sprites by WJohnston. Aren't on the map yet as I'm waiting for it to be free.

2012-10-16 21:30:01 +00:00

transform_procs.dm

More and yet more fixes from the piratepad.

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

update_icons.dm

…