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

# Conflicts:
#	code/modules/events/alien_infestation.dm
#	code/modules/events/spider_infestation.dm
#	code/modules/events/vent_clog.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm

2018-01-02 05:16:13 -06:00

..

effects

Merge pull request #4454 from Citadel-Station-13/upstream-merge-33621

2018-01-02 04:52:57 -06:00

items

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

2018-01-01 14:09:07 -06:00

structures

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

2018-01-01 14:09:07 -06:00

buckling.dm

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

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

empulse.dm

…

items.dm

Merge branch 'master' into upstream-merge-32311

2017-12-29 18:38:50 -06:00

obj_defense.dm

Defines math, take 2

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

objs.dm

Fixes bartender suit having an adjust state

2017-11-22 12:40:32 -06:00

radiation.dm

…

structures.dm

…

weapons.dm

…