JJRcop 8fecbe2318 Merge branch 'master' of https://github.com/tgstation/-tg-station into ChronOPS ...

Conflicts:
	icons/mob/head.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/projectiles.dmi

2015-01-16 14:09:07 -05:00

..

camera

…

dead

Merge pull request #6883 from tkdrg/fukkenraydios

2015-01-11 19:38:24 +00:00

living

Merge pull request #7051 from Menshin/dead_ahunter_leaping_fix

2015-01-16 16:32:47 +01:00

new_player

Merge pull request #6808 from Boggart/readminbugfix

2015-01-10 01:29:01 -03:00

death.dm

…

interactive.dm

Quickfix to conform with the rewrite.

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

inventory.dm

…

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

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

2015-01-15 02:30:31 -05:00

mob_grab.dm

Tiny clean up, still lots of work to do

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

mob_helpers.dm

Fixes two typos in ran_zone() proc.

2015-01-11 15:10:56 +01:00

mob_movement.dm

Adds the Chronosuit

2015-01-09 16:14:49 -05:00

mob_transformation_simple.dm

…

mob.dm

* OOP'ed ear damages/deafness status updating

2015-01-13 00:40:46 +01: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