kingofkosmos 52325eda25 Merge branch 'master' of https://github.com/tgstation/tgstation into misc_span_fixes1 ...

# Conflicts:
#	code/game/machinery/Sleeper.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/objects/structures/beds_chairs/chair.dm
#	code/game/objects/structures/lavaland/geyser.dm
#	code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm
#	code/modules/antagonists/clockcult/clock_mobs/_eminence.dm
#	code/modules/paperwork/contract.dm

2019-10-17 06:02:06 +03:00

..

buffs.dm

Clockcult Removal 2019 (#47057)

2019-10-15 10:13:41 +02:00

debuffs.dm

Clockcult Removal 2019 (#47057)

2019-10-15 10:13:41 +02:00

gas.dm

Adds missing spans, missing periods and missing span endings. Also changes spans to suit the situation better.

2019-10-12 19:34:11 +03:00

neutral.dm

Gun sound revamp (#46689)

2019-09-24 18:01:27 -04:00

status_effect.dm

Stacking Status Effects (#44964)

2019-07-13 03:03:38 -07:00