diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index e12b6e05e0a..9e28a5326e7 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -4129,3 +4129,17 @@ Entries: message: Blood cultists no longer use numerals instead of punctuation id: 4926 time: '2024-04-22T10:12:32.0000000+00:00' +- author: Kesiath + changes: + - type: Tweak + message: >- + Frontier Station's orbit around Frontier Prime has entered a dense + asteroid belt. + id: 4927 + time: '2024-04-22T22:37:20.0000000+00:00' +- author: erhardsteinhauer + changes: + - type: Tweak + message: SCAF suit is now void capable, can be researched and printed. + id: 4928 + time: '2024-04-22T22:53:40.0000000+00:00' diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 026c290822d..9790f55ef15 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -361,6 +361,7 @@ - ClothingOuterHardsuitRd # Frontier - ClothingOuterHardsuitLuxury # Frontier - ClothingOuterHardsuitMercenary # Frontier + - ClothingOuterHardsuitScaf # Frontier - ClothingOuterHardsuitPilot # Frontier - ClothingOuterHardsuitMaximPrototype # Frontier - ClothingHeadHelmetAncient # Frontier diff --git a/Resources/Prototypes/Parallaxes/frontier.yml b/Resources/Prototypes/Parallaxes/frontier.yml index e94c7b659ca..b5c153992db 100644 --- a/Resources/Prototypes/Parallaxes/frontier.yml +++ b/Resources/Prototypes/Parallaxes/frontier.yml @@ -3,34 +3,51 @@ layers: - texture: !type:ImageParallaxTextureSource - path: "/Textures/Parallaxes/FrontierParallaxBG.png" - slowness: 0.969046875 + path: "/Textures/Parallaxes/layer1.png" + slowness: 0.998046875 + scale: "1, 1" + - texture: + !type:ImageParallaxTextureSource + path: "/Textures/_NF/Parallaxes/FrontierParallaxBG.png" + slowness: 0.998046875 scale: "1, 1" + - texture: + !type:ImageParallaxTextureSource + path: "/Textures/_NF/Parallaxes/FrontierParallaxNeb.png" + slowness: 0.998046875 + scale: "1, 1" - texture: !type:GeneratedParallaxTextureSource id: "hq_wizard_stars" configPath: "/Prototypes/Parallaxes/parallax_config_stars.toml" - slowness: 0.961625 + slowness: 0.996625 - texture: !type:GeneratedParallaxTextureSource id: "hq_wizard_stars_dim" configPath: "/Prototypes/Parallaxes/parallax_config_stars_dim.toml" - slowness: 0.952375 - - texture: - !type:ImageParallaxTextureSource - path: "/Textures/Parallaxes/FrontierParallaxNeb.png" - slowness: 0.943046875 - scale: "1, 1" + slowness: 0.989375 - texture: !type:GeneratedParallaxTextureSource id: "hq_wizard_stars_faster" configPath: "/Prototypes/Parallaxes/parallax_config_stars-2.toml" - slowness: 0.934265625 + slowness: 0.987265625 - texture: !type:GeneratedParallaxTextureSource id: "hq_wizard_stars_dim_faster" configPath: "/Prototypes/Parallaxes/parallax_config_stars_dim-2.toml" - slowness: 0.920352 + slowness: 0.984352 + - texture: + !type:ImageParallaxTextureSource + path: "/Textures/_NF/Parallaxes/Asteroids.png" + slowness: 0.97 + scale: 1.5,1.5 + scrolling: "0.018, 0.01" + - texture: + !type:ImageParallaxTextureSource + path: "/Textures/_NF/Parallaxes/Asteroids.png" + slowness: 0.80 + scale: 0.95,0.95 + scrolling: "-0.0075, -0.009" layersLQ: - texture: !type:GeneratedParallaxTextureSource diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml index 6b597f864ea..b0ab3a29e5c 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml @@ -212,3 +212,30 @@ Slash: 0.9 Piercing: 0.9 Heat: 0.9 + +#SCAF Helmet +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ClothingHeadHelmetHardsuitScaf + name: scaf hardsuit helmet + description: A robust, strong helmet. On the inside smells of pent up anger. + noSpawn: true + components: + - type: BreathMask + - type: Sprite + sprite: _NF/Clothing/Head/Hardsuits/scaf.rsi + - type: Clothing + sprite: _NF/Clothing/Head/Hardsuits/scaf.rsi + - type: PressureProtection + highPressureMultiplier: 0.525 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.8 + - type: PointLight + radius: 7 + energy: 2 + #color: "#d6adff" diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml index 31606c29b4c..493d9ea90e5 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml @@ -296,3 +296,34 @@ - type: ClothingSpeedModifier walkModifier: 0.85 sprintModifier: 0.75 + +# SCAF hardsuit +- type: entity + parent: ClothingOuterHardsuitBase + id: ClothingOuterHardsuitScaf + name: scaf hardsuit + description: A green and brown combat hardsuit. Old yet sturdy nonetheless. + components: + - type: Sprite + sprite: _NF/Clothing/OuterClothing/Hardsuits/scaf.rsi + - type: Clothing + sprite: _NF/Clothing/OuterClothing/Hardsuits/scaf.rsi + - type: Armor # Kept original scaf stats + modifiers: + coefficients: + Blunt: 0.7 + Slash: 0.7 + Piercing: 0.4 + Heat: 0.9 + Caustic: 0.9 + - type: ExplosionResistance + damageCoefficient: 0.8 + - type: PressureProtection + highPressureMultiplier: 0.5 + lowPressureMultiplier: 1000 + - type: ClothingSpeedModifier + walkModifier: 0.9 + sprintModifier: 0.9 + - type: HeldSpeedModifier + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitScaf diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/eva.yml b/Resources/Prototypes/_NF/Recipes/Lathes/eva.yml index a4dbf0a927e..b723066b33e 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/eva.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/eva.yml @@ -311,6 +311,17 @@ Durathread: 2000 Gold: 2000 +- type: latheRecipe + id: ClothingOuterHardsuitScaf + result: ClothingOuterHardsuitScaf + category: EVASuits + completetime: 4 + materials: + Glass: 500 + Plasteel: 2000 + Durathread: 2000 + Gold: 2000 + - type: latheRecipe id: ClothingOuterHardsuitEngineeringWhite result: ClothingOuterHardsuitEngineeringWhite diff --git a/Resources/Prototypes/_NF/Research/arsenal.yml b/Resources/Prototypes/_NF/Research/arsenal.yml index ed84f674bdb..8bba5473372 100644 --- a/Resources/Prototypes/_NF/Research/arsenal.yml +++ b/Resources/Prototypes/_NF/Research/arsenal.yml @@ -31,5 +31,6 @@ - ClothingOuterHardsuitSecurity - ClothingOuterHardsuitWarden - ClothingOuterHardsuitBrigmedic + - ClothingOuterHardsuitScaf technologyPrerequisites: - HardsuitsArmored diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/scaf.rsi/icon-flash.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/scaf.rsi/icon-flash.png new file mode 100644 index 00000000000..21363b5e7d7 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/scaf.rsi/icon-flash.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/scaf.rsi/icon.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/scaf.rsi/icon.png new file mode 100644 index 00000000000..7a44f388c84 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/scaf.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/scaf.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Hardsuits/scaf.rsi/meta.json new file mode 100644 index 00000000000..aab2c8e78ef --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Head/Hardsuits/scaf.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/a75dee2e6d236612dbd403dd5f8687ca930c01f1 | erhardsteinhauer added variations with light sfx", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-flash" + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "off-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", + "directions": 4 + }, + { + "name": "off-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/scaf.rsi/off-equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/scaf.rsi/off-equipped-HELMET.png new file mode 100644 index 00000000000..ec1c408550d Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/scaf.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/scaf.rsi/off-inhand-left.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/scaf.rsi/off-inhand-left.png new file mode 100644 index 00000000000..4432f6604a1 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/scaf.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/scaf.rsi/off-inhand-right.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/scaf.rsi/off-inhand-right.png new file mode 100644 index 00000000000..c90ef794560 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/scaf.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/scaf.rsi/on-equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/scaf.rsi/on-equipped-HELMET.png new file mode 100644 index 00000000000..12ad803107b Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/scaf.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/scaf.rsi/on-inhand-left.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/scaf.rsi/on-inhand-left.png new file mode 100644 index 00000000000..fa630bbac5d Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/scaf.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/scaf.rsi/on-inhand-right.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/scaf.rsi/on-inhand-right.png new file mode 100644 index 00000000000..8fc1d825455 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/scaf.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/scaf.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/scaf.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..8a2023facfc Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/scaf.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/scaf.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/scaf.rsi/icon.png new file mode 100644 index 00000000000..59fa9150d74 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/scaf.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/scaf.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/scaf.rsi/inhand-left.png new file mode 100644 index 00000000000..ce718ad3009 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/scaf.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/scaf.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/scaf.rsi/inhand-right.png new file mode 100644 index 00000000000..6bfef738a45 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/scaf.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/scaf.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/scaf.rsi/meta.json new file mode 100644 index 00000000000..e50313ccc47 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/scaf.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7 | erhardsteinhauer added boots (exactly 4 pixels at the bottom in icon and equipped-OUTERCLOTHING, no overlap with original suit sprites)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Parallaxes/Asteroids.png b/Resources/Textures/_NF/Parallaxes/Asteroids.png new file mode 100644 index 00000000000..0e6c1ca2a9c Binary files /dev/null and b/Resources/Textures/_NF/Parallaxes/Asteroids.png differ diff --git a/Resources/Textures/Parallaxes/FrontierParallaxBG.png b/Resources/Textures/_NF/Parallaxes/FrontierParallaxBG.png similarity index 100% rename from Resources/Textures/Parallaxes/FrontierParallaxBG.png rename to Resources/Textures/_NF/Parallaxes/FrontierParallaxBG.png diff --git a/Resources/Textures/Parallaxes/FrontierParallaxNeb.png b/Resources/Textures/_NF/Parallaxes/FrontierParallaxNeb.png similarity index 100% rename from Resources/Textures/Parallaxes/FrontierParallaxNeb.png rename to Resources/Textures/_NF/Parallaxes/FrontierParallaxNeb.png