Jack Edge aaefe844c1 Merge branch 'master' into my-best-friend-is-a-holocarp ...

Conflicts:
	code/_globalvars/lists/names.dm
	code/modules/mob/living/simple_animal/guardian/types/explosive.dm
	code/modules/mob/living/simple_animal/guardian/types/protector.dm
	code/modules/mob/living/simple_animal/guardian/types/ranged.dm
	code/modules/mob/living/simple_animal/guardian/types/standard.dm
	code/modules/mob/living/simple_animal/guardian/types/support.dm

2016-04-07 22:56:08 +01:00

..

camera

Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor

2016-02-04 14:34:45 +01:00

dead

Buffs OOC ban

2016-04-03 22:39:52 -05:00

living

Merge branch 'master' into my-best-friend-is-a-holocarp

2016-04-07 22:56:08 +01:00

new_player

Merge pull request #16225 from Ricotez/ghostlooks

2016-03-26 21:03:44 -05:00

death.dm

…

interactive.dm

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00

inventory.dm

Action buttons will now only update when needed instead of every Life().

2016-02-22 00:34:59 +01:00

login.dm

fixes leftover logic from a previous build.

2016-04-03 00:06:49 +01:00

logout.dm

- you now only see turfs when inside gas pipes.

2016-02-04 00:33:16 +01:00

mob_cleanup.dm

…

mob_defines.dm

Removes newcult and readds oldcult

2016-02-27 00:53:14 -08:00

mob_grab.dm

scales back grab nerf

2016-03-28 22:08:32 -07:00

mob_helpers.dm

Adds alien tooltip style

2016-03-26 00:13:02 -04:00

mob_movement.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs

2016-03-30 22:55:00 -06:00

mob_transformation_simple.dm

Adding a second argument to mind.transfer_to that forces key movement and fixing rudimentary transformation

2016-04-01 01:32:59 -06:00

mob.dm

World "?status" expansion, Topic() rework

2016-04-06 02:15:25 -06:00

say_readme.dm

…

say.dm

Ignore Buffs

2016-04-02 10:59:59 -05:00

transform_procs.dm

Goon-style blob placement

2016-03-09 20:21:19 -05:00

update_icons.dm

- you now only see turfs when inside gas pipes.

2016-02-04 00:33:16 +01:00