mwerezak 07881e7495 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into attack-cleanup2 ...

Conflicts:
	code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm

2015-10-15 07:08:16 -04:00

..

dead

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

2015-10-14 08:41:38 +02:00

freelook

…

language

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

2015-10-07 08:14:30 +02:00

living

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into attack-cleanup2

2015-10-15 07:08:16 -04:00

new_player

has_admin_rights() improvement.

2015-09-27 17:05:15 +02:00

animations.dm

Merge pull request #10420 from Kearel/sbike

2015-09-07 13:58:25 +09:30

death.dm

…

emote.dm

…

gender.dm

…

hear_say.dm

…

holder.dm

Added the Resomi.

2015-09-04 08:57:03 +09:30

inventory.dm

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

2015-09-15 20:31:59 +02:00

login.dm

…

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

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

2015-09-27 13:48:33 +02:00

mob_grab_specials.dm

Mob size tweaks.

2015-09-20 17:12:07 +02:00

mob_grab.dm

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

2015-09-02 14:58:13 +02:00

mob_helpers.dm

Merge pull request #11156 from PsiOmegaDelta/150920-PunPunOnTheTable

2015-09-21 19:08:53 +09:30

mob_movement.dm

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

2015-09-15 20:31:59 +02:00

mob_transformation_simple.dm

…

mob.dm

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

2015-09-15 20:31:59 +02:00

say.dm

…

transform_procs.dm

Cherrypicked xenophage-rewrite mechanics over.

2015-09-21 20:36:45 +09:30

typing_indicator.dm

…

update_icons.dm

…