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

Conflicts:
	code/modules/client/preference/preferences.dm
	icons/mob/uniform.dmi

2016-06-13 20:11:29 -07:00

..

camera

…

dead

Adds click-dragging ghosts onto items for ghostly possession (#4482)

2016-05-25 16:10:40 -04:00

living

Fixes camera assemblies and orange shoes not respecting NODROP (#4654)

2016-06-13 01:39:26 -04:00

new_player

Merge pull request #4584 from Crazylemon64/i_did_another_dumb

2016-06-03 20:13:40 -04:00

spirit

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

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

abilities.dm

…

death.dm

…

emote.dm

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

2016-04-05 08:25:57 -07: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

Tape gags for all

2016-05-07 15:02:38 +02:00

language.dm

Resolves conflict in interface/stylesheet.dm

2016-04-20 14:44:24 -07:00

login.dm

-tg- OOP Hud Refactor

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

logout.dm

…

mob_defines.dm

A Few More Disease and Reagents

2016-05-05 00:46:04 -04:00

mob_grab.dm

Grab Fixes and Throwing Refactor

2016-06-08 01:57:58 -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-13 20:11:29 -07:00

say.dm

Fixes a few runtimes

2016-05-23 19:23:18 -04: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