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

Conflicts:
	code/ATMOSPHERICS/pipes.dm
	code/game/dna/genes/powers.dm
	code/game/objects/items/devices/PDA/PDA.dm

2014-02-20 19:16:23 -06:00

..

dead

Deadchat sanitized so players can't use HTML.

2014-01-31 16:41:12 -06:00

living

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

2014-02-20 19:16:23 -06:00

new_player

Displaying delayed time.

2014-02-03 04:38:38 +03:00

abilities.dm

Removed some commented ability code.

2013-12-04 12:30:37 +10:30

death.dm

…

emote.dm

pAI / MMI emote fixes.

2014-02-18 06:47:06 -06:00

inventory.dm

…

language.dm

Tradeband and Gutterspeak now have a different font than Tradeband.

2014-01-08 22:15:47 -07:00

login.dm

Added skeleton code for mob abilities.

2013-11-30 00:02:05 +10:30

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

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

2014-01-11 10:45:57 +10:30

mob_grab.dm

…

mob_helpers.dm

Revert "Merge pull request #3965 from jack-fractal/dev"

2013-11-25 11:59:57 +00:00

mob_movement.dm

Sniper Rifle fix.

2014-01-22 22:40:21 -06:00

mob_transformation_simple.dm

DNA2 Bug Fixes - Part 2 (CHERRY PICK)

2014-02-10 22:46:28 -06:00

mob.dm

Fix for unpinning humans.

2014-02-10 01:38:32 +03:00

say.dm

Admin requested addition of a global dsay toggle.

2014-01-20 18:27:12 -08:00

transform_procs.dm

DNA2 Bug Fixes - Part 2 (CHERRY PICK)

2014-02-10 22:46:28 -06:00

update_icons.dm

…