phil235 129295be69 Merge branch 'master' of https://github.com/tgstation/-tg-station into PullvsGrab ...

Conflicts:
	code/__DEFINES/misc.dm
	code/game/objects/structures/tables_racks.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/living_defines.dm

2016-05-25 23:48:00 +02:00

..

camera

invisibility = 100 and 101 now use defines.

2016-04-29 01:00:05 +02:00

dead

Maybe now?

2016-05-24 18:25:20 -04:00

living

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

2016-05-25 23:48:00 +02:00

new_player

Fixes observers being called ghost

2016-05-25 06:15:19 +01:00

death.dm

…

interactive.dm

Merges Pull and Grab into a single functionality. Pulling someone is now the same as a passive grab. You can start pulling someone with ctrlclick or by using the grab intent with empty hand. Using the grab intent again on the pulled person tries to grab them aggressively, then neck grab, then kill grab.

2016-05-24 01:28:04 +02:00

inventory.dm

Merges Pull and Grab into a single functionality. Pulling someone is now the same as a passive grab. You can start pulling someone with ctrlclick or by using the grab intent with empty hand. Using the grab intent again on the pulled person tries to grab them aggressively, then neck grab, then kill grab.

2016-05-24 01:28:04 +02:00

login.dm

Adds a priority system for client.color effects

2016-04-07 21:55:31 +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

Merges Pull and Grab into a single functionality. Pulling someone is now the same as a passive grab. You can start pulling someone with ctrlclick or by using the grab intent with empty hand. Using the grab intent again on the pulled person tries to grab them aggressively, then neck grab, then kill grab.

2016-05-24 01:28:04 +02:00

mob_helpers.dm

Some adjustments, following suggestions in the PR discussion.

2016-05-05 21:50:30 +02:00

mob_movement.dm

Merges Pull and Grab into a single functionality. Pulling someone is now the same as a passive grab. You can start pulling someone with ctrlclick or by using the grab intent with empty hand. Using the grab intent again on the pulled person tries to grab them aggressively, then neck grab, then kill grab.

2016-05-24 01:28:04 +02: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

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

2016-05-25 23:48:00 +02:00

say_readme.dm

radio_controller -> SSradio, SSbp -> SSnpc

2015-12-04 22:25:24 -06:00

say.dm

Made Restore Ghost Character affect deadchat only

2016-05-24 15:04:04 +01:00

status_procs.dm

* Fixes the holosign_creator's sign counter not going back up when one of its holosign is destroyed.

2016-04-28 00:13:15 +02:00

transform_procs.dm

Devil Antag Round 2. (#15794)

2016-05-08 18:44:27 +01:00

update_icons.dm

- you now only see turfs when inside gas pipes.

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