Erthilo 3510a8adf0 Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates ...

Conflicts:
	code/defines/obj/hydro.dm
	code/game/mecha/mecha.dm
	code/game/objects/devices/PDA/PDA.dm
	code/game/objects/devices/flashlight.dm
	code/game/objects/items/candle.dm
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/items/weapons/papers_bins.dm
	code/game/objects/radio/radio.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/mob.dm

2012-08-23 13:56:12 +01:00

..

dead

Merge branch 'tg' into bs12_with_tgport

2012-08-22 18:39:44 +10:00

living

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

2012-08-23 13:56:12 +01:00

new_player

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

organ

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

simple_animal

Fixes simple_animal me command and mice making clonking noises in disposals.

2012-08-18 18:26:39 +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

I started with the desire to fix issue 634. It sounded like a simple issue, right? Well one complete rewrite of how equipping and stripping works later, this commit fixes issue 645

2012-08-15 23:15:55 +00: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

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_grab.dm

- Fixes issue 812.

2012-08-17 16:19:04 +00:00

mob_helpers.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_movement.dm

Removing some unused loops and the last of the speech-bubble stuff.

2012-08-11 15:41:21 +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

Ultralight update, less laggy and less buggy. Might still need to be removed, time will tell. Also: Added an Ion Storm law, and reverted the radio mode change back to the new subspace radios. Also added myself to the admins.txt since I am a dev again and the main server already is updated like that.

2012-08-21 17:25:57 -07:00

say.dm

- Proper fix for issue 803

2012-08-18 00:00:34 +00:00

screen.dm

- Fixed issue 814. Added a obj/screen/inventory object type, which is for screen objects that can hold other ones. This will stop clicks on other UI slots from attempting to equip whatever is in your active hand to them.

2012-08-18 00:26:47 +00:00

transform_procs.dm

Resolves Issue 734

2012-08-14 10:44:41 +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