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

# Conflicts:
#	icons/turf/shuttle.dmi

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

..

components

Fixes loadout renaming runtimes (#12497)

2021-09-17 12:53:47 +02:00

discord

Ports Bay's updated evacuation controller and bluespace jump. (#12445)

2021-09-07 17:12:10 +02:00

elements

…

ert

Space Sector: Badlands (#11985)

2021-08-05 13:03:49 -03:00

helper_datums

Colorable Chairs, Stools, and other phoney baloney (#12797)

2021-12-02 22:57:24 +01:00

looping_sounds

…

observation

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

2022-01-17 22:16:48 -03:00

outfits

Merge branch 'master' into final_shuttle_touches_and_stuff

2022-01-14 21:04:38 -03:00

radio

…

repositories

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

2022-01-17 22:16:48 -03:00

trading

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

2022-01-17 22:16:48 -03:00

underwear

…

uplink

Adds an ion rifle to the uplink (#12793)

2021-12-01 18:45:11 +01:00

wires

…

ai_law_sets.dm

Drone Speech Refactor and Tweak (#12308)

2021-09-13 14:54:41 +02:00

ai_laws.dm

…

beam.dm

…

browser.dm

…

callback-usage.txt

…

callback.dm

…

cargo.dm

Cargo suppliers can now have their prices influenced by the current space sector (#12147)

2021-07-16 20:43:42 +02:00

category.dm

…

computerfiles.dm

…

datum.dm

…

feedback.dm

…

late_choices.dm

Ports Bay's updated evacuation controller and bluespace jump. (#12445)

2021-09-07 17:12:10 +02:00

mind.dm

Corporate IDs and Manifest (#12152)

2021-07-21 14:07:50 +02:00

mixed.dm

…

modules.dm

…

position_point_vector.dm

…

progressbar.dm

…

records.dm

Corporate IDs and Manifest (#12152)

2021-07-21 14:07:50 +02:00

ruins.dm

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

2022-01-17 22:16:48 -03:00

statistic.dm

…

weakref.dm

…