Miauw 67e37bd449 Merge branch 'master' of https://github.com/tgstation/-tg-station into dalawisfluid ...

Conflicts:
	code/game/objects/items/weapons/AI_modules.dm
	code/modules/research/designs.dm
	maps/tgstation.2.1.2.dmm

2014-01-07 18:18:59 +01:00

..

camera

* Telescience now works on bluespace crystals, which are special crystals which unlock power settings from the telescience computer.

2013-11-12 14:24:56 +00:00

dead

* Refactored gib() and dust()

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

living

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

2014-01-07 18:18:59 +01:00

new_player

Side Part hair

2014-01-05 08:34:24 -06:00

death.dm

* Refactored gib() and dust()

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

inventory.dm

The icons and some inventory change

2013-11-19 08:24:56 +04:00

login.dm

…

logout.dm

…

mob_cleanup.dm

Viral fix

2013-12-27 17:43:26 +12:00

mob_defines.dm

feature: renames the monkeyizing var to "notransform" since that's how it was being used in the code, as a flag to tell code to ignore transformation (initially because they were already turning into a monkey).

2013-12-19 11:50:33 -05:00

mob_grab.dm

* Monkeys no longer wonder off when being pulled or grabbed.

2013-12-19 20:41:19 +00:00

mob_helpers.dm

Merge pull request #2182 from Rockdtben/sayRefactor

2014-01-01 14:46:04 -08:00

mob_movement.dm

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

2013-12-27 00:55:44 -05:00

mob_transformation_simple.dm

…

mob.dm

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

2013-12-27 00:55:44 -05:00

say.dm

…

transform_procs.dm

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

2014-01-07 18:18:59 +01:00

update_icons.dm

…