Neerti 6906acf193 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 5/10/2015_bay_merge_attempt_two ...

Conflicts:
	code/game/turfs/simulated/floor.dm
	icons/mob/back.dmi
	maps/exodus-3.dmm
	polaris.dme

2015-05-10 04:21:37 -04:00

..

dead

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

2015-04-24 17:13:37 +02:00

freelook

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 4/27/2015_bay_sync_2

2015-04-27 05:30:36 -04:00

language

Adds selectable default languages to all mobs which can speak

2015-04-08 15:18:59 +01:00

living

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 5/10/2015_bay_merge_attempt_two

2015-05-10 04:21:37 -04:00

new_player

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

death.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

emote.dm

sanitize() refactor: first pass (sanitize)

2015-03-22 23:31:19 +03:00

hear_say.dm

Fixes #8231. Adds on_hear_radio proc for observers to add tracking.

2015-02-27 17:18:47 -05:00

holder.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

inventory.dm

Merge pull request #8973 from mwerezak/inventory2

2015-04-26 20:13:21 +03:00

login.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

logout.dm

…

mob_cleanup.dm

Preliminary work on converting all monkeys to a human subspecies.

2015-03-25 02:15:45 +10:30

mob_defines.dm

Ports /vg/'s Nas-Sie remake.

2015-04-12 16:19:16 +02:00

mob_grab.dm

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

2015-05-02 21:50:11 +02:00

mob_helpers.dm

Compilation fixes.

2015-05-08 08:33:41 +02:00

mob_movement.dm

Ensures new players cannot ghost by moving, really breaks things.

2015-04-20 08:37:57 +02:00

mob_transformation_simple.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

mob.dm

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

2015-04-24 17:13:37 +02:00

say.dm

sanitize() refactor: second pass(other sanitize functions)

2015-03-23 01:38:09 +03:00

transform_procs.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

typing_indicator.dm

…

update_icons.dm

Updates clothing/under to use item_state_slots.

2015-04-23 08:03:40 -04:00