diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 8489a3c74a0..a5b22151117 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -4751,3 +4751,19 @@ Entries: shooting speed. id: 5002 time: '2024-06-01T16:30:25.0000000+00:00' +- author: dvir01 + changes: + - type: Tweak + message: >- + NT Found there is too much fiber and plastic in all employees blood, + making gloves use less fiber, but now they also allow your fingerprints + to mark stuff you interact with, some illegal gloves possibly kept the + old fibers quality. + id: 5003 + time: '2024-06-02T20:33:51.0000000+00:00' +- author: dvir01 + changes: + - type: Tweak + message: Pirate Cove got new equipment shipment. + id: 5004 + time: '2024-06-03T01:05:56.0000000+00:00' diff --git a/Resources/Locale/en-US/_NF/paper/paper-misc.ftl b/Resources/Locale/en-US/_NF/paper/paper-misc.ftl new file mode 100644 index 00000000000..844d3e9b40b --- /dev/null +++ b/Resources/Locale/en-US/_NF/paper/paper-misc.ftl @@ -0,0 +1 @@ +book-text-pirate-scribbles = Clarpy was drinking all the soda again, dont forget to refill the machine. diff --git a/Resources/Maps/_NF/Outpost/frontier.yml b/Resources/Maps/_NF/Outpost/frontier.yml index ae01828a0ed..4cbef46386f 100644 --- a/Resources/Maps/_NF/Outpost/frontier.yml +++ b/Resources/Maps/_NF/Outpost/frontier.yml @@ -4527,7 +4527,7 @@ entities: - type: Transform pos: -5.5,25.5 parent: 2173 -- proto: AirlockAtmosphericsGlassLocked +- proto: AirlockFrontierCommandAtmosphericsGlassLocked entities: - uid: 4082 components: @@ -4551,7 +4551,7 @@ entities: - type: Transform pos: 0.5,35.5 parent: 2173 -- proto: AirlockEngineeringGlassLocked +- proto: AirlockFrontierCommandEngineeringGlassLocked entities: - uid: 4079 components: @@ -4568,7 +4568,7 @@ entities: - type: Transform pos: -40.5,10.5 parent: 2173 -- proto: AirlockEngineeringLocked +- proto: AirlockFrontierCommandEngineeringLocked entities: - uid: 4136 components: @@ -5576,7 +5576,7 @@ entities: - type: Transform pos: 49.5,12.5 parent: 2173 -- proto: AirlockMaintEngiLocked +- proto: AirlockMaintFrontierBridgeLocked entities: - uid: 4131 components: @@ -41648,7 +41648,7 @@ entities: rot: 3.141592653589793 rad pos: 52.5,16.5 parent: 2173 -- proto: WindoorSecureEngineeringLocked +- proto: WindoorSecureFrontierCommandLocked entities: - uid: 2128 components: @@ -41671,7 +41671,7 @@ entities: - type: Transform pos: -33.5,6.5 parent: 2173 -- proto: WindoorSecureHeadOfPersonnelLocked +- proto: WindoorSecureFrontierCommandLocked entities: - uid: 2642 components: diff --git a/Resources/Maps/_NF/POI/cove.yml b/Resources/Maps/_NF/POI/cove.yml index b4adf4a0ad9..00654063fa1 100644 --- a/Resources/Maps/_NF/POI/cove.yml +++ b/Resources/Maps/_NF/POI/cove.yml @@ -89,8 +89,8 @@ entities: - type: Broadphase - type: Physics bodyStatus: InAir - angularDamping: 0.05 - linearDamping: 0.05 + angularDamping: 999999 + linearDamping: 999999 fixedRotation: False bodyType: Dynamic - type: Fixtures @@ -1073,16 +1073,6 @@ entities: - 171 - 974 - 973 -- proto: AirCanister - entities: - - uid: 901 - components: - - type: Transform - anchored: True - pos: 8.5,11.5 - parent: 1 - - type: Physics - bodyType: Static - proto: AirlockFreezer entities: - uid: 345 @@ -2352,6 +2342,13 @@ entities: rot: 1.5707963267948966 rad pos: -1.5,5.5 parent: 1 +- proto: BoxBeanbag + entities: + - uid: 2078 + components: + - type: Transform + pos: -3.469921,8.8195715 + parent: 1 - proto: BoxCardboard entities: - uid: 1993 @@ -2399,12 +2396,12 @@ entities: - uid: 1136 components: - type: Transform - pos: -3.6354046,8.857361 + pos: -5.3925104,5.652456 parent: 1 - uid: 1137 components: - type: Transform - pos: -3.3854048,8.732361 + pos: -5.600844,5.8334475 parent: 1 - proto: BrokenBottle entities: @@ -4062,27 +4059,27 @@ entities: parent: 1 - proto: CannonBallGlassshot entities: - - uid: 681 + - uid: 604 components: - type: Transform - pos: -2.3322191,11.64659 + pos: -2.308549,11.819694 parent: 1 - - uid: 684 + - uid: 682 components: - type: Transform - pos: -2.5926356,11.792424 + pos: -2.6314654,11.913444 parent: 1 - proto: CannonBallGrapeshot entities: - - uid: 682 + - uid: 2069 components: - type: Transform - pos: -3.3530524,11.698674 + pos: -2.6731322,11.705111 parent: 1 - - uid: 687 + - uid: 2070 components: - type: Transform - pos: -3.5926356,11.813257 + pos: -2.3606322,11.673861 parent: 1 - proto: CargoPallet entities: @@ -4209,6 +4206,12 @@ entities: - type: Transform pos: -5.5,13.5 parent: 1 + - uid: 98 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 8.5,11.5 + parent: 1 - uid: 115 components: - type: Transform @@ -4265,12 +4268,6 @@ entities: rot: -1.5707963267948966 rad pos: 8.5,12.5 parent: 1 - - uid: 604 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 8.5,11.5 - parent: 1 - uid: 627 components: - type: Transform @@ -5150,6 +5147,13 @@ entities: showEnts: False occludes: True ent: null +- proto: CrateFunHoverbikeNFPirate + entities: + - uid: 684 + components: + - type: Transform + pos: 0.5,11.5 + parent: 1 - proto: CrateFunParty entities: - uid: 125 @@ -5596,6 +5600,20 @@ entities: - type: Transform pos: 10.652694,21.650824 parent: 1 +- proto: DoubleEmergencyNitrogenTankFilled + entities: + - uid: 2065 + components: + - type: Transform + pos: 10.366604,23.616253 + parent: 1 +- proto: DoubleEmergencyOxygenTankFilled + entities: + - uid: 2066 + components: + - type: Transform + pos: 10.72077,23.605837 + parent: 1 - proto: Dresser entities: - uid: 1697 @@ -5921,7 +5939,7 @@ entities: pos: 7.5,28.5 parent: 1 - type: Door - secondsUntilStateChange: -2234.199 + secondsUntilStateChange: -3553.7524 state: Opening - proto: FenceWoodSmallCorner entities: @@ -7039,6 +7057,19 @@ entities: - type: Transform pos: 2.4884746,-4.2928896 parent: 1 +- proto: GasMixerFlipped + entities: + - uid: 901 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 7.5,11.5 + parent: 1 + - type: GasMixer + inletTwoConcentration: 0.78 + inletOneConcentration: 0.22 + - type: AtmosPipeColor + color: '#0055CCFF' - proto: GasPassiveVent entities: - uid: 1285 @@ -7310,14 +7341,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 944 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 7.5,11.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 945 components: - type: Transform @@ -7431,6 +7454,14 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' + - uid: 687 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,10.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 717 components: - type: Transform @@ -7863,13 +7894,26 @@ entities: - type: Transform pos: 3.5,12.5 parent: 1 -- proto: LessLethalVendingMachine +- proto: LiquidNitrogenCanister entities: - - uid: 2056 + - uid: 2068 components: - type: Transform - pos: -14.5,23.5 + anchored: True + pos: 7.5,10.5 + parent: 1 + - type: Physics + bodyType: Static +- proto: LiquidOxygenCanister + entities: + - uid: 2067 + components: + - type: Transform + anchored: True + pos: 8.5,11.5 parent: 1 + - type: Physics + bodyType: Static - proto: LuxuryPen entities: - uid: 955 @@ -7884,6 +7928,20 @@ entities: - type: Transform pos: 2.5,10.5 parent: 1 +- proto: MagazineBoxRifleBig + entities: + - uid: 1193 + components: + - type: Transform + pos: -14.385674,21.644907 + parent: 1 +- proto: MagazineBoxRifleBigRubber + entities: + - uid: 2077 + components: + - type: Transform + pos: -14.5940075,21.832407 + parent: 1 - proto: Mattress entities: - uid: 2023 @@ -8006,6 +8064,13 @@ entities: - type: Transform pos: -8.6548395,9.638229 parent: 1 +- proto: PaperWrittenPirateScribbles + entities: + - uid: 2080 + components: + - type: Transform + pos: -0.80706465,2.5555282 + parent: 1 - proto: PianoInstrument entities: - uid: 276 @@ -8381,11 +8446,6 @@ entities: - type: Transform pos: -3.5,13.5 parent: 1 - - uid: 98 - components: - - type: Transform - pos: -3.5,11.5 - parent: 1 - uid: 111 components: - type: Transform @@ -8427,12 +8487,37 @@ entities: - type: Transform pos: -1.5,13.5 parent: 1 + - uid: 944 + components: + - type: Transform + pos: -14.5,23.5 + parent: 1 + - uid: 1066 + components: + - type: Transform + pos: -3.5,11.5 + parent: 1 + - uid: 2056 + components: + - type: Transform + pos: 10.5,23.5 + parent: 1 - uid: 2059 components: - type: Transform rot: -1.5707963267948966 rad pos: 10.5,21.5 parent: 1 + - uid: 2064 + components: + - type: Transform + pos: -14.5,22.5 + parent: 1 + - uid: 2079 + components: + - type: Transform + pos: -14.5,21.5 + parent: 1 - proto: Railing entities: - uid: 3 @@ -8850,11 +8935,6 @@ entities: parent: 1 - proto: RandomStalagmiteOrCrystal entities: - - uid: 1066 - components: - - type: Transform - pos: -13.5,21.5 - parent: 1 - uid: 1067 components: - type: Transform @@ -9479,6 +9559,30 @@ entities: - type: Transform pos: -0.5,1.5 parent: 1 +- proto: SpeedLoaderRifleHeavy + entities: + - uid: 2075 + components: + - type: Transform + pos: -14.530999,22.55163 + parent: 1 + - uid: 2076 + components: + - type: Transform + pos: -14.426833,22.67663 + parent: 1 +- proto: SpeedLoaderRifleHeavyRubber + entities: + - uid: 2072 + components: + - type: Transform + pos: -14.318903,23.622427 + parent: 1 + - uid: 2073 + components: + - type: Transform + pos: -14.48557,23.487011 + parent: 1 - proto: StairStageWood entities: - uid: 1599 @@ -10013,13 +10117,6 @@ entities: - type: Transform pos: -5.323082,7.791107 parent: 1 -- proto: VendingMachineTankDispenserEVA - entities: - - uid: 1193 - components: - - type: Transform - pos: 10.5,23.5 - parent: 1 - proto: WallmountTelevisionFrame entities: - uid: 737 @@ -12755,6 +12852,13 @@ entities: parent: 1875 - type: Physics canCollide: False +- proto: WeaponEmpEmitter + entities: + - uid: 681 + components: + - type: Transform + pos: -3.471903,11.63687 + parent: 1 - proto: WeaponGrapplingGun entities: - uid: 2063 @@ -12799,6 +12903,20 @@ entities: showEnts: False occludes: True ent: null +- proto: WeaponRevolverArgenti + entities: + - uid: 2074 + components: + - type: Transform + pos: -14.541416,22.73913 + parent: 1 +- proto: WeaponRevolverArgentiNonlethal + entities: + - uid: 2071 + components: + - type: Transform + pos: -14.495986,23.716177 + parent: 1 - proto: WeaponRifleBB entities: - uid: 1695 @@ -12806,6 +12924,13 @@ entities: - type: Transform pos: 23.56418,24.946178 parent: 1 +- proto: WeaponShotgunDoubleBarreledRubber + entities: + - uid: 2081 + components: + - type: Transform + pos: -3.574088,8.4966545 + parent: 1 - proto: WeldingFuelTankHighCapacity entities: - uid: 395 diff --git a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml index 02cf0ab6f67..5053c27598f 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml @@ -43,4 +43,4 @@ components: - type: Fiber fiberMaterial: fibers-synthetic - - type: FingerprintMask +# - type: FingerprintMask # Frontier diff --git a/Resources/Prototypes/Entities/Clothing/Hands/colored.yml b/Resources/Prototypes/Entities/Clothing/Hands/colored.yml index 8b7300670d3..0b5b2e3fe79 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/colored.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/colored.yml @@ -300,7 +300,7 @@ name: insulated gloves description: These gloves will protect the wearer from electric shocks. components: - - type: FingerprintMask +# - type: FingerprintMask # Frontier - type: Sprite sprite: Clothing/Hands/Gloves/Color/yellow.rsi - type: Clothing diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml index 084d30d703a..17aee2ba5a7 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml @@ -24,7 +24,7 @@ - type: Fiber fiberMaterial: fibers-leather fiberColor: fibers-red - - type: FingerprintMask +# - type: FingerprintMask # Frontier - type: Tag tags: - Kangaroo @@ -44,7 +44,7 @@ - type: Fiber fiberMaterial: fibers-leather fiberColor: fibers-blue - - type: FingerprintMask +# - type: FingerprintMask # Frontier - type: entity parent: ClothingHandsGlovesBoxingRed @@ -60,7 +60,7 @@ - type: Fiber fiberMaterial: fibers-leather fiberColor: fibers-green - - type: FingerprintMask +# - type: FingerprintMask # Frontier - type: entity parent: ClothingHandsGlovesBoxingRed @@ -76,7 +76,7 @@ - type: Fiber fiberMaterial: fibers-leather fiberColor: fibers-yellow - - type: FingerprintMask +# - type: FingerprintMask # Frontier - type: entity parent: ClothingHandsGlovesBoxingBlue @@ -109,7 +109,7 @@ - type: Fiber fiberMaterial: fibers-durathread fiberColor: fibers-regal-blue - - type: FingerprintMask +# - type: FingerprintMask # Frontier - type: entity parent: ClothingHandsBase @@ -128,7 +128,7 @@ modifiers: coefficients: Slash: 0.95 - - type: FingerprintMask +# - type: FingerprintMask # Frontier #### Medical - type: entity @@ -143,7 +143,7 @@ sprite: Clothing/Hands/Gloves/latex.rsi - type: Fiber fiberMaterial: fibers-latex - - type: FingerprintMask +# - type: FingerprintMask # Frontier - type: entity parent: ClothingHandsButcherable @@ -157,7 +157,7 @@ sprite: Clothing/Hands/Gloves/nitrile.rsi - type: Fiber fiberMaterial: fibers-nitrile - - type: FingerprintMask +# - type: FingerprintMask # Frontier #### - type: entity parent: ClothingHandsButcherable @@ -174,7 +174,7 @@ - type: Fiber fiberMaterial: fibers-leather fiberColor: fibers-brown - - type: FingerprintMask +# - type: FingerprintMask # Frontier - type: entity parent: ClothingHandsBase @@ -188,7 +188,7 @@ sprite: Clothing/Hands/Gloves/powerglove.rsi - type: Fiber fiberMaterial: fibers-nanomachines - - type: FingerprintMask +# - type: FingerprintMask # Frontier - type: entity parent: ClothingHandsButcherable @@ -203,7 +203,7 @@ - type: Fiber fiberMaterial: fibers-leather fiberColor: fibers-black - - type: FingerprintMask +# - type: FingerprintMask # Frontier - type: entity parent: ClothingHandsBase @@ -339,7 +339,8 @@ - type: Thieving stripTimeReduction: 1.5 stealthy: true - - type: Contraband #frontier + - type: FingerprintMask # Frontier + - type: Contraband # Frontier - type: entity parent: ClothingHandsGlovesColorWhite @@ -416,4 +417,4 @@ - type: Fiber fiberMaterial: fibers-rubber fiberColor: fibers-yellow - - type: FingerprintMask +# - type: FingerprintMask # Frontier diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/fun.yml index 05e62163cd1..995fe0bfbf9 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/fun.yml @@ -37,3 +37,15 @@ contents: - id: VehicleHoverbikeNF - id: VehicleKeyHoverbikeNF + +- type: entity + id: CrateFunHoverbikeNFPirate + parent: CrateLivestock + name: hoverbike crate + suffix: Pirate + description: Harder, better, faster, stronger? No, just faster, faster, faster. + components: + - type: StorageFill + contents: + - id: VehicleHoverbikePirate + - id: VehicleKeyHoverbikeNF diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Paper/misc.yml b/Resources/Prototypes/_NF/Catalog/Fills/Paper/misc.yml new file mode 100644 index 00000000000..5e272148571 --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/Fills/Paper/misc.yml @@ -0,0 +1,7 @@ +- type: entity + id: PaperWrittenPirateScribbles + suffix: pirate scribbles + parent: Paper + components: + - type: Paper + content: book-text-pirate-scribbles diff --git a/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml index 1f9e7ed8b6e..17445ac4d3e 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml @@ -44,6 +44,14 @@ containers: board: [ DoorElectronicsFrontierCommand ] +- type: entity + parent: [ AirlockEngineering, AirlockFrontierCommandLocked] + id: AirlockFrontierCommandEngineeringLocked + components: + - type: ContainerFill + containers: + board: [ DoorElectronicsFrontierCommand ] + - type: entity parent: HighSecDoor id: HighSecFrontierCommandLocked @@ -189,6 +197,22 @@ containers: board: [ DoorElectronicsFrontierCommand ] +- type: entity + parent: [ AirlockEngineeringGlass, AirlockFrontierCommandGlassLocked] + id: AirlockFrontierCommandEngineeringGlassLocked + components: + - type: ContainerFill + containers: + board: [ DoorElectronicsFrontierCommand ] + +- type: entity + parent: [ AirlockAtmosphericsGlass, AirlockFrontierCommandGlassLocked] + id: AirlockFrontierCommandAtmosphericsGlassLocked + components: + - type: ContainerFill + containers: + board: [ DoorElectronicsFrontierCommand ] + - type: entity parent: AirlockGlass id: AirlockMailCarrierGlassLocked diff --git a/Resources/Prototypes/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml b/Resources/Prototypes/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml index d7eb0d73c88..8320212f396 100644 --- a/Resources/Prototypes/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml +++ b/Resources/Prototypes/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml @@ -59,6 +59,18 @@ components: - type: BallisticAmmoProvider proto: CartridgeRifleIncendiary + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: base-8 + map: [ "enum.GunVisualLayers.Mag" ] + - type: MagazineVisuals + magState: base + steps: 9 + zeroVisible: false + - type: Appearance - type: entity id: SpeedLoaderRifleHeavyPractice