cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 22:42:26 +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/mob/abstract/new_player/sprite_accessories.dm
+14 -6
View File
@@ -4313,12 +4313,17 @@ Follow by example and make good judgement based on length which list to include
body_parts = list(BP_CHEST)
species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/diona/coeu, /datum/species/machine/shell, /datum/species/skrell, /datum/species/skrell/axiori, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
tat_heart
name = "Tattoo (Heart, Chest)"
icon_state = "tat_heart"
body_parts = list(BP_CHEST)
tat_heart_arm
name = "Tattoo (Heart, Left Arm)"
icon_state = "tat_lheart"
body_parts = list(BP_L_ARM)
species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/diona/coeu, /datum/species/machine/shell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
right
name = "Tattoo (Heart, Right Arm)"
icon_state = "tat_rheart"
body_parts = list(BP_R_ARM)
tat_heart_back
name = "Tattoo (Heart, Lower Back)"
icon_state = "tat_heartback"
@@ -4560,6 +4565,7 @@ Follow by example and make good judgement based on length which list to include
skr_tears
name = "Tear Stains"
icon = 'icons/mob/human_races/markings_skrell.dmi'
icon_state = "skr_tears"
body_parts = list(BP_HEAD)
species_allowed = list(/datum/species/skrell,/datum/species/skrell/axiori,/datum/species/zombie/skrell)
@@ -4567,6 +4573,7 @@ Follow by example and make good judgement based on length which list to include
skr_axiori_eyes
name = "Axiori Eyes"
icon = 'icons/mob/human_races/markings_skrell.dmi'
icon_state = "skr_axiori_eyes"
body_parts = list(BP_HEAD)
species_allowed = list(/datum/species/skrell, /datum/species/zombie/skrell,/datum/species/zombie/skrell)
@@ -4574,7 +4581,8 @@ Follow by example and make good judgement based on length which list to include
skr_arms
name = "Skrell Arms"
icon_state = "skrell_arms"
icon = 'icons/mob/human_races/markings_skrell.dmi'
icon_state = "skr_arms"
body_parts = list(BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND)
species_allowed = list(/datum/species/skrell,/datum/species/skrell/axiori,/datum/species/zombie/skrell)
@@ -4603,7 +4611,7 @@ Follow by example and make good judgement based on length which list to include
name = "Skrell Stomach"
icon = 'icons/mob/human_races/markings_skrell.dmi'
icon_state = "skr_stomach"
body_parts = list(BP_CHEST)
body_parts = list(BP_CHEST, BP_GROIN)
species_allowed = list(/datum/species/skrell,/datum/species/skrell/axiori,/datum/species/zombie/skrell)
skr_chin
code/modules/mob/language/generic.dm
+1 -1
View File
@@ -80,7 +80,7 @@
signlang_verb = list("signs", "gestures")
sing_verb = null
colour = "i"
key = "4"
key = "s"
flags = NO_STUTTER|SIGNLANG
// Helper
code/modules/mob/language/station.dm
+14
View File
@@ -298,6 +298,20 @@
else
return ..()
//Placeholder stuff for now, a lot of it
/datum/language/elyran
name = LANGUAGE_ELYRAN_STANDARD
short = "ELY"
desc = "Elyran Standard is the official tongue of the Republic of Elyra. Constructed using elements of Farsi, Arabic, and Turkish, influence from all three of these languages can be seen throughout its grammar and vocabulary."
colour = "elyran"
written_style = "elyranstandard"
key = "4"
flags = WHITELISTED | TCOMSSIM
syllables = list("af", "if", "ba", "ta", "tha", "id", "jem", "ha", "kha", "dal", "dhl", "ra", "zay", "sen", "um", "shn", "sid", "ad", "ta", "za", "ayn", "gha", "zir", "yn", "fa", "qaf", "iam", "mim", "al", "ja", "non", "ha", "waw", "ya",
"hem", "zah", "hml", "ks", "ini", "da", "ks", "iga", "ih", "la", "ulf", "xe", "ayw", "sit", "ah", "aarah", "jalaa", "sirt", "kurt", "turhk", "ust", "irk", "kir", "mir", "ach", "oglu", "bolu", "shek", "she", "ghoz", "miya", "ejdan",
"haaz", "quq", "taab", "shanha", "an", "saa", "seh", "an'", "e'", "a'", "em'")
allow_accents = TRUE
/datum/language/machine
name = LANGUAGE_EAL
short = "EAL"
code/modules/mob/living/carbon/human/human.dm
+1 -1
View File
@@ -1291,7 +1291,7 @@
update_inv_gloves(1)
germ_level = 0
gunshot_residue = null
LAZYCLEARLIST(gunshot_residue)
if(clean_feet && !shoes)
footprint_color = null
feet_blood_DNA = null
code/modules/mob/living/carbon/human/human_defines.dm
+1 -1
View File
@@ -95,7 +95,7 @@
var/hand_blood_color
var/list/flavor_texts = list()
var/gunshot_residue
var/list/gunshot_residue
var/pulling_punches // Are you trying not to hurt your opponent?
mob_bump_flag = HUMAN
code/modules/mob/living/carbon/human/human_species.dm
+1
View File
@@ -244,6 +244,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy/mannequin)
/mob/living/carbon/human/terminator/Initialize(mapload)
. = ..(mapload, SPECIES_IPC_TERMINATOR)
add_language(LANGUAGE_SOL_COMMON, 1)
add_language(LANGUAGE_ELYRAN_STANDARD, 1)
add_language(LANGUAGE_UNATHI, 1)
add_language(LANGUAGE_SIIK_MAAS, 1)
add_language(LANGUAGE_SKRELLIAN, 1)
code/modules/mob/living/carbon/human/species/station/human/human.dm
+1 -1
View File
@@ -24,7 +24,7 @@
megacorporations have sparked secretive factions to fight their influence, while there is always the risk of someone digging too \
deep into the secrets of the galaxy..."
num_alternate_languages = 2
secondary_langs = list(LANGUAGE_SOL_COMMON)
secondary_langs = list(LANGUAGE_SOL_COMMON, LANGUAGE_ELYRAN_STANDARD)
name_language = null // Use the first-name last-name generator rather than a language scrambler
mob_size = 9
spawn_flags = CAN_JOIN
code/modules/mob/living/carbon/human/species/station/skrell/skrell.dm
+2 -2
View File
@@ -83,13 +83,13 @@
default_h_style = "Skrell Short Tentacles"
allowed_citizenships = list(CITIZENSHIP_JARGON, CITIZENSHIP_BIESEL, CITIZENSHIP_SOL, CITIZENSHIP_COALITION, CITIZENSHIP_ELYRA, CITIZENSHIP_ERIDANI)
allowed_citizenships = list(CITIZENSHIP_JARGON, CITIZENSHIP_BIESEL, CITIZENSHIP_SOL, CITIZENSHIP_COALITION, CITIZENSHIP_ERIDANI)
allowed_religions = list(RELIGION_QEBLAK, RELIGION_WEISHII, RELIGION_SUURKA, RELIGION_KIRGUL, RELIGION_NONE, RELIGION_OTHER)
default_citizenship = CITIZENSHIP_JARGON
default_accent = ACCENT_SKRELL
allowed_accents = list(ACCENT_SKRELL, ACCENT_HOMEWORLD, ACCENT_QERRMALIC, ACCENT_ALIOSE, ACCENT_AWEIJI, ACCENT_TRAVERSE, ACCENT_CETI, ACCENT_GIBSON, ACCENT_COC, ACCENT_ERIDANI,
ACCENT_ERIDANIDREG, ACCENT_VENUS, ACCENT_JUPITER, ACCENT_MARTIAN, ACCENT_ELYRA, ACCENT_SILVERSUN_EXPATRIATE, ACCENT_EUROPA, ACCENT_VALKYRIE, ACCENT_MICTLAN)
ACCENT_ERIDANIDREG, ACCENT_VENUS, ACCENT_JUPITER, ACCENT_MARTIAN, ACCENT_SILVERSUN_EXPATRIATE, ACCENT_EUROPA, ACCENT_VALKYRIE, ACCENT_MICTLAN)
zombie_type = SPECIES_ZOMBIE_SKRELL
bodyfall_sound = /decl/sound_category/bodyfall_skrell_sound
code/modules/mob/living/silicon/ai/ai.dm
+1
View File
@@ -158,6 +158,7 @@ var/list/ai_verbs_default = list(
add_language(LANGUAGE_ROBOT, TRUE)
add_language(LANGUAGE_TCB, TRUE)
add_language(LANGUAGE_SOL_COMMON, FALSE)
add_language(LANGUAGE_ELYRAN_STANDARD, FALSE)
add_language(LANGUAGE_UNATHI, FALSE)
add_language(LANGUAGE_SIIK_MAAS, FALSE)
add_language(LANGUAGE_SKRELLIAN, FALSE)
code/modules/mob/living/silicon/ai/ai_remote_control.dm
+1
View File
@@ -4,6 +4,7 @@
networks = list(NETWORK_COMMAND)
languages = list(
LANGUAGE_SOL_COMMON = TRUE,
LANGUAGE_ELYRAN_STANDARD = TRUE,
LANGUAGE_TRADEBAND = TRUE,
LANGUAGE_UNATHI = TRUE,
LANGUAGE_SIIK_MAAS = TRUE,
code/modules/mob/living/silicon/pai/pai.dm
+1
View File
@@ -174,6 +174,7 @@
//Default languages without universal translator software
add_language(LANGUAGE_SOL_COMMON, 1)
add_language(LANGUAGE_ELYRAN_STANDARD, 1)
add_language(LANGUAGE_TRADEBAND, 1)
add_language(LANGUAGE_GUTTER, 1)
add_language(LANGUAGE_EAL, 1)
code/modules/mob/living/silicon/robot/robot_modules.dm
+4
View File
@@ -22,6 +22,7 @@ var/global/list/robot_modules = list(
var/networks = list()
var/languages = list( //Any listed language will be understandable. Any set to TRUE will be speakable
LANGUAGE_SOL_COMMON = TRUE,
LANGUAGE_ELYRAN_STANDARD = TRUE,
LANGUAGE_TRADEBAND = TRUE,
LANGUAGE_UNATHI = FALSE,
LANGUAGE_SIIK_MAAS = FALSE,
@@ -608,6 +609,7 @@ var/global/list/robot_modules = list(
networks = list(NETWORK_SERVICE)
languages = list(
LANGUAGE_SOL_COMMON = TRUE,
LANGUAGE_ELYRAN_STANDARD = TRUE,
LANGUAGE_TRADEBAND = TRUE,
LANGUAGE_UNATHI = TRUE,
LANGUAGE_SIIK_MAAS = TRUE,
@@ -839,6 +841,7 @@ var/global/list/robot_modules = list(
name = "syndicate robot module"
languages = list(
LANGUAGE_SOL_COMMON = TRUE,
LANGUAGE_ELYRAN_STANDARD = TRUE,
LANGUAGE_TRADEBAND = TRUE,
LANGUAGE_UNATHI = TRUE,
LANGUAGE_SIIK_MAAS = TRUE,
@@ -1084,6 +1087,7 @@ var/global/list/robot_modules = list(
name = "bluespace robot module"
languages = list(
LANGUAGE_TCB = TRUE,
LANGUAGE_ELYRAN_STANDARD = TRUE,
LANGUAGE_GUTTER = TRUE,
LANGUAGE_SIGN = TRUE,
LANGUAGE_TRADEBAND = TRUE,