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

..

aphasia.dm

[Ready]Brain Trauma additions (#33405)

2017-12-17 18:10:25 +01:00

beachbum.dm

Resolve conflicts, change name.

2017-05-23 15:43:35 -04:00

codespeak.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

common.dm

Uses WJohnston's new fantastic icons

2017-04-25 21:07:41 +01:00

draconic.dm

Draconic language, for lizards (#26780)

2017-05-03 12:47:52 -03:00

drone.dm

Removes language colours

2017-04-25 22:01:54 +01:00

language_holder.dm

Clockcult Removal 2019 (#47057)

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

language_menu.dm

Changes some 1s and 0s to TRUE and FALSE (#29144)

2017-07-10 10:31:34 -04:00

language.dm

Use spritesheets to reduce time spent sending PNG assets by 90+% (#37399)

2018-05-10 14:34:57 +12:00

machine.dm

Removes language colours

2017-04-25 22:01:54 +01:00

monkey.dm

Removes language colours

2017-04-25 22:01:54 +01:00

mushroom.dm

Mushroom people, revived! (#35858)

2018-03-07 21:34:56 -06:00

narsian.dm

Makes usage of Nar-Sie consistent (#40029)

2018-09-08 13:31:09 +12:00

piratespeak.dm

Pirate language (#41489)

2018-11-27 14:31:57 +13:00

slime.dm

Removes language colours

2017-04-25 22:01:54 +01:00

swarmer.dm

Removes language colours

2017-04-25 22:01:54 +01:00

xenocommon.dm

Removes language colours

2017-04-25 22:01:54 +01:00