cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-20 04:17:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into final_shuttle_touches_and_stuff

Browse Source 
# Conflicts:
#	code/modules/power/breaker_box.dm
This commit is contained in:
alberyk
2022-01-17 19:36:22 -03:00
parent d78a20afd8 918d43972e
commit cf3b089df4
54 changed files with 407 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/ghostroles/spawner/human/responseteams/human/elyra.dm
+1 -1
View File
@@ -8,7 +8,7 @@
outfit = /datum/outfit/admin/ert/elyran_trooper
possible_species = list(SPECIES_HUMAN)
extra_languages = list(LANGUAGE_SOL_COMMON)
extra_languages = list(LANGUAGE_ELYRAN_STANDARD)
/datum/ghostspawner/human/ert/elyra/leader
short_name = "elyra_leadertrooper"