diff --git a/Content.Server/Objectives/Systems/KillPersonConditionSystem.cs b/Content.Server/Objectives/Systems/KillPersonConditionSystem.cs index bd062e74560..9d9c6aa7f31 100644 --- a/Content.Server/Objectives/Systems/KillPersonConditionSystem.cs +++ b/Content.Server/Objectives/Systems/KillPersonConditionSystem.cs @@ -41,18 +41,18 @@ private void OnGetProgress(EntityUid uid, KillPersonConditionComponent comp, ref private void OnPersonAssigned(Entity ent, ref ObjectiveAssignedEvent args) { - AssignRandomTarget(ent, args, _ => true); + AssignRandomTarget(ent, ref args, _ => true); } private void OnHeadAssigned(Entity ent, ref ObjectiveAssignedEvent args) { - AssignRandomTarget(ent, args, mindId => + AssignRandomTarget(ent, ref args, mindId => TryComp(mindId, out var mind) && mind.OwnedEntity is { } ownedEnt && HasComp(ownedEnt)); } - private void AssignRandomTarget(EntityUid uid, ObjectiveAssignedEvent args, Predicate filter, bool fallbackToAny = true) + private void AssignRandomTarget(EntityUid uid, ref ObjectiveAssignedEvent args, Predicate filter, bool fallbackToAny = true) { // invalid prototype if (!TryComp(uid, out var target)) @@ -97,6 +97,13 @@ private void AssignRandomTarget(EntityUid uid, ObjectiveAssignedEvent args, Pred // Pick between humans matching our filter or fall back to all humans alive var selectedHumans = filteredHumans.Count > 0 ? filteredHumans : allHumans; + // Still no valid targets even after the fallback + if (selectedHumans.Count == 0) + { + args.Cancelled = true; + return; + } + _target.SetTarget(uid, _random.Pick(selectedHumans), target); } diff --git a/Content.Shared/Humanoid/HumanoidVisualLayers.cs b/Content.Shared/Humanoid/HumanoidVisualLayers.cs index cecd8a1c13e..f55ee48d17e 100644 --- a/Content.Shared/Humanoid/HumanoidVisualLayers.cs +++ b/Content.Shared/Humanoid/HumanoidVisualLayers.cs @@ -11,6 +11,8 @@ public enum HumanoidVisualLayers : byte Hair, FacialHair, Chest, + Underwear, // DeltaV + Undershirt, // DeltaV Head, Snout, HeadSide, // side parts (i.e., frills) diff --git a/Content.Shared/Humanoid/Markings/MarkingCategories.cs b/Content.Shared/Humanoid/Markings/MarkingCategories.cs index db82fb1fd3d..062ed4c4f5e 100644 --- a/Content.Shared/Humanoid/Markings/MarkingCategories.cs +++ b/Content.Shared/Humanoid/Markings/MarkingCategories.cs @@ -13,6 +13,8 @@ public enum MarkingCategories : byte HeadSide, Snout, Chest, + Underwear, // DeltaV + Undershirt, // DeltaV Arms, Legs, Tail, @@ -32,6 +34,8 @@ public static MarkingCategories FromHumanoidVisualLayers(HumanoidVisualLayers la HumanoidVisualLayers.HeadTop => MarkingCategories.HeadTop, HumanoidVisualLayers.HeadSide => MarkingCategories.HeadSide, HumanoidVisualLayers.Snout => MarkingCategories.Snout, + HumanoidVisualLayers.Undershirt => MarkingCategories.Undershirt, // DeltaV + HumanoidVisualLayers.Underwear => MarkingCategories.Underwear, // DeltaV HumanoidVisualLayers.Chest => MarkingCategories.Chest, HumanoidVisualLayers.RArm => MarkingCategories.Arms, HumanoidVisualLayers.LArm => MarkingCategories.Arms, diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 059eceb7cde..ed243a30ff8 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,34 +1,4 @@ Entries: -- author: deltanedas - changes: - - message: CentComm now has a justice department if you want to use it for admemes. - type: Tweak - id: 408 - time: '2024-06-19T14:48:59.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1352 -- author: Velcroboy - changes: - - message: Added the NTES-Fishbowl, a stylish new ride to Centcomm from The Hive - Station - type: Add - id: 409 - time: '2024-06-20T17:32:27.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1417 -- author: Lyndomen - changes: - - message: Sleeper Agents are waking up! - type: Add - id: 410 - time: '2024-06-20T20:36:51.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1389 -- author: deltanedas - changes: - - message: Fugitives can now be wanted by GALPOL, they might even be hiding in your - very station! - type: Add - id: 411 - time: '2024-06-30T19:40:33.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1413 - author: Lyndomen changes: - message: Death Acidifiers are now in Syndicate Uplinks once more @@ -3854,3 +3824,35 @@ id: 907 time: '2025-01-14T01:39:32.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2720 +- author: beck-thompson + changes: + - message: Lone ops can now no longer be targeted by kill objectives + type: Fix + id: 908 + time: '2025-01-14T05:31:53.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2724 +- author: alterae + changes: + - message: Ported undergarments from Impstation + type: Add + - message: Slimefolk can now wear chest tattoos + type: Tweak + id: 909 + time: '2025-01-14T05:56:24.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2719 +- author: Velcroboy + changes: + - message: Added science! Smile the Slime can be created in the science lab through + a mixture of reagents and a special brain. + type: Add + id: 910 + time: '2025-01-14T14:17:02.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2632 +- author: Radezolid + changes: + - message: CMO's locker now starts with a medical biofabricator flatpack instead + of it's machine board. + type: Tweak + id: 911 + time: '2025-01-14T15:04:14.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2722 diff --git a/Resources/Locale/en-US/_DV/markings/tattoos.ftl b/Resources/Locale/en-US/_DV/markings/tattoos.ftl index d62a118a890..48000f66415 100644 --- a/Resources/Locale/en-US/_DV/markings/tattoos.ftl +++ b/Resources/Locale/en-US/_DV/markings/tattoos.ftl @@ -6,3 +6,6 @@ marking-TattooNightlingChestMale = Chest Tattoo (Nightling) marking-TattooNightlingChestFemale-tattoo_nightling_female = Chest Tattoo (Nightling) marking-TattooNightlingChestFemale = Chest Tattoo (Nightling) + +marking-TattooNanotrasenChest-tattoo_nanotrasen_chest = Chest Tattoo (Nanotrasen) +marking-TattooNanotrasenChest = Chest Tattoo (Nanotrasen) diff --git a/Resources/Locale/en-US/_DV/preferences/ui/markings-picker.ftl b/Resources/Locale/en-US/_DV/preferences/ui/markings-picker.ftl new file mode 100644 index 00000000000..dde065d59e0 --- /dev/null +++ b/Resources/Locale/en-US/_DV/preferences/ui/markings-picker.ftl @@ -0,0 +1,2 @@ +markings-category-Undershirt = Undershirt +markings-category-Underwear = Underwear diff --git a/Resources/Locale/en-US/_DV/reagents/meta/biological.ftl b/Resources/Locale/en-US/_DV/reagents/meta/biological.ftl new file mode 100644 index 00000000000..d3fcceb245f --- /dev/null +++ b/Resources/Locale/en-US/_DV/reagents/meta/biological.ftl @@ -0,0 +1,2 @@ +reagent-name-sentient-grey-matter = sentient grey matter +reagent-desc-sentient-grey-matter = Thought juice, the stuff that leaks out of your ears. It seems to be sparkling when you look at it in the right light. That's odd... diff --git a/Resources/Locale/en-US/_Impstation/markings/undershirt.ftl b/Resources/Locale/en-US/_Impstation/markings/undershirt.ftl new file mode 100644 index 00000000000..62ba91032af --- /dev/null +++ b/Resources/Locale/en-US/_Impstation/markings/undershirt.ftl @@ -0,0 +1,29 @@ +marking-UndershirtDefault-undershirt = Undershirt +marking-UndershirtDefault = Undershirt (Default) + +marking-UndershirtRolled-rolled_undershirt = Undershirt +marking-UndershirtRolled = Undershirt (Rolled) + +marking-UndershirtSleeveless-sleeveless = Tanktop +marking-UndershirtSleeveless = Tanktop + +marking-UndershirtGrossSleeveless-gross_sleeveless = Tanktop +marking-UndershirtGrossSleeveless = Tanktop (Gross) + +marking-UndershirtRolledSleeveless-rolled_undershirt_sleeveless = Tanktop +marking-UndershirtRolledSleeveless = Tanktop (Rolled) + +marking-UndershirtNanotrasen-nanotrasen = Undershirt +marking-UndershirtNanotrasen = Undershirt (Nanotrasen) + +marking-UndershirtBinder-binder = Binder +marking-UndershirtBinder = Binder + +marking-UndershirtBraClassic-classic = Bra +marking-UndershirtBraClassic = Bra (Classic) + +marking-UndershirtBraSports-sports = Bra +marking-UndershirtBraSports = Bra (Sports) + +marking-UndershirtBraStrapless-strapless = Bra +marking-UndershirtBraStrapless = Bra (Strapless) diff --git a/Resources/Locale/en-US/_Impstation/markings/underwear.ftl b/Resources/Locale/en-US/_Impstation/markings/underwear.ftl new file mode 100644 index 00000000000..23fbf04b23f --- /dev/null +++ b/Resources/Locale/en-US/_Impstation/markings/underwear.ftl @@ -0,0 +1,10 @@ +marking-UnderwearDefault-boxers = Underwear +marking-UnderwearDefault = Underwear (Default) +marking-UnderwearBriefs-briefs = Underwear +marking-UnderwearBriefs = Underwear (Briefs) +marking-UnderwearLowriders-lowriders = Underwear +marking-UnderwearLowriders = Underwear (Lowriders) +marking-UnderwearSatin-satin = Underwear +marking-UnderwearSatin = Underwear (Satin) +marking-UnderwearTanga-tanga = Underwear +marking-UnderwearTanga = Underwear (Tanga) diff --git a/Resources/Maps/glacier.yml b/Resources/Maps/glacier.yml index 1a32685837f..50afc8ade06 100644 --- a/Resources/Maps/glacier.yml +++ b/Resources/Maps/glacier.yml @@ -273,7 +273,7 @@ entities: version: 6 2,-2: ind: 2,-2 - tiles: UQAAAAAAGAAAAAAAGAAAAAACGAAAAAADGAAAAAAAGAAAAAAAYQAAAAAAGAAAAAAAGAAAAAABGAAAAAACGAAAAAAAYQAAAAAACQAAAAAACQAAAAAACQAAAAAAAAAAAAAAPQAAAAAAGAAAAAABGAAAAAAAGAAAAAACGAAAAAABGAAAAAAANwAAAAAAGAAAAAAAGAAAAAABYQAAAAAAYQAAAAAAYQAAAAAACQAAAAAACQAAAAAICQAAAAAECQAAAAAAYQAAAAAAYQAAAAAAGAAAAAADGAAAAAADGAAAAAADYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAACQAAAAAACQAAAAAACQAAAAADCQAAAAAACQAAAAAACQAAAAAAUQAAAAAAPQAAAAAAYQAAAAAAYQAAAAAAGAAAAAABYQAAAAAAOwAAAAADOwAAAAABOwAAAAABYQAAAAAACQAAAAAACQAAAAAACQAAAAAFCQAAAAAACQAAAAAACQAAAAAAUQAAAAAAPQAAAAAAGAAAAAADGAAAAAAAGAAAAAACYQAAAAAAOwAAAAACOwAAAAAAOwAAAAABYQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAYQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAYQAAAAAAGAAAAAACGAAAAAAAGAAAAAAANwAAAAAAOwAAAAABOwAAAAADOwAAAAAAYQAAAAAAXgAAAAABXgAAAAADXgAAAAADXgAAAAABIQAAAAABIQAAAAADGAAAAAADGAAAAAACGAAAAAACGAAAAAAAGAAAAAAAPQAAAAAAOwAAAAAAOwAAAAAAOwAAAAACYQAAAAAAXgAAAAAAXgAAAAAAXgAAAAABXgAAAAAAIQAAAAAAIQAAAAABGAAAAAADGAAAAAAAGAAAAAAAGAAAAAAAGAAAAAACPQAAAAAAOwAAAAACOwAAAAADOwAAAAACYQAAAAAAIQAAAAADIQAAAAABIQAAAAACIQAAAAAAIQAAAAADIQAAAAABGAAAAAADGAAAAAACGAAAAAACGAAAAAADGAAAAAADYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAIQAAAAADIQAAAAACIQAAAAACIQAAAAADIQAAAAACIQAAAAAAGAAAAAACGAAAAAAAGAAAAAACGAAAAAADGAAAAAADGAAAAAADGAAAAAACGAAAAAACNwAAAAAAIQAAAAADIQAAAAAAAQAAAAADAQAAAAADAQAAAAACAQAAAAAAAQAAAAADGAAAAAACGAAAAAABGAAAAAADGAAAAAAAGAAAAAACGAAAAAACGAAAAAAAGAAAAAACYQAAAAAAIQAAAAADIQAAAAABAQAAAAAAAQAAAAAAAQAAAAABAQAAAAADAQAAAAADGAAAAAABPQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAIQAAAAADIQAAAAABAQAAAAACAQAAAAABAQAAAAAAAQAAAAADAQAAAAADHwAAAAACHwAAAAACYQAAAAAAGAAAAAADGAAAAAADGAAAAAADYQAAAAAAFgAAAAADYQAAAAAAYQAAAAAAPQAAAAAANwAAAAAANwAAAAAAPQAAAAAAPQAAAAAAYQAAAAAAHwAAAAACHwAAAAABNwAAAAAAGAAAAAACGAAAAAAAGAAAAAABYQAAAAAACQAAAAAACQAAAAABCQAAAAAACQAAAAAASwAAAAABSwAAAAADCQAAAAAACQAAAAAACQAAAAAAGAAAAAACGAAAAAABNwAAAAAAGAAAAAAAGAAAAAACGAAAAAAAYQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAISwAAAAADSwAAAAADCQAAAAAACQAAAAAACQAAAAALHwAAAAAAHwAAAAADPQAAAAAAGAAAAAADGAAAAAACGAAAAAAAYQAAAAAACQAAAAAACQAAAAAAFQAAAAACCQAAAAAASwAAAAAASwAAAAAACQAAAAAACQAAAAAACQAAAAAA + tiles: UQAAAAAAGAAAAAAAGAAAAAACGAAAAAADGAAAAAAAGAAAAAAAYQAAAAAAGAAAAAAAGAAAAAABGAAAAAACGAAAAAAAYQAAAAAACQAAAAAACQAAAAAACQAAAAAAAAAAAAAAPQAAAAAAGAAAAAABGAAAAAAAGAAAAAACGAAAAAABGAAAAAAANwAAAAAAGAAAAAAAGAAAAAABYQAAAAAAYQAAAAAAYQAAAAAACQAAAAAACQAAAAAICQAAAAAECQAAAAAAYQAAAAAAYQAAAAAAGAAAAAADGAAAAAADGAAAAAADYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAACQAAAAAACQAAAAAACQAAAAADCQAAAAAACQAAAAAACQAAAAAAUQAAAAAAPQAAAAAAYQAAAAAAYQAAAAAAGAAAAAABYQAAAAAAOwAAAAADOwAAAAABOwAAAAABYQAAAAAACQAAAAAACQAAAAAACQAAAAAFCQAAAAAACQAAAAAACQAAAAAAUQAAAAAAPQAAAAAAGAAAAAADGAAAAAAAGAAAAAACYQAAAAAAOwAAAAACOwAAAAAAOwAAAAABYQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAYQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAYQAAAAAAGAAAAAACGAAAAAAAGAAAAAAANwAAAAAAOwAAAAABOwAAAAADOwAAAAAAYQAAAAAAXgAAAAABXgAAAAADXgAAAAADXgAAAAABIQAAAAABIQAAAAADGAAAAAADGAAAAAACGAAAAAACGAAAAAAAGAAAAAAAPQAAAAAAOwAAAAAAOwAAAAAAOwAAAAACYQAAAAAAXgAAAAAAXgAAAAAAXgAAAAABXgAAAAAAIQAAAAAAIQAAAAABGAAAAAADGAAAAAAAGAAAAAAAGAAAAAAAGAAAAAACPQAAAAAAOwAAAAACOwAAAAADOwAAAAACYQAAAAAAIQAAAAADIQAAAAABIQAAAAACIQAAAAAAIQAAAAADIQAAAAABGAAAAAADGAAAAAACGAAAAAAAGAAAAAADGAAAAAADYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAIQAAAAADIQAAAAACIQAAAAACIQAAAAADIQAAAAACIQAAAAAAGAAAAAACGAAAAAAAGAAAAAAAGAAAAAADGAAAAAADGAAAAAADGAAAAAACGAAAAAACNwAAAAAAIQAAAAADIQAAAAAAAQAAAAADAQAAAAADAQAAAAACAQAAAAAAAQAAAAADGAAAAAACGAAAAAABGAAAAAADGAAAAAAAGAAAAAACGAAAAAACGAAAAAAAGAAAAAACYQAAAAAAIQAAAAADIQAAAAABAQAAAAAAAQAAAAAAAQAAAAABAQAAAAADAQAAAAADGAAAAAABPQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAIQAAAAADIQAAAAABAQAAAAACAQAAAAABAQAAAAAAAQAAAAADAQAAAAADHwAAAAACHwAAAAACYQAAAAAAGAAAAAADGAAAAAADGAAAAAADYQAAAAAAFgAAAAADYQAAAAAAYQAAAAAAPQAAAAAANwAAAAAANwAAAAAAPQAAAAAAPQAAAAAAYQAAAAAAHwAAAAACHwAAAAABNwAAAAAAGAAAAAACGAAAAAAAGAAAAAABYQAAAAAACQAAAAAACQAAAAABCQAAAAAACQAAAAAASwAAAAABSwAAAAADCQAAAAAACQAAAAAACQAAAAAAGAAAAAACGAAAAAABNwAAAAAAGAAAAAAAGAAAAAACGAAAAAAAYQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAISwAAAAADSwAAAAADCQAAAAAACQAAAAAACQAAAAALHwAAAAAAHwAAAAADPQAAAAAAGAAAAAADGAAAAAACGAAAAAAAYQAAAAAACQAAAAAACQAAAAAAFQAAAAACCQAAAAAASwAAAAAASwAAAAAACQAAAAAACQAAAAAACQAAAAAA version: 6 3,-2: ind: 3,-2 @@ -281,7 +281,7 @@ entities: version: 6 1,-2: ind: 1,-2 - tiles: FQAAAAAAFQAAAAAEFQAAAAABFQAAAAAECQAAAAAACQAAAAAAPQAAAAAAXgAAAAABXgAAAAAAXgAAAAAAYQAAAAAAHAAAAAAAHAAAAAACYQAAAAAAPQAAAAAAYQAAAAAAFQAAAAAGFQAAAAAAFQAAAAAEFQAAAAABFQAAAAAGFQAAAAAFYQAAAAAAXgAAAAABXgAAAAACXgAAAAACNwAAAAAAHAAAAAACHAAAAAABYQAAAAAAPQAAAAAAYQAAAAAAFQAAAAAEFQAAAAACFQAAAAABUgAAAAAAFQAAAAADUgAAAAAAYQAAAAAAPQAAAAAAPQAAAAAAYQAAAAAAYQAAAAAAHAAAAAADHAAAAAABYQAAAAAAYQAAAAAAUQAAAAAAFQAAAAACFQAAAAACFQAAAAADUgAAAAAAFQAAAAABFQAAAAACYQAAAAAAOwAAAAAAOwAAAAAAOwAAAAABPQAAAAAAHAAAAAABHAAAAAADYQAAAAAAPQAAAAAAYQAAAAAAFQAAAAAGFQAAAAAGYQAAAAAAYQAAAAAAYQAAAAAAUQAAAAAAYQAAAAAAOwAAAAACOwAAAAACOwAAAAAANwAAAAAAHAAAAAAAHAAAAAAAYQAAAAAAPQAAAAAAYQAAAAAAFQAAAAADFQAAAAAAFQAAAAACFQAAAAABFQAAAAAFFQAAAAABYQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAYQAAAAAAHAAAAAABHAAAAAABYQAAAAAAPQAAAAAAPQAAAAAAFQAAAAAAFQAAAAADFQAAAAADFQAAAAAEFQAAAAAAFQAAAAAGYQAAAAAAGAAAAAADGAAAAAADGAAAAAABGAAAAAABHAAAAAAAHAAAAAACHAAAAAAAGAAAAAABGAAAAAADFQAAAAAAFQAAAAACFQAAAAACFQAAAAAFFQAAAAAFFQAAAAAAUQAAAAAAGAAAAAACGAAAAAAAGAAAAAADGAAAAAABHAAAAAACHAAAAAACHAAAAAAAGAAAAAADGAAAAAAACQAAAAAKCQAAAAADFQAAAAAGFQAAAAAFFQAAAAACFQAAAAAEYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAHAAAAAAAHAAAAAACHAAAAAADGAAAAAAAGAAAAAABCQAAAAACCQAAAAAAFQAAAAAEFQAAAAAEFQAAAAAAFQAAAAAGYQAAAAAAGAAAAAABGAAAAAACGAAAAAABYQAAAAAAHAAAAAADHAAAAAADHAAAAAAAYQAAAAAAGAAAAAABCQAAAAAAFQAAAAAAFQAAAAAGFQAAAAADFQAAAAADFQAAAAAFYQAAAAAAGAAAAAAAGAAAAAAAGAAAAAACYQAAAAAAHAAAAAACHAAAAAADHAAAAAADYQAAAAAAGAAAAAABFQAAAAADFQAAAAACFQAAAAADFQAAAAADFQAAAAAAFQAAAAAAYQAAAAAAYQAAAAAANwAAAAAAYQAAAAAAYQAAAAAAYQAAAAAANwAAAAAAYQAAAAAAYQAAAAAAPQAAAAAAFQAAAAAFFQAAAAABFQAAAAABFQAAAAAFFQAAAAAAFQAAAAABUQAAAAAAGAAAAAACGAAAAAADGAAAAAACNwAAAAAAHwAAAAADHwAAAAABHwAAAAADHwAAAAABHwAAAAACFQAAAAAGFQAAAAAGFQAAAAAFFQAAAAAAFQAAAAABFQAAAAAAFQAAAAACGAAAAAACGAAAAAACGAAAAAADPQAAAAAAHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAHwAAAAAAFQAAAAAEFQAAAAABFQAAAAABFQAAAAACFQAAAAADFQAAAAACFQAAAAADGAAAAAAAGAAAAAABGAAAAAACFQAAAAABHwAAAAACHwAAAAAAGAAAAAACGAAAAAACGAAAAAADFQAAAAAFFQAAAAACFQAAAAAAFQAAAAACFQAAAAAAFQAAAAACFQAAAAACFQAAAAAAFQAAAAADFQAAAAACFQAAAAAFHwAAAAADHwAAAAAAHwAAAAABHwAAAAACHwAAAAAB + tiles: FQAAAAAAFQAAAAAEFQAAAAABFQAAAAAECQAAAAAACQAAAAAAPQAAAAAAXgAAAAABXgAAAAAAXgAAAAAAYQAAAAAAHAAAAAAAHAAAAAACYQAAAAAAPQAAAAAAYQAAAAAAFQAAAAAGFQAAAAAAFQAAAAAEFQAAAAABFQAAAAAGFQAAAAAFYQAAAAAAXgAAAAABXgAAAAACXgAAAAACNwAAAAAAHAAAAAACHAAAAAABYQAAAAAAPQAAAAAAYQAAAAAAFQAAAAAEFQAAAAACFQAAAAABUgAAAAAAFQAAAAADUgAAAAAAYQAAAAAAPQAAAAAAPQAAAAAAYQAAAAAAYQAAAAAAHAAAAAADHAAAAAABYQAAAAAAYQAAAAAAUQAAAAAAFQAAAAACFQAAAAACFQAAAAADUgAAAAAAFQAAAAABFQAAAAACYQAAAAAAOwAAAAAAOwAAAAAAOwAAAAABPQAAAAAAHAAAAAABHAAAAAADYQAAAAAAPQAAAAAAYQAAAAAAFQAAAAAGFQAAAAAGYQAAAAAAYQAAAAAAYQAAAAAAUQAAAAAAYQAAAAAAOwAAAAACOwAAAAACOwAAAAAANwAAAAAAHAAAAAAAHAAAAAAAYQAAAAAAPQAAAAAAYQAAAAAAFQAAAAADFQAAAAAAFQAAAAACFQAAAAABFQAAAAAFFQAAAAABYQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAYQAAAAAAHAAAAAABHAAAAAABYQAAAAAAPQAAAAAAPQAAAAAAFQAAAAAAFQAAAAADFQAAAAADFQAAAAAEFQAAAAAAFQAAAAAGYQAAAAAAGAAAAAADGAAAAAADGAAAAAABGAAAAAABHAAAAAAAHAAAAAACHAAAAAAAGAAAAAABGAAAAAADFQAAAAAAFQAAAAACFQAAAAACFQAAAAAFFQAAAAAFFQAAAAAAUQAAAAAAGAAAAAACGAAAAAAAGAAAAAADGAAAAAABHAAAAAACHAAAAAACHAAAAAAAGAAAAAADGAAAAAAACQAAAAAKCQAAAAADFQAAAAAGFQAAAAAFFQAAAAACFQAAAAAEYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAHAAAAAAAHAAAAAACHAAAAAADGAAAAAAAGAAAAAABCQAAAAACCQAAAAAAFQAAAAAEFQAAAAAEFQAAAAAAFQAAAAAGYQAAAAAAGAAAAAABGAAAAAACGAAAAAABYQAAAAAAHAAAAAADHAAAAAADHAAAAAAAYQAAAAAAGAAAAAABCQAAAAAAFQAAAAAAFQAAAAAGFQAAAAADFQAAAAADFQAAAAAFYQAAAAAAGAAAAAAAGAAAAAAAGAAAAAACYQAAAAAAHAAAAAACHAAAAAAAHAAAAAACYQAAAAAAGAAAAAABFQAAAAADFQAAAAACFQAAAAADFQAAAAADFQAAAAAAFQAAAAAAYQAAAAAAYQAAAAAANwAAAAAAYQAAAAAAYQAAAAAAYQAAAAAANwAAAAAAYQAAAAAAYQAAAAAAPQAAAAAAFQAAAAAFFQAAAAABFQAAAAABFQAAAAAFFQAAAAAAFQAAAAABUQAAAAAAGAAAAAACGAAAAAADGAAAAAACNwAAAAAAHwAAAAADHwAAAAABHwAAAAADHwAAAAABHwAAAAACFQAAAAAGFQAAAAAGFQAAAAAFFQAAAAAAFQAAAAABFQAAAAAAFQAAAAACGAAAAAACGAAAAAACGAAAAAADPQAAAAAAHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAHwAAAAAAFQAAAAAEFQAAAAABFQAAAAABFQAAAAACFQAAAAADFQAAAAACFQAAAAADGAAAAAAAGAAAAAABGAAAAAACFQAAAAABHwAAAAACHwAAAAAAGAAAAAACGAAAAAACGAAAAAADFQAAAAAFFQAAAAACFQAAAAAAFQAAAAACFQAAAAAAFQAAAAACFQAAAAACFQAAAAAAFQAAAAADFQAAAAACFQAAAAAFHwAAAAADHwAAAAAAHwAAAAABHwAAAAACHwAAAAAB version: 6 4,-2: ind: 4,-2 @@ -2702,7 +2702,6 @@ entities: 3535: 13,16 3541: 6,-8 3583: 49,6 - 3587: 28,-22 3591: 52,-23 3647: 39,-23 3732: 11,-4 @@ -14214,8 +14213,6 @@ entities: - type: Transform pos: -33.5,33.5 parent: 2 - - type: PowerNetworkBattery - canDischarge: False - uid: 254 components: - type: MetaData @@ -17141,6 +17138,11 @@ entities: - type: Transform pos: 24.449337,-17.398048 parent: 2 + - uid: 9184 + components: + - type: Transform + pos: -0.4814006,1.10948 + parent: 2 - proto: BoxCardboard entities: - uid: 768 @@ -46283,10 +46285,10 @@ entities: parent: 2 - proto: ClosetChefFilled entities: - - uid: 6018 + - uid: 9183 components: - type: Transform - pos: 16.5,15.5 + pos: 7.5,17.5 parent: 2 - proto: ClosetEmergencyFilledRandom entities: @@ -46361,6 +46363,11 @@ entities: parent: 2 - proto: ClosetMaintenanceFilledRandom entities: + - uid: 3278 + components: + - type: Transform + pos: 16.5,15.5 + parent: 2 - uid: 6028 components: - type: Transform @@ -49420,16 +49427,22 @@ entities: - type: Transform pos: -62.5,-9.5 parent: 2 + - type: NavMapBeacon + text: Tyrant - uid: 11132 components: - type: Transform pos: -52.5,-11.5 parent: 2 + - type: NavMapBeacon + text: Tyrant Dock - uid: 13645 components: - type: Transform pos: 63.5,-25.5 parent: 2 + - type: NavMapBeacon + text: Sauna - uid: 16454 components: - type: Transform @@ -55476,16 +55489,6 @@ entities: - type: Transform pos: 43.5,12.5 parent: 2 - - uid: 7261 - components: - - type: Transform - pos: 32.5,-25.5 - parent: 2 - - uid: 7262 - components: - - type: Transform - pos: 31.5,-25.5 - parent: 2 - uid: 17925 components: - type: Transform @@ -58204,6 +58207,12 @@ entities: - type: Transform pos: -15.5,57.5 parent: 2 + - uid: 8626 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 64.5,-25.5 + parent: 2 - uid: 8922 components: - type: Transform @@ -58375,6 +58384,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#03FCD3FF' + - uid: 7262 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 37.5,-18.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' - uid: 7600 components: - type: Transform @@ -58389,6 +58406,13 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' + - uid: 7610 + components: + - type: Transform + pos: 35.5,-23.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' - uid: 7615 components: - type: Transform @@ -58832,14 +58856,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 7713 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 37.5,-22.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - uid: 7715 components: - type: Transform @@ -59117,6 +59133,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 8625 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 28.5,-18.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' - uid: 9821 components: - type: Transform @@ -59828,6 +59852,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#03FCD3FF' + - uid: 7717 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 36.5,-18.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' - uid: 7718 components: - type: Transform @@ -65712,7 +65744,8 @@ entities: - uid: 8608 components: - type: Transform - pos: 37.5,-18.5 + rot: -1.5707963267948966 rad + pos: 34.5,-18.5 parent: 2 - type: AtmosPipeColor color: '#990000FF' @@ -65761,14 +65794,15 @@ entities: - uid: 8617 components: - type: Transform - pos: 37.5,-20.5 + rot: -1.5707963267948966 rad + pos: 35.5,-18.5 parent: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 8618 components: - type: Transform - pos: 37.5,-21.5 + pos: 28.5,-22.5 parent: 2 - type: AtmosPipeColor color: '#990000FF' @@ -65776,7 +65810,7 @@ entities: components: - type: Transform rot: 1.5707963267948966 rad - pos: 36.5,-19.5 + pos: 33.5,-23.5 parent: 2 - type: AtmosPipeColor color: '#990000FF' @@ -65784,23 +65818,15 @@ entities: components: - type: Transform rot: 1.5707963267948966 rad - pos: 35.5,-19.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 8621 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 34.5,-19.5 + pos: 32.5,-23.5 parent: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 8622 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 36.5,-22.5 + rot: 1.5707963267948966 rad + pos: 31.5,-23.5 parent: 2 - type: AtmosPipeColor color: '#990000FF' @@ -65808,7 +65834,7 @@ entities: components: - type: Transform rot: 1.5707963267948966 rad - pos: 34.5,-22.5 + pos: 29.5,-23.5 parent: 2 - type: AtmosPipeColor color: '#990000FF' @@ -65816,46 +65842,7 @@ entities: components: - type: Transform rot: 1.5707963267948966 rad - pos: 33.5,-22.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 8625 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 32.5,-22.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 8626 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 31.5,-22.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 8627 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 30.5,-22.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 8628 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 29.5,-22.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 8629 - components: - - type: Transform - pos: 28.5,-23.5 + pos: 30.5,-23.5 parent: 2 - type: AtmosPipeColor color: '#990000FF' @@ -69334,6 +69321,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' + - uid: 9286 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 33.5,-18.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' - uid: 9297 components: - type: Transform @@ -69389,6 +69384,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#DD2222FF' + - uid: 10406 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 32.5,-18.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' - uid: 10918 components: - type: Transform @@ -69741,6 +69744,22 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' + - uid: 18027 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 31.5,-18.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 18028 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 30.5,-18.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' - uid: 18033 components: - type: Transform @@ -70888,6 +70907,28 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 18318 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 29.5,-18.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 18319 + components: + - type: Transform + pos: 28.5,-19.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 18320 + components: + - type: Transform + pos: 28.5,-20.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' - proto: GasPipeTJunction entities: - uid: 506 @@ -71083,14 +71124,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 7610 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 35.5,-23.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - uid: 7619 components: - type: Transform @@ -71105,21 +71138,21 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 7716 + - uid: 7713 components: - type: Transform - pos: 28.5,-25.5 + rot: 1.5707963267948966 rad + pos: 28.5,-23.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 7717 + color: '#990000FF' + - uid: 7716 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 28.5,-22.5 + pos: 28.5,-25.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#0055CCFF' - uid: 7724 components: - type: Transform @@ -71201,6 +71234,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' + - uid: 8621 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 34.5,-23.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' - uid: 8937 components: - type: Transform @@ -71869,21 +71910,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 9183 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 37.5,-19.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 9184 - components: - - type: Transform - pos: 35.5,-22.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - uid: 9185 components: - type: Transform @@ -72499,6 +72525,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 18321 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 28.5,-21.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' - proto: GasPort entities: - uid: 544 @@ -72577,12 +72611,6 @@ entities: rot: -1.5707963267948966 rad pos: 37.5,-32.5 parent: 2 - - uid: 9254 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 63.5,-25.5 - parent: 2 - uid: 9268 components: - type: Transform @@ -72878,12 +72906,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 9286 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 64.5,-25.5 - parent: 2 - proto: GasVentPump entities: - uid: 4959 @@ -74271,8 +74293,7 @@ entities: - uid: 9420 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 34.5,-23.5 + pos: 34.5,-22.5 parent: 2 - type: DeviceNetwork deviceLists: @@ -74664,7 +74685,8 @@ entities: - uid: 17602 components: - type: Transform - pos: 28.5,-21.5 + rot: -1.5707963267948966 rad + pos: 29.5,-21.5 parent: 2 - type: DeviceNetwork deviceLists: @@ -80864,6 +80886,13 @@ entities: - type: Transform pos: -2.5,21.5 parent: 2 +- proto: MedicalBiofabricator + entities: + - uid: 8628 + components: + - type: Transform + pos: 13.5,-6.5 + parent: 2 - proto: MedicalScannerMachineCircuitboard entities: - uid: 10350 @@ -81183,12 +81212,6 @@ entities: rot: 3.141592653589793 rad pos: 10.5,-8.5 parent: 2 - - uid: 10406 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 13.5,-6.5 - parent: 2 - uid: 16519 components: - type: Transform @@ -89203,12 +89226,12 @@ entities: - uid: 12104 components: - type: Transform - pos: 7.6254354,17.978848 + pos: 7.99691,17.851439 parent: 2 - uid: 12105 components: - type: Transform - pos: 7.2112093,17.989098 + pos: 8.137535,18.429564 parent: 2 - proto: OperatingTable entities: @@ -99267,10 +99290,10 @@ entities: parent: 2 - proto: ReverseEngineeringMachine entities: - - uid: 3278 + - uid: 8629 components: - type: Transform - pos: 34.5,-21.5 + pos: 32.5,-25.5 parent: 2 - proto: RevolverCapGun entities: @@ -99459,6 +99482,13 @@ entities: - type: Transform pos: 8.5,40.5 parent: 2 +- proto: SecureCabinetEpistemics + entities: + - uid: 6018 + components: + - type: Transform + pos: 31.5,-25.5 + parent: 2 - proto: SecureCabinetHoP entities: - uid: 7133 @@ -101661,6 +101691,13 @@ entities: - type: Transform pos: 41.5,-5.5 parent: 2 +- proto: SpawnMobSmile + entities: + - uid: 8627 + components: + - type: Transform + pos: 29.5,-25.5 + parent: 2 - proto: SpawnMobWalter entities: - uid: 5879 @@ -104523,27 +104560,6 @@ entities: - SurveillanceCameraService nameSet: True id: Reporter's Office - - uid: 18027 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -25.5,-3.5 - parent: 2 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraService - nameSet: True - id: Mime - - uid: 18028 - components: - - type: Transform - pos: -23.5,-11.5 - parent: 2 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraService - nameSet: True - id: Clown - uid: 18029 components: - type: Transform @@ -105458,6 +105474,11 @@ entities: - type: Transform pos: -3.5,12.5 parent: 2 + - uid: 9254 + components: + - type: Transform + pos: 29.5,-25.5 + parent: 2 - uid: 12109 components: - type: Transform @@ -107067,6 +107088,11 @@ entities: - Middle: Toggle - proto: UnfinishedMachineFrame entities: + - uid: 7261 + components: + - type: Transform + pos: 34.5,-21.5 + parent: 2 - uid: 14596 components: - type: Transform @@ -116486,15 +116512,15 @@ entities: - type: Transform pos: 36.5,70.5 parent: 2 - - uid: 17689 + - uid: 15209 components: - type: Transform - pos: 40.5,70.5 + pos: 38.5,63.5 parent: 2 - - uid: 15209 + - uid: 17689 components: - type: Transform - pos: 38.5,63.5 + pos: 40.5,70.5 parent: 2 - proto: WelderIndustrial entities: @@ -116972,7 +116998,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -10354.103 + secondsUntilStateChange: -10872.24 state: Opening - type: Airlock autoClose: False @@ -116988,7 +117014,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -10353.536 + secondsUntilStateChange: -10871.674 state: Opening - type: Airlock autoClose: False @@ -117010,7 +117036,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -10353.069 + secondsUntilStateChange: -10871.207 state: Opening - type: Airlock autoClose: False @@ -117026,7 +117052,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -10354.603 + secondsUntilStateChange: -10872.74 state: Opening - type: Airlock autoClose: False diff --git a/Resources/Migrations/deltaMigrations.yml b/Resources/Migrations/deltaMigrations.yml index d0c682215f9..8113abba178 100644 --- a/Resources/Migrations/deltaMigrations.yml +++ b/Resources/Migrations/deltaMigrations.yml @@ -131,3 +131,6 @@ AlwaysPoweredSmallLightMaintenanceRed: PoweredDimSmallLight # 2024-12-22 VendingMachineRestockSalvageEquipment: null + +# 2025-01-11 +SpawnMobSmile: SentientSmileCore diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 20dcc4e3cec..88871624621 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -231,7 +231,7 @@ - id: RubberStampCMO - id: MedTekCartridge # Shitmed - - id: MedicalBiofabMachineBoard + #- id: MedicalBiofabMachineBoard #DeltaV - Replaced with a flatpack at Prototypes/_DV/Catalog/Fills/Lockers/heads.yml # Hardsuit table, used for suit storage as well - type: entityTable diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml index ef6f057d823..6310f1b34f2 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml @@ -2,7 +2,7 @@ id: TattooHiveChest bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni + speciesRestriction: [Human, Dwarf, SlimePerson, Felinid, Oni] # Delta V - SlimePerson, Felinid, Oni sexRestriction: [Male] # DeltaV: Splitting the scars and tattoos coloring: default: @@ -17,7 +17,7 @@ id: TattooNightlingChest bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni + speciesRestriction: [Human, Dwarf, SlimePerson, Felinid, Oni] # Delta V - SlimePerson, Felinid, Oni sexRestriction: [Male] # DeltaV: Splitting the scars and tattoos coloring: default: diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml index 3570e8fd5e2..41b1aca0ed5 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml @@ -776,6 +776,9 @@ BaseUnshaded: aslime-_3 Dead: Base: rainbow_baby_slime_dead + - type: Body # DeltaV - Changes to add brain + prototype: Smiles + requiredLegs: 1 - type: Butcherable spawned: - id: FoodMeatSlime diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml index 0fd52d3f87a..56f43a2a78e 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml @@ -83,6 +83,8 @@ - map: [ "enum.HumanoidVisualLayers.LArm" ] - map: [ "enum.HumanoidVisualLayers.RLeg" ] - map: [ "enum.HumanoidVisualLayers.LLeg" ] + - map: [ "enum.HumanoidVisualLayers.Underwear" ] # DeltaV + - map: [ "enum.HumanoidVisualLayers.Undershirt" ] # DeltaV - map: ["jumpsuit"] - map: ["enum.HumanoidVisualLayers.LFoot"] - map: ["enum.HumanoidVisualLayers.RFoot"] diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml index 969e8a24650..7db00d77332 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/base.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml @@ -19,6 +19,8 @@ - map: [ "enum.HumanoidVisualLayers.LArm" ] - map: [ "enum.HumanoidVisualLayers.RLeg" ] - map: [ "enum.HumanoidVisualLayers.LLeg" ] + - map: [ "enum.HumanoidVisualLayers.Underwear" ] # DeltaV + - map: [ "enum.HumanoidVisualLayers.Undershirt" ] # DeltaV - map: ["jumpsuit"] - map: ["enum.HumanoidVisualLayers.LFoot"] - map: ["enum.HumanoidVisualLayers.RFoot"] @@ -322,6 +324,8 @@ - map: [ "enum.HumanoidVisualLayers.LArm" ] - map: [ "enum.HumanoidVisualLayers.RLeg" ] - map: [ "enum.HumanoidVisualLayers.LLeg" ] + - map: [ "enum.HumanoidVisualLayers.Underwear" ] # DeltaV + - map: [ "enum.HumanoidVisualLayers.Undershirt" ] # DeltaV - map: ["jumpsuit"] - map: ["enum.HumanoidVisualLayers.LFoot"] - map: ["enum.HumanoidVisualLayers.RFoot"] diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml index 92592116f21..2284af6b080 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml @@ -84,6 +84,8 @@ - map: [ "enum.HumanoidVisualLayers.LArm" ] - map: [ "enum.HumanoidVisualLayers.RLeg" ] - map: [ "enum.HumanoidVisualLayers.LLeg" ] + - map: [ "enum.HumanoidVisualLayers.Underwear" ] # DeltaV + - map: [ "enum.HumanoidVisualLayers.Undershirt" ] # DeltaV - map: [ "jumpsuit" ] - map: [ "enum.HumanoidVisualLayers.LHand" ] - map: [ "enum.HumanoidVisualLayers.RHand" ] diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml index 3e5964dea6b..815ee101bf7 100644 --- a/Resources/Prototypes/GameRules/events.yml +++ b/Resources/Prototypes/GameRules/events.yml @@ -520,6 +520,7 @@ - RoleSurvivalNukie components: - type: NukeOperative + - type: TargetObjectiveImmune # DeltaV - Nukies are no longer targets of kill objectives, this includes lone ops. - type: RandomMetadata nameSegments: - SyndicateNamesPrefix diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 428922831a2..5ef7a79d8bb 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -398,7 +398,7 @@ - SecurityNeck # DeltaV - SecurityJumpsuit - SecurityBackpack - - SecurityOuterClothing + - SecurityOuterClothingDeltaV # DeltaV - Switched to DeltaV version, was SecurityOuterClothing - SecurityShoes - SecurityPDA - SecurityBelt diff --git a/Resources/Prototypes/Nyanotrasen/Species/Oni.yml b/Resources/Prototypes/Nyanotrasen/Species/Oni.yml index d5e6cd459ed..88ee0825f2b 100644 --- a/Resources/Prototypes/Nyanotrasen/Species/Oni.yml +++ b/Resources/Prototypes/Nyanotrasen/Species/Oni.yml @@ -35,6 +35,12 @@ Chest: points: 1 required: false + Underwear: + points: 1 + required: false + Undershirt: + points: 1 + required: false Legs: points: 6 required: false diff --git a/Resources/Prototypes/Nyanotrasen/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Species/felinid.yml index e6a64379d93..8a3eb7fa997 100644 --- a/Resources/Prototypes/Nyanotrasen/Species/felinid.yml +++ b/Resources/Prototypes/Nyanotrasen/Species/felinid.yml @@ -28,6 +28,12 @@ Chest: points: 1 required: false + Underwear: + points: 1 + required: false + Undershirt: + points: 1 + required: false Legs: points: 6 required: false diff --git a/Resources/Prototypes/Species/arachnid.yml b/Resources/Prototypes/Species/arachnid.yml index 5dedba1b447..da01cb750b3 100644 --- a/Resources/Prototypes/Species/arachnid.yml +++ b/Resources/Prototypes/Species/arachnid.yml @@ -19,6 +19,8 @@ sprites: Head: MobArachnidHead Snout: MobHumanoidAnyMarking + Underwear: MobHumanoidAnyMarking # DeltaV + Undershirt: MobHumanoidAnyMarking # DeltaV Chest: MobArachnidTorso HeadTop: MobHumanoidAnyMarking HeadSide: MobHumanoidAnyMarking @@ -63,6 +65,14 @@ Chest: points: 1 required: false + # Begin DeltaV changes. + Underwear: + points: 1 + required: false + Undershirt: + points: 1 + required: false + # End DeltaV changes. Legs: points: 6 required: false diff --git a/Resources/Prototypes/Species/diona.yml b/Resources/Prototypes/Species/diona.yml index 19fafaa3e1b..fc84b4cf956 100644 --- a/Resources/Prototypes/Species/diona.yml +++ b/Resources/Prototypes/Species/diona.yml @@ -19,6 +19,8 @@ Head: MobDionaHead HeadTop: MobHumanoidAnyMarking HeadSide: MobHumanoidAnyMarking + Underwear: MobHumanoidAnyMarking # DeltaV + Undershirt: MobHumanoidAnyMarking # DeltaV Chest: MobDionaTorso Eyes: MobDionaEyes LArm: MobDionaLArm @@ -49,6 +51,14 @@ Legs: points: 2 required: false + # Begin DeltaV changes. + Underwear: + points: 1 + required: false + Undershirt: + points: 1 + required: false + # End DeltaV changes. Arms: points: 2 required: false diff --git a/Resources/Prototypes/Species/gingerbread.yml b/Resources/Prototypes/Species/gingerbread.yml index e6fc0d20df5..148799cb1c0 100644 --- a/Resources/Prototypes/Species/gingerbread.yml +++ b/Resources/Prototypes/Species/gingerbread.yml @@ -15,6 +15,8 @@ Head: MobGingerbreadHead HeadTop: MobHumanoidAnyMarking HeadSide: MobHumanoidAnyMarking + Underwear: MobHumanoidAnyMarking # DeltaV + Undershirt: MobHumanoidAnyMarking # DeltaV Chest: MobGingerbreadTorso Eyes: MobGingerbreadEyes LArm: MobGingerbreadLArm diff --git a/Resources/Prototypes/Species/human.yml b/Resources/Prototypes/Species/human.yml index bb494bfa799..8837dc14aaf 100644 --- a/Resources/Prototypes/Species/human.yml +++ b/Resources/Prototypes/Species/human.yml @@ -22,6 +22,8 @@ Hair: MobHumanoidAnyMarking FacialHair: MobHumanoidAnyMarking Snout: MobHumanoidAnyMarking + Underwear: MobHumanoidAnyMarking # DeltaV + Undershirt: MobHumanoidAnyMarking # DeltaV Chest: MobHumanTorso Eyes: MobHumanoidEyes HeadTop: MobHumanoidAnyMarking @@ -60,6 +62,14 @@ Chest: points: 1 required: false + # Begin DeltaV changes. + Underwear: + points: 1 + required: false + Undershirt: + points: 1 + required: false + # End DeltaV changes. Legs: points: 6 required: false diff --git a/Resources/Prototypes/Species/moth.yml b/Resources/Prototypes/Species/moth.yml index 2623865b046..667bb589b91 100644 --- a/Resources/Prototypes/Species/moth.yml +++ b/Resources/Prototypes/Species/moth.yml @@ -17,6 +17,8 @@ sprites: Head: MobMothHead Snout: MobHumanoidAnyMarking + Underwear: MobHumanoidAnyMarking # DeltaV + Undershirt: MobHumanoidAnyMarking # DeltaV Chest: MobMothTorso HeadTop: MobHumanoidAnyMarking HeadSide: MobHumanoidAnyMarking @@ -67,6 +69,14 @@ Chest: points: 1 required: false + # Begin DeltaV changes. + Underwear: + points: 1 + required: false + Undershirt: + points: 1 + required: false + # End DeltaV changes. Legs: points: 6 required: false diff --git a/Resources/Prototypes/Species/reptilian.yml b/Resources/Prototypes/Species/reptilian.yml index 16f2728070e..48dc3874d6c 100644 --- a/Resources/Prototypes/Species/reptilian.yml +++ b/Resources/Prototypes/Species/reptilian.yml @@ -17,6 +17,8 @@ sprites: Head: MobReptilianHead Snout: MobHumanoidAnyMarking + Underwear: MobHumanoidAnyMarking # DeltaV + Undershirt: MobHumanoidAnyMarking # DeltaV Chest: MobReptilianTorso HeadTop: MobHumanoidAnyMarking HeadSide: MobHumanoidAnyMarking @@ -58,6 +60,14 @@ Chest: points: 3 required: false + # Begin DeltaV changes. + Underwear: + points: 1 + required: false + Undershirt: + points: 1 + required: false + # End DeltaV changes. Legs: points: 6 required: false diff --git a/Resources/Prototypes/Species/slime.yml b/Resources/Prototypes/Species/slime.yml index ef49e9b7cf6..36e77a6902f 100644 --- a/Resources/Prototypes/Species/slime.yml +++ b/Resources/Prototypes/Species/slime.yml @@ -15,6 +15,8 @@ Head: MobSlimeHead Hair: MobSlimeMarkingFollowSkin FacialHair: MobSlimeMarkingFollowSkin + Underwear: MobHumanoidAnyMarking # DeltaV + Undershirt: MobHumanoidAnyMarking # DeltaV Chest: MobSlimeTorso Eyes: MobHumanoidEyes LArm: MobSlimeLArm @@ -38,6 +40,14 @@ Chest: points: 1 required: false + # Begin DeltaV changes. + Underwear: + points: 1 + required: false + Undershirt: + points: 1 + required: false + # End DeltaV changes. Legs: points: 4 required: false diff --git a/Resources/Prototypes/Species/vox.yml b/Resources/Prototypes/Species/vox.yml index 7419f3f277e..1885583c151 100644 --- a/Resources/Prototypes/Species/vox.yml +++ b/Resources/Prototypes/Species/vox.yml @@ -21,6 +21,8 @@ Snout: MobHumanoidAnyMarking Hair: MobHumanoidAnyMarking FacialHair: MobHumanoidAnyMarking + Underwear: MobHumanoidAnyMarking # DeltaV + Undershirt: MobHumanoidAnyMarking # DeltaV Chest: MobVoxTorso Eyes: MobVoxEyes LArm: MobVoxLArm @@ -58,6 +60,14 @@ points: 4 required: true defaultMarkings: [ VoxLLegScales, VoxRLegScales, VoxRFootScales, VoxLFootScales ] + # Begin DeltaV changes. + Underwear: + points: 1 + required: false + Undershirt: + points: 1 + required: false + # End DeltaV changes. Chest: points: 1 required: false diff --git a/Resources/Prototypes/_DV/Access/misc.yml b/Resources/Prototypes/_DV/Access/misc.yml index 364b1ab4c2d..96bdb2e55aa 100644 --- a/Resources/Prototypes/_DV/Access/misc.yml +++ b/Resources/Prototypes/_DV/Access/misc.yml @@ -51,4 +51,5 @@ - Justice - Prosecutor - Clerk + - Surgery diff --git a/Resources/Prototypes/_DV/Body/Organs/Animal/slimes.yml b/Resources/Prototypes/_DV/Body/Organs/Animal/slimes.yml new file mode 100644 index 00000000000..b16f5735475 --- /dev/null +++ b/Resources/Prototypes/_DV/Body/Organs/Animal/slimes.yml @@ -0,0 +1,17 @@ +- type: entity + id: SentientSmileCore + parent: SentientSlimesCore + name: sentient smile core + components: + - type: Sprite + sprite: _DV/Mobs/Pets/Smile/organs.rsi + state: brain-smile + - type: Extractable + grindableSolutionName: organ + - type: SolutionContainerManager + solutions: + organ: + maxVol: 5 + reagents: + - ReagentId: SentientGreyMatter + Quantity: 5 diff --git a/Resources/Prototypes/_DV/Body/Prototypes/Animal/slimes.yml b/Resources/Prototypes/_DV/Body/Prototypes/Animal/slimes.yml new file mode 100644 index 00000000000..80a27f8c3a9 --- /dev/null +++ b/Resources/Prototypes/_DV/Body/Prototypes/Animal/slimes.yml @@ -0,0 +1,19 @@ +- type: body + id: Smiles + name: "Smiles" + parent: Slimes + root: torso + slots: + torso: + part: TorsoSlime + connections: + - legs + organs: + core: SentientSmileCore + lungs: OrganSlimesLungs + legs: + part: LegsAnimal + connections: + - feet + feet: + part: FeetAnimal diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/heads.yml index ce8ff57b1d1..40b7d5dd6ed 100644 --- a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/heads.yml @@ -67,6 +67,7 @@ - id: LunchboxCommandFilledRandom prob: 0.3 - id: ChemMasterFlatpack # So the chemist can make pills + - id: MedBioFabricatorFlatpack # Replaced the shitmed board - type: entityTable id: LockerFillResearchDirectorDeltaV diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/tattoos.yml b/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/tattoos.yml index a3df1776332..2d92c02b429 100644 --- a/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/tattoos.yml +++ b/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/tattoos.yml @@ -2,7 +2,7 @@ id: TattooHiveChestFemale # DeltaV: Splitting the scars and tattoos bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni + speciesRestriction: [Human, Dwarf, SlimePerson, Felinid, Oni] # Delta V - SlimePerson, Felinid, Oni sexRestriction: [Female] # DeltaV: Splitting the scars and tattoos coloring: default: @@ -17,7 +17,7 @@ id: TattooNightlingChestFemale # DeltaV: Splitting the scars and tattoos bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni + speciesRestriction: [Human, Dwarf, SlimePerson, Felinid, Oni] # Delta V - SlimePerson, Felinid, Oni sexRestriction: [Female] # DeltaV: Splitting the scars and tattoos coloring: default: @@ -27,3 +27,17 @@ sprites: - sprite: _DV/Mobs/Customization/tattoos.rsi state: tattoo_nightling_female + +- type: marking + id: TattooNanotrasenChest + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Human, Dwarf, SlimePerson] + coloring: + default: + type: + !type:TattooColoring + fallbackColor: "#666666" + sprites: + - sprite: _DV/Mobs/Customization/tattoos.rsi + state: tattoo_nanotrasen_chest diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/_DV/Entities/Mobs/Species/harpy.yml index ec305698aa1..c057b353a74 100644 --- a/Resources/Prototypes/_DV/Entities/Mobs/Species/harpy.yml +++ b/Resources/Prototypes/_DV/Entities/Mobs/Species/harpy.yml @@ -42,6 +42,8 @@ - map: [ "enum.HumanoidVisualLayers.LArm" ] - map: [ "enum.HumanoidVisualLayers.RLeg" ] - map: [ "enum.HumanoidVisualLayers.LLeg" ] + - map: [ "enum.HumanoidVisualLayers.Underwear" ] + - map: [ "enum.HumanoidVisualLayers.Undershirt" ] - map: [ "underpants" ] - map: [ "undershirt" ] - map: [ "socks" ] @@ -175,6 +177,8 @@ - map: [ "enum.HumanoidVisualLayers.LArm" ] - map: [ "enum.HumanoidVisualLayers.RLeg" ] - map: [ "enum.HumanoidVisualLayers.LLeg" ] + - map: [ "enum.HumanoidVisualLayers.Underwear" ] + - map: [ "enum.HumanoidVisualLayers.Undershirt" ] - map: [ "underpants" ] - map: [ "undershirt" ] - map: [ "socks" ] diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Species/rodentia.yml b/Resources/Prototypes/_DV/Entities/Mobs/Species/rodentia.yml index 95e55cd02df..1fdd2cc0179 100644 --- a/Resources/Prototypes/_DV/Entities/Mobs/Species/rodentia.yml +++ b/Resources/Prototypes/_DV/Entities/Mobs/Species/rodentia.yml @@ -45,6 +45,8 @@ - map: [ "enum.HumanoidVisualLayers.LArm" ] - map: [ "enum.HumanoidVisualLayers.RLeg" ] - map: [ "enum.HumanoidVisualLayers.LLeg" ] + - map: [ "enum.HumanoidVisualLayers.Underwear" ] + - map: [ "enum.HumanoidVisualLayers.Undershirt" ] - map: [ "jumpsuit" ] - map: [ "enum.HumanoidVisualLayers.LHand" ] - map: [ "enum.HumanoidVisualLayers.RHand" ] diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Species/vulpkanin.yml b/Resources/Prototypes/_DV/Entities/Mobs/Species/vulpkanin.yml index ac7f62b86cc..07e3f627fd2 100644 --- a/Resources/Prototypes/_DV/Entities/Mobs/Species/vulpkanin.yml +++ b/Resources/Prototypes/_DV/Entities/Mobs/Species/vulpkanin.yml @@ -45,6 +45,8 @@ sprite: _DV/Mobs/Customization/Vulpkanin/masking_helpers.rsi state: female_full visible: false + - map: [ "enum.HumanoidVisualLayers.Underwear" ] + - map: [ "enum.HumanoidVisualLayers.Undershirt" ] - map: [ "jumpsuit" ] - map: [ "enum.HumanoidVisualLayers.LHand" ] - map: [ "enum.HumanoidVisualLayers.RHand" ] diff --git a/Resources/Prototypes/_DV/Entities/Objects/Devices/Devices/flatpack.yml b/Resources/Prototypes/_DV/Entities/Objects/Devices/Devices/flatpack.yml index eedeb96a871..d19d3307db0 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Devices/Devices/flatpack.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Devices/Devices/flatpack.yml @@ -6,3 +6,12 @@ components: - type: Flatpack entity: ChemMaster + +- type: entity + parent: BaseFlatpack + id: MedBioFabricatorFlatpack + name: medical biofabricator flatpack + description: A flatpack used for constructing a medical biofabricator. + components: + - type: Flatpack + entity: MedicalBiofabricator diff --git a/Resources/Prototypes/_DV/Reagents/biological.yml b/Resources/Prototypes/_DV/Reagents/biological.yml new file mode 100644 index 00000000000..b45bf8a4350 --- /dev/null +++ b/Resources/Prototypes/_DV/Reagents/biological.yml @@ -0,0 +1,5 @@ +- type: reagent + id: SentientGreyMatter + parent: GreyMatter + name: reagent-name-sentient-grey-matter + desc: reagent-desc-sentient-grey-matter diff --git a/Resources/Prototypes/_DV/Recipes/Reactions/fun.yml b/Resources/Prototypes/_DV/Recipes/Reactions/fun.yml index 2c026637ce7..722c6a2a4f9 100644 --- a/Resources/Prototypes/_DV/Recipes/Reactions/fun.yml +++ b/Resources/Prototypes/_DV/Recipes/Reactions/fun.yml @@ -9,3 +9,21 @@ effects: - !type:CreateEntityReactionEffect entity: SheetGlass1 + +- type: reaction + id: SmileTheSlime + impact: Low + quantized: true + conserveEnergy: false + reactants: + Happiness: + amount: 4 + SentientGreyMatter: + amount: 5 + JuiceThatMakesYouWeh: + amount: 10 + Slime: + amount: 20 + effects: + - !type:CreateEntityReactionEffect + entity: MobSlimesPet diff --git a/Resources/Prototypes/_DV/Species/harpy.yml b/Resources/Prototypes/_DV/Species/harpy.yml index 49861c04a8e..3f47171710f 100644 --- a/Resources/Prototypes/_DV/Species/harpy.yml +++ b/Resources/Prototypes/_DV/Species/harpy.yml @@ -15,6 +15,8 @@ Hair: MobHumanoidAnyMarking FacialHair: MobHumanoidAnyMarking Snout: MobHumanoidAnyMarking + Underwear: MobHumanoidAnyMarking + Undershirt: MobHumanoidAnyMarking Chest: MobHarpyTorso HeadTop: MobHumanoidAnyMarking HeadSide: MobHumanoidAnyMarking @@ -51,6 +53,12 @@ points: 1 required: true defaultMarkings: [ HarpyChestDefault ] + Underwear: + points: 1 + required: false + Undershirt: + points: 1 + required: false Legs: points: 2 required: false diff --git a/Resources/Prototypes/_DV/Species/rodentia.yml b/Resources/Prototypes/_DV/Species/rodentia.yml index 6d235be35ff..e92484d8dfd 100644 --- a/Resources/Prototypes/_DV/Species/rodentia.yml +++ b/Resources/Prototypes/_DV/Species/rodentia.yml @@ -20,6 +20,8 @@ Hair: MobHumanoidAnyMarking FacialHair: MobHumanoidAnyMarking Snout: MobHumanoidAnyMarking + Underwear: MobHumanoidAnyMarking + Undershirt: MobHumanoidAnyMarking Chest: MobRodentiaTorso HeadTop: MobHumanoidAnyMarking HeadSide: MobHumanoidAnyMarking @@ -53,6 +55,12 @@ Arms: points: 6 required: false + Underwear: + points: 1 + required: false + Undershirt: + points: 1 + required: false Snout: points: 1 required: false diff --git a/Resources/Prototypes/_DV/Species/vulpkanin.yml b/Resources/Prototypes/_DV/Species/vulpkanin.yml index 1c5cd66457a..22e71716b76 100644 --- a/Resources/Prototypes/_DV/Species/vulpkanin.yml +++ b/Resources/Prototypes/_DV/Species/vulpkanin.yml @@ -19,6 +19,8 @@ Hair: MobHumanoidAnyMarking FacialHair: MobHumanoidAnyMarking Snout: MobHumanoidAnyMarking + Underwear: MobHumanoidAnyMarking + Undershirt: MobHumanoidAnyMarking Chest: MobVulpkaninTorso HeadTop: MobHumanoidAnyMarking HeadSide: MobHumanoidAnyMarking @@ -49,6 +51,12 @@ Head: points: 3 required: false + Underwear: + points: 1 + required: false + Undershirt: + points: 1 + required: false Legs: points: 6 required: false diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/undershirt.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/undershirt.yml new file mode 100644 index 00000000000..5d5625a7f6a --- /dev/null +++ b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/undershirt.yml @@ -0,0 +1,139 @@ +- type: marking + id: UndershirtDefault + bodyPart: Undershirt + markingCategory: Undershirt + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _Impstation/Mobs/Customization/undershirt.rsi + state: undershirt + +- type: marking + id: UndershirtRolled + bodyPart: Undershirt + markingCategory: Undershirt + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _Impstation/Mobs/Customization/undershirt.rsi + state: rolled_undershirt + +- type: marking + id: UndershirtSleeveless + bodyPart: Undershirt + markingCategory: Undershirt + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _Impstation/Mobs/Customization/undershirt.rsi + state: sleeveless + +- type: marking + id: UndershirtRolledSleeveless + bodyPart: Undershirt + markingCategory: Undershirt + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _Impstation/Mobs/Customization/undershirt.rsi + state: rolled_undershirt_sleeveless + +- type: marking + id: UndershirtGrossSleeveless + bodyPart: Undershirt + markingCategory: Undershirt + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _Impstation/Mobs/Customization/undershirt.rsi + state: gross_sleeveless + +- type: marking + id: UndershirtNanotrasen + bodyPart: Undershirt + markingCategory: Undershirt + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _Impstation/Mobs/Customization/undershirt.rsi + state: nanotrasen + +- type: marking + id: UndershirtBinder + bodyPart: Undershirt + markingCategory: Undershirt + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _Impstation/Mobs/Customization/undershirt.rsi + state: binder + +- type: marking + id: UndershirtBraClassic + bodyPart: Undershirt + markingCategory: Undershirt + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _Impstation/Mobs/Customization/undershirt.rsi + state: classic + +- type: marking + id: UndershirtBraSports + bodyPart: Undershirt + markingCategory: Undershirt + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _Impstation/Mobs/Customization/undershirt.rsi + state: sports + +- type: marking + id: UndershirtBraStrapless + bodyPart: Undershirt + markingCategory: Undershirt + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _Impstation/Mobs/Customization/undershirt.rsi + state: strapless diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/underwear.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/underwear.yml new file mode 100644 index 00000000000..f43a6c9eb50 --- /dev/null +++ b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/underwear.yml @@ -0,0 +1,69 @@ +- type: marking + id: UnderwearDefault + bodyPart: Underwear + markingCategory: Underwear + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _Impstation/Mobs/Customization/underwear.rsi + state: boxers + +- type: marking + id: UnderwearBriefs + bodyPart: Underwear + markingCategory: Underwear + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _Impstation/Mobs/Customization/underwear.rsi + state: briefs + +- type: marking + id: UnderwearLowriders + bodyPart: Underwear + markingCategory: Underwear + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _Impstation/Mobs/Customization/underwear.rsi + state: lowriders + +- type: marking + id: UnderwearSatin + bodyPart: Underwear + markingCategory: Underwear + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _Impstation/Mobs/Customization/underwear.rsi + state: satin + +- type: marking + id: UnderwearTanga + bodyPart: Underwear + markingCategory: Underwear + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: _Impstation/Mobs/Customization/underwear.rsi + state: tanga diff --git a/Resources/Textures/_DV/Mobs/Customization/tattoos.rsi/meta.json b/Resources/Textures/_DV/Mobs/Customization/tattoos.rsi/meta.json index 5693064c0f5..4999a2299f9 100644 --- a/Resources/Textures/_DV/Mobs/Customization/tattoos.rsi/meta.json +++ b/Resources/Textures/_DV/Mobs/Customization/tattoos.rsi/meta.json @@ -1,23 +1,27 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/Skyrat-SS13/Skyrat-tg/tree/40e3cdbb15b8bc0d5ef2fb46133adf805bda5297/modular_skyrat/master_files/icons/mob/body_markings/tattoo_markings.dmi, modified by Aikakakah", + "copyright": "https://github.com/Skyrat-SS13/Skyrat-tg/tree/40e3cdbb15b8bc0d5ef2fb46133adf805bda5297/modular_skyrat/master_files/icons/mob/body_markings/tattoo_markings.dmi, modified by Aikakakah. NanoTrasen tattoo ported from ImpStation as of https://github.com/impstation/imp-station-14/pull/384", "size": { - "x": 32, - "y": 32 + "x": 32, + "y": 32 }, "states": [ - { - "name": "tattoo_hive_chest_female", - "directions": 4 - }, - { - "name": "tattoo_nightling", - "directions": 4 - }, - { - "name": "tattoo_nightling_female", - "directions": 4 - } + { + "name": "tattoo_hive_chest_female", + "directions": 4 + }, + { + "name": "tattoo_nightling", + "directions": 4 + }, + { + "name": "tattoo_nightling_female", + "directions": 4 + }, + { + "name": "tattoo_nanotrasen_chest", + "directions": 4 + } ] } diff --git a/Resources/Textures/_DV/Mobs/Customization/tattoos.rsi/tattoo_nanotrasen_chest.png b/Resources/Textures/_DV/Mobs/Customization/tattoos.rsi/tattoo_nanotrasen_chest.png new file mode 100644 index 00000000000..f97c3078a84 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/tattoos.rsi/tattoo_nanotrasen_chest.png differ diff --git a/Resources/Textures/_DV/Mobs/Pets/Smile/organs.rsi/brain-inhand-left.png b/Resources/Textures/_DV/Mobs/Pets/Smile/organs.rsi/brain-inhand-left.png new file mode 100644 index 00000000000..c07475fc631 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Pets/Smile/organs.rsi/brain-inhand-left.png differ diff --git a/Resources/Textures/_DV/Mobs/Pets/Smile/organs.rsi/brain-inhand-right.png b/Resources/Textures/_DV/Mobs/Pets/Smile/organs.rsi/brain-inhand-right.png new file mode 100644 index 00000000000..c8c570917b8 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Pets/Smile/organs.rsi/brain-inhand-right.png differ diff --git a/Resources/Textures/_DV/Mobs/Pets/Smile/organs.rsi/brain-smile.png b/Resources/Textures/_DV/Mobs/Pets/Smile/organs.rsi/brain-smile.png new file mode 100644 index 00000000000..60aaa2f92cf Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Pets/Smile/organs.rsi/brain-smile.png differ diff --git a/Resources/Textures/_DV/Mobs/Pets/Smile/organs.rsi/meta.json b/Resources/Textures/_DV/Mobs/Pets/Smile/organs.rsi/meta.json new file mode 100644 index 00000000000..04527308169 --- /dev/null +++ b/Resources/Textures/_DV/Mobs/Pets/Smile/organs.rsi/meta.json @@ -0,0 +1,42 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Nimfar11 (Github) for Space Station 14, inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "brain-smile", + "delays": [ + [ + 10.0, + 0.2, + 0.4, + 0.2, + 0.1, + 0.1, + 0.1, + 0.1, + 0.2, + 0.4, + 0.6, + 0.4, + 5.0, + 0.02, + 0.02, + 0.02 + ] + ] + }, + { + "name": "brain-inhand-left", + "directions": 4 + }, + { + "name": "brain-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/binder.png b/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/binder.png new file mode 100644 index 00000000000..57bd2017318 Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/binder.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/classic.png b/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/classic.png new file mode 100644 index 00000000000..bf277cb4a72 Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/classic.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/gross_sleeveless.png b/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/gross_sleeveless.png new file mode 100644 index 00000000000..2ec1b3f1f36 Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/gross_sleeveless.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/meta.json b/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/meta.json new file mode 100644 index 00000000000..cbf5c67d0ee --- /dev/null +++ b/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/meta.json @@ -0,0 +1,51 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/884ab172389b6fc54ef063f5fbea5e8b0a0a2235/icons/mob/humans/undershirt.dmi, nanotrasen taken from https://github.com/tgstation/tgstation/commit/c14e98740794eb107bfa40aad19bd4c4d307184f, undershirts modified by Pinkbat5(github), binder by Pinkbat5(github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "undershirt", + "directions": 4 + }, + { + "name": "sleeveless", + "directions": 4 + }, + { + "name": "gross_sleeveless", + "directions": 4 + }, + { + "name": "rolled_undershirt_sleeveless", + "directions": 4 + }, + { + "name": "rolled_undershirt", + "directions": 4 + }, + { + "name": "binder", + "directions": 4 + }, + { + "name": "classic", + "directions": 4 + }, + { + "name": "sports", + "directions": 4 + }, + { + "name": "strapless", + "directions": 4 + }, + { + "name": "nanotrasen", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/nanotrasen.png b/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/nanotrasen.png new file mode 100644 index 00000000000..5d69f6dd8e4 Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/nanotrasen.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/rolled_undershirt.png b/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/rolled_undershirt.png new file mode 100644 index 00000000000..fb5a9b74e88 Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/rolled_undershirt.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/rolled_undershirt_sleeveless.png b/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/rolled_undershirt_sleeveless.png new file mode 100644 index 00000000000..ec51c413ed3 Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/rolled_undershirt_sleeveless.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/sleeveless.png b/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/sleeveless.png new file mode 100644 index 00000000000..7f6f870ed86 Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/sleeveless.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/sports.png b/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/sports.png new file mode 100644 index 00000000000..49feecd4a6e Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/sports.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/strapless.png b/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/strapless.png new file mode 100644 index 00000000000..6736e280018 Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/strapless.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/undershirt.png b/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/undershirt.png new file mode 100644 index 00000000000..c1a3a40c0fe Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi/undershirt.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/underwear.rsi/boxers.png b/Resources/Textures/_Impstation/Mobs/Customization/underwear.rsi/boxers.png new file mode 100644 index 00000000000..18ec96ff084 Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/underwear.rsi/boxers.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/underwear.rsi/briefs.png b/Resources/Textures/_Impstation/Mobs/Customization/underwear.rsi/briefs.png new file mode 100644 index 00000000000..256345ff7d1 Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/underwear.rsi/briefs.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/underwear.rsi/lowriders.png b/Resources/Textures/_Impstation/Mobs/Customization/underwear.rsi/lowriders.png new file mode 100644 index 00000000000..986aa6a0f0f Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/underwear.rsi/lowriders.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/underwear.rsi/meta.json b/Resources/Textures/_Impstation/Mobs/Customization/underwear.rsi/meta.json new file mode 100644 index 00000000000..cd202dc299e --- /dev/null +++ b/Resources/Textures/_Impstation/Mobs/Customization/underwear.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/884ab172389b6fc54ef063f5fbea5e8b0a0a2235/icons/mob/humans/underwear.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "briefs", + "directions": 4 + }, + { + "name": "lowriders", + "directions": 4 + }, + { + "name": "satin", + "directions": 4 + }, + { + "name": "tanga", + "directions": 4 + }, + { + "name": "boxers", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Impstation/Mobs/Customization/underwear.rsi/satin.png b/Resources/Textures/_Impstation/Mobs/Customization/underwear.rsi/satin.png new file mode 100644 index 00000000000..0482ac35592 Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/underwear.rsi/satin.png differ diff --git a/Resources/Textures/_Impstation/Mobs/Customization/underwear.rsi/tanga.png b/Resources/Textures/_Impstation/Mobs/Customization/underwear.rsi/tanga.png new file mode 100644 index 00000000000..5edf178a8d5 Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/underwear.rsi/tanga.png differ