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

Changes Jargon to Nralakk (#14734)

Browse Source
This commit is contained in:
SleepyGemmy
2022-09-01 21:47:36 +02:00
committed by GitHub
parent 0616bd19ff
commit c1511cbc71
57 changed files with 284 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_accessories.dm
+1 -1
View File
@@ -544,6 +544,6 @@
flagpatch_national["flagpatch, dpra"] = /obj/item/clothing/accessory/flagpatch/dpra
flagpatch_national["flagpatch, nka"] = /obj/item/clothing/accessory/flagpatch/nka
flagpatch_national["flagpatch, free council"] = /obj/item/clothing/accessory/flagpatch/freecouncil
flagpatch_national["flagpatch, jargon"] = /obj/item/clothing/accessory/flagpatch/jargon
flagpatch_national["flagpatch, nralakk"] = /obj/item/clothing/accessory/flagpatch/nralakk
flagpatch_national["flagpatch, hegemony"] = /obj/item/clothing/accessory/flagpatch/hegemony
gear_tweaks += new /datum/gear_tweak/path(flagpatch_national)
code/modules/client/preference_setup/loadout/loadout_factions.dm
+1 -1
View File
@@ -317,7 +317,7 @@
faction = "Zeng-Hu Pharmaceuticals"
/datum/gear/faction/zenghu_cloak
display_name = "Zeng-Hu Jargon Division cloak"
display_name = "Zeng-Hu Nralakk Division cloak"
path = /obj/item/clothing/accessory/poncho/shouldercape/qeblak/zeng
slot = slot_wear_suit
faction = "Zeng-Hu Pharmaceuticals"
code/modules/client/preference_setup/loadout/loadout_general.dm
+3 -3
View File
@@ -112,7 +112,7 @@
coffeecups["Eridani coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/eridani
coffeecups["Elyra coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/elyra
coffeecups["Hegemony coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/hegemony
coffeecups["Jargon coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/jargon
coffeecups["Nralakk coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/nralakk
coffeecups["NT coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/nt
coffeecups["Hephaestus coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/metal/hepht
coffeecups["Idris coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/idris
@@ -156,7 +156,7 @@
banners["banner, Dominia"] = /obj/item/flag/dominia
banners["banner, Elyra"] = /obj/item/flag/elyra
banners["banner, Hegemony"] = /obj/item/flag/hegemony
banners["banner, Jargon"] = /obj/item/flag/jargon
banners["banner, Nralakk"] = /obj/item/flag/nralakk
banners["banner, Traverse"] = /obj/item/flag/traverse
banners["banner, NanoTrasen"] = /obj/item/flag/nanotrasen
banners["banner, Eridani Fed"] = /obj/item/flag/eridani
@@ -207,7 +207,7 @@
flags["flag, Dominia"] = /obj/item/flag/dominia/l
flags["flag, Elyra"] = /obj/item/flag/elyra/l
flags["flag, Hegemony"] = /obj/item/flag/hegemony/l
flags["flag, Jargon"] = /obj/item/flag/jargon/l
flags["flag, Nralakk"] = /obj/item/flag/nralakk/l
flags["flag, Traverse"] = /obj/item/flag/traverse/l
flags["flag, NanoTrasen"] = /obj/item/flag/nanotrasen/l
flags["flag, Eridani Fed"] = /obj/item/flag/eridani/l
code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm
+30 -30
View File
@@ -116,14 +116,14 @@
/datum/gear/homeworld_deck
display_name = "qweipaqui homeworld deck"
path = /obj/item/deck/tarot/jargon
path = /obj/item/deck/tarot/nralakk
whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_DIONA, SPECIES_DIONA_COEUS)
sort_category = "Xenowear - Skrell"
flags = GEAR_NO_SELECTION
/datum/gear/colonist_deck // Intentionally separate from homeworld_deck, so that both can be chosen. -Lly
display_name = "qweipaqui colonist deck"
path = /obj/item/deck/tarot/nonjargon
path = /obj/item/deck/tarot/nonnralakk
whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_DIONA, SPECIES_DIONA_COEUS)
sort_category = "Xenowear - Skrell"
flags = GEAR_NO_SELECTION
@@ -179,8 +179,8 @@
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/accessory/skrell_passport
display_name = "jargon federation passport"
path = /obj/item/clothing/accessory/badge/passport/jargon
display_name = "nralakk federation passport"
path = /obj/item/clothing/accessory/badge/passport/nralakk
sort_category = "Xenowear - Skrell"
whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_DIONA, SPECIES_DIONA_COEUS)
flags = GEAR_NO_SELECTION
@@ -206,7 +206,7 @@
return FALSE
/datum/gear/accessory/skrell_passport/spawn_item(location, metadata, mob/living/carbon/human/H)
var/obj/item/clothing/accessory/badge/passport/jargon/J = ..()
var/obj/item/clothing/accessory/badge/passport/nralakk/J = ..()
var/static/list/species_name_to_tag = list(SPECIES_SKRELL = "_s", SPECIES_SKRELL_AXIORI = "_s", SPECIES_VAURCA_WARRIOR = "_v", SPECIES_VAURCA_WORKER = "_v", SPECIES_VAURCA_BREEDER = "_v", SPECIES_VAURCA_BULWARK = "_v", SPECIES_DIONA = "_d", SPECIES_DIONA_COEUS = "_d")
var/tag = species_name_to_tag[H.species.name]
if(tag)
@@ -232,45 +232,45 @@ datum/gear_tweak/social_credit/get_default()
return 5
datum/gear_tweak/social_credit/get_metadata(var/user, var/metadata)
var/credit_score = input(user, "Set the credit score your passport will display, refer to the wiki to gauge it. (It will be slightly randomized to simulate Jargon calculations.)", "Social Credit Score") as null|num
var/credit_score = input(user, "Set the credit score your passport will display, refer to the wiki to gauge it. (It will be slightly randomized to simulate Nralakk calculations.)", "Social Credit Score") as null|num
if(credit_score)
return round(credit_score, 0.01)
return metadata
datum/gear_tweak/social_credit/tweak_item(var/obj/item/clothing/accessory/badge/passport/jargon/PP, var/metadata)
datum/gear_tweak/social_credit/tweak_item(var/obj/item/clothing/accessory/badge/passport/nralakk/PP, var/metadata)
if(!istype(PP))
return
PP.credit_score = metadata + pick(-0.01, 0, 0.01)
/datum/gear/uniform/skrell/work
display_name = "work uniforms"
path = /obj/item/clothing/under/skrell/jargon
path = /obj/item/clothing/under/skrell/nralakk
whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK, SPECIES_DIONA, SPECIES_DIONA_COEUS)
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/uniform/skrell/work/New()
..()
var/list/outfit = list()
outfit["ox research"] = /obj/item/clothing/under/skrell/jargon
outfit["ox security"] = /obj/item/clothing/under/skrell/jargon/ox
outfit["ox engineer"] = /obj/item/clothing/under/skrell/jargon/ox/engineer
outfit["ox service"] = /obj/item/clothing/under/skrell/jargon/ox/service
outfit["ox medical"] = /obj/item/clothing/under/skrell/jargon/ox/med
outfit["ix research"] = /obj/item/clothing/under/skrell/jargon/ix
outfit["ix security"] = /obj/item/clothing/under/skrell/jargon/ix/security
outfit["ix engineer"] = /obj/item/clothing/under/skrell/jargon/ix/engineer
outfit["ix service"] = /obj/item/clothing/under/skrell/jargon/ix/service
outfit["ix medical"] = /obj/item/clothing/under/skrell/jargon/ix/med
outfit["oqi research"] = /obj/item/clothing/under/skrell/jargon/oqi
outfit["oqi security"] = /obj/item/clothing/under/skrell/jargon/oqi/security
outfit["oqi engineer"] = /obj/item/clothing/under/skrell/jargon/oqi/engineer
outfit["oqi service"] = /obj/item/clothing/under/skrell/jargon/oqi/service
outfit["oqi medical"] = /obj/item/clothing/under/skrell/jargon/oqi/med
outfit["iqi research"] = /obj/item/clothing/under/skrell/jargon/iqi
outfit["iqi security"] = /obj/item/clothing/under/skrell/jargon/iqi/security
outfit["iqi engineer"] = /obj/item/clothing/under/skrell/jargon/iqi/engineer
outfit["iqi service"] = /obj/item/clothing/under/skrell/jargon/iqi/service
outfit["iqi medical"] = /obj/item/clothing/under/skrell/jargon/iqi/med
outfit["ox research"] = /obj/item/clothing/under/skrell/nralakk
outfit["ox security"] = /obj/item/clothing/under/skrell/nralakk/ox
outfit["ox engineer"] = /obj/item/clothing/under/skrell/nralakk/ox/engineer
outfit["ox service"] = /obj/item/clothing/under/skrell/nralakk/ox/service
outfit["ox medical"] = /obj/item/clothing/under/skrell/nralakk/ox/med
outfit["ix research"] = /obj/item/clothing/under/skrell/nralakk/ix
outfit["ix security"] = /obj/item/clothing/under/skrell/nralakk/ix/security
outfit["ix engineer"] = /obj/item/clothing/under/skrell/nralakk/ix/engineer
outfit["ix service"] = /obj/item/clothing/under/skrell/nralakk/ix/service
outfit["ix medical"] = /obj/item/clothing/under/skrell/nralakk/ix/med
outfit["oqi research"] = /obj/item/clothing/under/skrell/nralakk/oqi
outfit["oqi security"] = /obj/item/clothing/under/skrell/nralakk/oqi/security
outfit["oqi engineer"] = /obj/item/clothing/under/skrell/nralakk/oqi/engineer
outfit["oqi service"] = /obj/item/clothing/under/skrell/nralakk/oqi/service
outfit["oqi medical"] = /obj/item/clothing/under/skrell/nralakk/oqi/med
outfit["iqi research"] = /obj/item/clothing/under/skrell/nralakk/iqi
outfit["iqi security"] = /obj/item/clothing/under/skrell/nralakk/iqi/security
outfit["iqi engineer"] = /obj/item/clothing/under/skrell/nralakk/iqi/engineer
outfit["iqi service"] = /obj/item/clothing/under/skrell/nralakk/iqi/service
outfit["iqi medical"] = /obj/item/clothing/under/skrell/nralakk/iqi/med
gear_tweaks += new /datum/gear_tweak/path(outfit)
/datum/gear/suit/skrell/jacket
@@ -362,7 +362,7 @@ datum/gear_tweak/social_credit/tweak_item(var/obj/item/clothing/accessory/badge/
tees["teal eriuyushi nebula shirt"] = /obj/item/clothing/accessory/tshirt/skrell/nebula/teal
tees["black eriuyushi nebula shirt"] = /obj/item/clothing/accessory/tshirt/skrell/nebula/black
tees["white eriuyushi nebula shirt"] = /obj/item/clothing/accessory/tshirt/skrell/nebula/white
tees["jargon eriuyushi nebula shirt"] = /obj/item/clothing/accessory/tshirt/skrell/nebula/jargon
tees["nralakk eriuyushi nebula shirt"] = /obj/item/clothing/accessory/tshirt/skrell/nebula/nralakk
gear_tweaks += new /datum/gear_tweak/path(tees)
/datum/gear/accessory/skrell/dress
@@ -414,7 +414,7 @@ datum/gear_tweak/social_credit/tweak_item(var/obj/item/clothing/accessory/badge/
/datum/gear/accessory/skrell/nationcapes/New()
..()
var/list/nationcapes = list()
nationcapes["Jargon Cape"] = /obj/item/clothing/accessory/poncho/shouldercape/nationcapes
nationcapes["Nralakk Cape"] = /obj/item/clothing/accessory/poncho/shouldercape/nationcapes
nationcapes["Free Traverse Cape"] = /obj/item/clothing/accessory/poncho/shouldercape/nationcapes/traverse
nationcapes["Sol Cape"] = /obj/item/clothing/accessory/poncho/shouldercape/nationcapes/sol
nationcapes["Coalition Cape"] = /obj/item/clothing/accessory/poncho/shouldercape/nationcapes/coc