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

..

effects

oops

2017-12-27 07:08:26 -06:00

items

save point - a lot of shit to fix

2017-12-27 07:03:40 -06:00

structures

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

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

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

items.dm

save point - a lot of shit to fix

2017-12-27 07:03:40 -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

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

structures.dm

Fix many instances of "the the"

2017-10-13 09:41:54 -05:00

weapons.dm

goddamnit_again (#2511)

2017-08-26 18:43:57 -07:00