Tigercat2000 5d48cc22b7 Merge remote-tracking branch 'upstream/master' into bay_equipping ...

Conflicts:
	code/modules/client/preference/preferences.dm

2016-06-19 16:28:57 -07:00

..

camera

Port -tg-station cameranets

2016-03-13 15:06:24 -07:00

dead

strips out old emote code

2016-06-14 09:03:39 +01:00

living

Merge pull request #4349 from VampyrBytes/DatumEmotesMK2

2016-06-19 14:04:00 -04:00

new_player

Noir Doesn't Grey out HUD, Adds Remaining Glasses for Vox, 'Yi' to Vox-pidgin syllables & Framework for Icon-based Skin Tone, Fixes #3138, Greyscales Vox Hair (#4614)

2016-06-19 11:35:36 -04:00

spirit

Makes is_mechanical() use OOP, removes bizarre is_active()

2016-05-17 07:25:52 -04:00

abilities.dm

…

death.dm

Bug Fixes (#4714)

2016-06-19 13:24:58 -04:00

hear_say.dm

Fixes autosay to no longer create AIs for their messages

2016-04-28 14:53:52 -07:00

holder.dm

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

inventory.dm

Puts UI on it's own plane

2016-06-06 17:12:28 -04:00

language.dm

Noir Doesn't Grey out HUD, Adds Remaining Glasses for Vox, 'Yi' to Vox-pidgin syllables & Framework for Icon-based Skin Tone, Fixes #3138, Greyscales Vox Hair (#4614)

2016-06-19 11:35:36 -04:00

login.dm

-tg- OOP Hud Refactor

2016-04-21 20:28:08 -07:00

logout.dm

…

mob_defines.dm

Merge pull request #4349 from VampyrBytes/DatumEmotesMK2

2016-06-19 14:04:00 -04:00

mob_grab.dm

Merge branch 'master' into ui_plane

2016-06-19 12:38:00 -04:00

mob_helpers.dm

Merge pull request #4385 from FlattestGuitar/tapegag

2016-05-09 19:12:53 -04:00

mob_movement.dm

Grab Fixes and Throwing Refactor

2016-06-08 01:57:58 -04:00

mob_transformation_simple.dm

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

mob.dm

Merge remote-tracking branch 'upstream/master' into bay_equipping

2016-06-19 16:28:57 -07:00

say.dm

fixes me runtime

2016-06-16 18:57:32 +01:00

transform_procs.dm

Adds pAIzing

2016-05-10 00:02:55 +02:00

typing_indicator.dm

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

update_icons.dm

-tg- OOP Hud Refactor

2016-04-21 20:28:08 -07:00