LetterJay 518b264654 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783 ...

# Conflicts:
#	_maps/map_files/generic/CentCom.dmm
#	code/modules/mob/living/living.dm

2017-12-29 01:34:17 -06:00

..

brain

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783

2017-12-29 01:34:17 -06:00

carbon

fk

2017-12-29 01:20:09 -06:00

silicon

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783

2017-12-29 01:34:17 -06:00

simple_animal

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783

2017-12-29 01:34:17 -06:00

blood.dm

more save points

2017-12-29 00:07:36 -06:00

bloodcrawl.dm

Clean up some loc assignments (#33157)

2017-12-02 09:44:20 -06:00

damage_procs.dm

Defines math, take 2

2017-12-17 10:02:43 -06:00

death.dm

Replaces a bunch of mob loops with hopefully better ones

2017-11-16 16:09:15 -06:00

emote.dm

Ghosts can *spin and *flip

2017-12-25 17:11:29 -06:00

inhand_holder.dm

[READY]Adds picking up corgis and pAIs!

2017-12-27 15:47:57 -06:00

life.dm

more save points

2017-12-29 00:07:36 -06:00

living_defense.dm

more save points

2017-12-29 00:07:36 -06:00

living_defines.dm

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783

2017-12-29 01:34:17 -06:00

living.dm

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783

2017-12-29 01:34:17 -06:00

login.dm

Fixes a brain login runtime (#33569)

2017-12-17 04:11:17 -06:00

logout.dm

Update logout.dm

2017-12-14 19:12:27 -05:00

say.dm

fk

2017-12-29 01:20:09 -06:00

status_procs.dm

fk

2017-12-29 01:20:09 -06:00

taste.dm

…

ventcrawling.dm

…