phil235 029bc65b93 Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing ...

# Conflicts:
#	code/game/atoms.dm
#	code/game/gamemodes/nuclear/nuclearbomb.dm

2016-10-19 01:56:02 +02:00

..

camera

…

dead

Plane master handling + new chemical Rotatium (#20707)

2016-10-18 11:41:23 +02:00

living

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

2016-10-19 01:56:02 +02:00

new_player

Adds a few turf istype helpers (#20754)

2016-10-01 19:25:46 +02:00

death.dm

…

interactive.dm

Replaces a bunch of istypes with their proper macros (#20739)

2016-09-30 20:21:08 +02:00

inventory.dm

Plane master handling + new chemical Rotatium (#20707)

2016-10-18 11:41:23 +02:00

login.dm

Fixes some Alternate Appearance issues (#19258)

2016-07-12 10:07:49 +12:00

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

Removes the mob "memory" var (#20814)

2016-10-10 11:46:52 +13:00

mob_helpers.dm

Plane master handling + new chemical Rotatium (#20707)

2016-10-18 11:41:23 +02:00

mob_movement.dm

Fixes an issue where moving in no grav would push off movable objects when nonmovable ones were availablee

2016-10-16 22:53:46 -07:00

mob_transformation_simple.dm

More istypes replaced with helpers (#20767)

2016-10-03 13:40:13 +13:00

mob.dm

Merge pull request #20962 from phil235/hit_message

2016-10-18 09:17:41 +13:00

say_readme.dm

Splits languages into languages_spoken and languages_understood.

2016-06-16 18:50:32 -04:00

say.dm

[S] Fixes deadchat bugs (#19972)

2016-08-19 17:06:08 -05:00

status_procs.dm

Carbon Dismemberment , second attempt. (#20461)

2016-09-12 19:33:50 +02:00

transform_procs.dm

Plane master handling + new chemical Rotatium (#20707)

2016-10-18 11:41:23 +02:00

update_icons.dm

Carbon Dismemberment , second attempt. (#20461)

2016-09-12 19:33:50 +02:00