alberyk cf3b089df4 Merge branch 'master' into final_shuttle_touches_and_stuff ...

# Conflicts:
#	code/modules/power/breaker_box.dm

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

..

admin

Adds a new skrell subspecies: Axiori (#12511)

2021-09-28 08:02:07 +02:00

responseteams

Adds Elyran Standard language (#12880)

2022-01-17 16:52:00 +01:00

emergencypod.dm

the rest

2022-01-02 00:06:46 -03:00

human.dm

…

kataphract.dm

…

merchant.dm

Adds a new skrell subspecies: Axiori (#12511)

2021-09-28 08:02:07 +02:00

pra.dm

Kosmostrelki & Combat Uniform Adjustment (#11711)

2021-04-23 12:53:54 +02:00

visitor.dm

Adds a new skrell subspecies: Axiori (#12511)

2021-09-28 08:02:07 +02:00

zenghu.dm

Adds a new skrell subspecies: Axiori (#12511)

2021-09-28 08:02:07 +02:00