cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-29 19:42:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into computer_tweaks

Browse Source 
# Conflicts:
#	code/game/jobs/faction/eridani.dm
#	code/game/jobs/job/captain.dm
#	code/game/jobs/job/civilian.dm
#	code/game/jobs/job/civilian_chaplain.dm
#	code/game/jobs/job/science.dm
#	icons/obj/machines/shielding.dmi
This commit is contained in:
alberyk
2021-10-29 21:41:30 -03:00
parent f78e9f669f 67034ad04c
commit 2294b4f0c5
192 changed files with 1871 additions and 429 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/client/preference_setup/loadout/loadout_accessories.dm
View File

@@ -409,6 +409,7 @@
passcard["passcard, assunzione"] = /obj/item/clothing/accessory/badge/passcard/assu
passcard["passcard, techno-conglomerate"] = /obj/item/clothing/accessory/badge/passcard/techno
passcard["passcard, konyang"] = /obj/item/clothing/accessory/badge/passcard/konyang
passcard["passcard, visegrad"] = /obj/item/clothing/accessory/badge/passcard/sol/visegrad
gear_tweaks += new /datum/gear_tweak/path(passcard)
/datum/gear/accessory/passport

15
code/modules/client/preference_setup/loadout/loadout_factions.dm
View File

@@ -141,6 +141,21 @@
epmc_sunglasses["aviator sunglasses, EPMC"] = /obj/item/clothing/glasses/sunglasses/sechud/aviator/epmc
gear_tweaks += new /datum/gear_tweak/path(epmc_sunglasses)
/datum/gear/faction/epmc_labcoat
display_name = "EPMC labcoat selection"
description = "A selection of EPMC labcoats."
path = /obj/item/clothing/suit/storage/toggle/labcoat/epmc
slot = slot_wear_suit
faction = "Eridani Private Military Contractors"
/datum/gear/faction/epmc_labcoat/New()
..()
var/list/epmc_labcoats = list()
epmc_labcoats["security labcoat, EPMC"] = /obj/item/clothing/suit/storage/toggle/labcoat/epmc
epmc_labcoats["security labcoat alt, EPMC"] = /obj/item/clothing/suit/storage/toggle/labcoat/epmc/alt
epmc_labcoats["medical labcoat, EPMC"] = /obj/item/clothing/suit/storage/toggle/labcoat/epmc/med
gear_tweaks += new /datum/gear_tweak/path(epmc_labcoats)
/datum/gear/faction/zenghu_uniform_alt
display_name = "zeng-hu white uniform"
path = /obj/item/clothing/under/rank/zeng/alt

10
code/modules/client/preference_setup/loadout/loadout_general.dm
View File

@@ -107,8 +107,16 @@
coffeecups["NKA coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/nka
coffeecups["PRA coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/pra
coffeecups["DPRA coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/metal/dpra
coffeecups["sedantis coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/metal/sedantis
coffeecups["Sedantis coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/metal/sedantis
coffeecups["CoC coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/metal/coc
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["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
coffeecups["Zeng-Hu coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/zeng
coffeecups["TCFL coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/tcfl
coffeecups["#1 coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/one
coffeecups["#1 monkey coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/puni

3
code/modules/client/preference_setup/loadout/loadout_shoes.dm
View File

@@ -136,6 +136,7 @@
..()
var/list/recolourable_shoes = list()
recolourable_shoes["sneakers"] = /obj/item/clothing/shoes/sneakers
recolourable_shoes["sneakers (white tip)"] = /obj/item/clothing/shoes/sneakers/whitetip
recolourable_shoes["oxfords"] = /obj/item/clothing/shoes/laceup/colourable
gear_tweaks += new /datum/gear_tweak/path(recolourable_shoes)
@@ -161,4 +162,4 @@ var/datum/gear_tweak/shoe_layer/gear_tweak_shoe_layer = new()
if(metadata == "Over")
S.shoes_under_pants = FALSE
else
S.shoes_under_pants = TRUE
S.shoes_under_pants = TRUE

7
code/modules/client/preference_setup/loadout/loadout_utility.dm
View File

@@ -23,7 +23,7 @@
cost = 2
/datum/gear/utility/purse
display_name = "Purse"
display_name = "purse"
description = "A small, fashionable bag typically worn over the shoulder."
path = /obj/item/storage/backpack/satchel/pocketbook/purse
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
@@ -61,6 +61,11 @@
display_name = "personal AI device"
path = /obj/item/device/paicard
/datum/gear/utility/classicwallet
display_name = "wallet"
path = /obj/item/storage/wallet
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION
/datum/gear/utility/wallet
display_name = "wallet selection"
path = /obj/item/storage/wallet

3
code/modules/client/preference_setup/loadout/loadout_xeno.dm
View File

@@ -2,7 +2,8 @@
display_name = "gear harness"
path = /obj/item/clothing/under/gearharness
sort_category = "Xenowear"
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)
whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_DIONA, SPECIES_DIONA_COEUS, 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"

40
code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm
View File

@@ -2,7 +2,7 @@
display_name = "headtail chain selection"
path = /obj/item/clothing/ears/skrell/chain
sort_category = "Xenowear - Skrell"
whitelisted = list(SPECIES_SKRELL)
whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI)
/datum/gear/ears/skrell/chains/New()
..()
@@ -16,7 +16,7 @@
display_name = "headtail band selection"
path = /obj/item/clothing/ears/skrell/band
sort_category = "Xenowear - Skrell"
whitelisted = list(SPECIES_SKRELL)
whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI)
/datum/gear/ears/skrell/bands/New()
..()
@@ -30,7 +30,7 @@
display_name = "short headtail cloth"
path = /obj/item/clothing/ears/skrell/cloth_short/black
sort_category = "Xenowear - Skrell"
whitelisted = list(SPECIES_SKRELL)
whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI)
/datum/gear/ears/skrell/cloth/short/New()
..()
@@ -44,7 +44,7 @@
display_name = "average headtail cloth"
path = /obj/item/clothing/ears/skrell/cloth_average/black
sort_category = "Xenowear - Skrell"
whitelisted = list(SPECIES_SKRELL)
whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI)
/datum/gear/ears/skrell/cloth/average/New()
..()
@@ -57,7 +57,7 @@
/datum/gear/accessory/capes
display_name = "shoulder capes"
path = /obj/item/clothing/accessory/poncho/shouldercape
whitelisted = list(SPECIES_SKRELL)
whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI)
sort_category = "Xenowear - Skrell"
/datum/gear/accessory/capes/New()
@@ -72,26 +72,26 @@
/datum/gear/uniform/skrell
display_name = "qeblak ceremonial garment"
path = /obj/item/clothing/under/skrell/qeblak
whitelisted = list(SPECIES_SKRELL)
whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI)
sort_category = "Xenowear - Skrell"
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/stellascope
display_name = "stellascope"
path = /obj/item/stellascope
whitelisted = list(SPECIES_SKRELL)
whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI)
sort_category = "Xenowear - Skrell"
/datum/gear/skrell_projector
display_name = "nralakk projector"
path = /obj/item/skrell_projector
whitelisted = list(SPECIES_SKRELL)
whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI)
sort_category = "Xenowear - Skrell"
/datum/gear/ears/skrell/goop
display_name = "glowing algae"
path = /obj/item/clothing/ears/skrell/goop
whitelisted = list(SPECIES_SKRELL)
whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI)
sort_category = "Xenowear - Skrell"
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
@@ -106,13 +106,13 @@
/datum/gear/mask/skrell
display_name = "skrell gill cover"
path = /obj/item/clothing/mask/breath/skrell
whitelisted = list(SPECIES_SKRELL)
whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI)
sort_category = "Xenowear - Skrell"
/datum/gear/ears/skrell/scrunchy
display_name = "tentacle tie"
path = /obj/item/clothing/ears/skrell/scrunchy
whitelisted = list(SPECIES_SKRELL)
whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI)
sort_category = "Xenowear - Skrell"
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
@@ -120,9 +120,17 @@
display_name = "jargon federation passport"
path = /obj/item/clothing/accessory/badge/passport/jargon
sort_category = "Xenowear - Skrell"
whitelisted = list(SPECIES_SKRELL, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_DIONA)
whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_DIONA)
flags = GEAR_NO_SELECTION
cost = 0
/datum/gear/accessory/skrell_residency
display_name = "starlight residency card"
path = /obj/item/clothing/accessory/badge/starlight
sort_category = "Xenowear - Skrell"
whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI)
flags = GEAR_NO_SELECTION
cost = 0
flags = 0
/datum/gear/accessory/skrell_passport/New()
. = ..()
@@ -130,14 +138,14 @@
// the whitelisted list ensures only people with skrell, vaurca, or diona whitelists can reach this check
/datum/gear/accessory/skrell_passport/check_species_whitelist(mob/living/carbon/human/H)
var/static/list/species_list = list(SPECIES_SKRELL, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BREEDER, SPECIES_DIONA)
var/static/list/species_list = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BREEDER, SPECIES_DIONA)
if(H.species.name in species_list)
return TRUE
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/static/list/species_name_to_tag = list(SPECIES_SKRELL = "_s", SPECIES_VAURCA_WARRIOR = "_v", SPECIES_VAURCA_WORKER = "_v", SPECIES_VAURCA_BREEDER = "_v", SPECIES_DIONA = "_d")
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_DIONA = "_d")
var/tag = species_name_to_tag[H.species.name]
if(tag)
J.species_tag = tag
@@ -146,7 +154,7 @@
/datum/gear/head/skrell_helmet
display_name = "Skrellmet"
path = /obj/item/clothing/head/helmet/security/skrell
whitelisted = list(SPECIES_SKRELL)
whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI)
sort_category = "Xenowear - Skrell"
allowed_roles = list("Head of Security", "Warden", "Security Officer", "Investigator", "Executive Officer", "Captain")

20
code/modules/client/preference_setup/loadout/loadout_xeno/vaurca.dm
View File

@@ -2,7 +2,7 @@
display_name = "vaurca blindfold"
path = /obj/item/clothing/glasses/sunglasses/blinders
cost = 2
whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR)
whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK)
sort_category = "Xenowear - Vaurca"
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
@@ -10,7 +10,7 @@
display_name = "mandible garment"
path = /obj/item/clothing/mask/breath/vaurca
cost = 1
whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR)
whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK)
sort_category = "Xenowear - Vaurca"
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
@@ -18,7 +18,7 @@
display_name = "filter port"
path = /obj/item/clothing/mask/breath/vaurca/filter
cost = 1
whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR)
whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK)
sort_category = "Xenowear - Vaurca"
/datum/gear/mask/vaurca_expression
@@ -50,11 +50,11 @@
/datum/gear/cape_selection
display_name = "tunnel cloak selection"
path = /obj/item/storage/backpack/cloak
path = /obj/item/storage/backpack/cloak
cost = 1
whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR)
sort_category = "Xenowear - Vaurca"
flags = GEAR_HAS_DESC_SELECTION
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/cape_selection/New()
..()
@@ -73,7 +73,7 @@
description = "A selection of vaurca colored hive cloaks."
path = /obj/item/clothing/suit/vaurca
cost = 1
whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR)
whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK)
sort_category = "Xenowear - Vaurca"
/datum/gear/vaurca_robe/New()
@@ -88,7 +88,7 @@
/datum/gear/uniform/vaurca
display_name = "vaurca clothes"
path = /obj/item/clothing/under/vaurca
whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR)
whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK)
sort_category = "Xenowear - Vaurca"
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
@@ -104,7 +104,7 @@
/datum/gear/shoes/vaurca
display_name = "vaurca shoes"
path = /obj/item/clothing/shoes/vaurca
whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR)
whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK)
sort_category = "Xenowear - Vaurca"
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
@@ -140,7 +140,7 @@
path = /obj/item/organ/internal/augment/language/klax
cost = 2
sort_category = "Xenowear - Vaurca"
whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR)
whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK)
flags = GEAR_NO_SELECTION
/datum/gear/augment/language_processor/New()
@@ -156,7 +156,7 @@
cost = 2
path = /obj/item/storage/toolbox/lunchbox
sort_category = "Xenowear - Vaurca"
whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR)
whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK)
/datum/gear/vaurca_lunchbox/New()
..()