MrPerson 24dcf08b2e Merge branch 'master' of https://github.com/tgstation/-tg-station into alert_alert_ur_a_faget ...

Conflicts:
	code/modules/mob/living/carbon/alien/humanoid/life.dm
	code/modules/mob/living/carbon/alien/larva/life.dm
	code/modules/mob/living/carbon/alien/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
	icons/mob/screen_alien.dmi

2015-03-02 12:04:38 -08:00

..

camera

…

dead

Adds blob overmind cursor mob to ghost darkness vision

2015-03-01 04:07:10 -08:00

living

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

2015-03-02 12:04:38 -08:00

new_player

Merge pull request #7963 from Incoming5643/manage_ass

2015-02-28 21:28:44 +00:00

death.dm

…

interactive.dm

Quickfix to conform with the rewrite.

2015-01-07 01:51:39 +11:00

inventory.dm

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00

login.dm

Fixes deadmins from being unable to re-admin after disconnecting.

2015-01-05 00:50:49 -07:00

logout.dm

SubSystem rewrite

2014-12-31 13:25:41 +00:00

mob_cleanup.dm

…

mob_defines.dm

On screen alert system

2015-03-01 17:31:26 -08:00

mob_grab.dm

Tiny clean up, still lots of work to do

2014-12-12 23:57:11 +03:00

mob_helpers.dm

appease my own 'tism

2015-02-11 20:03:54 -05:00

mob_movement.dm

Fixes restrained message spam by giving it a cooldown.

2015-02-24 14:32:31 +01:00

mob_transformation_simple.dm

…

mob.dm

Merge pull request #8011 from Jordie0608/CMOSisforscrubskeepyourcomputerclocksavedinRAM

2015-03-02 08:32:48 -06:00

say_readme.dm

…

say.dm

…

transform_procs.dm

Last pack of fixes for now

2015-01-11 08:23:50 +03:00

update_icons.dm

General cleanup

2014-12-29 11:36:01 +03:00