mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-19 19:10:05 +01:00
hazelratandGitHub
c9e5c6e591
This resolves every issue I could eyeball with Vaurca Attendants. Added to every ghostrole where they're appropriate, mostly wherever warriors are. Included as non-combatants in the TCAF ghostspawn. Added to every list for species-specific loadout items and augments, so they should be able to select them now. Added to every job blacklist warriors were already on, most notably so you can't join as a consular officer or corporate representative. Accounts for attendants with a lot of admin outfits and ERT spawns. Resolves https://github.com/Aurorastation/Aurora.3/issues/19974
32 lines
1.1 KiB
Plaintext
32 lines
1.1 KiB
Plaintext
/datum/ghostspawner/human/merchantass
|
|
short_name = "merchantass"
|
|
name = "Merchants Assistant"
|
|
desc = "Assist the Merchant with their duties."
|
|
tags = list("External")
|
|
|
|
enabled = FALSE
|
|
spawnpoints = list("MerchantAss")
|
|
req_perms = null
|
|
max_count = 1
|
|
|
|
//Vars related to human mobs
|
|
outfit = /obj/outfit/merchant_assistant
|
|
possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_DIONA)
|
|
allow_appearance_change = APPEARANCE_PLASTICSURGERY
|
|
|
|
assigned_role = "Merchants Assistant"
|
|
special_role = "Merchants Assistant"
|
|
respawn_flag = null
|
|
|
|
mob_name = null
|
|
|
|
/datum/ghostspawner/human/merchantass/can_edit(mob/user)
|
|
. = ..()
|
|
var/is_merchant = FALSE
|
|
|
|
if(ishuman(user))
|
|
var/mob/living/carbon/human/H = user
|
|
is_merchant = (H.job == "Merchant")
|
|
|
|
return . || is_merchant
|