cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-18 03:21:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into computer_tweaks

Browse Source 
# Conflicts:
#	code/game/jobs/job/ship_crew.dm
This commit is contained in:
alberyk
2021-10-10 13:18:14 -03:00
parent 99cb9a0ea2 6298a41f58
commit 805ffc2f85
229 changed files with 3237 additions and 502 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/client procs.dm
+21
View File
@@ -391,6 +391,9 @@ var/list/localhost_addresses = list(
if (byond_version >= 511 && prefs.clientfps)
fps = prefs.clientfps
if(prefs.toggles_secondary & FULLSCREEN_MODE)
toggle_fullscreen(TRUE)
/client/proc/InitClient()
to_chat(src, "<span class='alert'>If the title screen is black, resources are still downloading. Please be patient until the title screen appears.</span>")
@@ -598,6 +601,24 @@ var/list/localhost_addresses = list(
if(prefs)
prefs.ShowChoices(usr)
/client/verb/toggle_fullscreen_preference()
set name = "Toggle Fullscreen Preference"
set category = "Preferences"
set desc = "Toggles whether the game window will be true fullscreen or normal."
prefs.toggles_secondary ^= FULLSCREEN_MODE
prefs.save_preferences()
toggle_fullscreen(prefs.toggles_secondary & FULLSCREEN_MODE)
/client/proc/toggle_fullscreen(new_value)
if(new_value)
winset(src, "mainwindow", "is-maximized=false;can-resize=false;titlebar=false;menu=menu")
winset(src, "mainwindow.mainvsplit", "pos=0x0")
else
winset(src, "mainwindow", "is-maximized=false;can-resize=true;titlebar=true;menu=menu")
winset(src, "mainwindow.mainvsplit", "pos=3x0")
winset(src, "mainwindow", "is-maximized=true")
/client/proc/apply_fps(var/client_fps)
if(world.byond_version >= 511 && byond_version >= 511 && client_fps >= 0 && client_fps <= 1000)
vars["fps"] = prefs.clientfps
code/modules/client/preference_setup/loadout/loadout_augments.dm
+7 -7
View File
@@ -5,7 +5,7 @@
cost = 1
augment = TRUE
sort_category = "Augments"
whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_SKRELL, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR)
whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR)
flags = GEAR_NO_SELECTION
/datum/gear/augment/eye_sensors
@@ -13,7 +13,7 @@
description = "An eye augment that allows the user to deploy medical or security sensors."
path = /obj/item/organ/internal/augment/eye_sensors
cost = 1
whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_UNATHI, SPECIES_SKRELL, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR)
whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_UNATHI, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR)
/datum/gear/augment/eye_sensors/New()
..()
@@ -106,21 +106,21 @@
display_name = "memory inhibitor"
description = "A Zeng Hu implant that allows one to have control over their memories, allowing you to set a timer and remove any memories developed within it."
path = /obj/item/organ/internal/augment/memory_inhibitor
whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_SKRELL)
whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI)
faction = "Zeng-Hu Pharmaceuticals"
/datum/gear/augment/emotional_manipulator
display_name = "emotional manipulator"
description = "A Zeng Hu brain implant to manipulate the brain's chemicals to induce a calming or happy feeling."
path = /obj/item/organ/internal/augment/emotional_manipulator
whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_SKRELL)
whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI)
faction = "Zeng-Hu Pharmaceuticals"
/datum/gear/augment/enhanced_vision
display_name = "vision enhanced retinas"
description = "Zeng Hu implants given to EMTs to assist with finding the injured. These eye implants allow one to see further than you normally could."
path = /obj/item/organ/internal/augment/enhanced_vision
whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_SKRELL, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL)
whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL)
faction = "Zeng-Hu Pharmaceuticals"
cost = 3
@@ -128,7 +128,7 @@
display_name = "ocular installed sightlights"
description = "Designed to assist Zeng-Hu medical personnel in darker areas or places experiencing periodic power issues, Sightlights will allow one to be able to use their eyes as a flashlight."
path = /obj/item/organ/internal/augment/sightlights
whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_SKRELL, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL)
whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL)
faction = "Zeng-Hu Pharmaceuticals"
cost = 3
@@ -136,7 +136,7 @@
display_name = "zeng-hu veterancy plate"
description = "A clear sign of Zeng-Hu's best, this plate bearing the company's symbol is installed on those who prove themselves in the hyper-competitive environment"
path = /obj/item/organ/internal/augment/zenghu_plate
whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_SKRELL, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL)
whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL)
faction = "Zeng-Hu Pharmaceuticals"
/datum/gear/augment/corrective_lenses
code/modules/client/preference_setup/loadout/loadout_shoes.dm
+12
View File
@@ -127,6 +127,18 @@
path = /obj/item/clothing/shoes/sandal/clogs
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/shoes/recolourable_shoes
display_name = "shoe selection (colourable)"
path = /obj/item/clothing/shoes/sneakers
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/shoes/recolourable_shoes/New()
..()
var/list/recolourable_shoes = list()
recolourable_shoes["sneakers"] = /obj/item/clothing/shoes/sneakers
recolourable_shoes["oxfords"] = /obj/item/clothing/shoes/laceup/colourable
gear_tweaks += new /datum/gear_tweak/path(recolourable_shoes)
/*
Shoe Layer Adjustment
*/
code/modules/client/preference_setup/loadout/loadout_xeno.dm
+1 -1
View File
@@ -2,7 +2,7 @@
display_name = "gear harness"
path = /obj/item/clothing/under/gearharness
sort_category = "Xenowear"
whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_DIONA, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP)
whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_DIONA, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP)
/datum/gear/shoes/footwraps
display_name = "cloth footwraps"
code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm
+22
View File
@@ -337,3 +337,25 @@
sort_category = "Xenowear - Tajara"
whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/accessory/tajara_charm
display_name = "charms and talismans"
description = "Charms and talismans often thought of to bring good luck, or of religious significance."
path = /obj/item/clothing/accessory/tajaran/charm
whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
sort_category = "Xenowear - Tajara"
flags = GEAR_HAS_DESC_SELECTION | GEAR_HAS_NAME_SELECTION
/datum/gear/accessory/tajara_charm/New()
..()
var/list/charm = list()
charm["wooden charm"] = /obj/item/clothing/accessory/tajaran/charm
charm["stone charm"] = /obj/item/clothing/accessory/tajaran/charm/stone
charm["steel charm"] = /obj/item/clothing/accessory/tajaran/charm/steel
charm["silver charm"] = /obj/item/clothing/accessory/tajaran/charm/steel/silver
charm["bone charm"] = /obj/item/clothing/accessory/tajaran/charm/bone
charm["silver seashell charm"] = /obj/item/clothing/accessory/tajaran/charm/steel/silver/seashell
charm["tajani charm"] = /obj/item/clothing/accessory/tajaran/charm/tajani
charm["holy sun rosette"] = /obj/item/clothing/accessory/tajaran/srendarr
gear_tweaks += new /datum/gear_tweak/path(charm)
code/modules/client/preferences_spawnpoints.dm
+1
View File
@@ -47,6 +47,7 @@
C.set_occupant(victim, 1)
victim.Sleeping(3)
to_chat(victim, SPAN_NOTICE("You are slowly waking up from the cryostasis aboard [current_map.full_name]. It might take a few seconds."))
to_chat(victim, FONT_LARGE("<b>Your workplace attire is waiting for you at the nearest autodrobe vendor.</b>"))
return
/datum/spawnpoint/cyborg