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

Changes mentions of New Ankara to Tabiti (#19609)

Browse Source 
As per NEWLORE.

---------

Signed-off-by: lavillastrangiato <63124803+lavillastrangiato@users.noreply.github.com>
Co-authored-by: La Villa Strangiato <mangodeity@gmail.com~>
This commit is contained in:
lavillastrangiato
2024-07-27 10:09:52 +00:00
committed by GitHub
co-authored by La Villa Strangiato
parent ac19237a3a
commit c03efa6661
15 changed files with 77 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/space_sectors.dm
+3 -3
View File
@@ -10,14 +10,14 @@
#define SECTOR_VALLEY_HALE "Valley Hale" //Generic sector but is also used for the entire Elyran territory
#define SECTOR_BADLANDS "Badlands" //Generic sector
//Elyran sectors
#define SECTOR_NEW_ANKARA "New Ankara" //New Ankara and its gravity well, Persepolis and New Suez are found here
#define SECTOR_TABITI "Tabiti" //Tabiti and its gravity well, Persepolis and New Suez are found here
#define SECTOR_AEMAQ "Al-Wakwak" //al-Wakwak and its gravity well, Aemaqq is found here
//Tajaran and Unathi sectors
#define SECTOR_SRANDMARR "S'rand'marr" //S'r'and'marr and its gravity well, Adhomai and Raskara are found here
#define SECTOR_NRRAHRAHUL "Nrrahrahul" //Nrrahrahul and its gravity well, Hro'zamal is found here
#define SECTOR_GAKAL "Gakal" //Gakal and its gravity well, Gakal'zaal is found here.
#define SECTOR_UUEOAESA "Uueoa-Esa" //Uueoa-Esa and its gravity well, Moghes and Ouerea are found here.
#define ALL_BADLAND_SECTORS list(SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_NEW_ANKARA, SECTOR_AEMAQ, SECTOR_SRANDMARR, SECTOR_NRRAHRAHUL, SECTOR_GAKAL, SECTOR_UUEOAESA)
#define ALL_BADLAND_SECTORS list(SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_TABITI, SECTOR_AEMAQ, SECTOR_SRANDMARR, SECTOR_NRRAHRAHUL, SECTOR_GAKAL, SECTOR_UUEOAESA)
//Coalition-aligned sectors
#define SECTOR_COALITION "Coalition of Colonies" //For if we want to specify coalition assets, but not focused on a particular planet
@@ -45,6 +45,6 @@
#define ALL_DANGEROUS_SECTORS list(SECTOR_BADLANDS, ALL_VOID_SECTORS)
/// all non-generic, named and specific sectors, where generic planets or the like should not spawn
#define ALL_SPECIFIC_SECTORS list(SECTOR_TAU_CETI, SECTOR_SRANDMARR, SECTOR_HANEUNIM, SECTOR_BURZSIA, SECTOR_UUEOAESA, SECTOR_NEW_ANKARA, SECTOR_AEMAQ, SECTOR_NRRAHRAHUL, SECTOR_GAKAL)
#define ALL_SPECIFIC_SECTORS list(SECTOR_TAU_CETI, SECTOR_SRANDMARR, SECTOR_HANEUNIM, SECTOR_BURZSIA, SECTOR_UUEOAESA, SECTOR_TABITI, SECTOR_AEMAQ, SECTOR_NRRAHRAHUL, SECTOR_GAKAL)
#define ALL_POSSIBLE_SECTORS list(ALL_TAU_CETI_SECTORS, ALL_BADLAND_SECTORS, ALL_COALITION_SECTORS, ALL_VOID_SECTORS, ALL_GENERIC_SECTORS, ALL_CORPORATE_SECTORS)
code/datums/ert/outsider.dm
+1 -1
View File
@@ -46,7 +46,7 @@
name = "Elyran Navy"
chance = 15
spawner = /datum/ghostspawner/human/ert/elyra
possible_space_sector = list(SECTOR_BADLANDS, SECTOR_NEW_ANKARA, SECTOR_VALLEY_HALE, SECTOR_AEMAQ)
possible_space_sector = list(SECTOR_BADLANDS, SECTOR_TABITI, SECTOR_VALLEY_HALE, SECTOR_AEMAQ)
/datum/responseteam/coalition
name = "Coalition Rangers"
code/datums/trading/trade.dm
+1 -1
View File
@@ -27,7 +27,7 @@
/// Things they will automatically refuse
var/list/blacklisted_trade_items = list(/mob/living/carbon/human)
/// Which sector(s) this merchant can show up
var/list/allowed_space_sectors = list(SECTOR_ROMANOVICH, SECTOR_TAU_CETI, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_NEW_ANKARA, SECTOR_AEMAQ, SECTOR_SRANDMARR, SECTOR_NRRAHRAHUL,
var/list/allowed_space_sectors = list(SECTOR_ROMANOVICH, SECTOR_TAU_CETI, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_TABITI, SECTOR_AEMAQ, SECTOR_SRANDMARR, SECTOR_NRRAHRAHUL,
SECTOR_GAKAL, SECTOR_UUEOAESA)
/// The list of all their replies and messages. Structure is (id = talk)
code/datums/trading/weaponry.dm
+1 -1
View File
@@ -107,7 +107,7 @@
SPECIES_TAJARA_TESLA_BODY = TRADER_BIAS_DISCOUNT
)
allowed_space_sectors = list(SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_NEW_ANKARA, SECTOR_AEMAQ, SECTOR_SRANDMARR, SECTOR_NRRAHRAHUL, SECTOR_GAKAL, SECTOR_UUEOAESA)
allowed_space_sectors = list(SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_TABITI, SECTOR_AEMAQ, SECTOR_SRANDMARR, SECTOR_NRRAHRAHUL, SECTOR_GAKAL, SECTOR_UUEOAESA)
possible_trading_items = list(
/obj/item/gun/projectile/shotgun/pump/rifle = TRADER_ALL,
code/modules/background/accent/human.dm
+1 -1
View File
@@ -360,7 +360,7 @@
/datum/accent/persepolis
name = ACCENT_PERSEPOLIS
description = "Well-known across Elyra for its rapid-fire, energetic cadence, the Persepolitian accent is characterised by a vibrant and fast-paced nature that represents the New Ankaran Jewel's cosmopolitan nature. \
description = "Well-known across Elyra for its rapid-fire, energetic cadence, the Persepolitian accent is characterised by a vibrant and fast-paced nature that represents the Tabitian Jewel's cosmopolitan nature. \
Speakers of this variant of Elyran Standard tend to be affluent and well-cultured, in keeping with the Elyran capital's general prosperity."
tag_icon = "persepolis"
text_tag = "PER"
code/modules/background/space_sectors/badlands.dm
+2 -2
View File
@@ -38,8 +38,8 @@
starlight_range = 4
/datum/space_sector/new_ankara
name = SECTOR_NEW_ANKARA
description = "New Ankara is the home system of the Republic of Elyra. Its capital is Persepolis. The planet was originally an arid planet with a modest atmosphere and stubborn \
name = SECTOR_TABITI
description = "Tabiti is the home system of the Republic of Elyra. Its capital is Persepolis. The planet was originally an arid planet with a modest atmosphere and stubborn \
native ecosystems already present. Original Alliance-funded terraforming efforts transformed the planet into an Earthlike planet within a decade, allowing the population to flourish \
before and after independence. Commercial and service sector jobs remain the highest employer, second to refineries processing phoron or other minerals transported to the planet's \
orbit. This is among the primary locations in Elyra where phoron can be found in abundance."
html/changelogs/Lavillastrangiato - tabiti.yml
+58
View File
@@ -0,0 +1,58 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# - (fixes bugs)
# wip
# - (work in progress)
# qol
# - (quality of life)
# soundadd
# - (adds a sound)
# sounddel
# - (removes a sound)
# rscadd
# - (adds a feature)
# rscdel
# - (removes a feature)
# imageadd
# - (adds an image or sprite)
# imagedel
# - (removes an image or sprite)
# spellcheck
# - (fixes spelling or grammar)
# experiment
# - (experimental change)
# balance
# - (balance changes)
# code_imp
# - (misc internal code change)
# refactor
# - (refactors code)
# config
# - (makes a change to the config files)
# admin
# - (makes changes to administrator tools)
# server
# - (miscellaneous changes to server)
#################################
# Your name.
author: Lavillastrangiato
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
changes:
- spellcheck: "Changes all mentions of New Ankara to Tabiti, in line with new lore."
maps/away/away_site/big_derelict/bigderelict.dm
+1 -1
View File
@@ -5,7 +5,7 @@
prefix = "away_site/big_derelict/"
suffixes = list("bigderelict.dmm")
sectors = list(SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_NEW_ANKARA, SECTOR_BADLANDS, SECTOR_AEMAQ, ALL_COALITION_SECTORS)
sectors = list(SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_TABITI, SECTOR_BADLANDS, SECTOR_AEMAQ, ALL_COALITION_SECTORS)
sectors_blacklist = list(SECTOR_HANEUNIM)
spawn_weight = 1
spawn_cost = 2
maps/away/away_site/crashed_elyran_tanker/crashed_elyran_tanker.dm
+1 -1
View File
@@ -7,7 +7,7 @@
prefix = "away_site/crashed_elyran_tanker/"
suffixes = list("crashed_elyran_tanker.dmm")
sectors = list(SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_NEW_ANKARA, SECTOR_BADLANDS, SECTOR_AEMAQ)
sectors = list(SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_TABITI, SECTOR_BADLANDS, SECTOR_AEMAQ)
spawn_weight = 1
spawn_cost = 1
id = "crashed_elyran_tanker"
maps/away/away_site/hivebot_hub/hivebot_hub.dm
-1
View File
@@ -6,7 +6,6 @@
prefix = "away_site/hivebot_hub/"
suffixes = list("hivebot_hub.dmm")
sectors = ALL_POSSIBLE_SECTORS
spawn_weight = 1
spawn_cost = 1
maps/away/away_site/racers/racers.dm
+1 -1
View File
@@ -5,7 +5,7 @@
prefix = "away_site/racers/"
suffixes = list("racers.dmm")
sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_NEW_ANKARA, SECTOR_BADLANDS, SECTOR_AEMAQ, ALL_COALITION_SECTORS)
sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_TABITI, SECTOR_BADLANDS, SECTOR_AEMAQ, ALL_COALITION_SECTORS)
spawn_weight = 1
spawn_cost = 2
id = "racers"
maps/away/ships/casino/casino.dm
+1 -1
View File
@@ -5,7 +5,7 @@
prefix = "ships/casino/"
suffixes = list("casino.dmm")
sectors = list(ALL_TAU_CETI_SECTORS, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_NEW_ANKARA, SECTOR_AEMAQ, SECTOR_SRANDMARR, SECTOR_NRRAHRAHUL, SECTOR_GAKAL, SECTOR_UUEOAESA, ALL_COALITION_SECTORS)
sectors = list(ALL_TAU_CETI_SECTORS, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_TABITI, SECTOR_AEMAQ, SECTOR_SRANDMARR, SECTOR_NRRAHRAHUL, SECTOR_GAKAL, SECTOR_UUEOAESA, ALL_COALITION_SECTORS)
spawn_weight = 1
spawn_cost = 1
id = "awaysite_casino"
maps/away/ships/elyra/elyra_corvette/elyra_corvette.dm
+1 -1
View File
@@ -5,7 +5,7 @@
prefix = "ships/elyra/elyra_corvette/"
suffixes = list("elyra_corvette.dmm")
sectors = list(SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_NEW_ANKARA, SECTOR_AEMAQ)
sectors = list(SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_TABITI, SECTOR_AEMAQ)
spawn_weight = 1
ship_cost = 1
id = "elyran_corvette"
maps/away/ships/yacht/yacht.dm
+1 -1
View File
@@ -8,7 +8,7 @@
spawn_cost = 0.5
spawn_weight = 0.5
sectors = list(SECTOR_ROMANOVICH, SECTOR_TAU_CETI, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, ALL_COALITION_SECTORS, SECTOR_NEW_ANKARA, SECTOR_AEMAQ, SECTOR_SRANDMARR, SECTOR_NRRAHRAHUL, SECTOR_GAKAL, SECTOR_UUEOAESA)
sectors = list(SECTOR_ROMANOVICH, SECTOR_TAU_CETI, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, ALL_COALITION_SECTORS, SECTOR_TABITI, SECTOR_AEMAQ, SECTOR_SRANDMARR, SECTOR_NRRAHRAHUL, SECTOR_GAKAL, SECTOR_UUEOAESA)
unit_test_groups = list(3)
maps/random_ruins/exoplanets/asteroid/asteroid.dm
+4 -4
View File
@@ -119,7 +119,7 @@
id = "crashed_satelite"
description = "A crashed satelite."
sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_NEW_ANKARA, SECTOR_AEMAQ, SECTOR_SRANDMARR, SECTOR_NRRAHRAHUL, SECTOR_GAKAL, SECTOR_UUEOAESA, ALL_COALITION_SECTORS)
sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_TABITI, SECTOR_AEMAQ, SECTOR_SRANDMARR, SECTOR_NRRAHRAHUL, SECTOR_GAKAL, SECTOR_UUEOAESA, ALL_COALITION_SECTORS)
prefix = "asteroid/satellite_crash/"
suffixes = list("satellite_crash_unique.dmm")
@@ -153,7 +153,7 @@
spawn_weight = 0.5
spawn_cost = 1
sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_NEW_ANKARA, SECTOR_AEMAQ, ALL_COALITION_SECTORS)
sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_TABITI, SECTOR_AEMAQ, ALL_COALITION_SECTORS)
prefix = "asteroid/escape_pod/"
suffixes = list("escape_pod_unique.dmm")
@@ -170,7 +170,7 @@
spawn_weight = 1
spawn_cost = 1
sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_NEW_ANKARA, SECTOR_AEMAQ, ALL_COALITION_SECTORS, SECTOR_UUEOAESA)
sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_TABITI, SECTOR_AEMAQ, ALL_COALITION_SECTORS, SECTOR_UUEOAESA)
prefix = "asteroid/digsite/"
suffixes = list("digsite_unique.dmm")
@@ -187,7 +187,7 @@
spawn_weight = 1
spawn_cost = 0.5
sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_NEW_ANKARA, SECTOR_AEMAQ, ALL_COALITION_SECTORS)
sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_TABITI, SECTOR_AEMAQ, ALL_COALITION_SECTORS)
prefix = "asteroid/crashed_pod/"
suffixes = list("crashed_pod_unique.dmm")