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 handsSystem = entityManager.System<HandsSystem>();
var coords = entityManager.GetComponent<TransformComponent>(target).Coordinates; 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); 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 Content.Shared.Preferences;
using Robust.Shared.Prototypes; 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 namespace Content.Shared.Roles
{ {
[Prototype("startingGear")] [Prototype("startingGear")]
public sealed class StartingGearPrototype : IPrototype public sealed class StartingGearPrototype : IPrototype
{ {
[DataField("equipment", customTypeSerializer: typeof(PrototypeIdValueDictionarySerializer<string, EntityPrototype>))] [DataField]
private Dictionary<string, string> _equipment = new(); public Dictionary<string, EntProtoId> Equipment = new();
/// <summary> /// <summary>
/// if empty, there is no skirt override - instead the uniform provided in equipment is added. /// if empty, there is no skirt override - instead the uniform provided in equipment is added.
/// </summary> /// </summary>
[DataField("innerclothingskirt", customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))] [DataField]
private string? _innerClothingSkirt; public EntProtoId? InnerClothingSkirt;
[DataField("satchel", customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))] [DataField]
private string? _satchel; public EntProtoId? Satchel;
[DataField("duffelbag", customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))] [DataField]
private string? _duffelbag; public EntProtoId? Duffelbag;
public IReadOnlyDictionary<string, string> Inhand => _inHand; [DataField]
/// <summary> public List<EntProtoId> Inhand = new(0);
/// hand index, item prototype
/// </summary>
[DataField("inhand")]
private Dictionary<string, string> _inHand = new(0);
[ViewVariables] [ViewVariables]
[IdDataField] [IdDataField]
@@ -38,15 +32,15 @@ namespace Content.Shared.Roles
{ {
if (profile != null) if (profile != null)
{ {
if (slot == "jumpsuit" && profile.Clothing == ClothingPreference.Jumpskirt && !string.IsNullOrEmpty(_innerClothingSkirt)) if (slot == "jumpsuit" && profile.Clothing == ClothingPreference.Jumpskirt && !string.IsNullOrEmpty(InnerClothingSkirt))
return _innerClothingSkirt; return InnerClothingSkirt;
if (slot == "back" && profile.Backpack == BackpackPreference.Satchel && !string.IsNullOrEmpty(_satchel)) if (slot == "back" && profile.Backpack == BackpackPreference.Satchel && !string.IsNullOrEmpty(Satchel))
return _satchel; return Satchel;
if (slot == "back" && profile.Backpack == BackpackPreference.Duffelbag && !string.IsNullOrEmpty(_duffelbag)) if (slot == "back" && profile.Backpack == BackpackPreference.Duffelbag && !string.IsNullOrEmpty(Duffelbag))
return _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 inhand = startingGear.Inhand;
var coords = EntityManager.GetComponent<TransformComponent>(entity).Coordinates; var coords = EntityManager.GetComponent<TransformComponent>(entity).Coordinates;
foreach (var (hand, prototype) in inhand) foreach (var prototype in inhand)
{ {
var inhandEntity = EntityManager.SpawnEntity(prototype, coords); 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 id: PassengerPDA
belt: ClothingBeltUtility belt: ClothingBeltUtility
pocket1: AppraisalTool pocket1: AppraisalTool
innerclothingskirt: ClothingUniformJumpsuitPirate innerClothingSkirt: ClothingUniformJumpsuitPirate
satchel: ClothingBackpackPirateFilled satchel: ClothingBackpackPirateFilled
duffelbag: ClothingBackpackPirateFilled duffelbag: ClothingBackpackPirateFilled
@@ -24,7 +24,7 @@
pocket1: AppraisalTool pocket1: AppraisalTool
pocket2: EnergyCutlass pocket2: EnergyCutlass
outerClothing: ClothingOuterCoatPirate outerClothing: ClothingOuterCoatPirate
innerclothingskirt: ClothingUniformJumpskirtColorLightBrown innerClothingSkirt: ClothingUniformJumpskirtColorLightBrown
satchel: ClothingBackpackPirateFilled satchel: ClothingBackpackPirateFilled
duffelbag: ClothingBackpackPirateFilled duffelbag: ClothingBackpackPirateFilled
@@ -39,6 +39,6 @@
belt: ClothingBeltUtility belt: ClothingBeltUtility
pocket1: AppraisalTool pocket1: AppraisalTool
outerClothing: ClothingOuterCoatGentle outerClothing: ClothingOuterCoatGentle
innerclothingskirt: ClothingUniformJumpsuitPirate innerClothingSkirt: ClothingUniformJumpsuitPirate
satchel: ClothingBackpackPirateFilled satchel: ClothingBackpackPirateFilled
duffelbag: ClothingBackpackPirateFilled duffelbag: ClothingBackpackPirateFilled

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -13,7 +13,7 @@
gloves: ClothingHandsGlovesColorBlack gloves: ClothingHandsGlovesColorBlack
id: PassengerPDA id: PassengerPDA
ears: ClothingHeadsetGrey 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 satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled duffelbag: ClothingBackpackDuffelFilled
@@ -30,7 +30,7 @@
eyes: ClothingEyesGlassesMeson eyes: ClothingEyesGlassesMeson
belt: ClothingBeltUtilityEngineering belt: ClothingBeltUtilityEngineering
ears: ClothingHeadsetAltCommand #Should use the "alt" engineering headset sprite. ears: ClothingHeadsetAltCommand #Should use the "alt" engineering headset sprite.
innerclothingskirt: ClothingUniformJumpsuitRepairmanNT innerClothingSkirt: ClothingUniformJumpsuitRepairmanNT
satchel: ClothingBackpackSatchelEngineeringFilled satchel: ClothingBackpackSatchelEngineeringFilled
duffelbag: ClothingBackpackDuffelEngineeringFilled duffelbag: ClothingBackpackDuffelEngineeringFilled
@@ -46,7 +46,7 @@
eyes: ClothingEyesHudMedical eyes: ClothingEyesHudMedical
gloves: ClothingHandsGlovesLatex gloves: ClothingHandsGlovesLatex
belt: ClothingBeltMedicalFilled belt: ClothingBeltMedicalFilled
innerclothingskirt: ClothingUniformJumpskirtMedicalDoctor innerClothingSkirt: ClothingUniformJumpskirtMedicalDoctor
satchel: ClothingBackpackSatchelFilled satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled duffelbag: ClothingBackpackDuffelFilled
@@ -58,12 +58,12 @@
head: ClothingHeadHatHardhatArmored head: ClothingHeadHatHardhatArmored
jumpsuit: ClothingUniformJumpsuitChiefEngineerNT jumpsuit: ClothingUniformJumpsuitChiefEngineerNT
back: ClothingBackpackFilled #Again, the regular sprite here looks way worse than the regular backpack. back: ClothingBackpackFilled #Again, the regular sprite here looks way worse than the regular backpack.
shoes: ClothingShoesBootsJack shoes: ClothingShoesBootsJack
gloves: ClothingHandsGlovesCombat gloves: ClothingHandsGlovesCombat
id: CEPDA id: CEPDA
eyes: ClothingEyesGlassesMeson eyes: ClothingEyesGlassesMeson
ears: ClothingHeadsetAltCommand #Same as repairman - make this use the alt headset sprite. ears: ClothingHeadsetAltCommand #Same as repairman - make this use the alt headset sprite.
belt: ClothingBeltUtilityEngineering belt: ClothingBeltUtilityEngineering
innerclothingskirt: ClothingUniformJumpsuitChiefEngineerNT innerClothingSkirt: ClothingUniformJumpsuitChiefEngineerNT
satchel: ClothingBackpackSatchelFilled satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled duffelbag: ClothingBackpackDuffelFilled

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

@@ -12,7 +12,7 @@
gloves: ClothingHandsGlovesColorBlack gloves: ClothingHandsGlovesColorBlack
id: PassengerPDA id: PassengerPDA
ears: ClothingHeadsetGrey 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 satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled duffelbag: ClothingBackpackDuffelFilled
@@ -29,7 +29,7 @@
eyes: ClothingEyesGlassesMeson eyes: ClothingEyesGlassesMeson
belt: ClothingBeltUtilityEngineering belt: ClothingBeltUtilityEngineering
ears: ClothingHeadsetAltCommand #Should use the "alt" engineering headset sprite. ears: ClothingHeadsetAltCommand #Should use the "alt" engineering headset sprite.
innerclothingskirt: ClothingUniformJumpsuitRepairmanSyndie innerClothingSkirt: ClothingUniformJumpsuitRepairmanSyndie
satchel: ClothingBackpackSatchelFilled satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled duffelbag: ClothingBackpackDuffelFilled
@@ -45,7 +45,7 @@
eyes: ClothingEyesHudMedical eyes: ClothingEyesHudMedical
gloves: ClothingHandsGlovesLatex gloves: ClothingHandsGlovesLatex
belt: ClothingBeltMedicalFilled belt: ClothingBeltMedicalFilled
innerclothingskirt: ClothingUniformJumpsuitParamedicSyndie innerClothingSkirt: ClothingUniformJumpsuitParamedicSyndie
satchel: ClothingBackpackSatchelFilled satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled duffelbag: ClothingBackpackDuffelFilled
@@ -57,12 +57,12 @@
head: ClothingHeadHatHardhatArmored head: ClothingHeadHatHardhatArmored
jumpsuit: ClothingUniformJumpsuitChiefEngineerSyndie jumpsuit: ClothingUniformJumpsuitChiefEngineerSyndie
back: ClothingBackpackFilled #In a running theme, the default station job backpack still continues to look strange in comparison to the regular one. It's not as bad as on the syndicate engineer here, though. back: ClothingBackpackFilled #In a running theme, the default station job backpack still continues to look strange in comparison to the regular one. It's not as bad as on the syndicate engineer here, though.
shoes: ClothingShoesBootsJack shoes: ClothingShoesBootsJack
gloves: ClothingHandsGlovesCombat gloves: ClothingHandsGlovesCombat
id: CEPDA id: CEPDA
eyes: ClothingEyesGlassesMeson eyes: ClothingEyesGlassesMeson
ears: ClothingHeadsetAltCommand ears: ClothingHeadsetAltCommand
belt: ClothingBeltUtilityEngineering belt: ClothingBeltUtilityEngineering
innerclothingskirt: ClothingUniformJumpsuitChiefEngineerSyndie innerClothingSkirt: ClothingUniformJumpsuitChiefEngineerSyndie
satchel: ClothingBackpackSatchelFilled satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled duffelbag: ClothingBackpackDuffelFilled

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

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

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

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

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

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

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

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