Whitellama 71c2317264 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into flame ...

Conflicts:
	code/game/objects/items/weapons/storage/belt.dm

2014-09-01 18:31:26 -07:00

..

dead

Adds JMP button to certain admin logs

2014-08-17 02:21:21 +02:00

living

Fixed matches and candles not being able to burn papers. Also made Diona join prompt appear for a bit longer.

2014-08-31 02:12:04 -07:00

new_player

Fixed xenobiologist having no preview clothes in character setup

2014-08-31 16:22:43 -07:00

abilities.dm

…

death.dm

Fixes #4744

2014-05-10 00:40:20 +09:30

emote.dm

Cleaned up holders a bit, added show_message() proc to them, added loops in custom_emote to show emotes to things in inventories with the right flag.

2014-05-18 10:59:47 +09:30

hear_say.dm

Compromise on speach_sound, will check distance instead of just checking if ghost.

2014-07-23 01:48:48 -05:00

holder.dm

Fixed some vox icons.

2014-07-01 07:29:30 +09:30

inventory.dm

…

language.dm

Remerged Siik'maas and siik'tajr together as per the tajara maintainer's request.

2014-07-24 17:01:52 -07:00

login.dm

Crash fix attempt: Moving NanoUI resource file sending away from client/New()

2014-04-25 17:47:27 -05:00

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

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

2014-05-31 00:25:56 +01:00

mob_grab.dm

…

mob_helpers.dm

Merging.

2014-07-25 22:50:35 +09:30

mob_movement.dm

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

2014-07-06 17:50:53 +01:00

mob_transformation_simple.dm

…

mob.dm

Fixes yank out object bloodying the wrong hands

2014-08-07 16:49:44 -04:00

say.dm

fixes alien castes not understanding each other

2014-08-01 22:34:28 +02:00

transform_procs.dm

Merge branch 'master' into dev

2014-06-17 16:16:44 +04:00

update_icons.dm

…