Tigercat2000 bcb4a9601f Merge remote-tracking branch 'upstream/master' into poolit ...

Conflicts:
	code/game/objects/structures/displaycase.dm
	code/game/objects/structures/grille.dm
	code/game/objects/structures/lamarr_cage.dm

2015-06-22 13:40:07 -07:00

..

camera

…

dead

-tg- atom pooling system, qdel changes

2015-06-21 15:47:57 -07:00

living

Merge remote-tracking branch 'upstream/master' into poolit

2015-06-22 13:40:07 -07:00

new_player

Whitelisting to bypass the reroute system.

2015-05-28 10:34:33 -07:00

spirit

Generic Action\Action Button System

2015-05-11 09:32:08 -07:00

abilities.dm

Generic ventcrawling + Bugfixes

2015-05-11 06:28:44 -07:00

death.dm

Revert "Manual update"

2015-05-06 20:57:37 -04:00

emote.dm

Fixes missing/broken admin permission checks

2015-06-08 07:55:29 -04:00

hear_say.dm

Fixes hear_radio runtime from fake speakers

2015-05-25 06:58:39 -04:00

holder.dm

…

inventory.dm

…

language.dm

typo

2015-05-28 04:07:41 -04:00

login.dm

…

logout.dm

…

mob_cleanup.dm

2/3 of port done

2015-05-25 19:48:13 -04:00

mob_defines.dm

Mob Resizing, -tg- mob lying standarization

2015-05-27 15:58:13 -07:00

mob_grab.dm

-tg- atom pooling system, qdel changes

2015-06-21 15:47:57 -07:00

mob_helpers.dm

Singularity Refactor

2015-06-10 20:04:28 -04:00

mob_movement.dm

Port Atlas's implementation of -tg-'s canvas art.

2015-05-29 15:43:42 -07:00

mob_transformation_simple.dm

…

mob.dm

-tg- atom pooling system, qdel changes

2015-06-21 15:47:57 -07:00

say.dm

Fix for languages using 2 characters in prefix

2015-05-26 21:38:10 -04:00

transform_procs.dm

Mob Refactor+Update and Pet Collars

2015-05-28 00:20:25 -04:00

typing_indicator.dm

…

update_icons.dm

Mob Resizing, -tg- mob lying standarization

2015-05-27 15:58:13 -07:00