alberyk 4b32268c1a Merge branch 'master' into final_shuttle_touches_and_stuff ...

# Conflicts:
#	code/game/objects/structures/window.dm
#	code/modules/client/preference_setup/loadout/loadout_uniform.dm

2021-12-21 16:51:40 -03:00

..

turfs

…

zmimic

Revert "New Check" (#11344)

2021-03-01 18:24:59 +01:00

_stubs.dm

…

basic.dm

Revert "New Check" (#11344)

2021-03-01 18:24:59 +01:00

disabled.dm

…

hoist.dm

adds helpful descriptions to certain items (#12743)

2021-11-21 21:03:19 +01:00

mobile_ladders.dm

…

movement.dm

You see me rollin' - Roller Bed Tweaks (#11150)

2021-02-16 19:41:55 +01:00

pipes.dm

…

structures.dm

…