Mloc 503302dae5 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze ...

Conflicts:
	code/game/objects/items/weapons/implants/implant.dm
	code/modules/reagents/Chemistry-Machinery.dm

2013-11-24 23:37:09 +00:00

..

dead

BugFix: Cult Ghosts...after a bit of professional advise from chinsky.

2013-11-15 01:00:25 -06:00

living

Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze

2013-11-24 23:37:09 +00:00

new_player

Conflict fix.

2013-10-21 04:37:28 +03:00

death.dm

…

emote.dm

Fixes #3555

2013-08-25 13:47:45 -07:00

inventory.dm

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

language.dm

Added key to Check Languages.

2013-09-09 21:51:04 -07:00

login.dm

Fully reverts clickdelay change.

2013-08-13 13:10:09 +01:00

logout.dm

Nano UI Framework

2013-08-19 22:52:23 +01:00

mob_cleanup.dm

…

mob_defines.dm

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

mob_grab.dm

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

mob_helpers.dm

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

mob_movement.dm

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

mob_transformation_simple.dm

…

mob.dm

mecha fixes

2013-11-02 12:26:34 -07:00

say.dm

Merge branch 'master' of https://github.com/Baystation12/Baystation12

2013-08-18 02:09:06 -07:00

transform_procs.dm

Added "Android" and "Robot" alt titles to cyborgs- They spawn with posibrains. Robot alt title waiting on an alt MMI/brain type from Ravensdale, but functions with posibrain right now.

2013-10-27 20:23:01 -04:00

update_icons.dm

…