Kelenius 0071ed3f24 Merge branch 'dev' into ofClicksAndCooldowns ...

Conflicts:
	code/_onclick/click.dm
	code/_onclick/telekinesis.dm
	code/game/machinery/deployable.dm
	code/game/objects/items.dm
	code/game/objects/structures/grille.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
	code/setup.dm

2015-06-07 14:05:54 +03:00

..

dead

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-06-07 10:30:27 +02:00

freelook

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into newmalf-merge

2015-05-11 07:46:51 +02:00

language

Readded preview icon for IPC, added language and blurb.

2015-05-25 14:50:00 +09:30

living

Merge branch 'dev' into ofClicksAndCooldowns

2015-06-07 14:05:54 +03:00

new_player

Actually renames 'going' var.

2015-06-05 11:07:24 +03:00

animations.dm

Clean up world print

2015-05-20 00:35:26 -04:00

death.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

emote.dm

get_mobs_in_view() renamed to get_mobs_or_objects_in_view(). Returns mobs or objects depending on specifications

2015-05-17 16:54:18 +10:00

hear_say.dm

…

holder.dm

Allows pAIs to be scooped up and worn as hats.

2015-05-26 15:15:15 +09:30

inventory.dm

Items again have their loc set just before dropped() is called.

2015-05-21 17:55:31 +02:00

login.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

Moves admin attack log helpers to admin module, makes admin_attack_log more resilient against null arguments

2015-06-06 11:53:12 -04:00

mob_grab.dm

Merge branch 'dev' into ofClicksAndCooldowns

2015-06-07 14:05:54 +03:00

mob_helpers.dm

Removed IS_SYNTHETIC and REGENERATES_LIMBS flags.

2015-05-25 14:49:07 +09:30

mob_movement.dm

Merge remote-tracking branch 'upstream/dev' into dev

2015-05-12 14:39:21 +02:00

mob_transformation_simple.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

mob.dm

Merge branch 'dev' into ofClicksAndCooldowns

2015-06-07 14:05:54 +03:00

say.dm

…

transform_procs.dm

Fixes #9244.

2015-05-18 19:15:28 +02:00

typing_indicator.dm

Fixes corpses and unconscious people still showing typing indicators.

2015-05-30 03:13:45 +03:00

update_icons.dm

Updates clothing/under to use item_state_slots.

2015-04-23 08:03:40 -04:00