Kelenius 24ef7752cd Merge branch 'Baystation12/dev' into ofChemistryAndStuff ...

Conflicts:
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/living/carbon/monkey/monkey.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/glass.dm

2015-03-28 19:14:59 +03:00

..

dead

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

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

freelook

Refactors the AI eye.

2015-03-25 18:53:11 +01:00

language

Finalized monkey species definitions and icons.

2015-03-26 14:45:41 +10:30

living

Merge branch 'Baystation12/dev' into ofChemistryAndStuff

2015-03-28 19:14:59 +03:00

new_player

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

2015-03-23 11:47:15 +01:00

death.dm

…

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

Finalized monkey species definitions and icons.

2015-03-26 14:45:41 +10:30

inventory.dm

Fixes #8075

2015-02-18 23:55:21 -05:00

login.dm

Ports /tg/'s borg hotkeys. They work similarly to the AI's hotkeys.

2015-03-13 21:41:23 -04: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

Fixing compile issues, adjusted buckle code after a weird merge.

2015-03-07 11:52:14 +10:30

mob_grab.dm

Updated ismonkey(), refactored kitchen spike, refactored plastic flaps.

2015-03-26 12:45:12 +10:30

mob_helpers.dm

Merge pull request #8380 from volas/sanitize_procs

2015-03-29 00:57:33 +10:30

mob_movement.dm

Refactors the AI eye.

2015-03-25 18:53:11 +01:00

mob_transformation_simple.dm

…

mob.dm

sanitize() refactor: third pass (misc)

2015-03-25 01:05:21 +03:00

say.dm

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

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

transform_procs.dm

Finalized monkey species definitions and icons.

2015-03-26 14:45:41 +10:30

typing_indicator.dm

…

update_icons.dm

…