tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make starting gear automatically find hands for inhand items (#20861)

Browse Source
This commit is contained in:
DrSmugleaf
2023-10-14 10:28:52 -07:00
committed by GitHub
parent 9e1ecdea76
commit ed15b93926
48 changed files with 105 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Administration/Commands/SetOutfitCommand.cs
View File

@@ -121,10 +121,10 @@ namespace Content.Server.Administration.Commands
{
var handsSystem = entityManager.System<HandsSystem>();
var coords = entityManager.GetComponent<TransformComponent>(target).Coordinates;
foreach (var (hand, prototype) in startingGear.Inhand)
foreach (var prototype in startingGear.Inhand)
{
var inhandEntity = entityManager.SpawnEntity(prototype, coords);
handsSystem.TryPickup(target, inhandEntity, hand, checkActionBlocker: false, handsComp: handsComponent);
handsSystem.TryPickup(target, inhandEntity, checkActionBlocker: false, handsComp: handsComponent);
}
}

40
Content.Shared/Roles/StartingGearPrototype.cs
View File

@@ -1,34 +1,28 @@
using Content.Shared.Preferences;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary;
namespace Content.Shared.Roles
{
[Prototype("startingGear")]
public sealed class StartingGearPrototype : IPrototype
{
[DataField("equipment", customTypeSerializer: typeof(PrototypeIdValueDictionarySerializer<string, EntityPrototype>))]
private Dictionary<string, string> _equipment = new();
[DataField]
public Dictionary<string, EntProtoId> Equipment = new();
/// <summary>
/// if empty, there is no skirt override - instead the uniform provided in equipment is added.
/// </summary>
[DataField("innerclothingskirt", customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
private string? _innerClothingSkirt;
[DataField]
public EntProtoId? InnerClothingSkirt;
[DataField("satchel", customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
private string? _satchel;
[DataField]
public EntProtoId? Satchel;
[DataField("duffelbag", customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
private string? _duffelbag;
[DataField]
public EntProtoId? Duffelbag;
public IReadOnlyDictionary<string, string> Inhand => _inHand;
/// <summary>
/// hand index, item prototype
/// </summary>
[DataField("inhand")]
private Dictionary<string, string> _inHand = new(0);
[DataField]
public List<EntProtoId> Inhand = new(0);
[ViewVariables]
[IdDataField]
@@ -38,15 +32,15 @@ namespace Content.Shared.Roles
{
if (profile != null)
{
if (slot == "jumpsuit" && profile.Clothing == ClothingPreference.Jumpskirt && !string.IsNullOrEmpty(_innerClothingSkirt))
return _innerClothingSkirt;
if (slot == "back" && profile.Backpack == BackpackPreference.Satchel && !string.IsNullOrEmpty(_satchel))
return _satchel;
if (slot == "back" && profile.Backpack == BackpackPreference.Duffelbag && !string.IsNullOrEmpty(_duffelbag))
return _duffelbag;
if (slot == "jumpsuit" && profile.Clothing == ClothingPreference.Jumpskirt && !string.IsNullOrEmpty(InnerClothingSkirt))
return InnerClothingSkirt;
if (slot == "back" && profile.Backpack == BackpackPreference.Satchel && !string.IsNullOrEmpty(Satchel))
return Satchel;
if (slot == "back" && profile.Backpack == BackpackPreference.Duffelbag && !string.IsNullOrEmpty(Duffelbag))
return Duffelbag;
}
return _equipment.TryGetValue(slot, out var equipment) ? equipment : string.Empty;
return Equipment.TryGetValue(slot, out var equipment) ? equipment : string.Empty;
}
}
}

8
Content.Shared/Station/SharedStationSpawningSystem.cs
View File

@@ -37,10 +37,14 @@ public abstract class SharedStationSpawningSystem : EntitySystem
var inhand = startingGear.Inhand;
var coords = EntityManager.GetComponent<TransformComponent>(entity).Coordinates;
foreach (var (hand, prototype) in inhand)
foreach (var prototype in inhand)
{
var inhandEntity = EntityManager.SpawnEntity(prototype, coords);
_handsSystem.TryPickup(entity, inhandEntity, hand, checkActionBlocker: false, handsComp: handsComponent);
if (_handsSystem.TryGetEmptyHand(entity, out var emptyHand, handsComponent))
{
_handsSystem.TryPickup(entity, inhandEntity, emptyHand, checkActionBlocker: false, handsComp: handsComponent);
}
}
}
}

6
Resources/Prototypes/Roles/Antags/pirate.yml
View File

@@ -8,7 +8,7 @@
id: PassengerPDA
belt: ClothingBeltUtility
pocket1: AppraisalTool
innerclothingskirt: ClothingUniformJumpsuitPirate
innerClothingSkirt: ClothingUniformJumpsuitPirate
satchel: ClothingBackpackPirateFilled
duffelbag: ClothingBackpackPirateFilled
@@ -24,7 +24,7 @@
pocket1: AppraisalTool
pocket2: EnergyCutlass
outerClothing: ClothingOuterCoatPirate
innerclothingskirt: ClothingUniformJumpskirtColorLightBrown
innerClothingSkirt: ClothingUniformJumpskirtColorLightBrown
satchel: ClothingBackpackPirateFilled
duffelbag: ClothingBackpackPirateFilled
@@ -39,6 +39,6 @@
belt: ClothingBeltUtility
pocket1: AppraisalTool
outerClothing: ClothingOuterCoatGentle
innerclothingskirt: ClothingUniformJumpsuitPirate
innerClothingSkirt: ClothingUniformJumpsuitPirate
satchel: ClothingBackpackPirateFilled
duffelbag: ClothingBackpackPirateFilled

2
Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
View File

@@ -23,6 +23,6 @@
id: CargoPDA
ears: ClothingHeadsetCargo
pocket1: AppraisalTool
innerclothingskirt: ClothingUniformJumpskirtCargo
innerClothingSkirt: ClothingUniformJumpskirtCargo
satchel: ClothingBackpackSatchelCargoFilled
duffelbag: ClothingBackpackDuffelCargoFilled

2
Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
View File

@@ -45,6 +45,6 @@
ears: ClothingHeadsetQM
belt: BoxFolderClipboard
pocket1: AppraisalTool
innerclothingskirt: ClothingUniformJumpskirtQM
innerClothingSkirt: ClothingUniformJumpskirtQM
satchel: ClothingBackpackSatchelQuartermasterFilled
duffelbag: ClothingBackpackDuffelQuartermasterFilled

2
Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml
View File

@@ -17,6 +17,6 @@
shoes: ClothingShoesColorBlack
id: PassengerPDA
ears: ClothingHeadsetGrey
innerclothingskirt: ClothingUniformJumpskirtColorGrey
innerClothingSkirt: ClothingUniformJumpskirtColorGrey
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled

2
Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml
View File

@@ -28,6 +28,6 @@
shoes: ClothingShoesColorBlack
id: BartenderPDA
ears: ClothingHeadsetService
innerclothingskirt: ClothingUniformJumpskirtBartender
innerClothingSkirt: ClothingUniformJumpskirtBartender
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled

2
Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml
View File

@@ -24,6 +24,6 @@
ears: ClothingHeadsetService
outerClothing: ClothingOuterApronBotanist
belt: ClothingBeltPlantFilled
innerclothingskirt: ClothingUniformJumpskirtHydroponics
innerClothingSkirt: ClothingUniformJumpskirtHydroponics
satchel: ClothingBackpackSatchelHydroponicsFilled
duffelbag: ClothingBackpackDuffelHydroponicsFilled

2
Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
View File

@@ -22,6 +22,6 @@
shoes: ClothingShoesColorBlack
id: ChaplainPDA
ears: ClothingHeadsetService
innerclothingskirt: ClothingUniformJumpskirtChaplain
innerClothingSkirt: ClothingUniformJumpskirtChaplain
satchel: ClothingBackpackSatchelChaplainFilled
duffelbag: ClothingBackpackDuffelChaplainFilled

2
Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
View File

@@ -29,6 +29,6 @@
id: ChefPDA
ears: ClothingHeadsetService
outerClothing: ClothingOuterApronChef
innerclothingskirt: ClothingUniformJumpskirtChef
innerClothingSkirt: ClothingUniformJumpskirtChef
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled

4
Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml
View File

@@ -24,7 +24,7 @@
id: JanitorPDA
ears: ClothingHeadsetService
belt: ClothingBeltJanitorFilled
innerclothingskirt: ClothingUniformJumpskirtJanitor
innerClothingSkirt: ClothingUniformJumpskirtJanitor
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled
@@ -37,6 +37,6 @@
head: ClothingHeadHatCatEars
ears: ClothingHeadsetService
belt: ClothingBeltJanitorFilled
innerclothingskirt: ClothingUniformJumpskirtJanimaid
innerClothingSkirt: ClothingUniformJumpskirtJanimaid
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled

4
Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
View File

@@ -24,7 +24,7 @@
ears: ClothingHeadsetSecurity
# TODO add copy of space law
inhand:
right hand: BriefcaseBrownFilled
innerclothingskirt: ClothingUniformJumpskirtLawyerBlack
- BriefcaseBrownFilled
innerClothingSkirt: ClothingUniformJumpskirtLawyerBlack
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled

2
Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
View File

@@ -20,6 +20,6 @@
ears: ClothingHeadsetService
pocket1: d10Dice
pocket2: HandLabeler # for making named bestsellers
innerclothingskirt: ClothingUniformJumpskirtLibrarian
innerClothingSkirt: ClothingUniformJumpskirtLibrarian
satchel: ClothingBackpackSatchelLibrarianFilled
duffelbag: ClothingBackpackDuffelLibrarianFilled

2
Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
View File

@@ -31,7 +31,7 @@
mask: ClothingMaskMime
id: MimePDA
ears: ClothingHeadsetService
innerclothingskirt: ClothingUniformJumpskirtMime
innerClothingSkirt: ClothingUniformJumpskirtMime
satchel: ClothingBackpackSatchelMimeFilled
duffelbag: ClothingBackpackDuffelMimeFilled

2
Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml
View File

@@ -23,6 +23,6 @@
shoes: ClothingShoesColorBlack
id: ServiceWorkerPDA
ears: ClothingHeadsetService
innerclothingskirt: ClothingUniformJumpskirtBartender
innerClothingSkirt: ClothingUniformJumpskirtBartender
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled

2
Resources/Prototypes/Roles/Jobs/Command/captain.yml
View File

@@ -44,6 +44,6 @@
outerClothing: ClothingOuterArmorCaptainCarapace
id: CaptainPDA
ears: ClothingHeadsetAltCommand
innerclothingskirt: ClothingUniformJumpskirtCaptain
innerClothingSkirt: ClothingUniformJumpskirtCaptain
satchel: ClothingBackpackSatchelCaptainFilled
duffelbag: ClothingBackpackDuffelCaptainFilled

2
Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
View File

@@ -64,6 +64,6 @@
id: HoPPDA
ears: ClothingHeadsetAltCommand
belt: BoxFolderClipboard
innerclothingskirt: ClothingUniformJumpskirtHoP
innerClothingSkirt: ClothingUniformJumpskirtHoP
satchel: ClothingBackpackSatchelHOPFilled
duffelbag: ClothingBackpackDuffelHOPFilled

2
Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
View File

@@ -26,6 +26,6 @@
id: AtmosPDA
belt: ClothingBeltUtilityEngineering
ears: ClothingHeadsetEngineering
innerclothingskirt: ClothingUniformJumpskirtAtmos
innerClothingSkirt: ClothingUniformJumpskirtAtmos
satchel: ClothingBackpackSatchelAtmosphericsFilled
duffelbag: ClothingBackpackDuffelAtmosphericsFilled

2
Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
View File

@@ -46,6 +46,6 @@
eyes: ClothingEyesGlassesMeson
ears: ClothingHeadsetCE
belt: ClothingBeltUtilityEngineering
innerclothingskirt: ClothingUniformJumpskirtChiefEngineer
innerClothingSkirt: ClothingUniformJumpskirtChiefEngineer
satchel: ClothingBackpackSatchelChiefEngineerFilled
duffelbag: ClothingBackpackDuffelChiefEngineerFilled

2
Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml
View File

@@ -33,6 +33,6 @@
eyes: ClothingEyesGlassesMeson
belt: ClothingBeltUtilityEngineering
ears: ClothingHeadsetEngineering
innerclothingskirt: ClothingUniformJumpskirtSeniorEngineer
innerClothingSkirt: ClothingUniformJumpskirtSeniorEngineer
satchel: ClothingBackpackSatchelEngineeringFilled
duffelbag: ClothingBackpackDuffelEngineeringFilled

2
Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
View File

@@ -29,6 +29,6 @@
eyes: ClothingEyesGlassesMeson
belt: ClothingBeltUtilityEngineering
ears: ClothingHeadsetEngineering
innerclothingskirt: ClothingUniformJumpskirtEngineering
innerClothingSkirt: ClothingUniformJumpskirtEngineering
satchel: ClothingBackpackSatchelEngineeringFilled
duffelbag: ClothingBackpackDuffelEngineeringFilled

2
Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
View File

@@ -27,6 +27,6 @@
id: TechnicalAssistantPDA
belt: ClothingBeltUtilityEngineering
ears: ClothingHeadsetEngineering
innerclothingskirt: ClothingUniformJumpskirtColorYellow
innerClothingSkirt: ClothingUniformJumpskirtColorYellow
satchel: ClothingBackpackSatchelEngineeringFilled
duffelbag: ClothingBackpackDuffelEngineeringFilled

4
Resources/Prototypes/Roles/Jobs/Fun/cult_startinggear.yml
View File

@@ -10,7 +10,7 @@
shoes: ClothingShoesCult
id: PassengerPDA
ears: ClothingHeadsetService
innerclothingskirt: ClothingUniformJumpskirtColorBlack
innerClothingSkirt: ClothingUniformJumpskirtColorBlack
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled
@@ -24,6 +24,6 @@
shoes: ClothingShoesColorRed
id: PassengerPDA
ears: ClothingHeadsetService
innerclothingskirt: ClothingUniformJumpskirtColorBlack
innerClothingSkirt: ClothingUniformJumpskirtColorBlack
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled

40
Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
View File

@@ -15,7 +15,7 @@
ears: ClothingHeadsetGrey
pocket1: VehicleSkeletonMotorcycle
pocket2: VehicleKeySkeletonMotorcycle
innerclothingskirt: ClothingUniformJumpskirtColorBlack
innerClothingSkirt: ClothingUniformJumpskirtColorBlack
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled
@@ -39,7 +39,7 @@
belt: EnergyKatana
suitstorage: YellowOxygenTankFilled
inhand:
left hand: JetpackBlackFilled
- JetpackBlackFilled
#Deathsquad Outfit
- type: startingGear
@@ -57,7 +57,7 @@
id: DeathsquadPDA
pocket1: EnergySword
belt: ClothingBeltChiefEngineerFilled
innerclothingskirt: ClothingUniformJumpskirtColorBlack
innerClothingSkirt: ClothingUniformJumpskirtColorBlack
satchel: ClothingBackpackDuffelSyndicateAmmo
duffelbag: ClothingBackpackDuffelSyndicateAmmo
@@ -68,7 +68,7 @@
head: ClothingHeadHatOutlawHat
jumpsuit: ClothingUniformJumpsuitOperative
mask: CigaretteSyndicate
innerclothingskirt: ClothingUniformJumpsuitOperative
innerClothingSkirt: ClothingUniformJumpsuitOperative
# Syndicate Operative Outfit - Barratry
- type: startingGear
@@ -78,7 +78,7 @@
back: ClothingBackpackDuffelSyndicateOperative
shoes: ClothingShoesBootsCombatFilled
gloves: ClothingHandsGlovesColorBlack
innerclothingskirt: ClothingUniformJumpsuitOperative
innerClothingSkirt: ClothingUniformJumpsuitOperative
satchel: ClothingBackpackDuffelSyndicateOperative
duffelbag: ClothingBackpackDuffelSyndicateOperative
@@ -93,7 +93,7 @@
shoes: ClothingShoesBootsCombatFilled
pocket1: BaseUplinkRadio40TC
id: AgentIDCard
innerclothingskirt: ClothingUniformJumpsuitOperative
innerClothingSkirt: ClothingUniformJumpsuitOperative
satchel: ClothingBackpackDuffelSyndicateOperative
duffelbag: ClothingBackpackDuffelSyndicateOperative
@@ -114,7 +114,7 @@
pocket1: DoubleEmergencyOxygenTankFilled
pocket2: BaseUplinkRadio40TC
belt: ClothingBeltMilitaryWebbing
innerclothingskirt: ClothingUniformJumpskirtOperative
innerClothingSkirt: ClothingUniformJumpskirtOperative
satchel: ClothingBackpackDuffelSyndicateOperative
duffelbag: ClothingBackpackDuffelSyndicateOperative
@@ -136,8 +136,8 @@
pocket2: BaseUplinkRadio40TC
belt: ClothingBeltMilitaryWebbing
inhand:
right hand: NukeOpsDeclarationOfWar
innerclothingskirt: ClothingUniformJumpskirtOperative
- NukeOpsDeclarationOfWar
innerClothingSkirt: ClothingUniformJumpskirtOperative
satchel: ClothingBackpackDuffelSyndicateOperative
duffelbag: ClothingBackpackDuffelSyndicateOperative
@@ -157,7 +157,7 @@
pocket1: DoubleEmergencyOxygenTankFilled
pocket2: BaseUplinkRadio40TC
belt: ClothingBeltMilitaryWebbingMedFilled
innerclothingskirt: ClothingUniformJumpskirtOperative
innerClothingSkirt: ClothingUniformJumpskirtOperative
satchel: ClothingBackpackDuffelSyndicateOperativeMedic
duffelbag: ClothingBackpackDuffelSyndicateOperativeMedic
@@ -174,7 +174,7 @@
back: ClothingBackpackFilled
shoes: ClothingShoesBootsCombat
id: SyndiPDA #a subtype of this for footsoldiers would probably be good to have
innerclothingskirt: ClothingUniformJumpsuitOperative
innerClothingSkirt: ClothingUniformJumpsuitOperative
satchel: ClothingBackpackDuffelSyndicateOperative
duffelbag: ClothingBackpackDuffelSyndicateOperative
@@ -192,7 +192,7 @@
shoes: ClothingShoesBootsCombat
pocket1: CombatKnife
id: SyndiPDA
innerclothingskirt: ClothingUniformJumpsuitOperative
innerClothingSkirt: ClothingUniformJumpsuitOperative
satchel: ClothingBackpackDuffelSyndicateOperative
duffelbag: ClothingBackpackDuffelSyndicateOperative
@@ -211,7 +211,7 @@
pocket1: EnergySword
pocket2: EnergyShield
id: SyndiPDA
innerclothingskirt: ClothingUniformJumpsuitOperative
innerClothingSkirt: ClothingUniformJumpsuitOperative
satchel: ClothingBackpackDuffelSyndicateOperative
duffelbag: ClothingBackpackDuffelSyndicateOperative
@@ -229,7 +229,7 @@
shoes: ClothingShoesBootsCombat
pocket1: WeaponPistolViper
id: SyndiPDA
innerclothingskirt: ClothingUniformJumpsuitOperative
innerClothingSkirt: ClothingUniformJumpsuitOperative
satchel: ClothingBackpackDuffelSyndicateOperative
duffelbag: ClothingBackpackDuffelSyndicateOperative
@@ -246,7 +246,7 @@
outerClothing: ClothingOuterArmorBasicSlim
ears: ClothingHeadsetSecurity
gloves: ClothingHandsGlovesCombat
innerclothingskirt: ClothingUniformJumpskirtSec
innerClothingSkirt: ClothingUniformJumpskirtSec
satchel: ClothingBackpackSatchelSecurityFilled
duffelbag: ClothingBackpackDuffelSecurityFilled
@@ -267,7 +267,7 @@
pocket2: WeaponLaserGun
suitstorage: YellowOxygenTankFilled
belt: ClothingBeltBandolier
innerclothingskirt: ClothingUniformJumpsuitColorBrown
innerClothingSkirt: ClothingUniformJumpsuitColorBrown
satchel: ClothingBackpackDuffelCBURN
duffelbag: ClothingBackpackDuffelCBURN
@@ -291,7 +291,7 @@
equipment:
jumpsuit: ClothingUniformJumpsuitColorGrey
shoes: ClothingShoesColorBlack
innerclothingskirt: ClothingUniformJumpskirtColorGrey
innerClothingSkirt: ClothingUniformJumpskirtColorGrey
# DeathMatch Gear
@@ -302,9 +302,9 @@
shoes: ClothingShoesBootsJack
ears: ClothingHeadsetGrey
gloves: ClothingHandsGlovesFingerless
innerclothingskirt: ClothingUniformJumpskirtColorWhite
innerClothingSkirt: ClothingUniformJumpskirtColorWhite
inhand:
left hand: WeaponMeleeToolboxRobust
- WeaponMeleeToolboxRobust
#Brigmedic
@@ -322,7 +322,7 @@
ears: ClothingHeadsetBrigmedic
mask: ClothingMaskBreathMedicalSecurity
belt: ClothingBeltMedicalFilled
innerclothingskirt: ClothingUniformJumpskirtBrigmedic
innerClothingSkirt: ClothingUniformJumpskirtBrigmedic
satchel: ClothingBackpackSatchelBrigmedicFilled
duffelbag: ClothingBackpackDuffelBrigmedicFilled

8
Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml
View File

@@ -9,7 +9,7 @@
shoes: ClothingShoesWizard
id: PassengerPDA
ears: ClothingHeadsetService
innerclothingskirt: ClothingUniformJumpskirtColorDarkBlue
innerClothingSkirt: ClothingUniformJumpskirtColorDarkBlue
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled
@@ -23,7 +23,7 @@
shoes: ClothingShoesWizard
id: PassengerPDA
ears: ClothingHeadsetService
innerclothingskirt: ClothingUniformJumpskirtColorRed
innerClothingSkirt: ClothingUniformJumpskirtColorRed
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled
@@ -37,7 +37,7 @@
shoes: ClothingShoesWizard
id: PassengerPDA
ears: ClothingHeadsetService
innerclothingskirt: ClothingUniformJumpskirtColorPurple
innerClothingSkirt: ClothingUniformJumpskirtColorPurple
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled
@@ -50,6 +50,6 @@
shoes: ClothingShoesWizard
id: PassengerPDA
ears: ClothingHeadsetService
innerclothingskirt: ClothingUniformJumpskirtColorPurple
innerClothingSkirt: ClothingUniformJumpskirtColorPurple
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled

2
Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
View File

@@ -27,6 +27,6 @@
belt: ChemBag
pocket1: HandLabeler
# the purple glasses?
innerclothingskirt: ClothingUniformJumpskirtChemistry
innerClothingSkirt: ClothingUniformJumpskirtChemistry
satchel: ClothingBackpackSatchelChemistryFilled
duffelbag: ClothingBackpackDuffelChemistryFilled

2
Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
View File

@@ -46,6 +46,6 @@
id: CMOPDA
ears: ClothingHeadsetCMO
belt: ClothingBeltMedicalFilled
innerclothingskirt: ClothingUniformJumpskirtCMO
innerClothingSkirt: ClothingUniformJumpskirtCMO
satchel: ClothingBackpackSatchelCMOFilled
duffelbag: ClothingBackpackDuffelCMOFilled

2
Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
View File

@@ -26,6 +26,6 @@
id: MedicalPDA
ears: ClothingHeadsetMedical
belt: ClothingBeltMedicalFilled
innerclothingskirt: ClothingUniformJumpskirtMedicalDoctor
innerClothingSkirt: ClothingUniformJumpskirtMedicalDoctor
satchel: ClothingBackpackSatchelMedicalFilled
duffelbag: ClothingBackpackDuffelMedicalFilled

2
Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
View File

@@ -25,6 +25,6 @@
id: MedicalInternPDA
ears: ClothingHeadsetMedical
belt: ClothingBeltMedicalFilled
innerclothingskirt: ClothingUniformJumpskirtColorWhite
innerClothingSkirt: ClothingUniformJumpskirtColorWhite
satchel: ClothingBackpackSatchelMedicalFilled
duffelbag: ClothingBackpackDuffelMedicalFilled

2
Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
View File

@@ -28,6 +28,6 @@
id: ParamedicPDA
ears: ClothingHeadsetMedical
belt: ClothingBeltParamedicFilled
innerclothingskirt: ClothingUniformJumpskirtParamedic
innerClothingSkirt: ClothingUniformJumpskirtParamedic
satchel: ClothingBackpackSatchelMedicalFilled
duffelbag: ClothingBackpackDuffelMedicalFilled

2
Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml
View File

@@ -31,6 +31,6 @@
id: SeniorPhysicianPDA
ears: ClothingHeadsetMedical
belt: ClothingBeltMedicalFilled
innerclothingskirt: ClothingUniformJumpskirtSeniorPhysician
innerClothingSkirt: ClothingUniformJumpskirtSeniorPhysician
satchel: ClothingBackpackSatchelMedicalFilled
duffelbag: ClothingBackpackDuffelMedicalFilled

2
Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
View File

@@ -24,6 +24,6 @@
shoes: ClothingShoesColorWhite
id: ResearchAssistantPDA
ears: ClothingHeadsetScience
innerclothingskirt: ClothingUniformJumpskirtColorWhite
innerClothingSkirt: ClothingUniformJumpskirtColorWhite
satchel: ClothingBackpackSatchelScienceFilled
duffelbag: ClothingBackpackDuffelScienceFilled

2
Resources/Prototypes/Roles/Jobs/Science/research_director.yml
View File

@@ -36,6 +36,6 @@
outerClothing: ClothingOuterCoatRnd
id: RnDPDA
ears: ClothingHeadsetRD
innerclothingskirt: ClothingUniformJumpskirtResearchDirector
innerClothingSkirt: ClothingUniformJumpskirtResearchDirector
satchel: ClothingBackpackSatchelResearchDirectorFilled
duffelbag: ClothingBackpackDuffelResearchDirectorFilled

2
Resources/Prototypes/Roles/Jobs/Science/scientist.yml
View File

@@ -23,6 +23,6 @@
outerClothing: ClothingOuterCoatRnd
id: SciencePDA
ears: ClothingHeadsetScience
innerclothingskirt: ClothingUniformJumpskirtScientist
innerClothingSkirt: ClothingUniformJumpskirtScientist
satchel: ClothingBackpackSatchelScienceFilled
duffelbag: ClothingBackpackDuffelScienceFilled

2
Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml
View File

@@ -24,6 +24,6 @@
outerClothing: ClothingOuterCoatLabSeniorResearcher
id: SeniorResearcherPDA
ears: ClothingHeadsetScience
innerclothingskirt: ClothingUniformJumpskirtSeniorResearcher
innerClothingSkirt: ClothingUniformJumpskirtSeniorResearcher
satchel: ClothingBackpackSatchelScienceFilled
duffelbag: ClothingBackpackDuffelScienceFilled

2
Resources/Prototypes/Roles/Jobs/Security/detective.yml
View File

@@ -33,6 +33,6 @@
id: DetectivePDA
ears: ClothingHeadsetSecurity
belt: ClothingBeltHolsterFilled
innerclothingskirt: ClothingUniformJumpskirtDetective
innerClothingSkirt: ClothingUniformJumpskirtDetective
satchel: ClothingBackpackSatchelSecurityFilledDetective
duffelbag: ClothingBackpackDuffelSecurityFilledDetective

2
Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
View File

@@ -52,6 +52,6 @@
ears: ClothingHeadsetAltSecurity
belt: ClothingBeltSecurityFilled
pocket1: WeaponPistolMk58Nonlethal
innerclothingskirt: ClothingUniformJumpskirtHoS
innerClothingSkirt: ClothingUniformJumpskirtHoS
satchel: ClothingBackpackSatchelHOSFilled
duffelbag: ClothingBackpackDuffelHOSFilled

2
Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
View File

@@ -32,6 +32,6 @@
id: SecurityCadetPDA
ears: ClothingHeadsetSecurity
pocket1: WeaponPistolMk58Nonlethal
innerclothingskirt: ClothingUniformJumpskirtColorRed
innerClothingSkirt: ClothingUniformJumpskirtColorRed
satchel: ClothingBackpackSatchelSecurityFilled
duffelbag: ClothingBackpackDuffelSecurityFilled

2
Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
View File

@@ -34,6 +34,6 @@
ears: ClothingHeadsetSecurity
belt: ClothingBeltSecurityFilled
pocket1: WeaponPistolMk58Nonlethal
innerclothingskirt: ClothingUniformJumpskirtSec
innerClothingSkirt: ClothingUniformJumpskirtSec
satchel: ClothingBackpackSatchelSecurityFilled
duffelbag: ClothingBackpackDuffelSecurityFilled

2
Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml
View File

@@ -43,6 +43,6 @@
ears: ClothingHeadsetSecurity
belt: ClothingBeltSecurityFilled
pocket1: WeaponPistolMk58Nonlethal
innerclothingskirt: ClothingUniformJumpskirtSeniorOfficer
innerClothingSkirt: ClothingUniformJumpskirtSeniorOfficer
satchel: ClothingBackpackSatchelSecurityFilled
duffelbag: ClothingBackpackDuffelSecurityFilled

2
Resources/Prototypes/Roles/Jobs/Security/warden.yml
View File

@@ -36,6 +36,6 @@
ears: ClothingHeadsetSecurity
belt: ClothingBeltSecurityFilled
pocket1: WeaponPistolMk58Nonlethal
innerclothingskirt: ClothingUniformJumpskirtWarden
innerClothingSkirt: ClothingUniformJumpskirtWarden
satchel: ClothingBackpackSatchelSecurityFilled
duffelbag: ClothingBackpackDuffelSecurityFilled

8
Resources/Prototypes/Roles/Jobs/Ship_VS_Ship/nanotrasen.yml
View File

@@ -13,7 +13,7 @@
gloves: ClothingHandsGlovesColorBlack
id: PassengerPDA
ears: ClothingHeadsetGrey
innerclothingskirt: ClothingUniformJumpsuitRecruitNT #Wearing a jumpskirt into combat is a little unfitting and silly, so there is no jumpskirt counterpart for any of the Ship VS. Ship suits.
innerClothingSkirt: ClothingUniformJumpsuitRecruitNT #Wearing a jumpskirt into combat is a little unfitting and silly, so there is no jumpskirt counterpart for any of the Ship VS. Ship suits.
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled
@@ -30,7 +30,7 @@
eyes: ClothingEyesGlassesMeson
belt: ClothingBeltUtilityEngineering
ears: ClothingHeadsetAltCommand #Should use the "alt" engineering headset sprite.
innerclothingskirt: ClothingUniformJumpsuitRepairmanNT
innerClothingSkirt: ClothingUniformJumpsuitRepairmanNT
satchel: ClothingBackpackSatchelEngineeringFilled
duffelbag: ClothingBackpackDuffelEngineeringFilled
@@ -46,7 +46,7 @@
eyes: ClothingEyesHudMedical
gloves: ClothingHandsGlovesLatex
belt: ClothingBeltMedicalFilled
innerclothingskirt: ClothingUniformJumpskirtMedicalDoctor
innerClothingSkirt: ClothingUniformJumpskirtMedicalDoctor
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled
@@ -64,6 +64,6 @@
eyes: ClothingEyesGlassesMeson
ears: ClothingHeadsetAltCommand #Same as repairman - make this use the alt headset sprite.
belt: ClothingBeltUtilityEngineering
innerclothingskirt: ClothingUniformJumpsuitChiefEngineerNT
innerClothingSkirt: ClothingUniformJumpsuitChiefEngineerNT
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled

8
Resources/Prototypes/Roles/Jobs/Ship_VS_Ship/syndicate.yml
View File

@@ -12,7 +12,7 @@
gloves: ClothingHandsGlovesColorBlack
id: PassengerPDA
ears: ClothingHeadsetGrey
innerclothingskirt: ClothingUniformJumpsuitRecruitSyndie #Wearing a jumpskirt into combat is a little unfitting and silly, so there is no jumpskirt counterpart for any of the Ship VS. Ship suits.
innerClothingSkirt: ClothingUniformJumpsuitRecruitSyndie #Wearing a jumpskirt into combat is a little unfitting and silly, so there is no jumpskirt counterpart for any of the Ship VS. Ship suits.
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled
@@ -29,7 +29,7 @@
eyes: ClothingEyesGlassesMeson
belt: ClothingBeltUtilityEngineering
ears: ClothingHeadsetAltCommand #Should use the "alt" engineering headset sprite.
innerclothingskirt: ClothingUniformJumpsuitRepairmanSyndie
innerClothingSkirt: ClothingUniformJumpsuitRepairmanSyndie
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled
@@ -45,7 +45,7 @@
eyes: ClothingEyesHudMedical
gloves: ClothingHandsGlovesLatex
belt: ClothingBeltMedicalFilled
innerclothingskirt: ClothingUniformJumpsuitParamedicSyndie
innerClothingSkirt: ClothingUniformJumpsuitParamedicSyndie
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled
@@ -63,6 +63,6 @@
eyes: ClothingEyesGlassesMeson
ears: ClothingHeadsetAltCommand
belt: ClothingBeltUtilityEngineering
innerclothingskirt: ClothingUniformJumpsuitChiefEngineerSyndie
innerClothingSkirt: ClothingUniformJumpsuitChiefEngineerSyndie
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled

2
Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml
View File

@@ -20,6 +20,6 @@
gloves: ClothingHandsGlovesBoxingRed
shoes: ClothingShoesColorRed
belt: ClothingBeltChampion
innerclothingskirt: UniformShortsRedWithTop
innerClothingSkirt: UniformShortsRedWithTop
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled

2
Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
View File

@@ -20,6 +20,6 @@
shoes: ClothingShoesLeather
id: PsychologistPDA
ears: ClothingHeadsetMedical
innerclothingskirt: ClothingUniformJumpsuitPsychologist
innerClothingSkirt: ClothingUniformJumpsuitPsychologist
satchel: ClothingBackpackSatchelMedicalFilled
duffelbag: ClothingBackpackDuffelMedicalFilled

2
Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml
View File

@@ -18,6 +18,6 @@
shoes: ClothingShoesColorWhite
id: ReporterPDA
ears: ClothingHeadsetService
innerclothingskirt: ClothingUniformJumpsuitJournalist
innerClothingSkirt: ClothingUniformJumpsuitJournalist
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled

2
Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml
View File

@@ -19,6 +19,6 @@
shoes: ClothingShoesColorWhite
id: ZookeeperPDA
ears: ClothingHeadsetService
innerclothingskirt: ClothingUniformJumpsuitSafari
innerClothingSkirt: ClothingUniformJumpsuitSafari
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled