deathride58 742d50b5e7 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization ...

# Conflicts:
#	code/citadel/custom_loadout/custom_items.dm
#	code/datums/components/riding.dm
#	code/game/objects/items/implants/implantuplink.dm
#	icons/mob/neck.dmi
#	icons/obj/clothing/cloaks.dmi

2017-12-08 19:58:41 -05:00

..

brain

Datumizes saymodes

2017-12-03 12:56:03 -06:00

carbon

Merge branch 'master' into upstream-merge-32249

2017-12-04 23:15:38 +00:00

silicon

Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization

2017-12-08 19:58:41 -05:00

simple_animal

commit (#33343)

2017-12-08 10:34:42 -06:00

blood.dm

Vampire species for halloween

2017-10-26 11:55:40 -05:00

bloodcrawl.dm

Clean up some loc assignments (#33157)

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

damage_procs.dm

Configuration datum refactor

2017-09-28 21:37:53 -05:00

death.dm

Replaces a bunch of mob loops with hopefully better ones

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

emote.dm

[READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on

2017-12-03 15:33:29 -06:00

life.dm

IRC message if client mob ends up in nullspace (#33004)

2017-11-24 12:59:54 -06:00

living_defense.dm

Ratvar summoning now ends the round/triggers mass proselytize (#31956)

2017-10-24 18:07:06 -05:00

living_defines.dm

Clean up some loc assignments (#33157)

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

living.dm

Merge branch 'master' into upstream-merge-32249

2017-12-04 23:15:38 +00:00

login.dm

…

logout.dm

…

say.dm

Merge pull request #33277 from tgstation/Cyberboss-patch-8

2017-12-05 04:08:13 -06:00

status_procs.dm

…

taste.dm

Adds defines for organ slots

2017-10-15 19:34:42 -05:00

ventcrawling.dm

…