alberyk 8cd6f9ca66 Merge branch 'master' into final_shuttle_touches_and_stuff ...

# Conflicts:
#	icons/turf/shuttle.dmi

2022-01-17 22:20:15 -03:00

..

turfs

…

zmimic

Revert "New Check" (#11344)

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

_stubs.dm

…

basic.dm

Overmap exoplanet generation, ported from Bay. (#12362)

2022-01-17 22:16:48 -03: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

Teaser 1, purple pipes, Lobby screen

2021-02-08 06:14:14 +01:00

structures.dm

Sculpting Blocks (#10775)

2020-12-22 15:45:25 +01:00