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

# Conflicts:
#	icons/turf/shuttle.dmi

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

..

antagonist

Merge branch 'master' into computer_tweaks

2021-10-29 21:41:30 -03:00

area

…

dna

console stuff

2021-10-10 15:08:16 -03:00

gamemodes

Merge branch 'master' into final_shuttle_touches_and_stuff

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

jobs

Merge branch 'master' into final_shuttle_touches_and_stuff

2022-01-17 19:36:22 -03:00

machinery

Merge branch 'master' into final_shuttle_touches_and_stuff

2022-01-17 19:36:22 -03:00

modifiers

…

objects

Merge branch 'master' into final_shuttle_touches_and_stuff

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

turfs

Merge branch 'master' into final_shuttle_touches_and_stuff

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

verbs

…

ambience.dm

…

atoms_init.dm

…

atoms_movable.dm

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

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

atoms.dm

Storage Opening (#12640)

2021-10-30 13:56:35 +02:00

base_turf.dm

…

periodic_news.dm

…

shuttle_engines.dm

…

sound.dm

Removes several sounds with incompatible license (#12263)

2021-08-01 17:22:43 +02:00

supplyshuttle.dm

…