diff --git a/Content.Client/Buckle/BuckleSystem.cs b/Content.Client/Buckle/BuckleSystem.cs index 33a47afdfab..e87a288135e 100644 --- a/Content.Client/Buckle/BuckleSystem.cs +++ b/Content.Client/Buckle/BuckleSystem.cs @@ -5,6 +5,8 @@ using Robust.Client.GameObjects; using Robust.Client.Player; using Robust.Shared.GameStates; +using Robust.Shared.Timing; + namespace Content.Client.Buckle; @@ -12,6 +14,8 @@ internal sealed class BuckleSystem : SharedBuckleSystem { [Dependency] private readonly RotationVisualizerSystem _rotationVisualizerSystem = default!; [Dependency] private readonly IPlayerManager _player = default!; // Floof + [Dependency] private readonly IGameTiming _timing = default!; // Floof + [Dependency] private readonly SharedTransformSystem _xform = default!; // Floof public override void Initialize() { @@ -87,6 +91,10 @@ private void UpdateBucklesDrawDepth(EntityUid uid, StrapComponent component) { if (!TryComp(uid, out var strapSprite)) return; + // Floof - man, fuck prediction. + if (!_timing.IsFirstTimePredicted) + return; + var isNorth = GetEntityOrientation(uid) == Direction.North; // Floof - replaced with a method call foreach (var buckledEntity in component.BuckledEntities) { @@ -124,9 +132,15 @@ private void OnAppearanceChange(EntityUid uid, BuckleComponent component, ref Ap // Floof section - method for getting the direction of an entity perceived by the local player private Direction GetEntityOrientation(EntityUid uid) { - var ownRotation = Transform(uid).LocalRotation; + var xform = Transform(uid); + var ownRotation = xform.LocalRotation; var eyeRotation = - TryComp(_player.LocalEntity, out var eye) ? eye.Rotation : Angle.Zero; + TryComp(_player.LocalEntity, out var eye) ? eye.Eye.Rotation : Angle.Zero; + + // This is TOTALLY dumb, but the eye stores camera rotation relative to the WORLD, so we need to convert it to local rotation as well + // Cameras are also relative to grids (NOT direct parents), so we cannot just GetWorldRotation of the entity or something similar. + if (xform.GridUid is { Valid: true } grid) + eyeRotation += _xform.GetWorldRotation(grid); // Note: we subtract instead of adding because e.g. rotating an eye +90° visually rotates all entities in vision by -90° return (ownRotation + eyeRotation).GetCardinalDir(); diff --git a/Content.Server/FloofStation/VoreSystem.cs b/Content.Server/FloofStation/VoreSystem.cs index 86fc7cf2417..b1fbd53ff4a 100644 --- a/Content.Server/FloofStation/VoreSystem.cs +++ b/Content.Server/FloofStation/VoreSystem.cs @@ -36,7 +36,6 @@ using Content.Server.Nutrition.EntitySystems; using Content.Shared.Interaction.Events; using Content.Shared.Hands.EntitySystems; -using Robust.Shared.Player; namespace Content.Server.FloofStation; @@ -95,8 +94,11 @@ private void DevourVerb(EntityUid uid, VoreComponent component, GetVerbsEvent(args.Target) - || !_consent.HasConsent(args.User, "VorePred") + || !TryComp(args.User, out var voreuser) + || !voreuser.CanVore + || !TryComp(args.Target, out var voretarget) + || !voretarget.CanBeVored + || !_consent.HasConsent(args.User, "Vore") || !_consent.HasConsent(args.Target, "Vore")) return; @@ -116,14 +118,17 @@ private void InsertSelfVerb(EntityUid uid, GetVerbsEvent args) if (!args.CanInteract || !args.CanAccess || args.User == args.Target - || !TryComp(args.Target, out var component) - || !_consent.HasConsent(args.Target, "VorePred") + || !TryComp(args.User, out var voreuser) + || !voreuser.CanBeVored + || !TryComp(args.Target, out var voretarget) + || !voretarget.CanVore + || !_consent.HasConsent(args.Target, "Vore") || !_consent.HasConsent(args.User, "Vore")) return; InnateVerb verbInsert = new() { - Act = () => TryDevour(args.Target, args.User, component), + Act = () => TryDevour(args.Target, args.User, voretarget), Text = Loc.GetString("action-name-insert-self"), Category = VerbCategory.Interaction, Icon = new SpriteSpecifier.Rsi(new ResPath("Interface/Actions/devour.rsi"), "icon"), @@ -421,6 +426,9 @@ private void FullyDigest(EntityUid uid, EntityUid prey) private void OnExamine(EntityUid uid, ExaminedEvent args) { + if (!_consent.HasConsent(args.Examiner, "Vore")) + return; + if (!_containerSystem.TryGetContainer(uid, "stomach", out var stomach) || stomach.ContainedEntities.Count < 1) return; diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Body.cs b/Content.Shared/Body/Systems/SharedBodySystem.Body.cs index a56504b5f0d..ce753963809 100644 --- a/Content.Shared/Body/Systems/SharedBodySystem.Body.cs +++ b/Content.Shared/Body/Systems/SharedBodySystem.Body.cs @@ -140,6 +140,10 @@ private void OnBodyCanDrag(Entity ent, ref CanDragEvent args) private void OnStandAttempt(Entity ent, ref StandAttemptEvent args) { + // Floof - why did you not check for this??? + if (ent.Comp.RequiredLegs <= 0) + return; + if (ent.Comp.LegEntities.Count == 0) args.Cancel(); } diff --git a/Content.Shared/Floofstation/VoreComponent.cs b/Content.Shared/Floofstation/VoreComponent.cs index 160f489ebd6..b40fd0936b7 100644 --- a/Content.Shared/Floofstation/VoreComponent.cs +++ b/Content.Shared/Floofstation/VoreComponent.cs @@ -8,6 +8,12 @@ namespace Content.Shared.FloofStation; [RegisterComponent] public sealed partial class VoreComponent : Component { + [DataField] + public bool CanVore = false; + + [DataField] + public bool CanBeVored = true; + [DataField] public float Delay = 5f; diff --git a/Content.Shared/Standing/SharedLayingDownSystem.cs b/Content.Shared/Standing/SharedLayingDownSystem.cs index 6aa004f589a..7e3d185895b 100644 --- a/Content.Shared/Standing/SharedLayingDownSystem.cs +++ b/Content.Shared/Standing/SharedLayingDownSystem.cs @@ -145,8 +145,8 @@ public bool TryStandUp(EntityUid uid, LayingDownComponent? layingDown = null, St || standingState.CurrentState is not StandingState.Lying || !_mobState.IsAlive(uid) || TerminatingOrDeleted(uid) - || !TryComp(uid, out var body) - || body.LegEntities.Count == 0 + // || !TryComp(uid, out var body) + // || body.LegEntities.Count == 0 // Floof - whoever wrote this, I hate you. || !_actionBlocker.CanConsciouslyPerformAction(uid)) // Floof - check for consciousness instead of a no-brain DeBrainedComponent check (pun intended) return false; diff --git a/Resources/Changelog/Floof.yml b/Resources/Changelog/Floof.yml index 07f0530771f..bfe45f3ffb5 100644 --- a/Resources/Changelog/Floof.yml +++ b/Resources/Changelog/Floof.yml @@ -2447,3 +2447,103 @@ Entries: id: 305 time: '2025-01-24T17:45:56.0000000+00:00' url: https://github.com/Fansana/floofstation1/pull/501 +- author: Mnemotechnician + changes: + - type: Fix + message: >- + Borgs can stand up after falling again, and buckle layering should no + longer break when the grid you are standing on is incorrectly oriented. + id: 306 + time: '2025-02-09T13:11:46.0000000+00:00' + url: https://github.com/Fansana/floofstation1/pull/541 +- author: VividPups + changes: + - type: Add + message: >- + Added some standard engineering, logistics, and security outfits to the + loadouts, as well as the security longcoat. + id: 307 + time: '2025-02-09T13:12:00.0000000+00:00' + url: https://github.com/Fansana/floofstation1/pull/540 +- author: Forzii + changes: + - type: Tweak + message: Logistics can now buy plushie crates + id: 308 + time: '2025-02-09T17:18:37.0000000+00:00' + url: https://github.com/Fansana/floofstation1/pull/533 +- author: Mnemotechnician + changes: + - type: Fix + message: Submarine is back to the map pool. + id: 309 + time: '2025-02-09T17:18:54.0000000+00:00' + url: https://github.com/Fansana/floofstation1/pull/536 +- author: Eagle0600 + changes: + - type: Add + message: Missing Logistics Officer items to loadout. + - type: Add + message: Chief Medical Officer longcoat loadout. + - type: Add + message: Paramedic cap, wind breaker, and winter boots loadout. + - type: Add + message: Various mask loadouts. + - type: Add + message: Corpsman arm warmers, thong, and thigh high socks. + - type: Tweak + message: >- + Reduced the cost of departmental arm warmers, thongs, and thigh high + socks to 0. + id: 310 + time: '2025-02-10T15:35:22.0000000+00:00' + url: https://github.com/Fansana/floofstation1/pull/543 +- author: VividPups + changes: + - type: Add + message: General Surgeon + id: 311 + time: '2025-02-14T22:32:52.0000000+00:00' + url: https://github.com/Fansana/floofstation1/pull/516 +- author: sowelipililimute + changes: + - type: Add + message: Sticky notes exist, and can be found in the bureaucracy crate + - type: Add + message: Bureaucracy crate has more and more varied folders + - type: Add + message: >- + Papermoon white and dyed paper reams are now available to spice up your + paperwork in the Bureaucracy crate + - type: Tweak + message: >- + Loose papers in the bureaucracy crate have been replaced with a ream of + white paper + id: 312 + time: '2025-02-14T22:33:31.0000000+00:00' + url: https://github.com/Fansana/floofstation1/pull/556 +- author: VividPups + changes: + - type: Add + message: Added the Handheld radio to the autolathe. + id: 313 + time: '2025-02-15T19:06:40.0000000+00:00' + url: https://github.com/Fansana/floofstation1/pull/554 +- author: FoxxoTrystan + changes: + - type: Tweak + message: Vore features are now hidden if the vore option is toggled off. + - type: Tweak + message: Merged Vore Prey / Pred into one consent option. + id: 314 + time: '2025-02-15T19:36:40.0000000+00:00' + url: https://github.com/Fansana/floofstation1/pull/544 +- author: Crow + changes: + - type: Fix + message: fixed localization bug relating to senior roles. + - type: Fix + message: moved senior cosmetics to job/[department]/all tab + id: 315 + time: '2025-02-15T19:43:10.0000000+00:00' + url: https://github.com/Fansana/floofstation1/pull/549 diff --git a/Resources/Locale/en-US/Blep/consent.ftl b/Resources/Locale/en-US/Blep/consent.ftl index 18369494a2c..72b3f60f89d 100644 --- a/Resources/Locale/en-US/Blep/consent.ftl +++ b/Resources/Locale/en-US/Blep/consent.ftl @@ -18,11 +18,8 @@ consent-examine-verb = Consent Info consent-examine-not-set = This player has no consent preferences set. Ask for consent first before engaging in any erotic roleplay. # Consent toggles -consent-Vore-name = Vore Prey -consent-Vore-desc = Allow yourself to be devoured by anyone... or anything. - -consent-VorePred-name = Vore Pred -consent-VorePred-desc = Allow to devoured critters... or anyone that has the consent option 'vore' enabled. +consent-Vore-name = Vore +consent-Vore-desc = Allow yourself to be predator or prey. consent-Digestion-name = Digestion consent-Digestion-desc = Allow yourself to be digested. WARNING: BEING DIGESTED WILL ROUND-REMOVE YOU. diff --git a/Resources/Locale/en-US/Floof/paper/stamp-componet.ftl b/Resources/Locale/en-US/Floof/paper/stamp-componet.ftl new file mode 100644 index 00000000000..833ac3f7559 --- /dev/null +++ b/Resources/Locale/en-US/Floof/paper/stamp-componet.ftl @@ -0,0 +1 @@ +stamp-component-stamped-name-surgeon-general = Surgeon General diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl index 60ab9b05433..ffe5049260d 100644 --- a/Resources/Locale/en-US/job/job-names.ftl +++ b/Resources/Locale/en-US/job/job-names.ftl @@ -4,6 +4,7 @@ job-name-cadet = Security Cadet job-name-hos = Head of Security job-name-detective = Detective job-name-brigmedic = Corpsman +job-name-senior-officer = Senior Officer job-name-borg = Cyborg job-name-senior-researcher = Mystic job-name-scientist = Acolyte @@ -16,9 +17,11 @@ job-name-doctor = Medical Doctor job-name-paramedic = Paramedic job-name-cmo = Chief Medical Officer job-name-chemist = Chemist +job-name-senior-physician = Senior Physician job-name-technical-assistant = Technical Assistant job-name-engineer = Station Engineer job-name-atmostech = Atmospheric Technician +job-name-senior-engineer = Senior Engineer job-name-hop = Head of Personnel job-name-captain = Captain job-name-serviceworker = Service Worker diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml index 869a28fc5d6..c3e16ceac7f 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml @@ -68,7 +68,7 @@ id: CrateFunPlushie parent: CrateGenericSteel name: plushie crate - description: A buncha soft plushies. Throw them around and then wonder how you're gonna explain this purchase to NT. + description: A bunch of older plushies from another sector, you'll have to look elsewhere for the newer models. Throw them around and then wonder how you're gonna explain this purchase to NT. # Description modified for Floofstation - though we could always update the plushie table... components: - type: EntityTableContainerFill containers: diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml index 35e66ac4d35..29e54b17701 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml @@ -117,17 +117,40 @@ components: - type: StorageFill contents: - - id: Paper - amount: 15 + # DeltaV - replace the paper in the bureaucracy crate with a ream + - id: BoxReamWhite + # - id: Paper + # amount: 15 - id: Pen amount: 2 - id: BoxFolderClipboard amount: 2 - id: HandLabeler - id: BoxFolderBlue + amount: 2 # DeltaV - more folders in the bureacracy crate - id: BoxFolderRed + amount: 2 # DeltaV - more folders in the bureacracy crate - id: BoxFolderYellow + amount: 2 # DeltaV - more folders in the bureacracy crate + # Begin DeltaV: sticky notes + - id: PaperStickyNoteStackFilled + - id: PaperStickyNoteStackFilledPink + - id: PaperStickyNoteStackFilledGreen + - id: PaperStickyNoteStackFilledBlue + # End DeltaV: sticky notes - id: NewtonCradle + #- id: BoxEnvelope Floof - Removed until envelopes are added. + - id: BrbSign + # Start DeltaV - More folders & colored paper reams in the bureaucracy crate + - id: BoxFolderBlack + amount: 2 + - id: BoxFolderGrey + amount: 2 + - id: BoxFolderGreen + amount: 2 + - id: BoxReamClassic + - id: BoxReamBright + # End DeltaV - More folders & colored paper reams in the bureaucracy crate - type: entity id: CrateServicePersonnel diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/commandUncategorized.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/commandUncategorized.yml index c20e6dd322d..46306250b70 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Command/commandUncategorized.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Command/commandUncategorized.yml @@ -32,10 +32,12 @@ - type: loadout id: LoadoutCommandFlash -#- type: characterItemGroup -# id: LoadoutCommandEyes -# maxItems: 1 -# items: +- type: characterItemGroup + id: LoadoutCommandEyes + maxItems: 1 + items: + - type: loadout + id: LoadoutCommandEyesCommand #- type: characterItemGroup # id: LoadoutCommandGloves diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/atmosphericTechnician.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/atmosphericTechnician.yml index 27890a2827d..3aed27fa869 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/atmosphericTechnician.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/atmosphericTechnician.yml @@ -92,3 +92,5 @@ id: LoadingEngineeringAtmosUniformSuit - type: loadout id: LoadingEngineeringAtmosUniformSkirt + - type: loadout + id: LoadoutEngineeringClothingUniformJumpsuitAtmosCasual diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/engineeringUncategorized.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/uncategorized.yml similarity index 93% rename from Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/engineeringUncategorized.yml rename to Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/uncategorized.yml index efc045928e0..24030ebdd2a 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/engineeringUncategorized.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Engineering/uncategorized.yml @@ -93,3 +93,7 @@ id: LoadoutEngineeringUniformSkirt - type: loadout id: LoadoutEngineeringUniformHazard + - type: loadout + id: LoadoutEngineeringUniformJumpsuitSenior + - type: loadout + id: LoadoutEngineeringUniformJumpskirtSenior diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/uncategorized.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/uncategorized.yml index cc49ed1dc97..f6c02da208e 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/uncategorized.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Epistemics/uncategorized.yml @@ -87,6 +87,8 @@ id: LoadoutScienceOuterExplorerLabcoat - type: loadout id: LoadoutOuterRobeTechPriest + - type: loadout + id: LoadoutScienceOuterLabcoatSeniorResearcher - type: characterItemGroup id: LoadoutEpistemicsShoes @@ -94,7 +96,11 @@ - type: loadout id: LoadoutScienceShoesBootsWinterSci -#- type: characterItemGroup -# id: LoadoutEpistemicsUniforms -# maxItems: 1 -# items: +- type: characterItemGroup + id: LoadoutEpistemicsUniforms + maxItems: 1 + items: + - type: loadout + id: LoadoutScienceUniformJumpsuitSenior + - type: loadout + id: LoadoutScienceUniformJumpskirtSenior diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/logisticsOfficer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/logisticsOfficer.yml index 230fd830363..1f4706051b1 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/logisticsOfficer.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/logisticsOfficer.yml @@ -23,16 +23,20 @@ # id: LoadoutLogisticsOfficerEyes # maxItems: 1 # items: -# -#- type: characterItemGroup -# id: LoadoutLogisticsOfficerGloves -# maxItems: 1 -# items: -# + +- type: characterItemGroup + id: LoadoutLogisticsOfficerGloves + maxItems: 1 + items: + - type: loadout + id: LoadoutCommandQMGlovesBrown + - type: characterItemGroup id: LoadoutLogisticsOfficerHead maxItems: 1 items: + - type: loadout + id: LoadoutCommandQMHeadBeret - type: loadout id: LoadoutCommandQMHeadSoft @@ -49,17 +53,23 @@ items: - type: loadout id: LoadoutCommandQMNeckCloak + - type: loadout + id: LoadoutCommandQMNeckMantle #- type: characterItemGroup # id: LoadoutLogisticsOfficerMask # maxItems: 1 # items: -# -#- type: characterItemGroup -# id: LoadoutLogisticsOfficerOuter -# maxItems: 1 -# items: -# + +- type: characterItemGroup + id: LoadoutLogisticsOfficerOuter + maxItems: 1 + items: + - type: loadout + id: LoadoutCommandQMOuterLongcoat + - type: loadout + id: LoadoutCommandQMOuterWinter + - type: characterItemGroup id: LoadoutLogisticsOfficerShoes maxItems: 1 @@ -75,3 +85,5 @@ id: LoadoutCommandQMUniformTurtleneck - type: loadout id: LoadoutCommandQMUniformTurtleneckSkirt + - type: loadout + id: LoadoutCommandQMUniformFormal diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/chiefMedicalOfficer.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/chiefMedicalOfficer.yml index 6e9bd02b4f6..7064b802d55 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/chiefMedicalOfficer.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/chiefMedicalOfficer.yml @@ -67,6 +67,8 @@ id: LoadoutChiefMedicalOfficerOuter maxItems: 1 items: + - type: loadout + id: LoadoutCommandCMOOuterLongcoat - type: loadout id: LoadoutCommandCMOOuterWinter - type: loadout diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/paramedic.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/paramedic.yml index 7abd4c242fb..dab6d7b8eb6 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/paramedic.yml @@ -28,12 +28,14 @@ # id: LoadoutParamedicGloves # maxItems: 1 # items: -# -#- type: characterItemGroup -# id: LoadoutParamedicHead -# maxItems: 1 -# items: -# + +- type: characterItemGroup + id: LoadoutParamedicHead + maxItems: 1 + items: + - type: loadout + id: LoadoutMedicalHeadParamedicSoft + #- type: characterItemGroup # id: LoadoutParamedicId # maxItems: 1 @@ -48,17 +50,21 @@ # id: LoadoutParamedicMask # maxItems: 1 # items: -# -#- type: characterItemGroup -# id: LoadoutParamedicOuter -# maxItems: 1 -# items: -# -#- type: characterItemGroup -# id: LoadoutParamedicShoes -# maxItems: 1 -# items: -# + +- type: characterItemGroup + id: LoadoutParamedicOuter + maxItems: 1 + items: + - type: loadout + id: LoadoutMedicalOuterParamedicWB + +- type: characterItemGroup + id: LoadoutParamedicShoes + maxItems: 1 + items: + - type: loadout + id: LoadoutMedicalShoesParamedicWinter + - type: characterItemGroup id: LoadoutParamedicUniforms maxItems: 1 diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/uncategorized.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/uncategorized.yml index 02d9dbda3bc..cd5dc053a40 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/uncategorized.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Medical/uncategorized.yml @@ -79,6 +79,8 @@ id: LoadoutMedicalHeadSurgcapWhite - type: loadout id: LoadoutMedicalHeadSurgcapCybersun + - type: loadout + id: LoadoutMedicalHeadBeretSeniorPhysician #- type: characterItemGroup # id: LoadoutMedicalId @@ -94,11 +96,15 @@ - type: loadout id: LoadoutMedicalBedsheetMedical -#- type: characterItemGroup -# id: LoadoutMedicalMask -# maxItems: 1 -# items: -# +- type: characterItemGroup + id: LoadoutMedicalMask + maxItems: 1 + items: + - type: loadout + id: LoadoutMedicalMaskSterile + - type: loadout + id: LoadoutMedicalMaskBreathMedical + - type: characterItemGroup id: LoadoutMedicalOuter maxItems: 1 @@ -131,3 +137,7 @@ id: LoadoutMedicalUniformScrubsPink - type: loadout id: LoadoutMedicalUniformScrubsCybersun + - type: loadout + id: LoadoutMedicalUniformJumpskirtSenior + - type: loadout + id: LoadoutMedicalUniformJumpsuitSenior diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/corpsman.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/corpsman.yml index d2a1f1381d7..fcc73b7a467 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/corpsman.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/corpsman.yml @@ -60,11 +60,13 @@ - type: loadout id: LoadoutBedsheetBrigmedic -#- type: characterItemGroup -# id: LoadoutCorpsmanMask -# maxItems: 1 -# items: -# +- type: characterItemGroup + id: LoadoutCorpsmanMask + maxItems: 1 + items: + - type: loadout + id: LoadoutMaskCorpsmanBreathMedicalSecurity + #- type: characterItemGroup # id: LoadoutCorpsmanOuter # maxItems: 1 diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/uncategorized.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/uncategorized.yml index 9cac5c34226..2f36b5e1620 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/uncategorized.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/uncategorized.yml @@ -163,6 +163,8 @@ items: - type: loadout id: LoadoutSecurityMaskGasSwat + - type: loadout + id: LoadoutSecurityMaskGasSecurity - type: characterItemGroup id: LoadoutSecurityOuter @@ -202,3 +204,7 @@ id: LoadoutUniformJumpsuitSecFormal - type: loadout id: LoadoutUniformJumpsuitSecSummer + - type: loadout + id: LoadoutSecurityUniformJumpskirtSenior + - type: loadout + id: LoadoutSecurityUniformJumpsuitSenior diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml index b44dd1a52d8..bd8d79d3fdc 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml @@ -229,6 +229,8 @@ - RobotTalk - type: PsionicInsulation - type: Vore # Floofstation - Vore + canVore: true + canBeVored: false - type: entity abstract: true diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 22d9dd04c10..0116b3af180 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -1563,6 +1563,7 @@ id: MobMouse description: Squeak! components: + - type: Vore - type: Body prototype: Mouse - type: GhostRole diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml index 212b88df544..853b0b61d23 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml @@ -82,6 +82,7 @@ interactFailureSound: path: /Audio/Effects/bite.ogg - type: Vore # Floofstation - Vore + canVore: true - type: Body # Shitmed - Adds carp organs. prototype: Carp - type: SurgeryTarget diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml index 5fd6a151853..b99b100a115 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml @@ -143,6 +143,8 @@ understands: - Xeno - type: Vore # Floofstation - Vore + canVore: true + canBeVored: false - type: entity name: Praetorian diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon_base.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon_base.yml index cbda72500f7..5103de6267b 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/silicon_base.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/silicon_base.yml @@ -5,6 +5,7 @@ abstract: true components: - type: Vore # Floofstation - Vore + canVore: true - type: ContentEye - type: CameraRecoil - type: Reactive diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml index 4565ff9415b..02d3355b325 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/base.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml @@ -215,6 +215,7 @@ deathPenalty: 0.01 # However they really ought to be living and intact, otherwise they're worth 100x less. - type: CanEscapeInventory # Carrying system from nyanotrasen. - type: Vore # Floofstation - Vore + canVore: true - type: LanguageKnowledge # This is here so even if species doesn't have a defined language, they at least speak GC speaks: - TauCetiBasic diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index cfe4c255f99..9dc6f6bd008 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -199,6 +199,7 @@ - ShockCollar # FloofStation - LeashBasic # FloofStation - ClothingEyesHypnoVisor # FloofStation + - ToolRadioHandheld # Floofstation - StationAnchorCircuitboard - type: EmagLatheRecipes emagStaticRecipes: diff --git a/Resources/Prototypes/Floof/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/Floof/Catalog/Cargo/cargo_fun.yml index 52cbdf2084b..1ec9fd6ebec 100644 --- a/Resources/Prototypes/Floof/Catalog/Cargo/cargo_fun.yml +++ b/Resources/Prototypes/Floof/Catalog/Cargo/cargo_fun.yml @@ -17,3 +17,23 @@ cost: 99999 category: cargoproduct-category-name-fun group: market + +- type: cargoProduct + id: FunPlushieCrate + icon: + sprite: Objects/Fun/toys.rsi + state: plushie_h + product: CrateFunPlushie + cost: 3500 + category: cargoproduct-category-name-fun + group: market + +- type: cargoProduct + id: FunLizardPlushieCrate + icon: + sprite: Objects/Fun/toys.rsi + state: plushie_lizard + product: CrateFunLizardPlushieBulk + cost: 2500 + category: cargoproduct-category-name-fun + group: market diff --git a/Resources/Prototypes/Floof/Catalog/Fills/Belts/surgengeneral.yml b/Resources/Prototypes/Floof/Catalog/Fills/Belts/surgengeneral.yml new file mode 100644 index 00000000000..7099d55a147 --- /dev/null +++ b/Resources/Prototypes/Floof/Catalog/Fills/Belts/surgengeneral.yml @@ -0,0 +1,14 @@ +- type: entity + parent: ClothingBeltMedicalSurgeonGeneral + id: ClothingBeltMedicalSurgeonGeneralFilled + suffix: Filled + components: + - type: StorageFill + contents: + - id: Hemostat + - id: Saw + - id: Drill + - id: Cautery + - id: Retractor + - id: Scalpel + - id: BoneGel diff --git a/Resources/Prototypes/Floof/Entities/Structures/Storage/locker.yml b/Resources/Prototypes/Floof/Catalog/Fills/Lockers/locker.yml similarity index 67% rename from Resources/Prototypes/Floof/Entities/Structures/Storage/locker.yml rename to Resources/Prototypes/Floof/Catalog/Fills/Lockers/locker.yml index e1ea2dfc4c3..1c241c4ca88 100644 --- a/Resources/Prototypes/Floof/Entities/Structures/Storage/locker.yml +++ b/Resources/Prototypes/Floof/Catalog/Fills/Lockers/locker.yml @@ -80,3 +80,32 @@ - id: ClothingMaskSadMime - id: ClothingMaskSexyMime - id: ClothingMaskScaredMime + +- type: entity + id: LockerSurgeonGeneralFilled + suffix: Surgeon general, Filled + parent: LockerSurgeonGeneral + components: + - type: StorageFill + contents: + - id: ClothingCloakSurgeonGeneral + - id: ClothingHeadHatBeretSurgeongeneral + - id: ClothingEyesPrescriptionMedHud + - id: ClothingOuterWinterSurgeonGeneral + - id: ClothingHandsGlovesNitrile + - id: ClothingUniformSurgeonGerneralThong + - id: ClothingBeltMedicalSurgeonGeneralFilled + - id: SurgeonGeneralIDCard + - id: Hypospray + - id: RubberStampSurgery + - id: ClothingHeadsetAltCentCom + - id: ClothingShoesBootsCombatFilled + - id: ClothingBackpackSatchelMedicalSurgeonGeneral + - id: WeaponPistolN1984 + - id: ClothingMaskGasCentcom + - id: ClothingOuterHardsuitMedical + - id: IceCreamBloodDrop + - id: MedkitCombatFilled + - id: ClothingOuterHardsuitSurgeonGeneral + - id: DrinkBloodGlass + amount: 2 diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/Floof/Entities/Clothing/Back/satchel.yml new file mode 100644 index 00000000000..98740525001 --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Clothing/Back/satchel.yml @@ -0,0 +1,8 @@ +- type: entity + parent: ClothingBackpackSatchel + id: ClothingBackpackSatchelMedicalSurgeonGeneral + name: surgeon general satchel. + description: A sterile satchel used by the Surgeon General. Tailor by SESWC + components: + - type: Sprite + sprite: Floof/Clothing/Back/surgeongeneralsatchel.rsi diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Belts/surgengeneral.yml b/Resources/Prototypes/Floof/Entities/Clothing/Belts/surgengeneral.yml new file mode 100644 index 00000000000..29d5c4fc1e3 --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Clothing/Belts/surgengeneral.yml @@ -0,0 +1,11 @@ +- type: entity + parent: ClothingBeltMedical + id: ClothingBeltMedicalSurgeonGeneral + name: surgeon general belt + suffix: Empty + description: Belt of the surgeon general to hold all his needed surgery tools. Tailor by SESWC + components: + - type: Sprite + sprite: Floof/Clothing/Belts/surgeongeneralbelt.rsi + - type: Clothing + sprite: Floof/Clothing/Belts/surgeongeneralbelt.rsi diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Head/beret.yml b/Resources/Prototypes/Floof/Entities/Clothing/Head/beret.yml new file mode 100644 index 00000000000..bda84ff987f --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Clothing/Head/beret.yml @@ -0,0 +1,14 @@ +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatBeretSurgeongeneral + name: surgeon general beret + description: Teal beret with a cross on the front. The sight of it calms you down and makes it clear that you will be cured. Tailor by SESWC #I have no idea what to put for a surgeon i was trying to be funny + components: + - type: Sprite + sprite: Floof/Clothing/Head/surgeongeneralberet.rsi + - type: Clothing + sprite: Floof/Clothing/Head/surgeongeneralberet.rsi + - type: Tag + tags: + - ClothMade + - HamsterWearable diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Floof/Entities/Clothing/Neck/cloaks.yml index b19202b26d7..5662a58f3fa 100644 --- a/Resources/Prototypes/Floof/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/Floof/Entities/Clothing/Neck/cloaks.yml @@ -14,3 +14,14 @@ - type: ContainerContainer containers: toggleable-clothing: !type:ContainerSlot {} + +- type: entity + parent: ClothingNeckBase + id: ClothingCloakSurgeonGeneral + name: surgeon general cloak + description: A sterile teal cloak with a green cross, radiating with a sense of duty and willingness to help others. Tailor by SESWC + components: + - type: Sprite + sprite: Floof/Clothing/Neck/surgeongeneralcloak.rsi + - type: Clothing + sprite: Floof/Clothing/Neck/surgeongeneralcloak.rsi diff --git a/Resources/Prototypes/Floof/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Floof/Entities/Clothing/OuterClothing/hardsuits.yml new file mode 100644 index 00000000000..484f0ac0fc9 --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Clothing/OuterClothing/hardsuits.yml @@ -0,0 +1,14 @@ +- type: entity + parent: ClothingOuterHardsuitSyndieMedic + id: ClothingOuterHardsuitSurgeonGeneral + name: Surgeon general hardsuit + description: A protective hardsuit worn by the Surgeon Generial, tailor by SESWC. + components: + - type: Sprite + sprite: Floof/Clothing/OuterClothing/Hardsuits/surgengeneralhardsuit.rsi + - type: Clothing + sprite: Floof/Clothing/OuterClothing/Hardsuits/surgengeneralhardsuit.rsi + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitERTMedical + - type: StaminaDamageResistance + coefficient: 0.5 # 50% diff --git a/Resources/Prototypes/Floof/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Floof/Entities/Clothing/OuterClothing/wintercoats.yml index 2a14fb89aa9..223dba9ce8a 100644 --- a/Resources/Prototypes/Floof/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Floof/Entities/Clothing/OuterClothing/wintercoats.yml @@ -1,3 +1,30 @@ +#Winter coats +- type: entity + parent: ClothingOuterWinterCMO + id: ClothingOuterWinterSurgeonGeneral + name: surgeon general winter coat + description: surgeon general winter coat. Tailor by SESWC + components: + - type: Sprite + sprite: Floof/Clothing/OuterClothing/WinterCoats/coatsg.rsi + - type: Clothing + sprite: Floof/Clothing/OuterClothing/WinterCoats/coatsg.rsi + - type: ToggleableClothing + clothingPrototype: ClothingHeadHatHoodWinterSurgenGeneral + +- type: entity + parent: ClothingHeadHatHoodWinterBase + id: ClothingHeadHatHoodWinterSurgenGeneral + categories: [ HideSpawnMenu ] + name: surgeon general hood + components: + - type: Sprite + sprite: Floof/Clothing/Head/Hoods/surgeongeneralhood.rsi + - type: Clothing + sprite: Floof/Clothing/Head/Hoods/surgeongeneralhood.rsi + + +#Long coats - type: entity parent: ClothingOuterWinterCoat id: ClothingLongcoatAL @@ -120,7 +147,7 @@ sprite: Floof/Clothing/OuterClothing/WinterCoats/longcoatSec.rsi - type: Armor #A stylish but solid middle-ground between the Durathread Vest and Plate Carrier, but not as good as the Armored Trenchcoat or Armored Longcoat. modifiers: - coefficients: + coefficients: Blunt: 0.75 Slash: 0.70 Piercing: 0.75 @@ -144,7 +171,7 @@ sprite: Floof/Clothing/OuterClothing/WinterCoats/longcoatWarden.rsi - type: Armor #overall better than the Secoff Armored Longcoat, Warden Longcoat defense stats have parity to Warden's Armored Jacket, being slightly better than the Armored Jacket but maintaining the slowdown. modifiers: - coefficients: + coefficients: Blunt: 0.70 Slash: 0.65 Piercing: 0.70 @@ -168,7 +195,7 @@ sprite: Floof/Clothing/OuterClothing/WinterCoats/longcoatBrigmedic.rsi - type: Armor #Trades physical resistances for heat/caust/explosive compared to secoff armored longcoat, and is only 5% slow. modifiers: - coefficients: + coefficients: Blunt: 0.85 Slash: 0.85 Piercing: 0.85 @@ -192,7 +219,7 @@ sprite: Floof/Clothing/OuterClothing/WinterCoats/longcoatHoS.rsi - type: Armor #Effectively a heavier Armored Trenchcoat, trading speed for slightly better Slash and Explosion resistance. modifiers: - coefficients: + coefficients: Blunt: 0.7 Slash: 0.6 Piercing: 0.7 diff --git a/Resources/Prototypes/Floof/Entities/Clothing/departmental_clothes.yml b/Resources/Prototypes/Floof/Entities/Clothing/departmental_clothes.yml index fae030a48b1..d8b6ee26ddb 100644 --- a/Resources/Prototypes/Floof/Entities/Clothing/departmental_clothes.yml +++ b/Resources/Prototypes/Floof/Entities/Clothing/departmental_clothes.yml @@ -652,6 +652,23 @@ tags: - Skirt +# Surgeon Outfit + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformSurgeonGerneralThong + name: surgeon general thong + description: Styled for the surgeon general, but is this even considered a piece of clothing? Tailor by SESWC + components: + - type: Sprite + sprite: Floof/Clothing/Departmental/Medical/surgeongeneralthong.rsi + - type: Clothing + sprite: Floof/Clothing/Departmental/Medical/surgeongeneralthong.rsi + - type: Tag #DeltaV, needed for species with nonhuman legs/can only wear skirts + tags: + - Skirt + + #Security Outfits # #General Security @@ -778,6 +795,21 @@ - Skirt #Corpsmen Outfits +- type: entity + parent: ClothingHandsBase + id: ClothingHandsCorpsmanWarmers + name: corpsman arm-warmers + description: A pair of rather nice arm-warmers, styled for Corpsman roles. + components: + - type: Sprite + sprite: Floof/Clothing/Departmental/Security/corpsmanwarmer.rsi + - type: Clothing + sprite: Floof/Clothing/Departmental/Security/corpsmanwarmer.rsi + - type: Fiber + fiberMaterial: fibers-latex + fiberColor: fibers-white + - type: FingerprintMask + - type: entity parent: [ ClothingShoesBase, ClothingShoesMilitaryBase ] id: ClothingUnderSocksCorpsman @@ -785,9 +817,23 @@ description: A pair of thigh-high socks, styled for Corpsman roles. components: - type: Sprite - sprite: Floof/Clothing/Departmental/Medical/paramedsocks.rsi + sprite: Floof/Clothing/Departmental/Security/corpsmansocks.rsi - type: Clothing - sprite: Floof/Clothing/Departmental/Medical/paramedsocks.rsi + sprite: Floof/Clothing/Departmental/Security/corpsmansocks.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformCorpsmanThong + name: corpsman thong + description: Styled for a Corpsmen, but is this even considered a piece of clothing? + components: + - type: Sprite + sprite: Floof/Clothing/Departmental/Security/corpsmanthong.rsi + - type: Clothing + sprite: Floof/Clothing/Departmental/Security/corpsmanthong.rsi + - type: Tag #DeltaV, needed for species with nonhuman legs/can only wear skirts + tags: + - Skirt #Service Outfits # diff --git a/Resources/Prototypes/Floof/Entities/Mobs/NPCs/scugcat.yml b/Resources/Prototypes/Floof/Entities/Mobs/NPCs/scugcat.yml index d1556f300ef..552116f525d 100644 --- a/Resources/Prototypes/Floof/Entities/Mobs/NPCs/scugcat.yml +++ b/Resources/Prototypes/Floof/Entities/Mobs/NPCs/scugcat.yml @@ -107,6 +107,7 @@ - type: LeashAnchor # Floofstation offset: 0, 0.2 - type: Vore + canVore: true - type: palette id: ScugCatColors diff --git a/Resources/Prototypes/Floof/Entities/Objects/Devices/Misc/identification_card.yml b/Resources/Prototypes/Floof/Entities/Objects/Devices/Misc/identification_card.yml index d5d268beb64..61e4b81a7f7 100644 --- a/Resources/Prototypes/Floof/Entities/Objects/Devices/Misc/identification_card.yml +++ b/Resources/Prototypes/Floof/Entities/Objects/Devices/Misc/identification_card.yml @@ -10,4 +10,28 @@ color: "#C96DBF" - state: passenger - type: PresetIdCard - job: Anomaly \ No newline at end of file + job: Anomaly + +- type: entity + parent: IDCardStandard + id: SurgeonGeneralIDCard + name: surgeron general ID card + components: + - type: Sprite + layers: + - state: centcom + - state: departmenthead + color: "#32A794" + - state: subdepartment + color: "#1B67A5" + - state: cc + - type: Item + heldPrefix: blue + - type: IdCard + jobTitle: Surgeon General + jobIcon: JobIconNanotrasen + - type: Access + groups: + - AllAccess + tags: + - CentralCommand diff --git a/Resources/Prototypes/Floof/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Floof/Entities/Objects/Devices/pda.yml new file mode 100644 index 00000000000..b89fe160339 --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Objects/Devices/pda.yml @@ -0,0 +1,19 @@ +- type: entity + parent: CentcomPDA + id: SurgeonGeneralPDA + name: surgeon general PDA + description: Extraordinarily shiny and sterile PDA made for the surgeon general. Has a built-in health analyzer. Produced by SESWC + components: + - type: HealthAnalyzer + scanDelay: 1 + scanningEndSound: + path: "/Audio/Items/Medical/healthscanner.ogg" + - type: Pda + id: SurgeonGeneralIDCard + state: pda-centcom + penSlot: + startingItem: PenCentcom + priority: -1 + whitelist: + tags: + - Write diff --git a/Resources/Prototypes/Floof/Entities/Objects/Misc/rubberstamps.yml b/Resources/Prototypes/Floof/Entities/Objects/Misc/rubberstamps.yml new file mode 100644 index 00000000000..29e80a8b037 --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Objects/Misc/rubberstamps.yml @@ -0,0 +1,11 @@ +- type: entity + name: Surgeon General stamp + parent: RubberStampBase + id: RubberStampSurgery + components: + - type: Stamp + stampedName: stamp-component-stamped-name-surgeon-general + stampedColor: "#32A794" + - type: Sprite + sprite: Floof/Objects/Misc/stamp.rsi + state: stamp-sg diff --git a/Resources/Prototypes/Floof/Entities/Structures/Storage/Closets/lockers2.yml b/Resources/Prototypes/Floof/Entities/Structures/Storage/Closets/lockers2.yml new file mode 100644 index 00000000000..08972cc6376 --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Structures/Storage/Closets/lockers2.yml @@ -0,0 +1,14 @@ +- type: entity + id: LockerSurgeonGeneral + name: central command surgeon general locker + parent: LockerBaseSecure + components: + - type: Sprite + sprite: Floof/Structures/Lockers/surgeongeneral.rsi + - type: Appearance + - type: AccessReader + access: [["CentralCommand"]] + - type: EntityStorageVisuals + stateBaseClosed: surgeon_secure + stateDoorOpen: surgeon_secure_open + stateDoorClosed: surgeon_secure_door diff --git a/Resources/Prototypes/Floof/Loadouts/Generic/uniform.yml b/Resources/Prototypes/Floof/Loadouts/Generic/uniform.yml index ff05e91742e..0dddb57ff3f 100644 --- a/Resources/Prototypes/Floof/Loadouts/Generic/uniform.yml +++ b/Resources/Prototypes/Floof/Loadouts/Generic/uniform.yml @@ -25,6 +25,22 @@ - Security - Command +- type: loadout + id: LoadoutUniformClassicalMaidDress + category: Uniform + cost: 0 + exclusive: true + items: + - ClothingUniformClassicalMaidDress + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutUniformsCivilian2 + - !type:CharacterDepartmentRequirement + inverted: true + departments: + - Security + - Command + - type: loadout id: LoadoutUniformJumpskirtJanimaid category: Uniform @@ -41,6 +57,7 @@ - Security - Command + - type: loadout id: LoadoutUniformJumpskirtJanimaidmini category: Uniform diff --git a/Resources/Prototypes/Floof/Loadouts/Jobs/Command/captain.yml b/Resources/Prototypes/Floof/Loadouts/Jobs/Command/captain.yml index eecaf2a2b1e..80f1bf39caa 100644 --- a/Resources/Prototypes/Floof/Loadouts/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Floof/Loadouts/Jobs/Command/captain.yml @@ -1,7 +1,7 @@ - type: loadout id: LoadoutClothingHandsCaptainWarmers category: JobsCommandCaptain - cost: 2 + cost: 0 exclusive: true items: - ClothingHandsCaptainWarmers @@ -13,7 +13,7 @@ - type: loadout id: LoadoutClothingUnderSocksCaptain category: JobsCommandCaptain - cost: 2 + cost: 0 exclusive: true items: - ClothingUnderSocksCaptain @@ -30,7 +30,7 @@ - type: loadout id: LoadoutClothingUniformCaptainThong category: JobsCommandCaptain - cost: 2 + cost: 0 exclusive: true items: - ClothingUniformCaptainThong diff --git a/Resources/Prototypes/Floof/Loadouts/Jobs/Command/uncategorized.yml b/Resources/Prototypes/Floof/Loadouts/Jobs/Command/uncategorized.yml index 59dd1603af8..6a0ee8a9181 100644 --- a/Resources/Prototypes/Floof/Loadouts/Jobs/Command/uncategorized.yml +++ b/Resources/Prototypes/Floof/Loadouts/Jobs/Command/uncategorized.yml @@ -1,7 +1,8 @@ +# Uncategorized - type: loadout id: LoadoutClothingHandsCommandWarmers category: JobsCommandAUncategorized - cost: 2 + cost: 0 exclusive: true items: - ClothingHandsCommandWarmers @@ -13,7 +14,7 @@ - type: loadout id: LoadoutClothingUnderSocksCommand category: JobsCommandAUncategorized - cost: 2 + cost: 0 exclusive: true items: - ClothingUnderSocksCommand @@ -30,7 +31,7 @@ - type: loadout id: LoadoutClothingUniformCommandThong category: JobsCommandAUncategorized - cost: 2 + cost: 0 exclusive: true items: - ClothingUniformCommandThong @@ -38,3 +39,42 @@ - !type:CharacterDepartmentRequirement departments: - Command + +# Backpacks + +# Belt + +# Ears + +# Equipment + +# Eyes +- type: loadout + id: LoadoutCommandEyesCommand + category: JobsCommandAUncategorized + cost: 2 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCommandEyes + - !type:CharacterDepartmentRequirement + departments: + - Command + items: + - ClothingEyesGlassesCommand + +# Gloves + +# Head + +# Id + +# Neck + +# Mask + +# Outer + +# Shoes + +# Uniforms diff --git a/Resources/Prototypes/Floof/Loadouts/Jobs/Engineering/atmos.yml b/Resources/Prototypes/Floof/Loadouts/Jobs/Engineering/atmos.yml new file mode 100644 index 00000000000..e0974929dd2 --- /dev/null +++ b/Resources/Prototypes/Floof/Loadouts/Jobs/Engineering/atmos.yml @@ -0,0 +1,15 @@ +#uniform + +- type: loadout + id: LoadoutEngineeringClothingUniformJumpsuitAtmosCasual + category: JobsEngineeringAtmosphericTechnician + cost: 0 # its an Jumpsuit + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutAtmosphericTechnicianUniforms + - !type:CharacterJobRequirement + jobs: + - AtmosphericTechnician + items: + - ClothingUniformJumpsuitAtmosCasual diff --git a/Resources/Prototypes/Floof/Loadouts/Jobs/Engineering/chiefEngineer.yml b/Resources/Prototypes/Floof/Loadouts/Jobs/Engineering/chiefEngineer.yml index 523787cb3b6..76ae93b8167 100644 --- a/Resources/Prototypes/Floof/Loadouts/Jobs/Engineering/chiefEngineer.yml +++ b/Resources/Prototypes/Floof/Loadouts/Jobs/Engineering/chiefEngineer.yml @@ -1,7 +1,7 @@ - type: loadout id: LoadoutClothingHandsChiefEngiWarmers category: JobsEngineeringChiefEngineer - cost: 1 + cost: 0 exclusive: true items: - ClothingHandsChiefEngiWarmers @@ -13,7 +13,7 @@ - type: loadout id: LoadoutClothingUnderSocksChiefEngi category: JobsEngineeringChiefEngineer - cost: 1 + cost: 0 exclusive: true items: - ClothingUnderSocksChiefEngi @@ -30,7 +30,7 @@ - type: loadout id: LoadoutClothingUniformChiefEngiThong category: JobsEngineeringChiefEngineer - cost: 1 + cost: 0 exclusive: true items: - ClothingUniformChiefEngiThong diff --git a/Resources/Prototypes/Floof/Loadouts/Jobs/Engineering/uncategorized.yml b/Resources/Prototypes/Floof/Loadouts/Jobs/Engineering/uncategorized.yml index 8aee47124bd..149cebc80cf 100644 --- a/Resources/Prototypes/Floof/Loadouts/Jobs/Engineering/uncategorized.yml +++ b/Resources/Prototypes/Floof/Loadouts/Jobs/Engineering/uncategorized.yml @@ -1,7 +1,7 @@ - type: loadout id: LoadoutClothingHandsEngiWarmers category: JobsEngineeringAAUncategorized - cost: 2 + cost: 0 exclusive: true items: - ClothingHandsEngiWarmers @@ -13,7 +13,7 @@ - type: loadout id: LoadoutClothingUnderSocksEngi category: JobsEngineeringAAUncategorized - cost: 2 + cost: 0 exclusive: true items: - ClothingUnderSocksEngi @@ -30,7 +30,7 @@ - type: loadout id: LoadoutClothingUniformEngiThong category: JobsEngineeringAAUncategorized - cost: 2 + cost: 0 exclusive: true items: - ClothingUniformEngiThong diff --git a/Resources/Prototypes/Floof/Loadouts/Jobs/Epistemics/chaplain.yml b/Resources/Prototypes/Floof/Loadouts/Jobs/Epistemics/chaplain.yml index f92152be402..9276dae9570 100644 --- a/Resources/Prototypes/Floof/Loadouts/Jobs/Epistemics/chaplain.yml +++ b/Resources/Prototypes/Floof/Loadouts/Jobs/Epistemics/chaplain.yml @@ -1,7 +1,7 @@ - type: loadout id: LoadoutClothingHandChaplainWarmers category: JobsEpistemicsChaplain - cost: 2 + cost: 0 exclusive: true items: - ClothingHandsChaplainWarmers @@ -13,7 +13,7 @@ - type: loadout id: LoadoutClothingUnderSocksChaplain category: JobsEpistemicsChaplain - cost: 2 + cost: 0 exclusive: true items: - ClothingUnderSocksChaplain @@ -30,7 +30,7 @@ - type: loadout id: LoadoutClothingUniformChaplainThong category: JobsEpistemicsChaplain - cost: 2 + cost: 0 exclusive: true items: - ClothingUniformChaplainThong diff --git a/Resources/Prototypes/Floof/Loadouts/Jobs/Epistemics/mystagogue.yml b/Resources/Prototypes/Floof/Loadouts/Jobs/Epistemics/mystagogue.yml index b8fa449a586..3aa79771f8a 100644 --- a/Resources/Prototypes/Floof/Loadouts/Jobs/Epistemics/mystagogue.yml +++ b/Resources/Prototypes/Floof/Loadouts/Jobs/Epistemics/mystagogue.yml @@ -1,7 +1,7 @@ - type: loadout id: LoadoutClothingHandsEpiHeadWarmers category: JobsEpistemicsMystagogue - cost: 1 + cost: 0 exclusive: true items: - ClothingHandsEpiHeadWarmers @@ -13,7 +13,7 @@ - type: loadout id: LoadoutClothingUnderSocksEpiHead category: JobsEpistemicsMystagogue - cost: 1 + cost: 0 exclusive: true items: - ClothingUnderSocksEpiHead @@ -30,7 +30,7 @@ - type: loadout id: LoadoutClothingUniformEpiHeadThong category: JobsEpistemicsMystagogue - cost: 1 + cost: 0 exclusive: true items: - ClothingUniformEpiHeadThong diff --git a/Resources/Prototypes/Floof/Loadouts/Jobs/Epistemics/psionicMantis.yml b/Resources/Prototypes/Floof/Loadouts/Jobs/Epistemics/psionicMantis.yml index 1f58f0fed41..4c135bbffae 100644 --- a/Resources/Prototypes/Floof/Loadouts/Jobs/Epistemics/psionicMantis.yml +++ b/Resources/Prototypes/Floof/Loadouts/Jobs/Epistemics/psionicMantis.yml @@ -1,7 +1,7 @@ - type: loadout id: LoadoutClothingHandsMantisEpiWarmers category: JobsEpistemicsPsionicMantis - cost: 1 + cost: 0 exclusive: true items: - ClothingHandsMantisEpiWarmers @@ -13,7 +13,7 @@ - type: loadout id: LoadoutClothingUnderSocksMantisEpi category: JobsEpistemicsPsionicMantis - cost: 1 + cost: 0 exclusive: true items: - ClothingUnderSocksMantisEpi @@ -30,7 +30,7 @@ - type: loadout id: LoadoutClothingUniformMantisEpiThong category: JobsEpistemicsPsionicMantis - cost: 1 + cost: 0 exclusive: true items: - ClothingUniformMantisEpiThong diff --git a/Resources/Prototypes/Floof/Loadouts/Jobs/Epistemics/uncategorized.yml b/Resources/Prototypes/Floof/Loadouts/Jobs/Epistemics/uncategorized.yml index 14087be7bb7..1563c378dda 100644 --- a/Resources/Prototypes/Floof/Loadouts/Jobs/Epistemics/uncategorized.yml +++ b/Resources/Prototypes/Floof/Loadouts/Jobs/Epistemics/uncategorized.yml @@ -1,7 +1,7 @@ - type: loadout id: LoadoutClothingHandsEpiWarmers category: JobsEpistemicsAAUncategorized - cost: 2 + cost: 0 exclusive: true items: - ClothingHandsEpiWarmers @@ -13,7 +13,7 @@ - type: loadout id: LoadoutClothingUnderSocksEpi category: JobsEpistemicsAAUncategorized - cost: 2 + cost: 0 exclusive: true items: - ClothingUnderSocksEpi @@ -30,7 +30,7 @@ - type: loadout id: LoadoutClothingUniformEpiThong category: JobsEpistemicsAAUncategorized - cost: 2 + cost: 0 exclusive: true items: - ClothingUniformEpiThong diff --git a/Resources/Prototypes/Floof/Loadouts/Jobs/Logistics/courier.yml b/Resources/Prototypes/Floof/Loadouts/Jobs/Logistics/courier.yml index 7c5eb58a33e..998a4772b46 100644 --- a/Resources/Prototypes/Floof/Loadouts/Jobs/Logistics/courier.yml +++ b/Resources/Prototypes/Floof/Loadouts/Jobs/Logistics/courier.yml @@ -1,7 +1,9 @@ +#SHOES + - type: loadout id: LoadoutClothingHandsCourierWarmers category: JobsLogisticsCourier - cost: 1 + cost: 0 exclusive: true items: - ClothingHandsCourierWarmers @@ -13,7 +15,7 @@ - type: loadout id: LoadoutClothingUnderSocksCourier category: JobsLogisticsCourier - cost: 2 + cost: 0 exclusive: true items: - ClothingUnderSocksCourier @@ -27,10 +29,12 @@ jobs: - MailCarrier +#UNIFORMS + - type: loadout id: LoadoutClothingUniformCourierThong category: JobsLogisticsCourier - cost: 1 + cost: 0 exclusive: true items: - ClothingUniformCourierThong @@ -38,3 +42,51 @@ - !type:CharacterJobRequirement jobs: - MailCarrier + +- type: loadout + id: LoadoutClothingUniformCourier + category: JobsLogisticsCourier + cost: 0 # why are jumpsuits costing points? + exclusive: true + items: + - ClothingUniformCourier + requirements: + - !type:CharacterJobRequirement + jobs: + - MailCarrier + +- type: loadout + id: LoadoutClothingUniformSkirtCourier + category: JobsLogisticsCourier + cost: 0 # why are jumpsuits costing points? + exclusive: true + items: + - ClothingUniformSkirtCourier + requirements: + - !type:CharacterJobRequirement + jobs: + - MailCarrier + +- type: loadout + id: LoadoutClothingUniformMailCarrier + category: JobsLogisticsCourier + cost: 0 # why are jumpsuits costing points? + exclusive: true + items: + - ClothingUniformMailCarrier + requirements: + - !type:CharacterJobRequirement + jobs: + - MailCarrier + +- type: loadout + id: LoadoutClothingUniformSkirtMailCarrier + category: JobsLogisticsCourier + cost: 0 # why are jumpsuits costing points? + exclusive: true + items: + - ClothingUniformSkirtMailCarrier + requirements: + - !type:CharacterJobRequirement + jobs: + - MailCarrier diff --git a/Resources/Prototypes/Floof/Loadouts/Jobs/Logistics/logisticsOfficer.yml b/Resources/Prototypes/Floof/Loadouts/Jobs/Logistics/logisticsOfficer.yml index c32fb04e079..d63596bb496 100644 --- a/Resources/Prototypes/Floof/Loadouts/Jobs/Logistics/logisticsOfficer.yml +++ b/Resources/Prototypes/Floof/Loadouts/Jobs/Logistics/logisticsOfficer.yml @@ -1,7 +1,8 @@ +# Logistics Officer - type: loadout id: LoadoutClothingHandsLOLogisWarmers category: JobsLogisticsLogisticsOfficer - cost: 1 + cost: 0 exclusive: true items: - ClothingHandsLOLogisWarmers @@ -13,7 +14,7 @@ - type: loadout id: LoadoutClothingUnderSocksLOLogis category: JobsLogisticsLogisticsOfficer - cost: 1 + cost: 0 exclusive: true items: - ClothingUnderSocksLOLogis @@ -30,7 +31,7 @@ - type: loadout id: LoadoutClothingUniformLOLogisThong category: JobsLogisticsLogisticsOfficer - cost: 1 + cost: 0 exclusive: true items: - ClothingUniformLOLogisThong @@ -38,3 +39,105 @@ - !type:CharacterJobRequirement jobs: - Quartermaster +# Backpacks + +# Belt + +# Ears + +# Equipment + +# Eyes + +# Gloves +- type: loadout + id: LoadoutCommandQMGlovesBrown + category: JobsLogisticsLogisticsOfficer + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutLogisticsOfficerGloves + - !type:CharacterJobRequirement + jobs: + - Quartermaster + items: + - ClothingHandsGlovesColorBrown + +# Head +- type: loadout + id: LoadoutCommandQMHeadBeret + category: JobsLogisticsLogisticsOfficer + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutLogisticsOfficerHead + - !type:CharacterJobRequirement + jobs: + - Quartermaster + items: + - ClothingHeadHatBeretQM + +# Id + +# Neck +- type: loadout + id: LoadoutCommandQMNeckMantle + category: JobsLogisticsLogisticsOfficer + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutLogisticsOfficerNeck + - !type:CharacterJobRequirement + jobs: + - Quartermaster + items: + - ClothingNeckMantleQM + +# Outer +- type: loadout + id: LoadoutCommandQMOuterLongcoat + category: JobsLogisticsLogisticsOfficer + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutLogisticsOfficerOuter + - !type:CharacterJobRequirement + jobs: + - Quartermaster + items: + - ClothingLongcoatLO + +- type: loadout + id: LoadoutCommandQMOuterWinter + category: JobsLogisticsLogisticsOfficer + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutLogisticsOfficerOuter + - !type:CharacterJobRequirement + jobs: + - Quartermaster + items: + - ClothingOuterWinterQM + +# Shoes + +# Uniforms +- type: loadout + id: LoadoutCommandQMUniformFormal + category: JobsLogisticsLogisticsOfficer + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutLogisticsOfficerUniforms + - !type:CharacterJobRequirement + jobs: + - Quartermaster + items: + - ClothingUniformJumpsuitQMFormal diff --git a/Resources/Prototypes/Floof/Loadouts/Jobs/Logistics/uncategorized.yml b/Resources/Prototypes/Floof/Loadouts/Jobs/Logistics/uncategorized.yml index dcb34a9ec01..c386034d52e 100644 --- a/Resources/Prototypes/Floof/Loadouts/Jobs/Logistics/uncategorized.yml +++ b/Resources/Prototypes/Floof/Loadouts/Jobs/Logistics/uncategorized.yml @@ -2,7 +2,7 @@ - type: loadout id: LoadoutClothingHandsLogisWarmers category: JobsLogisticsAUncategorized - cost: 2 + cost: 0 exclusive: true items: - ClothingHandsLogisWarmers @@ -14,7 +14,7 @@ - type: loadout id: LoadoutClothingUnderSocksLogis category: JobsLogisticsAUncategorized - cost: 2 + cost: 0 exclusive: true items: - ClothingUnderSocksLogis @@ -31,7 +31,7 @@ - type: loadout id: LoadoutClothingUniformLogisThong category: JobsLogisticsAUncategorized - cost: 2 + cost: 0 exclusive: true items: - ClothingUniformLogisThong diff --git a/Resources/Prototypes/Floof/Loadouts/Jobs/Medical/chemist.yml b/Resources/Prototypes/Floof/Loadouts/Jobs/Medical/chemist.yml index 0321e724aa8..1b05b46d8ff 100644 --- a/Resources/Prototypes/Floof/Loadouts/Jobs/Medical/chemist.yml +++ b/Resources/Prototypes/Floof/Loadouts/Jobs/Medical/chemist.yml @@ -1,7 +1,7 @@ - type: loadout id: LoadoutClothingHandsChemistsWarmers category: JobsMedicalChemist - cost: 2 + cost: 0 exclusive: true items: - ClothingHandsChemistsWarmers @@ -13,7 +13,7 @@ - type: loadout id: LoadoutClothingUnderSocksChemists category: JobsMedicalChemist - cost: 2 + cost: 0 exclusive: true items: - ClothingUnderSocksChemists @@ -30,7 +30,7 @@ - type: loadout id: LoadoutClothingUniformChemistsThong category: JobsMedicalChemist - cost: 2 + cost: 0 exclusive: true items: - ClothingUniformChemistsThong diff --git a/Resources/Prototypes/Floof/Loadouts/Jobs/Medical/chiefMedicalOfficer.yml b/Resources/Prototypes/Floof/Loadouts/Jobs/Medical/chiefMedicalOfficer.yml index d4a456022c5..5e08a0129f4 100644 --- a/Resources/Prototypes/Floof/Loadouts/Jobs/Medical/chiefMedicalOfficer.yml +++ b/Resources/Prototypes/Floof/Loadouts/Jobs/Medical/chiefMedicalOfficer.yml @@ -1,7 +1,8 @@ +# Chief Medical Officer - type: loadout id: LoadoutClothingHandsCMOWarmers category: JobsMedicalChiefMedicalOfficer - cost: 2 + cost: 0 exclusive: true items: - ClothingHandsCMOWarmers @@ -13,7 +14,7 @@ - type: loadout id: LoadoutClothingUnderSocksCMO category: JobsMedicalChiefMedicalOfficer - cost: 2 + cost: 0 exclusive: true items: - ClothingUnderSocksCMO @@ -30,7 +31,7 @@ - type: loadout id: LoadoutClothingUniformCMOThong category: JobsMedicalChiefMedicalOfficer - cost: 2 + cost: 0 exclusive: true items: - ClothingUniformCMOThong @@ -38,3 +39,40 @@ - !type:CharacterJobRequirement jobs: - ChiefMedicalOfficer +# Backpacks + +# Belt + +# Ears + +# Equipment + +# Eyes + +# Gloves + +# Head + +# Id + +# Neck + +# Mask + +# Outer +- type: loadout + id: LoadoutCommandCMOOuterLongcoat + category: JobsMedicalChiefMedicalOfficer + cost: 0 + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutChiefMedicalOfficerOuter + - !type:CharacterJobRequirement + jobs: + - ChiefMedicalOfficer + items: + - ClothingLongcoatCMO + +# Shoes + +# Uniforms diff --git a/Resources/Prototypes/Floof/Loadouts/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Floof/Loadouts/Jobs/Medical/paramedic.yml index 197fbbb29b0..be9a9e2da76 100644 --- a/Resources/Prototypes/Floof/Loadouts/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/Floof/Loadouts/Jobs/Medical/paramedic.yml @@ -1,7 +1,8 @@ +# Paramedic - type: loadout id: LoadoutClothingHandsParaMedicWarmers category: JobsMedicalParamedic - cost: 1 + cost: 0 exclusive: true items: - ClothingHandsParaMedicWarmers @@ -13,7 +14,7 @@ - type: loadout id: LoadoutClothingUnderSocksParaMedic category: JobsMedicalParamedic - cost: 1 + cost: 0 exclusive: true items: - ClothingUnderSocksParaMedic @@ -30,7 +31,7 @@ - type: loadout id: LoadoutClothingUniformParaMedicThong category: JobsMedicalParamedic - cost: 1 + cost: 0 exclusive: true items: - ClothingUniformParaMedicThong @@ -38,3 +39,67 @@ - !type:CharacterJobRequirement jobs: - Paramedic +# Backpacks + +# Belt + +# Ears + +# Equipment + +# Eyes + +# Gloves + +# Head +- type: loadout + id: LoadoutMedicalHeadParamedicSoft + category: JobsMedicalParamedic + cost: 0 + exclusive: true + items: + - ClothingHeadHatParamedicsoft + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutParamedicHead + - !type:CharacterJobRequirement + jobs: + - Paramedic + +# Id + +# Neck + +# Mask + +# Outer +- type: loadout + id: LoadoutMedicalOuterParamedicWB + category: JobsMedicalParamedic + cost: 0 + exclusive: true + items: + - ClothingOuterCoatParamedicWB + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutParamedicOuter + - !type:CharacterJobRequirement + jobs: + - Paramedic + +# Shoes +- type: loadout + id: LoadoutMedicalShoesParamedicWinter + category: JobsMedicalParamedic + cost: 0 + exclusive: true + items: + - ClothingShoesBootsWinterParamedic + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutParamedicShoes + - !type:CharacterJobRequirement + jobs: + - Paramedic + +# Uniforms diff --git a/Resources/Prototypes/Floof/Loadouts/Jobs/Medical/uncategorized.yml b/Resources/Prototypes/Floof/Loadouts/Jobs/Medical/uncategorized.yml index 7e47f1aa622..54a986a098d 100644 --- a/Resources/Prototypes/Floof/Loadouts/Jobs/Medical/uncategorized.yml +++ b/Resources/Prototypes/Floof/Loadouts/Jobs/Medical/uncategorized.yml @@ -1,7 +1,8 @@ +# Uncategorized - type: loadout id: LoadoutClothingHandsMedicWarmers category: JobsMedicalAUncategorized - cost: 2 + cost: 0 exclusive: true items: - ClothingHandsMedicWarmers @@ -13,7 +14,7 @@ - type: loadout id: LoadoutClothingUnderSocksMedic category: JobsMedicalAUncategorized - cost: 2 + cost: 0 exclusive: true items: - ClothingUnderSocksMedic @@ -30,7 +31,7 @@ - type: loadout id: LoadoutClothingUniformMedicThong category: JobsMedicalAUncategorized - cost: 2 + cost: 0 exclusive: true items: - ClothingUniformMedicThong @@ -50,6 +51,55 @@ items: - ClothingNeckCollarMed -# Chemist +# Backpacks -# Paramedic +# Belt + +# Ears + +# Equipment + +# Eyes + +# Gloves + +# Head + +# Id + +# Neck + +# Mask +- type: loadout + id: LoadoutMedicalMaskSterile + category: JobsMedicalAUncategorized + cost: 0 + exclusive: true + items: + - ClothingMaskSterile + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutMedicalMask + - !type:CharacterDepartmentRequirement + departments: + - Medical + +- type: loadout + id: LoadoutMedicalMaskBreathMedical + category: JobsMedicalAUncategorized + cost: 0 + exclusive: true + items: + - ClothingMaskBreathMedical + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutMedicalMask + - !type:CharacterDepartmentRequirement + departments: + - Medical + +# Outer + +# Shoes + +# Uniforms diff --git a/Resources/Prototypes/Floof/Loadouts/Jobs/Security/corpsman.yml b/Resources/Prototypes/Floof/Loadouts/Jobs/Security/corpsman.yml index e33d62d4c25..67a6402c626 100644 --- a/Resources/Prototypes/Floof/Loadouts/Jobs/Security/corpsman.yml +++ b/Resources/Prototypes/Floof/Loadouts/Jobs/Security/corpsman.yml @@ -1,11 +1,81 @@ +# Corpsman - type: loadout - id: LoadoutClothingUnderSocksCorpsman + id: LoadoutClothingHandCorpsmanWarmers category: JobsSecurityCorpsman - cost: 1 + cost: 0 exclusive: true + items: + - ClothingHandsCorpsmanWarmers requirements: - !type:CharacterJobRequirement jobs: - Brigmedic + +- type: loadout + id: LoadoutClothingUnderSocksCorpsman + category: JobsSecurityCorpsman + cost: 0 + exclusive: true items: - ClothingUnderSocksCorpsman + requirements: + - !type:CharacterSpeciesRequirement + inverted: true + species: + - Diona + - Harpy + - !type:CharacterJobRequirement + jobs: + - Brigmedic + +- type: loadout + id: LoadoutClothingUniformCorpsmanThong + category: JobsSecurityCorpsman + cost: 0 + exclusive: true + items: + - ClothingUniformCorpsmanThong + requirements: + - !type:CharacterJobRequirement + jobs: + - Brigmedic + +# Backpacks + +# Belt + +# Ears + +# Equipment + +# Eyes + +# Gloves + +# Head + +# Id + +# Neck + +# Mask +- type: loadout + id: LoadoutMaskCorpsmanBreathMedicalSecurity + category: JobsSecurityCorpsman + cost: 0 + exclusive: true + items: + - ClothingMaskBreathMedicalSecurity + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutCorpsmanMask + - !type:CharacterJobRequirement + jobs: + - Brigmedic + + +# Outer + +# Shoes + +# Uniforms diff --git a/Resources/Prototypes/Floof/Loadouts/Jobs/Security/detective.yml b/Resources/Prototypes/Floof/Loadouts/Jobs/Security/detective.yml index 56c20e0f3e7..9e7d422466d 100644 --- a/Resources/Prototypes/Floof/Loadouts/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Floof/Loadouts/Jobs/Security/detective.yml @@ -1,7 +1,7 @@ - type: loadout id: LoadoutClothingHandsDetectiveWarmers category: JobsSecurityDetective - cost: 2 + cost: 0 exclusive: true items: - ClothingHandsDetectiveWarmers @@ -13,7 +13,7 @@ - type: loadout id: LoadoutClothingUnderSocksDetective category: JobsSecurityDetective - cost: 2 + cost: 0 exclusive: true items: - ClothingUnderSocksDetective @@ -30,7 +30,7 @@ - type: loadout id: LoadoutClothingUniformDetectiveThong category: JobsSecurityDetective - cost: 2 + cost: 0 exclusive: true items: - ClothingUniformDetectiveThong diff --git a/Resources/Prototypes/Floof/Loadouts/Jobs/Security/headOfSecurity.yml b/Resources/Prototypes/Floof/Loadouts/Jobs/Security/headOfSecurity.yml index 1ceae3cda44..5982a8cea06 100644 --- a/Resources/Prototypes/Floof/Loadouts/Jobs/Security/headOfSecurity.yml +++ b/Resources/Prototypes/Floof/Loadouts/Jobs/Security/headOfSecurity.yml @@ -1,7 +1,7 @@ - type: loadout id: LoadoutClothingHandsHeadSecurityWarmers category: JobsSecurityHeadOfSecurity - cost: 1 + cost: 0 exclusive: true items: - ClothingHandsHeadSecurityWarmers @@ -13,7 +13,7 @@ - type: loadout id: LoadoutClothingUnderSocksHeadSecurity category: JobsSecurityHeadOfSecurity - cost: 1 + cost: 0 exclusive: true items: - ClothingUnderSocksHeadSecurity @@ -30,7 +30,7 @@ - type: loadout id: LoadoutClothingUniformHeadSecurityThong category: JobsSecurityHeadOfSecurity - cost: 1 + cost: 0 exclusive: true items: - ClothingUniformHeadSecurityThong diff --git a/Resources/Prototypes/Floof/Loadouts/Jobs/Security/uncategorized.yml b/Resources/Prototypes/Floof/Loadouts/Jobs/Security/uncategorized.yml index f9769e7170a..d1deb2380cd 100644 --- a/Resources/Prototypes/Floof/Loadouts/Jobs/Security/uncategorized.yml +++ b/Resources/Prototypes/Floof/Loadouts/Jobs/Security/uncategorized.yml @@ -1,7 +1,21 @@ +# Uncategorized +# Backpack + +# Belt + +# Ears + +# Equipment + +# Service Weapon + +# Eyes + +# Gloves - type: loadout id: LoadoutClothingHandsSecurityWarmers category: JobsSecurityAUncategorized - cost: 2 + cost: 0 exclusive: true items: - ClothingHandsSecurityWarmers @@ -10,10 +24,61 @@ departments: - Security +# Head + +# Id + +# Neck +- type: loadout + id: LoadoutSecurityNeckCollar + category: JobsSecurityAUncategorized + cost: 1 + requirements: + - !type:CharacterDepartmentRequirement + departments: + - Security + items: + - ClothingNeckCollarSec + +# Mask +- type: loadout + id: LoadoutSecurityMaskGasSecurity + category: JobsSecurityAUncategorized + cost: 0 + exclusive: true + items: + - ClothingMaskGasSecurity + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutSecurityMask + - !type:CharacterDepartmentRequirement + departments: + - Security + - !type:CharacterJobRequirement + inverted: true + jobs: + - Brigmedic + +# Outer +- type: loadout + id: LoadoutClothingLongcoatSec + category: JobsSecurityAUncategorized + cost: 0 # same as the other armor + exclusive: true + items: + - ClothingLongcoatSec + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutSecurityOuter + - !type:CharacterDepartmentRequirement + departments: + - Security + +# Shoes - type: loadout id: LoadoutClothingUnderSocksSecurity category: JobsSecurityAUncategorized - cost: 2 + cost: 0 exclusive: true items: - ClothingUnderSocksSecurity @@ -27,10 +92,11 @@ departments: - Security +# Uniforms - type: loadout id: LoadoutClothingUniformSecurityThong category: JobsSecurityAUncategorized - cost: 2 + cost: 0 exclusive: true items: - ClothingUniformSecurityThong @@ -40,12 +106,15 @@ - Security - type: loadout - id: LoadoutSecurityNeckCollar + id: ClothingUniformJumpskirtSec category: JobsSecurityAUncategorized - cost: 1 + cost: 0 # same as the other uniforms + exclusive: true + items: + - ClothingUniformJumpskirtSec requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutSecurityUniforms - !type:CharacterDepartmentRequirement departments: - - Security - items: - - ClothingNeckCollarSec + - Security diff --git a/Resources/Prototypes/Floof/Loadouts/Jobs/Service/bartender.yml b/Resources/Prototypes/Floof/Loadouts/Jobs/Service/bartender.yml index 918fc7b16e9..d074ccbb53e 100644 --- a/Resources/Prototypes/Floof/Loadouts/Jobs/Service/bartender.yml +++ b/Resources/Prototypes/Floof/Loadouts/Jobs/Service/bartender.yml @@ -1,7 +1,7 @@ - type: loadout id: LoadoutClothingHandsBartenderWarmers category: JobsServiceBartender - cost: 1 + cost: 0 exclusive: true items: - ClothingHandsBartenderWarmers @@ -13,7 +13,7 @@ - type: loadout id: LoadoutClothingUnderSocksBartender category: JobsServiceBartender - cost: 1 + cost: 0 exclusive: true items: - ClothingUnderSocksBartender @@ -30,7 +30,7 @@ - type: loadout id: LoadoutClothingUniformBartenderThong category: JobsServiceBartender - cost: 1 + cost: 0 exclusive: true items: - ClothingUniformBartenderThong diff --git a/Resources/Prototypes/Floof/Loadouts/Jobs/Service/chef.yml b/Resources/Prototypes/Floof/Loadouts/Jobs/Service/chef.yml index cc4fd3deda2..5ce218581ed 100644 --- a/Resources/Prototypes/Floof/Loadouts/Jobs/Service/chef.yml +++ b/Resources/Prototypes/Floof/Loadouts/Jobs/Service/chef.yml @@ -1,7 +1,7 @@ - type: loadout id: LoadoutClothingHandsChefWarmers category: JobsServiceChef - cost: 1 + cost: 0 exclusive: true items: - ClothingHandsChefWarmers @@ -13,7 +13,7 @@ - type: loadout id: LoadoutClothingUnderSocksChef category: JobsServiceChef - cost: 1 + cost: 0 exclusive: true items: - ClothingUnderSocksChef @@ -30,7 +30,7 @@ - type: loadout id: LoadoutClothingUniformChefThong category: JobsServiceChef - cost: 1 + cost: 0 exclusive: true items: - ClothingUniformChefThong diff --git a/Resources/Prototypes/Floof/Loadouts/Jobs/Service/janitor.yml b/Resources/Prototypes/Floof/Loadouts/Jobs/Service/janitor.yml index 1cb3a979040..5c4425fa90f 100644 --- a/Resources/Prototypes/Floof/Loadouts/Jobs/Service/janitor.yml +++ b/Resources/Prototypes/Floof/Loadouts/Jobs/Service/janitor.yml @@ -1,7 +1,7 @@ - type: loadout id: LoadoutClothingHandsJanitorWarmers category: JobsServiceJanitor - cost: 2 + cost: 0 exclusive: true items: - ClothingHandsJanitorWarmers @@ -13,7 +13,7 @@ - type: loadout id: LoadoutClothingUnderSocksJanitor category: JobsServiceJanitor - cost: 2 + cost: 0 exclusive: true items: - ClothingUnderSocksJanitor @@ -30,7 +30,7 @@ - type: loadout id: LoadoutClothingUniformJanitorThong category: JobsServiceJanitor - cost: 2 + cost: 0 exclusive: true items: - ClothingUniformJanitorThong diff --git a/Resources/Prototypes/Floof/Loadouts/Jobs/Service/mime.yml b/Resources/Prototypes/Floof/Loadouts/Jobs/Service/mime.yml index 89a5e2fa9c3..3c2af4fd115 100644 --- a/Resources/Prototypes/Floof/Loadouts/Jobs/Service/mime.yml +++ b/Resources/Prototypes/Floof/Loadouts/Jobs/Service/mime.yml @@ -1,7 +1,7 @@ - type: loadout id: LoadoutClothingHandsStripeWhiteWarmers category: JobsServiceMime - cost: 2 + cost: 0 exclusive: true items: - ClothingHandsStripeWhiteWarmers @@ -13,7 +13,7 @@ - type: loadout id: LoadoutClothingUnderSocksStripedWhite category: JobsServiceMime - cost: 2 + cost: 0 exclusive: true items: - ClothingUnderSocksStripedWhite @@ -30,7 +30,7 @@ - type: loadout id: LoadoutClothingUniformStripedThongWhite category: JobsServiceMime - cost: 2 + cost: 0 exclusive: true items: - ClothingUniformStripedThongWhite diff --git a/Resources/Prototypes/Floof/Loadouts/Jobs/Service/musician.yml b/Resources/Prototypes/Floof/Loadouts/Jobs/Service/musician.yml index 1758626debb..99d6e270369 100644 --- a/Resources/Prototypes/Floof/Loadouts/Jobs/Service/musician.yml +++ b/Resources/Prototypes/Floof/Loadouts/Jobs/Service/musician.yml @@ -1,7 +1,7 @@ - type: loadout id: LoadoutClothingHandsMusicianWarmers category: JobsServiceMusician - cost: 2 + cost: 0 exclusive: true items: - ClothingHandsMusicianWarmers @@ -13,7 +13,7 @@ - type: loadout id: LoadoutClothingUnderSocksMusician category: JobsServiceMusician - cost: 2 + cost: 0 exclusive: true items: - ClothingUnderSocksMusician @@ -30,7 +30,7 @@ - type: loadout id: LoadoutClothingUniformMusicianThong category: JobsServiceMusician - cost: 2 + cost: 0 exclusive: true items: - ClothingUniformMusicianThong diff --git a/Resources/Prototypes/Floof/Loadouts/Jobs/Service/uncategorized.yml b/Resources/Prototypes/Floof/Loadouts/Jobs/Service/uncategorized.yml index a6ad5cca8e5..fd8511042ac 100644 --- a/Resources/Prototypes/Floof/Loadouts/Jobs/Service/uncategorized.yml +++ b/Resources/Prototypes/Floof/Loadouts/Jobs/Service/uncategorized.yml @@ -1,7 +1,7 @@ - type: loadout id: LoadoutClothingHandsServiceWarmers category: JobsServiceAUncategorized - cost: 2 + cost: 0 exclusive: true items: - ClothingHandsServiceWarmers @@ -13,7 +13,7 @@ - type: loadout id: LoadoutClothingUnderSocksService category: JobsServiceAUncategorized - cost: 2 + cost: 0 exclusive: true items: - ClothingUnderSocksService @@ -30,7 +30,7 @@ - type: loadout id: LoadoutClothingUniformServiceThong category: JobsServiceAUncategorized - cost: 2 + cost: 0 exclusive: true items: - ClothingUniformServiceThong diff --git a/Resources/Prototypes/Floof/Recipes/Lathes/tools.yml b/Resources/Prototypes/Floof/Recipes/Lathes/tools.yml index dd6a3bb17fb..7e692bb8e8c 100644 --- a/Resources/Prototypes/Floof/Recipes/Lathes/tools.yml +++ b/Resources/Prototypes/Floof/Recipes/Lathes/tools.yml @@ -14,3 +14,12 @@ materials: Glass: 100 Steel: 75 + +- type: latheRecipe + id: ToolRadioHandheld + result: RadioHandheld + completetime: 3.5 + materials: + Glass: 50 + Steel: 100 + Plastic: 50 diff --git a/Resources/Prototypes/Floof/Roles/Jobs/Surgeongeneral.yml b/Resources/Prototypes/Floof/Roles/Jobs/Surgeongeneral.yml new file mode 100644 index 00000000000..aa482691d45 --- /dev/null +++ b/Resources/Prototypes/Floof/Roles/Jobs/Surgeongeneral.yml @@ -0,0 +1,16 @@ +- type: startingGear + id: SurgeonGeneral + equipment: + jumpsuit: ClothingUniformSurgeonGerneralThong + shoes: ClothingShoesBootsCombatFilled + neck: ClothingCloakSurgeonGeneral + head: ClothingHeadHatBeretSurgeongeneral + eyes: ClothingEyesPrescriptionMedHud + gloves: ClothingHandsGlovesNitrile + outerClothing: ClothingOuterWinterSurgeonGeneral + back: ClothingBackpackSatchelMedicalSurgeonGeneral + id: SurgeonGeneralPDA + ears: ClothingHeadsetAltCentCom + belt: ClothingBeltMedicalSurgeonGeneralFilled + pocket1: RubberStampSurgery + pocket2: Hypospray diff --git a/Resources/Prototypes/Loadouts/Categories/categories.yml b/Resources/Prototypes/Loadouts/Categories/categories.yml index 48de355a517..6965aee9bbc 100644 --- a/Resources/Prototypes/Loadouts/Categories/categories.yml +++ b/Resources/Prototypes/Loadouts/Categories/categories.yml @@ -68,7 +68,7 @@ - JobsEngineeringAAUncategorized - JobsEngineeringAtmosphericTechnician - JobsEngineeringChiefEngineer - - JobsEngineeringSeniorEngineer + - JobsEngineeringSeniorEngineer - JobsEngineeringStationEngineer - JobsEngineeringTechnicalAssistant @@ -81,8 +81,8 @@ - type: loadoutCategory id: JobsEngineeringChiefEngineer -- type: loadoutCategory - id: JobsEngineeringSeniorEngineer +- type: loadoutCategory + id: JobsEngineeringSeniorEngineer - type: loadoutCategory id: JobsEngineeringStationEngineer @@ -123,7 +123,7 @@ id: JobsEpistemicsMystagogue - type: loadoutCategory - id: JobsEpistemicsMystic + id: JobsEpistemicsMystic #floof senior scientist - type: loadoutCategory id: JobsEpistemicsNoviciate diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/seniorEngineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/seniorEngineer.yml index c507d073cdb..5aab5dc9262 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/seniorEngineer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/seniorEngineer.yml @@ -130,30 +130,30 @@ # Shoes # Uniforms -- type: loadout - id: LoadoutEngineeringUniformJumpskirtSenior - category: JobsEngineeringSeniorEngineer - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutSeniorEngineerUniforms - - !type:CharacterJobRequirement - jobs: - - SeniorEngineer - items: - - ClothingUniformJumpskirtSeniorEngineer - -- type: loadout - id: LoadoutEngineeringUniformJumpsuitSenior - category: JobsEngineeringSeniorEngineer - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutSeniorEngineerUniforms - - !type:CharacterJobRequirement - jobs: - - SeniorEngineer - items: - - ClothingUniformJumpsuitSeniorEngineer +#- type: loadout #floof - temporarily moving senior clothing to aauncategorized to make it obtainable for players while senior roles are updated +# id: LoadoutEngineeringUniformJumpskirtSenior +# category: JobsEngineeringSeniorEngineer +# cost: 0 +# exclusive: true +# requirements: +# - !type:CharacterItemGroupRequirement +# group: LoadoutSeniorEngineerUniforms +# - !type:CharacterJobRequirement +# jobs: +# - SeniorEngineer +# items: +# - ClothingUniformJumpskirtSeniorEngineer + +#- type: loadout #floof - temporarily moving senior clothing to aauncategorized to make it obtainable for players while senior roles are updated +# id: LoadoutEngineeringUniformJumpsuitSenior +# category: JobsEngineeringSeniorEngineer +# cost: 0 +# exclusive: true +# requirements: +# - !type:CharacterItemGroupRequirement +# group: LoadoutSeniorEngineerUniforms +# - !type:CharacterJobRequirement +# jobs: +# - SeniorEngineer +# items: +# - ClothingUniformJumpsuitSeniorEngineer diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/uncategorized.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/uncategorized.yml index 283448126b6..4a18f8dc74a 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/uncategorized.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/uncategorized.yml @@ -255,3 +255,43 @@ - StationEngineer items: - ClothingUniformJumpsuitEngineeringHazard + +- type: loadout #floof - temporarily moving senior clothing to aauncategorized to make it obtainable for players while senior roles are updated + id: LoadoutEngineeringUniformJumpskirtSenior + category: JobsEngineeringAAUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutEngineeringUniforms + - !type:CharacterDepartmentRequirement + departments: + - Engineering + - !type:CharacterJobRequirement #all engineering jobs but TA + inverted: true + jobs: [TechnicalAssistant] + - !type:CharacterDepartmentTimeRequirement + department: Engineering + min: 144000 #40 hours + items: + - ClothingUniformJumpskirtSeniorEngineer + +- type: loadout #floof - temporarily moving senior clothing to aauncategorized to make it obtainable for players while senior roles are updated + id: LoadoutEngineeringUniformJumpsuitSenior + category: JobsEngineeringAAUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutEngineeringUniforms + - !type:CharacterDepartmentRequirement + departments: + - Engineering + - !type:CharacterJobRequirement #all engineering jobs but TA + inverted: true + jobs: [TechnicalAssistant] + - !type:CharacterDepartmentTimeRequirement + department: Engineering + min: 144000 #40 hours + items: + - ClothingUniformJumpsuitSeniorEngineer diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystic.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystic.yml index b390adefdaa..ff75a79198c 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystic.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/mystic.yml @@ -20,47 +20,47 @@ # Mask # Outer -- type: loadout - id: LoadoutScienceOuterLabcoatSeniorResearcher - category: JobsEpistemicsAAUncategorized - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutMysticOuter - - !type:CharacterJobRequirement - jobs: - - SeniorResearcher - items: - - ClothingOuterCoatLabSeniorResearcher +#- type: loadout #floof - temporarily moving senior clothing to aauncategorized to make it obtainable for players while senior roles are updated +# id: LoadoutScienceOuterLabcoatSeniorResearcher +# category: JobsEpistemicsAAUncategorized +# cost: 0 +# exclusive: true +# requirements: +# - !type:CharacterItemGroupRequirement +# group: LoadoutMysticOuter +# - !type:CharacterJobRequirement +# jobs: +# - SeniorResearcher +# items: +# - ClothingOuterCoatLabSeniorResearcher # Shoes # Uniforms -- type: loadout - id: LoadoutScienceUniformJumpskirtSenior - category: JobsEpistemicsMystic - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutMysticUniforms - - !type:CharacterJobRequirement - jobs: - - SeniorResearcher - items: - - ClothingUniformJumpskirtSeniorResearcher +#- type: loadout #floof - temporarily moving senior clothing to aauncategorized to make it obtainable for players while senior roles are updated +# id: LoadoutScienceUniformJumpskirtSenior +# category: JobsEpistemicsMystic +# cost: 0 +# exclusive: true +# requirements: +# - !type:CharacterItemGroupRequirement +# group: LoadoutMysticUniforms +# - !type:CharacterJobRequirement +# jobs: +# - SeniorResearcher +# items: +# - ClothingUniformJumpskirtSeniorResearcher -- type: loadout - id: LoadoutScienceUniformJumpsuitSenior - category: JobsEpistemicsMystic - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutMysticUniforms - - !type:CharacterJobRequirement - jobs: - - SeniorResearcher - items: - - ClothingUniformJumpsuitSeniorResearcher +#- type: loadout #floof - temporarily moving senior clothing to aauncategorized to make it obtainable for players while senior roles are updated +# id: LoadoutScienceUniformJumpsuitSenior +# category: JobsEpistemicsMystic +# cost: 0 +# exclusive: true +# requirements: +# - !type:CharacterItemGroupRequirement +# group: LoadoutMysticUniforms +# - !type:CharacterJobRequirement +# jobs: +# - SeniorResearcher +# items: +# - ClothingUniformJumpsuitSeniorResearcher diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/uncategorized.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/uncategorized.yml index 43f8623fb05..e6f38b93310 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Epistemics/uncategorized.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/uncategorized.yml @@ -242,16 +242,38 @@ - type: loadout id: LoadoutOuterRobeTechPriest - category: Outer + category: JobsEpistemicsAAUncategorized cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutEpistemicsOuter + - !type:CharacterDepartmentRequirement + departments: + - Epistemics items: - ClothingOuterRobeTechPriest + +- type: loadout #floof - temporarily moving senior clothing to aauncategorized to make it obtainable for players while senior roles are updated + id: LoadoutScienceOuterLabcoatSeniorResearcher + category: JobsEpistemicsAAUncategorized + cost: 0 + exclusive: true requirements: - !type:CharacterItemGroupRequirement group: LoadoutEpistemicsOuter - !type:CharacterDepartmentRequirement departments: - Epistemics + - !type:CharacterJobRequirement #all epistemics jobs but intern + inverted: true + jobs: [ResearchAssistant] + - !type:CharacterDepartmentTimeRequirement + department: Epistemics + min: 144000 #40 hours + items: + - ClothingOuterCoatLabSeniorResearcher + # Shoes - type: loadout @@ -269,3 +291,42 @@ - ClothingShoesBootsWinterSci # Uniforms +- type: loadout #floof - temporarily moving senior clothing to aauncategorized to make it obtainable for players while senior roles are updated + id: LoadoutScienceUniformJumpskirtSenior + category: JobsEpistemicsAAUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutEpistemicsUniforms + - !type:CharacterDepartmentRequirement + departments: + - Epistemics + - !type:CharacterJobRequirement #all epistemics jobs but intern + inverted: true + jobs: [ResearchAssistant] + - !type:CharacterDepartmentTimeRequirement + department: Epistemics + min: 144000 #40 hours + items: + - ClothingUniformJumpskirtSeniorResearcher + +- type: loadout #floof - temporarily moving senior clothing to aauncategorized to make it obtainable for players while senior roles are updated + id: LoadoutScienceUniformJumpsuitSenior + category: JobsEpistemicsAAUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutEpistemicsUniforms + - !type:CharacterDepartmentRequirement + departments: + - Epistemics + - !type:CharacterJobRequirement #all epistemics jobs but intern + inverted: true + jobs: [ResearchAssistant] + - !type:CharacterDepartmentTimeRequirement + department: Epistemics + min: 144000 #40 hours + items: + - ClothingUniformJumpsuitSeniorResearcher diff --git a/Resources/Prototypes/Loadouts/Jobs/Logistics/logisticsOfficer.yml b/Resources/Prototypes/Loadouts/Jobs/Logistics/logisticsOfficer.yml index 190c7467b54..72b906ece88 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Logistics/logisticsOfficer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Logistics/logisticsOfficer.yml @@ -16,6 +16,7 @@ id: LoadoutCommandQMHeadSoft category: JobsLogisticsLogisticsOfficer cost: 0 + exclusive: true requirements: - !type:CharacterItemGroupRequirement group: LoadoutLogisticsOfficerHead diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/seniorPhysician.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/seniorPhysician.yml index a8937cc2f0e..a6a28905c58 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/seniorPhysician.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/seniorPhysician.yml @@ -39,19 +39,19 @@ # Gloves # Head -- type: loadout - id: LoadoutMedicalHeadBeretSeniorPhysician - category: JobsMedicalSeniorPhysician - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutSeniorPhysicianHead - - !type:CharacterJobRequirement - jobs: - - SeniorPhysician - items: - - ClothingHeadHatBeretSeniorPhysician +#- type: loadout #floof - temporarily moving senior clothing to aauncategorized to make it obtainable for players while senior roles are updated +# id: LoadoutMedicalHeadBeretSeniorPhysician +# category: JobsMedicalSeniorPhysician +# cost: 0 +# exclusive: true +# requirements: +# - !type:CharacterItemGroupRequirement +# group: LoadoutSeniorPhysicianHead +# - !type:CharacterJobRequirement +# jobs: +# - SeniorPhysician +# items: +# - ClothingHeadHatBeretSeniorPhysician # Id @@ -64,30 +64,30 @@ # Shoes # Uniforms -- type: loadout - id: LoadoutMedicalUniformJumpskirtSenior - category: JobsMedicalSeniorPhysician - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutSeniorPhysicianUniforms - - !type:CharacterJobRequirement - jobs: - - SeniorPhysician - items: - - ClothingUniformJumpskirtSeniorPhysician +#- type: loadout #floof - temporarily moving senior clothing to aauncategorized to make it obtainable for players while senior roles are updated +# id: LoadoutMedicalUniformJumpskirtSenior +# category: JobsMedicalSeniorPhysician +# cost: 0 +# exclusive: true +# requirements: +# - !type:CharacterItemGroupRequirement +# group: LoadoutSeniorPhysicianUniforms +# - !type:CharacterJobRequirement +# jobs: +# - SeniorPhysician +# items: +# - ClothingUniformJumpskirtSeniorPhysician -- type: loadout - id: LoadoutMedicalUniformJumpsuitSenior - category: JobsMedicalSeniorPhysician - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutSeniorPhysicianUniforms - - !type:CharacterJobRequirement - jobs: - - SeniorPhysician - items: - - ClothingUniformJumpsuitSeniorPhysician +#- type: loadout #floof - temporarily moving senior clothing to aauncategorized to make it obtainable for players while senior roles are updated +# id: LoadoutMedicalUniformJumpsuitSenior +# category: JobsMedicalSeniorPhysician +# cost: 0 +# exclusive: true +# requirements: +# - !type:CharacterItemGroupRequirement +# group: LoadoutSeniorPhysicianUniforms +# - !type:CharacterJobRequirement +# jobs: +# - SeniorPhysician +# items: +# - ClothingUniformJumpsuitSeniorPhysician diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/uncategorized.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/uncategorized.yml index d3b88f9fa9d..a914b6164a1 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/uncategorized.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/uncategorized.yml @@ -336,6 +336,26 @@ items: - ClothingHeadHatSurgcapCybersun +- type: loadout #floof - temporarily moving senior clothing to aauncategorized to make it obtainable for players while senior roles are updated + id: LoadoutMedicalHeadBeretSeniorPhysician + category: JobsMedicalAUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutMedicalHead + - !type:CharacterDepartmentRequirement + departments: + - Medical + - !type:CharacterJobRequirement #all medical jobs but intern + inverted: true + jobs: [MedicalIntern] + - !type:CharacterDepartmentTimeRequirement + department: Medical + min: 144000 #40 hours + items: + - ClothingHeadHatBeretSeniorPhysician + # Id # Neck @@ -503,3 +523,44 @@ - Paramedic items: - UniformScrubsColorCybersun + + +- type: loadout #floof - temporarily moving senior clothing to aauncategorized to make it obtainable for players while senior roles are updated + id: LoadoutMedicalUniformJumpskirtSenior + category: JobsMedicalAUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutMedicalUniforms + - !type:CharacterDepartmentRequirement + departments: + - Medical + - !type:CharacterJobRequirement #all medical jobs but intern + inverted: true + jobs: [MedicalIntern] + - !type:CharacterDepartmentTimeRequirement + department: Medical + min: 144000 #40 hours + items: + - ClothingUniformJumpskirtSeniorPhysician + +- type: loadout + id: LoadoutMedicalUniformJumpsuitSenior + category: JobsMedicalAUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutMedicalUniforms + - !type:CharacterDepartmentRequirement + departments: + - Medical + - !type:CharacterJobRequirement #all medical jobs but intern + inverted: true + jobs: [MedicalIntern] + - !type:CharacterDepartmentTimeRequirement + department: Medical + min: 144000 #40 hours + items: + - ClothingUniformJumpsuitSeniorPhysician diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/seniorOfficer.yml b/Resources/Prototypes/Loadouts/Jobs/Security/seniorOfficer.yml index 69e47019c3a..8f6597cfc11 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/seniorOfficer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/seniorOfficer.yml @@ -24,30 +24,30 @@ # Shoes # Uniforms -- type: loadout - id: LoadoutSecurityUniformJumpskirtSenior - category: JobsSecuritySeniorOfficer - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutSeniorOfficerUniforms - - !type:CharacterJobRequirement - jobs: - - SeniorOfficer - items: - - ClothingUniformJumpskirtSeniorOfficer - -- type: loadout - id: LoadoutSecurityUniformJumpsuitSenior - category: JobsSecuritySeniorOfficer - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutSeniorOfficerUniforms - - !type:CharacterJobRequirement - jobs: - - SeniorOfficer - items: - - ClothingUniformJumpsuitSeniorOfficer +#- type: loadout #floof - temporarily moving senior clothing to aauncategorized to make it obtainable for players while senior roles are updated +# id: LoadoutSecurityUniformJumpskirtSenior +# category: JobsSecuritySeniorOfficer +# cost: 0 +# exclusive: true +# requirements: +# - !type:CharacterItemGroupRequirement +# group: LoadoutSeniorOfficerUniforms +# - !type:CharacterJobRequirement +# jobs: +# - SeniorOfficer +# items: +# - ClothingUniformJumpskirtSeniorOfficer + +#- type: loadout #floof - temporarily moving senior clothing to aauncategorized to make it obtainable for players while senior roles are updated +# id: LoadoutSecurityUniformJumpsuitSenior +# category: JobsSecuritySeniorOfficer +# cost: 0 +# exclusive: true +# requirements: +# - !type:CharacterItemGroupRequirement +# group: LoadoutSeniorOfficerUniforms +# - !type:CharacterJobRequirement +# jobs: +# - SeniorOfficer +# items: +# - ClothingUniformJumpsuitSeniorOfficer diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/uncategorized.yml b/Resources/Prototypes/Loadouts/Jobs/Security/uncategorized.yml index 0002bbb6565..e428180c9fe 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/uncategorized.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/uncategorized.yml @@ -1003,3 +1003,43 @@ - Security items: - ClothingUniformJumpsuitSecSummer + +- type: loadout #floof - temporarily moving senior clothing to aauncategorized to make it obtainable for players while senior roles are updated + id: LoadoutSecurityUniformJumpskirtSenior + category: JobsSecurityAUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutSecurityUniforms + - !type:CharacterDepartmentRequirement + departments: + - Security + - !type:CharacterJobRequirement #all sec jobs but cadet + inverted: true + jobs: [SecurityCadet] + - !type:CharacterDepartmentTimeRequirement + department: Security + min: 144000 #40 hours + items: + - ClothingUniformJumpskirtSeniorOfficer + +- type: loadout #floof - temporarily moving senior clothing to aauncategorized to make it obtainable for players while senior roles are updated + id: LoadoutSecurityUniformJumpsuitSenior + category: JobsSecurityAUncategorized + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutSecurityUniforms + - !type:CharacterDepartmentRequirement + departments: + - Security + - !type:CharacterJobRequirement #all sec jobs but cadet + inverted: true + jobs: [SecurityCadet] + - !type:CharacterDepartmentTimeRequirement + department: Security + min: 144000 #40 hours + items: + - ClothingUniformJumpsuitSeniorOfficer diff --git a/Resources/Prototypes/Maps/Pools/default.yml b/Resources/Prototypes/Maps/Pools/default.yml index 48755df5e00..fd7eff84e24 100644 --- a/Resources/Prototypes/Maps/Pools/default.yml +++ b/Resources/Prototypes/Maps/Pools/default.yml @@ -11,7 +11,7 @@ - Pebble - Saltern - Shoukou - #- Submarine # Floof - Map Compleatly Broken, need rework. + - Submarine - Tortuga - TheHive #- Gax # Floof - Remvoe Gax due to mapping issues, power, access, etc. diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml index 914357ffeeb..61e8e89d4a9 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml @@ -3,10 +3,11 @@ name: job-name-senior-engineer description: job-description-senior-engineer playTimeTracker: JobSeniorEngineer + setPreference: true #floof - this toggle allows players to ready up / create loadouts as senior roles. false disables it from the job requirements: - !type:CharacterDepartmentTimeRequirement department: Engineering - min: 14400 # Floofstation 4 hrs + min: 144000 # Floofstation 40 hrs startingGear: SeniorEngineerGear icon: "JobIconSeniorEngineer" supervisors: job-supervisors-ce diff --git a/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml b/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml index 8698f596ad3..9956bd659c2 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml @@ -3,10 +3,11 @@ name: job-name-senior-physician description: job-description-senior-physician playTimeTracker: JobSeniorPhysician + setPreference: true #floof - this toggle allows players to ready up / create loadouts as senior roles. false disables it from the job list. requirements: - !type:CharacterDepartmentTimeRequirement department: Medical - min: 14400 # Floofstation 4 hrs + min: 144000 # Floofstation 40 hrs startingGear: SeniorPhysicianGear icon: "JobIconSeniorPhysician" supervisors: job-supervisors-cmo diff --git a/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml b/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml index 94a645f4872..bd97b5a534d 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml @@ -1,12 +1,13 @@ - type: job id: SeniorResearcher - name: job-name-senior-researcher + name: job-name-senior-researcher #localized to mystic description: job-description-senior-researcher playTimeTracker: JobSeniorResearcher + setPreference: true #floof - this toggle allows players to ready up / create loadouts as senior roles. false disables it from the job list. requirements: - !type:CharacterDepartmentTimeRequirement department: Epistemics # DeltaV - Epistemics Department replacing Science - min: 14400 # Floofstation 4 hrs + min: 144000 # Floofstation 40 hrs startingGear: SeniorResearcherGear icon: "JobIconSeniorResearcher" supervisors: job-supervisors-rd diff --git a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml index c516553b35f..f85fa508c1f 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml @@ -3,11 +3,11 @@ name: job-name-senior-officer description: job-description-senior-officer playTimeTracker: JobSeniorOfficer - setPreference: true # DeltaV - Disable Senior Roles round start selection + setPreference: true # DeltaV - Disable Senior Roles round start selection #floof - toggle to true to reenable requirements: - !type:CharacterDepartmentTimeRequirement department: Security - min: 3600 # Floofstation - 1 hour + min: 144000 # Floofstation 40 hrs startingGear: SeniorOfficerGear icon: "JobIconSeniorOfficer" supervisors: job-supervisors-hos diff --git a/Resources/Prototypes/_DV/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/_DV/Entities/Objects/Misc/paper.yml new file mode 100644 index 00000000000..05d8469d7d6 --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Objects/Misc/paper.yml @@ -0,0 +1,305 @@ +- type: entity + parent: Paper + id: PaperDyedPink + description: 'A piece of pink paper.' + suffix: pink + components: + - type: Sprite + sprite: Objects/Misc/bureaucracy.rsi + layers: + - state: paper + color: "#e670b5" + - state: paper_words + map: ["enum.PaperVisualLayers.Writing"] + color: "#e670b5" + visible: false + - state: paper_stamp-generic + map: ["enum.PaperVisualLayers.Stamp"] + visible: false + - type: PaperVisuals + backgroundModulate: "#eb87c0" + +- type: entity + parent: Paper + id: PaperDyedRed + description: 'A piece of red paper.' + suffix: red + components: + - type: Sprite + sprite: Objects/Misc/bureaucracy.rsi + layers: + - state: paper + color: "#ba453f" + - state: paper_words + map: ["enum.PaperVisualLayers.Writing"] + color: "#ba453f" + visible: false + - state: paper_stamp-generic + map: ["enum.PaperVisualLayers.Stamp"] + visible: false + - type: PaperVisuals + backgroundModulate: "#ba453f" + +- type: entity + parent: Paper + id: PaperDyedOrange + description: 'A piece of orange paper.' + suffix: orange + components: + - type: Sprite + sprite: Objects/Misc/bureaucracy.rsi + layers: + - state: paper + color: "#ec912e" + - state: paper_words + map: ["enum.PaperVisualLayers.Writing"] + color: "#ec912e" + visible: false + - state: paper_stamp-generic + map: ["enum.PaperVisualLayers.Stamp"] + visible: false + - type: PaperVisuals + backgroundModulate: "#ec912e" + +- type: entity + parent: Paper + id: PaperDyedYellow + description: 'A piece of yellow paper.' + suffix: yellow + components: + - type: Sprite + sprite: Objects/Misc/bureaucracy.rsi + layers: + - state: paper + color: "#ffd617" + - state: paper_words + map: ["enum.PaperVisualLayers.Writing"] + color: "#ffd617" + visible: false + - state: paper_stamp-generic + map: ["enum.PaperVisualLayers.Stamp"] + visible: false + - type: PaperVisuals + backgroundModulate: "#fee36c" + +- type: entity + parent: Paper + id: PaperDyedGrass + description: 'A piece of grass green paper.' + suffix: grass + components: + - type: Sprite + sprite: Objects/Misc/bureaucracy.rsi + layers: + - state: paper + color: "#c7dd4b" + - state: paper_words + map: ["enum.PaperVisualLayers.Writing"] + color: "#c7dd4b" + visible: false + - state: paper_stamp-generic + map: ["enum.PaperVisualLayers.Stamp"] + visible: false + - type: PaperVisuals + backgroundModulate: "#c7dd4b" + +- type: entity + parent: Paper + id: PaperDyedGreen + description: 'A piece of green paper.' + suffix: green + components: + - type: Sprite + sprite: Objects/Misc/bureaucracy.rsi + layers: + - state: paper + color: "#0da04d" + - state: paper_words + map: ["enum.PaperVisualLayers.Writing"] + color: "#0da04d" + visible: false + - state: paper_stamp-generic + map: ["enum.PaperVisualLayers.Stamp"] + visible: false + - type: PaperVisuals + backgroundModulate: "#0da04d" + +- type: entity + parent: Paper + id: PaperDyedOcean + description: 'A piece of ocean blue paper.' + suffix: ocean + components: + - type: Sprite + sprite: Objects/Misc/bureaucracy.rsi + layers: + - state: paper + color: "#1796c8" + - state: paper_words + map: ["enum.PaperVisualLayers.Writing"] + color: "#1796c8" + visible: false + - state: paper_stamp-generic + map: ["enum.PaperVisualLayers.Stamp"] + visible: false + - type: PaperVisuals + backgroundModulate: "#1796c8" + +- type: entity + parent: Paper + id: PaperDyedSky + description: 'A piece of sky blue paper.' + suffix: sky + components: + - type: Sprite + sprite: Objects/Misc/bureaucracy.rsi + layers: + - state: paper + color: "#49cddd" + - state: paper_words + map: ["enum.PaperVisualLayers.Writing"] + color: "#49cddd" + visible: false + - state: paper_stamp-generic + map: ["enum.PaperVisualLayers.Stamp"] + visible: false + - type: PaperVisuals + backgroundModulate: "#49cddd" + +- type: entity + parent: Paper + id: PaperDyedPurple + description: 'A piece of purple paper.' + suffix: purple + components: + - type: Sprite + sprite: Objects/Misc/bureaucracy.rsi + layers: + - state: paper + color: "#7c70d7" + - state: paper_words + map: ["enum.PaperVisualLayers.Writing"] + color: "#7c70d7" + visible: false + - state: paper_stamp-generic + map: ["enum.PaperVisualLayers.Stamp"] + visible: false + - type: PaperVisuals + backgroundModulate: "#938bda" + +- type: entity + parent: Paper + id: PaperDyedTan + description: 'A piece of tan paper.' + suffix: tan + components: + - type: Sprite + sprite: Objects/Misc/bureaucracy.rsi + layers: + - state: paper + color: "#cfbdaa" + - state: paper_words + map: ["enum.PaperVisualLayers.Writing"] + color: "#cfbdaa" + visible: false + - state: paper_stamp-generic + map: ["enum.PaperVisualLayers.Stamp"] + visible: false + - type: PaperVisuals + backgroundModulate: "#cfbdaa" + +- type: entity + parent: Paper + id: PaperDyedBrown + description: 'A piece of brown paper.' + suffix: brown + components: + - type: Sprite + sprite: Objects/Misc/bureaucracy.rsi + layers: + - state: paper + color: "#a47449" + - state: paper_words + map: ["enum.PaperVisualLayers.Writing"] + color: "#a47449" + visible: false + - state: paper_stamp-generic + map: ["enum.PaperVisualLayers.Stamp"] + visible: false + - type: PaperVisuals + backgroundModulate: "#a47449" + +- type: entity + parent: BoxBase + id: BoxReamClassic + name: Papermoon classic color paper ream + description: Brighten up your records and more with Papermoon colored paper, in the six classic colors you've come to know and love. Dyed throughout for maximum colorfastness. + components: + - type: Sprite + sprite: DeltaV/Objects/Misc/bureaucracy.rsi + layers: + - state: ream-classic + - type: ContainerContainer + containers: + storagebase: !type:Container + ents: [] + - type: Storage + grid: + - 0,0,3,5 + whitelist: + tags: + - Document + - type: StorageFill + contents: + - id: PaperDyedYellow + amount: 4 + - id: PaperDyedGreen + amount: 4 + - id: PaperDyedRed + amount: 4 + - id: PaperDyedOcean + amount: 4 + - id: PaperDyedTan + amount: 4 + - id: PaperDyedBrown + amount: 4 + +- type: entity + parent: BoxReamClassic + id: BoxReamBright + name: Papermoon happy color paper ream + description: Make getting a pink slip a joyous occassion with Papermoon colored paper, in six cheerful and vibrant colors. Dyed throughout for maximum colorfastness. + components: + - type: Sprite + sprite: DeltaV/Objects/Misc/bureaucracy.rsi + layers: + - state: ream-bright + - type: StorageFill + contents: + - id: PaperDyedOrange + amount: 4 + - id: PaperDyedGrass + amount: 4 + - id: PaperDyedYellow + amount: 4 + - id: PaperDyedSky + amount: 4 + - id: PaperDyedPink + amount: 4 + - id: PaperDyedPurple + amount: 4 + +- type: entity + parent: BoxReamClassic + id: BoxReamWhite + name: Papermoon glimmer white paper ream + description: Create reports that are sure to get noticed with this Papermoon white-as-glimmer paper. Harvested with sustainable noöspheric practices. + components: + - type: Sprite + sprite: DeltaV/Objects/Misc/bureaucracy.rsi + layers: + - state: ream-white + - type: StorageFill + contents: + - id: Paper + amount: 24 diff --git a/Resources/Prototypes/_DV/Entities/Objects/Misc/sticky_notes.yml b/Resources/Prototypes/_DV/Entities/Objects/Misc/sticky_notes.yml new file mode 100644 index 00000000000..c6c13f0b1c2 --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Objects/Misc/sticky_notes.yml @@ -0,0 +1,344 @@ +# tags + +- type: Tag + id: StickyNoteYellow + +- type: Tag + id: StickyNotePink + +- type: Tag + id: StickyNoteGreen + +- type: Tag + id: StickyNoteBlue + +# single sticky notes + +- type: entity + parent: Paper + id: PaperStickyNote + name: sticky note + suffix: yellow + description: A sticky note, for when you want your reminders to stick + components: + - type: Sprite + sprite: _DV/Objects/Misc/stickies.rsi + layers: + - state: sticky_note + color: "#dad71a" + - state: sticky_note_words + map: ["enum.PaperVisualLayers.Writing"] + color: "#dad71a" + visible: false + - state: paper_stamp-generic + map: ["enum.PaperVisualLayers.Stamp"] + visible: false + sprite: Objects/Misc/bureaucracy.rsi + - type: PaperVisuals + contentMargin: 0.0, 0.0, 0.0, 0.0 + maxWritableArea: 368.0, 368.0 + backgroundModulate: "#fde663" + - type: Tag + tags: + - Document + - Paper + - StickyNoteYellow + - type: EmbeddableProjectile + removalTime: .2 + +- type: entity + parent: PaperStickyNote + id: PaperStickyNotePink + suffix: pink + components: + - type: Sprite + sprite: _DV/Objects/Misc/stickies.rsi + layers: + - state: sticky_note + color: "#ff8cba" + - state: sticky_note_words + map: ["enum.PaperVisualLayers.Writing"] + color: "#ff8cba" + visible: false + - state: paper_stamp-generic + map: ["enum.PaperVisualLayers.Stamp"] + visible: false + sprite: Objects/Misc/bureaucracy.rsi + - type: Tag + tags: + - Document + - Paper + - StickyNotePink + - type: PaperVisuals + backgroundModulate: "#fbc4c4" + +- type: entity + parent: PaperStickyNote + id: PaperStickyNoteGreen + suffix: green + components: + - type: Sprite + sprite: _DV/Objects/Misc/stickies.rsi + layers: + - state: sticky_note + color: "#9fd4a3" + - state: sticky_note_words + map: ["enum.PaperVisualLayers.Writing"] + color: "#9fd4a3" + visible: false + - state: paper_stamp-generic + map: ["enum.PaperVisualLayers.Stamp"] + visible: false + sprite: Objects/Misc/bureaucracy.rsi + - type: Tag + tags: + - Document + - Paper + - StickyNoteGreen + - type: PaperVisuals + backgroundModulate: "#9fd4a3" + +- type: entity + parent: PaperStickyNote + id: PaperStickyNoteBlue + suffix: blue + components: + - type: Sprite + sprite: _DV/Objects/Misc/stickies.rsi + layers: + - state: sticky_note + color: "#00c2e7" + - state: sticky_note_words + map: ["enum.PaperVisualLayers.Writing"] + color: "#00c2e7" + visible: false + - state: paper_stamp-generic + map: ["enum.PaperVisualLayers.Stamp"] + visible: false + sprite: Objects/Misc/bureaucracy.rsi + - type: Tag + tags: + - Document + - Paper + - StickyNoteBlue + - type: PaperVisuals + backgroundModulate: "#58dbf4" + +# sticky note stacks + +- type: entity + parent: BaseItem + id: PaperStickyNoteStack + name: sticky note stack + suffix: yellow + components: + - type: Sprite + sprite: _DV/Objects/Misc/stickies.rsi + state: sticky_note_dispenser_base + color: "#dad71a" + drawdepth: SmallObjects + noRot: true + - type: Appearance + - type: ItemMapper + sprite: _DV/Objects/Misc/stickies.rsi + mapLayers: + sticky_note_dispenser_bin1: + whitelist: + tags: + - Paper + sticky_note_dispenser_bin2: + minCount: 4 + whitelist: + tags: + - Paper + sticky_note_dispenser_bin3: + minCount: 8 + whitelist: + tags: + - Paper + sticky_note_dispenser_bin4: + minCount: 12 + whitelist: + tags: + - Paper + sticky_note_dispenser_bin5: + minCount: 16 + whitelist: + tags: + - Paper + - type: Bin + whitelist: + tags: + - StickyNoteYellow + - type: ContainerContainer + containers: + bin-container: !type:Container {} + +- type: entity + parent: PaperStickyNoteStack + id: PaperStickyNoteStackPink + name: sticky note stack + suffix: pink + components: + - type: Sprite + color: "#ff8cba" + - type: Bin + whitelist: + tags: + - StickyNotePink + +- type: entity + parent: PaperStickyNoteStack + id: PaperStickyNoteStackGreen + name: sticky note stack + suffix: green + components: + - type: Sprite + color: "#9fd4a3" + - type: Bin + whitelist: + tags: + - StickyNoteGreen + +- type: entity + parent: PaperStickyNoteStack + id: PaperStickyNoteStackBlue + name: sticky note stack + suffix: blue + components: + - type: Sprite + color: "#00c2e7" + - type: Bin + whitelist: + tags: + - StickyNoteBlue + +# filled sticky note stacks + +- type: entity + parent: PaperStickyNoteStack + id: PaperStickyNoteStackFilled + name: sticky note stack + suffix: yellow, filled + components: + - type: Bin + whitelist: + tags: + - StickyNoteYellow + initialContents: + - PaperStickyNote + - PaperStickyNote + - PaperStickyNote + - PaperStickyNote + - PaperStickyNote + - PaperStickyNote + - PaperStickyNote + - PaperStickyNote + - PaperStickyNote + - PaperStickyNote + - PaperStickyNote + - PaperStickyNote + - PaperStickyNote + - PaperStickyNote + - PaperStickyNote + - PaperStickyNote + - PaperStickyNote + - PaperStickyNote + - PaperStickyNote + - PaperStickyNote + +- type: entity + parent: PaperStickyNoteStackPink + id: PaperStickyNoteStackFilledPink + name: sticky note stack + suffix: pink, filled + components: + - type: Bin + whitelist: + tags: + - StickyNotePink + initialContents: + - PaperStickyNotePink + - PaperStickyNotePink + - PaperStickyNotePink + - PaperStickyNotePink + - PaperStickyNotePink + - PaperStickyNotePink + - PaperStickyNotePink + - PaperStickyNotePink + - PaperStickyNotePink + - PaperStickyNotePink + - PaperStickyNotePink + - PaperStickyNotePink + - PaperStickyNotePink + - PaperStickyNotePink + - PaperStickyNotePink + - PaperStickyNotePink + - PaperStickyNotePink + - PaperStickyNotePink + - PaperStickyNotePink + - PaperStickyNotePink + +- type: entity + parent: PaperStickyNoteStackGreen + id: PaperStickyNoteStackFilledGreen + name: sticky note stack + suffix: green, filled + components: + - type: Bin + whitelist: + tags: + - StickyNoteGreen + initialContents: + - PaperStickyNoteGreen + - PaperStickyNoteGreen + - PaperStickyNoteGreen + - PaperStickyNoteGreen + - PaperStickyNoteGreen + - PaperStickyNoteGreen + - PaperStickyNoteGreen + - PaperStickyNoteGreen + - PaperStickyNoteGreen + - PaperStickyNoteGreen + - PaperStickyNoteGreen + - PaperStickyNoteGreen + - PaperStickyNoteGreen + - PaperStickyNoteGreen + - PaperStickyNoteGreen + - PaperStickyNoteGreen + - PaperStickyNoteGreen + - PaperStickyNoteGreen + - PaperStickyNoteGreen + - PaperStickyNoteGreen + +- type: entity + parent: PaperStickyNoteStackBlue + id: PaperStickyNoteStackFilledBlue + name: sticky note stack + suffix: blue, filled + components: + - type: Bin + whitelist: + tags: + - StickyNoteBlue + initialContents: + - PaperStickyNoteBlue + - PaperStickyNoteBlue + - PaperStickyNoteBlue + - PaperStickyNoteBlue + - PaperStickyNoteBlue + - PaperStickyNoteBlue + - PaperStickyNoteBlue + - PaperStickyNoteBlue + - PaperStickyNoteBlue + - PaperStickyNoteBlue + - PaperStickyNoteBlue + - PaperStickyNoteBlue + - PaperStickyNoteBlue + - PaperStickyNoteBlue + - PaperStickyNoteBlue + - PaperStickyNoteBlue + - PaperStickyNoteBlue + - PaperStickyNoteBlue + - PaperStickyNoteBlue + - PaperStickyNoteBlue diff --git a/Resources/Prototypes/consent.yml b/Resources/Prototypes/consent.yml index 69e45f682da..632db3120c4 100644 --- a/Resources/Prototypes/consent.yml +++ b/Resources/Prototypes/consent.yml @@ -1,9 +1,6 @@ - type: consentToggle id: Vore -- type: consentToggle - id: VorePred - - type: consentToggle id: Digestion diff --git a/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/meta.json index 5e2c34d5304..7d618c521a3 100644 --- a/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/meta.json @@ -1,14 +1,23 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432 | modified by Floofers. Stamp icon taken from tgstation at https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93, modified by leonardo_dabepis (Discord)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "folder-hop-ian" - } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432 | modified by Floofers. Stamp icon taken from tgstation at https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93, modified by leonardo_dabepis (Discord), ream-classic, bright, and white by 2025 Janet Blackquill ", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "folder-hop-ian" + }, + { + "name": "ream-classic" + }, + { + "name": "ream-bright" + }, + { + "name": "ream-white" + } + ] } diff --git a/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/ream-bright.png b/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/ream-bright.png new file mode 100644 index 00000000000..5c60ce56345 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/ream-bright.png differ diff --git a/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/ream-classic.png b/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/ream-classic.png new file mode 100644 index 00000000000..a38cafeb6c2 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/ream-classic.png differ diff --git a/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/ream-white.png b/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/ream-white.png new file mode 100644 index 00000000000..6b08e1c150b Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/ream-white.png differ diff --git a/Resources/Textures/Floof/Clothing/Back/surgeongeneralsatchel.rsi/equipped-BACKPACK.png b/Resources/Textures/Floof/Clothing/Back/surgeongeneralsatchel.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..44198577231 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Back/surgeongeneralsatchel.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Floof/Clothing/Back/surgeongeneralsatchel.rsi/icon.png b/Resources/Textures/Floof/Clothing/Back/surgeongeneralsatchel.rsi/icon.png new file mode 100644 index 00000000000..0046919e923 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Back/surgeongeneralsatchel.rsi/icon.png differ diff --git a/Resources/Textures/Floof/Clothing/Back/surgeongeneralsatchel.rsi/inhand-left.png b/Resources/Textures/Floof/Clothing/Back/surgeongeneralsatchel.rsi/inhand-left.png new file mode 100644 index 00000000000..a75d86b5064 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Back/surgeongeneralsatchel.rsi/inhand-left.png differ diff --git a/Resources/Textures/Floof/Clothing/Back/surgeongeneralsatchel.rsi/inhand-right.png b/Resources/Textures/Floof/Clothing/Back/surgeongeneralsatchel.rsi/inhand-right.png new file mode 100644 index 00000000000..827345f3632 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Back/surgeongeneralsatchel.rsi/inhand-right.png differ diff --git a/Resources/Textures/Floof/Clothing/Back/surgeongeneralsatchel.rsi/meta.json b/Resources/Textures/Floof/Clothing/Back/surgeongeneralsatchel.rsi/meta.json new file mode 100644 index 00000000000..c4f553b50b1 --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Back/surgeongeneralsatchel.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1, Modified by VividPups", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Belts/surgeongeneralbelt.rsi/equipped-BELT.png b/Resources/Textures/Floof/Clothing/Belts/surgeongeneralbelt.rsi/equipped-BELT.png new file mode 100644 index 00000000000..fa33ccde0e7 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Belts/surgeongeneralbelt.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Floof/Clothing/Belts/surgeongeneralbelt.rsi/icon.png b/Resources/Textures/Floof/Clothing/Belts/surgeongeneralbelt.rsi/icon.png new file mode 100644 index 00000000000..a9114a5bd64 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Belts/surgeongeneralbelt.rsi/icon.png differ diff --git a/Resources/Textures/Floof/Clothing/Belts/surgeongeneralbelt.rsi/inhand-left.png b/Resources/Textures/Floof/Clothing/Belts/surgeongeneralbelt.rsi/inhand-left.png new file mode 100644 index 00000000000..a5c1b9b5f7b Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Belts/surgeongeneralbelt.rsi/inhand-left.png differ diff --git a/Resources/Textures/Floof/Clothing/Belts/surgeongeneralbelt.rsi/inhand-right.png b/Resources/Textures/Floof/Clothing/Belts/surgeongeneralbelt.rsi/inhand-right.png new file mode 100644 index 00000000000..8eb56b4e064 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Belts/surgeongeneralbelt.rsi/inhand-right.png differ diff --git a/Resources/Textures/Floof/Clothing/Belts/surgeongeneralbelt.rsi/meta.json b/Resources/Textures/Floof/Clothing/Belts/surgeongeneralbelt.rsi/meta.json new file mode 100644 index 00000000000..8f6acfe1245 --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Belts/surgeongeneralbelt.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Drawn by Ubaser.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Departmental/Medical/surgeongeneralthong.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Floof/Clothing/Departmental/Medical/surgeongeneralthong.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..58d16326985 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Departmental/Medical/surgeongeneralthong.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Floof/Clothing/Departmental/Medical/surgeongeneralthong.rsi/icon.png b/Resources/Textures/Floof/Clothing/Departmental/Medical/surgeongeneralthong.rsi/icon.png new file mode 100644 index 00000000000..9402eff3065 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Departmental/Medical/surgeongeneralthong.rsi/icon.png differ diff --git a/Resources/Textures/Floof/Clothing/Departmental/Medical/surgeongeneralthong.rsi/inhand-left.png b/Resources/Textures/Floof/Clothing/Departmental/Medical/surgeongeneralthong.rsi/inhand-left.png new file mode 100644 index 00000000000..547c76b0433 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Departmental/Medical/surgeongeneralthong.rsi/inhand-left.png differ diff --git a/Resources/Textures/Floof/Clothing/Departmental/Medical/surgeongeneralthong.rsi/inhand-right.png b/Resources/Textures/Floof/Clothing/Departmental/Medical/surgeongeneralthong.rsi/inhand-right.png new file mode 100644 index 00000000000..b2d7472491e Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Departmental/Medical/surgeongeneralthong.rsi/inhand-right.png differ diff --git a/Resources/Textures/Floof/Clothing/Departmental/Medical/surgeongeneralthong.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Medical/surgeongeneralthong.rsi/meta.json new file mode 100644 index 00000000000..a32446e05b1 --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Departmental/Medical/surgeongeneralthong.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Dakota Haven - DiscordID '56038550335922176'", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Departmental/Security/corpsmansocks.rsi/equipped-FEET.png b/Resources/Textures/Floof/Clothing/Departmental/Security/corpsmansocks.rsi/equipped-FEET.png new file mode 100644 index 00000000000..4830d37a4de Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Departmental/Security/corpsmansocks.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Floof/Clothing/Departmental/Security/corpsmansocks.rsi/icon.png b/Resources/Textures/Floof/Clothing/Departmental/Security/corpsmansocks.rsi/icon.png new file mode 100644 index 00000000000..0d3c3bd7694 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Departmental/Security/corpsmansocks.rsi/icon.png differ diff --git a/Resources/Textures/Floof/Clothing/Departmental/Security/corpsmansocks.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Security/corpsmansocks.rsi/meta.json new file mode 100644 index 00000000000..d6f7f712f40 --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Departmental/Security/corpsmansocks.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Modified by Eagle0600. Original by Dakota Haven - DiscordID '56038550335922176'", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Departmental/Security/corpsmanthong.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Floof/Clothing/Departmental/Security/corpsmanthong.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..ef236a7902d Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Departmental/Security/corpsmanthong.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Floof/Clothing/Departmental/Security/corpsmanthong.rsi/icon.png b/Resources/Textures/Floof/Clothing/Departmental/Security/corpsmanthong.rsi/icon.png new file mode 100644 index 00000000000..aa8b6496dc3 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Departmental/Security/corpsmanthong.rsi/icon.png differ diff --git a/Resources/Textures/Floof/Clothing/Departmental/Security/corpsmanthong.rsi/inhand-left.png b/Resources/Textures/Floof/Clothing/Departmental/Security/corpsmanthong.rsi/inhand-left.png new file mode 100644 index 00000000000..09b29f5a96e Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Departmental/Security/corpsmanthong.rsi/inhand-left.png differ diff --git a/Resources/Textures/Floof/Clothing/Departmental/Security/corpsmanthong.rsi/inhand-right.png b/Resources/Textures/Floof/Clothing/Departmental/Security/corpsmanthong.rsi/inhand-right.png new file mode 100644 index 00000000000..73e0025bdf2 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Departmental/Security/corpsmanthong.rsi/inhand-right.png differ diff --git a/Resources/Textures/Floof/Clothing/Departmental/Security/corpsmanthong.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Security/corpsmanthong.rsi/meta.json new file mode 100644 index 00000000000..9a6b3b7c146 --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Departmental/Security/corpsmanthong.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Modified by Eagle0600. Original by Dakota Haven - DiscordID '56038550335922176'", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Departmental/Security/corpsmanwarmer.rsi/equipped-HAND.png b/Resources/Textures/Floof/Clothing/Departmental/Security/corpsmanwarmer.rsi/equipped-HAND.png new file mode 100644 index 00000000000..525396f7555 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Departmental/Security/corpsmanwarmer.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/Floof/Clothing/Departmental/Security/corpsmanwarmer.rsi/icon.png b/Resources/Textures/Floof/Clothing/Departmental/Security/corpsmanwarmer.rsi/icon.png new file mode 100644 index 00000000000..2ede1b264a2 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Departmental/Security/corpsmanwarmer.rsi/icon.png differ diff --git a/Resources/Textures/Floof/Clothing/Departmental/Security/corpsmanwarmer.rsi/meta.json b/Resources/Textures/Floof/Clothing/Departmental/Security/corpsmanwarmer.rsi/meta.json new file mode 100644 index 00000000000..5198642dfd7 --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Departmental/Security/corpsmanwarmer.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Modified by Eagle0600. Original by Dakota Haven - DiscordID '56038550335922176'", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Head/Hoods/surgeongeneralhood.rsi/equipped-HELMET.png b/Resources/Textures/Floof/Clothing/Head/Hoods/surgeongeneralhood.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..412054afd45 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Head/Hoods/surgeongeneralhood.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Floof/Clothing/Head/Hoods/surgeongeneralhood.rsi/icon.png b/Resources/Textures/Floof/Clothing/Head/Hoods/surgeongeneralhood.rsi/icon.png new file mode 100644 index 00000000000..0d3487a2460 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Head/Hoods/surgeongeneralhood.rsi/icon.png differ diff --git a/Resources/Textures/Floof/Clothing/Head/Hoods/surgeongeneralhood.rsi/meta.json b/Resources/Textures/Floof/Clothing/Head/Hoods/surgeongeneralhood.rsi/meta.json new file mode 100644 index 00000000000..e1f133a034c --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Head/Hoods/surgeongeneralhood.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "By Gotimanga for SS14, Modified by VividPups", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Head/surgeongeneralberet.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Floof/Clothing/Head/surgeongeneralberet.rsi/equipped-HELMET-hamster.png new file mode 100644 index 00000000000..1f223c024aa Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Head/surgeongeneralberet.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Floof/Clothing/Head/surgeongeneralberet.rsi/equipped-HELMET.png b/Resources/Textures/Floof/Clothing/Head/surgeongeneralberet.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..74b9ab4283b Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Head/surgeongeneralberet.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Floof/Clothing/Head/surgeongeneralberet.rsi/icon.png b/Resources/Textures/Floof/Clothing/Head/surgeongeneralberet.rsi/icon.png new file mode 100644 index 00000000000..9019f9ee53c Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Head/surgeongeneralberet.rsi/icon.png differ diff --git a/Resources/Textures/Floof/Clothing/Head/surgeongeneralberet.rsi/inhand-left.png b/Resources/Textures/Floof/Clothing/Head/surgeongeneralberet.rsi/inhand-left.png new file mode 100644 index 00000000000..0a03428c34b Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Head/surgeongeneralberet.rsi/inhand-left.png differ diff --git a/Resources/Textures/Floof/Clothing/Head/surgeongeneralberet.rsi/inhand-right.png b/Resources/Textures/Floof/Clothing/Head/surgeongeneralberet.rsi/inhand-right.png new file mode 100644 index 00000000000..815f08f17df Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Head/surgeongeneralberet.rsi/inhand-right.png differ diff --git a/Resources/Textures/Floof/Clothing/Head/surgeongeneralberet.rsi/meta.json b/Resources/Textures/Floof/Clothing/Head/surgeongeneralberet.rsi/meta.json new file mode 100644 index 00000000000..28c0ce98f0d --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Head/surgeongeneralberet.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by 𝘽𝙚𝙡𝙖𝙮#7441, Modified by VividPups", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Neck/surgeongeneralcloak.rsi/equipped-NECK.png b/Resources/Textures/Floof/Clothing/Neck/surgeongeneralcloak.rsi/equipped-NECK.png new file mode 100644 index 00000000000..65be19efd73 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Neck/surgeongeneralcloak.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Floof/Clothing/Neck/surgeongeneralcloak.rsi/icon.png b/Resources/Textures/Floof/Clothing/Neck/surgeongeneralcloak.rsi/icon.png new file mode 100644 index 00000000000..9bbc373a42d Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Neck/surgeongeneralcloak.rsi/icon.png differ diff --git a/Resources/Textures/Floof/Clothing/Neck/surgeongeneralcloak.rsi/inhand-left.png b/Resources/Textures/Floof/Clothing/Neck/surgeongeneralcloak.rsi/inhand-left.png new file mode 100644 index 00000000000..6855aa0ac1f Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Neck/surgeongeneralcloak.rsi/inhand-left.png differ diff --git a/Resources/Textures/Floof/Clothing/Neck/surgeongeneralcloak.rsi/inhand-right.png b/Resources/Textures/Floof/Clothing/Neck/surgeongeneralcloak.rsi/inhand-right.png new file mode 100644 index 00000000000..dc8896949fd Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Neck/surgeongeneralcloak.rsi/inhand-right.png differ diff --git a/Resources/Textures/Floof/Clothing/Neck/surgeongeneralcloak.rsi/meta.json b/Resources/Textures/Floof/Clothing/Neck/surgeongeneralcloak.rsi/meta.json new file mode 100644 index 00000000000..5a9f987fe81 --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Neck/surgeongeneralcloak.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875, Modified by Vividpups for floof", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/Hardsuits/surgengeneralhardsuit.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Floof/Clothing/OuterClothing/Hardsuits/surgengeneralhardsuit.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..2cea1028e26 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/OuterClothing/Hardsuits/surgengeneralhardsuit.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/Hardsuits/surgengeneralhardsuit.rsi/icon.png b/Resources/Textures/Floof/Clothing/OuterClothing/Hardsuits/surgengeneralhardsuit.rsi/icon.png new file mode 100644 index 00000000000..ef8e5504bf7 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/OuterClothing/Hardsuits/surgengeneralhardsuit.rsi/icon.png differ diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/Hardsuits/surgengeneralhardsuit.rsi/inhand-left.png b/Resources/Textures/Floof/Clothing/OuterClothing/Hardsuits/surgengeneralhardsuit.rsi/inhand-left.png new file mode 100644 index 00000000000..b9e5c3bd564 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/OuterClothing/Hardsuits/surgengeneralhardsuit.rsi/inhand-left.png differ diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/Hardsuits/surgengeneralhardsuit.rsi/inhand-right.png b/Resources/Textures/Floof/Clothing/OuterClothing/Hardsuits/surgengeneralhardsuit.rsi/inhand-right.png new file mode 100644 index 00000000000..343babe1585 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/OuterClothing/Hardsuits/surgengeneralhardsuit.rsi/inhand-right.png differ diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/Hardsuits/surgengeneralhardsuit.rsi/meta.json b/Resources/Textures/Floof/Clothing/OuterClothing/Hardsuits/surgengeneralhardsuit.rsi/meta.json new file mode 100644 index 00000000000..a11634c725b --- /dev/null +++ b/Resources/Textures/Floof/Clothing/OuterClothing/Hardsuits/surgengeneralhardsuit.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6. Modified by Vividpups for surgeon general", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/WinterCoats/coatsg.rsi/equipped-OUTERCLOTHING-resomi.png b/Resources/Textures/Floof/Clothing/OuterClothing/WinterCoats/coatsg.rsi/equipped-OUTERCLOTHING-resomi.png new file mode 100644 index 00000000000..d10fcdb771c Binary files /dev/null and b/Resources/Textures/Floof/Clothing/OuterClothing/WinterCoats/coatsg.rsi/equipped-OUTERCLOTHING-resomi.png differ diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/WinterCoats/coatsg.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Floof/Clothing/OuterClothing/WinterCoats/coatsg.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..d44eb8af301 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/OuterClothing/WinterCoats/coatsg.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/WinterCoats/coatsg.rsi/icon.png b/Resources/Textures/Floof/Clothing/OuterClothing/WinterCoats/coatsg.rsi/icon.png new file mode 100644 index 00000000000..55467dfa4ac Binary files /dev/null and b/Resources/Textures/Floof/Clothing/OuterClothing/WinterCoats/coatsg.rsi/icon.png differ diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/WinterCoats/coatsg.rsi/inhand-left.png b/Resources/Textures/Floof/Clothing/OuterClothing/WinterCoats/coatsg.rsi/inhand-left.png new file mode 100644 index 00000000000..d79f54c2828 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/OuterClothing/WinterCoats/coatsg.rsi/inhand-left.png differ diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/WinterCoats/coatsg.rsi/inhand-right.png b/Resources/Textures/Floof/Clothing/OuterClothing/WinterCoats/coatsg.rsi/inhand-right.png new file mode 100644 index 00000000000..d5a99df855e Binary files /dev/null and b/Resources/Textures/Floof/Clothing/OuterClothing/WinterCoats/coatsg.rsi/inhand-right.png differ diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/WinterCoats/coatsg.rsi/meta.json b/Resources/Textures/Floof/Clothing/OuterClothing/WinterCoats/coatsg.rsi/meta.json new file mode 100644 index 00000000000..2b565837e2c --- /dev/null +++ b/Resources/Textures/Floof/Clothing/OuterClothing/WinterCoats/coatsg.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62, equipped-OUTERCLOTHING-resomi made by Pofitlo, Modified by VividPups", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-resomi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Objects/Misc/stamp.rsi/meta.json b/Resources/Textures/Floof/Objects/Misc/stamp.rsi/meta.json new file mode 100644 index 00000000000..5fda77f89b3 --- /dev/null +++ b/Resources/Textures/Floof/Objects/Misc/stamp.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from SS14 and modified by VividPups", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "stamp-sg" + } + ] +} diff --git a/Resources/Textures/Floof/Objects/Misc/stamp.rsi/stamp-sg.png b/Resources/Textures/Floof/Objects/Misc/stamp.rsi/stamp-sg.png new file mode 100644 index 00000000000..76b0e592baf Binary files /dev/null and b/Resources/Textures/Floof/Objects/Misc/stamp.rsi/stamp-sg.png differ diff --git a/Resources/Textures/Floof/Structures/Lockers/surgeongeneral.rsi/generic.png b/Resources/Textures/Floof/Structures/Lockers/surgeongeneral.rsi/generic.png new file mode 100644 index 00000000000..cd0c0ff2ea1 Binary files /dev/null and b/Resources/Textures/Floof/Structures/Lockers/surgeongeneral.rsi/generic.png differ diff --git a/Resources/Textures/Floof/Structures/Lockers/surgeongeneral.rsi/generic_door.png b/Resources/Textures/Floof/Structures/Lockers/surgeongeneral.rsi/generic_door.png new file mode 100644 index 00000000000..26498527779 Binary files /dev/null and b/Resources/Textures/Floof/Structures/Lockers/surgeongeneral.rsi/generic_door.png differ diff --git a/Resources/Textures/Floof/Structures/Lockers/surgeongeneral.rsi/generic_icon.png b/Resources/Textures/Floof/Structures/Lockers/surgeongeneral.rsi/generic_icon.png new file mode 100644 index 00000000000..2487eae1fdd Binary files /dev/null and b/Resources/Textures/Floof/Structures/Lockers/surgeongeneral.rsi/generic_icon.png differ diff --git a/Resources/Textures/Floof/Structures/Lockers/surgeongeneral.rsi/generic_open.png b/Resources/Textures/Floof/Structures/Lockers/surgeongeneral.rsi/generic_open.png new file mode 100644 index 00000000000..01ed5bf73b6 Binary files /dev/null and b/Resources/Textures/Floof/Structures/Lockers/surgeongeneral.rsi/generic_open.png differ diff --git a/Resources/Textures/Floof/Structures/Lockers/surgeongeneral.rsi/locked.png b/Resources/Textures/Floof/Structures/Lockers/surgeongeneral.rsi/locked.png new file mode 100644 index 00000000000..d90218d19e2 Binary files /dev/null and b/Resources/Textures/Floof/Structures/Lockers/surgeongeneral.rsi/locked.png differ diff --git a/Resources/Textures/Floof/Structures/Lockers/surgeongeneral.rsi/meta.json b/Resources/Textures/Floof/Structures/Lockers/surgeongeneral.rsi/meta.json new file mode 100644 index 00000000000..2f43b0113ee --- /dev/null +++ b/Resources/Textures/Floof/Structures/Lockers/surgeongeneral.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "copyright": "Taken from tgstation, Taken from Wizden, Modified by VividPups for Surgeon general ", + "license": "CC-BY-SA-3.0", + "states": [ + { + "name": "surgeon_secure_door" + }, + { + "name": "surgeon_secure_open" + }, + { + "name": "surgeon_secure" + }, + { + "name": "locked" + }, + { + "name": "unlocked" + }, + { + "name": "generic" + }, + { + "name": "generic_icon" + }, + { + "name": "generic_door" + }, + { + "name": "generic_open" + }, + { + "name": "welded" + } + ] +} diff --git a/Resources/Textures/Floof/Structures/Lockers/surgeongeneral.rsi/surgeon_secure.png b/Resources/Textures/Floof/Structures/Lockers/surgeongeneral.rsi/surgeon_secure.png new file mode 100644 index 00000000000..33ec5461f35 Binary files /dev/null and b/Resources/Textures/Floof/Structures/Lockers/surgeongeneral.rsi/surgeon_secure.png differ diff --git a/Resources/Textures/Floof/Structures/Lockers/surgeongeneral.rsi/surgeon_secure_door.png b/Resources/Textures/Floof/Structures/Lockers/surgeongeneral.rsi/surgeon_secure_door.png new file mode 100644 index 00000000000..3f6161d4a48 Binary files /dev/null and b/Resources/Textures/Floof/Structures/Lockers/surgeongeneral.rsi/surgeon_secure_door.png differ diff --git a/Resources/Textures/Floof/Structures/Lockers/surgeongeneral.rsi/surgeon_secure_open.png b/Resources/Textures/Floof/Structures/Lockers/surgeongeneral.rsi/surgeon_secure_open.png new file mode 100644 index 00000000000..64c556d3ed2 Binary files /dev/null and b/Resources/Textures/Floof/Structures/Lockers/surgeongeneral.rsi/surgeon_secure_open.png differ diff --git a/Resources/Textures/Floof/Structures/Lockers/surgeongeneral.rsi/unlocked.png b/Resources/Textures/Floof/Structures/Lockers/surgeongeneral.rsi/unlocked.png new file mode 100644 index 00000000000..418607bfaf5 Binary files /dev/null and b/Resources/Textures/Floof/Structures/Lockers/surgeongeneral.rsi/unlocked.png differ diff --git a/Resources/Textures/Floof/Structures/Lockers/surgeongeneral.rsi/welded.png b/Resources/Textures/Floof/Structures/Lockers/surgeongeneral.rsi/welded.png new file mode 100644 index 00000000000..5ba5dcc8962 Binary files /dev/null and b/Resources/Textures/Floof/Structures/Lockers/surgeongeneral.rsi/welded.png differ diff --git a/Resources/Textures/_DV/Objects/Misc/stickies.rsi/meta.json b/Resources/Textures/_DV/Objects/Misc/stickies.rsi/meta.json new file mode 100644 index 00000000000..aaca7900c9c --- /dev/null +++ b/Resources/Textures/_DV/Objects/Misc/stickies.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "sticky_note/sticky_note_wordssticky_note_dispenser_base/sticky_note_dispenser_bin1/sticky_note_dispenser_bin2/sticky_note_dispenser_bin3/sticky_note_dispenser_bin4/sticky_note_dispenser_bin5 by Janet Blackquill 2025", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "sticky_note" + }, + { + "name": "sticky_note_words" + }, + { + "name": "sticky_note_dispenser_base" + }, + { + "name": "sticky_note_dispenser_bin1" + }, + { + "name": "sticky_note_dispenser_bin2" + }, + { + "name": "sticky_note_dispenser_bin3" + }, + { + "name": "sticky_note_dispenser_bin4" + }, + { + "name": "sticky_note_dispenser_bin5" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_DV/Objects/Misc/stickies.rsi/sticky_note.png b/Resources/Textures/_DV/Objects/Misc/stickies.rsi/sticky_note.png new file mode 100644 index 00000000000..8368415c08d Binary files /dev/null and b/Resources/Textures/_DV/Objects/Misc/stickies.rsi/sticky_note.png differ diff --git a/Resources/Textures/_DV/Objects/Misc/stickies.rsi/sticky_note_dispenser_base.png b/Resources/Textures/_DV/Objects/Misc/stickies.rsi/sticky_note_dispenser_base.png new file mode 100644 index 00000000000..52f22d57f27 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Misc/stickies.rsi/sticky_note_dispenser_base.png differ diff --git a/Resources/Textures/_DV/Objects/Misc/stickies.rsi/sticky_note_dispenser_bin1.png b/Resources/Textures/_DV/Objects/Misc/stickies.rsi/sticky_note_dispenser_bin1.png new file mode 100644 index 00000000000..6ee1532449a Binary files /dev/null and b/Resources/Textures/_DV/Objects/Misc/stickies.rsi/sticky_note_dispenser_bin1.png differ diff --git a/Resources/Textures/_DV/Objects/Misc/stickies.rsi/sticky_note_dispenser_bin2.png b/Resources/Textures/_DV/Objects/Misc/stickies.rsi/sticky_note_dispenser_bin2.png new file mode 100644 index 00000000000..f662ff67fc8 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Misc/stickies.rsi/sticky_note_dispenser_bin2.png differ diff --git a/Resources/Textures/_DV/Objects/Misc/stickies.rsi/sticky_note_dispenser_bin3.png b/Resources/Textures/_DV/Objects/Misc/stickies.rsi/sticky_note_dispenser_bin3.png new file mode 100644 index 00000000000..f7c166c9760 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Misc/stickies.rsi/sticky_note_dispenser_bin3.png differ diff --git a/Resources/Textures/_DV/Objects/Misc/stickies.rsi/sticky_note_dispenser_bin4.png b/Resources/Textures/_DV/Objects/Misc/stickies.rsi/sticky_note_dispenser_bin4.png new file mode 100644 index 00000000000..72f56cad071 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Misc/stickies.rsi/sticky_note_dispenser_bin4.png differ diff --git a/Resources/Textures/_DV/Objects/Misc/stickies.rsi/sticky_note_dispenser_bin5.png b/Resources/Textures/_DV/Objects/Misc/stickies.rsi/sticky_note_dispenser_bin5.png new file mode 100644 index 00000000000..239d23f513e Binary files /dev/null and b/Resources/Textures/_DV/Objects/Misc/stickies.rsi/sticky_note_dispenser_bin5.png differ diff --git a/Resources/Textures/_DV/Objects/Misc/stickies.rsi/sticky_note_words.png b/Resources/Textures/_DV/Objects/Misc/stickies.rsi/sticky_note_words.png new file mode 100644 index 00000000000..f573ad92f87 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Misc/stickies.rsi/sticky_note_words.png differ