Cael_Aislinn 56f5cb9e4e Merge tgstation r4633 into bs12_with_tgport ...

Conflicts:
	code/defines/obj/costume.dm
	code/game/gamemodes/cult/runes.dm
	code/game/machinery/computer/communications.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/objects/structures/crates_lockers/closets/fitness.dm
	code/modules/mob/living/simple_animal/life.dm
	code/modules/mob/living/simple_animal/parrot.dm
	code/modules/power/power.dm
	code/modules/power/switch.dm

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

2012-09-06 13:13:57 +10:00

..

dead

Merged respawn timer.

2012-08-29 22:36:59 +01:00

living

Merge tgstation r4633 into bs12_with_tgport

2012-09-06 13:13:57 +10:00

new_player

Merged arrivals announcement computer.

2012-08-29 22:36:36 +01:00

organ

merge with tgstation's r4618, removed some broken bs12 merges (organs, pain)

2012-09-06 13:09:20 +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

More work on amorphs.

2012-07-04 17:42:21 +02:00

inventory.dm

* Merged diagonal reaching.

2012-08-23 22:43:38 +01:00

login.dm

- Added a real_name variable to DNA, which gets assigned when mobs are created and when preferences are copied as well as when changelings absorb mobs. This is so I could drop the dictionary-style list from changelings, which went list(real_name = \ref[dna]). What this meant was that if you absorbed multiple people whose real_name was "Unknown", you'd only have one dna to show for it. Now all of them will show and will be available to transform into.

2012-08-17 03:55:09 +00:00

logout.dm

Important!

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

mob_cleanup.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_defines.dm

Merge tgstation13 r4570 into bs12_with_tgport

2012-08-28 19:57:11 +10:00

mob_grab.dm

-The weaken in the choke code wasn't enough and people were able to escape from being choked. I've upped it and tested it, you should not be able to escape from a lethal choke on your own any more.

2012-08-28 13:32:17 +00:00

mob_helpers.dm

fixed some oustanding issues with mutantrace taj (including ears and tail, character creation preview), reset hair colour when player switches race in character creation

2012-08-25 07:09:30 +10:00

mob_movement.dm

Mob movement now works on world.timeofday instead of world.time.

2012-08-28 17:48:32 +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

Merge branch 'bs12_with_tgport' of github.com:caelaislinn/Baystation12 into bs12_with_tgport (probably broke ZAS again)

2012-09-04 22:23:50 +10:00

say.dm

* Merged diagonal reaching.

2012-08-23 22:43:38 +01:00

screen.dm

In-hand items should now properly update when equipping items.

2012-08-23 04:13:37 +00:00

transform_procs.dm

Fixed a bug where throwing an emp grenade at the AI would cause the thrower to call the shuttle.

2012-08-31 05:42:43 +00:00

update_icons.dm

- Made legcuffs a thing. At the moment the only legcuff type is the beartrap, but it needs sprites before it can get added to the map. The bear-trap triggers when you arm it and then someone runs over it. It attaches to their leg, making them unable to run until they remove it. You remove a legcuff by resisting out of it or by getting someone else to do it for you in the same way that handcuffs are removed. Resisting out of a beartrap takes

2012-07-24 07:09:57 +00:00