diff --git a/Content.Server/StationEvents/Events/IonStormRule.cs b/Content.Server/StationEvents/Events/IonStormRule.cs index cd3cd63ae86..54c0ca89d08 100644 --- a/Content.Server/StationEvents/Events/IonStormRule.cs +++ b/Content.Server/StationEvents/Events/IonStormRule.cs @@ -64,15 +64,19 @@ protected override void Started(EntityUid uid, IonStormRuleComponent comp, GameR { base.Started(uid, comp, gameRule, args); - if (!TryGetRandomStation(out var chosenStation)) - return; + // Frontier - Affect all silicon beings in the sector, not just on-station. + // if (!TryGetRandomStation(out var chosenStation)) + // return; + // End Frontier var query = EntityQueryEnumerator(); while (query.MoveNext(out var ent, out var lawBound, out var xform, out var target)) { - // only affect law holders on the station - if (CompOrNull(xform.GridUid)?.Station != chosenStation) - continue; + // Frontier - Affect all silicon beings in the sector, not just on-station. + // // only affect law holders on the station + // if (CompOrNull(xform.GridUid)?.Station != chosenStation) + // continue; + // End Frontier if (!RobustRandom.Prob(target.Chance)) continue; diff --git a/Content.Shared/DeltaV/StepTrigger/Component/NoShoesSilentFootstepsComponent.cs b/Content.Shared/DeltaV/StepTrigger/Component/NoShoesSilentFootstepsComponent.cs new file mode 100644 index 00000000000..ae2697b0ef0 --- /dev/null +++ b/Content.Shared/DeltaV/StepTrigger/Component/NoShoesSilentFootstepsComponent.cs @@ -0,0 +1,9 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.StepTrigger.Components; + + +[RegisterComponent, NetworkedComponent] +public sealed partial class NoShoesSilentFootstepsComponent : Component +{ +} diff --git a/Content.Shared/Movement/Systems/SharedMoverController.cs b/Content.Shared/Movement/Systems/SharedMoverController.cs index 92b953aca98..31a05b2004c 100644 --- a/Content.Shared/Movement/Systems/SharedMoverController.cs +++ b/Content.Shared/Movement/Systems/SharedMoverController.cs @@ -23,6 +23,7 @@ using Robust.Shared.Timing; using Robust.Shared.Utility; using PullableComponent = Content.Shared.Movement.Pulling.Components.PullableComponent; +using Content.Shared.StepTrigger.Components; // Delta V-NoShoesSilentFootstepsComponent namespace Content.Shared.Movement.Systems { @@ -46,6 +47,7 @@ public abstract partial class SharedMoverController : VirtualController [Dependency] protected readonly SharedPhysicsSystem Physics = default!; [Dependency] private readonly SharedTransformSystem _transform = default!; [Dependency] private readonly TagSystem _tags = default!; + [Dependency] private readonly IEntityManager _entities = default!; // Delta V-NoShoesSilentFootstepsComponent protected EntityQuery MoverQuery; protected EntityQuery MobMoverQuery; @@ -438,6 +440,14 @@ private bool TryGetSound( sound = moverModifier.FootstepSoundCollection; return true; } + + // If got the component in yml and no shoes = no sound. Delta V + if (_entities.TryGetComponent(uid, out NoShoesSilentFootstepsComponent? _) & + !_inventory.TryGetSlotEntity(uid, "shoes", out var _)) + { + return false; + } + // Delta V NoShoesSilentFootsteps till here. if (_inventory.TryGetSlotEntity(uid, "shoes", out var shoes) && TryComp(shoes, out var modifier)) diff --git a/Resources/Audio/_NF/Voice/Goblin/attributions.yml b/Resources/Audio/_NF/Voice/Goblin/attributions.yml index 5da1cf34088..6a2b1738bf2 100644 --- a/Resources/Audio/_NF/Voice/Goblin/attributions.yml +++ b/Resources/Audio/_NF/Voice/Goblin/attributions.yml @@ -1,10 +1,10 @@ - files: ["goblin-cackle-01.ogg, goblin-cackle-02.ogg, goblin-cackle-03.ogg"] license: "CC0-1.0" - copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (cropped) by erhardsteinhauer (discord/github)" + copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (converted to mono, cropped, lowered amplitudes) by erhardsteinhauer (discord/github)" source: "https://freesound.org/people/SnowFightStudios/sounds/643664/" - files: ["goblin-cackle-04.ogg"] license: "CC0-1.0" - copyright: "Original file made by spookymodem (https://freesound.org/people/spookymodem/), edited (cropped) by erhardsteinhauer (discord/github)" + copyright: "Original file made by spookymodem (https://freesound.org/people/spookymodem/), edited (converted to mono, cropped) by erhardsteinhauer (discord/github)" source: "https://freesound.org/people/spookymodem/sounds/202096/" - files: ["goblin-cackle-05.ogg"] license: "CC-BY-4.0" @@ -12,21 +12,21 @@ source: "https://freesound.org/people/Nanakisan/sounds/253532/" - files: ["goblin-scream-01.ogg"] license: "CC0-1.0" - copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (cropped) by erhardsteinhauer (discord/github)" + copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (converted to mono, cropped) by erhardsteinhauer (discord/github)" source: "https://freesound.org/people/SnowFightStudios/sounds/643655/" - files: ["goblin-scream-02.ogg, goblin-scream-03.ogg, goblin-scream-04.ogg"] license: "CC0-1.0" - copyright: "Original file made by Duisterwho (https://freesound.org/people/Duisterwho/), edited (cropped) by erhardsteinhauer (discord/github)" + copyright: "Original file made by Duisterwho (https://freesound.org/people/Duisterwho/), edited (converted to mono, cropped) by erhardsteinhauer (discord/github)" source: "https://freesound.org/people/Duisterwho/sounds/643497/" - files: ["goblin-cry-01.ogg, goblin-cry-02.ogg"] license: "CC0-1.0" - copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (cropped) by erhardsteinhauer (discord/github)" + copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (converted to mono, cropped) by erhardsteinhauer (discord/github)" source: https://freesound.org/people/SnowFightStudios/sounds/643657/ - files: ["goblin-chatter-01.ogg"] license: "CC0-1.0" - copyright: "Original file made by Fenodyrie (https://freesound.org/people/Fenodyrie/)" + copyright: "Original file made by Fenodyrie (https://freesound.org/people/Fenodyrie/), edited (converted to mono) by erhardsteinhauer (discord/github)" source: https://freesound.org/people/Fenodyrie/sounds/565923/ - files: ["goblin-hiss-01.ogg"] license: "CC-BY-4.0" - copyright: "Original file made by LittleRobotSoundFactory (https://freesound.org/people/LittleRobotSoundFactory/)" + copyright: "Original file made by LittleRobotSoundFactory (https://freesound.org/people/LittleRobotSoundFactory/), edited (converted to mono) by erhardsteinhauer (discord/github)" source: https://freesound.org/people/LittleRobotSoundFactory/sounds/270389/ diff --git a/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-01.ogg b/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-01.ogg index 74d3e2e0555..56bfd911568 100644 Binary files a/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-01.ogg and b/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-01.ogg differ diff --git a/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-02.ogg b/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-02.ogg index 42587638db5..5b56010b6b3 100644 Binary files a/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-02.ogg and b/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-02.ogg differ diff --git a/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-03.ogg b/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-03.ogg index 7db2a2f7bea..c84ad8527ba 100644 Binary files a/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-03.ogg and b/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-03.ogg differ diff --git a/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-04.ogg b/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-04.ogg index 1b9d67543c7..d607c86a7a5 100644 Binary files a/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-04.ogg and b/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-04.ogg differ diff --git a/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-05.ogg b/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-05.ogg index 8d98dbda60d..fee25893c64 100644 Binary files a/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-05.ogg and b/Resources/Audio/_NF/Voice/Goblin/goblin-cackle-05.ogg differ diff --git a/Resources/Audio/_NF/Voice/Goblin/license.txt b/Resources/Audio/_NF/Voice/Goblin/license.txt index 824f0bdbeda..21f10cccf15 100644 --- a/Resources/Audio/_NF/Voice/Goblin/license.txt +++ b/Resources/Audio/_NF/Voice/Goblin/license.txt @@ -1,32 +1,32 @@ - files: ["goblin-cackle-01.ogg, goblin-cackle-02.ogg, goblin-cackle-03.ogg"] license: "CC0-1.0" - copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (cropped) by erhardsteinhauer (discord/github)" + copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (converted to mono, cropped, lowered amplitudes) by erhardsteinhauer (discord/github)" source: "https://freesound.org/people/SnowFightStudios/sounds/643664/" - files: ["goblin-cackle-04.ogg"] license: "CC0-1.0" - copyright: "Original file made by spookymodem (https://freesound.org/people/spookymodem/), edited (cropped) by erhardsteinhauer (discord/github)" + copyright: "Original file made by spookymodem (https://freesound.org/people/spookymodem/), edited (converted to mono, cropped) by erhardsteinhauer (discord/github)" source: "https://freesound.org/people/spookymodem/sounds/202096/" - files: ["goblin-cackle-05.ogg"] - license: "CC BY 4.0" + license: "CC-BY-4.0" copyright: "Original file made by Nanakisan (https://freesound.org/people/Nanakisan/)" source: "https://freesound.org/people/Nanakisan/sounds/253532/" - files: ["goblin-scream-01.ogg"] license: "CC0-1.0" - copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (cropped) by erhardsteinhauer (discord/github)" + copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (converted to mono, cropped) by erhardsteinhauer (discord/github)" source: "https://freesound.org/people/SnowFightStudios/sounds/643655/" - files: ["goblin-scream-02.ogg, goblin-scream-03.ogg, goblin-scream-04.ogg"] license: "CC0-1.0" - copyright: "Original file made by Duisterwho (https://freesound.org/people/Duisterwho/), edited (cropped) by erhardsteinhauer (discord/github)" + copyright: "Original file made by Duisterwho (https://freesound.org/people/Duisterwho/), edited (converted to mono, cropped) by erhardsteinhauer (discord/github)" source: "https://freesound.org/people/Duisterwho/sounds/643497/" - files: ["goblin-cry-01.ogg, goblin-cry-02.ogg"] license: "CC0-1.0" - copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (cropped) by erhardsteinhauer (discord/github)" + copyright: "Original file made by SnowFightStudios (https://freesound.org/people/SnowFightStudios/), edited (converted to mono, cropped) by erhardsteinhauer (discord/github)" source: https://freesound.org/people/SnowFightStudios/sounds/643657/ - files: ["goblin-chatter-01.ogg"] license: "CC0-1.0" - copyright: "Original file made by Fenodyrie (https://freesound.org/people/Fenodyrie/)" + copyright: "Original file made by Fenodyrie (https://freesound.org/people/Fenodyrie/), edited (converted to mono) by erhardsteinhauer (discord/github)" source: https://freesound.org/people/Fenodyrie/sounds/565923/ - files: ["goblin-hiss-01.ogg"] - license: "CC BY 4.0" - copyright: "Original file made by LittleRobotSoundFactory (https://freesound.org/people/LittleRobotSoundFactory/)" + license: "CC-BY-4.0" + copyright: "Original file made by LittleRobotSoundFactory (https://freesound.org/people/LittleRobotSoundFactory/), edited (converted to mono) by erhardsteinhauer (discord/github)" source: https://freesound.org/people/LittleRobotSoundFactory/sounds/270389/ diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 1f56c4ad64d..e7f7d050ab3 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -4435,3 +4435,61 @@ Entries: cases. id: 4963 time: '2024-04-29T21:36:47.0000000+00:00' +- author: VMSolidus + changes: + - type: Fix + message: >- + All Jumpskirts in the game have been correctly listed as skirts, now + Harpies can wear them again. + id: 4964 + time: '2024-05-01T21:37:35.0000000+00:00' +- author: erhardsteinhauer + changes: + - type: Fix + message: >- + Fixed goblin stomach. Now it actually doesn't turn itself out when raw + meat or blood is consumed by owner of that stomach. + - type: Fix + message: Lowered sound level of goblin laughter sfx. + id: 4965 + time: '2024-05-01T23:10:16.0000000+00:00' +- author: blueDev2 + changes: + - type: Add + message: Brigmedic PDAs can now perform medical scans + id: 4966 + time: '2024-05-01T23:32:16.0000000+00:00' +- author: dvir01 + changes: + - type: Tweak + message: >- + Lower IFF amounts in Expeditionary Flatpackvend, you can now find many + IFF boards on planets. + - type: Tweak + message: >- + Added R&D Server Flatpack to Flatpackvend, removed the hidden HoverBike, + they can also be found on planets now. + id: 4967 + time: '2024-05-02T01:07:48.0000000+00:00' +- author: DeltaV + changes: + - type: Add + message: Felinids now scream in agony from water. + - type: Tweak + message: Felinid's thieving gloves have been removed for Soft paws mechanic. + - type: Add + message: Added a speech bubble to felinids. Mraow! + id: 4968 + time: '2024-05-02T01:08:21.0000000+00:00' +- author: dvir01 + changes: + - type: Fix + message: Fixed mailpod power issue + id: 4969 + time: '2024-05-02T01:21:52.0000000+00:00' +- author: erhardsteinhauer + changes: + - type: Fix + message: Added felinids/goblins/vulps to hoverbike built-in storage blacklist. + id: 4970 + time: '2024-05-03T00:27:37.0000000+00:00' diff --git a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl index 6d65758abd7..9ff0cb4f2cd 100644 --- a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl @@ -24,6 +24,10 @@ uplink-security-hardsuit-combat-name = Patrol Combat Hardsuit uplink-security-hardsuit-combat-desc = An armored patrol suit for combat meant to be utilized for multi-environmental hostile engagements. uplink-security-hardsuit-commmand-name = Command Combat Hardsuit uplink-security-hardsuit-commmand-desc = An advanced combat suit designed for seasoned nfsd supervisors meant to be utilized for multi-environmental hostile engagements. +uplink-security-lethalarmory-name = Lethal armory stock crate +uplink-security-lethalarmory-desc = A crate containing weapons necessary to fill an armory. +uplink-security-nonlethalarmory-name = Non-lethal armory stock crate +uplink-security-nonlethalarmory-desc = A crate containing non-lethal weapons necessary to fill an armory. uplink-security-mk58-name = MK 58 uplink-security-mk58-desc = Cheap, standard issue side-arm. Uses .35 Auto. uplink-security-kammerer-name = Kammerer diff --git a/Resources/Maps/_NF/Shuttles/mailpod.yml b/Resources/Maps/_NF/Shuttles/mailpod.yml index 761d0e13f8f..adf521b3bc6 100644 --- a/Resources/Maps/_NF/Shuttles/mailpod.yml +++ b/Resources/Maps/_NF/Shuttles/mailpod.yml @@ -118,37 +118,19 @@ entities: data: tiles: 0,0: - 0: 1 - 1: 30582 - -1,0: - 2: 4 - 1: 52424 + 0: 4403 + 1: 17408 0,-1: - 1: 25975 - 3: 4096 - 0: 512 - -1,-1: - 1: 52428 + 0: 13106 + -1,0: + 0: 34944 0,1: - 1: 7 + 1: 4 + -1,-1: + 1: 17476 -1,1: - 1: 12 + 1: 4 uniqueMixes: - - volume: 2500 - temperature: 293.14996 - moles: - - 20.078888 - - 75.53487 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - volume: 2500 temperature: 293.15 moles: @@ -165,10 +147,8 @@ entities: - 0 - 0 - volume: 2500 - temperature: 293.14996 + immutable: True moles: - - 21.824879 - - 82.10312 - 0 - 0 - 0 @@ -179,19 +159,6 @@ entities: - 0 - 0 - 0 - - volume: 2500 - temperature: 293.15 - moles: - - 23.710548 - - 89.19683 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - 0 - 0 chunkSize: 4 @@ -330,24 +297,16 @@ entities: - type: Transform pos: 2.5,1.5 parent: 1 - - uid: 64 + - uid: 32 components: - type: Transform - pos: 2.5,2.5 + pos: 1.5,1.5 parent: 1 - uid: 73 components: - type: Transform pos: 1.5,2.5 parent: 1 -- proto: CableTerminal - entities: - - uid: 32 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,1.5 - parent: 1 - proto: ChairOfficeLight entities: - uid: 58 diff --git a/Resources/Prototypes/DeltaV/typing_indicator.yml b/Resources/Prototypes/DeltaV/typing_indicator.yml new file mode 100644 index 00000000000..a3fc2fbcfb9 --- /dev/null +++ b/Resources/Prototypes/DeltaV/typing_indicator.yml @@ -0,0 +1,5 @@ +- type: typingIndicator + id: felinid + spritePath: /Textures/DeltaV/Effects/speech.rsi + typingState: felinid0 + offset: 0, 0.2 # 0625 diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml index 6e7d2ba7a6e..fe2a10d60a7 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml @@ -36,6 +36,11 @@ - type: Clothing slots: [innerclothing] femaleMask: UniformTop + - type: Tag + tags: + - ClothMade + - WhitelistChameleon + - Skirt #Frontier, needed for Harpies - type: entity diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml index 70956eafa36..a96f74ec636 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml @@ -1,6 +1,6 @@ # White Jumpskirt - type: entity - parent: ClothingUniformBase + parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtColorWhite name: white jumpskirt description: A generic white jumpskirt with no rank markings. @@ -27,7 +27,7 @@ # Grey Jumpskirt - type: entity - parent: ClothingUniformBase + parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtColorGrey name: grey jumpskirt description: A tasteful grey jumpskirt that reminds you of the good old days. @@ -58,7 +58,7 @@ # Black Jumpskirt - type: entity - parent: ClothingUniformBase + parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtColorBlack name: black jumpskirt description: A generic black jumpskirt with no rank markings. @@ -89,7 +89,7 @@ # Blue Jumpskirt - type: entity - parent: ClothingUniformBase + parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtColorBlue name: blue jumpskirt description: A generic blue jumpskirt with no rank markings. @@ -120,7 +120,7 @@ # Dark Blue Jumpskirt - type: entity - parent: ClothingUniformBase + parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtColorDarkBlue name: dark blue jumpskirt description: A generic dark blue jumpskirt with no rank markings. @@ -151,7 +151,7 @@ # Teal Jumpskirt - type: entity - parent: ClothingUniformBase + parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtColorTeal name: teal jumpskirt description: A generic teal jumpskirt with no rank markings. @@ -182,7 +182,7 @@ # Green Jumpskirt - type: entity - parent: ClothingUniformBase + parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtColorGreen name: green jumpskirt description: A generic green jumpskirt with no rank markings. @@ -213,7 +213,7 @@ # Dark Green Jumpskirt - type: entity - parent: ClothingUniformBase + parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtColorDarkGreen name: dark green jumpskirt description: A generic dark green jumpskirt with no rank markings. @@ -244,7 +244,7 @@ # Orange Jumpskirt - type: entity - parent: ClothingUniformBase + parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtColorOrange name: orange jumpskirt description: Don't wear this near paranoid security officers. @@ -275,7 +275,7 @@ # Pink Jumpskirt - type: entity - parent: ClothingUniformBase + parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtColorPink name: pink jumpskirt description: Just looking at this makes you feel fabulous. @@ -306,7 +306,7 @@ # Red Jumpskirt - type: entity - parent: ClothingUniformBase + parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtColorRed name: red jumpskirt description: A generic red jumpskirt with no rank markings. @@ -337,7 +337,7 @@ # Yellow Jumpskirt - type: entity - parent: ClothingUniformBase + parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtColorYellow name: yellow jumpskirt description: A generic yellow jumpskirt with no rank markings. @@ -368,7 +368,7 @@ # Purple Jumpskirt - type: entity - parent: ClothingUniformBase + parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtColorPurple name: purple jumpskirt description: A generic light purple jumpskirt with no rank markings. @@ -399,7 +399,7 @@ # Light Brown Jumpskirt - type: entity - parent: ClothingUniformBase + parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtColorLightBrown name: light brown jumpskirt description: A generic light brown jumpskirt with no rank markings. @@ -433,7 +433,7 @@ # Brown Jumpskirt - type: entity - parent: ClothingUniformBase + parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtColorBrown name: brown jumpskirt description: A generic brown jumpskirt with no rank markings. @@ -464,7 +464,7 @@ # Maroon Jumpskirt - type: entity - parent: ClothingUniformBase + parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtColorMaroon name: maroon jumpskirt description: A generic maroon jumpskirt with no rank markings. diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 63c5879ed7a..e887c2a8b05 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -263,7 +263,7 @@ sprite: Clothing/Uniforms/Jumpskirt/brigmedic.rsi - type: entity - parent: ClothingUniformBase + parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtPrisoner name: prisoner jumpskirt description: Busted. diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml index d95014d1675..8e1242d2d7c 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml @@ -24,21 +24,30 @@ prototype: Felinid - type: Damageable damageModifierSet: Felinid + - type: SlowOnDamage + speedModifierThresholds: + 60: 0.85 # 0.7 is base speed. + 80: 0.75 # 0.5 is base speed. - type: MeleeWeapon soundHit: collection: Punch animation: WeaponArcClaw damage: types: - Blunt: 3 - Slash: 2 + Slash: 4 + Piercing: 1 +# - type: DiseaseCarrier +# naturalImmunities: +# - OwOnavirus - type: Speech speechSounds: Alto - - type: DamageOnHighSpeedImpact + - type: DamageOnHighSpeedImpact # Landing on all fours! damage: types: Blunt: 1 - type: Stamina + - type: TypingIndicator + proto: felinid - type: PseudoItem - type: Vocal wilhelm: "/Audio/Nyanotrasen/Voice/Felinid/cat_wilhelm.ogg" @@ -54,6 +63,22 @@ - type: SizeAttributeWhitelist # Frontier tall: true tallscale: 1 + - type: Reactive + groups: + Flammable: [ Touch ] + Extinguish: [ Touch ] + reactions: + - reagents: [ Water, SpaceCleaner ] + methods: [ Touch ] + effects: + - !type:WashCreamPieReaction + - reagents: [ Water ] + methods: [ Touch ] + effects: + - !type:Emote + emote: Scream + probability: 0.2 + - type: NoShoesSilentFootsteps - type: entity save: false @@ -65,5 +90,3 @@ components: - type: HumanoidAppearance species: Felinid - -#Nya~~ diff --git a/Resources/Prototypes/_NF/Body/Organs/goblin_organs.yml b/Resources/Prototypes/_NF/Body/Organs/goblin_organs.yml index 4e0c6175c12..b514153338b 100644 --- a/Resources/Prototypes/_NF/Body/Organs/goblin_organs.yml +++ b/Resources/Prototypes/_NF/Body/Organs/goblin_organs.yml @@ -114,7 +114,7 @@ metabolizerTypes: [ Goblin ] - type: entity - parent: [OrganAnimalStomach, OrganHumanStomach] + parent: [ OrganHumanStomach, OrganAnimalStomach ] id: OrganGoblinStomach name: stomach suffix: Goblin @@ -134,29 +134,9 @@ - ReagentId: UncookedAnimalProteins Quantity: 5 - type: Stomach -# reverseFoodQuality: true -# trashDigestion: true -# specialDigestible: -# tags: -# - Raw -# - Meat -# - Fruit -# - Pill -# - Crayon -# - Egg -# - Trash -# - FoodSnack -# - Soup -# - Bread -# - DonkPocket -# - Donut -# - Nugget -# - Pancake -# - Pie -# - Pizza - type: Metabolizer maxReagents: 3 - metabolizerTypes: [ Goblin ] + metabolizerTypes: [ Animal ] # [ Goblin ] removeEmpty: true groups: - id: Food diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/nfsdarmory.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/nfsdarmory.yml index 03916e5b3a5..521335d5361 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/nfsdarmory.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/nfsdarmory.yml @@ -69,3 +69,45 @@ amount: 2 - id: MagazinePistol amount: 4 + +- type: entity + id: CrateArmoryLethalNfsd + parent: CrateNfsdSecure2 + name: nfsd lethal armory crate + description: Contains a standard armory stock kit. + components: + - type: StorageFill + contents: + - id: WeaponRifleLecter + amount: 5 + - id: WeaponSubMachineGunWt550 + amount: 4 + - id: WeaponShotgunEnforcer + amount: 5 + - id: WeaponLaserCarbine + amount: 4 + - id: WeaponEnergyGun + amount: 4 + - id: WeaponPistolMk58 + amount: 4 + - id: WeaponRevolverInspector + amount: 4 + +- type: entity + id: CrateArmoryNonLethalNfsd + parent: CrateNfsdSecure1 + name: nfsd non-lethal armory crate + description: Contains a standard armory stock kit. + components: + - type: StorageFill + contents: + - id: WeaponDisabler + amount: 5 + - id: WeaponPistolMk58Nonlethal + amount: 4 + - id: WeaponDisablerSMG + amount: 5 + - id: WeaponRifleLecterRubber + amount: 4 + - id: WeaponShotgunEnforcerRubber + amount: 4 diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/expeditionaryflatpackvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/expeditionaryflatpackvend.yml index b79d6217271..01494e6bc10 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/expeditionaryflatpackvend.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/expeditionaryflatpackvend.yml @@ -6,4 +6,4 @@ PowerCellRechargerFlatpack: 16 WeaponCapacitorRechargerFlatpack: 16 BorgChargerFlatpack: 16 - ComputerIFFFlatpack: 3 + ComputerIFFFlatpack: 1 diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/flatpackvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/flatpackvend.yml index 158eae93dcc..a2430466621 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/flatpackvend.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/flatpackvend.yml @@ -8,6 +8,7 @@ ExosuitFabricatorFlatpack: 4 ProtolatheFlatpack: 6 CircuitImprinterFlatpack: 6 + ResearchAndDevelopmentServerFlatpack: 6 ScienceTechFabFlatpack: 4 EngineeringTechFabFlatpack: 4 SalvageTechfabNFFlatpack: 4 @@ -24,5 +25,3 @@ AirlockGlassFlatpack: 20 AirlockShuttleFlatpack: 20 AirlockGlassShuttleFlatpack: 20 - emaggedInventory: - HoverbikeFlatpack: 1 diff --git a/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml b/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml index 4e07d0d8eda..4e86da470f5 100644 --- a/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml +++ b/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml @@ -1185,3 +1185,45 @@ - Bailiff - SeniorOfficer - Sheriff + +- type: listing + id: UplinkSecurityLethalArmory + name: uplink-security-lethalarmory-name + description: uplink-security-lethalarmory-desc + productEntity: CrateArmoryLethalNfsd + icon: { sprite: _NF/Structures/Storage/Crates/nfsd_secure2.rsi, state: icon } + cost: + FrontierUplinkCoin: 15 + categories: + - UplinkSecurityUtility + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - SecurityUplink + - !type:BuyerJobCondition + whitelist: + - Bailiff + - SeniorOfficer + - Sheriff + +- type: listing + id: UplinkSecurityNonLethalArmory + name: uplink-security-nonlethalarmory-name + description: uplink-security-nonlethalarmory-desc + productEntity: CrateArmoryNonLethalNfsd + icon: { sprite: _NF/Structures/Storage/Crates/nfsd_secure1.rsi, state: icon } + cost: + FrontierUplinkCoin: 10 + categories: + - UplinkSecurityUtility + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - SecurityUplink + - !type:BuyerJobCondition + whitelist: + - Bailiff + - SeniorOfficer + - Sheriff \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml index feab138ff02..e0093a21e2c 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml @@ -125,6 +125,11 @@ state: pda-sheriff bookSlot: # Frontier startingItem: HyperlinkBookNfsdSop + priority: -2 + whitelist: + tags: + - BookSpaceLaw + - BookNfsdSop - type: PdaBorderColor borderColor: "#FFFDD0" accentHColor: "#896b49" @@ -155,6 +160,11 @@ state: pda-cadet bookSlot: # Frontier startingItem: HyperlinkBookNfsdSop + priority: -2 + whitelist: + tags: + - BookSpaceLaw + - BookNfsdSop - type: PdaBorderColor borderColor: "#FFFDD0" accentHColor: "#896b49" @@ -185,6 +195,11 @@ state: pda-deputy bookSlot: # Frontier startingItem: HyperlinkBookNfsdSop + priority: -2 + whitelist: + tags: + - BookSpaceLaw + - BookNfsdSop - type: PdaBorderColor borderColor: "#FFFDD0" accentHColor: "#896b49" @@ -205,7 +220,7 @@ state: pda-deputy - type: entity - parent: BasePDA + parent: BaseMedicalPDA id: BrigmedicNFPDA name: brigmedic PDA description: Whosoever bears this PDA heals the law. @@ -215,6 +230,11 @@ state: pda-brigmed bookSlot: # Frontier startingItem: HyperlinkBookNfsdSop + priority: -2 + whitelist: + tags: + - BookSpaceLaw + - BookNfsdSop - type: PdaBorderColor borderColor: "#FFFDD0" accentHColor: "#896b49" @@ -245,6 +265,11 @@ state: pda-sergeant bookSlot: # Frontier startingItem: HyperlinkBookNfsdSop + priority: -2 + whitelist: + tags: + - BookSpaceLaw + - BookNfsdSop - type: PdaBorderColor borderColor: "#FFFDD0" accentHColor: "#896b49" @@ -275,6 +300,11 @@ state: pda-bailiff bookSlot: # Frontier startingItem: HyperlinkBookNfsdSop + priority: -2 + whitelist: + tags: + - BookSpaceLaw + - BookNfsdSop - type: PdaBorderColor borderColor: "#FFFDD0" accentHColor: "#896b49" @@ -305,6 +335,11 @@ state: pda-detective bookSlot: # Frontier startingItem: HyperlinkBookNfsdSop + priority: -2 + whitelist: + tags: + - BookSpaceLaw + - BookNfsdSop - type: PdaBorderColor borderColor: "#774705" - type: Icon @@ -321,9 +356,13 @@ state: pda-sr penSlot: startingItem: PenCentcom + priority: -1 + whitelist: + tags: + - Write - type: PdaBorderColor borderColor: "#789876" - accentHColor: "#447987" + accentHColor: "#447987" - type: Sprite sprite: _NF/Objects/Devices/pda.rsi layers: diff --git a/Resources/Prototypes/_NF/Entities/Objects/Vehicles/vehicles.yml b/Resources/Prototypes/_NF/Entities/Objects/Vehicles/vehicles.yml index fdda560c9e7..cd49d37bc62 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Vehicles/vehicles.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Vehicles/vehicles.yml @@ -58,19 +58,22 @@ name: skeleton motorcycle description: Bad to the Bone. components: - - type: Storage - grid: - - 0,0,1,3 - - 3,0,6,3 - - 8,0,9,3 - maxItemSize: Huge - - type: ContainerContainer - containers: - storagebase: !type:Container - - type: UserInterface - interfaces: - - key: enum.StorageUiKey.Key - type: StorageBoundUserInterface + - type: Storage + grid: + - 0,0,1,3 + - 3,0,6,3 + - 8,0,9,3 + maxItemSize: Huge + blacklist: + components: + - HumanoidAppearance + - type: ContainerContainer + containers: + storagebase: !type:Container + - type: UserInterface + interfaces: + - key: enum.StorageUiKey.Key + type: StorageBoundUserInterface # New Frontier vehicles - type: entity diff --git a/Resources/Textures/DeltaV/Effects/speech.rsi/felinid0.png b/Resources/Textures/DeltaV/Effects/speech.rsi/felinid0.png new file mode 100644 index 00000000000..586d1e6a343 Binary files /dev/null and b/Resources/Textures/DeltaV/Effects/speech.rsi/felinid0.png differ diff --git a/Resources/Textures/DeltaV/Effects/speech.rsi/felinid1.png b/Resources/Textures/DeltaV/Effects/speech.rsi/felinid1.png new file mode 100644 index 00000000000..8af894f1dec Binary files /dev/null and b/Resources/Textures/DeltaV/Effects/speech.rsi/felinid1.png differ diff --git a/Resources/Textures/DeltaV/Effects/speech.rsi/felinid2.png b/Resources/Textures/DeltaV/Effects/speech.rsi/felinid2.png new file mode 100644 index 00000000000..abb5f04373e Binary files /dev/null and b/Resources/Textures/DeltaV/Effects/speech.rsi/felinid2.png differ diff --git a/Resources/Textures/DeltaV/Effects/speech.rsi/meta.json b/Resources/Textures/DeltaV/Effects/speech.rsi/meta.json new file mode 100644 index 00000000000..1d4b09fbffe --- /dev/null +++ b/Resources/Textures/DeltaV/Effects/speech.rsi/meta.json @@ -0,0 +1,28 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Felinid sprites made by Adrian16199 (Github)", + "states": [ + { + "name": "felinid0", + "delays": [ + [ + 0.2, + 0.3, + 0.3, + 0.5 + ] + ] + }, + { + "name": "felinid1" + }, + { + "name": "felinid2" + } + ] +} diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Felinid/felinid_tails.rsi/felinid_fluffy_tail_rings.png b/Resources/Textures/DeltaV/Mobs/Customization/Felinid/felinid_tails.rsi/felinid_fluffy_tail_rings.png index 4e6a6d8dc0d..31b402d3381 100644 Binary files a/Resources/Textures/DeltaV/Mobs/Customization/Felinid/felinid_tails.rsi/felinid_fluffy_tail_rings.png and b/Resources/Textures/DeltaV/Mobs/Customization/Felinid/felinid_tails.rsi/felinid_fluffy_tail_rings.png differ