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

Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/carbon_defines.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Goon-420BlazeIt.dm
	code/modules/reagents/Chemistry-Goon-Pyrotechnics.dm

2015-03-08 14:26:52 -07:00

..

camera

Fixes cyborgs spawning as ghosts.

2014-04-13 13:04:36 +01:00

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 explosive

2015-03-08 14:26:52 -07:00

new_player

Merge pull request #8080 from Incoming5643/Appearance_fix

2015-03-06 12:20:24 -06:00

death.dm

* Refactored gib() and dust()

2013-12-23 17:56:58 +00:00

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

Cuts /disease variables from 28 to 23 (includes new ones)

2014-10-30 06:21:14 +00:00

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

NEWCRIT + other changes

2015-03-03 21:35:30 -08: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

The rest of the junk

2014-09-05 18:14:02 +04:00

mob.dm

Merge pull request #8011 from Jordie0608/CMOSisforscrubskeepyourcomputerclocksavedinRAM

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

say_readme.dm

The rest of the junk

2014-09-05 18:14:02 +04:00

say.dm

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00

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