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

Conflicts:
	code/game/objects/explosion.dm
	code/game/objects/items/stacks/sheets/mineral.dm
	code/game/objects/structures/girders.dm
	code/game/objects/structures/grille.dm
	code/game/turfs/turf.dm
	code/modules/events/spacevine.dm
	code/modules/events/wormholes.dm
	code/modules/mining/mine_items.dm
	code/modules/mob/living/silicon/robot/robot.dm

2016-04-03 18:22:20 -06:00

..

camera

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

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

dead

Merge pull request #16381 from ChangelingRain/justthetooltip

2016-03-27 22:41:15 -05:00

living

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

2016-04-03 18:22:20 -06: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 vision not being correctly updated in some cases when ghosting.

2016-02-07 19:01:09 +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

Atoms may now have many mobs buckled to them, as opposed to one, this is controlled by the new max_buckled_mobs var on atoms, defaults to 1 as to not change any current functionality

2016-03-07 18:03:25 +00: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