Cael_Aislinn 49e4eaeffb Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze ...

Conflicts:
	maps/tgstation.2.1.0.0.1.dmm

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

2013-02-14 22:02:06 +10:00

..

dead

observers can become mice, strange ore can be picked up in ore boxes/satchels, crates and closets can be built out of plasteel, changelog update

2013-01-21 18:47:03 +10:00

living

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

2013-02-14 22:02:06 +10:00

new_player

Due to git tree being fucked up for some reason, manually reapplied many man many fixes.

2013-02-07 07:13:27 +04:00

death.dm

…

emote.dm

…

inventory.dm

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

login.dm

…

logout.dm

…

mob_cleanup.dm

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

mob_defines.dm

Merge branch 'incremental_tg' r5600 into bs12_with_tgport

2013-01-23 00:23:37 +10:00

mob_grab.dm

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

mob_helpers.dm

No, monkeys do not have organs, stop lying.

2013-02-06 19:19:38 +04:00

mob_movement.dm

Added an upgraded mopbucket for the janitor and placed it on the map.

2012-11-30 22:37:00 +00:00

mob_transformation_simple.dm

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

mob.dm

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

say.dm

unique voice text colour for soghun, skrell and taj

2013-02-10 22:36:23 +10:00

screen.dm

Merge branch 'incremental_tg' r5600 into bs12_with_tgport

2013-01-23 00:23:37 +10:00

transform_procs.dm

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

update_icons.dm

…