cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 14:31:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into prepare_stuff_for_second_week

Browse Source
This commit is contained in:
alberyk
2022-01-29 11:45:45 -03:00
parent 8e875dc192 edb1c08178
commit cd07daa559
35 changed files with 208 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/abstract/new_player/menu.dm
+3
View File
@@ -14,6 +14,7 @@
using = new /obj/screen/new_player/title(src)
using.name = "Title"
using.hud = src
adding += using
using = new /obj/screen/new_player/selection/join_game(src)
@@ -83,6 +84,8 @@
. = ..()
/obj/screen/new_player/title/proc/Update()
if(!istype(hud) || !isnewplayer(hud.mymob))
return
lobby_index += 1
if (lobby_index > length(current_map.lobby_screens))
lobby_index = 1
code/modules/mob/living/carbon/human/species/station/diona/diona.dm
+1 -1
View File
@@ -110,7 +110,7 @@
max_hydration_factor = -1
allowed_citizenships = list(CITIZENSHIP_BIESEL, CITIZENSHIP_JARGON, CITIZENSHIP_SOL, CITIZENSHIP_COALITION, CITIZENSHIP_DOMINIA, CITIZENSHIP_IZWESKI, CITIZENSHIP_NONE)
allowed_citizenships = list(CITIZENSHIP_BIESEL, CITIZENSHIP_JARGON, CITIZENSHIP_SOL, CITIZENSHIP_COALITION, CITIZENSHIP_DOMINIA, CITIZENSHIP_IZWESKI, CITIZENSHIP_EUM, CITIZENSHIP_NONE)
allowed_religions = list(RELIGION_QEBLAK, RELIGION_WEISHII, RELIGION_MOROZ, RELIGION_THAKH, RELIGION_SKAKH, RELIGION_ETERNAL, RELIGION_NONE, RELIGION_OTHER)
allowed_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG)
code/modules/mob/living/carbon/human/species/station/ipc/ipc.dm
+1 -1
View File
@@ -31,7 +31,7 @@
name_language = "Encoded Audio Language"
num_alternate_languages = 2
secondary_langs = list("Encoded Audio Language", "Sol Common")
secondary_langs = list("Encoded Audio Language", "Sol Common", "Elyran Standard")
ethanol_resistance = -1//Can't get drunk
radiation_mod = 0 // not affected by radiation
remains_type = /obj/effect/decal/remains/robot
code/modules/mob/living/carbon/human/species/station/skrell/skrell.dm
+1 -1
View File
@@ -83,7 +83,7 @@
default_h_style = "Skrell Short Tentacles"
allowed_citizenships = list(CITIZENSHIP_JARGON, CITIZENSHIP_BIESEL, CITIZENSHIP_SOL, CITIZENSHIP_COALITION, CITIZENSHIP_ERIDANI)
allowed_citizenships = list(CITIZENSHIP_JARGON, CITIZENSHIP_BIESEL, CITIZENSHIP_SOL, CITIZENSHIP_COALITION, CITIZENSHIP_ERIDANI, CITIZENSHIP_EUM)
allowed_religions = list(RELIGION_QEBLAK, RELIGION_WEISHII, RELIGION_SUURKA, RELIGION_KIRGUL, RELIGION_NONE, RELIGION_OTHER)
default_citizenship = CITIZENSHIP_JARGON