From 6e5a1d3226c3cc3330166cc0e045a7c8985668eb Mon Sep 17 00:00:00 2001 From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Date: Mon, 8 Apr 2024 23:23:48 +0300 Subject: [PATCH 01/13] Hostile Humanoid Mobs Tweaks (#1153) * tweaks * syndiCAT spawner, more tweaks to mobs, LPBravo changes * syndie mime with a chaisaw * everything is contraband, boosted mod resistances to laser based weapons * glued guns to gloves (visual) * syndicate chemwarrior, syndicate bio suit * new death acidifiers for syndicate agents * syndiemobs ammo replenishment rate tweaks * events tweaks * unremoveable syndie hardsuit for commander * crossbow visuals for cultists * filled meta files * more tweaks to syndie mobs * minor tweaks * more tweaks, commented mobs, some clean up * soap numbers * syndie mobs and loot big rework * syndie tweaks, bloodcult tweaks (ascended cultist amulet) * restored acidifier for syndie mobs * disabled climbing for mobs * syndie grenadier and chemwarrior variants, syndie bomb suit * Update throwable_weapons.yml Uncapital --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- .../mobchatter/mimehostilehumanoidmob.ftl | 20 + Resources/Maps/_NF/POI/lpbravo.yml | 1099 ++++++++++++----- .../Entities/Clothing/Belt/belts.yml | 2 + .../Entities/Clothing/Head/helmets.yml | 3 + .../Entities/Clothing/Head/hoods.yml | 1 + .../Entities/Clothing/OuterClothing/armor.yml | 3 + .../Entities/Clothing/OuterClothing/coats.yml | 2 + .../Clothing/OuterClothing/hardsuits.yml | 1 + .../Entities/Clothing/OuterClothing/misc.yml | 4 + .../Clothing/OuterClothing/wintercoats.yml | 3 + .../Entities/Clothing/Uniforms/jumpskirts.yml | 2 + .../Entities/Clothing/Uniforms/jumpsuits.yml | 5 + .../Clothing/Uniforms/ship_vs_ship.yml | 4 + .../Objects/Weapons/Guns/Basic/base_staff.yml | 1 + .../Objects/Weapons/Guns/Basic/base_wand.yml | 1 + .../Weapons/Guns/Projectiles/magic.yml | 77 -- .../Entities/Objects/Weapons/Melee/cult.yml | 3 + .../Procedural/salvage_factions.yml | 25 +- .../_NF/Body/Organs/synthetic_organs.yml | 56 + .../Prototypes/human_synthetic_organs.yml | 50 + .../Fills/Backpacks/duffelbag_npc_loot.yml | 613 +++++++++ .../Catalog/NPCsChatter/mimehumanoidmob.yml | 23 + .../_NF/Chemistry/metabolism_groups.yml | 3 + .../Clothing/Belt/crossbow_bolt_quiver.yml | 32 +- .../_NF/Entities/Clothing/Hands/gloves.yml | 116 ++ .../_NF/Entities/Clothing/Head/helmets.yml | 34 + .../_NF/Entities/Clothing/Head/hoods.yml | 27 + .../_NF/Entities/Clothing/Neck/misc.yml | 25 + .../Entities/Clothing/OuterClothing/armor.yml | 26 + .../Clothing/OuterClothing/hardsuits.yml | 28 +- .../Entities/Clothing/OuterClothing/suits.yml | 11 + .../Mobs/NPCs/base_humanoid_hostile.yml | 55 +- .../Entities/Mobs/NPCs/bloodcultistmob.yml | 56 +- .../_NF/Entities/Mobs/NPCs/syndicatemob.yml | 508 +++++++- .../Mobs/NPCs/wizardfederationmob.yml | 15 +- .../Specific/Wizard/conjured_items.yml | 33 +- .../Weapons/Ammunition/Projectiles/chem.yml | 130 ++ .../Guns/Projectiles/crossbow_bolts.yml | 9 +- .../Weapons/Guns/Projectiles/magic.yml | 73 ++ .../Objects/Weapons/Melee/wizard_staff.yml | 5 + ...able_weapons.yml => throwable_weapons.yml} | 30 +- .../_NF/Entities/Spawners/syndicatemobs.yml | 321 ++++- Resources/Prototypes/_NF/Events/events.yml | 8 +- .../_NF/Roles/Jobs/Hostile/blood_cultists.yml | 10 +- .../Jobs/Hostile/syndicate_naval_forces.yml | 508 +++++++- .../npc_ak.rsi/equipped-HAND.png | Bin 0 -> 8389 bytes .../npc_guns_visuals/npc_ak.rsi/icon.png | Bin 0 -> 485 bytes .../npc_guns_visuals/npc_ak.rsi/meta.json | 18 + .../npc_china_lake.rsi/equipped-HAND.png | Bin 0 -> 8284 bytes .../npc_china_lake.rsi/icon.png | Bin 0 -> 485 bytes .../npc_china_lake.rsi/meta.json | 18 + .../npc_crossbow.rsi/equipped-HAND.png | Bin 0 -> 8643 bytes .../npc_crossbow.rsi/icon.png | Bin 0 -> 485 bytes .../npc_crossbow.rsi/meta.json | 18 + .../npc_laser_pistol.rsi/equipped-HAND.png | Bin 0 -> 8172 bytes .../npc_laser_pistol.rsi/icon.png | Bin 0 -> 485 bytes .../npc_laser_pistol.rsi/meta.json | 18 + .../npc_pistol.rsi/equipped-HAND.png | Bin 0 -> 6818 bytes .../npc_guns_visuals/npc_pistol.rsi/icon.png | Bin 0 -> 485 bytes .../npc_guns_visuals/npc_pistol.rsi/meta.json | 18 + .../npc_python.rsi/equipped-HAND.png | Bin 0 -> 7280 bytes .../npc_guns_visuals/npc_python.rsi/icon.png | Bin 0 -> 485 bytes .../npc_guns_visuals/npc_python.rsi/meta.json | 18 + .../npc_shotgun.rsi/equipped-HAND.png | Bin 0 -> 9375 bytes .../npc_guns_visuals/npc_shotgun.rsi/icon.png | Bin 0 -> 485 bytes .../npc_shotgun.rsi/meta.json | 18 + .../npc_smg.rsi/equipped-HAND.png | Bin 0 -> 7532 bytes .../npc_guns_visuals/npc_smg.rsi/icon.png | Bin 0 -> 485 bytes .../npc_guns_visuals/npc_smg.rsi/meta.json | 18 + .../npc_spray_nozzle.rsi/equipped-HAND.png | Bin 0 -> 7959 bytes .../npc_spray_nozzle.rsi/icon.png | Bin 0 -> 485 bytes .../npc_spray_nozzle.rsi/meta.json | 18 + .../equipped-HELMET.png | Bin 0 -> 1120 bytes .../Helmets/syndicate_bombsuit.rsi/icon.png | Bin 0 -> 842 bytes .../syndicate_bombsuit.rsi/inhand-left.png | Bin 0 -> 1005 bytes .../syndicate_bombsuit.rsi/inhand-right.png | Bin 0 -> 1000 bytes .../Helmets/syndicate_bombsuit.rsi/meta.json | 26 + .../Bio/syndicate.rsi/equipped-HELMET.png | Bin 0 -> 1195 bytes .../Head/Hoods/Bio/syndicate.rsi/icon.png | Bin 0 -> 819 bytes .../Hoods/Bio/syndicate.rsi/inhand-left.png | Bin 0 -> 925 bytes .../Hoods/Bio/syndicate.rsi/inhand-right.png | Bin 0 -> 940 bytes .../Head/Hoods/Bio/syndicate.rsi/meta.json | 26 + .../equipped-NECK.png | Bin 0 -> 5931 bytes .../Misc/ascended_cultist_amulet.rsi/icon.png | Bin 0 -> 1049 bytes .../inhand-left.png | Bin 0 -> 6055 bytes .../inhand-right.png | Bin 0 -> 6182 bytes .../ascended_cultist_amulet.rsi/meta.json | 26 + .../syndicate.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 2499 bytes .../OuterClothing/Bio/syndicate.rsi/icon.png | Bin 0 -> 1227 bytes .../Bio/syndicate.rsi/inhand-left.png | Bin 0 -> 1061 bytes .../Bio/syndicate.rsi/inhand-right.png | Bin 0 -> 1049 bytes .../OuterClothing/Bio/syndicate.rsi/meta.json | 26 + .../equipped-OUTERCLOTHING.png | Bin 0 -> 2018 bytes .../Suits/syndicate_bombsuit.rsi/icon.png | Bin 0 -> 1177 bytes .../syndicate_bombsuit.rsi/inhand-left.png | Bin 0 -> 1087 bytes .../syndicate_bombsuit.rsi/inhand-right.png | Bin 0 -> 1114 bytes .../Suits/syndicate_bombsuit.rsi/meta.json | 26 + 97 files changed, 3835 insertions(+), 518 deletions(-) create mode 100644 Resources/Locale/en-US/_NF/advertisements/mobchatter/mimehostilehumanoidmob.ftl create mode 100644 Resources/Prototypes/_NF/Body/Organs/synthetic_organs.yml create mode 100644 Resources/Prototypes/_NF/Body/Prototypes/human_synthetic_organs.yml create mode 100644 Resources/Prototypes/_NF/Catalog/Fills/Backpacks/duffelbag_npc_loot.yml create mode 100644 Resources/Prototypes/_NF/Catalog/NPCsChatter/mimehumanoidmob.yml create mode 100644 Resources/Prototypes/_NF/Chemistry/metabolism_groups.yml create mode 100644 Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/suits.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Projectiles/chem.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Projectiles/magic.yml rename Resources/Prototypes/_NF/Entities/Objects/Weapons/Throwable/{trowable_weapons.yml => throwable_weapons.yml} (55%) create mode 100644 Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_ak.rsi/equipped-HAND.png create mode 100644 Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_ak.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_ak.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_china_lake.rsi/equipped-HAND.png create mode 100644 Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_china_lake.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_china_lake.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_crossbow.rsi/equipped-HAND.png create mode 100644 Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_crossbow.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_crossbow.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_laser_pistol.rsi/equipped-HAND.png create mode 100644 Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_laser_pistol.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_laser_pistol.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_pistol.rsi/equipped-HAND.png create mode 100644 Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_pistol.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_pistol.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_python.rsi/equipped-HAND.png create mode 100644 Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_python.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_python.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_shotgun.rsi/equipped-HAND.png create mode 100644 Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_shotgun.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_shotgun.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_smg.rsi/equipped-HAND.png create mode 100644 Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_smg.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_smg.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_spray_nozzle.rsi/equipped-HAND.png create mode 100644 Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_spray_nozzle.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_spray_nozzle.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Head/Helmets/syndicate_bombsuit.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Helmets/syndicate_bombsuit.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Helmets/syndicate_bombsuit.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Helmets/syndicate_bombsuit.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Helmets/syndicate_bombsuit.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Head/Hoods/Bio/syndicate.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hoods/Bio/syndicate.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hoods/Bio/syndicate.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hoods/Bio/syndicate.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hoods/Bio/syndicate.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Neck/Misc/ascended_cultist_amulet.rsi/equipped-NECK.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Misc/ascended_cultist_amulet.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Misc/ascended_cultist_amulet.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Misc/ascended_cultist_amulet.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Misc/ascended_cultist_amulet.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Bio/syndicate.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Bio/syndicate.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Bio/syndicate.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Bio/syndicate.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Bio/syndicate.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Suits/syndicate_bombsuit.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Suits/syndicate_bombsuit.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Suits/syndicate_bombsuit.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Suits/syndicate_bombsuit.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Suits/syndicate_bombsuit.rsi/meta.json diff --git a/Resources/Locale/en-US/_NF/advertisements/mobchatter/mimehostilehumanoidmob.ftl b/Resources/Locale/en-US/_NF/advertisements/mobchatter/mimehostilehumanoidmob.ftl new file mode 100644 index 00000000000..d15559c9a0f --- /dev/null +++ b/Resources/Locale/en-US/_NF/advertisements/mobchatter/mimehostilehumanoidmob.ftl @@ -0,0 +1,20 @@ +advertisement-mimehumanoid-1 = *pretends to whistle* +advertisement-mimehumanoid-2 = *points at you and drags finger across neck* +advertisement-mimehumanoid-3 = *performs a sensual jigga of manslaughter* +advertisement-mimehumanoid-4 = *slowly shifts from heel to toe* +advertisement-mimehumanoid-5 = *pretends to be trapped by invisible walls* +advertisement-mimehumanoid-6 = *stands completely still* +advertisement-mimehumanoid-7 = *moves around in uneven jerking fashion* +advertisement-mimehumanoid-8 = *sneezes multiple times without sound* +advertisement-mimehumanoid-9 = *pretends to draw with pencil on canvas fixed to an easel* +advertisement-mimehumanoid-10 = *imitates waiter serving table for two with wine* +advertisement-mimehumanoid-11 = *performs a cartwheel and ends the motion in a handstand* +advertisement-mimehumanoid-12 = *imitates playing on violin, you recognise the melody as "The Day Clowns Heads Rolled"* +advertisement-mimehumanoid-13 = *pretends to have a dinner with family they never had* +advertisement-mimehumanoid-14 = *imitates intense phone negotiations, appears to be on the losing side* +advertisement-mimehumanoid-15 = *pretends to slip but instead of fallingб smoothly transitions to performing tap dance* +advertisement-mimehumanoid-16 = *pretends to be a jazz musitian* +advertisement-mimehumanoid-17 = *flips imaginary coin, doesn't seem happy with the result* +advertisement-mimehumanoid-18 = *cries and wails without sound* +advertisement-mimehumanoid-19 = *counts something on their fingers* +advertisement-mimehumanoid-20 = *dances to the tune only they can hear* diff --git a/Resources/Maps/_NF/POI/lpbravo.yml b/Resources/Maps/_NF/POI/lpbravo.yml index 8905d9b5f6f..bc01b72a0b0 100644 --- a/Resources/Maps/_NF/POI/lpbravo.yml +++ b/Resources/Maps/_NF/POI/lpbravo.yml @@ -6,9 +6,9 @@ tilemap: 30: FloorDark 34: FloorDarkMini 35: FloorDarkMono - 119: FloorWood - 121: Lattice - 122: Plating + 121: FloorWood + 124: Lattice + 125: Plating entities: - proto: "" entities: @@ -22,27 +22,27 @@ entities: chunks: 0,0: ind: 0,0 - tiles: HgAAAAAAHgAAAAACHgAAAAAAHgAAAAADHgAAAAADIwAAAAACIwAAAAABegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAHgAAAAADHgAAAAABHgAAAAADegAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAABIgAAAAAAIgAAAAADHgAAAAABHgAAAAADegAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAADHgAAAAABHgAAAAACegAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: HgAAAAAAHgAAAAACHgAAAAAAHgAAAAADHgAAAAADIwAAAAACIwAAAAABfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAHgAAAAADHgAAAAABHgAAAAADfQAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAABIgAAAAAAIgAAAAADHgAAAAABHgAAAAADfQAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAADHgAAAAABHgAAAAACfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 0,-1: ind: 0,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAdwAAAAAAdwAAAAABdwAAAAABegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAIgAAAAACIgAAAAAAegAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAIgAAAAADIgAAAAADegAAAAAAdwAAAAAAdwAAAAADdwAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAIgAAAAABIgAAAAABegAAAAAAdwAAAAABdwAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAACHgAAAAABHgAAAAACHgAAAAABegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAACHgAAAAACHgAAAAACHgAAAAADIwAAAAADIwAAAAADegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAACHgAAAAADHgAAAAACHgAAAAADIwAAAAABIwAAAAACegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAeQAAAAAAeQAAAAABeQAAAAABfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIgAAAAACIgAAAAAAfQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIgAAAAADIgAAAAADfQAAAAAAeQAAAAAAeQAAAAADeQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIgAAAAABIgAAAAABfQAAAAAAeQAAAAABeQAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAACHgAAAAABHgAAAAACHgAAAAABfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAACHgAAAAACHgAAAAACHgAAAAADIwAAAAADIwAAAAADfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAACHgAAAAADHgAAAAACHgAAAAADIwAAAAABIwAAAAACfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,0: ind: -1,0 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAIwAAAAABIwAAAAADHgAAAAAAHgAAAAABHgAAAAABHgAAAAAAHgAAAAABHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAegAAAAAAHgAAAAAAHgAAAAAAHgAAAAACHgAAAAADHgAAAAABHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAegAAAAAAHgAAAAACHgAAAAACIgAAAAAAIgAAAAABIgAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAegAAAAAAHgAAAAAAHgAAAAACHgAAAAABHgAAAAADHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIwAAAAABIwAAAAADHgAAAAAAHgAAAAABHgAAAAABHgAAAAAAHgAAAAABHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAACHgAAAAADHgAAAAABHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAHgAAAAACHgAAAAACIgAAAAAAIgAAAAABIgAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAHgAAAAAAHgAAAAACHgAAAAABHgAAAAADHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAA version: 6 -1,-1: ind: -1,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAABHgAAAAABHgAAAAABegAAAAAAegAAAAAAegAAAAAAegAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAAAHgAAAAACHgAAAAACHgAAAAAAHgAAAAADHgAAAAABegAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAADHgAAAAADHgAAAAADHgAAAAABHgAAAAADHgAAAAADHgAAAAACHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAHgAAAAADHgAAAAACHgAAAAACHgAAAAAAHgAAAAACHgAAAAACHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAAHgAAAAAAHgAAAAAAHgAAAAADHgAAAAABHgAAAAAAHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAAAHgAAAAAAHgAAAAABHgAAAAACHgAAAAACHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAIwAAAAADIwAAAAABHgAAAAAAHgAAAAABHgAAAAABHgAAAAAAHgAAAAADHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAIwAAAAABIwAAAAACHgAAAAAAHgAAAAAAHgAAAAADHgAAAAADHgAAAAABHgAAAAAD + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAABHgAAAAABHgAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAAAHgAAAAACHgAAAAACHgAAAAAAHgAAAAADHgAAAAABfQAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAADHgAAAAADHgAAAAADHgAAAAABHgAAAAADHgAAAAADHgAAAAACHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAADHgAAAAACHgAAAAACHgAAAAAAHgAAAAACHgAAAAACHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAADHgAAAAABHgAAAAAAHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAABHgAAAAACHgAAAAACHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIwAAAAADIwAAAAABHgAAAAAAHgAAAAABHgAAAAABHgAAAAAAHgAAAAADHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIwAAAAABIwAAAAACHgAAAAAAHgAAAAAAHgAAAAADHgAAAAADHgAAAAABHgAAAAAD version: 6 -1,1: ind: -1,1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 0,1: ind: 0,1 - tiles: eQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: fAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 - type: Broadphase - type: Physics @@ -238,63 +238,79 @@ entities: -1,0: 0: 65535 -1,1: - 0: 65535 + 0: 52479 + 1: 13056 -1,-1: 0: 65535 0,1: - 0: 65535 + 0: 4607 + 1: 60928 0,2: - 0: 4371 + 1: 4371 0,3: - 0: 4369 + 1: 4369 1,0: - 0: 65535 + 0: 13311 + 1: 52224 1,1: - 0: 319 + 0: 1 + 1: 318 0,-3: - 0: 65535 + 1: 61439 + 0: 4096 0,-2: 0: 65535 1,-3: - 0: 65520 + 1: 4080 + 0: 61440 1,-2: - 0: 65535 + 0: 32767 + 1: 32768 1,-1: - 0: 65535 + 0: 65527 + 1: 8 -3,0: - 0: 34952 + 0: 136 + 1: 34816 -3,1: - 0: 8 + 1: 8 -2,0: - 0: 65535 + 0: 61183 + 1: 4352 -2,1: - 0: 36079 + 1: 35939 + 0: 140 -1,2: - 0: 52430 + 1: 52430 -1,3: - 0: 52428 + 1: 52428 -3,-3: - 0: 34944 + 1: 2176 + 0: 32768 -3,-2: - 0: 34952 + 0: 2184 + 1: 32768 -3,-1: - 0: 34952 + 1: 8 + 0: 34944 -2,-3: - 0: 65528 + 1: 36856 + 0: 28672 -2,-2: 0: 65535 -2,-1: 0: 65535 -1,-3: - 0: 65535 + 1: 16383 + 0: 49152 -1,-2: 0: 65535 -1,4: - 0: 52428 + 1: 52428 -1,5: - 0: 8 + 1: 8 0,4: - 0: 4369 + 1: 4369 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -311,202 +327,821 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.15 + moles: + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance -- proto: Airlock +- proto: AirlockEngineering + entities: + - uid: 147 + components: + - type: Transform + pos: -3.5,1.5 + parent: 1 + - uid: 148 + components: + - type: Transform + pos: 2.5,1.5 + parent: 1 +- proto: AirlockExternal entities: + - uid: 95 + components: + - type: Transform + pos: 5.5,-0.5 + parent: 1 + - uid: 96 + components: + - type: Transform + pos: 5.5,-1.5 + parent: 1 + - uid: 97 + components: + - type: Transform + pos: -0.5,-8.5 + parent: 1 + - uid: 98 + components: + - type: Transform + pos: -0.5,7.5 + parent: 1 + - uid: 99 + components: + - type: Transform + pos: -0.5,5.5 + parent: 1 + - uid: 100 + components: + - type: Transform + pos: -0.5,-6.5 + parent: 1 + - uid: 101 + components: + - type: Transform + pos: -6.5,-1.5 + parent: 1 + - uid: 102 + components: + - type: Transform + pos: 5.5,0.5 + parent: 1 - uid: 145 components: - - type: MetaData - flags: PvsPriority - type: Transform - pos: 2.5,-3.5 + pos: -6.5,-0.5 + parent: 1 + - uid: 146 + components: + - type: Transform + pos: -6.5,0.5 + parent: 1 +- proto: AirlockGlassShuttleSyndicate + entities: + - uid: 15 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,0.5 + parent: 1 + - uid: 16 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,-0.5 + parent: 1 + - uid: 17 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,-1.5 + parent: 1 + - uid: 18 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 7.5,0.5 + parent: 1 + - uid: 19 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 7.5,-0.5 + parent: 1 + - uid: 20 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 7.5,-1.5 + parent: 1 +- proto: AirlockSyndicate + entities: + - uid: 93 + components: + - type: Transform + pos: 4.5,-3.5 + parent: 1 + - uid: 94 + components: + - type: Transform + pos: 2.5,-3.5 + parent: 1 +- proto: APCBasic + entities: + - uid: 283 + components: + - type: Transform + pos: 0.5,5.5 + parent: 1 + - uid: 284 + components: + - type: Transform + pos: 3.5,1.5 + parent: 1 +- proto: AtmosDeviceFanTiny + entities: + - uid: 21 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 7.5,0.5 + parent: 1 + - uid: 22 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 7.5,-0.5 + parent: 1 + - uid: 23 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 7.5,-1.5 + parent: 1 + - uid: 24 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,0.5 + parent: 1 + - uid: 25 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,-0.5 + parent: 1 + - uid: 26 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,-1.5 + parent: 1 + - uid: 103 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,7.5 + parent: 1 + - uid: 104 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-8.5 + parent: 1 +- proto: AtmosFixBlockerMarker + entities: + - uid: 527 + components: + - type: Transform + pos: -8.5,-3.5 + parent: 1 + - uid: 528 + components: + - type: Transform + pos: -8.5,-4.5 + parent: 1 + - uid: 529 + components: + - type: Transform + pos: -8.5,-9.5 + parent: 1 + - uid: 530 + components: + - type: Transform + pos: -8.5,-10.5 + parent: 1 + - uid: 531 + components: + - type: Transform + pos: -7.5,-9.5 + parent: 1 + - uid: 532 + components: + - type: Transform + pos: -7.5,-10.5 + parent: 1 + - uid: 533 + components: + - type: Transform + pos: -6.5,-9.5 + parent: 1 + - uid: 534 + components: + - type: Transform + pos: -6.5,-10.5 + parent: 1 + - uid: 535 + components: + - type: Transform + pos: -5.5,-9.5 + parent: 1 + - uid: 536 + components: + - type: Transform + pos: -5.5,-10.5 + parent: 1 + - uid: 537 + components: + - type: Transform + pos: -4.5,-8.5 + parent: 1 + - uid: 538 + components: + - type: Transform + pos: -3.5,-8.5 + parent: 1 + - uid: 539 + components: + - type: Transform + pos: -2.5,-8.5 + parent: 1 + - uid: 540 + components: + - type: Transform + pos: -4.5,-9.5 + parent: 1 + - uid: 541 + components: + - type: Transform + pos: -4.5,-10.5 + parent: 1 + - uid: 542 + components: + - type: Transform + pos: -4.5,-11.5 + parent: 1 + - uid: 543 + components: + - type: Transform + pos: -3.5,-9.5 + parent: 1 + - uid: 544 + components: + - type: Transform + pos: -3.5,-10.5 + parent: 1 + - uid: 545 + components: + - type: Transform + pos: -3.5,-11.5 + parent: 1 + - uid: 546 + components: + - type: Transform + pos: -2.5,-9.5 + parent: 1 + - uid: 547 + components: + - type: Transform + pos: -2.5,-10.5 + parent: 1 + - uid: 548 + components: + - type: Transform + pos: -2.5,-11.5 + parent: 1 + - uid: 549 + components: + - type: Transform + pos: -1.5,-9.5 + parent: 1 + - uid: 550 + components: + - type: Transform + pos: -1.5,-10.5 + parent: 1 + - uid: 551 + components: + - type: Transform + pos: -1.5,-11.5 + parent: 1 + - uid: 552 + components: + - type: Transform + pos: -0.5,-9.5 + parent: 1 + - uid: 553 + components: + - type: Transform + pos: -0.5,-10.5 + parent: 1 + - uid: 554 + components: + - type: Transform + pos: -0.5,-11.5 + parent: 1 + - uid: 555 + components: + - type: Transform + pos: 0.5,-9.5 + parent: 1 + - uid: 556 + components: + - type: Transform + pos: 0.5,-10.5 + parent: 1 + - uid: 557 + components: + - type: Transform + pos: 0.5,-11.5 + parent: 1 + - uid: 558 + components: + - type: Transform + pos: 1.5,-9.5 + parent: 1 + - uid: 559 + components: + - type: Transform + pos: 1.5,-10.5 + parent: 1 + - uid: 560 + components: + - type: Transform + pos: 1.5,-11.5 + parent: 1 + - uid: 561 + components: + - type: Transform + pos: 2.5,-9.5 + parent: 1 + - uid: 562 + components: + - type: Transform + pos: 2.5,-10.5 + parent: 1 + - uid: 563 + components: + - type: Transform + pos: 2.5,-11.5 + parent: 1 + - uid: 564 + components: + - type: Transform + pos: 3.5,-9.5 + parent: 1 + - uid: 565 + components: + - type: Transform + pos: 3.5,-10.5 + parent: 1 + - uid: 566 + components: + - type: Transform + pos: 3.5,-11.5 + parent: 1 + - uid: 567 + components: + - type: Transform + pos: 1.5,-8.5 + parent: 1 + - uid: 568 + components: + - type: Transform + pos: 2.5,-8.5 + parent: 1 + - uid: 569 + components: + - type: Transform + pos: 3.5,-8.5 + parent: 1 + - uid: 570 + components: + - type: Transform + pos: 4.5,-10.5 + parent: 1 + - uid: 571 + components: + - type: Transform + pos: 4.5,-9.5 + parent: 1 + - uid: 572 + components: + - type: Transform + pos: 5.5,-10.5 + parent: 1 + - uid: 573 + components: + - type: Transform + pos: 5.5,-9.5 + parent: 1 + - uid: 574 + components: + - type: Transform + pos: 6.5,-10.5 + parent: 1 + - uid: 575 + components: + - type: Transform + pos: 6.5,-9.5 + parent: 1 + - uid: 576 + components: + - type: Transform + pos: 7.5,-10.5 + parent: 1 + - uid: 577 + components: + - type: Transform + pos: 7.5,-9.5 + parent: 1 + - uid: 578 + components: + - type: Transform + pos: 7.5,-4.5 + parent: 1 + - uid: 579 + components: + - type: Transform + pos: 7.5,-3.5 + parent: 1 + - uid: 580 + components: + - type: Transform + pos: 7.5,2.5 + parent: 1 + - uid: 581 + components: + - type: Transform + pos: 7.5,3.5 + parent: 1 + - uid: 582 + components: + - type: Transform + pos: 7.5,4.5 + parent: 1 + - uid: 583 + components: + - type: Transform + pos: 6.5,2.5 + parent: 1 + - uid: 584 + components: + - type: Transform + pos: 6.5,3.5 + parent: 1 + - uid: 585 + components: + - type: Transform + pos: 6.5,4.5 + parent: 1 + - uid: 586 + components: + - type: Transform + pos: 5.5,4.5 + parent: 1 + - uid: 587 + components: + - type: Transform + pos: 5.5,5.5 + parent: 1 + - uid: 588 + components: + - type: Transform + pos: 4.5,5.5 + parent: 1 + - uid: 589 + components: + - type: Transform + pos: 4.5,6.5 + parent: 1 + - uid: 590 + components: + - type: Transform + pos: 3.5,6.5 + parent: 1 + - uid: 591 + components: + - type: Transform + pos: 3.5,7.5 + parent: 1 + - uid: 592 + components: + - type: Transform + pos: 2.5,6.5 + parent: 1 + - uid: 593 + components: + - type: Transform + pos: 2.5,7.5 + parent: 1 + - uid: 594 + components: + - type: Transform + pos: 1.5,6.5 + parent: 1 + - uid: 595 + components: + - type: Transform + pos: 1.5,7.5 + parent: 1 + - uid: 596 + components: + - type: Transform + pos: -2.5,6.5 + parent: 1 + - uid: 597 + components: + - type: Transform + pos: -2.5,7.5 + parent: 1 + - uid: 598 + components: + - type: Transform + pos: -3.5,6.5 + parent: 1 + - uid: 599 + components: + - type: Transform + pos: -3.5,7.5 + parent: 1 + - uid: 600 + components: + - type: Transform + pos: -4.5,6.5 + parent: 1 + - uid: 601 + components: + - type: Transform + pos: -4.5,7.5 + parent: 1 + - uid: 602 + components: + - type: Transform + pos: -5.5,6.5 + parent: 1 + - uid: 603 + components: + - type: Transform + pos: -5.5,5.5 + parent: 1 + - uid: 604 + components: + - type: Transform + pos: -6.5,5.5 + parent: 1 + - uid: 605 + components: + - type: Transform + pos: -6.5,4.5 + parent: 1 + - uid: 606 + components: + - type: Transform + pos: -8.5,4.5 + parent: 1 + - uid: 607 + components: + - type: Transform + pos: -8.5,3.5 + parent: 1 + - uid: 608 + components: + - type: Transform + pos: -8.5,2.5 + parent: 1 + - uid: 609 + components: + - type: Transform + pos: -7.5,4.5 + parent: 1 + - uid: 610 + components: + - type: Transform + pos: -7.5,3.5 + parent: 1 + - uid: 611 + components: + - type: Transform + pos: -7.5,2.5 + parent: 1 + - uid: 612 + components: + - type: Transform + pos: -2.5,8.5 + parent: 1 + - uid: 613 + components: + - type: Transform + pos: -1.5,8.5 + parent: 1 + - uid: 614 + components: + - type: Transform + pos: -0.5,8.5 parent: 1 - - uid: 146 + - uid: 615 components: - - type: MetaData - flags: PvsPriority - type: Transform - pos: 4.5,-3.5 + pos: 0.5,8.5 parent: 1 -- proto: AirlockEngineering - entities: - - uid: 147 + - uid: 616 components: - - type: MetaData - flags: PvsPriority - type: Transform - pos: -3.5,1.5 + pos: 1.5,8.5 parent: 1 - - uid: 148 + - uid: 617 components: - - type: MetaData - flags: PvsPriority - type: Transform - pos: 2.5,1.5 + pos: 0.5,9.5 parent: 1 -- proto: AirlockExternalGlass - entities: - - uid: 93 + - uid: 618 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 5.5,-1.5 + pos: 0.5,10.5 parent: 1 - - uid: 94 + - uid: 619 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 5.5,-0.5 + pos: 0.5,11.5 parent: 1 - - uid: 95 + - uid: 620 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 5.5,0.5 + pos: 0.5,12.5 parent: 1 - - uid: 96 + - uid: 621 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -6.5,-1.5 + pos: 0.5,13.5 parent: 1 - - uid: 97 + - uid: 622 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -6.5,-0.5 + pos: 0.5,14.5 parent: 1 - - uid: 98 + - uid: 623 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -6.5,0.5 + pos: 0.5,15.5 parent: 1 - - uid: 99 + - uid: 624 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,-8.5 + pos: 0.5,16.5 parent: 1 - - uid: 100 + - uid: 625 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,-6.5 + pos: 0.5,17.5 parent: 1 - - uid: 101 + - uid: 626 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,5.5 + pos: 0.5,18.5 parent: 1 - - uid: 102 + - uid: 627 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,7.5 + pos: 0.5,19.5 parent: 1 -- proto: AirlockGlassShuttle - entities: - - uid: 15 + - uid: 628 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -8.5,-1.5 + pos: -0.5,9.5 parent: 1 - - uid: 16 + - uid: 629 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -8.5,-0.5 + pos: -0.5,10.5 parent: 1 - - uid: 17 + - uid: 630 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -8.5,0.5 + pos: -0.5,11.5 parent: 1 - - uid: 18 + - uid: 631 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 7.5,-1.5 + pos: -0.5,12.5 parent: 1 - - uid: 19 + - uid: 632 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 7.5,-0.5 + pos: -0.5,13.5 parent: 1 - - uid: 20 + - uid: 633 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 7.5,0.5 + pos: -0.5,14.5 parent: 1 -- proto: APCBasic - entities: - - uid: 283 + - uid: 634 components: - type: Transform - pos: 0.5,5.5 + pos: -0.5,15.5 parent: 1 - - uid: 284 + - uid: 635 components: - type: Transform - pos: 3.5,1.5 + pos: -0.5,16.5 parent: 1 -- proto: AtmosDeviceFanTiny - entities: - - uid: 21 + - uid: 636 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 7.5,0.5 + pos: -0.5,17.5 parent: 1 - - uid: 22 + - uid: 637 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 7.5,-0.5 + pos: -0.5,18.5 parent: 1 - - uid: 23 + - uid: 638 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 7.5,-1.5 + pos: -0.5,19.5 parent: 1 - - uid: 24 + - uid: 639 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -8.5,0.5 + pos: -1.5,9.5 parent: 1 - - uid: 25 + - uid: 640 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -8.5,-0.5 + pos: -1.5,10.5 parent: 1 - - uid: 26 + - uid: 641 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -8.5,-1.5 + pos: -1.5,11.5 parent: 1 - - uid: 103 + - uid: 642 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,7.5 + pos: -1.5,12.5 parent: 1 - - uid: 104 + - uid: 643 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,-8.5 + pos: -1.5,13.5 + parent: 1 + - uid: 644 + components: + - type: Transform + pos: -1.5,14.5 + parent: 1 + - uid: 645 + components: + - type: Transform + pos: -1.5,15.5 + parent: 1 + - uid: 646 + components: + - type: Transform + pos: -1.5,16.5 + parent: 1 + - uid: 647 + components: + - type: Transform + pos: -1.5,17.5 + parent: 1 + - uid: 648 + components: + - type: Transform + pos: -1.5,18.5 + parent: 1 + - uid: 649 + components: + - type: Transform + pos: -1.5,19.5 + parent: 1 + - uid: 650 + components: + - type: Transform + pos: -0.5,20.5 parent: 1 - proto: BalloonSyn entities: @@ -2294,69 +2929,51 @@ entities: entities: - uid: 436 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -4.5,-6.5 parent: 1 - uid: 437 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: -5.5,-3.5 parent: 1 - uid: 438 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -0.5,-3.5 parent: 1 - uid: 439 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -0.5,0.5 parent: 1 - uid: 440 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -0.5,2.5 parent: 1 - uid: 490 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -5.5,0.5 parent: 1 - uid: 491 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 4.5,0.5 parent: 1 - uid: 492 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -4.5,2.5 parent: 1 - uid: 493 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 3.5,2.5 @@ -2365,48 +2982,36 @@ entities: entities: - uid: 434 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -7.5,3.5 parent: 1 - uid: 435 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 6.5,3.5 parent: 1 - uid: 441 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -2.5,7.5 parent: 1 - uid: 442 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 1.5,7.5 parent: 1 - uid: 443 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -8.5,-3.5 parent: 1 - uid: 444 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 7.5,-3.5 @@ -2886,6 +3491,32 @@ entities: rot: 1.5707963267948966 rad pos: -3.5,-5.5 parent: 1 +- proto: SpawnMobCatSyndy + entities: + - uid: 652 + components: + - type: Transform + pos: -1.5,3.5 + parent: 1 +- proto: SpawnMobSyndicateNavalDeckhand + entities: + - uid: 525 + components: + - type: Transform + pos: -4.5,-3.5 + parent: 1 + - uid: 526 + components: + - type: Transform + pos: -1.5,-2.5 + parent: 1 +- proto: SpawnMobSyndicateNavalEngineer + entities: + - uid: 450 + components: + - type: Transform + pos: -0.5,3.5 + parent: 1 - proto: SpawnVehicleAntagVehicle entities: - uid: 169 @@ -2921,6 +3552,14 @@ entities: - type: Transform pos: -2.5,4.5 parent: 1 +- proto: SyndieFlag + entities: + - uid: 651 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,1.5 + parent: 1 - proto: SyndiPDA entities: - uid: 171 @@ -3009,8 +3648,6 @@ entities: entities: - uid: 447 components: - - type: MetaData - flags: SessionSpecific - type: Transform pos: 1.5,-2.5 parent: 1 @@ -3018,8 +3655,6 @@ entities: entities: - uid: 446 components: - - type: MetaData - flags: SessionSpecific - type: Transform pos: 0.5,-2.5 parent: 1 @@ -3027,8 +3662,6 @@ entities: entities: - uid: 516 components: - - type: MetaData - flags: SessionSpecific - type: Transform pos: 0.5,0.5 parent: 1 @@ -3036,8 +3669,6 @@ entities: entities: - uid: 187 components: - - type: MetaData - flags: SessionSpecific - type: Transform pos: -1.5,0.5 parent: 1 @@ -3045,476 +3676,354 @@ entities: entities: - uid: 3 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -8.5,1.5 parent: 1 - uid: 4 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -7.5,1.5 parent: 1 - uid: 5 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -6.5,1.5 parent: 1 - uid: 6 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 5.5,1.5 parent: 1 - uid: 7 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 6.5,1.5 parent: 1 - uid: 8 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 7.5,1.5 parent: 1 - uid: 9 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 5.5,-2.5 parent: 1 - uid: 10 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 6.5,-2.5 parent: 1 - uid: 11 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 7.5,-2.5 parent: 1 - uid: 12 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -6.5,-2.5 parent: 1 - uid: 13 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -7.5,-2.5 parent: 1 - uid: 14 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -8.5,-2.5 parent: 1 - uid: 27 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 0.5,7.5 parent: 1 - uid: 28 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 0.5,6.5 parent: 1 - uid: 29 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: -1.5,7.5 parent: 1 - uid: 30 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: -1.5,6.5 parent: 1 - uid: 31 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 0.5,5.5 parent: 1 - uid: 32 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: -1.5,5.5 parent: 1 - uid: 34 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 5.5,3.5 parent: 1 - uid: 35 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 4.5,4.5 parent: 1 - uid: 36 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 3.5,5.5 parent: 1 - uid: 37 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: -4.5,5.5 parent: 1 - uid: 38 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: -5.5,4.5 parent: 1 - uid: 39 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: -6.5,3.5 parent: 1 - uid: 45 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 5.5,-3.5 parent: 1 - uid: 46 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 6.5,-4.5 parent: 1 - uid: 47 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 7.5,-5.5 parent: 1 - uid: 48 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: -6.5,-3.5 parent: 1 - uid: 49 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: -7.5,-4.5 parent: 1 - uid: 50 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: -8.5,-5.5 parent: 1 - uid: 51 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: -5.5,-8.5 parent: 1 - uid: 52 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: -4.5,-7.5 parent: 1 - uid: 53 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 4.5,-8.5 parent: 1 - uid: 54 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 3.5,-7.5 parent: 1 - uid: 55 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 7.5,-8.5 parent: 1 - uid: 56 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: -8.5,-8.5 parent: 1 - uid: 57 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: -1.5,-7.5 parent: 1 - uid: 58 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: -1.5,-6.5 parent: 1 - uid: 59 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 0.5,-7.5 parent: 1 - uid: 60 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 0.5,-6.5 parent: 1 - uid: 61 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 0.5,-8.5 parent: 1 - uid: 62 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: -1.5,-8.5 parent: 1 - uid: 105 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: -5.5,1.5 parent: 1 - uid: 106 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: -4.5,1.5 parent: 1 - uid: 108 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: -1.5,1.5 parent: 1 - uid: 109 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: -0.5,1.5 parent: 1 - uid: 110 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 0.5,1.5 parent: 1 - uid: 111 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 4.5,1.5 parent: 1 - uid: 112 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 3.5,1.5 parent: 1 - uid: 114 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 1.5,1.5 parent: 1 - uid: 115 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: -2.5,1.5 parent: 1 - uid: 132 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -7.5,-3.5 parent: 1 - uid: 133 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 6.5,-3.5 parent: 1 - uid: 134 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 0.5,-5.5 parent: 1 - uid: 135 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 0.5,-4.5 parent: 1 - uid: 136 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 1.5,-3.5 parent: 1 - uid: 137 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 3.5,-3.5 parent: 1 - uid: 139 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 0.5,-3.5 parent: 1 - uid: 140 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 3.5,-4.5 parent: 1 - uid: 141 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 3.5,-6.5 parent: 1 - uid: 155 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 3.5,-5.5 diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index 9f8097a7f0a..2e6a1d470d5 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -592,6 +592,7 @@ - Gun - BallisticAmmoProvider - CartridgeAmmo + - type: Contraband #frontier - type: entity parent: ClothingBeltStorageBase @@ -686,3 +687,4 @@ whitelist: tags: - WizardWand + - type: Contraband #frontier diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index c1873338e23..0efb6a04c5e 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -70,6 +70,7 @@ sprite: Clothing/Head/Helmets/swat_syndicate.rsi - type: Clothing sprite: Clothing/Head/Helmets/swat_syndicate.rsi + - type: Contraband #frontier #Light Riot Helmet - type: entity @@ -146,6 +147,7 @@ Slash: 0.8 Piercing: 0.9 Heat: 0.9 + - type: Contraband #frontier #SCAF Helmet - type: entity @@ -227,6 +229,7 @@ sprite: Clothing/Head/Helmets/wizardhelm.rsi - type: IngestionBlocker - type: IdentityBlocker + - type: Contraband #frontier #Fire Helmet - type: entity diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml index 103bfe693dd..ebb4f79f41e 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml @@ -112,6 +112,7 @@ tags: - HidesHair - WhitelistChameleon + - type: Contraband #frontier - type: entity parent: ClothingHeadBase diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index b4d1891b881..415021c145f 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -118,6 +118,7 @@ Piercing: 0.6 Heat: 0.5 - type: GroupExamine + - type: Contraband #frontier - type: entity parent: ClothingOuterBaseLarge @@ -173,6 +174,7 @@ sprite: Clothing/OuterClothing/Armor/magusblue.rsi - type: Clothing sprite: Clothing/OuterClothing/Armor/magusblue.rsi + - type: Contraband #frontier - type: entity parent: ClothingOuterArmorHeavy @@ -184,6 +186,7 @@ sprite: Clothing/OuterClothing/Armor/magusred.rsi - type: Clothing sprite: Clothing/OuterClothing/Armor/magusred.rsi + - type: Contraband #frontier - type: entity parent: ClothingOuterBaseLarge diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index 576560dc6ca..f5256958227 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -327,6 +327,7 @@ sprite: Clothing/OuterClothing/Coats/syndicate/coatsyndiecap.rsi - type: Clothing sprite: Clothing/OuterClothing/Coats/syndicate/coatsyndiecap.rsi + - type: Contraband #frontier - type: entity parent: ClothingOuterCoatHoSTrench @@ -338,6 +339,7 @@ sprite: Clothing/OuterClothing/Coats/syndicate/coatsyndiecaparmored.rsi - type: Clothing sprite: Clothing/OuterClothing/Coats/syndicate/coatsyndiecaparmored.rsi + - type: Contraband #frontier - type: entity parent: ClothingOuterStorageBase diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index a7b53cf503c..c79b1d035d4 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -666,6 +666,7 @@ - type: HeldSpeedModifier - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitWizard + - type: Contraband #frontier #Ling Space Suit - type: entity diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml index ed0e2e89262..2d9a9c8c735 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml @@ -127,6 +127,7 @@ sprite: Clothing/OuterClothing/Misc/cultrobes.rsi - type: Clothing sprite: Clothing/OuterClothing/Misc/cultrobes.rsi + - type: Contraband #frontier - type: entity parent: ClothingOuterBase @@ -174,6 +175,7 @@ sprite: Clothing/OuterClothing/Misc/violetwizard.rsi - type: Clothing sprite: Clothing/OuterClothing/Misc/violetwizard.rsi + - type: Contraband #frontier - type: entity parent: ClothingOuterBase @@ -185,6 +187,7 @@ sprite: Clothing/OuterClothing/Misc/wizard.rsi - type: Clothing sprite: Clothing/OuterClothing/Misc/wizard.rsi + - type: Contraband #frontier - type: entity parent: ClothingOuterBase @@ -196,6 +199,7 @@ sprite: Clothing/OuterClothing/Misc/redwizard.rsi - type: Clothing sprite: Clothing/OuterClothing/Misc/redwizard.rsi + - type: Contraband #frontier - type: entity parent: ClothingOuterBase diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index 33f4260d83e..5deebd69ac1 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -455,6 +455,7 @@ sprite: Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodWinterSyndie + - type: Contraband #frontier - type: entity parent: ClothingOuterWinterWarden @@ -468,6 +469,7 @@ sprite: Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecaparmored.rsi - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodWinterSyndie + - type: Contraband #frontier - type: entity parent: ClothingOuterWinterCoatToggleable @@ -481,6 +483,7 @@ sprite: Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodWinterSyndie + - type: Contraband #frontier - type: entity parent: ClothingOuterWinterCoat diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 6375c15abb3..7c7be0d97cd 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -613,6 +613,7 @@ sprite: Clothing/Uniforms/Jumpskirt/operative_s.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/operative_s.rsi + - type: Contraband #frontier - type: entity parent: ClothingUniformSkirtBase @@ -727,6 +728,7 @@ sprite: Clothing/Uniforms/Jumpskirt/syndieformaldress.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/syndieformaldress.rsi + - type: Contraband #frontier - type: entity parent: ClothingUniformSkirtBase diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 4493e400ad3..1677cce8346 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -902,6 +902,7 @@ sprite: Clothing/Uniforms/Jumpsuit/pyjamasyndicateblack.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/pyjamasyndicateblack.rsi + - type: Contraband #frontier - type: entity parent: UnsensoredClothingUniformBase @@ -913,6 +914,7 @@ sprite: Clothing/Uniforms/Jumpsuit/pyjamasyndicatepink.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/pyjamasyndicatepink.rsi + - type: Contraband #frontier - type: entity parent: UnsensoredClothingUniformBase @@ -924,6 +926,7 @@ sprite: Clothing/Uniforms/Jumpsuit/pyjamasyndicatered.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/pyjamasyndicatered.rsi + - type: Contraband #frontier - type: entity parent: ClothingUniformBase @@ -979,6 +982,7 @@ sprite: Clothing/Uniforms/Jumpsuit/operative.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/operative.rsi + - type: Contraband #frontier - type: entity parent: ClothingUniformBase @@ -1273,6 +1277,7 @@ sprite: Clothing/Uniforms/Jumpsuit/syndieformal.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/syndieformal.rsi + - type: Contraband #frontier - type: entity parent: ClothingUniformBase diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/ship_vs_ship.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/ship_vs_ship.yml index d6999a0a265..887d3656b3e 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/ship_vs_ship.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/ship_vs_ship.yml @@ -24,6 +24,7 @@ sprite: Clothing/Uniforms/Jumpsuit/recruit_syndie.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/recruit_syndie.rsi + - type: Contraband #frontier #Repairman - type: entity @@ -47,6 +48,7 @@ sprite: Clothing/Uniforms/Jumpsuit/repairman_syndie.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/repairman_syndie.rsi + - type: Contraband #frontier #Paramedic - type: entity @@ -70,6 +72,7 @@ sprite: Clothing/Uniforms/Jumpsuit/paramedic_syndie.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/paramedic_syndie.rsi + - type: Contraband #frontier #HEADS OF STAFF #Chief Engineer @@ -94,3 +97,4 @@ sprite: Clothing/Uniforms/Jumpsuit/ce_syndie.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/ce_syndie.rsi + - type: Contraband #frontier diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_staff.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_staff.yml index 9cab4cac25a..68d268ad813 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_staff.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_staff.yml @@ -20,4 +20,5 @@ - type: Tag tags: - WizardStaff + - type: Contraband #frontier diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wand.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wand.yml index c4a937ee2cd..bef22043e14 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wand.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wand.yml @@ -25,3 +25,4 @@ - type: Tag tags: - WizardWand + - type: Contraband #frontier diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml index fb7eee8c8c9..3556d1c8f8b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml @@ -183,80 +183,3 @@ whitelist: components: - Body - -# Frontier projectiles -# The game wont allow them to sit under _NF. - -- type: entity - parent: BaseBulletTrigger - id: BulletFireBolt - name: fire bolt - noSpawn: true - components: - - type: Projectile - damage: - types: - Heat: 2 - - type: Sprite - noRot: false - sprite: Objects/Weapons/Guns/Projectiles/magic.rsi - layers: - - state: infernoshot - - type: Ammo - muzzleFlash: null - - type: IgniteOnCollide - fireStacks: 2 - -- type: entity - parent: BaseBulletTrigger - id: BulletMagicBolt - name: magic bolt - noSpawn: true - components: - - type: Projectile - damage: - types: - Bloodloss: 2 - Asphyxiation: 4 - - type: Sprite - noRot: false - sprite: Objects/Weapons/Guns/Projectiles/magic.rsi - layers: - - state: arcane_barrage - - type: Ammo - muzzleFlash: null - -- type: entity - parent: BaseBulletTrigger - id: BulletBloodCultDarkBolt - name: blood bolt - noSpawn: true - components: - - type: Projectile - damage: - types: - Bloodloss: 1 - Slash: 5 - - type: Sprite - noRot: false - sprite: Objects/Weapons/Guns/Projectiles/magic.rsi - color: red - layers: - - state: arcane_barrage - - type: Ammo - muzzleFlash: null - -- type: hitscan - id: BloodCultLaser - damage: - types: - Slash: 10 - muzzleFlash: - sprite: _NF/Effects/bloodcultbeams.rsi - state: red_lightning - travelFlash: - sprite: _NF/Effects/bloodcultbeams.rsi - state: red_lightning - impactFlash: - sprite: _NF/Effects/bloodcultbeams.rsi - state: red_lightning \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml index db24d3e2cd0..0b126f3503d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml @@ -21,6 +21,7 @@ slots: - back - type: DisarmMalus + - type: Contraband #frontier - type: entity name: eldritch blade @@ -45,6 +46,7 @@ slots: - back - type: DisarmMalus + - type: Contraband #frontier - type: entity name: unholy halberd @@ -83,3 +85,4 @@ - back - type: UseDelay delay: 1 + - type: Contraband #frontier diff --git a/Resources/Prototypes/Procedural/salvage_factions.yml b/Resources/Prototypes/Procedural/salvage_factions.yml index 27d7cda8a62..376f8678104 100644 --- a/Resources/Prototypes/Procedural/salvage_factions.yml +++ b/Resources/Prototypes/Procedural/salvage_factions.yml @@ -70,19 +70,19 @@ id: Syndicate groups: - entries: - - id: MobSyndicateNavalDeckhand + - id: SpawnMobSyndicateNavalDeckhand amount: 2 maxAmount: 3 - - id: MobSyndicateNavalEngineer + - id: SpawnMobSyndicateNavalEngineer amount: 1 - entries: - - id: MobSyndicateNavalSaboteur - amount: 0 + - id: SpawnMobSyndicateNavalSaboteur + amount: 1 maxAmount: 2 prob: 0.5 - entries: - - id: MobSyndicateNavalMedic - amount: 0 + - id: SpawnMobSyndicateNavalMedic + amount: 1 maxAmount: 2 prob: 0.25 - entries: @@ -90,21 +90,22 @@ amount: 1 prob: 0.25 - entries: - - id: MobSyndicateNavalOperator + - id: SpawnMobSyndicateNavalOperator amount: 1 prob: 0.25 - entries: - - id: MobSyndicateNavalCaptain + - id: SpawnMobSyndicateNavalCaptain amount: 1 prob: 0.1 - entries: - - id: MobSyndicateNavalCommander - amount: 1 + - id: SpawnMobSyndicateNavalHorror + amount: 0 + maxAmount: 1 prob: 0.001 configs: DefenseStructure: CybersunDataMiner Mining: Xenos # No idea what this thing does or where to look for it - Megafauna: MobSyndicateNavalCommander + Megafauna: MobSyndicateNavalCommanderA # Can't use spawner here - type: salvageFaction id: Cultists @@ -138,7 +139,7 @@ amount: 1 prob: 0.1 - entries: - - id: MobBloodCultistAscended + - id: MobBloodCultistAcolyte # Will replace it later with new mob amount: 1 prob: 0.001 configs: diff --git a/Resources/Prototypes/_NF/Body/Organs/synthetic_organs.yml b/Resources/Prototypes/_NF/Body/Organs/synthetic_organs.yml new file mode 100644 index 00000000000..23f79bb8fdf --- /dev/null +++ b/Resources/Prototypes/_NF/Body/Organs/synthetic_organs.yml @@ -0,0 +1,56 @@ +# Organs with boosted metabolizm +- type: entity + id: OrganSyntheticHeart + parent: BaseHumanOrgan + name: synthetic heart + description: "Whirrs and pumps blood." + components: + - type: Sprite + state: heart-on + - type: Metabolizer + maxReagents: 4 + metabolizerTypes: [Human] + groups: + - id: Medicine +# - id: Poison +# - id: Narcotic +# - id: Toxins + - type: Contraband + +- type: entity + id: OrganSyntheticLiver + parent: BaseHumanOrgan + name: synthetic liver + description: "Filters toxins from the bloodstream at higher rate than old 'ganic liver." + components: + - type: Sprite + state: liver + - type: Metabolizer + maxReagents: 5 + metabolizerTypes: [Human] + groups: + - id: Alcohol + rateModifier: 10 # removes Alcohol fast + - id: Poison + rateModifier: 10 # removes Poison fast + - id: Narcotic + rateModifier: 10 # removes Narcotic fast + - id: Toxins + rateModifier: 20 # removes Toxins fast + - type: Contraband + +- type: entity + id: OrganSyntheticKidneys + parent: BaseHumanOrgan + name: synthetic kidneys + description: "Filters toxins from the bloodstream at higher rate than old 'ganic liver." + components: + - type: Sprite + layers: + - state: kidney-l + - state: kidney-r + - type: Metabolizer + maxReagents: 5 + metabolizerTypes: [Human] + removeEmpty: true + - type: Contraband diff --git a/Resources/Prototypes/_NF/Body/Prototypes/human_synthetic_organs.yml b/Resources/Prototypes/_NF/Body/Prototypes/human_synthetic_organs.yml new file mode 100644 index 00000000000..3bbfad38fd6 --- /dev/null +++ b/Resources/Prototypes/_NF/Body/Prototypes/human_synthetic_organs.yml @@ -0,0 +1,50 @@ +- type: body + parent: Human + id: HumanSyntheticOrgans + name: "human" + root: torso + slots: + head: + part: HeadHuman + connections: + - torso + organs: + brain: OrganHumanBrain + eyes: OrganHumanEyes + torso: + part: TorsoHuman + connections: + - right_arm + - left_arm + - right_leg + - left_leg + organs: + heart: OrganSyntheticHeart + lungs: OrganHumanLungs + stomach: OrganHumanStomach + liver: OrganSyntheticLiver + kidneys: OrganSyntheticKidneys + right_arm: + part: RightArmHuman + connections: + - right_hand + left_arm: + part: LeftArmHuman + connections: + - left_hand + right_hand: + part: RightHandHuman + left_hand: + part: LeftHandHuman + right_leg: + part: RightLegHuman + connections: + - right_foot + left_leg: + part: LeftLegHuman + connections: + - left_foot + right_foot: + part: RightFootHuman + left_foot: + part: LeftFootHuman diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/duffelbag_npc_loot.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/duffelbag_npc_loot.yml new file mode 100644 index 00000000000..baeb525e55f --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/duffelbag_npc_loot.yml @@ -0,0 +1,613 @@ +# Duffel bag - gift box +- type: entity + parent: BaseItem + id: SyndieDuffelGiftBox + name: syndicate naval operative bundle + description: Loot boxes? Here? + abstract: true + noSpawn: true + suffix: NPC Loot + components: + - type: Sprite + sprite: Clothing/Back/Duffels/syndicate.rsi + state: icon-ammo + - type: Item + size: Normal + - type: Clothing + quickEquip: false + slots: + - back + - type: SpawnItemsOnUse + items: + - id: SpaceCash10 + sound: + path: /Audio/Items/jumpsuit_equip.ogg + +# Syndicate NPCs Loot +# Syndicate Naval Captain Loot +- type: entity + parent: SyndieDuffelGiftBox + id: ClothingBackpackSyndicateCaptainLootA + noSpawn: true + components: + - type: Sprite + sprite: _NF/Clothing/Back/Messenger/syndicate.rsi + state: icon + - type: SpawnItemsOnUse + items: + - id: WeaponRevolverPythonAP + - id: SpeedLoaderMagnumAP + - id: SpeedLoaderMagnumAP + - id: SpaceCash5000 + sound: + path: /Audio/Items/jumpsuit_equip.ogg + +- type: entity + parent: ClothingBackpackSyndicateCaptainLootA + id: ClothingBackpackSyndicateCaptainLootB + noSpawn: true + components: + - type: SpawnItemsOnUse + items: + - id: WeaponRevolverPython + - id: SpeedLoaderMagnum + - id: SpeedLoaderMagnum + - id: SpaceCash2500 + sound: + path: /Audio/Items/jumpsuit_equip.ogg + +- type: entity + parent: ClothingBackpackSyndicateCaptainLootA + id: ClothingBackpackSyndicateCaptainLootC + noSpawn: true + components: + - type: SpawnItemsOnUse + items: + - id: SpeedLoaderMagnum + - id: SpaceCash2500 + sound: + path: /Audio/Items/jumpsuit_equip.ogg + +- type: entity + parent: ClothingBackpackSyndicateCaptainLootA + id: ClothingBackpackSyndicateCaptainLootD + noSpawn: true + components: + - type: SpawnItemsOnUse + items: + - id: SpaceCash2500 + sound: + path: /Audio/Items/jumpsuit_equip.ogg + +# Syndicate Naval Second Officer Loot +- type: entity + parent: ClothingBackpackSyndicateCaptainLootA + id: ClothingBackpackSyndicateSecondOfficerLootA + noSpawn: true + components: + - type: SpawnItemsOnUse + items: + - id: WeaponLaserSvalinn + - id: PowerCellHyperPrinted + - id: PowerCellHyperPrinted + - id: SpaceCash2500 + sound: + path: /Audio/Items/jumpsuit_equip.ogg + +- type: entity + parent: ClothingBackpackSyndicateCaptainLootA + id: ClothingBackpackSyndicateSecondOfficerLootB + noSpawn: true + components: + - type: SpawnItemsOnUse + items: + - id: WeaponDisabler + - id: PowerCellHighPrinted + - id: SpaceCash2500 + sound: + path: /Audio/Items/jumpsuit_equip.ogg + +- type: entity + parent: ClothingBackpackSyndicateCaptainLootA + id: ClothingBackpackSyndicateSecondOfficerLootC + noSpawn: true + components: + - type: SpawnItemsOnUse + items: + - id: PowerCellHighPrinted + - id: SpaceCash2500 + sound: + path: /Audio/Items/jumpsuit_equip.ogg + +- type: entity + parent: ClothingBackpackSyndicateCaptainLootA + id: ClothingBackpackSyndicateSecondOfficerLootD + noSpawn: true + components: + - type: SpawnItemsOnUse + items: + - id: SpaceCash1000 + - id: SpaceCash500 + sound: + path: /Audio/Items/jumpsuit_equip.ogg + +# Syndicate Naval Commander Loot +- type: entity + parent: SyndieDuffelGiftBox + id: ClothingBackpackSyndicateCommanderLootA + noSpawn: true + components: + - type: Sprite + sprite: _NF/Clothing/Back/Messenger/syndicate.rsi + state: icon + - type: SpawnItemsOnUse + items: + - id: WeaponRifleAk + - id: MagazineLightRifle + - id: MagazineLightRifle + - id: SpaceCash10000 + sound: + path: /Audio/Items/jumpsuit_equip.ogg + +- type: entity + parent: ClothingBackpackSyndicateCommanderLootA + id: ClothingBackpackSyndicateCommanderLootB + noSpawn: true + components: + - type: SpawnItemsOnUse + items: + - id: WeaponRifleLecter + - id: MagazineRifle + - id: MagazineRifle + - id: SpaceCash10000 + sound: + path: /Audio/Items/jumpsuit_equip.ogg + +- type: entity + parent: ClothingBackpackSyndicateCommanderLootA + id: ClothingBackpackSyndicateCommanderLootC + noSpawn: true + components: + - type: SpawnItemsOnUse + items: + - id: MagazineLightRifle + - id: MagazineLightRifle + - id: SpaceCash10000 + sound: + path: /Audio/Items/jumpsuit_equip.ogg + +- type: entity + parent: ClothingBackpackSyndicateCommanderLootA + id: ClothingBackpackSyndicateCommanderLootD + noSpawn: true + components: + - type: SpawnItemsOnUse + items: + - id: SpaceCash10000 + sound: + path: /Audio/Items/jumpsuit_equip.ogg + +# Syndicate Security Operative Loot +- type: entity + parent: SyndieDuffelGiftBox + id: ClothingBackpackSyndicateOperativeLootA + noSpawn: true + components: + - type: SpawnItemsOnUse + items: + - id: WeaponSubMachineGunAtreides + - id: MagazinePistolSubMachineGun + - id: MagazinePistolSubMachineGun + - id: SpaceCash1000 + - id: SpaceCash1000 + sound: + path: /Audio/Items/jumpsuit_equip.ogg + +- type: entity + parent: ClothingBackpackSyndicateOperativeLootA + id: ClothingBackpackSyndicateOperativeLootB + noSpawn: true + components: + - type: SpawnItemsOnUse + items: + - id: WeaponSubMachineGunWt550 + - id: MagazinePistolSubMachineGunTopMounted + - id: SpaceCash1000 + - id: SpaceCash500 + sound: + path: /Audio/Items/jumpsuit_equip.ogg + +- type: entity + parent: ClothingBackpackSyndicateOperativeLootA + id: ClothingBackpackSyndicateOperativeLootC + noSpawn: true + components: + - type: SpawnItemsOnUse + items: + - id: MagazineBoxPistol + - id: MagazineBoxPistol + - id: SpaceCash1000 + - id: SpaceCash500 + sound: + path: /Audio/Items/jumpsuit_equip.ogg + +- type: entity + parent: ClothingBackpackSyndicateOperativeLootA + id: ClothingBackpackSyndicateOperativeLootD + noSpawn: true + components: + - type: SpawnItemsOnUse + items: + - id: SpaceCash1000 + - id: SpaceCash500 + sound: + path: /Audio/Items/jumpsuit_equip.ogg + +# Syndicate Naval Deckhand Loot +- type: entity + parent: SyndieDuffelGiftBox + id: ClothingBackpackSyndicateDeckhandLootA + noSpawn: true + components: + - type: SpawnItemsOnUse + items: + - id: WeaponPistolViper + - id: MagazinePistol + - id: MagazinePistol + - id: SpaceCash1000 + sound: + path: /Audio/Items/jumpsuit_equip.ogg + +- type: entity + parent: SyndieDuffelGiftBox + id: ClothingBackpackSyndicateDeckhandLootB + noSpawn: true + components: + - type: SpawnItemsOnUse + items: + - id: WeaponPistolMk58 + - id: MagazinePistol + - id: SpaceCash1000 + sound: + path: /Audio/Items/jumpsuit_equip.ogg + +- type: entity + parent: SyndieDuffelGiftBox + id: ClothingBackpackSyndicateDeckhandLootC + noSpawn: true + components: + - type: SpawnItemsOnUse + items: + - id: MagazinePistol + - id: MagazinePistol + - id: SpaceCash1000 + sound: + path: /Audio/Items/jumpsuit_equip.ogg + +- type: entity + parent: SyndieDuffelGiftBox + id: ClothingBackpackSyndicateDeckhandLootD + noSpawn: true + components: + - type: SpawnItemsOnUse + items: + - id: SpaceCash1000 + sound: + path: /Audio/Items/jumpsuit_equip.ogg + +# Syndicate Naval Saboteur Loot +- type: entity + parent: ClothingBackpackSyndicateDeckhandLootA + id: ClothingBackpackSyndicateSaboteurLootA + noSpawn: true + components: + - type: Sprite + sprite: _NF/Clothing/Back/Messenger/syndicate.rsi + state: icon + +- type: entity + parent: ClothingBackpackSyndicateDeckhandLootB + id: ClothingBackpackSyndicateSaboteurLootB + noSpawn: true + components: + - type: Sprite + sprite: _NF/Clothing/Back/Messenger/syndicate.rsi + state: icon + +- type: entity + parent: ClothingBackpackSyndicateDeckhandLootC + id: ClothingBackpackSyndicateSaboteurLootC + noSpawn: true + components: + - type: Sprite + sprite: _NF/Clothing/Back/Messenger/syndicate.rsi + state: icon + +- type: entity + parent: ClothingBackpackSyndicateDeckhandLootD + id: ClothingBackpackSyndicateSaboteurLootD + noSpawn: true + components: + - type: Sprite + sprite: _NF/Clothing/Back/Messenger/syndicate.rsi + state: icon + +# Syndicate Naval Medic Loot +- type: entity + parent: SyndieDuffelGiftBox + id: ClothingBackpackSyndicateMedicLootA + noSpawn: true + components: + - type: Sprite + sprite: Clothing/Back/Duffels/syndicate.rsi + state: icon-med + - type: SpawnItemsOnUse + items: + - id: HypoMiniLimitedEdition + - id: BruteAutoInjector + - id: AntiPoisonMedipen + - id: MedicatedSuture + - id: Stimpack + - id: SpaceCash1000 + sound: + path: /Audio/Items/jumpsuit_equip.ogg + +- type: entity + parent: ClothingBackpackSyndicateMedicLootA + id: ClothingBackpackSyndicateMedicLootB + noSpawn: true + components: + - type: SpawnItemsOnUse + items: + - id: HypoMini + - id: BruteAutoInjector + - id: AntiPoisonMedipen + - id: MedicatedSuture + - id: SpaceCash1000 + sound: + path: /Audio/Items/jumpsuit_equip.ogg + +- type: entity + parent: ClothingBackpackSyndicateMedicLootA + id: ClothingBackpackSyndicateMedicLootC + noSpawn: true + components: + - type: SpawnItemsOnUse + items: + - id: HypoMini + - id: AntiPoisonMedipen + - id: MedicatedSuture + - id: SpaceCash1000 + sound: + path: /Audio/Items/jumpsuit_equip.ogg + +- type: entity + parent: ClothingBackpackSyndicateMedicLootA + id: ClothingBackpackSyndicateMedicLootD + noSpawn: true + components: + - type: SpawnItemsOnUse + items: + - id: AntiPoisonMedipen + - id: MedicatedSuture + - id: SpaceCash1000 + sound: + path: /Audio/Items/jumpsuit_equip.ogg + +# Syndicate Naval Engineer Loot +- type: entity + parent: SyndieDuffelGiftBox + id: ClothingBackpackSyndicateEngineerLootA + noSpawn: true + components: + - type: Sprite + sprite: Clothing/Back/Duffels/syndicate.rsi + state: icon + - type: SpawnItemsOnUse + items: + - id: WeaponShotgunKammerer + - id: SyndicateJawsOfLife + - id: BoxShotgunSlug + - id: SpaceCash1000 + - id: SpaceCash1000 + sound: + path: /Audio/Items/jumpsuit_equip.ogg + +- type: entity + parent: ClothingBackpackSyndicateEngineerLootA + id: ClothingBackpackSyndicateEngineerLootB + noSpawn: true + components: + - type: SpawnItemsOnUse + items: + - id: WeaponShotgunKammerer + - id: JawsOfLife + - id: SpaceCash1000 + sound: + path: /Audio/Items/jumpsuit_equip.ogg + +- type: entity + parent: ClothingBackpackSyndicateEngineerLootA + id: ClothingBackpackSyndicateEngineerLootC + noSpawn: true + components: + - type: SpawnItemsOnUse + items: + - id: JawsOfLife + - id: SpaceCash1000 + sound: + path: /Audio/Items/jumpsuit_equip.ogg + +- type: entity + parent: ClothingBackpackSyndicateEngineerLootA + id: ClothingBackpackSyndicateEngineerLootD + noSpawn: true + components: + - type: SpawnItemsOnUse + items: + - id: SpaceCash1000 + sound: + path: /Audio/Items/jumpsuit_equip.ogg + +# Syndicate Naval Chemwarrior +- type: entity + parent: SyndieDuffelGiftBox + id: ClothingBackpackSyndicateChemwarriorLootA + noSpawn: true + components: + - type: Sprite + sprite: Clothing/Back/Backpacks/waterbackpack.rsi + state: icon + - type: SpawnItemsOnUse + items: + - id: ClothingBackpackWaterTank + - id: WeaponSprayNozzle + - id: Stimpack + - id: SpaceCash2500 + sound: + path: /Audio/Items/jumpsuit_equip.ogg + +- type: entity + parent: ClothingBackpackSyndicateChemwarriorLootA + id: ClothingBackpackSyndicateChemwarriorLootB + noSpawn: true + components: + - type: SpawnItemsOnUse + items: + - id: WeaponWaterBlasterSuper + - id: Stimpack + - id: SpaceCash2500 + sound: + path: /Audio/Items/jumpsuit_equip.ogg + +- type: entity + parent: ClothingBackpackSyndicateChemwarriorLootA + id: ClothingBackpackSyndicateChemwarriorLootC + noSpawn: true + components: + - type: SpawnItemsOnUse + items: + - id: WeaponWaterBlaster + - id: SpaceCash2500 + sound: + path: /Audio/Items/jumpsuit_equip.ogg + +- type: entity + parent: ClothingBackpackSyndicateChemwarriorLootA + id: ClothingBackpackSyndicateChemwarriorLootD + noSpawn: true + components: + - type: SpawnItemsOnUse + items: + - id: WeaponWaterPistol + - id: SpaceCash2500 + sound: + path: /Audio/Items/jumpsuit_equip.ogg + +# Syndicate Naval Grenadier +- type: entity + parent: SyndieDuffelGiftBox + id: ClothingBackpackSyndicateGrenadierLootA + noSpawn: true + components: + - type: SpawnItemsOnUse + items: + - id: ExGrenade + amount: 4 + - id: SpaceCash5000 + sound: + path: /Audio/Items/jumpsuit_equip.ogg + +- type: entity + parent: ClothingBackpackSyndicateGrenadierLootA + id: ClothingBackpackSyndicateGrenadierLootB + noSpawn: true + components: + - type: SpawnItemsOnUse + items: + - id: ExGrenade + amount: 2 + - id: SpaceCash2500 + sound: + path: /Audio/Items/jumpsuit_equip.ogg + +- type: entity + parent: ClothingBackpackSyndicateGrenadierLootA + id: ClothingBackpackSyndicateGrenadierLootC + noSpawn: true + components: + - type: SpawnItemsOnUse + items: + - id: GrenadeFlashBang + amount: 4 + - id: SpaceCash2500 + sound: + path: /Audio/Items/jumpsuit_equip.ogg + +- type: entity + parent: ClothingBackpackSyndicateGrenadierLootA + id: ClothingBackpackSyndicateGrenadierLootD + noSpawn: true + components: + - type: SpawnItemsOnUse + items: + - id: GrenadeFlashBang + amount: 2 + - id: SpaceCash2500 + sound: + path: /Audio/Items/jumpsuit_equip.ogg + +# Blood Cult NPCs Loot +# Blood Cultist Zealot (Ranged) Loot +- type: entity + parent: SyndieDuffelGiftBox + id: ClothingBackpackBloodCultZealotLootA + name: cultist gear bundle + noSpawn: true + components: + - type: Sprite + sprite: _NF/Clothing/Back/Messenger/messenger.rsi + state: icon + - type: SpawnItemsOnUse + items: + - id: CrossbowImprovised +# - id: ClothingBeltQuiverCrossbowFilledBolt + - id: SpaceCash1000 + sound: + path: /Audio/Items/jumpsuit_equip.ogg + +- type: entity + parent: ClothingBackpackBloodCultZealotLootA + id: ClothingBackpackBloodCultZealotLootB + noSpawn: true + components: + - type: SpawnItemsOnUse + items: + - id: CrossbowImprovised + - id: ClothingBeltQuiverCrossbowFilledUranium + - id: SpaceCash1000 + sound: + path: /Audio/Items/jumpsuit_equip.ogg + +- type: entity + parent: ClothingBackpackBloodCultZealotLootA + id: ClothingBackpackBloodCultZealotLootC + noSpawn: true + components: + - type: SpawnItemsOnUse + items: + - id: ClothingBeltQuiverCrossbowFilledPlasma + - id: SpaceCash1000 + sound: + path: /Audio/Items/jumpsuit_equip.ogg + +- type: entity + parent: ClothingBackpackBloodCultZealotLootA + id: ClothingBackpackBloodCultZealotLootD + noSpawn: true + components: + - type: SpawnItemsOnUse + items: + - id: SpaceCash1000 + sound: + path: /Audio/Items/jumpsuit_equip.ogg diff --git a/Resources/Prototypes/_NF/Catalog/NPCsChatter/mimehumanoidmob.yml b/Resources/Prototypes/_NF/Catalog/NPCsChatter/mimehumanoidmob.yml new file mode 100644 index 00000000000..061f882d1b1 --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/NPCsChatter/mimehumanoidmob.yml @@ -0,0 +1,23 @@ +- type: advertisementsPack + id: mimehumanoidchatter + advertisements: + - advertisement-mimehumanoid-1 + - advertisement-mimehumanoid-2 + - advertisement-mimehumanoid-3 + - advertisement-mimehumanoid-4 + - advertisement-mimehumanoid-5 + - advertisement-mimehumanoid-6 + - advertisement-mimehumanoid-7 + - advertisement-mimehumanoid-8 + - advertisement-mimehumanoid-9 + - advertisement-mimehumanoid-10 + - advertisement-mimehumanoid-11 + - advertisement-mimehumanoid-12 + - advertisement-mimehumanoid-13 + - advertisement-mimehumanoid-14 + - advertisement-mimehumanoid-15 + - advertisement-mimehumanoid-16 + - advertisement-mimehumanoid-17 + - advertisement-mimehumanoid-18 + - advertisement-mimehumanoid-19 + - advertisement-mimehumanoid-20 diff --git a/Resources/Prototypes/_NF/Chemistry/metabolism_groups.yml b/Resources/Prototypes/_NF/Chemistry/metabolism_groups.yml new file mode 100644 index 00000000000..464b33337c3 --- /dev/null +++ b/Resources/Prototypes/_NF/Chemistry/metabolism_groups.yml @@ -0,0 +1,3 @@ +# Not sure if it actually does something +- type: metabolismGroup + id: Toxins diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Belt/crossbow_bolt_quiver.yml b/Resources/Prototypes/_NF/Entities/Clothing/Belt/crossbow_bolt_quiver.yml index 186b762347a..b05e5cf8fb4 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Belt/crossbow_bolt_quiver.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Belt/crossbow_bolt_quiver.yml @@ -2,7 +2,7 @@ parent: ClothingBeltStorageBase id: ClothingBeltQuiverCrossbow name: quiver (bolts) - description: Can hold up to 20 bolts, and fits snug around your waist. + description: Can hold up to 25 bolts, and fits snug around your waist. components: - type: Sprite sprite: _NF/Objects/Clothing/Belt/crossbow_quiver.rsi @@ -24,4 +24,32 @@ fillBaseName: fill- - type: Construction graph: CraftQuiverBolt - node: CraftQuiverBolt \ No newline at end of file + node: CraftQuiverBolt + +# Filled versions +- type: entity + parent: ClothingBeltQuiverCrossbow + id: ClothingBeltQuiverCrossbowFilledBolt + components: + - type: StorageFill + contents: + - id: CrossbowBolt + amount: 15 + +- type: entity + parent: ClothingBeltQuiverCrossbow + id: ClothingBeltQuiverCrossbowFilledUranium + components: + - type: StorageFill + contents: + - id: CrossbowBoltUraniumGlassShard + amount: 15 + +- type: entity + parent: ClothingBeltQuiverCrossbow + id: ClothingBeltQuiverCrossbowFilledPlasma + components: + - type: StorageFill + contents: + - id: CrossbowBoltPlasmaGlassShard + amount: 15 diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/_NF/Entities/Clothing/Hands/gloves.yml index cdba15ec666..8a66062fa73 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Hands/gloves.yml @@ -54,3 +54,119 @@ sprite: _NF/Clothing/Hands/Gloves/nfsd_cream.rsi - type: Clothing sprite: _NF/Clothing/Hands/Gloves/nfsd_cream.rsi + +# Gloves with fake guns visuals for NPCs +- type: entity + parent: ClothingHandsGlovesSyntheticBase + id: ClothingHandsGlovesColorBlackSMG + name: combat gloves + suffix: smg + description: Regular black gloves that do not keep you from frying. + noSpawn: true + components: + - type: Unremoveable + - type: GloveHeatResistance + heatResistance: 1400 + - type: Insulated + - type: Fiber + fiberColor: fibers-black + - type: Sprite + sprite: _NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_smg.rsi + - type: Clothing + sprite: _NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_smg.rsi + +- type: entity + parent: ClothingHandsGlovesColorBlackSMG + id: ClothingHandsGlovesColorBlackAK + name: combat gloves + suffix: ak + noSpawn: true + components: + - type: Sprite + sprite: _NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_ak.rsi + - type: Clothing + sprite: _NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_ak.rsi + +- type: entity + parent: ClothingHandsGlovesColorBlackSMG + id: ClothingHandsGlovesColorBlackChinaLake + name: combat gloves + suffix: china lake + noSpawn: true + components: + - type: Sprite + sprite: _NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_china_lake.rsi + - type: Clothing + sprite: _NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_china_lake.rsi + +- type: entity + parent: ClothingHandsGlovesColorBlackSMG + id: ClothingHandsGlovesColorBlackPistol + name: combat gloves + suffix: pistol + noSpawn: true + components: + - type: Sprite + sprite: _NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_pistol.rsi + - type: Clothing + sprite: _NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_pistol.rsi + +- type: entity + parent: ClothingHandsGlovesColorBlackSMG + id: ClothingHandsGlovesColorBlackPython + name: combat gloves + suffix: python + noSpawn: true + components: + - type: Sprite + sprite: _NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_python.rsi + - type: Clothing + sprite: _NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_python.rsi + +- type: entity + parent: ClothingHandsGlovesColorBlackSMG + id: ClothingHandsGlovesColorBlackShotgun + name: combat gloves + suffix: shotgun + noSpawn: true + components: + - type: Sprite + sprite: _NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_shotgun.rsi + - type: Clothing + sprite: _NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_shotgun.rsi + +- type: entity + parent: ClothingHandsGlovesColorBlackSMG + id: ClothingHandsGlovesColorBlackSprayNozzle + name: combat gloves + suffix: spray nozzle + noSpawn: true + components: + - type: Sprite + sprite: _NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_spray_nozzle.rsi + - type: Clothing + sprite: _NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_spray_nozzle.rsi + +- type: entity + parent: ClothingHandsGlovesColorBlackSMG + id: ClothingHandsGlovesColorBlackCrossbow + name: combat gloves + suffix: crossbow + noSpawn: true + components: + - type: Sprite + sprite: _NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_crossbow.rsi + - type: Clothing + sprite: _NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_crossbow.rsi + +- type: entity + parent: ClothingHandsGlovesColorBlackSMG + id: ClothingHandsGlovesColorBlackLaserPistol + name: combat gloves + suffix: laser pistol + noSpawn: true + components: + - type: Sprite + sprite: _NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_laser_pistol.rsi + - type: Clothing + sprite: _NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_laser_pistol.rsi diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/helmets.yml index 15371dd597b..bd1622b240b 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/helmets.yml @@ -12,3 +12,37 @@ sprite: _NF/Clothing/Head/Helmets/ert_mailcarrier.rsi - type: Clothing sprite: _NF/Clothing/Head/Helmets/ert_mailcarrier.rsi +# Syndicate Bomb Suit Helmet +- type: entity + parent: ClothingHeadHelmetBombSuit + id: ClothingHeadHelmetBombSuitSyndie + name: syndicate bombsuit helmet + components: + - type: Sprite + sprite: _NF/Clothing/Head/Helmets/syndicate_bombsuit.rsi + - type: Clothing + sprite: _NF/Clothing/Head/Helmets/syndicate_bombsuit.rsi + - type: Contraband + +# Syndicate NPC helmets, unremoveable +- type: entity + parent: ClothingHeadHelmetHardsuitSyndie + id: ClothingHeadHelmetHardsuitSyndieEliteUnremoveable + noSpawn: true + components: + - type: Unremoveable + - type: Sprite + sprite: Clothing/Head/Hardsuits/syndieelite.rsi + - type: Clothing + sprite: Clothing/Head/Hardsuits/syndieelite.rsi + +- type: entity + parent: ClothingHeadHelmetHardsuitSyndie + id: ClothingHeadHelmetHardsuitSyndieUnremoveable + noSpawn: true + components: + - type: Unremoveable + - type: Sprite + sprite: Clothing/Head/Hardsuits/syndiecommander.rsi + - type: Clothing + sprite: Clothing/Head/Hardsuits/syndiecommander.rsi diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/hoods.yml index 140dacbc48f..ff4c0e351c1 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/hoods.yml @@ -8,3 +8,30 @@ sprite: _NF/Clothing/Head/Hoods/Coat/arcadia.rsi - type: Clothing sprite: _NF/Clothing/Head/Hoods/Coat/arcadia.rsi + +# Syndicate armored bio suit hood +- type: entity + parent: ClothingHeadHatHoodBioGeneral + id: ClothingHeadHatHoodBioArmoredSyndicate + name: bio hood + suffix: Syndicate + description: A hood that protects the head and face from biological contaminants. As well as user's identity. + components: + - type: IdentityBlocker + - type: Sprite + sprite: _NF/Clothing/Head/Hoods/Bio/syndicate.rsi + - type: Clothing + sprite: _NF/Clothing/Head/Hoods/Bio/syndicate.rsi + - type: Contraband + +- type: entity # for looks only + parent: ClothingHeadHatHoodWinterBase + id: ClothingHeadHatHoodWinterSyndieUnremoveable + noSpawn: true + name: syndicate coat hood + components: + - type: Unremoveable + - type: Sprite + sprite: Clothing/Head/Hoods/Coat/hoodsyndicate.rsi + - type: Clothing + sprite: Clothing/Head/Hoods/Coat/hoodsyndicate.rsi diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Neck/misc.yml b/Resources/Prototypes/_NF/Entities/Clothing/Neck/misc.yml index b973fec43a3..72374f0b247 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Neck/misc.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Neck/misc.yml @@ -32,3 +32,28 @@ - type: EmitsSoundOnMove soundCollection: collection: FootstepJester + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckAmuletBloodCult + name: ascended cultist amulet + description: Every time you look upon it, you feel like it gazes back. + components: + - type: Item + size: Tiny + - type: Sprite + sprite: _NF/Clothing/Neck/Misc/ascended_cultist_amulet.rsi + - type: Clothing + sprite: _NF/Clothing/Neck/Misc/ascended_cultist_amulet.rsi + - type: BasicEntityAmmoProvider + proto: MobBloodCultDrainedOneNanoTrasen + capacity: 1 + count: 1 + - type: Gun + fireRate: 1 + soundGunshot: + path: /Audio/Effects/teleport_arrival.ogg + - type: RechargeBasicEntityAmmo + rechargeCooldown: 440 + rechargeSound: + path: /Audio/_NF/Effects/silence.ogg diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/armor.yml index a221e8ebbd8..1dd5d735183 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/armor.yml @@ -23,6 +23,32 @@ damageCoefficient: 0.60 - type: GroupExamine +# Syndicate armored bio suit +- type: entity + parent: ClothingOuterBioGeneral + id: ClothingOuterBioArmoredSyndicate + name: bio suit + suffix: Syndicate + description: Favorite protective gear of any syndicate chemical warfare enjoyers. + components: + - type: Sprite + sprite: _NF/Clothing/OuterClothing/Bio/syndicate.rsi + - type: Clothing + sprite: _NF/Clothing/OuterClothing/Bio/syndicate.rsi + - type: Armor + modifiers: + coefficients: + Slash: 1.2 + Piercing: 0.4 + Heat: 0.6 + Caustic: 0.4 + - type: ClothingSpeedModifier + walkModifier: 0.85 + sprintModifier: 0.85 + - type: ExplosionResistance + damageCoefficient: 0.60 + - type: Contraband + - type: entity parent: ClothingOuterBaseLarge id: ClothingOuterArmorNfsdArmor diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml index 0571b51ae5c..10ddba58a84 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml @@ -136,7 +136,7 @@ - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitMaximPrototype -# Funny meme jokes ha-ha: off-brand blood-red hardsuit +# Funny meme joke ha-ha: off-brand blood-red hardsuit - type: entity parent: ClothingOuterHardsuitSyndie id: ClothingOuterHardsuitSundie @@ -159,6 +159,32 @@ Caustic: 1.5 - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitSundie + +# Syndicate NPC hard suit, unremoveable +- type: entity + parent: ClothingOuterHardsuitSyndie + id: ClothingOuterHardsuitSyndieEliteUnremoveable + name: syndicate hardsuit + noSpawn: true + components: + - type: Unremoveable + - type: Sprite + sprite: Clothing/OuterClothing/Hardsuits/syndieelite.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Hardsuits/syndieelite.rsi + - type: Contraband + +- type: entity + parent: ClothingOuterHardsuitSyndie + id: ClothingOuterHardsuitSyndieBloodRedUnremoveable + name: syndicate hardsuit + noSpawn: true + components: + - type: Unremoveable + - type: Sprite + sprite: Clothing/OuterClothing/Hardsuits/syndicate.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Hardsuits/syndicate.rsi - type: Contraband - type: entity diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/suits.yml new file mode 100644 index 00000000000..5994ebcc7c3 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/suits.yml @@ -0,0 +1,11 @@ +# Syndicate bomb suit +- type: entity + parent: ClothingOuterSuitBomb + id: ClothingOuterSuitBombSyndie + name: syndicate bomb suit + components: + - type: Sprite + sprite: _NF/Clothing/OuterClothing/Suits/syndicate_bombsuit.rsi + - type: Clothing + sprite: _NF/Clothing/OuterClothing/Suits/syndicate_bombsuit.rsi + - type: Contraband diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/base_humanoid_hostile.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/base_humanoid_hostile.yml index ab239ed6c15..eb7ee760a69 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/base_humanoid_hostile.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/base_humanoid_hostile.yml @@ -14,21 +14,52 @@ thermalRegulationTemperatureThreshold: 25 - type: MovedByPressure +- type: entity + save: false + id: MobPassiveRegen + abstract: true + components: + - type: PassiveDamage # Slight passive regen. + allowedStates: + - Alive + damageCap: 400 + damage: + groups: + Brute: -1 + Burn: -10 + Airloss: -1 + Toxin: -7 + Genetic: -7 + +- type: entity + save: false + id: MobLaserReflect + abstract: true + components: + - type: Reflect + reflectProb: 0.7 + reflects: + - Energy + # Human NPC, uses equipment, immune to vacuum/low pressure # but otherwise should be the same as base line human mob # Going to use this prototype later for other mobs - type: entity name: Human NPC - suffix: AI + suffix: AI, Hostile abstract: true parent: - MobAtmosNF - MobBloodstream - MobFlammable + - MobLaserReflect - BaseMobSpecies id: MobHumanoidHostileBase components: + - type: MovementAlwaysTouching + - type: MobMover - type: NoSlip + - type: StandingState - type: RandomHumanoidAppearance randomizeName: true - type: MobThresholds @@ -44,7 +75,7 @@ - type: Butcherable butcheringType: Spike # TODO human. spawned: - - id: FoodMeat + - id: FoodMeatHuman amount: 5 # AI package - type: HTN @@ -55,10 +86,15 @@ # task: SimpleRangedHostileCompound blackboard: NavClimb: !type:Bool # They use this option too much for my liking, but without this mobs usually get stuck on spawn in expeds - true + false - type: NpcFactionMember factions: - - SimpleNeutral + - SimpleHostile + - type: Carriable # Carrying system from nyanotrasen. + - type: MobPrice + price: 1500 # Kidnapping a living person and selling them for cred is a good move. + deathPenalty: 0.5 # However they really ought to be living and intact, otherwise they're worth 2x less. + - type: Contraband - type: Advertise pack: syndicatehumanoidchatter # Don't have neutral one minimumWait: 120 # 1 * 2 @@ -68,13 +104,15 @@ # NonHuman NPC base, no equipment, immune to vacuum/low pressure - type: entity name: Mob NPC - suffix: AI + suffix: AI, Hostile abstract: true parent: - MobAtmosNF + - MobLaserReflect - SimpleSpaceMobBase id: MobNonHumanHostileBase components: + - type: MovementAlwaysTouching - type: NoSlip - type: ZombieImmune - type: Hands @@ -113,7 +151,7 @@ # true - type: NpcFactionMember factions: - - SimpleNeutral + - SimpleHostile - type: Sprite drawdepth: Mobs sprite: _NF/Mobs/BloodCult/ascended_cultist.rsi @@ -128,3 +166,8 @@ Base: crit Dead: Base: dead + - type: Carriable # Carrying system from nyanotrasen. + - type: MobPrice + price: 1500 # Kidnapping a living person and selling them for cred is a good move. + deathPenalty: 0.5 # However they really ought to be living and intact, otherwise they're worth 2x less. + - type: Contraband diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/bloodcultistmob.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/bloodcultistmob.yml index 8bf93693a2c..2cce0d155e7 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/bloodcultistmob.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/bloodcultistmob.yml @@ -17,8 +17,12 @@ minimumWait: 120 # 1 * 2 maximumWait: 240 # 2 * 60 NextAdvertisementTime: 0 + - type: AutoWakeUp + - type: MovementAlwaysTouching # Humans +# Blood Cult Priest, ranged mab, bolts deal 10 slash damage +# Look for magic bolt here:\Resources\Prototypes\_NF\Entities\Objects\Weapons\Guns\Projectiles\magic.yml - type: entity name: Blood Cult Priest parent: MobBloodCultistBase @@ -37,15 +41,16 @@ fireCost: 100 - type: BatterySelfRecharger autoRecharge: true - autoRechargeRate: 50 + autoRechargeRate: 100 - type: Battery - maxCharge: 200 - startingCharge: 200 + maxCharge: 300 + startingCharge: 300 - type: Gun fireRate: 4 soundGunshot: path: /Audio/Effects/Lightning/lightningshock.ogg +# Blood Cult Acolyte, melee mob armed with eldritch sword (16 slash) - type: entity name: Blood Cult Acolyte parent: MobBloodCultistBase @@ -60,6 +65,7 @@ reflectProb: .3 spread: 90 +# Blood Cult Acolyte, melee mob armed with ritual dagger (12 slash) - type: entity name: Blood Cult Zealot parent: MobBloodCultistBase @@ -74,6 +80,8 @@ reflectProb: .1 spread: 90 +# Blood Cult Zealot, ranged mob, crossbow bolt deals 20 slash and 5 bloodloss +# Look for crossbow bolt here: \Resources\Prototypes\_NF\Entities\Objects\Weapons\Guns\Projectiles\crossbow_bolts.yml - type: entity name: Blood Cult Zealot suffix: AI, Crossbow @@ -99,6 +107,8 @@ soundGunshot: collection: BulletMiss +# Blood Cult Zealot, ranged mob, magic bolt deals 5 slash and 2 bloodloss +# Look for magic bolt here:\Resources\Prototypes\_NF\Entities\Objects\Weapons\Guns\Projectiles\magic.yml - type: entity name: Blood Cult Zealot suffix: AI, Ranged @@ -122,6 +132,7 @@ path: /Audio/_NF/Effects/silence.ogg # Non-human mobs +# Ascended Cultist, spawns 2 Drained Ones - type: entity name: Ascended Cultist # Megafauna suffix: AI, Ranged @@ -134,11 +145,12 @@ factions: - BloodCultNF - type: MovementIgnoreGravity + - type: MovementAlwaysTouching - type: Advertise pack: bloodcultisthumanoidchatter - type: Reflect enabled: true - reflectProb: .5 + reflectProb: .4 spread: 90 - type: Sprite drawdepth: Mobs @@ -170,7 +182,7 @@ soundGunshot: path: /Audio/Effects/teleport_arrival.ogg - type: RechargeBasicEntityAmmo - rechargeCooldown: 50 + rechargeCooldown: 55 rechargeSound: path: /Audio/_NF/Effects/silence.ogg - type: MeleeWeapon @@ -190,11 +202,18 @@ range: 5 sound: path: /Audio/_NF/Effects/bloodcult/whispers.ogg + - type: Butcherable + spawned: + - id: ClothingNeckAmuletBloodCult + amount: 1 +# Blood Leech, melee, fast, has moderate health regen - type: entity name: Blood Leech suffix: AI, Melee - parent: MobNonHumanHostileBase + parent: + - MobNonHumanHostileBase + - MobPassiveRegen id: MobBloodCultLeech components: - type: NpcFactionMember @@ -226,19 +245,15 @@ - type: MovementSpeedModifier baseWalkSpeed: 4 baseSprintSpeed: 6 - - type: LeechOnMarker - leech: - groups: - Brute: -10 - Burn: -10 - type: MeleeWeapon soundHit: path: /Audio/Effects/bite.ogg damage: types: - Slash: 12 + Slash: 10 animation: WeaponArcBite +# Drained One, melee - type: entity name: Drained One suffix: AI, Melee @@ -279,7 +294,7 @@ path: /Audio/Effects/bite.ogg damage: types: - Asphyxiation: 12 + Asphyxiation: 7 animation: WeaponArcClaw - type: PointLight color: MediumPurple @@ -295,7 +310,22 @@ - type: Ammo muzzleFlash: null +# Drained One (summonable by players), melee +- type: entity + name: Drained One + suffix: AI, Melee + parent: MobBloodCultDrainedOne + id: MobBloodCultDrainedOneNanoTrasen + components: + - type: NpcFactionMember + factions: + - NanoTrasen + - type: TimedDespawn + lifetime: 80 + # Turrets +# blood pylon, ranged, magic bolt deals 5 slash and 2 bloodloss +# Look for magic bolt here:\Resources\Prototypes\_NF\Entities\Objects\Weapons\Guns\Projectiles\magic.yml - type: entity parent: BaseWeaponTurret id: BloodCultTurret diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/syndicatemob.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/syndicatemob.yml index 8a7e4a2e544..ed68256edf0 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/syndicatemob.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/syndicatemob.yml @@ -1,16 +1,21 @@ - type: entity name: Syndicate Naval Agent abstract: true + noSpawn: true # parent: BaseMobHuman parent: MobHumanoidHostileBase id: MobSyndicateNavalBase components: + - type: Body + prototype: HumanSyntheticOrgans # New set of synthetic organs grants elevated resistance to toxins and poisons + requiredLegs: 2 - type: NpcFactionMember factions: - Syndicate - type: AutoImplant implants: - DeathRattleImplant + - DeathAcidifierImplantNF # - DeathAcidifierImplant # - MicroBombImplant - type: RechargeBasicEntityAmmo @@ -19,25 +24,27 @@ path: /Audio/_NF/Effects/silence.ogg - type: Advertise pack: syndicatehumanoidchatter - minimumWait: 120 # 1 * 2 - maximumWait: 240 # 2 * 60 - NextAdvertisementTime: 0 + minimumWait: 20 + maximumWait: 120 # 2 * 60 + NextAdvertisementTime: 5 - type: Buckle disable: true - type: AutoWakeUp # Humans +# Syndicate Captain, "armed" with AP Python - type: entity name: Syndicate Captain parent: MobSyndicateNavalBase - id: MobSyndicateNavalCaptain + id: MobSyndicateNavalCaptainA + noSpawn: true components: - type: Loadout prototypes: - - SyndicateNavalCaptainGear + - SyndicateNavalCaptainGearA - type: Reflect enabled: true - reflectProb: .5 + reflectProb: .05 spread: 90 - type: RechargeBasicEntityAmmo rechargeCooldown: 0.75 @@ -55,20 +62,64 @@ - SemiAuto soundGunshot: /Audio/Weapons/Guns/Gunshots/revolver.ogg +- type: entity + name: Syndicate Captain + parent: MobSyndicateNavalCaptainA + id: MobSyndicateNavalCaptainB + noSpawn: true + components: + - type: Loadout + prototypes: + - SyndicateNavalCaptainGearB + - type: BasicEntityAmmoProvider + proto: BulletMagnum + capacity: 1 + count: 1 + +- type: entity + name: Syndicate Captain + parent: MobSyndicateNavalCaptainA + id: MobSyndicateNavalCaptainC + noSpawn: true + components: + - type: Loadout + prototypes: + - SyndicateNavalCaptainGearC + - type: BasicEntityAmmoProvider + proto: BulletMagnum + capacity: 1 + count: 1 + +- type: entity + name: Syndicate Captain + parent: MobSyndicateNavalCaptainA + id: MobSyndicateNavalCaptainD + noSpawn: true + components: + - type: Loadout + prototypes: + - SyndicateNavalCaptainGearD + - type: BasicEntityAmmoProvider + proto: BulletMagnum + capacity: 1 + count: 1 + +# Syndicate Engineer, "armed" with shotgun - type: entity name: Syndicate Engineer parent: MobSyndicateNavalBase - id: MobSyndicateNavalEngineer + id: MobSyndicateNavalEngineerA + noSpawn: true components: - type: Loadout prototypes: - - SyndicateNavalEngineerGear + - SyndicateNavalEngineerGearA - type: RechargeBasicEntityAmmo rechargeCooldown: 2 rechargeSound: path: /Audio/_NF/Effects/silence.ogg - type: BasicEntityAmmoProvider - proto: PelletShotgun + proto: ShellShotgunSlug capacity: 1 count: 1 - type: Gun @@ -79,20 +130,61 @@ - SemiAuto soundGunshot: /Audio/Weapons/Guns/Gunshots/shotgun.ogg +- type: entity + name: Syndicate Engineer + parent: MobSyndicateNavalEngineerA + id: MobSyndicateNavalEngineerB + noSpawn: true + components: + - type: Loadout + prototypes: + - SyndicateNavalEngineerGearB + - type: BasicEntityAmmoProvider + proto: ShellShotgun + capacity: 1 + count: 1 + +- type: entity + name: Syndicate Engineer + parent: MobSyndicateNavalEngineerB + id: MobSyndicateNavalEngineerC + noSpawn: true + components: + - type: Loadout + prototypes: + - SyndicateNavalEngineerGearC + +- type: entity + name: Syndicate Engineer + parent: MobSyndicateNavalEngineerB + id: MobSyndicateNavalEngineerD + noSpawn: true + components: + - type: Loadout + prototypes: + - SyndicateNavalEngineerGearD + - type: BasicEntityAmmoProvider + proto: PelletShotgunBeanbag + capacity: 1 + count: 1 + +# Syndicate "Medic", throws poisoned darts laced with 2u of Impedrezene (hallucinogenic, deals minor poison damage, makes you barf and slows you down) +# Look for darts here: \Resources\Prototypes\_NF\Entities\Objects\Weapons\Throwable\throwable_weapons.yml - type: entity name: Syndicate Medic parent: MobSyndicateNavalBase - id: MobSyndicateNavalMedic + id: MobSyndicateNavalMedicA + noSpawn: true components: - type: Loadout prototypes: - - SyndicateNavalMedicGear + - SyndicateNavalMedicGearA - type: RechargeBasicEntityAmmo - rechargeCooldown: 4 + rechargeCooldown: 2 rechargeSound: path: /Audio/_NF/Effects/silence.ogg - type: BasicEntityAmmoProvider - proto: DartSindicateTranquilizer + proto: DartSindicateImpedrezene capacity: 1 count: 1 - type: Gun @@ -104,14 +196,54 @@ soundGunshot: collection: BulletMiss +- type: entity + name: Syndicate Medic + parent: MobSyndicateNavalMedicA + id: MobSyndicateNavalMedicB + noSpawn: true + components: + - type: Loadout + prototypes: + - SyndicateNavalMedicGearB + +- type: entity + name: Syndicate Medic + parent: MobSyndicateNavalMedicA + id: MobSyndicateNavalMedicC + noSpawn: true + components: + - type: Loadout + prototypes: + - SyndicateNavalMedicGearB + - type: BasicEntityAmmoProvider + proto: DartSindicateTranquilizer + capacity: 1 + count: 1 + +- type: entity + name: Syndicate Medic + parent: MobSyndicateNavalMedicA + id: MobSyndicateNavalMedicD + noSpawn: true + components: + - type: Loadout + prototypes: + - SyndicateNavalMedicGearD + - type: BasicEntityAmmoProvider + proto: DartSindicateTranquilizer + capacity: 1 + count: 1 + +# Second Officer, "armed" with Advanced Laser Pistol - type: entity name: Syndicate Second Officer parent: MobSyndicateNavalBase - id: MobSyndicateNavalSecondOfficer + id: MobSyndicateNavalSecondOfficerA + noSpawn: true components: - type: Loadout prototypes: - - SyndicateNavalSecondOfficerGear + - SyndicateNavalSecondOfficerGearA - type: HitscanBatteryAmmoProvider proto: RedMediumLaser fireCost: 100 @@ -130,41 +262,108 @@ soundGunshot: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg - type: entity - name: Syndicate Operator + name: Syndicate Second Officer + parent: MobSyndicateNavalSecondOfficerA + id: MobSyndicateNavalSecondOfficerB + noSpawn: true + components: + - type: Loadout + prototypes: + - SyndicateNavalSecondOfficerGearB + +- type: entity + name: Syndicate Second Officer + parent: MobSyndicateNavalSecondOfficerA + id: MobSyndicateNavalSecondOfficerC + noSpawn: true + components: + - type: Loadout + prototypes: + - SyndicateNavalSecondOfficerGearC + +- type: entity + name: Syndicate Second Officer + parent: MobSyndicateNavalSecondOfficerA + id: MobSyndicateNavalSecondOfficerD + noSpawn: true + components: + - type: Loadout + prototypes: + - SyndicateNavalSecondOfficerGearD + - type: HitscanBatteryAmmoProvider + proto: RedLaser + fireCost: 50 + +# Syndicate Security Operative, "armed" with Atreides SMG +- type: entity + name: Syndicate Operative parent: MobSyndicateNavalBase - id: MobSyndicateNavalOperator + id: MobSyndicateNavalOperatorA + noSpawn: true components: - type: Loadout prototypes: - - SyndicateNavalOperatorGear + - SyndicateNavalOperatorGearA - type: RechargeBasicEntityAmmo - rechargeCooldown: 0.5 + rechargeCooldown: 1.5 rechargeSound: path: /Audio/_NF/Effects/silence.ogg - type: BasicEntityAmmoProvider proto: BulletPistol - capacity: 10 - count: 10 + capacity: 8 + count: 8 - type: Gun useKey: false - minAngle: 2 - maxAngle: 16 - fireRate: 10 + minAngle: 10 + maxAngle: 30 + fireRate: 8 angleIncrease: 3 - angleDecay: 16 + angleDecay: 6 selectedMode: FullAuto availableModes: - FullAuto soundGunshot: /Audio/Weapons/Guns/Gunshots/smg.ogg +- type: entity + name: Syndicate Operative + parent: MobSyndicateNavalOperatorA + id: MobSyndicateNavalOperatorB + noSpawn: true + components: + - type: Loadout + prototypes: + - SyndicateNavalOperatorGearB + +- type: entity + name: Syndicate Operative + parent: MobSyndicateNavalOperatorA + id: MobSyndicateNavalOperatorC + noSpawn: true + components: + - type: Loadout + prototypes: + - SyndicateNavalOperatorGearC + +- type: entity + name: Syndicate Operative + parent: MobSyndicateNavalOperatorA + id: MobSyndicateNavalOperatorD + noSpawn: true + components: + - type: Loadout + prototypes: + - SyndicateNavalOperatorGearD + +# Syndicate Grenadier, "armed" with china lake - type: entity name: Syndicate Grenadier parent: MobSyndicateNavalBase - id: MobSyndicateNavalGrenadier + id: MobSyndicateNavalGrenadierA + noSpawn: true components: - type: Loadout prototypes: - - SyndicateNavalGrenadierGear + - SyndicateNavalGrenadierGearA - type: AutoImplant implants: - DeathAcidifierImplantNF @@ -184,14 +383,58 @@ - SemiAuto soundGunshot: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg +- type: entity + name: Syndicate Grenadier + parent: MobSyndicateNavalGrenadierA + id: MobSyndicateNavalGrenadierB + noSpawn: true + components: + - type: Loadout + prototypes: + - SyndicateNavalGrenadierGearB + - type: BasicEntityAmmoProvider + proto: GrenadeBlast + capacity: 1 + count: 1 + +- type: entity + name: Syndicate Grenadier + parent: MobSyndicateNavalGrenadierA + id: MobSyndicateNavalGrenadierC + noSpawn: true + components: + - type: Loadout + prototypes: + - SyndicateNavalGrenadierGearC + - type: BasicEntityAmmoProvider + proto: GrenadeBaton + capacity: 1 + count: 1 + +- type: entity + name: Syndicate Grenadier + parent: MobSyndicateNavalGrenadierA + id: MobSyndicateNavalGrenadierD + noSpawn: true + components: + - type: Loadout + prototypes: + - SyndicateNavalGrenadierGearD + - type: BasicEntityAmmoProvider + proto: GrenadeFlash + capacity: 2 + count: 2 + +# Syndicate Saboteur, "armed" with EMP Viper - type: entity name: Syndicate Saboteur parent: MobSyndicateNavalBase - id: MobSyndicateNavalSaboteur + id: MobSyndicateNavalSaboteurA + noSpawn: true components: - type: Loadout prototypes: - - SyndicateNavalSaboteurGear + - SyndicateNavalSaboteurGearA - type: RechargeBasicEntityAmmo rechargeCooldown: 1 rechargeSound: @@ -209,6 +452,37 @@ - SemiAuto soundGunshot: /Audio/Weapons/Guns/Gunshots/pistol.ogg +- type: entity + name: Syndicate Saboteur + parent: MobSyndicateNavalSaboteurA + id: MobSyndicateNavalSaboteurB + noSpawn: true + components: + - type: Loadout + prototypes: + - SyndicateNavalSaboteurGearB + +- type: entity + name: Syndicate Saboteur + parent: MobSyndicateNavalSaboteurA + id: MobSyndicateNavalSaboteurC + noSpawn: true + components: + - type: Loadout + prototypes: + - SyndicateNavalSaboteurGearC + +- type: entity + name: Syndicate Saboteur + parent: MobSyndicateNavalSaboteurA + id: MobSyndicateNavalSaboteurD + noSpawn: true + components: + - type: Loadout + prototypes: + - SyndicateNavalSaboteurGearD + +# Hostile Victim of Experimentation, "armed" with shiv - type: entity name: Captive #Victim of Experimentation parent: MobHumanoidHostileBase @@ -216,6 +490,7 @@ # - MobFlammable # - BaseMobSpecies id: MobExperimentationVictim + noSpawn: true components: - type: NameIdentifier group: GenericNumber @@ -231,14 +506,16 @@ rootTask: task: SimpleHumanoidHostileCompound +# Syndicate Commander, "armed" with AK - type: entity name: Syndicate Commander # Mega Fauna for Dungeons parent: MobSyndicateNavalBase - id: MobSyndicateNavalCommander + id: MobSyndicateNavalCommanderA + noSpawn: true components: - type: Loadout prototypes: - - SyndicateNavalCommanderGear + - SyndicateNavalCommanderGearA - type: Stamina critThreshold: 500 # Extra hard to incapacitate and loot - type: AutoImplant @@ -246,7 +523,7 @@ - DeathRattleImplant - DeathAcidifierImplantNF - type: RechargeBasicEntityAmmo - rechargeCooldown: 0.5 + rechargeCooldown: 1.5 rechargeSound: path: /Audio/_NF/Effects/silence.ogg - type: BasicEntityAmmoProvider @@ -261,14 +538,57 @@ - SemiAuto soundGunshot: /Audio/Weapons/Guns/Gunshots/rifle2.ogg +- type: entity + name: Syndicate Commander + parent: MobSyndicateNavalCommanderA + id: MobSyndicateNavalCommanderB + noSpawn: true + components: + - type: Loadout + prototypes: + - SyndicateNavalCommanderGearB + - type: BasicEntityAmmoProvider + proto: CartridgeRifle + capacity: 4 + count: 4 + - type: Gun + fireRate: 5 + useKey: false + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg + +- type: entity + name: Syndicate Commander + parent: MobSyndicateNavalCommanderB + id: MobSyndicateNavalCommanderC + noSpawn: true + components: + - type: Loadout + prototypes: + - SyndicateNavalCommanderGearC + +- type: entity + name: Syndicate Commander + parent: MobSyndicateNavalCommanderB + id: MobSyndicateNavalCommanderD + noSpawn: true + components: + - type: Loadout + prototypes: + - SyndicateNavalCommanderGearD + +# Syndicate Deckhand, "armed" with Viper - type: entity name: Syndicate Deckhand parent: MobSyndicateNavalBase - id: MobSyndicateNavalDeckhand + id: MobSyndicateNavalDeckhandA + noSpawn: true components: - type: Loadout prototypes: - - SyndicateNavalDeckhandGear + - SyndicateNavalDeckhandGearA - type: RechargeBasicEntityAmmo rechargeCooldown: 1 rechargeSound: @@ -285,3 +605,123 @@ - FullAuto - SemiAuto soundGunshot: /Audio/Weapons/Guns/Gunshots/pistol.ogg + +- type: entity + name: Syndicate Deckhand + parent: MobSyndicateNavalDeckhandA + id: MobSyndicateNavalDeckhandB + noSpawn: true + components: + - type: Loadout + prototypes: + - SyndicateNavalDeckhandGearB + +- type: entity + name: Syndicate Deckhand + parent: MobSyndicateNavalDeckhandA + id: MobSyndicateNavalDeckhandC + noSpawn: true + components: + - type: Loadout + prototypes: + - SyndicateNavalDeckhandGearC + +- type: entity + name: Syndicate Deckhand + parent: MobSyndicateNavalDeckhandA + id: MobSyndicateNavalDeckhandD + noSpawn: true + components: + - type: Loadout + prototypes: + - SyndicateNavalDeckhandGearD + +# Syndicate Mime, melee, "armed" with chainsaw +- type: entity + name: Syndicate Mime + parent: MobSyndicateNavalBase + id: MobSyndicateNavalMime + noSpawn: true + components: + - type: Loadout + prototypes: + - SyndicateNavalMimeGear + - type: Stamina + critThreshold: 500 # Extra hard to incapacitate and loot + - type: MovementSpeedModifier + baseWalkSpeed: 4 + baseSprintSpeed: 6 + - type: Advertise + pack: mimehumanoidchatter + minimumWait: 120 # 1 * 2 + maximumWait: 240 # 2 * 60 + NextAdvertisementTime: 0 + +# Syndicate Chemwarrior, shoots healthy mixes of chems +# Look for chems here: \Resources\Prototypes\_NF\Entities\Objects\Weapons\Ammunition\Projectiles\chem.yml +- type: entity + name: Syndicate ChemwarriorA + parent: MobSyndicateNavalBase + id: MobSyndicateNavalChemwarriorA + noSpawn: true + components: + - type: Loadout + prototypes: + - SyndicateNavalChemwarriorGearA + - type: RechargeBasicEntityAmmo + rechargeCooldown: 2 + rechargeSound: + path: /Audio/_NF/Effects/silence.ogg + - type: BasicEntityAmmoProvider + proto: SplatterChemCold + capacity: 3 + count: 3 + - type: Gun + fireRate: 4 + useKey: false + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: /Audio/Weapons/Guns/Gunshots/water_spray.ogg + +- type: entity + name: Syndicate ChemwarriorB + parent: MobSyndicateNavalChemwarriorA + id: MobSyndicateNavalChemwarriorB + noSpawn: true + components: + - type: Loadout + prototypes: + - SyndicateNavalChemwarriorGearB + - type: BasicEntityAmmoProvider + proto: SplatterChemDrugs + capacity: 1 + count: 1 + +- type: entity + name: Syndicate ChemwarriorC + parent: MobSyndicateNavalChemwarriorA + id: MobSyndicateNavalChemwarriorC + noSpawn: true + components: + - type: Loadout + prototypes: + - SyndicateNavalChemwarriorGearC + - type: BasicEntityAmmoProvider + proto: SplatterChemMute + capacity: 1 + count: 1 + +- type: entity + name: Syndicate ChemwarriorD + parent: MobSyndicateNavalChemwarriorA + id: MobSyndicateNavalChemwarriorD + noSpawn: true + components: + - type: Loadout + prototypes: + - SyndicateNavalChemwarriorGearD + - type: BasicEntityAmmoProvider + proto: SplatterChemWeh + capacity: 1 + count: 1 diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/wizardfederationmob.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/wizardfederationmob.yml index e43a3f7272b..29f8504def0 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/wizardfederationmob.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/wizardfederationmob.yml @@ -4,6 +4,7 @@ abstract: true parent: - MobHumanoidHostileBase + - MobPassiveRegen id: MobWizFedlBase components: - type: NpcFactionMember @@ -15,10 +16,10 @@ path: /Audio/_NF/Effects/silence.ogg - type: AutoImplant implants: - - DeathAcidifierImplant + - DeathAcidifierImplantNF - type: Reflect enabled: true - reflectProb: .25 + reflectProb: .35 spread: 90 # Immunity to Heat damage from being lit on fire - type: Flammable @@ -41,8 +42,11 @@ minimumWait: 120 # 1 * 2 maximumWait: 240 # 2 * 60 NextAdvertisementTime: 0 + - type: AutoWakeUp + - type: MovementAlwaysTouching # Humans +# Blue Wizard, summons 2 Blue Curacao Elementals - type: entity name: Blue Wizard parent: MobWizFedlBase @@ -64,6 +68,8 @@ rechargeSound: path: /Audio/_NF/Effects/silence.ogg +# Red Wizard, shoots magic bolts that put targets on fire (2 heat damage, 2 fire stacks) +# Look for magic bolt here:\Resources\Prototypes\_NF\Entities\Objects\Weapons\Guns\Projectiles\magic.yml - type: entity name: Red Wizard parent: MobWizFedlBase @@ -101,6 +107,8 @@ soundGunshot: path: /Audio/Magic/fireball.ogg +# Violet Wizard, shoots asphyxiation magic bolts (4 bloodloss, 4 asphyxiation) +# Look for magic bolt here:\Resources\Prototypes\_NF\Entities\Objects\Weapons\Guns\Projectiles\magic.yml - type: entity name: Violet Wizard parent: MobWizFedlBase @@ -122,6 +130,8 @@ rechargeSound: path: /Audio/_NF/Effects/silence.ogg +# Soap Wizard, summons soap to slip targets +# Look for soap here: \Resources\Prototypes\_NF\Entities\Objects\Specific\Wizard\conjured_items.yml - type: entity name: Soap Wizard suffix: AI @@ -189,6 +199,7 @@ - MobNonHumanHostileBase id: WaterElementalConjured components: + - type: MovementAlwaysTouching - type: NoSlip - type: NpcFactionMember factions: diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Wizard/conjured_items.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Wizard/conjured_items.yml index c1c635d55e9..f733bcf09eb 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Specific/Wizard/conjured_items.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/Wizard/conjured_items.yml @@ -3,7 +3,7 @@ id: ConjuredObject10 suffix: Conjured abstract: true - description: A magically created object, that'll vanish from existance eventually. + description: A magically created entity, that'll vanish from existence eventually. components: - type: TimedDespawn lifetime: 10 @@ -13,6 +13,7 @@ name: soap id: SoapConjured parent: + - BaseBullet - Soap - ConjuredObject10 components: @@ -26,11 +27,35 @@ maxFillLevels: 4 fillBaseName: soap- changeColor: false -# - type: Item -# heldPrefix: conjured + - type: Fixtures + fixtures: + fix1: + shape: !type:PhysShapeCircle + radius: 0.2 + density: 5 + mask: + - ItemMask + restitution: 0.3 + friction: 0.2 + projectile: + shape: + !type:PhysShapeAabb + bounds: "-0.1,-0.1,0.1,0.1" + hard: false + mask: + - Impassable + - BulletImpassable - type: Ammo muzzleFlash: null + - type: Projectile + deleteOnCollide: false + onlyCollideWhenShot: true + damage: + types: + Blunt: 9 # 12 hits to crit unarmored target + - type: StaminaDamageOnCollide + damage: 10 # 6 hits to slow, 10 hits to stun - type: PointLight color: MediumPurple - radius: 1 + radius: 1.5 softness: 1 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Projectiles/chem.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Projectiles/chem.yml new file mode 100644 index 00000000000..41390102583 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Projectiles/chem.yml @@ -0,0 +1,130 @@ +# Syndicate Chemwarrior Projectiles +- type: entity +# parent: BaseBulletPractice + parent: BulletWaterShot + id: SplatterChemBase + name: chemical splatter + noSpawn: true + components: + - type: Ammo + muzzleFlash: null + - type: TimedDespawn + lifetime: 10 + - type: Projectile + damage: + types: + Blunt: 0 + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/water_shot.rsi + layers: + - state: icon + map: ["enum.VaporVisualLayers.Base"] + - type: SolutionContainerManager + solutions: + vapor: + maxVol: 50 + canReact: false + - type: RefillableSolution + solution: vapor + - type: DrainableSolution + solution: vapor + - type: SolutionInjectOnCollide + transferAmount: 50 + blockSlots: NONE # can't be blocked by clothing + - type: InjectableSolution + solution: vapor + - type: Vapor + active: true + - type: Appearance + - type: VaporVisuals + +- type: entity + parent: SplatterChemBase + id: SplatterChemPhlogNapalm + name: chemical splatter + noSpawn: true + components: + - type: SolutionContainerManager + solutions: + vapor: + maxVol: 50 + canReact: false + reagents: + - ReagentId: Napalm + Quantity: 1 + - ReagentId: Phlogiston + Quantity: 1 + - ReagentId: ChlorineTrifluoride + Quantity: 1 + - ReagentId: Laughter + Quantity: 4 + +- type: entity + parent: SplatterChemBase + id: SplatterChemDrugs + name: chemical splatter + noSpawn: true + components: + - type: SolutionContainerManager + solutions: + vapor: + maxVol: 50 + canReact: false + reagents: + - ReagentId: THC + Quantity: 5 + - ReagentId: PolytrinicAcid + Quantity: 1 + - ReagentId: Razorium + Quantity: 1 + +- type: entity + parent: SplatterChemBase + id: SplatterChemMute + name: chemical splatter + noSpawn: true + components: + - type: SolutionContainerManager + solutions: + vapor: + maxVol: 50 + canReact: false + reagents: + - ReagentId: MuteToxin + Quantity: 4 + - ReagentId: PolytrinicAcid + Quantity: 1 + - ReagentId: ChloralHydrate + Quantity: 1 + +- type: entity + parent: SplatterChemBase + id: SplatterChemWeh + name: chemical splatter + noSpawn: true + components: + - type: SolutionContainerManager + solutions: + vapor: + maxVol: 50 + canReact: false + reagents: + - ReagentId: JuiceThatMakesYouWeh + Quantity: 5 # 50u in bloodstream required to turn victim into a lizard + - ReagentId: Licoxide + Quantity: 1 + +- type: entity + parent: SplatterChemBase + id: SplatterChemCold + name: chemical splatter + noSpawn: true + components: + - type: SolutionContainerManager + solutions: + vapor: + maxVol: 50 + canReact: false + reagents: + - ReagentId: Fresium + Quantity: 7 # needs 40u in bloodstream for special effect diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Projectiles/crossbow_bolts.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Projectiles/crossbow_bolts.yml index f9725f60b7d..45aa58cac3a 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Projectiles/crossbow_bolts.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Projectiles/crossbow_bolts.yml @@ -113,9 +113,12 @@ node: CraftCrossbowBoltUraniumGlassShard - type: entity - parent: CrossbowBolt + parent: + - CrossbowBolt + - ConjuredObject10 # Despawns in 10 seconds id: CrossbowBoltBloodDrinker name: blood drinker bolt + description: A razor-sharp bolt with a serrated tip. Unquestionably unethical. components: - type: Sprite layers: @@ -131,7 +134,5 @@ - type: Projectile damage: types: - Slashing: 25 + Slashing: 20 Bloodloss: 5 - - type: TimedDespawn - lifetime: 10 \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Projectiles/magic.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Projectiles/magic.yml new file mode 100644 index 00000000000..2fe3197f16c --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Projectiles/magic.yml @@ -0,0 +1,73 @@ +- type: entity + parent: BaseBulletTrigger + id: BulletFireBolt + name: fire bolt + noSpawn: true + components: + - type: Projectile + damage: + types: + Heat: 2 + - type: Sprite + noRot: false + sprite: Objects/Weapons/Guns/Projectiles/magic.rsi + layers: + - state: infernoshot + - type: Ammo + muzzleFlash: null + - type: IgniteOnCollide + fireStacks: 2 + +- type: entity + parent: BaseBulletTrigger + id: BulletMagicBolt + name: magic bolt + noSpawn: true + components: + - type: Projectile + damage: + types: + Bloodloss: 4 + Asphyxiation: 4 + - type: Sprite + noRot: false + sprite: Objects/Weapons/Guns/Projectiles/magic.rsi + layers: + - state: arcane_barrage + - type: Ammo + muzzleFlash: null + +- type: entity + parent: BaseBulletTrigger + id: BulletBloodCultDarkBolt + name: blood bolt + noSpawn: true + components: + - type: Projectile + damage: + types: + Bloodloss: 2 + Slash: 5 + - type: Sprite + noRot: false + sprite: Objects/Weapons/Guns/Projectiles/magic.rsi + color: red + layers: + - state: arcane_barrage + - type: Ammo + muzzleFlash: null + +- type: hitscan + id: BloodCultLaser + damage: + types: + Slash: 10 + muzzleFlash: + sprite: _NF/Effects/bloodcultbeams.rsi + state: red_lightning + travelFlash: + sprite: _NF/Effects/bloodcultbeams.rsi + state: red_lightning + impactFlash: + sprite: _NF/Effects/bloodcultbeams.rsi + state: red_lightning diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/wizard_staff.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/wizard_staff.yml index 73986ae96b2..e30e0863509 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/wizard_staff.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/wizard_staff.yml @@ -21,6 +21,7 @@ - type: Tag tags: - WizardStaff + - type: Contraband - type: entity name: red wizard staff @@ -31,6 +32,7 @@ heldPrefix: animation - type: Sprite state: animation + - type: Contraband - type: entity name: violet wizard staff @@ -41,6 +43,7 @@ heldPrefix: chaos - type: Sprite state: chaos + - type: Contraband - type: entity name: soap wizard staff @@ -51,6 +54,7 @@ heldPrefix: healing - type: Sprite state: healing + - type: Contraband # Blood Cult - type: entity @@ -68,3 +72,4 @@ animation: WeaponArcThrust soundHit: path: /Audio/Effects/bite.ogg + - type: Contraband diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Throwable/trowable_weapons.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Throwable/throwable_weapons.yml similarity index 55% rename from Resources/Prototypes/_NF/Entities/Objects/Weapons/Throwable/trowable_weapons.yml rename to Resources/Prototypes/_NF/Entities/Objects/Weapons/Throwable/throwable_weapons.yml index 6363bb6c8b5..a780c0e20b0 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Throwable/trowable_weapons.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Throwable/throwable_weapons.yml @@ -1,8 +1,11 @@ - type: entity - parent: Dart - id: DartSindicateTranquilizer - name: Syndicate Tranquilizer Dart + parent: + - Dart + - ConjuredObject10 # Despawns in 10 seconds + id: DartSindicateImpedrezene + name: syndicate impedrezene dart description: Try not to prick yourself. + noSpawn: true components: - type: Sprite sprite: Objects/Fun/Darts/dart_red.rsi @@ -10,8 +13,6 @@ - type: EmbeddableProjectile removalTime: 0.5 sound: /Audio/Weapons/star_hit.ogg - - type: TimedDespawn - lifetime: 10 - type: DamageOtherOnHit damage: types: @@ -28,7 +29,24 @@ - type: DrainableSolution solution: ammo - type: SolutionInjectOnCollide - transferAmount: 4 + transferAmount: 2 blockSlots: NONE #tranquillizer darts shouldn't be blocked by a mask - type: InjectableSolution solution: ammo + +- type: entity # 4 hits to KO a spaceman + parent: DartSindicateImpedrezene + id: DartSindicateTranquilizer + name: syndicate tranquilizer dart + noSpawn: true + components: + - type: SolutionContainerManager + solutions: + ammo: + maxVol: 3 + reagents: + - ReagentId: ChloralHydrate + Quantity: 3 + - type: SolutionInjectOnCollide + transferAmount: 3 + blockSlots: NONE #tranquillizer darts shouldn't be blocked by a mask diff --git a/Resources/Prototypes/_NF/Entities/Spawners/syndicatemobs.yml b/Resources/Prototypes/_NF/Entities/Spawners/syndicatemobs.yml index edff85579c4..714667eac68 100644 --- a/Resources/Prototypes/_NF/Entities/Spawners/syndicatemobs.yml +++ b/Resources/Prototypes/_NF/Entities/Spawners/syndicatemobs.yml @@ -2,102 +2,245 @@ name: Syndicate Naval Captain Spawner id: SpawnMobSyndicateNavalCaptain parent: MarkerBase + suffix: AI, Hostile, RND components: - type: Sprite layers: - state: red - state: ai - - type: ConditionalSpawner + - sprite: Mobs/Species/Human/parts.rsi + state: full + - sprite: Clothing/Head/Hats/syndiecap_maa.rsi + state: equipped-HELMET + - sprite: Clothing/Uniforms/Jumpsuit/tacticool.rsi + state: equipped-INNERCLOTHING + - sprite: Clothing/Shoes/Boots/jackboots.rsi + state: equipped-FEET + - sprite: Clothing/OuterClothing/Coats/syndicate/coatsyndiecaparmored.rsi + state: equipped-OUTERCLOTHING + - sprite: Objects/Weapons/Guns/Revolvers/python.rsi + state: inhand-left + - sprite: _NF/Objects/Weapons/Melee/armingsword.rsi + state: inhand-right + - type: RandomSpawner prototypes: - - MobSyndicateNavalCaptain + - MobSyndicateNavalCaptainB + - MobSyndicateNavalCaptainC + - MobSyndicateNavalCaptainD + rarePrototypes: + - MobSyndicateNavalCaptainA + rareChance: 0.1 - type: entity name: Syndicate Naval Engineer Spawner id: SpawnMobSyndicateNavalEngineer parent: MarkerBase + suffix: AI, Hostile, RND components: - type: Sprite layers: - state: red - state: ai - - type: ConditionalSpawner + - sprite: Mobs/Species/Human/parts.rsi + state: full + - sprite: Clothing/Head/Hats/syndiecap.rsi + state: equipped-HELMET + - sprite: Clothing/Uniforms/Jumpsuit/repairman_syndie.rsi + state: equipped-INNERCLOTHING + - sprite: Clothing/Shoes/Boots/jackboots.rsi + state: equipped-FEET + - sprite: Objects/Weapons/Guns/Shotguns/db_shotgun.rsi + state: inhand-left + - sprite: Objects/Tools/Toolboxes/toolbox_syn.rsi + state: inhand-right + - type: RandomSpawner prototypes: - - MobSyndicateNavalEngineer + - MobSyndicateNavalEngineerB + - MobSyndicateNavalEngineerC + - MobSyndicateNavalEngineerD + rarePrototypes: + - MobSyndicateNavalEngineerA + rareChance: 0.1 - type: entity name: Syndicate Naval Medic Spawner id: SpawnMobSyndicateNavalMedic parent: MarkerBase + suffix: AI, Hostile, RND components: - type: Sprite layers: - state: red - state: ai - - type: ConditionalSpawner + - sprite: Mobs/Species/Human/parts.rsi + state: full + - sprite: Clothing/Head/Hats/syndiecap.rsi + state: equipped-HELMET + - sprite: Clothing/Uniforms/Jumpsuit/tacticool.rsi + state: equipped-INNERCLOTHING + - sprite: Clothing/Shoes/Boots/jackboots.rsi + state: equipped-FEET + - sprite: Clothing/OuterClothing/Coats/brigmedic.rsi + state: equipped-OUTERCLOTHING + - sprite: Objects/Specific/Medical/Surgery/scalpel.rsi + state: inhand-left + - sprite: Objects/Specific/Medical/Surgery/saw.rsi + state: advanced-inhand-right + - type: RandomSpawner prototypes: - - MobSyndicateNavalMedic + - MobSyndicateNavalMedicB + - MobSyndicateNavalMedicC + - MobSyndicateNavalMedicD + rarePrototypes: + - MobSyndicateNavalMedicA + rareChance: 0.1 - type: entity name: Syndicate Naval Second Officer Spawner id: SpawnMobSyndicateNavalSecondOfficer parent: MarkerBase + suffix: AI, Hostile, RND components: - type: Sprite layers: - state: red - state: ai - - type: ConditionalSpawner + - sprite: Mobs/Species/Human/parts.rsi + state: full + - sprite: Clothing/Head/Hats/syndiecap.rsi + state: equipped-HELMET + - sprite: Clothing/Uniforms/Jumpsuit/recruit_syndie.rsi + state: equipped-INNERCLOTHING + - sprite: Clothing/Shoes/Boots/jackboots.rsi + state: equipped-FEET + - sprite: Clothing/OuterClothing/Armor/security_slim.rsi + state: equipped-OUTERCLOTHING + - sprite: Objects/Weapons/Guns/Battery/advancedlasergun.rsi + state: inhand-left + - sprite: Objects/Weapons/Melee/cutlass.rsi + state: inhand-right + - type: RandomSpawner prototypes: - - MobSyndicateNavalSecondOfficer + - MobSyndicateNavalSecondOfficerB + - MobSyndicateNavalSecondOfficerC + - MobSyndicateNavalSecondOfficerD + rarePrototypes: + - MobSyndicateNavalSecondOfficerA + rareChance: 0.1 - type: entity name: Syndicate Naval Operator Spawner id: SpawnMobSyndicateNavalOperator parent: MarkerBase + suffix: AI, Hostile, RND components: - type: Sprite layers: - state: red - state: ai - - type: ConditionalSpawner + - sprite: Mobs/Species/Human/parts.rsi + state: full + - sprite: Clothing/Head/Helmets/swat_syndicate.rsi + state: equipped-HELMET + - sprite: Clothing/Uniforms/Jumpsuit/tacticool.rsi + state: equipped-INNERCLOTHING + - sprite: Clothing/Shoes/Boots/jackboots.rsi + state: equipped-FEET + - sprite: Clothing/OuterClothing/Armor/bulletproof.rsi + state: equipped-OUTERCLOTHING + - sprite: Objects/Weapons/Guns/SMGs/atreides.rsi + state: inhand-left + - sprite: Objects/Weapons/Melee/kukri_knife.rsi + state: inhand-right + - type: RandomSpawner prototypes: - - MobSyndicateNavalOperator + - MobSyndicateNavalOperatorB + - MobSyndicateNavalOperatorC + - MobSyndicateNavalOperatorD + rarePrototypes: + - MobSyndicateNavalOperatorA + rareChance: 0.1 - type: entity name: Syndicate Naval Grenadier Spawner id: SpawnMobSyndicateNavalGrenadier parent: MarkerBase + suffix: AI, Hostile, RND components: - type: Sprite layers: - state: red - state: ai - - type: ConditionalSpawner + - sprite: Mobs/Species/Human/parts.rsi + state: full + - sprite: Clothing/Uniforms/Jumpsuit/tacticool.rsi + state: equipped-INNERCLOTHING + - sprite: Clothing/Shoes/Boots/jackboots.rsi + state: equipped-FEET + - sprite: _NF/Clothing/OuterClothing/Suits/syndicate_bombsuit.rsi + state: equipped-OUTERCLOTHING + - sprite: _NF/Clothing/Head/Helmets/syndicate_bombsuit.rsi + state: equipped-HELMET + - sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi + state: inhand-left + - type: RandomSpawner prototypes: - - MobSyndicateNavalGrenadier + - MobSyndicateNavalGrenadierB + - MobSyndicateNavalGrenadierC + - MobSyndicateNavalGrenadierD + rarePrototypes: + - MobSyndicateNavalGrenadierA + rareChance: 0.1 - type: entity name: Syndicate Naval Saboteur Spawner id: SpawnMobSyndicateNavalSaboteur parent: MarkerBase + suffix: AI, Hostile, RND components: - type: Sprite layers: - state: red - state: ai - - type: ConditionalSpawner + - sprite: Mobs/Species/Human/parts.rsi + state: full + - sprite: Clothing/Head/Hats/syndiecap.rsi + state: equipped-HELMET + - sprite: Clothing/Uniforms/Jumpsuit/tacticool.rsi + state: equipped-INNERCLOTHING + - sprite: Clothing/Shoes/Boots/jackboots.rsi + state: equipped-FEET + - sprite: Clothing/OuterClothing/Armor/bulletproof.rsi + state: equipped-OUTERCLOTHING + - sprite: Objects/Weapons/Guns/Pistols/viper.rsi + state: inhand-left + - sprite: Objects/Weapons/Melee/kukri_knife.rsi + state: inhand-right + - type: RandomSpawner prototypes: - - MobSyndicateNavalSaboteur + - MobSyndicateNavalSaboteurB + - MobSyndicateNavalSaboteurC + - MobSyndicateNavalSaboteurD + rarePrototypes: + - MobSyndicateNavalSaboteurA + rareChance: 0.1 - type: entity name: Victim of Experimentation Spawner id: SpawnMobExperimentationVictim parent: MarkerBase + suffix: AI, Hostile components: - type: Sprite layers: - state: red - state: ai + - sprite: Mobs/Species/Human/parts.rsi + state: full + - sprite: Clothing/OuterClothing/Misc/hospitalgown.rsi + state: equipped-OUTERCLOTHING + - sprite: Objects/Weapons/Melee/shiv.rsi + state: inhand-right - type: ConditionalSpawner prototypes: - MobExperimentationVictim @@ -106,24 +249,168 @@ name: Syndicate Naval Commander Spawner id: SpawnMobSyndicateNavalCommander parent: MarkerBase + suffix: AI, Hostile, RND components: - type: Sprite layers: - state: red - state: ai - - type: ConditionalSpawner + - sprite: Mobs/Species/Human/parts.rsi + state: full + - sprite: Clothing/Head/Hardsuits/syndicate.rsi + state: combat-equipped-HELMET + - sprite: Clothing/OuterClothing/Hardsuits/syndicate.rsi + state: equipped-OUTERCLOTHING + - sprite: Objects/Weapons/Guns/Rifles/ak.rsi + state: inhand-left + - sprite: Objects/Weapons/Melee/captain_sabre.rsi + state: inhand-right + - type: RandomSpawner prototypes: - - MobSyndicateNavalCommander + - MobSyndicateNavalCommanderB + - MobSyndicateNavalCommanderC + - MobSyndicateNavalCommanderD + rarePrototypes: + - MobSyndicateNavalCommanderA + rareChance: 0.1 - type: entity name: Syndicate Naval Deckhand Spawner id: SpawnMobSyndicateNavalDeckhand parent: MarkerBase + suffix: AI, Hostile, RND components: - type: Sprite layers: - state: red - state: ai + - sprite: Mobs/Species/Human/parts.rsi + state: full + - sprite: Clothing/Head/Hats/syndiecap.rsi + state: equipped-HELMET + - sprite: Clothing/Uniforms/Jumpsuit/recruit_syndie.rsi + state: equipped-INNERCLOTHING + - sprite: Clothing/Shoes/Boots/jackboots.rsi + state: equipped-FEET + - sprite: Objects/Weapons/Guns/Pistols/viper.rsi + state: inhand-left + - type: RandomSpawner + prototypes: + - MobSyndicateNavalDeckhandB + - MobSyndicateNavalDeckhandC + - MobSyndicateNavalDeckhandD + rarePrototypes: + - MobSyndicateNavalDeckhandA + rareChance: 0.1 + +- type: entity + name: syndicat + id: SpawnMobCatSyndy + parent: MarkerBase + components: + - type: Sprite + layers: + - state: red + - sprite: Mobs/Pets/cat.rsi + state: syndicat + - state: ai - type: ConditionalSpawner prototypes: - - MobSyndicateNavalDeckhand + - MobCatSyndy + +- type: entity + name: Syndicate Naval Mime Spawner + id: SpawnMobSyndicateNavalMime + parent: MarkerBase + suffix: AI, Hostile + components: + - type: Sprite + layers: + - state: red + - state: ai + - sprite: Mobs/Species/Human/parts.rsi + state: full + - sprite: Clothing/Uniforms/Jumpsuit/mime.rsi + state: equipped-INNERCLOTHING + - sprite: Clothing/Shoes/Boots/jackboots.rsi + state: equipped-FEET + - sprite: Clothing/Mask/mime.rsi + state: equipped-MASK + - sprite: Clothing/Head/Hats/beret.rsi + state: equipped-HELMET + - sprite: Objects/Weapons/Melee/chainsaw.rsi + state: wielded-inhand-right + - type: ConditionalSpawner + prototypes: + - MobSyndicateNavalMime + +- type: entity + name: Syndicate Naval Chemwarrior Spawner + id: SpawnMobSyndicateNavalChemwarrior + parent: MarkerBase + suffix: AI, Hostile, RND + components: + - type: Sprite + layers: + - state: red + - state: ai + - sprite: Mobs/Species/Human/parts.rsi + state: full + - sprite: Clothing/Uniforms/Jumpsuit/tacticool.rsi + state: equipped-INNERCLOTHING + - sprite: Clothing/Shoes/Boots/jackboots.rsi + state: equipped-FEET + - sprite: _NF/Clothing/Head/Hoods/Bio/syndicate.rsi + state: equipped-HELMET + - sprite: _NF/Clothing/OuterClothing/Bio/syndicate.rsi + state: equipped-OUTERCLOTHING + - sprite: Objects/Weapons/Guns/Basic/spraynozzle.rsi + state: inhand-left + - sprite: Objects/Weapons/Melee/uranium_spear.rsi + state: inhand-right + - type: RandomSpawner + prototypes: + - MobSyndicateNavalChemwarriorB + - MobSyndicateNavalChemwarriorC + - MobSyndicateNavalChemwarriorD + rarePrototypes: + - MobSyndicateNavalChemwarriorA + rareChance: 0.1 + +- type: entity + name: Syndicate Naval Horror Spawner + id: SpawnMobSyndicateNavalHorror + parent: MarkerBase + suffix: AI, Hostile, RND + components: + - type: Sprite + layers: + - state: red + - state: ai + - sprite: Mobs/Species/Human/parts.rsi + state: full + - sprite: Clothing/Uniforms/Jumpsuit/tacticool.rsi + state: equipped-INNERCLOTHING + - sprite: Clothing/Shoes/Boots/jackboots.rsi + state: equipped-FEET + - sprite: _NF/Clothing/Head/Hoods/Bio/syndicate.rsi + state: equipped-HELMET + - sprite: _NF/Clothing/OuterClothing/Bio/syndicate.rsi + state: equipped-OUTERCLOTHING + - sprite: Objects/Weapons/Guns/Basic/spraynozzle.rsi + state: inhand-left + - sprite: Objects/Weapons/Melee/uranium_spear.rsi + state: inhand-right + - type: RandomSpawner + prototypes: + - MobSyndicateNavalGrenadierB + - MobSyndicateNavalGrenadierC + - MobSyndicateNavalGrenadierD + - MobSyndicateNavalChemwarriorB + - MobSyndicateNavalChemwarriorC + - MobSyndicateNavalChemwarriorD + rarePrototypes: + - MobSyndicateNavalMime + - MobSyndicateNavalChemwarriorA + - MobSyndicateNavalGrenadierA + rareChance: 0.1 diff --git a/Resources/Prototypes/_NF/Events/events.yml b/Resources/Prototypes/_NF/Events/events.yml index 035524ad4ba..a39ee0a9ae6 100644 --- a/Resources/Prototypes/_NF/Events/events.yml +++ b/Resources/Prototypes/_NF/Events/events.yml @@ -170,8 +170,8 @@ startAudio: path: /Audio/Misc/notice1.ogg endAnnouncement: station-event-bluespace-syndicate-ftl-interception-end-announcement - earliestStart: 200 - minimumPlayers: 15 + earliestStart: 80 + minimumPlayers: 30 weight: 10 startDelay: 10 duration: 1800 @@ -208,8 +208,8 @@ startAudio: path: /Audio/Misc/notice1.ogg endAnnouncement: station-event-bluespace-bloodmoon-end-announcement - earliestStart: 200 - minimumPlayers: 15 + earliestStart: 80 + minimumPlayers: 30 weight: 10 startDelay: 10 duration: 1800 diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Hostile/blood_cultists.yml b/Resources/Prototypes/_NF/Roles/Jobs/Hostile/blood_cultists.yml index 230f2604931..818a06d3dd5 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Hostile/blood_cultists.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Hostile/blood_cultists.yml @@ -20,8 +20,8 @@ gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterArmorCult inhand: -# - EldritchBlade - - RitualDagger + - EldritchBlade +# - RitualDagger # Cultist (Melee) - type: startingGear @@ -42,10 +42,10 @@ head: ClothingHeadHatHoodCulthood shoes: ClothingShoesCult mask: ClothingMaskRaven - gloves: ClothingHandsGlovesCombat + gloves: ClothingHandsGlovesColorBlackCrossbow outerClothing: ClothingOuterRobesCult - back: CrossbowImprovised - belt: ClothingBeltQuiverCrossbow + back: ClothingBackpackBloodCultZealotLootA + belt: ClothingBeltQuiverCrossbowFilledBolt # Cultist (Caster) - type: startingGear diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Hostile/syndicate_naval_forces.yml b/Resources/Prototypes/_NF/Roles/Jobs/Hostile/syndicate_naval_forces.yml index af10c04d1b6..e6b7dd5f27a 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Hostile/syndicate_naval_forces.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Hostile/syndicate_naval_forces.yml @@ -1,105 +1,393 @@ # Captain - type: startingGear - id: SyndicateNavalCaptainGear + id: SyndicateNavalCaptainGearA equipment: head: ClothingHeadHatSyndieMAA jumpsuit: ClothingUniformJumpsuitSyndieFormal shoes: ClothingShoesBootsCombat - gloves: ClothingHandsGlovesCombat + gloves: ClothingHandsGlovesColorBlackPython neck: ClothingNeckScarfStripedSyndieRed mask: ClothingMaskGasSyndicate outerClothing: ClothingOuterCoatSyndieCapArmored - pocket1: WeaponRevolverPythonAP + back: ClothingBackpackSyndicateCaptainLootA inhand: - PlasteelArmingSword +- type: startingGear + id: SyndicateNavalCaptainGearB + equipment: + head: ClothingHeadHatSyndieMAA + jumpsuit: ClothingUniformJumpsuitSyndieFormal + shoes: ClothingShoesBootsCombat + gloves: ClothingHandsGlovesColorBlackPython + neck: ClothingNeckScarfStripedSyndieRed + mask: ClothingMaskGasSyndicate + outerClothing: ClothingOuterCoatSyndieCapArmored + back: ClothingBackpackSyndicateCaptainLootB + inhand: + - PlasteelArmingSword + +- type: startingGear + id: SyndicateNavalCaptainGearC + equipment: + head: ClothingHeadHatSyndieMAA + jumpsuit: ClothingUniformJumpsuitSyndieFormal + shoes: ClothingShoesBootsCombat + gloves: ClothingHandsGlovesColorBlackPython + neck: ClothingNeckScarfStripedSyndieRed + mask: ClothingMaskGasSyndicate + outerClothing: ClothingOuterCoatSyndieCapArmored + back: ClothingBackpackSyndicateCaptainLootC + +- type: startingGear + id: SyndicateNavalCaptainGearD + equipment: + head: ClothingHeadHatSyndieMAA + jumpsuit: ClothingUniformJumpsuitSyndieFormal + shoes: ClothingShoesBootsCombat + gloves: ClothingHandsGlovesColorBlackPython + neck: ClothingNeckScarfStripedSyndieRed + mask: ClothingMaskGasSyndicate + outerClothing: ClothingOuterCoatSyndieCapArmored + back: ClothingBackpackSyndicateCaptainLootD + # Engineer - type: startingGear - id: SyndicateNavalEngineerGear + id: SyndicateNavalEngineerGearA equipment: head: ClothingHeadHatHardhatRed jumpsuit: ClothingUniformJumpsuitChiefEngineerSyndie - back: ClothingBackpackDuffelSyndicateAmmo shoes: ClothingShoesBootsCombat - gloves: ClothingHandsGlovesCombat + gloves: ClothingHandsGlovesColorBlackShotgun belt: ClothingBeltUtility mask: ClothingMaskGasSyndicate outerClothing: ClothingOuterArmorBasic + back: ClothingBackpackSyndicateEngineerLootA inhand: - - WeaponShotgunKammerer + - ToolboxSyndicate + +- type: startingGear + id: SyndicateNavalEngineerGearB + equipment: + head: ClothingHeadHatHardhatRed + jumpsuit: ClothingUniformJumpsuitChiefEngineerSyndie + shoes: ClothingShoesBootsCombat + gloves: ClothingHandsGlovesColorBlackShotgun + belt: ClothingBeltUtility + mask: ClothingMaskGasSyndicate + outerClothing: ClothingOuterArmorBasic + back: ClothingBackpackSyndicateEngineerLootB + inhand: + - ToolboxEmergency + +- type: startingGear + id: SyndicateNavalEngineerGearC + equipment: + head: ClothingHeadHatHardhatRed + jumpsuit: ClothingUniformJumpsuitChiefEngineerSyndie + shoes: ClothingShoesBootsCombat + gloves: ClothingHandsGlovesColorBlackShotgun + belt: ClothingBeltUtility + mask: ClothingMaskGasSyndicate + outerClothing: ClothingOuterArmorBasic + back: ClothingBackpackSyndicateEngineerLootC + inhand: + - ToolboxElectrical + +- type: startingGear + id: SyndicateNavalEngineerGearD + equipment: + head: ClothingHeadHatHardhatRed + jumpsuit: ClothingUniformJumpsuitChiefEngineerSyndie + shoes: ClothingShoesBootsCombat + gloves: ClothingHandsGlovesColorBlackShotgun + belt: ClothingBeltUtility + mask: ClothingMaskGasSyndicate + outerClothing: ClothingOuterArmorBasic + back: ClothingBackpackSyndicateEngineerLootD + inhand: + - ToolboxMechanical # Medic - type: startingGear - id: SyndicateNavalMedicGear + id: SyndicateNavalMedicGearA equipment: head: ClothingHeadHatSyndie jumpsuit: ClothingUniformJumpsuitParamedicSyndie - back: ClothingBackpackDuffelSyndicateMedical shoes: ClothingShoesBootsCombat gloves: ClothingHandsGlovesCombat belt: ClothingBeltMedical neck: ClothingNeckStethoscope mask: ClothingMaskGasSyndicate outerClothing: ClothingOuterCoatAMG + back: ClothingBackpackSyndicateMedicLootA inhand: - SawAdvanced +- type: startingGear + id: SyndicateNavalMedicGearB + equipment: + head: ClothingHeadHatSyndie + jumpsuit: ClothingUniformJumpsuitParamedicSyndie + shoes: ClothingShoesBootsCombat + gloves: ClothingHandsGlovesCombat + belt: ClothingBeltMedical + neck: ClothingNeckStethoscope + mask: ClothingMaskGasSyndicate + outerClothing: ClothingOuterCoatAMG + back: ClothingBackpackSyndicateMedicLootB + inhand: + - ScalpelAdvanced + +- type: startingGear + id: SyndicateNavalMedicGearC + equipment: + head: ClothingHeadHatSyndie + jumpsuit: ClothingUniformJumpsuitParamedicSyndie + shoes: ClothingShoesBootsCombat + gloves: ClothingHandsGlovesCombat + belt: ClothingBeltMedical + neck: ClothingNeckStethoscope + mask: ClothingMaskGasSyndicate + outerClothing: ClothingOuterCoatAMG + back: ClothingBackpackSyndicateMedicLootC + inhand: + - Drill + +- type: startingGear + id: SyndicateNavalMedicGearD + equipment: + head: ClothingHeadHatSyndie + jumpsuit: ClothingUniformJumpsuitParamedicSyndie + shoes: ClothingShoesBootsCombat + gloves: ClothingHandsGlovesCombat + belt: ClothingBeltMedical + neck: ClothingNeckStethoscope + mask: ClothingMaskGasSyndicate + outerClothing: ClothingOuterCoatAMG + back: ClothingBackpackSyndicateMedicLootD + inhand: + - SawImprov + # Syndicate Second Officer - type: startingGear - id: SyndicateNavalSecondOfficerGear + id: SyndicateNavalSecondOfficerGearA equipment: head: ClothingHeadHatSyndie jumpsuit: ClothingUniformJumpsuitRecruitSyndie - back: ClothingBackpackDuffelSyndicate shoes: ClothingShoesBootsCombat - gloves: ClothingHandsGlovesCombat + gloves: ClothingHandsGlovesColorBlackLaserPistol eyes: ClothingEyesGlassesSunglasses belt: ClothingBeltMilitaryWebbing mask: ClothingMaskNeckGaiter outerClothing: ClothingOuterArmorBasic + back: ClothingBackpackSyndicateSecondOfficerLootA inhand: - - WeaponAdvancedLaser + - Cutlass + +- type: startingGear + id: SyndicateNavalSecondOfficerGearB + equipment: + head: ClothingHeadHatSyndie + jumpsuit: ClothingUniformJumpsuitRecruitSyndie + shoes: ClothingShoesBootsCombat + gloves: ClothingHandsGlovesColorBlackLaserPistol + eyes: ClothingEyesGlassesSunglasses + belt: ClothingBeltMilitaryWebbing + mask: ClothingMaskNeckGaiter + outerClothing: ClothingOuterArmorBasic + back: ClothingBackpackSyndicateSecondOfficerLootB + inhand: + - Machete + +- type: startingGear + id: SyndicateNavalSecondOfficerGearC + equipment: + head: ClothingHeadHatSyndie + jumpsuit: ClothingUniformJumpsuitRecruitSyndie + shoes: ClothingShoesBootsCombat + gloves: ClothingHandsGlovesColorBlackLaserPistol + eyes: ClothingEyesGlassesSunglasses + belt: ClothingBeltMilitaryWebbing + mask: ClothingMaskNeckGaiter + outerClothing: ClothingOuterArmorBasic + back: ClothingBackpackSyndicateSecondOfficerLootC + inhand: + - CombatKnife + +- type: startingGear + id: SyndicateNavalSecondOfficerGearD + equipment: + head: ClothingHeadHatSyndie + jumpsuit: ClothingUniformJumpsuitRecruitSyndie + shoes: ClothingShoesBootsCombat + gloves: ClothingHandsGlovesColorBlackLaserPistol + eyes: ClothingEyesGlassesSunglasses + belt: ClothingBeltMilitaryWebbing + mask: ClothingMaskNeckGaiter + outerClothing: ClothingOuterArmorBasic + back: ClothingBackpackSyndicateSecondOfficerLootD # Syndicate Security Operative - type: startingGear - id: SyndicateNavalOperatorGear + id: SyndicateNavalOperatorGearA equipment: head: ClothingHeadHelmetSwatSyndicate jumpsuit: ClothingUniformJumpsuitOperative - back: WeaponSubMachineGunAtreides + back: ClothingBackpackSyndicateOperativeLootA shoes: ClothingShoesBootsCombat - gloves: ClothingHandsGlovesCombat + gloves: ClothingHandsGlovesColorBlackSMG belt: ClothingBeltMilitaryWebbing mask: ClothingMaskGasSyndicate outerClothing: ClothingOuterArmorBulletproof inhand: - KukriKnife +- type: startingGear + id: SyndicateNavalOperatorGearB + equipment: + head: ClothingHeadHelmetSwatSyndicate + jumpsuit: ClothingUniformJumpsuitOperative + back: ClothingBackpackSyndicateOperativeLootB + shoes: ClothingShoesBootsCombat + gloves: ClothingHandsGlovesColorBlackSMG + belt: ClothingBeltMilitaryWebbing + mask: ClothingMaskGasSyndicate + outerClothing: ClothingOuterArmorBulletproof + inhand: + - KukriKnife + +- type: startingGear + id: SyndicateNavalOperatorGearC + equipment: + head: ClothingHeadHelmetSwatSyndicate + jumpsuit: ClothingUniformJumpsuitOperative + back: ClothingBackpackSyndicateOperativeLootC + shoes: ClothingShoesBootsCombat + gloves: ClothingHandsGlovesColorBlackSMG + belt: ClothingBeltMilitaryWebbing + mask: ClothingMaskGasSyndicate + outerClothing: ClothingOuterArmorBulletproof + inhand: + - Machete + +- type: startingGear + id: SyndicateNavalOperatorGearD + equipment: + head: ClothingHeadHelmetSwatSyndicate + jumpsuit: ClothingUniformJumpsuitOperative + back: ClothingBackpackSyndicateOperativeLootD + shoes: ClothingShoesBootsCombat + gloves: ClothingHandsGlovesColorBlackSMG + belt: ClothingBeltMilitaryWebbing + mask: ClothingMaskGasSyndicate + outerClothing: ClothingOuterArmorBulletproof + inhand: + - CombatKnife + # Syndicate Grenadier - type: startingGear - id: SyndicateNavalGrenadierGear + id: SyndicateNavalGrenadierGearA equipment: - head: ClothingHeadHelmetBombSuit - jumpsuit: ClothingUniformJumpsuitRecruitSyndie + back: ClothingBackpackSyndicateGrenadierLootA + head: ClothingHeadHelmetBombSuitSyndie + jumpsuit: ClothingUniformJumpsuitPyjamaSyndicateRed shoes: ClothingShoesBootsCombat - gloves: ClothingHandsGlovesCombat + gloves: ClothingHandsGlovesColorBlackChinaLake + belt: ClothingBeltMilitaryWebbing + mask: ClothingMaskGasSyndicate + outerClothing: ClothingOuterSuitBombSyndie + +- type: startingGear + id: SyndicateNavalGrenadierGearB + equipment: + back: ClothingBackpackSyndicateGrenadierLootB + head: ClothingHeadHelmetBombSuitSyndie + jumpsuit: ClothingUniformJumpsuitPyjamaSyndicateRed + shoes: ClothingShoesBootsCombat + gloves: ClothingHandsGlovesColorBlackChinaLake + belt: ClothingBeltMilitaryWebbing + mask: ClothingMaskGasSyndicate + outerClothing: ClothingOuterSuitBombSyndie + +- type: startingGear + id: SyndicateNavalGrenadierGearC + equipment: + back: ClothingBackpackSyndicateGrenadierLootC + head: ClothingHeadHelmetBombSuitSyndie + jumpsuit: ClothingUniformJumpsuitPyjamaSyndicateRed + shoes: ClothingShoesBootsCombat + gloves: ClothingHandsGlovesColorBlackChinaLake belt: ClothingBeltMilitaryWebbing mask: ClothingMaskGasSyndicate - outerClothing: ClothingOuterSuitBomb + outerClothing: ClothingOuterSuitBombSyndie + +- type: startingGear + id: SyndicateNavalGrenadierGearD + equipment: + back: ClothingBackpackSyndicateGrenadierLootD + head: ClothingHeadHelmetBombSuitSyndie + jumpsuit: ClothingUniformJumpsuitPyjamaSyndicateRed + shoes: ClothingShoesBootsCombat + gloves: ClothingHandsGlovesColorBlackChinaLake + belt: ClothingBeltMilitaryWebbing + mask: ClothingMaskGasSyndicate + outerClothing: ClothingOuterSuitBombSyndie # Syndicate Saboteur - type: startingGear - id: SyndicateNavalSaboteurGear + id: SyndicateNavalSaboteurGearA equipment: head: ClothingHeadHatSyndie - back: JetpackBlackFilled jumpsuit: ClothingUniformJumpsuitOperative shoes: ClothingShoesBootsCombat - gloves: ClothingHandsGlovesCombat + gloves: ClothingHandsGlovesColorBlackPistol eyes: ClothingEyesGlassesSunglasses mask: ClothingMaskNeckGaiter outerClothing: ClothingOuterArmorBasicSlim -# pocket1: WeaponPistolViper + back: ClothingBackpackSyndicateSaboteurLootA + inhand: + - CombatKnife + +- type: startingGear + id: SyndicateNavalSaboteurGearB + equipment: + head: ClothingHeadHatSyndie + jumpsuit: ClothingUniformJumpsuitOperative + shoes: ClothingShoesBootsCombat + gloves: ClothingHandsGlovesColorBlackPistol + eyes: ClothingEyesGlassesSunglasses + mask: ClothingMaskNeckGaiter + outerClothing: ClothingOuterArmorBasicSlim + back: ClothingBackpackSyndicateSaboteurLootB + inhand: + - CombatKnife + +- type: startingGear + id: SyndicateNavalSaboteurGearC + equipment: + head: ClothingHeadHatSyndie + jumpsuit: ClothingUniformJumpsuitOperative + shoes: ClothingShoesBootsCombat + gloves: ClothingHandsGlovesColorBlackPistol + eyes: ClothingEyesGlassesSunglasses + mask: ClothingMaskNeckGaiter + outerClothing: ClothingOuterArmorBasicSlim + back: ClothingBackpackSyndicateSaboteurLootC + inhand: + - CombatKnife + +- type: startingGear + id: SyndicateNavalSaboteurGearD + equipment: + head: ClothingHeadHatSyndie + jumpsuit: ClothingUniformJumpsuitOperative + shoes: ClothingShoesBootsCombat + gloves: ClothingHandsGlovesColorBlackPistol + eyes: ClothingEyesGlassesSunglasses + mask: ClothingMaskNeckGaiter + outerClothing: ClothingOuterArmorBasicSlim + back: ClothingBackpackSyndicateSaboteurLootD inhand: - CombatKnife @@ -113,30 +401,178 @@ inhand: - ReinforcedShiv -# Commander (Megafauna for dungeons) +# Syndicate Commander - type: startingGear - id: SyndicateNavalCommanderGear + id: SyndicateNavalCommanderGearA # Megafauna for dungeons equipment: mask: ClothingMaskGasSyndicate neck: BedsheetSyndie jumpsuit: ClothingUniformJumpsuitSyndieFormal - outerClothing: ClothingOuterHardsuitSyndieElite - gloves: ClothingHandsGlovesCombat + outerClothing: ClothingOuterHardsuitSyndieEliteUnremoveable + head: ClothingHeadHelmetHardsuitSyndieEliteUnremoveable + gloves: ClothingHandsGlovesColorBlackAK shoes: ClothingShoesBootsMagSyndie - back: WeaponRifleAk - pocket1: MagazineLightRifle - pocket2: MagazineLightRifle + back: ClothingBackpackSyndicateCommanderLootA inhand: - CaptainSabre - + +- type: startingGear + id: SyndicateNavalCommanderGearB + equipment: + mask: ClothingMaskGasSyndicate + jumpsuit: ClothingUniformJumpsuitSyndieFormal + outerClothing: ClothingOuterHardsuitSyndieEliteUnremoveable + head: ClothingHeadHelmetHardsuitSyndieEliteUnremoveable + gloves: ClothingHandsGlovesColorBlackAK + shoes: ClothingShoesBootsMagSyndie + back: ClothingBackpackSyndicateCommanderLootB + inhand: + - CaptainSabre + +- type: startingGear + id: SyndicateNavalCommanderGearC + equipment: + mask: ClothingMaskGasSyndicate + neck: BedsheetSyndie + jumpsuit: ClothingUniformJumpsuitSyndieFormal + outerClothing: ClothingOuterHardsuitSyndieBloodRedUnremoveable + head: ClothingHeadHelmetHardsuitSyndieUnremoveable + gloves: ClothingHandsGlovesColorBlackAK + shoes: ClothingShoesBootsMagSyndie + back: ClothingBackpackSyndicateCommanderLootC + inhand: + - CaptainSabre + +- type: startingGear + id: SyndicateNavalCommanderGearD + equipment: + mask: ClothingMaskGasSyndicate + jumpsuit: ClothingUniformJumpsuitSyndieFormal + outerClothing: ClothingOuterHardsuitSyndieBloodRedUnremoveable + head: ClothingHeadHelmetHardsuitSyndieUnremoveable + gloves: ClothingHandsGlovesColorBlackAK + shoes: ClothingShoesBootsMagSyndie + back: ClothingBackpackSyndicateCommanderLootD + inhand: + - CaptainSabre + # Syndicate Deckhand - type: startingGear - id: SyndicateNavalDeckhandGear + id: SyndicateNavalDeckhandGearA equipment: head: ClothingHeadHatSyndie jumpsuit: ClothingUniformJumpsuitRecruitSyndie shoes: ClothingShoesBootsWork outerClothing: ClothingOuterArmorBasic - pocket1: WeaponPistolViper + gloves: ClothingHandsGlovesColorBlackPistol + back: ClothingBackpackSyndicateDeckhandLootA inhand: - - CombatKnife + - PowerDrill + +- type: startingGear + id: SyndicateNavalDeckhandGearB + equipment: + head: ClothingHeadHatSyndie + jumpsuit: ClothingUniformJumpsuitRecruitSyndie + shoes: ClothingShoesBootsWork + outerClothing: ClothingOuterArmorBasic + gloves: ClothingHandsGlovesColorBlackPistol + back: ClothingBackpackSyndicateDeckhandLootB + inhand: + - Crowbar + +- type: startingGear + id: SyndicateNavalDeckhandGearC + equipment: + head: ClothingHeadHatSyndie + jumpsuit: ClothingUniformJumpsuitRecruitSyndie + shoes: ClothingShoesBootsWork + outerClothing: ClothingOuterArmorBasic + gloves: ClothingHandsGlovesColorBlackPistol + back: ClothingBackpackSyndicateDeckhandLootC + inhand: + - Wrench + +- type: startingGear + id: SyndicateNavalDeckhandGearD + equipment: + head: ClothingHeadHatSyndie + jumpsuit: ClothingUniformJumpsuitRecruitSyndie + shoes: ClothingShoesBootsWork + outerClothing: ClothingOuterArmorBasic + gloves: ClothingHandsGlovesColorBlackPistol + back: ClothingBackpackSyndicateDeckhandLootD + inhand: + - Screwdriver + +# Syndicate Mime +- type: startingGear + id: SyndicateNavalMimeGear + equipment: + head: ClothingHeadHatBeret + mask: ClothingMaskMime + neck: ClothingNeckScarfStripedSyndieRed + jumpsuit: ClothingUniformJumpsuitMime + gloves: ClothingHandsGlovesCombat + shoes: ClothingShoesBootsCombat + outerClothing: ClothingOuterArmorBulletproof + eyes: ClothingEyesHudSyndicate + back: ClothingBackpackMessengerSyndicate + pocket1: Stimpack + inhand: + - Chainsaw + +# Syndicate Chemwarrior +- type: startingGear + id: SyndicateNavalChemwarriorGearA + equipment: + head: ClothingHeadHatHoodWinterSyndieUnremoveable + mask: ClothingMaskGasSyndicate + neck: ClothingNeckScarfStripedSyndieRed + jumpsuit: ClothingUniformJumpsuitPyjamaSyndicateRed + gloves: ClothingHandsGlovesColorBlackSprayNozzle + shoes: ClothingShoesBootsWinterSyndicate + outerClothing: ClothingOuterWinterSyndie + eyes: ClothingEyesHudSyndicate + back: ClothingBackpackSyndicateChemwarriorLootA + inhand: + - SpearUranium + +- type: startingGear + id: SyndicateNavalChemwarriorGearB + equipment: + head: ClothingHeadHatHoodBioArmoredSyndicate + jumpsuit: ClothingUniformJumpsuitPyjamaSyndicateRed + gloves: ClothingHandsGlovesColorBlackSprayNozzle + shoes: ClothingShoesBootsCombat + outerClothing: ClothingOuterBioArmoredSyndicate + eyes: ClothingEyesHudSyndicate + back: ClothingBackpackSyndicateChemwarriorLootB + inhand: + - SpearPlasma + +- type: startingGear + id: SyndicateNavalChemwarriorGearC + equipment: + head: ClothingHeadHatHoodBioArmoredSyndicate + jumpsuit: ClothingUniformJumpsuitPyjamaSyndicateRed + gloves: ClothingHandsGlovesColorBlackSprayNozzle + shoes: ClothingShoesBootsCombat + outerClothing: ClothingOuterBioArmoredSyndicate + eyes: ClothingEyesHudSyndicate + back: ClothingBackpackSyndicateChemwarriorLootC + inhand: + - SpearReinforced + +- type: startingGear + id: SyndicateNavalChemwarriorGearD + equipment: + head: ClothingHeadHatHoodBioArmoredSyndicate + jumpsuit: ClothingUniformJumpsuitPyjamaSyndicateRed + gloves: ClothingHandsGlovesColorBlackSprayNozzle + shoes: ClothingShoesBootsCombat + outerClothing: ClothingOuterBioArmoredSyndicate + eyes: ClothingEyesHudSyndicate + back: ClothingBackpackSyndicateChemwarriorLootD + inhand: + - SpearBone diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_ak.rsi/equipped-HAND.png b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_ak.rsi/equipped-HAND.png new file mode 100644 index 0000000000000000000000000000000000000000..7b4ae24563b2fc951d0f02269b84ddbf84bdba0f GIT binary patch literal 8389 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_china_lake.rsi/icon.png b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_china_lake.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..59d0d46baa122bd3285084760fb07b3857645fc4 GIT binary patch literal 485 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_laser_pistol.rsi/icon.png b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_laser_pistol.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..59d0d46baa122bd3285084760fb07b3857645fc4 GIT binary patch literal 485 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 F{sl=yq?rH! literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_pistol.rsi/icon.png b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_pistol.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..59d0d46baa122bd3285084760fb07b3857645fc4 GIT binary patch literal 485 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 R0L&SPg^8_kx#6C}{{p`kg^>UN literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_python.rsi/icon.png b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_python.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..59d0d46baa122bd3285084760fb07b3857645fc4 GIT binary patch literal 485 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 mA%qY@2qAXD literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/syndicate_bombsuit.rsi/icon.png b/Resources/Textures/_NF/Clothing/Head/Helmets/syndicate_bombsuit.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..5ee08fa92020b3569f5ed790f21d8a5d57b58fcd GIT binary patch literal 842 zcmV-Q1GW5#P)EX>4Tx04R}tkv&MmKpe$i(`rRpI@m$PAwzYtAS&W0RV;#q(pG5I!Q|2}XktiG zTpR`0f`cE6RRsi(3FIe3n*d-(Wz7w1{t=l&dFrD!t1Clb#x-LQz)iKjO$ zo%23%lvN~!_?&pmpbHW|a$R=$jdR&yfoDdITxO0qN-UPUSngt0F;wCy;+UdplrQ96 zRyc2QR%>jdyW16NwdztIF{K1pwM zwAc|4*#<7IJDR))T zjFu^T&EwsD-M#&LrrqBULo#xdiyD_X00006VoOIv0E+;N0E?)9lr;bV010qNS#tmY zE+YT{E+YYWr9XB6000McNliru=mZ81AsgyUJ5~Sy02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{00AONL_t(o!|j#3u7W@ihJTP|_aFrbBqkb6tZjS{pThUx zJ*<5dJ8K)wAr>ZrQYb>@r6Tcy%Pzs3oVZ`PJ3I5w&dv@Xkw_%pj#A}Nw`E_8*4Mj8 z*q>G<@Sy9#(wh%^`{W1!S5YB~NN|G?414`N*bA24#Qb-OLzZ!iP(?Cl1GN!ywwivt906(0H>4fXykv=9HA$d$tRM5FE0s zzAl&rD*%AwI83`R3^5Bt8;KTXs6-oU5%a{-#@0c$ex0boBK z`$g-N(t2k>-b%^k{NVh#&d+8^)$; UEB~hNb^rhX07*qoM6N<$f@kh&A^-pY literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/syndicate_bombsuit.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Head/Helmets/syndicate_bombsuit.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..6024b36156e427f73c9ca6c32071d22627f7aa6a GIT binary patch literal 1005 zcmVEX>4Tx04R}tkv&MmKpe$i(`rRpI@m$PAwzYtAS&W0RV;#q(pG5I!Q|2}XktiG zTpR`0f`cE6RRsi(3FIe3n*d-(Wz7w1{t=l&dFrD!t1Clb#x-LQz)iKjO$ zo%23%lvN~!_?&pmpbHW|a$R=$jdR&yfoDdITxO0qN-UPUSngt0F;wCy;+UdplrQ96 zRyc2QR%>jdyW16NwdztIF{K1pwM zwAc|4*#<7IJDR))T zjFu^T&EwsD-M#&LrrqBULo#xdiyD_X00006VoOIv0E+;N0E?)9lr;bV010qNS#tmY zE+YT{E+YYWr9XB6000McNliru=mZ81Ap(vkla>Gg02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{00G5GL_t(|+U?pwPQpMG2H*!04MTNNXfPO>CT@sP58%$N zS76N<*!BXRpc^+_$hctHKs1&L3&bHBle%#xrBX!ONjmy}t9BY_-|L%p0*?p)00000 z0002~my(JvJ#E{OV>RWz9|m+c9&LRtyJ1BK)vDZ|FPAiW3YA=IMOE;1V?TK)+9nBh z!-~#rXXW$L#WN96q#_BWyn}yuS)?9s)r^gmAnts;dg4{2q7rhg01-T6?8`CEIc-V~ z5m8$3L`06&BtHy_KLr?LH12lY zfN7dha%`L60RR91000000000$DXo61PxcKEW$zuR=oI|r$(h{$>=_V#-8-N~1+4q0 z>B2dd+gW-Cv`9dw(^*NtWHMQsgrBtGXf*|{hC{mU_g%4{XRkq-G?qulh!zRBF-^H$ z_q>(6?}tIA<_YZ{f}+=;RWoEi(e22mKmQgGjaMRgu?8TbOzQw`7DA#5jPi~gQ`I~P b0RP7arYy|PgE6@600000NkvXXu0mjfP>!o0 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/syndicate_bombsuit.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Head/Helmets/syndicate_bombsuit.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..0e6f76da0690f9c0c109bb083b4059c951f7633f GIT binary patch literal 1000 zcmV>P)EX>4Tx04R}tkv&MmKpe$i(`rRpI@m$PAwzYtAS&W0RV;#q(pG5I!Q|2}XktiG zTpR`0f`cE6RRsi(3FIe3n*d-(Wz7w1{t=l&dFrD!t1Clb#x-LQz)iKjO$ zo%23%lvN~!_?&pmpbHW|a$R=$jdR&yfoDdITxO0qN-UPUSngt0F;wCy;+UdplrQ96 zRyc2QR%>jdyW16NwdztIF{K1pwM zwAc|4*#<7IJDR))T zjFu^T&EwsD-M#&LrrqBULo#xdiyD_X00006VoOIv0E+;N0E?)9lr;bV010qNS#tmY zE+YT{E+YYWr9XB6000McNliru=mZ81Aqs%}8>9dL02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{00F>BL_t(|+U?pwPQpMG2H;miGz{pXP%s!84q&_r2Vl(! zyg;{{p&K`x!<`qgp{)sQI_3XXbbzMs&6}B~Qz8HW00000 z001~FR$Aj_*A+ddog4>INDtGAWlB(P(-CLYYI3|>uW9lgrCxs}EBHqJRR2ntkOa5s zh%2|ZasBi7gNR6^CBf2zpRMA|lXq(MLRW(9d9`}gDo(3}jS7&#Gsd<~z&WS9BHMJiWa;9($bg(oKR#WeR4wUZ?i5Is|g(0Nb_&V~jZGG#?I= zDroq=C)*c`MPcWF_W6Z4`Tinx1yGaoSvjWg?bXU%2Gt~}!=mWH>q*e11)q5zVB5CP z+e`=^00000000000001T?e(l*--jp4--|C*0^~ltr0&PxKHeLX1Z$t3SGS_?f|sq| znXsEw+2v1J!M9p1Jpok81f*e%(Nn+g$>ZzM$a^+m2<-iSK-PY|DRxSLd=Wtno^wtO z-%l#w#`S& literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/syndicate_bombsuit.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Helmets/syndicate_bombsuit.rsi/meta.json new file mode 100644 index 00000000000..e0ee93d642c --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Head/Helmets/syndicate_bombsuit.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/a75dee2e6d236612dbd403dd5f8687ca930c01f1", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/Bio/syndicate.rsi/equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hoods/Bio/syndicate.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..43c3ffc07b41afe50d9e790dcd90c0dd687db69e GIT binary patch literal 1195 zcmV;c1XTNpP)EX>4Tx04R}tkv&MmKpe$iQ^l`}gB?T^GE^rEqN0vc#UfZJZG~1HOfLO`CJjl7 zi=*ILaPVWX>fqw6tAnc`2!4P#J2)x2NQwVT3N2zhIPS;0dyl(!fKV$j)odFFRLwFH z(TJGNtco44@M9QVm_d)kOg)xdOu=(}-NVP%yD-o4KKJM7Rk9`nd?N82(+!JwgLrz= z(mC%F2U$TbZyUI{Zff!#aJd5vJn51lIg+2Ikjnw@XY@@Op#K)=UUPeE?BnzSNKseIH^9Lm zFq)_Ab&q#eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{00M(aL_t(|+U=UpZrVT)#y>)k`6pEhBHKt9IHXqFB<(Zw znuo|U^ilc@J@y>+1#;_wQ&AhskrIenOaiJK+iM$adT`gGh^W}LNonVIV%MPWo7wSl zm;s3Yn_Q9~o$T%n7Wdu`zdl}<=`{7XlZd~TTL1vnvgaQS){%s?^>azZ1@k7}k8d)q zgp=L9!SPNVN~Mg`+hMe?l&XpKV^@G`*-$FwWhbyUPH%_!@5YXs06jopLFpY z{a&W!f6;2Q>SO`{c=h}U08o{RxM;N*%)9Jf0fDb53;?+2K{vi(8u;OD`t%vgGH}ar z0RYp$hv_oMV}X zb6Jk9zj6gE_TA?Vh~N#|j@_S+gXOp|Y#Wahg=wm)uj)0Ge}O}}IkOxW2XYfYIF*sl zZ^8Ein63i=QGfnpzn9A*0e^!Bf*=TjAP9mW2!bF8f*^>E<_CY|ZgZJNbh`im002ov JPDHLkV1naL7Lot} literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/Bio/syndicate.rsi/icon.png b/Resources/Textures/_NF/Clothing/Head/Hoods/Bio/syndicate.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..b097523f1c3fd0c622bed65c8482f2b57aad92d0 GIT binary patch literal 819 zcmV-31I+x1P)EX>4Tx04R}tkv&MmKpe$iQ$>+V2Rlf0$WWauh)QvkDi*;)X)CnqU~=gfG-*gu zTpR`0f`cE6RR74h8L#!+*#OK5l23?T&k?XR{Z=6dG3p_JqWYhD+A!4!A#c~(3vY`^s5JwbMqkJLf zvch?bvs$gQ_C5Iv0|jj*!*!aYNMH#`q#!~@9TikzAxf)8iitGs$36UE$DbmXOs)zT zITlcZ3d!+<|H1EW&EoWwn-quxy)U-?F$VPQ0jdyW16NwdUuy!hpQJZB zTI2`_ZUYzB9ZlW?E_Z<8CtWfmNAlAYibdf4jJ_!k4BY|)Yi@7teVjf3S?X%}1~@nb z#!HmF?(y#a?%w`A)9&vF%ztvrk~cC500006VoOIv0Eqx=01uIfP|N@T010qNS#tmY zE+YT{E+YYWr9XB6000McNliru=mQ%O0VW`ceSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{009e0L_t(o!|jw$O2a@Dhrg!w&!h_%1wm-)rWQrfi;Nd= z;Tb%W8xPRjpeGO%MY>7~qENA5GMcm*7o{O|)rn*w&bJxnJ?8!9_jog4u~;mY|4yy! z!K=Of(Pr%C?d8I>&Q4kJYwrMn=O`|wMy8jj|3)03+iWmPQveP{2iI{f@1oD!ZReQlPKk{_YpWpVr8BS`4kds}5?<#YEVAY5O&=Z0O8^x$002ovPDHLkV1ld&U)KNt literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/Bio/syndicate.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Head/Hoods/Bio/syndicate.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..96ad13fecc43f7f4a829a1c824dcb6a78a76fbf7 GIT binary patch literal 925 zcmV;O17iG%P)EX>4Tx04R}tkv&MmKpe$iQ$>+V2Rlf0$WWauh)QvkDi*;)X)CnqU~=gfG-*gu zTpR`0f`cE6RR74h8L#!+*#OK5l23?T&k?XR{Z=6dG3p_JqWYhD+A!4!A#c~(3vY`^s5JwbMqkJLf zvch?bvs$gQ_C5Iv0|jj*!*!aYNMH#`q#!~@9TikzAxf)8iitGs$36UE$DbmXOs)zT zITlcZ3d!+<|H1EW&EoWwn-quxy)U-?F$VPQ0jdyW16NwdUuy!hpQJZB zTI2`_ZUYzB9ZlW?E_Z<8CtWfmNAlAYibdf4jJ_!k4BY|)Yi@7teVjf3S?X%}1~@nb z#!HmF?(y#a?%w`A)9&vF%ztvrk~cC500006VoOIv0Eqx=01uIfP|N@T010qNS#tmY zE+YT{E+YYWr9XB6000McNliru=mQ%O0TXsQAlU!_02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{00DJLL_t(|+U?rkN`r6|2k`H7|8y5!36aMF4;U ztpQz8E^fT{YfGW?pi!^k z)^$o*#}g3|5fKp)5fKp)(T}A2zn=B%Kv}lrvz{GLWlSE(ZgxPC=?M@qJD|!^eNnRm zQuF|kvjfsJK~b{EX>4Tx04R}tkv&MmKpe$iQ$>+V2Rlf0$WWauh)QvkDi*;)X)CnqU~=gfG-*gu zTpR`0f`cE6RR74h8L#!+*#OK5l23?T&k?XR{Z=6dG3p_JqWYhD+A!4!A#c~(3vY`^s5JwbMqkJLf zvch?bvs$gQ_C5Iv0|jj*!*!aYNMH#`q#!~@9TikzAxf)8iitGs$36UE$DbmXOs)zT zITlcZ3d!+<|H1EW&EoWwn-quxy)U-?F$VPQ0jdyW16NwdUuy!hpQJZB zTI2`_ZUYzB9ZlW?E_Z<8CtWfmNAlAYibdf4jJ_!k4BY|)Yi@7teVjf3S?X%}1~@nb z#!HmF?(y#a?%w`A)9&vF%ztvrk~cC500006VoOIv0Eqx=01uIfP|N@T010qNS#tmY zE+YT{E+YYWr9XB6000McNliru=mQ%O0U4I>$;SWy02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{00D$aL_t(|+U?rkO2Tjy2k@^m|7>1#Aq0W58*!_}pkX{lTCM0M^m5qkMn9@$R;}xDL;GZ2o(>x9>>k0ZHT6_W_4?GaA3WF*uqE@Zo+H(teOI&*VL_|bHL_|bHL_|ctAk*`4>2n0Yiur&f$xEIiSSV&q9*{Rj z5ND*_D1D9~^$CzZN07M(NS`BEOB0knN3fP2AbpM?^?d;UhbJQXLp}hr79f}QW#=dW O0000FmEGw!x8Lv1e}N!p?QeZ+?QgHOH;1)s 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 TL(G<800000NkvXXu0mjf&d1jZ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Neck/Misc/ascended_cultist_amulet.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Neck/Misc/ascended_cultist_amulet.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..51e418ee4ff35242442983dfb3a5cfecb0200103 GIT binary patch literal 6055 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 E-$^hWq4)k!q|2gOy@=dng&mw}FTP$o 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 N002ovPDHLkV1m<2w&DN) literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Bio/syndicate.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Bio/syndicate.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..b4c613edc35e706c56aeac94978416f10978d686 GIT binary patch literal 1227 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 AEdT%j literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Suits/syndicate_bombsuit.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/syndicate_bombsuit.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..8fe092d8997ea2f87a9c22198c10bd927b77635e GIT binary patch literal 1177 zcmV;K1ZMk*P)EX>4Tx04R}tkv&MmKpe$i(`rRpI@m$PAwzYtAS&W0RV;#q(pG5I!Q|2}XktiG zTpR`0f`cE6RRsi(3FIe3n*d-(Wz7w1{t=l&dFrD!t1Clb#x-LQz)iKjO$ zo%23%lvN~!_?&pmpbHW|a$R=$jdR&yfoDdITxO0qN-UPUSngt0F;wCy;+UdplrQ96 zRyc2QR%>jdyW16NwdztIF{K1pwM zwAc|4*#<7IJDR))T zjFu^T&EwsD-M#&LrrqBULo#xdiyD_X00006VoOIv0E+;N0E?)9lr;bV010qNS#tmY zE+YT{E+YYWr9XB6000McNliru=mZ81ASSCnMg{-?02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{00MDIL_t(o!|j&AOXE-w#(!A_!}Im9(MAy3Mh${eLGb2P zul}`r_3W)suy~4?C{+4l!$M!*)&)0vkc3uSlXjK8bRZ;|OfvJn`R03pr7dk~OZ(4e zE%H*cR!`shIuG~Omlj~#cIsE%{JuNX`Std?%&&u3F&d3ZfA`xwD?Zur@v2*NhZ-S7 zesqT#ue!y_jz1Hjg%N1h>gmajPw?`Lzp}=UP8-*C-^D4VxM&^|ygc*$*KfkOSE?;4? zaBwgY*Jw0owOU->T;o^WycOd-nVSQSj6QmI6pi>2tgD@NGbCpiXwy% zoF5($#EQNiaJIXT5CX?>(uEPoU=8CQ;}h_a`Bj%N?v)tEp0Jyxl#u!7R(RjxJV+@x!*8rS)dt~n>NwPQzx7Q_Jb&CyInOI#E zMH5q?^($G&<4?Uk!njA0B>&ceEO{9Ba#l+@*$ycs#+dy1hODq5E2X$#l~uv+P~*BT zT5F6k6Jn&4LI{DB5~Wnmmoh?BTC*L;NwcI`5t(Jlvto++K35CI`OsDBy>F;pGLxIVl~VEB_y1ZXr}*D5wLB0>W(%VjjWHJeF_4$ZKs~+q4lfEW#jf% r2gc7*O2RNq%M@WPy80pn%A)WW?ddvp>jSTf00000NkvXXu0mjf;EWa@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Suits/syndicate_bombsuit.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/syndicate_bombsuit.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..3a1d5744b0fb21c0532d4a362b1e07e69218ae15 GIT binary patch literal 1087 zcmV-F1i<@=P)EX>4Tx04R}tkv&MmKpe$i(`rRpI@m$PAwzYtAS&W0RV;#q(pG5I!Q|2}XktiG zTpR`0f`cE6RRsi(3FIe3n*d-(Wz7w1{t=l&dFrD!t1Clb#x-LQz)iKjO$ zo%23%lvN~!_?&pmpbHW|a$R=$jdR&yfoDdITxO0qN-UPUSngt0F;wCy;+UdplrQ96 zRyc2QR%>jdyW16NwdztIF{K1pwM zwAc|4*#<7IJDR))T zjFu^T&EwsD-M#&LrrqBULo#xdiyD_X00006VoOIv0E+;N0E?)9lr;bV010qNS#tmY zE+YT{E+YYWr9XB6000McNliru=mZ81AQWTh7lr@;02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{00I|DL_t(|+U?pgYvV8!2k^f_2lMPg@qves1eaziE))ta zWav=3cJA2Eci*A&4F?AYXATdA6E^sWgTsMkk)c#K6o({BowUBhm-mAZS@49OkSt>h zV2m-w7-Nhv#u#Ia?Gw>d!$E&ws&bgb;$O$t)oCK}hwB@YmI}`{AuSaiu5Zj@LUrS- z-#YPI9e|)eFc-%|K}rcCLaqv291rnU5{vPk=Rs=?&+}@>Z+!sLQXyBx{Mz^Z zc{x`F(o!`VzY|N~@#l}V>OVSus{_!r9o%1zASYu0fRys}e=^4XT}>;@mc1i~a1 zTI;1ct?PF_Ok#26bs?q1k?255i7T($*jCsBiU!uIn1tb%VGqHNzbo|aN0mc|(j4{R-V~jDz7-Ks~ zw6)`|>zcdZ9Jwm+qzgn*v{5dtd@bJV^^DdUpTB-t8jwxeI%w+*@O>XcI)t2zk-g*G zK&wBDd~yyOIW*CV^v@5n=U6&VN4xs^kI8li&34#9#7}2(`H6+0y_3002ovPDHLk FV1kW|EX>4Tx04R}tkv&MmKpe$i(`rRpI@m$PAwzYtAS&W0RV;#q(pG5I!Q|2}XktiG zTpR`0f`cE6RRsi(3FIe3n*d-(Wz7w1{t=l&dFrD!t1Clb#x-LQz)iKjO$ zo%23%lvN~!_?&pmpbHW|a$R=$jdR&yfoDdITxO0qN-UPUSngt0F;wCy;+UdplrQ96 zRyc2QR%>jdyW16NwdztIF{K1pwM zwAc|4*#<7IJDR))T zjFu^T&EwsD-M#&LrrqBULo#xdiyD_X00006VoOIv0E+;N0E?)9lr;bV010qNS#tmY zE+YT{E+YYWr9XB6000McNliru=mZ81AR2^FI)MNH02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{00J^eL_t(|+U?rUYvMo@2k`F%4`C9aq>w|fMX3jodJ-&n z=%M&OcSooBC(1ORBQ;kxfh*HYRV z|A!$EPA7th*7gyRF-u`Moro(xfKm!4!h%u?SAMWFers1n!{!CT=|l{h7sg%O%yoiM zw})^#5u7-Nhv z#u#IaF~%5U?1+@U&E4sAvbL<_)UD%N_=v?~Axvz5Qn$s6f0W!k+=GbFXf!et8=zM9 zz&MUka|oku4^NapYmKAn0l6sEICbkr&jF=-K;XFOx7xUSxCa18DUYuQ{P_KZ@nC3d z@}(OfpYe+iB$>Jj)V^B5WBdoR*-V()14;*8TnbG+`(K&^hzL?jNGY-J0fhgy2jofT g6Ce>8@c_l9e Date: Mon, 8 Apr 2024 20:24:15 +0000 Subject: [PATCH 02/13] Automatic Changelog (#1153) --- Resources/Changelog/Changelog.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 875ddd27966..81d44cb1c40 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -3968,3 +3968,30 @@ Entries: message: Fixed missing HV cable on Stratos SMES unit. id: 4905 time: '2024-04-08T19:59:32.0000000+00:00' +- author: erhardsteinhauer + changes: + - type: Tweak + message: Prevents dungeons from spawning multiple bosses. + - type: Tweak + message: >- + Syndicate NPCs store loot in special bags, that can be worn as a + backpack, but don't function as one - it spawns a predefined set of + items on use and disappears. + - type: Tweak + message: >- + Ascended Cultist (blood cult expedition boss) can be butchered by + players if they wish to obtain some of its powers for themselves. + - type: Tweak + message: Listening Post Bravo is now manned by appropriate forces. + - type: Tweak + message: Wizards and Blood Cultists have trouble sleeping. + - type: Tweak + message: >- + Incapacitated (put in crit) hostile agents can be exchanged for Frontier + Uplink Coins at NFSD Outpost. + - type: Tweak + message: >- + Reclassified some items as contraband: wizard items (hard suits, armor, + staffs, and wands), blood cult items (armor, weapons). + id: 4906 + time: '2024-04-08T20:23:48.0000000+00:00' From 0fa3e758eb8f54cdd76cee009532cab4d6ad1d07 Mon Sep 17 00:00:00 2001 From: Salvantrix <149609610+Salvantrix@users.noreply.github.com> Date: Mon, 8 Apr 2024 17:39:49 -0400 Subject: [PATCH 03/13] 04/01/2024 - NFSD Addons (#1183) * 04/01/2024 - NFSD Addons Experimental hardsuit, Suit/wall storage for each NFSD role, updated over ear headsets to include encrpyts, added crates and crate filled variants, locked/unlocked nfsd colored doors, NFSDDrobe and inventory/ads, brigmedic filled locker, jetpack, sheriff stamp. Probably other things I'm forgetting. * Update to fix things.... removed helmet files from suit files... * 04/02/2024 Updated Headsets to have "safe" variants, removing the NFSD key on purchase. Updated Lockers to remove filled variants, and will update the drove/vending machine to add additional amounts of things people can purchase -> This will make lockers work in a locker capacity so NFSD employees can use them for their item storage, rather than just clutter. * 04/02/2024 Added updated Brigmedic badge. * 04/04/2024 Added SecTec w/ inventory and Helmet * 04/04/2024 Fixed small bit of yml for SecTec * Fix * 04/05/2024 READDED BRIGMEDIC STUFF FOR DARIN * 04/05/2024 FIXED AGAIN THANKS DARIN * 04/05/2024 Added updated banners and NFSD shipyard console/tabletop console. * 04/05/2024 Added restock crates for the NFSDDrobe and NFSDTec vending machines. * 04/05/2024 Updated NFSD Helmet crate to include actual NFSD helmets and added the updated deployable barrier. Also added the new NFSDFab with relevant inventory. (Circuit Board still pending) * 04/05/2024 Pushed updated to fix yml for nfsdfab --------- Co-authored-by: Dvir Co-authored-by: checkraze --- .../advertisements/vending/nfsddrobe.ftl | 5 + .../Fills/Backpacks/StarterGear/backpack.yml | 3 +- .../Fills/Backpacks/StarterGear/duffelbag.yml | 2 +- .../Fills/Backpacks/StarterGear/satchel.yml | 2 +- .../Catalog/Fills/Lockers/security.yml | 118 +++++++++-- .../Spawners/vending_machine_restock.yml | 2 +- .../Fills/Backpacks/StarterGear/backpack.yml | 2 +- .../Fills/Backpacks/StarterGear/duffelbag.yml | 2 +- .../Fills/Backpacks/StarterGear/satchel.yml | 2 +- .../_NF/Catalog/Fills/Crates/nfsd.yml | 116 ++++++++++ .../_NF/Catalog/Fills/Crates/nfsdarmory.yml | 71 +++++++ .../_NF/Catalog/Fills/Lockers/security.yml | 74 ------- .../Catalog/Fills/Lockers/suit_storage.yml | 114 ++++++++++ .../Fills/Lockers/suit_storage_wallmount.yml | 30 +++ .../Advertisements/nfsddrobe.yml | 10 + .../VendingMachines/Inventories/nfsddrobe.yml | 37 ++++ .../VendingMachines/Inventories/nfsdtec.yml | 35 ++++ .../_NF/Entities/Clothing/Back/backpacks.yml | 1 - .../_NF/Entities/Clothing/Ears/headsets.yml | 33 +++ .../Entities/Clothing/Ears/headsets_alt.yml | 6 +- .../Clothing/Head/hardsuit-helmets.yml | 12 ++ .../_NF/Entities/Clothing/Head/helmets.yml | 12 ++ .../_NF/Entities/Clothing/Neck/scarfs.yml | 14 +- .../Clothing/OuterClothing/hardsuits.yml | 13 ++ .../_NF/Entities/Objects/Misc/stamps.yml | 36 ++++ .../Service/vending_machine_restock.yml | 34 +++ .../Entities/Objects/Specific/security.yml | 79 ++++++- .../_NF/Entities/Objects/Tools/jetpacks.yml | 32 +++ .../Structures/Decoration/banners.yml | 25 +++ .../Structures/Doors/Airlocks/access.yml | 10 + .../Structures/Doors/Airlocks/airlocks.yml | 12 ++ .../Machines/Computers/computers.yml | 24 +++ .../Machines/Computers/computers_tabletop.yml | 20 ++ .../Entities/Structures/Machines/lathe.yml | 129 ++++++++++++ .../Structures/Machines/vending_machines.yml | 52 +++++ .../Storage/Closets/Lockers/lockers.yml | 198 +++++++++++++++++- .../Structures/Storage/Crates/crates.yml | 36 ++++ .../_NF/Roles/Jobs/NFSD/brigmedic.yml | 4 +- .../_NF/Roles/Jobs/NFSD/head_of_security.yml | 2 +- .../_NF/Roles/Jobs/NFSD/security_cadet.yml | 2 +- .../_NF/Roles/Jobs/NFSD/security_officer.yml | 2 +- .../_NF/Roles/Jobs/NFSD/senior_officer.yml | 8 +- .../Prototypes/_NF/Roles/Jobs/NFSD/warden.yml | 10 +- .../Objects/Misc/bureaucracy.rsi/meta.json | 3 + .../bureaucracy.rsi/paper_stamp-sheriff.png | Bin 0 -> 196 bytes .../Structures/Machines/techfab.rsi/meta.json | 3 + .../Structures/Machines/techfab.rsi/nfsd.png | Bin 0 -> 275 bytes .../nfsd_experimental.rsi/icon-flash.png | Bin 0 -> 434 bytes .../Hardsuits/nfsd_experimental.rsi/icon.png | Bin 0 -> 418 bytes .../Hardsuits/nfsd_experimental.rsi/meta.json | 57 +++++ .../off-equipped-HELMET-lizard.png | Bin 0 -> 1001 bytes .../off-equipped-HELMET-vulpkanin.png | Bin 0 -> 988 bytes .../off-equipped-HELMET.png | Bin 0 -> 1018 bytes .../nfsd_experimental.rsi/off-inhand-left.png | Bin 0 -> 876 bytes .../off-inhand-right.png | Bin 0 -> 919 bytes .../on-equipped-HELMET-lizard.png | Bin 0 -> 1160 bytes .../on-equipped-HELMET-vulpkanin.png | Bin 0 -> 1102 bytes .../on-equipped-HELMET.png | Bin 0 -> 1151 bytes .../nfsd_experimental.rsi/on-inhand-left.png | Bin 0 -> 885 bytes .../nfsd_experimental.rsi/on-inhand-right.png | Bin 0 -> 934 bytes .../Head/Helmets/nfsd.rsi/equipped-HELMET.png | Bin 0 -> 807 bytes .../Clothing/Head/Helmets/nfsd.rsi/icon.png | Bin 0 -> 285 bytes .../Head/Helmets/nfsd.rsi/inhand-left.png | Bin 0 -> 843 bytes .../Head/Helmets/nfsd.rsi/inhand-right.png | Bin 0 -> 883 bytes .../nfsd.rsi/light-equipped-HELMET.png | Bin 0 -> 930 bytes .../nfsd.rsi/lighton-equipped-HELMET.png | Bin 0 -> 996 bytes .../Clothing/Head/Helmets/nfsd.rsi/meta.json | 34 +++ .../equipped-NECK.png | Bin 0 -> 201 bytes .../nfsd_silvercross_badge.rsi/icon.png | Bin 0 -> 317 bytes .../inhand-left.png | Bin 0 -> 402 bytes .../inhand-right.png | Bin 0 -> 410 bytes .../nfsd_silvercross_badge.rsi/meta.json | 26 +++ .../equipped-OUTERCLOTHING.png | Bin 0 -> 2552 bytes .../Hardsuits/nfsd_experimental.rsi/icon.png | Bin 0 -> 1161 bytes .../nfsd_experimental.rsi/inhand-left.png | Bin 0 -> 418 bytes .../nfsd_experimental.rsi/inhand-right.png | Bin 0 -> 393 bytes .../Hardsuits/nfsd_experimental.rsi/meta.json | 26 +++ .../_NF/Objects/Misc/stamps.rsi/meta.json | 14 ++ .../Objects/Misc/stamps.rsi/stamp-sheriff.png | Bin 0 -> 294 bytes .../Security/nfsdbarrier.rsi/idle.png | Bin 0 -> 828 bytes .../Security/nfsdbarrier.rsi/locked.png | Bin 0 -> 1536 bytes .../Security/nfsdbarrier.rsi/meta.json | 26 +++ .../vending_machine_restock.rsi/meta.json | 6 + .../refill_nfsddrobe.png | Bin 0 -> 318 bytes .../refill_nfsdtec.png | Bin 0 -> 352 bytes .../Jetpacks/nfsd.rsi/equipped-BACKPACK.png | Bin 0 -> 818 bytes .../Tanks/Jetpacks/nfsd.rsi/icon-on.png | Bin 0 -> 591 bytes .../Objects/Tanks/Jetpacks/nfsd.rsi/icon.png | Bin 0 -> 484 bytes .../Tanks/Jetpacks/nfsd.rsi/inhand-left.png | Bin 0 -> 609 bytes .../Tanks/Jetpacks/nfsd.rsi/inhand-right.png | Bin 0 -> 628 bytes .../Objects/Tanks/Jetpacks/nfsd.rsi/meta.json | 59 ++++++ .../nfsd.rsi/on-equipped-BACKPACK.png | Bin 0 -> 1087 bytes .../Decoration/banner.rsi/meta.json | 17 ++ .../Decoration/banner.rsi/nfsd-banner.png | Bin 0 -> 574 bytes .../Decoration/banner.rsi/nfsd-flag.png | Bin 0 -> 686 bytes .../Airlocks/Glass/nfsd.rsi/assembly.png | Bin 0 -> 1120 bytes .../Airlocks/Glass/nfsd.rsi/bolted_unlit.png | Bin 0 -> 144 bytes .../Doors/Airlocks/Glass/nfsd.rsi/closed.png | Bin 0 -> 1269 bytes .../Airlocks/Glass/nfsd.rsi/closed_unlit.png | Bin 0 -> 144 bytes .../Doors/Airlocks/Glass/nfsd.rsi/closing.png | Bin 0 -> 2364 bytes .../Airlocks/Glass/nfsd.rsi/closing_unlit.png | Bin 0 -> 432 bytes .../Airlocks/Glass/nfsd.rsi/deny_unlit.png | Bin 0 -> 321 bytes .../Glass/nfsd.rsi/emergency_unlit.png | Bin 0 -> 588 bytes .../Doors/Airlocks/Glass/nfsd.rsi/meta.json | 195 +++++++++++++++++ .../Doors/Airlocks/Glass/nfsd.rsi/open.png | Bin 0 -> 363 bytes .../Doors/Airlocks/Glass/nfsd.rsi/opening.png | Bin 0 -> 2330 bytes .../Airlocks/Glass/nfsd.rsi/opening_unlit.png | Bin 0 -> 284 bytes .../Airlocks/Glass/nfsd.rsi/panel_closing.png | Bin 0 -> 445 bytes .../Airlocks/Glass/nfsd.rsi/panel_open.png | Bin 0 -> 315 bytes .../Airlocks/Glass/nfsd.rsi/panel_opening.png | Bin 0 -> 470 bytes .../Doors/Airlocks/Glass/nfsd.rsi/sparks.png | Bin 0 -> 697 bytes .../Airlocks/Glass/nfsd.rsi/sparks_broken.png | Bin 0 -> 183 bytes .../Glass/nfsd.rsi/sparks_damaged.png | Bin 0 -> 184 bytes .../Airlocks/Glass/nfsd.rsi/sparks_open.png | Bin 0 -> 175 bytes .../Doors/Airlocks/Glass/nfsd.rsi/welded.png | Bin 0 -> 296 bytes .../VendingMachines/nfsddrobe.rsi/broken.png | Bin 0 -> 455 bytes .../VendingMachines/nfsddrobe.rsi/meta.json | 33 +++ .../nfsddrobe.rsi/normal-unshaded.png | Bin 0 -> 1301 bytes .../VendingMachines/nfsddrobe.rsi/off.png | Bin 0 -> 359 bytes .../VendingMachines/nfsddrobe.rsi/panel.png | Bin 0 -> 203 bytes .../VendingMachines/nfsdtec.rsi/broken.png | Bin 0 -> 576 bytes .../VendingMachines/nfsdtec.rsi/meta.json | 33 +++ .../nfsdtec.rsi/normal-unshaded.png | Bin 0 -> 869 bytes .../VendingMachines/nfsdtec.rsi/off.png | Bin 0 -> 516 bytes .../VendingMachines/nfsdtec.rsi/panel.png | Bin 0 -> 347 bytes .../Machines/computers.rsi/meta.json | 30 +++ .../Machines/computers.rsi/shipyard_nfsd.png | Bin 0 -> 2186 bytes .../Storage/Crates/nfsd_brigmed.rsi/base.png | Bin 0 -> 400 bytes .../Crates/nfsd_brigmed.rsi/closed.png | Bin 0 -> 313 bytes .../Storage/Crates/nfsd_brigmed.rsi/icon.png | Bin 0 -> 536 bytes .../Crates/nfsd_brigmed.rsi/locked.png | Bin 0 -> 147 bytes .../Storage/Crates/nfsd_brigmed.rsi/meta.json | 45 ++++ .../Storage/Crates/nfsd_brigmed.rsi/open.png | Bin 0 -> 329 bytes .../Crates/nfsd_brigmed.rsi/sparking.png | Bin 0 -> 206 bytes .../Crates/nfsd_brigmed.rsi/unlocked.png | Bin 0 -> 142 bytes .../Crates/nfsd_brigmed.rsi/welded.png | Bin 0 -> 294 bytes .../Storage/Crates/nfsd_secure1.rsi/base.png | Bin 0 -> 401 bytes .../Crates/nfsd_secure1.rsi/closed.png | Bin 0 -> 253 bytes .../Storage/Crates/nfsd_secure1.rsi/icon.png | Bin 0 -> 469 bytes .../Crates/nfsd_secure1.rsi/locked.png | Bin 0 -> 147 bytes .../Storage/Crates/nfsd_secure1.rsi/meta.json | 45 ++++ .../Storage/Crates/nfsd_secure1.rsi/open.png | Bin 0 -> 273 bytes .../Crates/nfsd_secure1.rsi/sparking.png | Bin 0 -> 206 bytes .../Crates/nfsd_secure1.rsi/unlocked.png | Bin 0 -> 142 bytes .../Crates/nfsd_secure1.rsi/welded.png | Bin 0 -> 294 bytes .../Storage/Crates/nfsd_secure2.rsi/base.png | Bin 0 -> 401 bytes .../Crates/nfsd_secure2.rsi/closed.png | Bin 0 -> 313 bytes .../Storage/Crates/nfsd_secure2.rsi/icon.png | Bin 0 -> 534 bytes .../Crates/nfsd_secure2.rsi/locked.png | Bin 0 -> 147 bytes .../Storage/Crates/nfsd_secure2.rsi/meta.json | 45 ++++ .../Storage/Crates/nfsd_secure2.rsi/open.png | Bin 0 -> 329 bytes .../Crates/nfsd_secure2.rsi/sparking.png | Bin 0 -> 206 bytes .../Crates/nfsd_secure2.rsi/unlocked.png | Bin 0 -> 142 bytes .../Crates/nfsd_secure2.rsi/welded.png | Bin 0 -> 294 bytes .../Structures/Storage/closet.rsi/meta.json | 54 +++++ .../Structures/Storage/closet.rsi/nfsd.png | Bin 0 -> 329 bytes .../Storage/closet.rsi/nfsd_brigmed.png | Bin 0 -> 411 bytes .../Storage/closet.rsi/nfsd_brigmed_door.png | Bin 0 -> 521 bytes .../Storage/closet.rsi/nfsd_brigmed_open.png | Bin 0 -> 414 bytes .../Storage/closet.rsi/nfsd_copper.png | Bin 0 -> 372 bytes .../Storage/closet.rsi/nfsd_copper_door.png | Bin 0 -> 452 bytes .../Storage/closet.rsi/nfsd_copper_open.png | Bin 0 -> 369 bytes .../Storage/closet.rsi/nfsd_door.png | Bin 0 -> 446 bytes .../Storage/closet.rsi/nfsd_gold.png | Bin 0 -> 352 bytes .../Storage/closet.rsi/nfsd_gold_door.png | Bin 0 -> 448 bytes .../Storage/closet.rsi/nfsd_gold_open.png | Bin 0 -> 350 bytes .../Storage/closet.rsi/nfsd_open.png | Bin 0 -> 327 bytes .../Storage/closet.rsi/nfsd_sheriff.png | Bin 0 -> 329 bytes .../Storage/closet.rsi/nfsd_sheriff_door.png | Bin 0 -> 542 bytes .../Storage/closet.rsi/nfsd_sheriff_open.png | Bin 0 -> 327 bytes .../Storage/closet.rsi/nfsd_silver.png | Bin 0 -> 392 bytes .../Storage/closet.rsi/nfsd_silver_door.png | Bin 0 -> 452 bytes .../Storage/closet.rsi/nfsd_silver_open.png | Bin 0 -> 391 bytes 173 files changed, 2052 insertions(+), 130 deletions(-) create mode 100644 Resources/Locale/en-US/advertisements/vending/nfsddrobe.ftl create mode 100644 Resources/Prototypes/_NF/Catalog/Fills/Crates/nfsd.yml create mode 100644 Resources/Prototypes/_NF/Catalog/Fills/Crates/nfsdarmory.yml create mode 100644 Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/nfsddrobe.yml create mode 100644 Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nfsddrobe.yml create mode 100644 Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nfsdtec.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Misc/stamps.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Tools/jetpacks.yml create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Decoration/banners.yml create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-sheriff.png create mode 100644 Resources/Textures/Structures/Machines/techfab.rsi/nfsd.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/icon-flash.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/off-equipped-HELMET-lizard.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/off-equipped-HELMET-vulpkanin.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/off-equipped-HELMET.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/off-inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/off-inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/on-equipped-HELMET-lizard.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/on-equipped-HELMET-vulpkanin.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/on-equipped-HELMET.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/on-inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/on-inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Helmets/nfsd.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Helmets/nfsd.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Helmets/nfsd.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Helmets/nfsd.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Helmets/nfsd.rsi/light-equipped-HELMET.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Helmets/nfsd.rsi/lighton-equipped-HELMET.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Helmets/nfsd.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Neck/Scarfs/nfsd_silvercross_badge.rsi/equipped-NECK.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Scarfs/nfsd_silvercross_badge.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Scarfs/nfsd_silvercross_badge.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Scarfs/nfsd_silvercross_badge.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Scarfs/nfsd_silvercross_badge.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Misc/stamps.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Misc/stamps.rsi/stamp-sheriff.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Security/nfsdbarrier.rsi/idle.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Security/nfsdbarrier.rsi/locked.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Security/nfsdbarrier.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/refill_nfsddrobe.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/refill_nfsdtec.png create mode 100644 Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/icon-on.png create mode 100644 Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/icon.png create mode 100644 Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/on-equipped-BACKPACK.png create mode 100644 Resources/Textures/_NF/Structures/Decoration/banner.rsi/meta.json create mode 100644 Resources/Textures/_NF/Structures/Decoration/banner.rsi/nfsd-banner.png create mode 100644 Resources/Textures/_NF/Structures/Decoration/banner.rsi/nfsd-flag.png create mode 100644 Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/assembly.png create mode 100644 Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/bolted_unlit.png create mode 100644 Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/closed.png create mode 100644 Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/closed_unlit.png create mode 100644 Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/closing.png create mode 100644 Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/closing_unlit.png create mode 100644 Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/deny_unlit.png create mode 100644 Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/emergency_unlit.png create mode 100644 Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/meta.json create mode 100644 Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/open.png create mode 100644 Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/opening.png create mode 100644 Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/opening_unlit.png create mode 100644 Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/panel_closing.png create mode 100644 Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/panel_open.png create mode 100644 Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/panel_opening.png create mode 100644 Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/sparks.png create mode 100644 Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/sparks_broken.png create mode 100644 Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/sparks_damaged.png create mode 100644 Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/sparks_open.png create mode 100644 Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/welded.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsddrobe.rsi/broken.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsddrobe.rsi/meta.json create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsddrobe.rsi/normal-unshaded.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsddrobe.rsi/off.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsddrobe.rsi/panel.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsdtec.rsi/broken.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsdtec.rsi/meta.json create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsdtec.rsi/normal-unshaded.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsdtec.rsi/off.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsdtec.rsi/panel.png create mode 100644 Resources/Textures/_NF/Structures/Machines/computers.rsi/shipyard_nfsd.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/nfsd_brigmed.rsi/base.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/nfsd_brigmed.rsi/closed.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/nfsd_brigmed.rsi/icon.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/nfsd_brigmed.rsi/locked.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/nfsd_brigmed.rsi/meta.json create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/nfsd_brigmed.rsi/open.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/nfsd_brigmed.rsi/sparking.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/nfsd_brigmed.rsi/unlocked.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/nfsd_brigmed.rsi/welded.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure1.rsi/base.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure1.rsi/closed.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure1.rsi/icon.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure1.rsi/locked.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure1.rsi/meta.json create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure1.rsi/open.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure1.rsi/sparking.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure1.rsi/unlocked.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure1.rsi/welded.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure2.rsi/base.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure2.rsi/closed.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure2.rsi/icon.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure2.rsi/locked.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure2.rsi/meta.json create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure2.rsi/open.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure2.rsi/sparking.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure2.rsi/unlocked.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure2.rsi/welded.png create mode 100644 Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd.png create mode 100644 Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_brigmed.png create mode 100644 Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_brigmed_door.png create mode 100644 Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_brigmed_open.png create mode 100644 Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_copper.png create mode 100644 Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_copper_door.png create mode 100644 Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_copper_open.png create mode 100644 Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_door.png create mode 100644 Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_gold.png create mode 100644 Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_gold_door.png create mode 100644 Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_gold_open.png create mode 100644 Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_open.png create mode 100644 Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_sheriff.png create mode 100644 Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_sheriff_door.png create mode 100644 Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_sheriff_open.png create mode 100644 Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_silver.png create mode 100644 Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_silver_door.png create mode 100644 Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_silver_open.png diff --git a/Resources/Locale/en-US/advertisements/vending/nfsddrobe.ftl b/Resources/Locale/en-US/advertisements/vending/nfsddrobe.ftl new file mode 100644 index 00000000000..45279b7bb0f --- /dev/null +++ b/Resources/Locale/en-US/advertisements/vending/nfsddrobe.ftl @@ -0,0 +1,5 @@ +advertisement-nfsddrobe-1 = Looking To 'Cop' A Fresh Look? +advertisement-nfsddrobe-2 = From Boots to Caps, We Got Your Back +advertisement-nfsddrobe-3 = Enforce Fashion With Arresting Attire +advertisement-nfsddrobe-4 = Serve Justice, Look Fabulous! +advertisement-nfsddrobe-5 = Now you can wear your brown pants too diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml index 046ab18ea01..0d7c84c81d9 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -141,7 +141,7 @@ - id: BoxSurvivalSecurity - id: Flash - id: MagazinePistol - - id: RubberStampHos # Frontier + - id: RubberStampSheriff # Frontier - id: DoorRemoteSecurity # Frontier - id: SecurityTechFabCircuitboard # Frontier - id: BaseSecurityUplinkRadioSheriff # Frontier @@ -399,3 +399,4 @@ - id: BoxSurvivalBrigmedic - id: Flash - id: FrontierUplinkCoin5 + - id: EncryptionKeyMedical \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index 65bb5dfabc4..b98e784095e 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -151,7 +151,7 @@ - id: BoxSurvivalSecurity - id: Flash - id: MagazinePistol - - id: RubberStampHos # Frontier + - id: RubberStampSheriff # Frontier - id: DoorRemoteSecurity # Frontier - id: SecurityTechFabCircuitboard # Frontier - id: BaseSecurityUplinkRadioSheriff # Frontier diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml index 9e93242a26b..1f33a5863ac 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -165,7 +165,7 @@ - id: BoxSurvivalSecurity - id: Flash - id: MagazinePistol - - id: RubberStampHos # Frontier + - id: RubberStampSheriff # Frontier - id: DoorRemoteSecurity # Frontier - id: SecurityTechFabCircuitboard # Frontier - id: BaseSecurityUplinkRadioSheriff # Frontier diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index b285bb9b9e5..28e5035b022 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -1,3 +1,99 @@ +- type: entity + id: LockerBrigmedicFilledHardsuit + suffix: Filled, Hardsuit + parent: LockerBrigmedic + components: + - type: StorageFill + contents: +# - id: ClothingEyesHudSecurity +# - id: WeaponDisabler + - id: ClothingOuterHardsuitBrigmedic + - id: BoxSterileMask +# - id: ClothingHeadHatBeretBrigmedic +# - id: ClothingOuterCoatAMG +# - id: ClothingUniformJumpsuitBrigmedic +# - id: ClothingUniformJumpskirtBrigmedic +# - id: ClothingUniformJumpskirtOfLife +# prob: 0.1 + - id: MedkitFilled + - id: MedkitCombatFilled +# prob: 0.6 + - id: MedkitAdvancedFilled +# prob: 0.4 +# - id: MedkitOxygenFilled +# prob: 0.3 +# - id: MedkitBruteFilled +# prob: 0.3 +# - id: MedkitToxinFilled +# prob: 0.3 +# - id: MedkitBurnFilled +# prob: 0.7 +# - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse +# prob: 0.15 +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled + - id: ClothingMaskBreathMedicalSecurity + - id: JetpackSecurityFilled + - id: HandheldGPSBasic + - id: ClothingShoesBootsMagCombatFilled + - id: HypoBrigmedic # Frontier + +- type: entity + id: LockerBrigmedicFilled + suffix: Filled + parent: LockerBrigmedic + components: + - type: StorageFill + contents: +# - id: ClothingEyesHudSecurity +# - id: WeaponDisabler + - id: BoxSterileMask +# - id: ClothingHeadHatBeretBrigmedic +# - id: ClothingOuterCoatAMG +# - id: ClothingUniformJumpsuitBrigmedic +# - id: ClothingUniformJumpskirtBrigmedic +# - id: ClothingUniformJumpskirtOfLife +# prob: 0.1 + - id: MedkitFilled + - id: MedkitCombatFilled +# prob: 0.6 + - id: MedkitAdvancedFilled +# prob: 0.4 +# - id: MedkitOxygenFilled +# prob: 0.3 +# - id: MedkitBruteFilled +# prob: 0.3 +# - id: MedkitToxinFilled +# prob: 0.3 +# - id: MedkitBurnFilled +# prob: 0.7 +# - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse +# prob: 0.15 + - id: HypoBrigmedic # Frontier + +- type: entity + id: LockerSecurityFilled + suffix: Filled + parent: LockerSecurity + components: + - type: StorageFill + contents: +# - id: FlashlightSeclite +# - id: ClothingUniformJumpsuitSecGrey +# prob: 0.3 + - id: ClothingHeadHelmetBasic + - id: ClothingOuterArmorBasic +# - id: ClothingBeltSecurityFilled +# - id: Flash +# - id: ClothingEyesGlassesSecurity + - id: ClothingHeadsetSecuritySafe # Ask SR or Sheriff for keys +# - id: ClothingHandsGlovesColorBlack +# - id: ClothingShoesBootsJack +# - id: WeaponMeleeNeedle +# prob: 0.1 +# - id: ClothingEyesHudSecurity + - type: entity id: LockerWardenFilledHardsuit suffix: Filled, Hardsuit @@ -55,28 +151,6 @@ # - id: HoloprojectorSecurity # Frontier - Starting gear # - id: ClothingEyesHudSecurity -- type: entity - id: LockerSecurityFilled - suffix: Filled - parent: LockerSecurity - components: - - type: StorageFill - contents: -# - id: FlashlightSeclite -# - id: ClothingUniformJumpsuitSecGrey -# prob: 0.3 - - id: ClothingHeadHelmetBasic - - id: ClothingOuterArmorBasic -# - id: ClothingBeltSecurityFilled -# - id: Flash -# - id: ClothingEyesGlassesSecurity - - id: ClothingHeadsetSecuritySafe # Ask SR or Sheriff for keys -# - id: ClothingHandsGlovesColorBlack -# - id: ClothingShoesBootsJack -# - id: WeaponMeleeNeedle -# prob: 0.1 -# - id: ClothingEyesHudSecurity - - type: entity id: LockerDetectiveFilled suffix: Filled diff --git a/Resources/Prototypes/Entities/Markers/Spawners/vending_machine_restock.yml b/Resources/Prototypes/Entities/Markers/Spawners/vending_machine_restock.yml index 704b5e432ba..eadeab57129 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/vending_machine_restock.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/vending_machine_restock.yml @@ -60,4 +60,4 @@ - type: ConditionalSpawner prototypes: - VendingMachineRestockRobustSoftdrinks - - VendingMachineRestockHotDrinks + - VendingMachineRestockHotDrinks \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/backpack.yml index b11642fa23e..9620064a6e6 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -63,7 +63,7 @@ - type: entity noSpawn: true - parent: ClothingBackpackSecurity + parent: ClothingBackpacknfsd id: ClothingBackpackOfficerFilled components: - type: StorageFill diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index 8b40fdd820d..bedb635eba8 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -63,7 +63,7 @@ - type: entity noSpawn: true - parent: ClothingBackpackDuffelSecurity + parent: ClothingBackpackDuffelnfsd id: ClothingBackpackDuffelOfficerFilled components: - type: StorageFill diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/satchel.yml index a1384bbd072..a05a54feb00 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -63,7 +63,7 @@ - type: entity noSpawn: true - parent: ClothingBackpackSatchelSecurity + parent: ClothingBackpackSatchelnfsd id: ClothingBackpackSatchelOfficerFilled components: - type: StorageFill diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/nfsd.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/nfsd.yml new file mode 100644 index 00000000000..0d734b80341 --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/nfsd.yml @@ -0,0 +1,116 @@ +- type: entity + id: CrateNFSDArmor + parent: CratenfsdSecure1 + name: nfsd armor crate + description: Three vests of well-rounded, decently-protective armor. Requires Security access to open. + components: + - type: StorageFill + contents: + - id: ClothingOuterArmorNfsdArmor + amount: 3 + +- type: entity + id: CrateNFSDHelmet + parent: CratenfsdSecure1 + name: nfsd helmet crate + description: Contains three standard-issue brain buckets. Requires Security access to open. + components: + - type: StorageFill + contents: + - id: ClothingHeadHelmetNFSD + amount: 3 + +- type: entity + id: CrateNFSDNonlethal + parent: CratenfsdSecure1 + name: nfsd nonlethals crate + description: Disabler weapons. Requires Security access to open. + components: + - type: StorageFill + contents: + - id: WeaponDisabler + amount: 3 + - id: Stunbaton + amount: 3 + - id: BoxFlashbang + - id: Flash + amount: 3 +# - Pepperspray +# - GrenadeTeargas + +- type: entity + id: CrateNFSDRiot + parent: CratenfsdSecure1 + name: nfsd swat crate + description: Contains two sets of riot armor, helmets, shields, and enforcers loaded with beanbags. Extra ammo is included. Requires Armory access to open. + components: + - type: StorageFill + contents: + - id: ClothingOuterArmorRiot + amount: 2 + - id: ClothingHeadHelmetRiot + amount: 2 + - id: WeaponShotgunEnforcerRubber + amount: 2 + - id: BoxBeanbag + amount: 2 + - id: RiotShield + amount: 2 +# - SecGasmask + +- type: entity + id: CrateNFSDSupplies + parent: CratenfsdSecure1 + name: nfsd supplies crate + description: Contains various supplies for the station's Security team. Requires Security access to open. + components: + - type: StorageFill + contents: + - id: BoxHandcuff + - id: BoxSechud +# - SecBelt +# - SecGasmask +# - SpacelawBook + +- type: entity + id: CrateNFSDRestraints + parent: CratenfsdSecure2 + name: nfsd restraints crate + description: Contains two boxes each of handcuffs and zipties. Requires Security access to open. + components: + - type: StorageFill + contents: + - id: BoxHandcuff + amount: 2 + - id: BoxZiptie + amount: 2 + +- type: entity + id: CrateNFSDBioSuit + parent: CratenfsdSecure2 + name: nfsd bio suit crate + description: Contains 2 biohazard suits to ensure that no disease will distract you from your duties. Requires Security access to open. + components: + - type: StorageFill + contents: + - id: ClothingOuterBioSecurity + amount: 2 + - id: ClothingHeadHatHoodBioSecurity + amount: 2 + - id: ClothingMaskSterile + amount: 2 + +- type: entity + id: CrateNFSDImplants + name: nfsd implanter crate + description: Contains 4 MindShield implants and 4 tracking implant. Requires Security access to open. + parent: CratenfsdSecure2 + components: + - type: StorageFill + contents: + - id: MindShieldImplanter + amount: 4 + - id: TrackingImplanter + amount: 4 + +# Cosmetic Crates diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/nfsdarmory.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/nfsdarmory.yml new file mode 100644 index 00000000000..5ed653ca727 --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/nfsdarmory.yml @@ -0,0 +1,71 @@ +- type: entity + id: CrateArmorySMGNFSD + parent: CratenfsdSecure1 + name: nfsd SMG crate + description: Contains two high-powered, semiautomatic rifles with four mags. Requires Armory access to open. + components: + - type: StorageFill + contents: + - id: WeaponSubMachineGunWt550 + amount: 2 + - id: MagazinePistolSubMachineGunTopMounted + amount: 4 + +- type: entity + id: CrateArmoryShotgunNFSD + parent: CratenfsdSecure1 + name: nfsd shotgun crate + description: For when the enemy absolutely needs to be replaced with lead. Contains two Enforcer Combat Shotguns, and some standard shotgun shells. Requires Armory access to open. + components: + - type: StorageFill + contents: + - id: WeaponShotgunKammerer + amount: 2 + - id: BoxLethalshot + amount: 3 + +- type: entity + id: CrateTrackingImplantsNFSD + parent: CratenfsdSecure1 + name: nfsd tracking implants + description: Contains a handful of tracking implanters. Good for prisoners you'd like to release but still keep track of. + components: + - type: StorageFill + contents: + - id: TrackingImplanter + amount: 5 + +- type: entity + parent: CratenfsdSecure2 + id: CrateTrainingBombsNFSD + name: nfsd training bombs + description: Contains three low-yield training bombs for security to learn defusal and safe ordnance disposal, EOD suit not included. Requires Armory access to open. + components: + - type: StorageFill + contents: + - id: TrainingBomb + amount: 3 + +- type: entity + id: CrateArmoryLaserNFSD + parent: CratenfsdSecure2 + name: nfsd lasers crate + description: Contains three standard-issue laser rifles. Requires Armory access to open. + components: + - type: StorageFill + contents: + - id: WeaponLaserCarbine + amount: 3 + +- type: entity + id: CrateArmoryPistolsNFSD + parent: CratenfsdSecure2 + name: nfsd pistols crate + description: Contains two standard NT pistols with four mags. Requires Armory access to open. + components: + - type: StorageFill + contents: + - id: WeaponPistolMk58 + amount: 2 + - id: MagazinePistol + amount: 4 diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/security.yml index 32c91e0e540..199d2cade40 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/security.yml @@ -1,77 +1,3 @@ -- type: entity - id: LockerBrigmedicFilledHardsuit - suffix: Filled, Hardsuit - parent: LockerBrigmedic - components: - - type: StorageFill - contents: -# - id: ClothingEyesHudSecurity -# - id: WeaponDisabler - - id: ClothingOuterHardsuitBrigmedic - - id: BoxSterileMask -# - id: ClothingHeadHatBeretBrigmedic -# - id: ClothingOuterCoatAMG -# - id: ClothingUniformJumpsuitBrigmedic -# - id: ClothingUniformJumpskirtBrigmedic -# - id: ClothingUniformJumpskirtOfLife -# prob: 0.1 - - id: MedkitFilled - - id: MedkitCombatFilled -# prob: 0.6 - - id: MedkitAdvancedFilled -# prob: 0.4 -# - id: MedkitOxygenFilled -# prob: 0.3 -# - id: MedkitBruteFilled -# prob: 0.3 -# - id: MedkitToxinFilled -# prob: 0.3 -# - id: MedkitBurnFilled -# prob: 0.7 -# - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse -# prob: 0.15 -# - id: NitrogenTankFilled -# - id: OxygenTankFilled - - id: AirTankFilled - - id: ClothingMaskBreathMedicalSecurity - - id: JetpackSecurityFilled - - id: HandheldGPSBasic - - id: ClothingShoesBootsMagCombatFilled - - id: HypoBrigmedic # Frontier - -- type: entity - id: LockerBrigmedicFilled - suffix: Filled - parent: LockerBrigmedic - components: - - type: StorageFill - contents: -# - id: ClothingEyesHudSecurity -# - id: WeaponDisabler - - id: BoxSterileMask -# - id: ClothingHeadHatBeretBrigmedic -# - id: ClothingOuterCoatAMG -# - id: ClothingUniformJumpsuitBrigmedic -# - id: ClothingUniformJumpskirtBrigmedic -# - id: ClothingUniformJumpskirtOfLife -# prob: 0.1 - - id: MedkitFilled - - id: MedkitCombatFilled -# prob: 0.6 - - id: MedkitAdvancedFilled -# prob: 0.4 -# - id: MedkitOxygenFilled -# prob: 0.3 -# - id: MedkitBruteFilled -# prob: 0.3 -# - id: MedkitToxinFilled -# prob: 0.3 -# - id: MedkitBurnFilled -# prob: 0.7 -# - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse -# prob: 0.15 - - id: HypoBrigmedic # Frontier - - type: entity id: LockerMercenaryFilled suffix: Filled diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml index 8314c35fa72..db55b86c18b 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml @@ -113,3 +113,117 @@ # - id: ClothingShoesBootsMagMercenaryFilled # Frontier - Not adding this to the suit storage so it wont be abused, exists only on role spawn. - type: AccessReader # access: [["Captain"], ["Pilot"]] + +#Cadet hardsuit +- type: entity + id: SuitStorageCadet + parent: SuitStorageBase + suffix: NFSDCadet + components: + - type: StorageFill + contents: +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled + - id: ClothingOuterHardsuitNfsdBronze # Frontier + - id: ClothingMaskBreathMedicalSecurity + - id: JetpackSecurityFilled + - id: HandheldGPSBasic + - id: ClothingShoesBootsMagNfsd # Frontier + - type: AccessReader + access: [["Security"]] + +#Deputy hardsuit +- type: entity + id: SuitStorageDeputy + parent: SuitStorageBase + suffix: NFSDDeputy + components: + - type: StorageFill + contents: +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled + - id: ClothingOuterHardsuitNfsdSilver # Frontier + - id: ClothingMaskBreathMedicalSecurity + - id: JetpackSecurityFilled + - id: HandheldGPSBasic + - id: ClothingShoesBootsMagNfsd # Frontier + - type: AccessReader + access: [["Security"]] + +#Brigmed hardsuit +- type: entity + id: SuitStorageBrigmed + parent: SuitStorageBase + suffix: NFSDBrigMedic + components: + - type: StorageFill + contents: +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled + - id: ClothingOuterHardsuitNfsdBrigMed # Frontier + - id: ClothingMaskBreathMedicalSecurity + - id: JetpackSecurityFilled + - id: HandheldGPSBasic + - id: ClothingShoesBootsMagNfsd # Frontier + - type: AccessReader + access: [["Security"]] + +#Sergeant hardsuit +- type: entity + id: SuitStorageSergeant + parent: SuitStorageBase + suffix: NFSDSergeant + components: + - type: StorageFill + contents: +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled + - id: ClothingOuterHardsuitNfsdGold # Frontier + - id: ClothingMaskBreathMedicalSecurity + - id: JetpackSecurityFilled + - id: HandheldGPSBasic + - id: ClothingShoesBootsMagNfsd # Frontier + - type: AccessReader + access: [["Security"]] + +#Bailiff hardsuit +- type: entity + id: SuitStorageBailiff + parent: SuitStorageBase + suffix: NFSDBailiff + components: + - type: StorageFill + contents: +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled + - id: ClothingOuterHardsuitNfsdGold # Frontier + - id: ClothingMaskBreathMedicalSecurity + - id: JetpackSecurityFilled + - id: HandheldGPSBasic + - id: ClothingShoesBootsMagNfsd # Frontier + - type: AccessReader + access: [["Security"]] + +#Sheriff hardsuit +- type: entity + id: SuitStorageSheriff + parent: SuitStorageBase + suffix: NFSDSheriff + components: + - type: StorageFill + contents: +# - id: NitrogenTankFilled +# - id: OxygenTankFilled + - id: AirTankFilled + - id: ClothingOuterHardsuitNfsdSheriff # Frontier + - id: ClothingMaskBreathMedicalSecurity + - id: JetpackSecurityFilled + - id: HandheldGPSBasic + - id: ClothingShoesBootsMagNfsd # Frontier + - type: AccessReader + access: [["Security"]] \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage_wallmount.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage_wallmount.yml index 82d934f30f5..0f04798afbe 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage_wallmount.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage_wallmount.yml @@ -136,3 +136,33 @@ - type: entity id: SuitStorageWallmountClown parent: [SuitStorageWallmount, SuitStorageClown] + +#NFSDCadet +- type: entity + id: SuitStorageWallmountCadet + parent: [SuitStorageWallmount, SuitStorageCadet] + +#NFSDDeputy +- type: entity + id: SuitStorageWallmountDeputy + parent: [SuitStorageWallmount, SuitStorageDeputy] + +#NFSDBrigmed +- type: entity + id: SuitStorageWallmountBrigmed + parent: [SuitStorageWallmount, SuitStorageBrigmed] + +#NFSDSergeant +- type: entity + id: SuitStorageWallmountSergeant + parent: [SuitStorageWallmount, SuitStorageSergeant] + +#NFSDBailiff +- type: entity + id: SuitStorageWallmountBailiff + parent: [SuitStorageWallmount, SuitStorageBailiff] + +#NFSDSheriff +- type: entity + id: SuitStorageWallmountSheriff + parent: [SuitStorageWallmount, SuitStorageSheriff] \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/nfsddrobe.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/nfsddrobe.yml new file mode 100644 index 00000000000..b69f8adbe15 --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/nfsddrobe.yml @@ -0,0 +1,10 @@ +- type: advertisementsPack + id: NFSDDrobeAds + advertisements: + - advertisement-nfsddrobe-1 + - advertisement-nfsddrobe-2 + - advertisement-nfsddrobe-3 + - advertisement-nfsddrobe-4 + - advertisement-nfsddrobe-5 + thankyous: + - vending-machine-thanks diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nfsddrobe.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nfsddrobe.yml new file mode 100644 index 00000000000..4bacda032a8 --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nfsddrobe.yml @@ -0,0 +1,37 @@ +- type: vendingMachineInventory + id: NFSDDrobeInventory + startingInventory: + ClothingBackpacknfsd: 6 + ClothingBackpackSatchelnfsd: 6 + ClothingBackpackDuffelnfsd: 6 + ClothingBackpackMessengerSecurity: 6 # Frontier + ClothingHeadHatNfsdBeretGreen: 6 + ClothingHeadHatNfsdBeretBrown: 6 + ClothingHeadHatNfsdBeretCream: 6 + ClothingHeadHatNfsdCampaign: 6 + ClothingHandsGlovesCombatNfsdBrown: 6 + ClothingHandsGlovesCombatNfsdCream: 6 + ClothingUniformJumpskirtNfsd: 6 + ClothingUniformJumpskirtNfsdShort: 6 + ClothingUniformJumpsuitNfsd: 6 + ClothingUniformJumpsuitNfsdShort: 6 + ClothingUniformJumpsuitNfsdTacBlack: 6 + ClothingUniformJumpsuitNfsdTacGray: 6 + ClothingUniformJumpsuitNfsdTacCamo: 6 + ClothingUniformJumpsuitNfsdTacCream: 6 + ClothingHeadsetNFSDgreenSafe: 6 # Frontier - Ask SR or Sheriff for keys + ClothingHeadsetNFSDbrownSafe: 6 # Frontier - Ask SR or Sheriff for keys + ClothingHeadsetNFSDcbSafe: 6 # Frontier - Ask SR or Sheriff for keys + ClothingMaskGasSecurity: 6 + ClothingHeadHelmetNFSD: 6 # Frontier + ClothingOuterArmorNfsdArmor: 6 + ClothingOuterCoatNfsdBomber: 6 + ClothingOuterCoatNfsdLongCoat: 6 + ClothingOuterCoatNfsdFormal: 6 + ClothingMaskBreathMedicalSecurity: 6 + ClothingEyesBlindfold: 3 + ClothingShoesBootsNFSDBrown: 6 + ClothingShoesBootsNFSDCream: 6 + ClothingShoesBootsMagNfsd: 3 + contrabandInventory: + ClothingUniformJumpskirtOfLife: 3 diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nfsdtec.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nfsdtec.yml new file mode 100644 index 00000000000..a2e766d0f84 --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nfsdtec.yml @@ -0,0 +1,35 @@ +- type: vendingMachineInventory + id: NFSDTecInventory + startingInventory: + Handcuffs: 10 + Zipties: 10 + GrenadeFlashBang: 10 + SecurityWhistle: 5 + TearGasGrenade: 4 + ClusterBangFull: 2 + GrenadeStinger: 4 + Flash: 10 + FlashlightSeclite: 10 + Tourniquet: 5 + ClothingEyesGlassesSunglasses: 5 + ClothingEyesGlassesNFSD: 5 # Frontier + ClothingEyesHudNfsd: 10 + ClothingEyesEyepatchHudSecurity: 5 + ClothingBeltNfsdWebbing: 10 + ClothingBeltNfsd: 10 # Frontier + RiotShield: 3 + RiotLaserShield: 3 + RiotBulletShield: 3 + Stunbaton: 10 + WeaponDisabler: 10 + CrowbarRed: 10 # Frontier + ForensicScanner: 3 # Frontier + BoxForensicPad: 3 # Frontier + LogProbeCartridge: 3 # Frontier + TrackingImplanter: 5 # Frontier +# MindShieldImplanter: 5 # Frontier + # security officers need to follow a diet regimen! + contrabandInventory: + FoodDonutHomer: 3 # Frontier - No more then 3 + FoodBoxDonut: 3 # Frontier - No more then 3 + #box evidence diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/_NF/Entities/Clothing/Back/backpacks.yml index c051d0d533d..c520c78f3ea 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Back/backpacks.yml @@ -66,7 +66,6 @@ - type: Sprite sprite: _NF/Clothing/Back/Backpacks/nfsd_backpack.rsi - - type: entity parent: ClothingBackpack id: ClothingBackpacknfsdsheriff diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets.yml index 05eb08f2f5a..83df47bbdd7 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets.yml @@ -53,3 +53,36 @@ sprite: _NF/Clothing/Ears/Headsets/nfsd_e_cb.rsi - type: Clothing sprite: _NF/Clothing/Ears/Headsets/nfsd_e_cb.rsi + +- type: entity + parent: ClothingHeadsetSecuritySafe + id: ClothingHeadsetNFSDgreenSafe # Ask SR or Sheriff for keys + name: nfsd headset + description: A headset for deputy sheriff's. + components: + - type: Sprite + sprite: _NF/Clothing/Ears/Headsets/nfsd_e_green.rsi + - type: Clothing + sprite: _NF/Clothing/Ears/Headsets/nfsd_e_green.rsi + +- type: entity + parent: ClothingHeadsetSecuritySafe + id: ClothingHeadsetNFSDbrownSafe # Ask SR or Sheriff for keys + name: nfsd headset + description: A headset for deputy sheriff's. + components: + - type: Sprite + sprite: _NF/Clothing/Ears/Headsets/nfsd_e_brown.rsi + - type: Clothing + sprite: _NF/Clothing/Ears/Headsets/nfsd_e_brown.rsi + +- type: entity + parent: ClothingHeadsetSecuritySafe + id: ClothingHeadsetNFSDcbSafe # Ask SR or Sheriff for keys + name: nfsd headset + description: A headset for deputy sheriff's. + components: + - type: Sprite + sprite: _NF/Clothing/Ears/Headsets/nfsd_e_cb.rsi + - type: Clothing + sprite: _NF/Clothing/Ears/Headsets/nfsd_e_cb.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets_alt.yml b/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets_alt.yml index 84d45643646..5925634085c 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets_alt.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets_alt.yml @@ -45,7 +45,7 @@ sprite: _NF/Clothing/Ears/Headsets/pilot.rsi - type: entity - parent: ClothingHeadsetAlt + parent: ClothingHeadsetAltSecurityWarden id: ClothingHeadsetAltNFSDgreen name: nfsd over-ear headset components: @@ -55,7 +55,7 @@ sprite: _NF/Clothing/Ears/Headsets/nfsd_h_green.rsi - type: entity - parent: ClothingHeadsetAlt + parent: ClothingHeadsetAltSecurityWarden id: ClothingHeadsetAltNFSDbrown name: nfsd over-ear headset components: @@ -65,7 +65,7 @@ sprite: _NF/Clothing/Ears/Headsets/nfsd_h_brown.rsi - type: entity - parent: ClothingHeadsetAltSecurity + parent: ClothingHeadsetAltCommand id: ClothingHeadsetAltNFSDCreamandBrown name: sheriff's over-ear headset components: diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml index d05b516f940..e77bcb29ce5 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml @@ -184,3 +184,15 @@ sprite: _NF/Clothing/Head/Hardsuits/nfsd_sheriff_helm.rsi - type: Clothing sprite: _NF/Clothing/Head/Hardsuits/nfsd_sheriff_helm.rsi + +- type: entity + parent: ClothingHeadHelmetHardsuitSyndieReverseEngineered + id: ClothingHeadHelmetHardsuitNfsdExperimental + noSpawn: true + name: nfsd experimental hardsuit helmet + description: An experimental nfsd hardsuit helmet. + components: + - type: Sprite + sprite: _NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi + - type: Clothing + sprite: _NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/helmets.yml index bd1622b240b..43a9f2f2b5d 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/helmets.yml @@ -12,6 +12,7 @@ sprite: _NF/Clothing/Head/Helmets/ert_mailcarrier.rsi - type: Clothing sprite: _NF/Clothing/Head/Helmets/ert_mailcarrier.rsi + # Syndicate Bomb Suit Helmet - type: entity parent: ClothingHeadHelmetBombSuit @@ -46,3 +47,14 @@ sprite: Clothing/Head/Hardsuits/syndiecommander.rsi - type: Clothing sprite: Clothing/Head/Hardsuits/syndiecommander.rsi + +- type: entity + parent: ClothingHeadHelmetBasic + id: ClothingHeadHelmetNFSD + name: nfsd helmet + description: an nfsd issued helmet to protect your head + components: + - type: Sprite + sprite: _NF/Clothing/Head/Helmets/nfsd.rsi + - type: Clothing + sprite: _NF/Clothing/Head/Helmets/nfsd.rsi diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Neck/scarfs.yml b/Resources/Prototypes/_NF/Entities/Clothing/Neck/scarfs.yml index ea7381b1775..37127bc7627 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Neck/scarfs.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Neck/scarfs.yml @@ -50,21 +50,21 @@ sprite: _NF/Clothing/Neck/Scarfs/nfsd_silver_badge.rsi - type: Clothing sprite: _NF/Clothing/Neck/Scarfs/nfsd_silver_badge.rsi - + - type: entity parent: ClothingNeckNfsdBadge - id: ClothingNeckNfsdBadgeDetective - suffix: Silver - Detective + id: ClothingNeckNfsdBadgeSecurityBrigmed + suffix: Silver - Brigmedic components: - type: Sprite - sprite: _NF/Clothing/Neck/Scarfs/nfsd_silver_badge.rsi + sprite: _NF/Clothing/Neck/Scarfs/nfsd_silvercross_badge.rsi - type: Clothing - sprite: _NF/Clothing/Neck/Scarfs/nfsd_silver_badge.rsi + sprite: _NF/Clothing/Neck/Scarfs/nfsd_silvercross_badge.rsi - type: entity parent: ClothingNeckNfsdBadge - id: ClothingNeckNfsdBadgeBrigmedic - suffix: Silver - Brigmedic + id: ClothingNeckNfsdBadgeDetective + suffix: Silver - Detective components: - type: Sprite sprite: _NF/Clothing/Neck/Scarfs/nfsd_silver_badge.rsi diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml index 10ddba58a84..cbaf78b0255 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml @@ -251,3 +251,16 @@ sprite: _NF/Clothing/OuterClothing/Hardsuits/nfsd_brigmed.rsi - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitNfsdBrigmed + +- type: entity + parent: ClothingOuterHardsuitSyndieReverseEngineered + id: ClothingOuterHardsuitNfsdExperimental + name: an experimental nfsd hardsuit + description: An experimental nfsd hardsuit, never before seen! + components: + - type: Sprite + sprite: _NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi + - type: Clothing + sprite: _NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitNfsdExperimental \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Objects/Misc/stamps.yml b/Resources/Prototypes/_NF/Entities/Objects/Misc/stamps.yml new file mode 100644 index 00000000000..b8e2654644b --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Misc/stamps.yml @@ -0,0 +1,36 @@ +- type: entity + name: generic rubber stamp + parent: RubberStampBase + id: RubberStampBaseNF + description: A rubber stamp for stamping important documents. + abstract: true + components: + - type: Stamp + stampedName: stamp-component-stamped-name-default + stampState: "paper_stamp-generic" + stampedColor: "#a23e3e" + sound: + path: /Audio/Items/Stamp/thick_stamp_sub.ogg + params: + volume: -2 + maxDistance: 5 + - type: Sprite + sprite: _NF/Objects/Misc/stamps.rsi + state: stamp-mime + - type: Item + size: Tiny + - type: StealTarget + stealGroup: Stamp + +- type: entity + name: sheriff's rubber stamp + parent: RubberStampBaseNF + id: RubberStampSheriff + suffix: DO NOT MAP + components: + - type: Stamp + stampedName: stamp-component-stamped-name-hos + stampedColor: "#4c653a" + stampState: "paper_stamp-sheriff" + - type: Sprite + state: stamp-sheriff \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/vending_machine_restock.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/vending_machine_restock.yml index ea1594b4336..347e95baeaa 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/vending_machine_restock.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/vending_machine_restock.yml @@ -160,3 +160,37 @@ - state: green_bit shader: unshaded - state: refill_pottedplant + +- type: entity + parent: SecuredVendingMachineRestock + id: VendingMachineRestockNFSDDrobe + name: NFSDDrobe restock box + description: "nfsddrobe restock box - may explode on contact with appendages." + components: + - type: VendingMachineRestock + canRestock: + - NFSDDrobeInventory + - type: Sprite + sprite: _NF/Objects/Specific/Service/vending_machine_restock.rsi + layers: + - state: base + - state: green_bit + shader: unshaded + - state: refill_nfsddrobe + +- type: entity + parent: SecuredVendingMachineRestock + id: VendingMachineRestockNFSDTec + name: NFSDTec restock box + description: "nfsdtec restock box - may unleash a singulo on contact with appendages" + components: + - type: VendingMachineRestock + canRestock: + - NFSDTecInventory + - type: Sprite + sprite: _NF/Objects/Specific/Service/vending_machine_restock.rsi + layers: + - state: base + - state: green_bit + shader: unshaded + - state: refill_nfsdtec \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/security.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/security.yml index abd6a4d3f0d..3252171c22c 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Specific/security.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/security.yml @@ -104,4 +104,81 @@ - type: Store preset: StorePresetSecurityUplink balance: - FrontierUplinkCoin: 10 \ No newline at end of file + FrontierUplinkCoin: 10 + +- type: entity + name: nfsd deployable barrier + id: NFSDDeployableBarrier + description: A deployable barrier. Swipe your ID card to lock/unlock it. + parent: BaseStructure + components: + - type: Transform + anchored: false + noRot: true + - type: Sprite + sprite: _NF/Objects/Specific/Security/nfsdbarrier.rsi + layers: + - state: idle + - state: locked + map: ["enum.LockVisualLayers.Lock"] + - type: Appearance + - type: LockVisuals + - type: InteractionOutline + - type: Physics + bodyType: Dynamic + canCollide: false + - type: Fixtures + fixtures: + base: + shape: + !type:PhysShapeCircle + radius: 0.45 + density: 75 + mask: + - MachineMask + barrier: + shape: + !type:PhysShapeCircle + radius: 0.45 + layer: + - WallLayer + - type: DeployableBarrier + fixture: barrier + - type: AccessReader + access: [["Security"]] + - type: Lock + locked: false + lockOnClick: true # toggle lock just by clicking on barrier + lockTime: 5 + unlockTime: 5 + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Metallic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 600 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 300 + behaviors: + - !type:SpawnEntitiesBehavior + spawn: + SheetSteel: + min: 5 + max: 5 + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: PointLight + enabled: false + radius: 3 + color: red + - type: StaticPrice + price: 200 \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/jetpacks.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/jetpacks.yml new file mode 100644 index 00000000000..19f9e82b797 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/jetpacks.yml @@ -0,0 +1,32 @@ +#Empty security +- type: entity + id: Jetpacknfsd + parent: BaseJetpack + name: nfsd jetpack + suffix: Empty + components: + - type: Item + sprite: _NF/Objects/Tanks/Jetpacks/nfsd.rsi + - type: Sprite + sprite: _NF/Objects/Tanks/Jetpacks/nfsd.rsi + - type: Clothing + sprite: _NF/Objects/Tanks/Jetpacks/nfsd.rsi + slots: + - Back + +#Filled security +- type: entity + id: JetpackNFSDFilled + parent: Jetpacknfsd + name: nfsd jetpack + suffix: Filled + components: + - type: GasTank + outputPressure: 42.6 + air: + # 13 minutes thrust + volume: 5 + temperature: 293.15 + moles: + - 1.025689525 # oxygen + - 1.025689525 # nitrogen \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Structures/Decoration/banners.yml b/Resources/Prototypes/_NF/Entities/Structures/Decoration/banners.yml new file mode 100644 index 00000000000..b2ddd0e305e --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Structures/Decoration/banners.yml @@ -0,0 +1,25 @@ +- type: entity + id: BannerNFSD + parent: BannerBase + name: nfsd banner + description: A banner displaying the colors of the new frontier sheriff's department. # Frontier - description change + components: + - type: Sprite + sprite: _NF/Structures/Decoration/banner.rsi + state: nfsd-banner + - type: Construction # Frontier + graph: BannersGraph # Frontier + node: BannerSecurityNode # Frontier + +- type: entity + id: FlagNFSD + parent: BannerBase + name: nfsd flag + description: A flag displaying the colors of the new frontier sheriff's department. # Frontier - description change + components: + - type: Sprite + sprite: _NF/Structures/Decoration/banner.rsi + state: nfsd-flag + - type: Construction # Frontier + graph: BannersGraph # Frontier + node: BannerSecurityNode # Frontier diff --git a/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml index 865879297f8..e8d04fb6600 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml @@ -81,3 +81,13 @@ components: - type: PriorityDock tag: DockTransit + +- type: entity + parent: AirlockNFSDGlass + id: AirlockNFSDGlassLocked + suffix: NFSD, Locked + components: + - type: AccessReader + access: [["Security"]] + - type: Wires + layoutId: AirlockSecurity \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/airlocks.yml index 04e478a80bf..0aa55c431bc 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/airlocks.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/airlocks.yml @@ -16,3 +16,15 @@ sprite: _NF/Structures/Doors/Airlocks/Glass/mercenary.rsi - type: PaintableAirlock group: Glass + +#Glass +- type: entity + parent: AirlockGlass + id: AirlockNFSDGlass + suffix: NFSD + components: + - type: Sprite + sprite: _NF/Structures/Doors/Airlocks/Glass/nfsd.rsi + - type: PaintableAirlock + department: Security + group: Glass \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers.yml index 5b394b6fcaf..8dfd0222fd3 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers.yml @@ -98,6 +98,30 @@ - key: enum.ShipyardConsoleUiKey.Security type: ShipyardConsoleBoundUserInterface +- type: entity + id: ComputerShipyardNFSD + parent: [BaseStructureDisableToolUse, BaseStructureIndestructible, ComputerShipyard] + name: nfsd shipyard console + description: Used to buy nfsd patrol vessels + components: + - type: Sprite + sprite: _NF/Structures/Machines/computers.rsi + layers: + - map: ["computerLayerBody"] + state: computer + - map: ["computerLayerKeyboard"] + state: generic_keyboard + - map: ["computerLayerScreen"] + state: shipyard_nfsd + - map: ["computerLayerKeys"] + state: telesci_key + - type: ActivatableUI + key: enum.ShipyardConsoleUiKey.Security + - type: UserInterface + interfaces: + - key: enum.ShipyardConsoleUiKey.Security + type: ShipyardConsoleBoundUserInterface + - type: entity id: ComputerShipyardBlackMarket parent: [BaseStructureDisableToolUse, BaseStructureDestructible, ComputerShipyard] diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_tabletop.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_tabletop.yml index cf182384bc2..5d8ed80db43 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_tabletop.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_tabletop.yml @@ -688,6 +688,26 @@ sprite: _NF/Structures/Machines/computers.rsi state: telesci_key +- type: entity + parent: [BaseStructureComputerTabletop, ComputerShipyardNFSD] + id: ComputerTabletopShipyardNFSD + components: + - type: Sprite + drawdepth: SmallObjects + layers: + - map: ["computerLayerBody"] + sprite: _NF/Structures/Machines/computer_tabletop.rsi + state: computer_tabletop + - map: ["computerLayerKeyboard"] + sprite: _NF/Structures/Machines/computer_tabletop.rsi + state: generic_keyboard_tabletop + - map: ["computerLayerScreen"] + sprite: _NF/Structures/Machines/computers.rsi + state: shipyard_nfsd + - map: ["computerLayerKeys"] + sprite: _NF/Structures/Machines/computers.rsi + state: telesci_key + - type: entity parent: [BaseStructureComputerTabletop, ComputerShipyardBlackMarket] id: ComputerTabletopShipyardBlackMarket diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml index 2d21228f006..48f25830ff1 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml @@ -364,3 +364,132 @@ - Sheet - RawMaterial - Ingot + +- type: entity + id: NFSDTechFab + parent: BaseLathe + name: nfsd techfab + description: Prints equipment for use by nfsd. + components: + - type: Sprite + sprite: Structures/Machines/techfab.rsi + layers: + - state: icon + map: ["enum.LatheVisualLayers.IsRunning"] + - state: nfsd + - state: unlit + shader: unshaded + map: ["enum.PowerDeviceVisualLayers.Powered"] + - state: inserting + map: ["enum.MaterialStorageVisualLayers.Inserting"] + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: Machine + board: SecurityTechFabCircuitboard + - type: Lathe + idleState: icon + runningState: icon + staticRecipes: + - Flash + - Handcuffs + - Zipties + - Stunbaton + - ForensicPad + - RiotShield + - ShellShotgun + - ShellShotgunSlug + - ShellShotgunFlare + - ShellTranquilizer + - MagazinePistol + - MagazinePistolSubMachineGun + - MagazinePistolSubMachineGunTopMounted + - MagazineRifle + - MagazineLightRifle + - MagazineBoxPistol + - MagazineBoxMagnum + - MagazineBoxRifle + - MagazineBoxLightRifle + - SpeedLoaderMagnum + - TargetHuman + - TargetSyndicate + - TargetClown + - MagazineBoxLightRiflePractice + - MagazineBoxMagnumPractice + - MagazineBoxPistolPractice + - MagazineBoxRiflePractice + - ShellShotgunPractice + - WeaponLaserCarbinePractice + - WeaponDisablerPractice + # Frontier Start + - ThrusterSecurityMachineCircuitboard + - ClothingOuterSuitEmergency + - ClothingHeadHelmetEVA + - ClothingHeadHelmetEVALarge + - ClothingOuterHardsuitEVAPrisoner + # Frontier End + dynamicRecipes: + - CartridgeLightRifleIncendiary + - CartridgeMagnumIncendiary + - CartridgePistolIncendiary + - CartridgeRifleIncendiary + - CartridgeLightRifleUranium + - CartridgeMagnumUranium + - CartridgePistolUranium + - CartridgeRifleUranium + - CartridgeLightRifleRubber + - CartridgeMagnumRubber + - CartridgePistolRubber + - CartridgeRifleRubber + - ClothingEyesGlassesSecurity + - ExplosivePayload + - FlashPayload + - HoloprojectorSecurity + - MagazineBoxLightRifleIncendiary + - MagazineBoxMagnumIncendiary + - MagazineBoxPistolIncendiary + - MagazineBoxRifleIncendiary + - MagazineBoxLightRifleUranium + - MagazineBoxMagnumUranium + - MagazineBoxPistolUranium + - MagazineBoxRifleUranium + - MagazineBoxLightRifleRubber + - MagazineBoxMagnumRubber + - MagazineBoxPistolRubber + - MagazineBoxRifleRubber + - MagazineGrenadeEmpty + - GrenadeEMP + - GrenadeFlash + - ShellShotgunBeanbag + - ShellShotgunIncendiary + - ShellShotgunUranium + - Signaller + - SignalTrigger + - TelescopicShield + - TimerTrigger + - Truncheon + - VoiceTrigger + - WeaponDisablerPractice + - WeaponAdvancedLaser +# - WeaponDisablerSMG + - WeaponLaserCannon + - WeaponLaserCarbine + - WeaponXrayCannon + - PowerCageSmall + - PowerCageMedium + - PowerCageHigh + - ShuttleGunSvalinnMachineGunCircuitboard + - ShuttleGunPerforatorCircuitboard + - ShuttleGunFriendshipCircuitboard + - ShuttleGunDusterCircuitboard + # Frontier Start + - ClothingOuterHardsuitSecurity + - ClothingOuterHardsuitSecuritypatrol + - ClothingOuterHardsuitWarden + - ClothingOuterHardsuitBrigmedic + # Frontier End + - type: MaterialStorage + whitelist: + tags: + - Sheet + - RawMaterial + - Ingot diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml index 7bba7de48c8..9e5db33817d 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml @@ -308,3 +308,55 @@ color: "#EEEEFF" - type: MarketModifier mod: 10 + +- type: entity + parent: [BaseStructureUnanchorable, VendingMachine] + id: VendingMachineNFSDDrobe + name: NFSDDrobe + description: A vending machine for NFSD and NFSD clothing! + components: + - type: VendingMachine + pack: NFSDDrobeInventory + offState: off + brokenState: broken + normalState: normal-unshaded + - type: Advertise + pack: NFSDDrobeAds + - type: Sprite + sprite: _NF/Structures/Machines/VendingMachines/nfsddrobe.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Base"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: AccessReader + access: [["Security"]] + +- type: entity + parent: [BaseStructureUnanchorable, VendingMachine] + id: VendingMachineNFSDTec + name: NFSDTec + description: A vending machine for NFSD and NFSD tech! + components: + - type: VendingMachine + pack: NFSDTecInventory + offState: off + brokenState: broken + normalState: normal-unshaded + - type: Advertise + pack: NFSDDrobeAds + - type: Sprite + sprite: _NF/Structures/Machines/VendingMachines/nfsdtec.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Base"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: AccessReader + access: [["Security"]] \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml index fa66529a186..614a31d5792 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -118,4 +118,200 @@ - type: Construction graph: StorageFurnitureGraph node: LockerWoodenGenericNode - - type: AccessReader \ No newline at end of file + - type: AccessReader + +# NFSD - Evidence +- type: entity + id: LockernfsdEvidence + parent: LockerBaseSecure + name: nfsd evidence locker + components: + - type: Appearance + - type: EntityStorageVisuals + stateBaseClosed: nfsd + stateDoorOpen: nfsd_open + stateDoorClosed: nfsd_door + - type: Sprite + sprite: _NF/Structures/Storage/closet.rsi + noRot: true + layers: + - state: generic + map: ["enum.StorageVisualLayers.Base"] + - state: generic_door + map: ["enum.StorageVisualLayers.Door"] + - state: locked + map: ["enum.LockVisualLayers.Lock"] + shader: unshaded + - state: welded + visible: false + map: ["enum.WeldableLayers.BaseWelded"] + - type: AccessReader + access: [["Security"]] + +# NFSD Copper +- type: entity + id: LockernfsdCopper + parent: LockerBaseSecure + name: nfsd cadet locker + components: + - type: Appearance + - type: EntityStorageVisuals + stateBaseClosed: nfsd_copper + stateDoorOpen: nfsd_copper_open + stateDoorClosed: nfsd_copper_door + - type: Sprite + sprite: _NF/Structures/Storage/closet.rsi + noRot: true + layers: + - state: generic + map: ["enum.StorageVisualLayers.Base"] + - state: generic_door + map: ["enum.StorageVisualLayers.Door"] + - state: locked + map: ["enum.LockVisualLayers.Lock"] + shader: unshaded + - state: welded + visible: false + map: ["enum.WeldableLayers.BaseWelded"] + - type: AccessReader + access: [["Security"]] + +# NFSD Silver +- type: entity + id: LockernfsdSilver + parent: LockerBaseSecure + name: nfsd deputy locker + components: + - type: Appearance + - type: EntityStorageVisuals + stateBaseClosed: nfsd_silver + stateDoorOpen: nfsd_silver_open + stateDoorClosed: nfsd_silver_door + - type: Sprite + sprite: _NF/Structures/Storage/closet.rsi + noRot: true + layers: + - state: generic + map: ["enum.StorageVisualLayers.Base"] + - state: generic_door + map: ["enum.StorageVisualLayers.Door"] + - state: locked + map: ["enum.LockVisualLayers.Lock"] + shader: unshaded + - state: welded + visible: false + map: ["enum.WeldableLayers.BaseWelded"] + - type: AccessReader + access: [["Security"]] + +# NFSD Brigmedic +- type: entity + id: LockernfsdBrigmedic + parent: LockerBaseSecure + name: nfsd brigmedic locker + components: + - type: Appearance + - type: EntityStorageVisuals + stateBaseClosed: nfsd_brigmed + stateDoorOpen: nfsd_brigmed_open + stateDoorClosed: nfsd_brigmed_door + - type: Sprite + sprite: _NF/Structures/Storage/closet.rsi + noRot: true + layers: + - state: generic + map: ["enum.StorageVisualLayers.Base"] + - state: generic_door + map: ["enum.StorageVisualLayers.Door"] + - state: locked + map: ["enum.LockVisualLayers.Lock"] + shader: unshaded + - state: welded + visible: false + map: ["enum.WeldableLayers.BaseWelded"] + - type: AccessReader + access: [["Security"]] + +# NFSD Gold - Sergeant +- type: entity + id: LockernfsdSergeant + parent: LockerBaseSecure + name: nfsd sergeant locker + components: + - type: Appearance + - type: EntityStorageVisuals + stateBaseClosed: nfsd_gold + stateDoorOpen: nfsd_gold_open + stateDoorClosed: nfsd_gold_door + - type: Sprite + sprite: _NF/Structures/Storage/closet.rsi + noRot: true + layers: + - state: generic + map: ["enum.StorageVisualLayers.Base"] + - state: generic_door + map: ["enum.StorageVisualLayers.Door"] + - state: locked + map: ["enum.LockVisualLayers.Lock"] + shader: unshaded + - state: welded + visible: false + map: ["enum.WeldableLayers.BaseWelded"] + - type: AccessReader + access: [["Security"]] + +# NFSD Gold - Bailiff +- type: entity + id: LockernfsdBailiff + parent: LockerBaseSecure + name: nfsd bailiff locker + components: + - type: Appearance + - type: EntityStorageVisuals + stateBaseClosed: nfsd_gold + stateDoorOpen: nfsd_gold_open + stateDoorClosed: nfsd_gold_door + - type: Sprite + sprite: _NF/Structures/Storage/closet.rsi + noRot: true + layers: + - state: generic + map: ["enum.StorageVisualLayers.Base"] + - state: generic_door + map: ["enum.StorageVisualLayers.Door"] + - state: locked + map: ["enum.LockVisualLayers.Lock"] + shader: unshaded + - state: welded + visible: false + map: ["enum.WeldableLayers.BaseWelded"] + - type: AccessReader + access: [["Security"]] + +# NFSD Sheriff +- type: entity + id: LockernfsdSheriff + parent: LockerBaseSecure + name: nfsd sheriff's locker + components: + - type: Appearance + - type: EntityStorageVisuals + stateBaseClosed: nfsd_sheriff + stateDoorOpen: nfsd_sheriff_open + stateDoorClosed: nfsd_sheriff_door + - type: Sprite + sprite: _NF/Structures/Storage/closet.rsi + noRot: true + layers: + - state: generic + map: ["enum.StorageVisualLayers.Base"] + - state: generic_door + map: ["enum.StorageVisualLayers.Door"] + - state: locked + map: ["enum.LockVisualLayers.Lock"] + shader: unshaded + - state: welded + visible: false + map: ["enum.WeldableLayers.BaseWelded"] + - type: AccessReader + access: [["HeadOfSecurity"]] \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml index 8d2b6e65433..2b30fb1ac0d 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml @@ -160,3 +160,39 @@ price: 20000 - type: Contraband value: 5 + +- type: entity + parent: CrateSecgear + id: CratenfsdBrigmedic + name: brigmedic crate + components: + - type: Icon + sprite: _NF/Structures/Storage/Crates/nfsd_brigmed.rsi + - type: Sprite + sprite: _NF/Structures/Storage/Crates/nfsd_brigmed.rsi + - type: AccessReader + access: [["Security"]] + +- type: entity + parent: CrateSecgear + id: CratenfsdSecure1 + name: nfsd crate + components: + - type: Icon + sprite: _NF/Structures/Storage/Crates/nfsd_secure1.rsi + - type: Sprite + sprite: _NF/Structures/Storage/Crates/nfsd_secure1.rsi + - type: AccessReader + access: [["Security"]] + +- type: entity + parent: CrateSecgear + id: CratenfsdSecure2 + name: nfsd crate + components: + - type: Icon + sprite: _NF/Structures/Storage/Crates/nfsd_secure2.rsi + - type: Sprite + sprite: _NF/Structures/Storage/Crates/nfsd_secure2.rsi + - type: AccessReader + access: [["Security"]] \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/brigmedic.yml b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/brigmedic.yml index acdd53a05ef..6c9548fd55d 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/brigmedic.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/brigmedic.yml @@ -10,7 +10,7 @@ - !type:OverallPlaytimeRequirement time: 36000 # Frontier - 10 hrs startingGear: BrigmedicGear - icon: "JobIconBrigmedic" + icon: "JobIconBrigmedic" # Frontier supervisors: job-supervisors-hos canBeAntag: false access: @@ -38,7 +38,7 @@ id: NfsdBrigmedic # Frontier ears: ClothingHeadsetNFSDbrown # Frontier belt: ClothingBeltNfsdWebbingFilledBrigmedic # Frontier - neck: ClothingNeckNfsdBadgeBrigmedic # Frontier + neck: ClothingNeckNfsdBadgeSecurityBrigmed # Frontier pocket1: WeaponPistolMk58Nonlethal # Frontier innerClothingSkirt: ClothingUniformJumpskirtNfsd # Frontier satchel: ClothingBackpackSatchelnfsdBrigmedFilled # Frontier diff --git a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/head_of_security.yml b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/head_of_security.yml index c4b059d7d41..13775f6fc52 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/head_of_security.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/head_of_security.yml @@ -16,7 +16,7 @@ weight: 10 startingGear: HoSGear alwaysUseSpawner: true - icon: "JobIconHeadOfSecurity" + icon: "JobIconHeadOfSecurity" # Frontier requireAdminNotify: true supervisors: job-supervisors-hop # Frontier whitelistRequired: true diff --git a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/security_cadet.yml b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/security_cadet.yml index 15710bcb2ce..4268ee53969 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/security_cadet.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/security_cadet.yml @@ -11,7 +11,7 @@ time: 36000 # Frontier - 10 hrs inverted: true # stop playing intern if you're good at security! startingGear: SecurityCadetGear - icon: "JobIconSecurityCadet" + icon: "JobIconSecurityCadet" # Frontier supervisors: job-supervisors-hos # Frontier canBeAntag: false access: diff --git a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/security_officer.yml b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/security_officer.yml index b3ae556f6f7..e3eab519dd4 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/security_officer.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/security_officer.yml @@ -7,7 +7,7 @@ - !type:OverallPlaytimeRequirement time: 21600 # Frontier - 6 hrs startingGear: SecurityOfficerGear - icon: "JobIconSecurityOfficer" + icon: "JobIconSecurityOfficer" # Frontier supervisors: job-supervisors-hos canBeAntag: false access: diff --git a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/senior_officer.yml b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/senior_officer.yml index 697ae8a9a5a..39f16bbdf84 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/senior_officer.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/senior_officer.yml @@ -13,7 +13,7 @@ department: Security time: 32400 # 9 hrs startingGear: SeniorOfficerGear - icon: "JobIconSeniorOfficer" + icon: "JobIconSeniorOfficer" # Frontier supervisors: job-supervisors-hos canBeAntag: false access: @@ -32,7 +32,7 @@ id: SeniorOfficerGear equipment: jumpsuit: ClothingUniformJumpsuitNfsdTacBlack # Frontier - back: ClothingBackpacknfsdFilled # Frontier + back: ClothingBackpackOfficerFilled # Frontier shoes: ClothingShoesBootsNFSDBrown # Frontier eyes: ClothingEyesGlassesNFSD # Frontier head: ClothingHeadHatNfsdBeretGreen # Frontier @@ -44,6 +44,6 @@ gloves: ClothingHandsGlovesCombatNfsdCream # Frontier neck: ClothingNeckNfsdBadgeSeniorOfficer # Frontier innerClothingSkirt: ClothingUniformJumpskirtNfsd # Frontier - satchel: ClothingBackpackSatchelnfsdFilled # Frontier - duffelbag: ClothingBackpackDuffelnfsdFilled # Frontier + satchel: ClothingBackpackSatchelOfficerFilled # Frontier + duffelbag: ClothingBackpackDuffelOfficerFilled # Frontier messenger: ClothingBackpackMessengerOfficerFilled # Frontier diff --git a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/warden.yml b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/warden.yml index 9abf35555ba..e3640c68c6b 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/warden.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/warden.yml @@ -13,7 +13,7 @@ department: Security time: 21600 # 6 hrs startingGear: WardenGear - icon: "JobIconWarden" + icon: "JobIconWarden" # Frontier supervisors: job-supervisors-hos canBeAntag: false access: @@ -35,18 +35,18 @@ equipment: head: ClothingHeadHatNfsdBeretBrown # Frontier jumpsuit: ClothingUniformJumpsuitNfsdTacCream # Frontier - back: ClothingBackpacknfsdFilled # Frontier + back: ClothingBackpackOfficerFilled # Frontier shoes: ClothingShoesBootsNFSDCream # Frontier eyes: ClothingEyesGlassesNFSD # Frontier outerClothing: ClothingOuterCoatNfsdFormal # Frontier id: NfsdBailiff # Frontier - ears: ClothingHeadsetAltNFSDgreen # Frontierr + ears: ClothingHeadsetAltNFSDgreen # Frontier belt: ClothingBeltNfsdWebbingFilled # Frontier pocket1: WeaponPistolMk58Nonlethal pocket2: HoloprojectorSecurity # Frontier gloves: ClothingHandsGlovesCombatNfsdCream # Frontier neck: ClothingNeckNfsdBadgeWarden # Frontier innerClothingSkirt: ClothingUniformJumpskirtNfsd # Frontier - satchel: ClothingBackpackSatchelnfsdFilled # Frontier - duffelbag: ClothingBackpackDuffelnfsdFilled # Frontier + satchel: ClothingBackpackSatchelOfficerFilled # Frontier + duffelbag: ClothingBackpackDuffelOfficerFilled # Frontier messenger: ClothingBackpackMessengerOfficerFilled # Frontier diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json index 844468199bb..7fb0875466f 100644 --- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json @@ -233,6 +233,9 @@ { "name": "paper_stamp-mime" }, + { + "name": "paper_stamp-sheriff" + }, { "name": "paper_stamp-qm" }, diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-sheriff.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-sheriff.png new file mode 100644 index 0000000000000000000000000000000000000000..4501db12d6d747d563382ccae759d15d7eefea0f GIT binary patch literal 196 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}DV{ElArY-_ z&n@IVpdirtaIsK-Dp%7Q*OETIlUyyD8!Fy}mNr(a_|E$NbNBad0YSlwY&%u9-jlOF z=KSRuhlaxRC2Pyfj|-_BvZ=efeBa`0h3#%FFH-wd*Ot8y7x{S7Kv3}SG3Hw{WjB~S lu3G}Mk1sXCGtJkRK?}&{0Adih6g(M3dAjqn(Z^DuiPD)oL7?tg1x%=0saDUGT9b;Nzm;C1cu-yg5q z^)^oH>#3UaS$7;ZnFM;x^xaxrAhhiIgx3ovbVMxS@YtgJ?qJOohC?0Op0Ag3n6cG2 zb1tXA&ai#6w${1}o$Px$Qb|NXR9J=Wls!v=Q5c3Vqak`jk??~T%>!&pb zMJ|`}ncjMFZPv=%7nz(J2OznB;jm+1z|JEztXf(}2cTJP(X6&u*;=rbj*x-drz~n% zwWcQmM1me7K@TCHn~=|qUr|`zm=`u76kE4Az)^e~9DcA~0oXfCP^i3-&XzepzU*69 zC;`(j0Z1IgfDf>$KnxXP*|Qy1ZU_ zCnF;!L_+E{v%>z$2_4A}-JdFhGslEeOPqW!dwf@4DPcBuuk6K{ z@7YB9^OOFvbG14x4EQ4{f48?TfNTyR27yb#lR=cHtDnm{ Hr-UW|jI*Uz literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/meta.json new file mode 100644 index 00000000000..1d1e66d4e05 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/meta.json @@ -0,0 +1,57 @@ +{ + "license": "CC-BY-NC-SA-4.0", + "copyright": "Content created by Bing Guss for Frontier Server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-flash" + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-lizard", + "directions": 4 + }, + { + "name": "off-inhand-left", + "directions": 4 + }, + { + "name": "off-inhand-right", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-lizard", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", + "directions": 4 + } + ], + "version": 1 +} diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/off-equipped-HELMET-lizard.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/off-equipped-HELMET-lizard.png new file mode 100644 index 0000000000000000000000000000000000000000..1dcc905a2da569d1db8de344cdc86bd30912c8ec GIT binary patch literal 1001 zcmVPx&iAh93RCt{2+Fxi>cN7QkZ*G#>p-hk(ZQ2JzU>0rTA4EH(jx9_rmAXMeMN~wE z4pej?7TzN39%!U+Lx@_x`MfMe zX*=^JZT_O3b{*O7#4pURSW*SZ3xU8@fsrv`i7dhmA=mMx z3J{B{2!?`AFm1+wDJ-O?G_)Mwu_#5@b!0nDPo!aqEcCQ+u7?{!6pO3U<9TErE}XnN za1-#X185kZ9Xt(xg%1Gm`%k@6W6Jn+&qneuvE%qFd>HzB9Bb-VVW4-|d1iEQR4TsI z8<5N9008PhCxDj#jQ~*bN7s3n!h$I*{CRa_N#2C~xTaw*JyTfD8~A#DGJI~5>HljG z)zz!9a@A8j8`qFbj-fEQQn5sK-nD#8Hmq4I4Kmg$L`_Ogy7}nO+;!%7A7p~lf zo)!?Ag@?V5OSS~oH-181p8~I6!HxYDs9doc`s5gzzZ*j?XBQwfl9Gxqoot{sK#HQE zI=lkoLsO`#`51uxO$_uUN;dgoR8?2eL~^36IWWc;V~jDz7-Nhv#u$5>NF;(tBvS4) z7;|GGnkC#Ufu^RWdHb2~lZ&felyF0cem=PzEtgXGXxS0~K;_a3JnVh6D7!LykM1Dd zFr9O4_V|AH1L^qE4HCgnkhB@&Rq)wkJuR@lac#+a1opK@oylv4=}aB~wlzme+agn_ zuo*#{F`&&D(9;5B44143WDL>NbjFTZF!A>xT>#6px1%@I)u69)>zsRuzV87_fb?4n zUIfx_5h#XVZ+tsv@|`>Fe2k2E+ehC?ssNAgv=LwzAr@Cr)7pc(9RcTla&!{Fb61HJ zN6f~UD_;bmnRxQsVX5Lv6(Fr9Ksf^C2p!#C+&sGyEtgWx{VmapZ%lBZBu6K)|J*g_ z+{g&D_vFytlY`Jqn1+SvC;d`mN_B|D;;Pe$;ZZ#3==K7z&lRs-%PrB1(tSF`@Ko;g zy#6C6v{y?Z-znmzQL1Rin%DiW8zlkx9HriX>-YXCYxl*e6Ni)^uKhTt8K|vwx1t#W zx~^kW;5h+V*Z*vcF~%5Uj4{R-V~nv6-+!@Pjg{Frl+XYG01jnXNoGw=04e|g00;m8 X000000Mb*F00000NkvXXu0mjf#ro4) literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000000000000000000000000000000000..110b4ec14efc08b6d9fa9cd2ec63d8fd3d3f0dcd GIT binary patch literal 988 zcmV<210(#2P)Px&d`Uz>RCt{2+FNKGRT#kW|4e7s*asgW({6?iAJr^rqo+7p;${T1uGik z6)#{B1x1niAX20cQo&*|h$2BDZz_VtN~I`~Ds8M`V@aE&&FpS2XuNE9cP@K;7gpDL9G&9DeIHZE zIXHQbk)acHTLP=sU8$B>CQBkF@9c=uu&kNFPgyp-nx#|<3NSM@qZMB}*`}5zWtt}O zwq;CD%+t8y5+HaJsUu@`8+x%LWm?Z#E-Z8mIrXrt=x?Nph` zeg!Z&KEu|>-vFTh!B!yHI=``}y}pN}PJFUmQBoY(wSt~k((K;mVObWDXoRjUyE$|? z#SORYqL_Da@~& zb-z3X2JG2k@Z6w*X_^>@fnf$+H7tz+ocE7ndEHk}`|{}!&k64PuFre-UCecl9jiIE z)?Z+F)Mhpt?7u(o`nk`l&kxn(k8t4quZ`~BP6d$96@g&jM?O1#PORazu?yn&EQAn3 z2qATF0000< KMNUMnLSTZRDBIZp literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/off-equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/off-equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..7128251c669ec4fc1d12195d33294b39407f318a GIT binary patch literal 1018 zcmVPx&nn^@KRCt{2+Dk}OQ5XmCzw=O|s0bZ(bkQ(SQ8_&pW{5^f4>7DjC=rS%!stP@ zN!qmtqE#XV5k*kZCZQ*_s719%FeoE)EF&?;(eaU*Gxy$e@7&YkI=7iJnR9a#;`_nC znYnk)_nmLfWftcHNb&*?cJkTIVJcSgvx(ds3U-;}@|t4qE%flJ!y9L%DAgx6^R=5+ z@~!(y%=q#7B}=FPF>a5Wt4sp`ghwRIbP;wPE9XDHN1#MhXeHvU1 zdjo(`fcF3h;Kl9JP?-jmX?S~ObxL+ZY+h9{9zB(5<_`QlKM@Wq$-IB}6?u8N$jOBIbp|M)Bx)5_uj!AHPV;Nk$_a5`}N(g7@8R)7wF56)bE2szBaBn@rN zpHlV+tSDZ>?G794P8+W8Nk`_QT*$+Hs5sXLT{j94>In(O7f#ky;Nmu$4SC*0=ulgMKu=>0P8AzsqGMn7k?HnjVqAG z706)*u5_oY2wdsnBV!RGX57O6g>V5h)i{k^wJaYk4MhppI$JIPymML-n-p)w)9a@a z7T>VN$VZ8=zkO>;LIwErsG0*t5nBBL>W;sp+p$!?iphysZbRSV_)72 z%_-a?q(^n*rR%6~vYYP#p!Uc$41`975)d&E8by8MeJBwICBncY)qKSoB}Ds#gm%Cy ze>R5tKTi5r6YCqOsJSSVfQUn9Z<*uRqCdR;oRH6}h08fGko25F1-SNP^2Gz>S|f?5q$_l%JNFlghxL zF|l@{t;b;pnWOQ+OO-@fwL7d*R``jzxXNtha$O;i)fy)2qxV-}mWhg{USCu8!Grxr zS2cHUUdOktN#O_Mqi4^Syiij8r?0uCRg@+CAWQ4A0?^n zR%(kAbmMn=ad^QQo#e1dlRn7Cf9Lq{Rqxp5Kj;5i?z%GPXhVaC&0(I)YH{lGZf)T` z_xp%o*p$#m#g76f>v{Y+QF`>T`8n3Ya;MEeqZ^ z;bX+pJx3$8Ln9u~`_uYx&b~cIN@qEHBrtYQP;hc&mDV`u))O{Ygj@4g|L-5{G5cNg zT4SUWp3HEUluEhI|BrqD?yaAMAIAk*@NL;|aqhT*z%ABSp~rvPmCgCZDNw_WoM`~Tlz&cT>=poY7iE{-7)t#7Y+^R*aouqC{|pt^;7$A8&& zyEWGu7AL1I626i6V6)n+`ajG8ckzxiD2I&Ug08#D( zybWhedBJ6@n8~OuiL6O?wklRK~l+E{$2~NiFjV z_v3$sJ&L#&F(tBHU^#WReSuuVtQA}SNak>7ZDciRTk}`z!-OyAtEc93>|xMowhH&U lX7L*6QNGj&&op0O1}z|)1BgN3Qt)ID<>~6@vd$@?2>>Z=gTDX( literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/off-inhand-right.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/off-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..8efbba27495af0895a010702346e9ac322b6c13e GIT binary patch literal 919 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+yeRz}S-M>>S|f?5q$_l%JNFlghxL zF|l@{t;b;pnWOQ+OO-@fwL7d*R``jzxXNtha$O;i)fy)2qxV-}mWhg{USCu8!Grxr zS2cHUUdOktN#O_Mqi4^Syiij8r?0uCRg@+CAWQ4A0?^n zR%(kAbmMn=ad^QQo#e1dlRn7Cf9Lq{Rqxp5Kj;5i?z%GPXhVaC&0(I)YH{lGZf)T` z_xp%o*p$#m#g76f>v{Y+QF`>T`8n3Ya;MEeqZ^ z;bX+pJx3$8Ln9u~`_uYx&b~cIN@qEHBrtYQP;hc&mDV`u))O{Ygj@4g|L-5{G5cNg zT4SUWp3HEUluEhI|BrqD?yaAMAIAk*@NL;|aqhT*z%ABSp~rvPmCgCZDNw_63o&p0Y4IKj;Tf1NrC2fWOKUSZgX&|L2scEXLZ>I_5 z0u2F@KxEl>Y#ETFUlQaO{2voA{Qoa28)c?!;O^}F|GzR^frFZJxcHGUF`(85o-U3d z5v^~pMf0^N@URAaKOlDN(uV)6QCvzAGp@|+FI4+_+-1jccZ2D=H5EC077rSj`m!z@jvsHMa=tn6Ik=O${R9& zn=6#tJhQo|Px(C`m*?RCt{2+Fxu_RUE+a@9nxV9S9q7(=!40KK1h6#7}ThV(XeEY8DH?l2ZcaFW|%C?CbL`Hwd+P#w%y))+a4df zc7^@1r)BBjoP=Om z?(HZ4)usp`Duoc0Z@vGrsC{vdc%}Jykv^AQU#_GYkS<{B<6Fg=RcmoMUEFP3#p}oR z3n4_MboM-Q12i5#;GG!PG4(hJGr_LCJG}sfB~Iy>cA1O2dVDnQ+~##UoNTMvPH0Vp z6{QfJjBw~^gBQ@GE0FYR%M0FwnP6lr#K83+lsEw!yY}w%zPoEuI-XR)?kcx%yWBV( zPC9=$0h${`kf!5pjNiP$$XJMySY&75YLNRMadPc~7q`m| zz~x^rOXZgu0?9-YfX?q*fCz{XFv@2i9K^B`SZ16nr#3IioN(pTW)TVp@%w!MSY{l3 z!oV`)v+9!}H3ZVGb@#H)wSm$ygBxQ8;qYjxC?oz4pS&}1GcoI2I_J>PP+l>melCvn z4gp{YKQBsc*?A!G)B&%0)O3Ue+2E zMNt$*Q4~c{6h%=KMNyRbcsw3F9?x=@p(y#7Z!}v~g*UA+D6qgin^|zk;=1ih#gZUPi)kydBv;WQa8oWcp{>(MHVFB<< zyWGk!CC!bE$V@#QOg_UYRZ)bymR1>;- zd{oqR@MEh30Dr(wI2;8L1Tm5Rh<~0?Ingw2Ff)G$1H>f3U}V;H=_Z)EMgRGOQo}&1 z0h7KyL{cD9wY>mHy|xvkdim(?qxi4;7k!OhE3VgW zpX5w^W*$iI6v>{O7Tp`Q5B;Y%N`iciQon%HKmD<+yDyG3zGnOM^KWk13Dr>dtW7se zVzC%o9HRmfdH=I1ilQirq9}@@D2k#eit_*WH=LTus1y5m!TTF0000Rc literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000000000000000000000000000000000..8fa68bf147cfd86d167848ba8e358c6be6ebb404 GIT binary patch literal 1102 zcmV-U1hM;xP)Px&?ny*JRCt{2+J9)2bsWI)_w#tSoY|)HcDJ3|bW1GIWP?_zwLcB3h65rw&}2JRfXX-rc?tuI%8C?tu{iz5C!>* z$eXu-yqg!0tIwxt*Cx+J$at{nUgOW<6t?Lwo-!w{FI!b%bacj~<7qMvhs(nvTpT78 z4AJ)KOF$`*WXIlD`Q!2^$&m!dKaNPnl(D+5QuuGmzP0`wAJMZzEL|DmeB^5H^_N`#AVkGq>Gd zLRV)$yZ3*=c*?{avpE;(p0!tC#XZZ#9G}h{zs`r7bC_FD#Q4Y{>t7xulgTz9(VvjY zFI{Y~Bq(%Ur})+ahN71UEY1V6zr^`dJ+n6W=?D}D#PGoIb*({B6h%=KMNt$*Q4~c{ z6h%>#8&K~LEmQUYXYWut-B9sxpLWB!LQ5W;GYY<*^< z;SS!m99BQ#vNM+5689OoZP;-sZvTu82H2KvBh&0jO zDD^wu1mOM0mjc-TWt+aIaA zZzmU{eVAjGY%TxFu^hU3f1&=#-JJNQoyT^*H*qf&>tTOg_PcF4TsYP!)dZ=<)kX=r*j)ZBSF0Q8=V&geF^yXZ}x_U`Er+ss~fEQi*uxl}!I zX4<)>{slTZVP1b+j0hPiaq8+K&?000hUSV?A0O#mtY000O800000 U007cclK=n!07*qoM6N<$fPx(A4x<(RCt{2+HGiCRT#kWf6}yjt9$9X#HOj*wc0w@bdxgYW)ZE`l}R01#35`_ zL8cqS34=0F+y`MW5Qq4NRD>xaT9{h#i+*t*R@t0Xs>`}{mUK;;G;M9yyxe<}96zMF zOG!6!vb6;{Ke%x2&CPS4^W>h~5BC8jcf;TB5{sR~&E%7xRp#WNf6yE^?cOS?>MBL+ ztB);cQG^f`LWqjC*PF$Ik8c!D?cFZY$1?NFl~e)J8n!iv>bq;Gud8Rd^$yyPJij1C z5JFS{JbUm7@3n~tTErl(CunTm?gc1Z;gF6gRe)a4Fb&%pgv0KjWYt<$E?-ThtD0rj zV)h<>Zb6E$%3dZC9jtVRdto(+XJiEc`V4X;w1nqT~S2e8P8p_ zf?F&@`6iYr{aQS2SNo&hm}Z#!(V6kDUFW3dBi$e1taOU#w08aCGvhVIYdLWEH7~Gv zX3I)E9~m*4f#%~My=hK9su||w0Ul~`&u@oFre4pmIgUlD# zT13w)s8j*^yW0e$iqPvBro8nOKX%x!XBfN)$twVXyt0`?MiB#uFrm@WtaH*u(4z(e zKkt!R22%Y2;o-}OWGa3~R{@_NTF1^~K_JyP(ARsOnpzjm^-aIY#La;ZATZ+R%7EWI zs6}-4ol1@MsDYuynHu<0DzJ2qP%@EBZOJ4ZT?OVoz>E7k84XTKC6Eh?#WG~EScU?A zABT>gM2qNX5gk2hm|MD0BJ;l~7gBe?Y0o;w0)Nl>s7dz?wCsLQDgha<9R0!^rzhQa z=F+TuPOsh|AbXkIh*SYOf0}#pAm5phk1ekHg7-f?Ija|@t#yYrs_DdHF*e)B1SIl) zvMGw9D2k#eilQirq9}@@{O|n-1USvkFl6(X0000EWmrjOO-%qQ00008000000002e RQ>S|f?5q$_l%JNFlghxL zF|l@{t;b;pnWOQ+OO-@fwL7d*R``jzxXNtha$O;i)fy)2qxV-}mWhg{USCu8!Grxr zS2cHUUdOktN#O_Mqi4^Syiij8r?0uCRg@+CAWQ4A0?^n zR%(kAbmMn=ad^QQo#e1dlRn7Cf9Lq{Rqxp5Kj;5i?z%GPXhVaC&0(I)YH{lGZf)T` z_xp%o*p$#m#g76f>v{Y+QF`>T`8n3Ya;MEeqZ^ z;bX+pJx3$8Ln9u~`_uYx&b~cIN@qEHBrtYQP;hc&mDV`u))O{Ygj@4g|L-5{G5cNg zT4SUWp3HEUluEhI|BrqD?yaAMAIAk*@NL;|aqhT*z%ABSp~rvPmCgCZDNw_WoM`~Tlz&cT>=poV9jE{-7)t#7Y+^EDgrumrrDuyn3Y&b#_! zw>*C=Dbmnf#WHoT@hclv7gL{yk9_zn9yBo9vp-1q&GF(qqv4W0OB*cM99TCnMKA`x zWW2$!nQsoO&IHKbaY5_JRM*J9m5+HRhP|BF=zOQ^|PU-x9VHp&8GM9lbv1+U{nb z*8P#8gJITth6uh3_Kj2am~B^36A)v_U2w1Y+4f~Q4VPAIsg>NrKjooZfaI&E-3NRx x+rJOpr}%-%V6QEwx4A4RSou;TJkxxA8MJ_G4j=}BOTm*tl&7no%Q~loCID{2i8TNK literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/on-inhand-right.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/on-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..0611ca6e8c5a4da010efdf191f91c07feaddaca1 GIT binary patch literal 934 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+yeRz}S-M>>S|f?5q$_l%JNFlghxL zF|l@{t;b;pnWOQ+OO-@fwL7d*R``jzxXNtha$O;i)fy)2qxV-}mWhg{USCu8!Grxr zS2cHUUdOktN#O_Mqi4^Syiij8r?0uCRg@+CAWQ4A0?^n zR%(kAbmMn=ad^QQo#e1dlRn7Cf9Lq{Rqxp5Kj;5i?z%GPXhVaC&0(I)YH{lGZf)T` z_xp%o*p$#m#g76f>v{Y+QF`>T`8n3Ya;MEeqZ^ z;bX+pJx3$8Ln9u~`_uYx&b~cIN@qEHBrtYQP;hc&mDV`u))O{Ygj@4g|L-5{G5cNg zT4SUWp3HEUluEhI|BrqD?yaAMAIAk*@NL;|aqhT*z%ABSp~rvPmCgCZDNw_63o&p0Y4IKj;Tf1NrC2fWOKUSZgX&|L2scEXLZ>I_5 z0u2F@KxEl>Y#ETFUlQaO{2voA{Qoa28)c?!;O^}F|GzR^frFZJxcHGUF`(A>o-U3d z5v^~pMGG}6@URAaKOiP_V#43|>lGD}W`}LD-zHpd^|+v4-^$$k$EOIHf&+}~d8|ts zH0&8BOU9~Cyuz4sU=9QC0l@@2<`Y&on9mrxv3UspRAG2vEU=jCI^#bsjulMB^G>|B z4rp*kYbkUiq`RB?P_((=f^Ypw`x$?gA0zopr049i{C;$Ke literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/nfsd.rsi/equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Helmets/nfsd.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..25a1a5f22707dd8d98978ab000cbdeb5ba9aa40c GIT binary patch literal 807 zcmV+?1K9kDP)Px%;Ymb6RCt{2n$K$!K@`Wowb|Wl+Uc@x+Cz}qix&&pgBCBnc=qJI2mgUW1+U^? zpk8~j;7zm#=|u!DUc?4U3+=%o#DXbJvxX#X+}TaL9?DE(`h%S@SwY_imSkti`@Z*P zW(mv}_|F;8`O%o?#NA^RzpfQaSKl%XdC$X0TR)>CJ~@#`ZJ*0Ach~}eIE^L<{WH+g zzoaT|nFeb69DXCf>&I8%Hv-i5IV{sSb7l0BPW?{)L|>@^0FbjX@EZYMJ!1Is^*i1^ zIc`GEQeI42cq3WabaDBO0NzMeE1uGl5i`KU=+rYY-p_5&sej(5s=m^+xy(kb`4cm< z)6cq}eSG!X7L0;5ClOG1VIo4K@bE%5Cox5&-?*EdLDsZ z>TCN0vgROy@DOGH00nOdW&Z$3!6Pu{IkC%Zsaf!bWG*`T%Km`P;sMA+TD%RH*;rke z>YGPkbzv%YnT-~2%i;kb2oI4p2QfL3SM~@bZh$zG+bC7#%!{kV+u&h@#W@>0yS`#s z$=TWUu{dXghmmZ8xPtHy8>OnUQ6lkj5kW1}K+ej@lVIT$$X~q-0H}WZ(YJTOnCHZu zIwBtcGAEHw(i{@M114@=!{~SpD@$ttP706ON4Wdoj`Rz3ADQ=(ieDd?nVo(r?mxWv zG!LAZHFy}|_WhgK+is!qu9zrh;w?}rZee|SQ=ZSe%$D8nXVK>&G%eGB%WUZpSYO^m zskoImj{Y- literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/nfsd.rsi/icon.png b/Resources/Textures/_NF/Clothing/Head/Helmets/nfsd.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3342716faf2bfca28450e6ee1fbcdc2997d0137f GIT binary patch literal 285 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|yaRkfTn`*L zprN6WnwnZySC^TYsjQ^t>FzEeE-5W7ojzen@w8?7dWLGM>Vo{dV#55gk|OE~5(err zj>gKKmTI|^W41NP9`94Uv()1JOaslT6WKsxB};<*f*Jl}f;N!Qk%_01fr_F%T^vI! zdf)c#yc5xZs-De}U%hb3Px&1xZ9fRCt{2+CNAeQ5*;GZzM4)#GoF9lpH7ynS_8-E0l9BghL`0Y2Bo=YjClp zwNu@@6&$RhXb2RG%PpcqH>cpB&_R@n7Om;!j=T=>op+b3-kEn|@%Nc7FL}Rr_shFK z-1`B95JCtcgb+dqA%u{JBqA!1rfC2GMNu5>a!O+J3(F1TD2n3f!?(GK@lp2U;HRUX z`!`sy)4y-uK_o9Ifk`%Z#A&dIrsY$naJnKY~DCV=Muakr?*U?*o4 z7-kL6-~7I8IRya3qQUZfp_}N4N5Ky|OhOazVkY+ifa39$wm4HN_=#bdH2?+xpl_%b zf6jom1hBWcFKRa(gq;G0S;N}wdI5k2KwFz#e`4D%)DO%*y=q`*qm13{GIln~(5r^1 zU3CyP17gt@%r7iQCdNk@fQD_q*MQYxDKetw7~kgYyiGJ=30PVwMn=>ev+p#&{khxS zyl!vq->()+k$Zg?0G$6GchkZDD~?yYrfHtZYKHI!p}Tgk9)$i!!V(b1`AG;Ngb+dq zA%qY@h+fEUgrU&93XlJ39X580S$>k_8!C=xgzK zYYg$$n6(_9EKh~9oRut3F}{p0rzA%W!DA^As2)N1xvu|&6AG_OSU$KN;spXW!I^t1WTuwiGWms6x0lfZzk9&ThTi^Lz zP8WI`{Pg)t=(j#Qdy*%{M*}az0|HNh`Gw_%+JL(h)@6k literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/nfsd.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Head/Helmets/nfsd.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..c28c4a8b69520dd448fb3d1e23d153421b721531 GIT binary patch literal 883 zcmV-(1C0EMP)Px&ElET{RCt{2n!!sOK@`TnNMcNA3^9u|#ehYMmkNTt)IwSRfUwAh6sg{XUZuAn z6e-r8dM-V+Akql8#GM=08CA!*^k}dKHfQ5mW6b#Y1)Ns8U9$Y z+e;=Swz!n@@y-E22hVUuRam^c3u7Y#%xD`P>|+^KVZ7_Tf-K7z9_%xH92*&6@$N1( z^V^XDz40iEMM408P|%Ouvp%Gs|3tY`0{|3DW$YjPb==nqA~V3SGuVHVg@S&w{Vcz^ z8Bi>hv0psI>n8zx`T7fQpGw#-9->$(x9sd?Qm)j@4*(pUe)I728XwK2UILKc13(Nw z6_}jA3jo^3x%I4QhedK!sp0m6e*7x|T@m2hr|+m#b?CKY?)8og&}+w7TiD0~&;V#_ z3mf+>$Js`Pyh5d_V|%lJovi}4Hw&m#^`_T5G9cjZz~WNQH#L!F0363&e-P@mW31-a z&AC3Vq!<9K=GT3^=Zzx(%PV=`xRPR4BgSjQXczSwYzJ1qjo(HPcyJ$ryqoMn@fw<@ zan}WaGbmQL0pQ)_<-uQsh5@)PoI3zsp8o_v5ClOG1VIo4K@bFSHm){08|}985V>X6 ztY1<6T**yQkwNBagN?|j3bQM$z40hpUdgw8%iN|&3G2^w24qx)-I5}8`g<}Vu~;O8 zjH<9`VWusTS+p?2GOEI2kr0BN0R%e(LhZW>fH8POa!w{BmP|-2e5%9eXM3=_cOcX; zgWbIYw+NSLH?dM3j6e+&?^i^#=ie{r{9qNRINIR&f=8 z{(E;!tsOWS{Amq=6B7dtV}J6kM+ZtZMO%a1i03-<%GHd=9j49bnWb82w)A6aebg;i-uV2<&0aSW-L z^LCb_x3r_k@&7AN=9%qMyS>J;CF$)#5v?sv-=alYF6k?>^0&rSO}OOza^?1*4dUmQ za_H7^2d`-g(rOL4)ls-TbCKT7yDz>e7`rV_P2YTyd9FOq$#;_~|9_u9SMfs}6XQCQ zlN$C~Gj8(TUKM70aqpZDA464-u8%$6FB5;Gp=l=XvEx2hzQxv^mk44McC`0N_-NfB z@qboEL8#}#ZSN1|nS3mK$M(iecx$crs!3Mg&vs1y_Tz1du>BTBH$Q#`g~e)#=Cgi$ z@Hzfne*edxM>ldxnqJBiQnR1)Y}sa@%nAPG{x5mFmEI^u7;J8wbXxJD%z>|e`kt?v z^eRig?dpL?F<&@4=DIJOzBcQsaCu&){`})M)%R6) z)5OCA^>ULc3#aa96wUUpICmksA@RwV1>efoAAZ{X?l|vlwx178dK9P5XAImve*>dK z`li2L^8}y&pWwm9u-yN4otnJ)MBW`b9I{Q*1v448GGr}byu!3%B3l6W0yilK-3BQF zf}Lya8D7NqJIwj0{GENtR7R7%&LMA@MLsvLxWQigQcz>Y%>x%qCUg4j)u?U zJ)V2;YmLsCtQ+?>vR>vo|E;gLHIjGT^J3u}8CC5O`q77ag`EB}9w?M|aP$4-Ww83> zZ1eTZ3~T1sSCxs0oXNQ$*Zz|6fNAG9jut!SW6ScAQ%stl9t~ws@BF=1*=An#q2H|M zrk#1b1QAO1p$@@6Oft1)PvC4V!MPaH<+~G3c zq-cW|brO-b9m#TCGd4~=9=YFP{r$Ebk5Bw#$YQ+W!MuVsK$&-em_x5gLllGQCH#WL dPkDc^-@Eb9>(1NOBfw0@;OXk;vd$@?2>@B2t7!lL literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/nfsd.rsi/lighton-equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Helmets/nfsd.rsi/lighton-equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..e2619c70d78fdb1e5437e2405f2c874aa7280ae7 GIT binary patch literal 996 zcmVPx&o=HSORCt{2noVdEK@`XT)h3&?Zo_uh9)j9j^k6^>Y7n6yp8Wtpyi`!U8bQI6 zMRI7bevng73g*&c3u${1K@cyJR!R#Nv{B?2tt<{Dn}z)t*P?m#JLLqkc_9s-OAhL=B0}BvEjr-TJrm_ylO%>N_ci} zA9SOHd)AEvrcI|4lD?4uhcs2u?SK&n4|7Xm>LvHH;dXc%wPb1*F%7Y2V+9vfmF z)QN7CU|KeGW8>~iejgtLfUninq2`DL;KR4~OE4`Py;ounoRhDgW^O5R5IMadWPk`^ zO~zt=1(M%~BWDle`{yF|9%#ed4d*k$=h|C?sRY@or0C+Pxvt@4d;fveV zkj~$*CWtK{lX<(R-X^}ccWyjV^RN!u-cAA{U^|b9)T`3R9565*BMsZxh-Dw z3zbrx&I90v6wNg#au72^J$!fK$-eU=FDqbO=xHb(Bq_`0Mcp6nZ_Ol3rj`4ddu*QHl@ax=(F^VK$l z)poqg=6R!r+mj%41$Y&YHSw3rsMY7FPyn{lJ^T#O6CJKh15w-FSPVtiQQ-8 zmyh4v0yZ5sEgL5;9>w?1MdY4OyOQZT2V|!gFgH2RqpZk59(`w@Kr>)ECBF}f9OS2A zZgL*k=>^wvT%UlPUT9$nrgFcwB%413p%FPCgQ{!b)MHvUZ*cDP=El-g{x^SZ}n6{HSX>0FlAM~ap;k%C*#Ki&i}%K_q7uwp4kWj_0(qsOI_G{ zw&=$DqzaqI6;|TU*XBk`O_(`xy`j-&xA|8^`3?M&dA{2{%UpAj9jG1ze(Z?V_r7lC r-Mi*d{Q>hUHYtCeFz`tNB?6xCx+bYtg)R!(3sUFl>gTe~DWM4fqw_{g literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Neck/Scarfs/nfsd_silvercross_badge.rsi/icon.png b/Resources/Textures/_NF/Clothing/Neck/Scarfs/nfsd_silvercross_badge.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..67b23059b88833fff63d45dd823de004fd85d8e3 GIT binary patch literal 317 zcmV-D0mA-?P)Px#_en%SR9J=W)4xi?P!z}UZ*5AVp>#<@3l7Cas5raz4FvIF@(_6sC#4kf1}>$m ztAh@OmRq5uQESMJbqET@K~7fBXSrN1=MO))pp;VTziUVf;yB&`gh7Yf=?&TXor}Q; zfNt0$iXu@@N4mhuEIAvV0^s>Bp6}8Pdp~bd2jU9Ayrg^gFzD221Jp=h_Iyt}J%Y#T z?)fgs!yN#t`C7a{tpsdQVv7=hkGFj9loBTp*goygD)MFVgwtwr;+$i0gKN`2s(%wF zFrFlhY*P)|zUJ7X#27=iNf}QP@vjmWe7nB7+|9QO0FDp)wT3IDlu`g+2yRRmip1=Z P00000NkvXXu0mjf6<&wx literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Neck/Scarfs/nfsd_silvercross_badge.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Neck/Scarfs/nfsd_silvercross_badge.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..ef9d8820cb1ddbac10fb186e03f9a37001fd8330 GIT binary patch literal 402 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zeLP(pLn`LH zy|vNnaDc?okHMN6T_TDdu`IHz+t20MHTEr9uduYXb5CRU7se$bRy(=!>`pFK$Xufq z(d+CvahjIrzHYw%_k~Ur6cy*6_$12-G#>~YB=7oJb00Q{-cw&%xv^w@&NTk)X^FcX zAIGQtJ(9ybr?_ab$KKnsf1aFb>w0?4{VQvl{LV$+{B~}c*|uw{o+nkVe);R1ufJ06 z-8?Sa^w4Xy?=R-;wcM<)FvCoA$#1JQ^4c?(SY>V5^1X6F!Yz~2pAP0Q|7uRum2)pT zr&(7wH}?2MAopQ#^wg)#FZ~VTD}+{mIsN+t6U1!{3=R4~*J)qo*7(KKZRd11&(rv) z$8F1W*}X>=IVV_2&)NUy#Ce6!)~op%Zyxyg=9kIjRbQF9HoQ`vQOhW{w?S#mFOFrR oGgm=aY0@9WH`iFPFf?TCW7rzUc+P7=^jDBYp00i_>zopr0N?(trvLx| literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Neck/Scarfs/nfsd_silvercross_badge.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Neck/Scarfs/nfsd_silvercross_badge.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..8611117cb864906263064547c7d56d781b909456 GIT binary patch literal 410 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zLp)s^Ln`LH zy|vNnaDd3MkL#5*x%D=QMeIQ@jQ$igp-OGLW#FWgk;WX(+8 zdN50-i_bK3=a*&MTmR>Cs;E3aee$WEr4Y~t5b#_Ts{Qec<^AuE+kfw_e;$5w&lzbo ze(MjPy49mLRnAN|JMjJQ{&S|%UoBpI6=i8$nsL+M>>Tgi0sHihR{yrXb?@#ZmEN|A z$L7cXs_4E_Tjja;{MOU6i*hDemaC&%fcpz?MVAxO~+f4P*AA>t1IM%~{F9#1T`1&4#HpUXO@geCynX1Qtr literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Neck/Scarfs/nfsd_silvercross_badge.rsi/meta.json b/Resources/Textures/_NF/Clothing/Neck/Scarfs/nfsd_silvercross_badge.rsi/meta.json new file mode 100644 index 00000000000..b1cc155cbe8 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Neck/Scarfs/nfsd_silvercross_badge.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-4.0", + "copyright": "Content created by GhostPrince for Frontier Server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..ce1a18c940ab42a61eed3da8a9fc5cf7e34ea365 GIT binary patch literal 2552 zcmVPx;m`OxIRCt{2nq5pB*A;+2*xi}kVZgiQ&tTW(FMyx~3^X>O{)>`WC~lf2en=EW zN))9@rK+k@^`TMK_MwgX(j-!)RO*kCNVOVOu_HxoBCDwr6S-+qNQ|f*AQ)pD78@|T zUB)vzyDZa(%?!J10y6{Tq1{hHjOOQ_bI(2Z+`IQ2$de~eo;-Q-MBGgW_18pimb=ueJuuH$?yxFo8E~hQaBxiLc1>xPQ<7VdM)9(f8V)J;154( zBckYh^SgH%cH6bX<9#j0#H`N5tWI5pXm#Ekhi>P;RHPox+cnPzrol9!$?<9ax1yK{CpIS{6Y&#$ggFSA`q(wXx(28Y zdb38pYP$qr8DeHZC8FrO(qF>R$TUx$^fG*AoYs9!o8kqn`+pzT0|QBo%36TIyEdaH5#**`lr!o$xTHPpp8$;1+|d4>KH0|kH~ z1_b^&I>U=k6!F5FVwQg9wG-AExf*!s4fJ2*0rXn zv^VdhqN;}W=AGGbr&vTP@w2T=wv4i-jI|ynlS}wSFKSGqq)fJi`vfnC9_q#~i5z;U zo7lX9rl^(zNj-^F5+Ipea^C9AgQl zY+hlwf1KjdB4YCjrPV=FOE>RWb6IzO9(lCa066vX*@EiYYGYSZ83`@HuI3#`vL986 z^XbS{gn+;&gHuH2q6L}XY{&wi$=4Qj`cDiLgvx^kfUYGt^4RUxJEvayyEWR8xoE+G z2fB?wv1m)aBLyW{GR(Q&(o;u8&30xd7r5~L1OZthIu}J%)GhlllomKP*OD7j#twHrvX{=g8?)|p-rdNZkL-2To+ATn zE0wM7Z|(^AL?7EqWmihr<>*rfIQ#lAr;mR?WA|#qpoWS zR7EY2WXZ_fi4}(=Mn4?i^rbLUKEQHnnX6M*3wG?@VHA2+9NDRSTT`H^v%#3XlK#PA zM&V4%H5g#_$~;Y-4V!u-X3AeqEu$$anxYb0hyf5=h*|fRQ_GI!+nNHWfBF>wW@jd? zdqX2h9(`Wr#V3krZ?3TJS5(yiu=Cz=yE?d(Kb;|e=a$OPlP6D}JbCiu`Jcq`p1q@K zm$l8zOiFA;O56^)>AT;*b-|Gyj$ZETX*6U<jFaWGn ziJ0!V|JWY9J`aESZU2@|fn(ph%UF!644=7_PSpB*6nfL%xSUFH>c>0T^W-_(IygEN z{_8tuX}Y%?C3=IUWQr>z*O>flE}AE`9S56@b7w}j#0VV+n~lF6{}+wjyR9?Gnp>*~ z?I_0U^B@KUhDL@QwdrUTXm8$0QeR1am^A}pKp`M4XP+}`{KOjrI_u5CU+HvgxCfcHox~RDlz7bNN?L}78$qBAkf!yE|sx0RG zKSsZhm7sNBlM%U=eH7-VL=H9(1anJdV$&+Ov}|r&z-rXD)moj;)WK~Kbo67$BsV7y zUtC_k|L5&McC7%c)C)M}zo|H!?tU+2mH+?%4rN$LW=%~1DgXcg2mk;800000(o>TF O0000Px(DM>^@R9J=8mR)EZRTRg6o9xc)P9~e(d@S9xlzcWJF*YO>5|pMs;=4uvW3bluWz}D&;yk-1!`v3q2dzHcH3UnnP9Eis!i zNUmyo6v&u4#wOyVk})E`xvG&?4ZgY=WNaeN+gH8Z zzcEc`Ut38k6s*-?Z?m0GoQK%i2Y#X4Q6sGy7(tmoAI=l13lWe-X70}w?S+C0_=R%P zszJugkx;UX%&zS!L4J&HmO07AfBO88&Be| z-1ZID%7mlAQoyG#x)Z$$mCbryX7;`!$e7QoOgx&|77 z-D&`I4K!lt*1-Z))yU5Ao0mI3`a~a9HS)m%XgeBiKhOWoO5QSUJuUWndVAG|ZlbB0 zN0KF53vo8vr01jnXNoGw=04e|g b00;m8000000Mb*F00000NkvXXu0mjf!s{DU literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..6a3d25f79f7f3083ae444b8c4812651f4063413a GIT binary patch literal 418 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`I0g8GxXRlm zR8>_OM6_+)y!q+Vr)SQbk&2(GP5d00W$TcKVN6po&YLE{-7)t#7a00#W}kb%(t9Q2gX0o0cOU*{=YMg!b?1JD+R6_M z6VI>(T-0sYbyV>|>i^#jdi;C}r&}3ADhuM2PUR`E2FuAL1hCwC@##ao{N$O;j{}dL n=YPbz1L!-x)CkWsUtb0-Ae#e-LEuvGWDw=)>gTe~DWM4f_%o`$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..8184691feba6a60a7772232f87390537e4fa0d39 GIT binary patch literal 393 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`*aY~5xXRlm zR8>_OM6_+)y!q+Vr)SQbk&2(GPdb&7etfupsy!A$Yq|5)Lj zK2bA6zPD#zxaPw*|7yvcEqi)I8W>m<82+;gY~5`fGJDCSCw0vZ7Z_BQPBCtfUJ%9H zAoL=7ZusxaufhwaSu=)3Gd_LD+%WYp_lBsO9v#|KxNE<5Uwsv}F8_hH_{P3;OCLrK z2L`4Oh72n`cRUv2X>e;e_lNI5?(8bHgUk)LzJ1E9U)0x_`9I-G;z!el&qlK(3NnSV z{&5+YaL%zm_io##6Do65)2)2?lbI`i9TRZ6lMxH_3}0%5XPU1sgBFm@0mLA1DR?r7 N@^tlcS?83{1OTemnVtXu literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi/meta.json new file mode 100644 index 00000000000..79fa7147485 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-4.0", + "copyright": "Content created by Bing Guss for Frontier Server", + "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/Objects/Misc/stamps.rsi/meta.json b/Resources/Textures/_NF/Objects/Misc/stamps.rsi/meta.json new file mode 100644 index 00000000000..55d8dc3da48 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Misc/stamps.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Sheriff Stamp created by GhostPrince for Frontier Server.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "stamp-sheriff" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Misc/stamps.rsi/stamp-sheriff.png b/Resources/Textures/_NF/Objects/Misc/stamps.rsi/stamp-sheriff.png new file mode 100644 index 0000000000000000000000000000000000000000..6d6e1757a9e473e4d0776e9cd69d6d378fb0f17e GIT binary patch literal 294 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|TmyVUT!AzY zsH&>k+uJ)ZFocGNHV81x*V5a{p!bDA{{PIbm|9;kVSYh=UR^5_Gj|ia5EJ(V>)--c z19cf$NfC7g2}fh)TUM?!fu@L;1o;Is{KpD5bQj+TDhcv*aSXBOeS1z@?0|xRbKsvp zr+I$IXPtIz@9L6TcUCy_?T_}>y>GVY+pPN#yFhN;>{ypr*AH<&=bUL`{T_7r6;JcU z<&Dj2G!q^62-J9T-|5%S`@Mo?t$XQrexT`msS%!OzP=1vKsE;ugTSTW$so$p)z4*} HQ$iB}sYGf& literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Security/nfsdbarrier.rsi/idle.png b/Resources/Textures/_NF/Objects/Specific/Security/nfsdbarrier.rsi/idle.png new file mode 100644 index 0000000000000000000000000000000000000000..393a1084d5de4015425b2aff84b8dd7de334ee93 GIT binary patch literal 828 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/refill_nfsdtec.png b/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/refill_nfsdtec.png new file mode 100644 index 0000000000000000000000000000000000000000..7b10539f133acb8bcd12a351cd601efb6397b977 GIT binary patch literal 352 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyEa{HEjtmSN`)Ym%P6qOe0(?ST zLm3#39z7Zo5;A@IbO%F5FH1%b50C#d8H@~dGs5K(gJe@uQXCx}Yiny$;^U*EqZ$4) zoH1rF{?8yM&abT?BFN7xCd@CREU#;2Vi#g!=5C^{AW;zQa=cG*L80ijCfV~d4el(p z2rh7qsrB_vwR2Cf{?+J_3$$IWB*-tA;Xg6JqTX~VP)E9_i(`mI@7q2{t^*1@EXALA zO*g1b`}JSnOjS;t`|Z`8=O%TYcxL?kaKsPo72S>otEQDMo%WSg^OwPx%>`6pHRCt{2+D%IvK^O<{e>BNvw@Ed)RhPOL+R_vYMW|3D5PB&ow5Q^|x%Aqv z(2vop-$5_ZL&Z{xCrc3_rAk7uwPLisZL%7fo+gdS&Ss}s^McRs67pm+`^=Nc?y@rg zA%qY@2q7&^Cns1tpZnq6Yt8W(qIfFs)Cs^sI;@YNkRJqb3q~~VX$I~gK=VllH zn1;@H{QY967MBr_X>1xgv(L`4TRLp|-ss2>Q^Fw>f9*;2=~X71V!_ZLA~zHOz{wvA z8%sG%Ws+!&FU^1UoP*~Xz{O*#RQxJwO0exdqziCxT$YOa<@c9D(|gOVI>u%6%?ucu zoy7La7WO}F!CEa~Y<3dGpL>pR8PapeZ3ZaekZgBSZl~{D`meLVV?56`$7M**fL`(- zvE6nbeO&-Q&O1^C5M2TRV7GJ_u+PrhPDmubya@nMV-cva2-X(Xp@c(NTUfso=k2_b zzGm}#0e;PId@tLd?6DucoWhR}-*IqUMm(n0Uhh4-k8g_`SDr)HjgAa4x7TZ-aj@5F z@PrUT2qAq7-i}Q8&Og6>74m?CAn__%fx|f)S&gydnyzLoq zeT1CJrdavJh8k6nU*3deSD`6ESa!A6rrVF9>wgTMo2CSjczPE+cemwo;o2ZykH0k$ zuf?1OYZ^N1RuM$UPA0}#bXY@lSVQI1MkbqLq9S-+8B%>%i|-VfT!jT_TxT!WO?%EX zbmqq+b!gK5sr2X{MpG7jM$cG<23sjQ8B#pGYz>&gye- wt25p~FW&x&_?~k=4W8@AoCzU>5JEcYFWP!ShZ0i5OaK4?07*qoM6N<$f(Q_PkN^Mx literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/icon-on.png b/Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/icon-on.png new file mode 100644 index 0000000000000000000000000000000000000000..3ddd5baa83a0869ccd3dd9ec075f05055d21412a GIT binary patch literal 591 zcmV-V0Px%2}wjjRA_ffAuW9x(oowmjuUe-be0D8h2B&@+T^8l=Qx10`T4Ij+57_ z4?}?F$(N;BamkK3fB$mQBFbjrpY=#SxsHlUgRK0C8xTca7`*^kfJKOqE26{v*yX5mGsn8sK+&Q@^V!$!^K7)PNtswaRv7((o(20{~9_ zHbH-&T!<_|f555VmfoM}3HbWqGiFKfE4Ko`&;F3^-@De`aWJcbmVZ7oPK8-{ZL7@g zo<$2ef1(C#>~CSLuCP}8^P*Yq1>^=pI>$}?_67BZ$EI!lH;$$!ck%@Odc)&^bq|qS zmGUe91#GL#!QQrN8fn}ehux|ry+5`An~$uS-_&L){`!f_ahv|w22|G9Vg*^|$l4#< zfO^wY9%fW>WbIe_4k!qNmVZ88&zm&-(&O;x${Br)*_9&Q%YcpjE#@%}r{%vMo_orgl^3VCr8uCm__qXiKB{}EM!sr d8jWUg_zkg`Pbn#Mf-V36002ovPDHLkV1oWK8211G literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/icon.png b/Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..dc5239109674ec0ab97403d37700901de05b2b81 GIT binary patch literal 484 zcmVPx$o=HSOR9J=Wl}$>+P!xr~+Su2hSO`(75^2Ff5GNH!#gQWy-~x0FZlGHcoVbOK z9El^*X`q5isa7ea(yFm7abiQO`D>z%@{Mlb+;b1Smva$fD;)ZarBgDzafzkQYepbU0*1&;B;dI2$YZ>kpeW^{i*NLe+PIqhf&&r zh<5!OXx;cNYtBMyADI>b=sGVfw-=970Dw1h$f}y-?D8h^@%^BzYf~$@tZP>p>03Ae0000Q6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..9b5482e0f17fb2cff340d2ad05e421ed8af00428 GIT binary patch literal 609 zcmV-n0-pVeP)Px%8%ab#RCt{2+QDiXQ4|K?f7--J2MI0$QEF=3)Y6^Hk_SlM!9~oI%scc61Py(K z%qCy1WzOQi!{H7SI0qmiA|fIpA|fJs z68qRvbvv(S>vcP?>|-lZPb%v%8&W|nql}gZ0GCtshF1WL0)XbTWIe`^2sx}CsC32x z0Q7r4oLbXZR8J}^4zU{$R@%=hKNyK*?d5iqWomg$0Kf|!q3*X|Yn>M+(%S3K9)@WX z0C3k2P%38OV-%@BB?|yb#VoGP<+I`tX~6D>0w(Wgs^{aZHo%*l7pcR&Tof}m>(+7c zrTZF3)vcwo;?VL6yxae=)_GxC8t^|6X+Ya?F}M#fxDU|1=wR{%=w5Ul>Ty3?POWK# zvjD&kMpIdB$CY?&07Cx<0OQXU09fY6Lj%IUzyG|6eU@ZaqV{q-YVz>&{(i13A|fIp zA|fIpA|h?-b{^6*{CT8y2*d{?=byIGGRo4i5iO%U-WQnB@Cr+vFWP{Ux9?FkQ%Gkl z999ps-Ga%k!0b8ysxKloc&}6{xZ3QhkADZ4Nm^weLF@*cHcq9YmbS|NfY=Qv6|?HA zHN?xUR{((DgP~M(gycSgSOdm0{1noe@z}24OQF-2N}ndVk0AC6=$zr}Je&IgQb9Ur v__HMU5k&U`lAPhMM00000NkvXXu0mjfoXHSx literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..fdb5f76e7b74ed618aad3d7c909b348664e838fa GIT binary patch literal 628 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 TLEuvGWDw=)>gTe~DWM4fLIU`^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Decoration/banner.rsi/nfsd-flag.png b/Resources/Textures/_NF/Structures/Decoration/banner.rsi/nfsd-flag.png new file mode 100644 index 0000000000000000000000000000000000000000..f946fa91c6561fe10abf181a4fe0abdfda87a1ae GIT binary patch literal 686 zcmV;f0#W^mP)EX>4Tx04R}tkv&MmKpe$iQ>7vm2Qx@<$WWauh+jBL6^me@v=v%)FuC*#ni!H4 z7e~Rh;NZt%)xpJCR|i)?5c~jfbaGO3krMxx6k5c1aNLh~_a1le0HIN3n$)S(glehxvqHp#<}FOz%xZNo1P;UiKS8pD;>LMR8WPD7_B-f7SgmI_wh$ue~MfRxhi1f zn8yY*$gUs!4}N!R6(`2Mq;MSQesP?SVIZ^%H0zG@ee5{R6Cn5uT)|5Tqat9cEGGtSBr65hASOnhB=$rDuz%9_b>h;#z$LRx*rLLB4fP+I| zq(s?kKJV`7?Csw(t^R%hpFMK95|x%T0002XNkljI0J7kQD;x0A_JwT`)spT`*3^U;`9|04|4+0;m!KFn}Baba4PIZjpl>IXaNl z-~wbt0X9Pk`5c!+$W8-mC+sG<5W@zjng;0R08U;GsyTqES^xk5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/assembly.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/assembly.png new file mode 100644 index 0000000000000000000000000000000000000000..d8ad6dcd30d5f7b5b74d5898b8c19a73e770ecb5 GIT binary patch literal 1120 zcmV-m1fTnfP)Px(8c9S!R9Jkx>I31w2FR!R?ObUW>`UV1}Z zD(%nNvEs7J+Fg2N6+2Ywgt}T~+M;z;HyDJLRw0DEFvkudI~co99Gf_7-;3?%<@^0U zZ~pxrX?AwD1yCxL0BE&ZbVEL$mz-r|V`JSroPC}fJnYFWTjFca-*$A)Obt=h z8dxU7p}wBP0g~~sCwHM-Cm@Pvmokg#uRi%EyOdc3Y}Za?&`;af#Y5LRah3zl0xy(mdQY1$9O~op$bf5|IN*SrE2o*d(IgU* zeT#dEI>p-zh$h4ab)$)99HALU)Qu*i=gwxtjT=t>1ENcDCaStbIMhct)JNTD5)Sq8 zFjoaSQC0I4$iM&ag6vY}zViq1^S$*u(+iUXUKBdWVv(TdNTGc%6dGm#yLdgi zXkc>X%iD7ouScK#`3K9cvA{xn``}a|KX7vRiUroUn8%$JB8OWnXfxm^BRVU*xB~!> z?yfES&4~O)Luc~hj0KPGt}O!uGE+kUsNetcwIAY#xhiWfE3VN{yc?XByjWV9sUf7# zGat6PrR5@WJ6cZ{lWyEHKvipynHuuEJOFk+;0IPdczI-?E4RF{TVeEkzggjuQHx}L z;milO3pFAk*>wOiU}vw1m}1|8Hg+p^qtWyIZTG`&uuLan3XzaZsj5TlojI|cWL?kq m_xF8|@V{Qq0R{&L0r(eO$V=Kj2FW}C0000MG;K^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/bolted_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/bolted_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..6857f2a24154b06497367e4b2474465b750393e2 GIT binary patch literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJa8DPPx(uSrBfR9Ju zq^6S5HEg#BxS;~J+ha1F7|C&FW*o3EO%qkIs{!%i`fh-9d0~o{)$vY9tPjIvIx&)? z(y+a~id{vW$sY3-$l@!j%QyBL*5X(?`RLxw;#x}U)3SoX<>yx58bsuNj^g^R7l=Sa z9N8%G{f4zTD$*~`rC837Q+{rR&dVGttIIb4itD?ilCfa}iFh>BHGudG!^^#HU~G^Z z1IQe*2{|_+qg;;?4HJ^bURL)**N2_vO!ipNz+uM@P;Wb-NtlR7-(`3ZqXG*U@SE_P zvE3fYxO$MkA<=`xM;ee#$Qy09hvjy$+%C4;WA^yLM#4D!P;IwIA|9pXC;|8KNwge= zL_A6&9!2cAQ*HqS9z($;bI2xSt%$hG#@z9MxQN0(FWjhdr7QD z&P@X_F`ee@l>*H-?dvg3-LzWvXJW(ID+MM$&Qg#067TsYV!yyKATyl?;Klv++S1a} zU_t}qz5y`AHIxHZ+aac@n;oZ{^N;@Lu9Zh!SXjuQ+-eOrD7fcvz{=K3ykt1}M)k|`eUH>}0+6Z);kw@X*2YZh;%|8N1Z zUxxd%I`n()yH5sRF1?%oWy9n0av(mPCYMbj?!M!6b1_ZbY`$q<&s{i8d|`&jtH!WW zNDc@tq-ywixy(u|#)C@(2k{GMJg(3OS%|~nI>Ocn{QlD>pI!~WB~8R#um9`Tsb6{o(P~ zXRj29JgEc-L}`_Cq0$*V<0mibH(UmLo;9`?PhQj?{q-knm1i}N%X4*-)Q8*%^ev1Ne?`CoBs2!2N z8v2_Qe=WFov$!T}fph{btHbib6adDLzkPF*2=A0z6wRhrkPhmU1*g9$RSKu4`+(QU z9M+c02Fb_OP9C&u0x z2?Q`C;)lN<+^)1q#?_J6QtRsE^Le7ZUhmt5g$0`X4qa!Tmerx&c0j@F{Wf-*)Y}d% ztHbQX7~8Mgpg_y+^U-+BGbhFs6e@cbsv1E-L5;pIy0+WnwKL|uAuD08=e1fb)b)Qw fHk$>8U(f#mdGWnqHEbfK00000NkvXXu0mjfIp|=7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/closed_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/closed_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..c78d01c42d084dd5be78e8a33a599a90cc86107f GIT binary patch literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJa8DPP>^Ss#&mpghvZkX~#s0-h3N2b6`K?}O)meqDd+l#VI$hWM`6MlQ q&#%(rqf#%I&Hk(pG?9U!&gT+u#1#>y1s3nVf%u-TelF{r5}E)5_cy%& literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/closing.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/closing.png new file mode 100644 index 0000000000000000000000000000000000000000..ba70dac7d3585b2b37d421be2d8dffc9218f1512 GIT binary patch literal 2364 zcmV-C3B&e@P)Px-_DMuRRCt{2oLx^FS00CdGmJf+*v1&b@{$52S}!6Z)e1RMtyUrzsOhe>(%v*5 z0C7_(U#L>V&0g$od(%rABD2qj+7&VQ&HJdmMrH*lILuSUc`zxV=&jRx-DzmIsY6{ri%U0q$pXf}(>qO zx2N8E=CbB8T|B(^PgM3>$fkK)o$Oc&+tP2Fulxfn57A

*aa#hSEQ`G;`U8ijaR$;nGogR`IVJA!%snb)RCo{qhOTQ3x zh3O)7dU#bo4%J1E$-WCWVE||x$)Vna6Y(Kjof;0+MUTlE>>FxHon9nEP~hS{AWWCz zrnt;XogSt~qWdi%b$SpxU5K47qHv+_0b#o&Gr|s+h!5f3ZW};2^Fd@-M@9vS_z)8D zAxNDbf^^YxNs%j{Ei=Bm7%`QR6*UU-0&!D%Lo)h1Hz*e^mmUQ*XGa2Y(PI);G9&D8 z?9wFga?cCHaj{F2#v224(Q+>V5Zls?Yqu6KJ~N6&OmpM)!9|amoy-6Le*XSwFzI~gQH*?akHxnUqAY`^!enWh*R+-6lUkA zy88URz6St6>-Ev?`Ay4b{1Uxo(!7~EI&V_cmY#%F*21KKi!HZ=_qgbU4Vizg^7 zP9V+qqrC}}#gEEFC5a-Zn%Rm}nevhXI=VFJ+%+AjC0ifTv_VYU*&oB(K*(?B{(P+Sn zhg+^BNdSQB*RP{oE<1K{!_4J!D3wY804|kE+0M$_EhjmAMpEX+Q>kIk9&WfmQa$)? zT--3rW#xpIN+mFVDg4RsG}GUOKfgJ(eFazzGwEs^$!a3mi-%J#spOT9)PtXh4>@*m z!>sJLkjP9Rm&<`m3$cN@33^CIvhvC=xQ=5GT~eoq@l4_Zi&Rh^MqJW%xmU1ZqtQj8wmH@V&ZN zG0A%wsje)@tgIK-j+^3gG9&CfxVyEH=KE-i`dN89Uqibu#S51vorxb{Q62W`;e@;O z^Z}S$S)H%yiW zhLM%0S+r2l9!6Zf^2@~zlcj-SWaaf(X50MoFyq?Y->HioCI<}OtpRUYc{`bSBQY-? zZn>mg?ShOG7pF{`r8^4pnw7W8#FIz*^7g~S4VSb_vz)lNVK!$+)SEcRvdoa!mTr)Z zeq`mXGV%F*UfI9{Z*Pfcy*|1fySQO?{!>xg;>5Oe<3#Sx$9QhfudKXPCLRDj-rdDYEQYWCb{*vV z)~kmT?!%im2i_B(%wT?0aO~oS8UN&}+7?GZfW54|osrO!%{}PFu>mC$KQ}jr^4uJ{ z^YcLK3Fr=c@o>T&( z=VEjc>@d00(|(Wsk>F=m-Y65_fzo!h`C|Ep@1EURSucF8{juW3!w&b#r>UL){fG^+ zZ|$UqAHI7Aw=PbYwd$eT7OVY{00fhj*S2Xk7v!gh6<2RRuP#>14-OjYwt=}I@?sEK zdAd!jxgbA1>~Qs1UR>-lfwL1}XZ6RgGGhhlVbnIAiu2pWP8+sY#N5t8>Sf}|BN2OW zcWc9M4=XN7MU(k^Ir-w?ZbQaD9q~?KZ7bi?|@JprA`QHcFsUZIQ_R-N%0Knnlq3!p0ji=LG iy?DA47dK2gp8gvc#!bBE85?K-0000UR&i(je0cL#ec*0}-@j8|{(iQzwzWT#=l!&5f jT;0h840aHhFykh_!rG~;5AeP$1@S#y{an^LB{Ts5_a?jl literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/deny_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/deny_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..7c56263f83958a17893b3db0b04ce3078c15cea0 GIT binary patch literal 321 zcmeAS@N?(olHy`uVBq!ia0vp^2|(x;TbZ%z1lzVbEa*5x0l` zFLCLtQfk)goBm*9Wqa5)W5IyH?gg7O+Vq@#{gzqI_j{ICbSF<}<0|vo?Y_6yOll7; z+AsO(r`@v>Kf7}$KR*umYV~i&zP&s*_xJv-=38t1deYzEyLbMqy6^o$Z`IbavsGXD zr!(F8`6z;|L6RYjVFqIYc7~Z}LvrZvRZ(vk567Q>-*~3QX2MKG<^wzo#tdf|3@{iQ zO7s8d*3Gv+{xi?r|HRuDl15mS!8LAhWr_IppL3FmClFnFq60fUCY M)78&qol`;+0G5h<`v3p{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/emergency_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/emergency_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..817f2fb3f95c53ee8720a7c5be418b6208a6a7e6 GIT binary patch literal 588 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 A7XSbN literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/opening_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/opening_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..84933bd5ed9cd40a972aee792b227f9aec95f233 GIT binary patch literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^2|(X)s_s z#KIwr!I-V$V11^#dUpKLjjy-9DY|#Kuw+Jjzzl{&rWQ^CH3uAwt;hGhNWR~>|B3$l qhyP2a-~C|qG6v`^C}^l(vC57yE3)EC^YOwKkf5ilpUXO@geCx+nr^EA literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/panel_closing.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/panel_closing.png new file mode 100644 index 0000000000000000000000000000000000000000..db7be0bc4a0ec0b2bc29e8718fb6b71796846f16 GIT binary patch literal 445 zcmeAS@N?(olHy`uVBq!ia0vp^2|(qk=b{5eiK-()1~xQ&@cMV`(mao8yQ?TZq;#^Y}m${ zacWZ!Yev-i>$j948lYsxftl|YY`yljZkp{(pFL*+-lj#WWzI6YweB*{ESZG)8eLCP zH-4D=_wruJUKQWqugks*3w-~bxAmsS_S>R@6K&4#1!`fty>^f8^xkc+O+xqazTJA; z{=7~2>uGDRIhyR%SJ)ONH}BrkKUz=f@~-S!d-avVtb5`KJrkcF_ZOUaf4N)v?bouY zpX0AZna`Cr-@$dKByUdGcPkF5{Og%j`&-%%FXZlavSVWw{8-KzzB@7SM0TXvt!o+A zif+H$q2jsc@9*!WwR0M*e5Y<-(ETyu&`qBj{lx9nl5Os{*Qk05m8bu?%XoF&`KQ?? l*%zfe7FQS8+W~`WRsIyAi(3!btSA5lf~TvW%Q~loCIEIM%9sEE literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/panel_open.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/panel_open.png new file mode 100644 index 0000000000000000000000000000000000000000..24eb2aedc2248aeb772b38f63ff992254e7aaec0 GIT binary patch literal 315 zcmV-B0mS}^P)G_@Zv*NK(#C83< z0hCg#mPY_q%Og#e`P2l!*GQEjpT`0MYBKbMv^%3TIE=g7KF`WXCR28pn>(x2n zemoXytpJ?bfcIZ;wOEjBHdt%rI!S!%PGhZ=2c^1AoGrxJR_5RoDx&OEP+E*gAHf&mPbH>ZE8FCH9e&*rpCoP%1 zIy_fR`1DT4EhW}ImG2+Fy>#^EcBOlIu{N4r8M|lHdv8DdMa^XX`Q)41s%D;5@l3t_ z>U!DiCu(!NfiicFek|lsbn*16WPNgF)9u86nlDcO+<9uZb*sRm>zlTKo#3wDtk_cV zGUiQg0fX*;t18(yxo?DbZh3Nv5#oCg`Gddm{r7*~nV;{o)~0;#=kiD}oLj`YgzrYV zCx61j+EYJuRBRcZ$AIaEWtl7E0M--(oM3v-T6o|50rvB z?(X|$_9K~q!b>Jme`5^XKVF&j%`2QtMsN-@c!MQ;uYX{&xPXV-MV4h*a7^*H)mTo% z^duKBlw8QrI7#Az6a!+!k42gRM*{jVXw(2^)BtAG0A@rO5W6r+TTo*dR0c>itn&u= ziYhf*#29dhKzXbye)sb`x`T#9jF|@skRQx^J~1)&r}u;k?=m8#VH_qLszE1c7I|*U z-vi17+kNaSpCz%9yQ#rS&sN2x0`#dRVZ$Zo3 z(YozxD(tDJ*Nd^#9ngM11*`#hZL|qqUX-aA#5S}G^!n=WLLU@GQ4~c{6dSK|xP5Tx z!-H@vnhtn%y49-Lc3NyR!WG{&^FjpmIbAy+o5nPrx)V}}E%fz`bB+BtcI@^)8^rTf zBx((Ky3EXU1aLM2IGxVm^KA+58-UdY;QHA(FXNaPN!aD?zV8}<6&DioA6qwm%&S`B zG(?rf)v;@BC^IYu=$f%ZGhhqXw5SF!qXsa;V!%*uXSl{qZh&O*G5ePMUQntINQ83i z$upoRb}H)fv5TKDu*ZP$-hvmY3!Atq6ENBh(WYFFM67|7l05p#?E1nmayZKasmvEs z4%uF#@2=U$hCc&#<3^>qaoRUjD5t(Q@!@5>eLn%YPa&y@Wk6F&Jf;Amr=S&p`TF~H zKQmyzZBbK@-3j_NfaCqFrZteLVgLD`ViBgsl+FQ!832*%0DhkaTq4i015y-4Q4~c{ f6h%=KHvsSpwHV1KmpgiI00000NkvXXu0mjf++aJ5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/sparks_broken.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/sparks_broken.png new file mode 100644 index 0000000000000000000000000000000000000000..fb5d774588ae44eab5608571cb6aafad7375e158 GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^2|(DFD66%%n7hj|c25u0=Hbzuz>&Md dbBcZ?)Aw7<0^jOhxdW|Y@O1TaS?83{1ORW&Jrn={ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/sparks_damaged.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/sparks_damaged.png new file mode 100644 index 0000000000000000000000000000000000000000..f16a028dee5bbe41a7f4e35f686043e8a112ce4e GIT binary patch literal 184 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeK3?y%aJ*@^(YymzYu0Z<#e`9lQK{p_au_VYZ zn8D%MjWi%9!PCVtL_+fI!HvAl4m=D8Hh=XH6ZQR;XyVo{y01gP^_0k+pXD$8l*-N4 z&iUk!V5<=?maE{?*yyS)-udN6;H*Pi5*L(-Fs)pAdDY$x8SUGCM{GTG-~v& dN}IerjGt7Q1>7HnEC$-e;OXk;vd$@?2>`@EK-2&L literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/sparks_open.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/sparks_open.png new file mode 100644 index 0000000000000000000000000000000000000000..630eabb976ecf11fa59ba29f03502b02bde399aa GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^2|(GM)~O;5D{Ad0LZe;7N97KJC6BX-upNVgWUu;=WLfz+qP_d4j_bJ3vh=hfa5r9 z0qVN81qdO4*#ozUc?-;6LK?t17pG~m0|2;<_}}aJ8%Xzkw*de?p>!O_N2;HSWO<%5 ub^zoJEX!gGaL3n-QrC61fn;4*wm#k_G(h}nBOLz#0000>iMqkl^O# zHg)P$paEjS{9#Vo$(~xCmTHd1$_DB(>IxFFk|MfRCT8v?F}1$I1+LzycCSxYIsjEG zmIV0)|HlLjC_=s7*Z%?)KlOBR46*1vJLxQ6lLJr7&VnH3jDUjWZ}bEes$bQbrN11}tuTPE?C&$reP;8Ok* zpXk2A>vcd=Bdem{MK_MNFo8wCqK>vR7VKMCb-jn7(J=O>l4?P7&CEl4FHL!Hai2%= zc>@)}sbY_Iw#_Pkkoha7a>YtT4T)o!iw#ZZ-1p+WyyN1R>UNji(Xm3g?+=UHGCZFf W^erLc=zE}t89ZJ6T-G@yGywntL%|3D literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsddrobe.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsddrobe.rsi/meta.json new file mode 100644 index 00000000000..8da68ee0f81 --- /dev/null +++ b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsddrobe.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by GhostPrince for Frontier Station.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "broken" + }, + { + "name": "off" + }, + { + "name": "panel" + }, + { + "name": "normal-unshaded", + "delays": [ + [ + 1.0, + 0.1, + 1.0, + 0.1, + 1.0, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsddrobe.rsi/normal-unshaded.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsddrobe.rsi/normal-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..4011a1c3c07457271f4706454ab43552c27c31f2 GIT binary patch literal 1301 zcmV+w1?u{VP)EX>4Tx04R}tkv&MmKpe$iQ^gOe4rUN>$WWauh>AE$6^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|=;Wm6A|?JWDYS_3;J6>}?mh0_0YbgZG^=9*&~)2O z#-dUtyDD|PLO>5hM9?oY%ZR5I)9@W%_XzOyF2b|?&;2?2)SShDfJ8jU4AUmwAfDN@ z4bJ<-A}h)&@j3ChNf#u3*o ztDLtuYvn3y-jlyDl+#yIT&FpL7?u!60umHdQ9>Cu^;LpSiiITYM}7Rmu0KI8g;V-)Dx1sXNS`95}>#t9I72Cnp$zfuQgKS{5( zwD1uyunk;Xw=`uBxZDATo($QPT`5RY$mfCgGy0}1Fn9~}u6eyR_i_3Fq^Yar8{ps& z7%Ncry3f12+k5->OtZfqa3FG~AWI@t0009_NklljQ5Xb*PNO4LniV1`EBmd7jMRzQlIg z#cfGrJ?=`st2qAZ zYSv+xNPOMooU&P^?y|`p0058zXl&Qf*shml&qCb(pw|ENy{2@l?^d&pPR|ZEEfDvM zF5r6sfG7)B#VTxw2ih=!Z=ds(z`_Bj8mDWAR&dKteLxlri zHKXz~IS-01wf4GI*06veJ%>uy6?*UmJVc7POs6pQPe6ou_sTN^g@tqwv6 zA%qY@2qA3&StE*zE;~p!!)L{iI8)z&rbZ(cY z{-74`k$?B$O$Y!(*Q=})$crH1geoah_tGWE=|*EfH}%NtECoZ?oBkZ{QjW{Z#_bPk zUp{`V4P6ftAu)74SdSk9n6;>@V7z_*dg&3VOgkXm8?T7>$m`ht3d4-nkCV>AvlCzI zh>|WF76w3PZ+uqN8RK;AP}N^$i%J6BrB8}zGNxe~h}%%K>}Gz@>DuAW?$(?<-6OAa zLPa?NKq4Vj=IQLr)}_19h*DWS^2=~`;^Wof-t_hH(djL}T@K2*h8YC{0A3wNiTC9B zBOD){PX9kxHV~O7WPr%wRa`r-Lkd9cz~4XrPUT8A9_5=*S+xzB0AuA~&Cd?mG>l<9)>YZxmo?vYkVq)fQqHAT+v?010s7J0O$S?Rm3SdCt z{r`U^`xFaMx#}JF&vy(1zwI~R-^sDJ^n>Gv0=EnA zW=AOgTw%@nKlsOY&du{LTb-;{47kwhkg6!*DxfU3xp>cmz5jXAB2yb5mkCOWR_soU zUC|N}p!~|IxJ64~7qe+gOa^DZMvt<| literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsddrobe.rsi/panel.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsddrobe.rsi/panel.png new file mode 100644 index 0000000000000000000000000000000000000000..33f9ed5033a0b1d2e9403060c53ada57cf78899a GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}t)4E9ArY;~ z2@TD@E@bvU_ zNvA($#wnr(!Xc+!xY-SW0LU@E^H5*bg578Khv|+_lg$sW*?jCvdBeJOdWZj3DYB`n tt4B%rOPnz=`)6-p#&6~hvQUMA!DX(L(7L;d?|=?s@O1TaS?83{1OWbLM9TmG literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsdtec.rsi/broken.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsdtec.rsi/broken.png new file mode 100644 index 0000000000000000000000000000000000000000..dcb84122d24a3fc3413cb878aa4cac4266f9b1a9 GIT binary patch literal 576 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|<^=eJxVrN5 zFEllrE+exp#HUF@LReHJN=WG4yLVTX%M=H32D=9&CM3AIxlNrq6{sWGQ!C6#+tX6b z(OB6)T}E9&LRL~lOqf5W);GAo)jQSBJ;B;8#Kg?qMAynhMp^#Qx*02{)Gp}AZOac` zP$&wti@|v2Ok?9Yv6k`Hs!jfeOVVAomH7MFXr7;GaA&E-@jk_9596{RZYdy8l)Clc zbR5uDlae66V21z50F?)mK^0B%v?LR?>gHg?(#$Lzq70ZnvjxrXu8M{~>v58O7S>tp&pV=%okuzIxU)3kc zO%paXxMc_}Vokb|+1;|NHE!ah1y@ZO-J8x%XHnXt8JE9IRK-$C)>UYusbwp}Kg%pj z)`|t?74FQ_8+BfYOC6hhkYz^kwt$C`1qZ(^&NJjwPu?=Yd4rhl(*<|;@0gVTwaWWW c`~RN|D)*8rZ1=dz0YjI;)78&qol`;+0DG|Y5C8xG literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsdtec.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsdtec.rsi/meta.json new file mode 100644 index 00000000000..8da68ee0f81 --- /dev/null +++ b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsdtec.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by GhostPrince for Frontier Station.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "broken" + }, + { + "name": "off" + }, + { + "name": "panel" + }, + { + "name": "normal-unshaded", + "delays": [ + [ + 1.0, + 0.1, + 1.0, + 0.1, + 1.0, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsdtec.rsi/normal-unshaded.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsdtec.rsi/normal-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..4e4e6ffa24c7fc1cbb905431ee54d31ecc80de10 GIT binary patch literal 869 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 LNkvXXu0mjfOW=u> literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_brigmed.rsi/icon.png b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_brigmed.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3760e73a4813e819f4a4984a40bbb0a32f972e26 GIT binary patch literal 536 zcmV+z0_XjSP)Px$(n&-?R9J=Wmc2^DP#A{aYHVz4ZMD&AQHUTFDRyyk=`DB<-hdzoZaNA=CnslT zL02!p$x%fqSSX~{Mvo=Y^wgg^)Dv@>q@|(iV4f*C&zF;z{j&t&<_=r$e zcJy8y^R@tPL{!puXT=N<76n8@L!1nY0)~Twj^3+dYqkJHGf=J7xk92DD1Q~Vd#{eI zG5)*>%}F?!h&hhTpW^_ z9R;Oko^wq|bZXnUos2BuqNv)|6;(qPx$14%?dR9J=WlV5AXFcig4XPa0d>Zr^=ASi73{XdROuprD;Dy_{!Oe=Ix2D{p# z(x4CdJtg;Cat|j7@MNs>Vlf-#*BX}ouT`Z#s$J^Jz;rywKPSCH)9U9?*k9_8YG-}3 z4a)|+Zu^?q#@Q!FWx)O~3VA}rg_gnZ%!NyfBTEJ%E$TOf&5EhswS>ZaJg&3YthlXPO3s!C){L b42|#yud-h0QXSZ^$5X5FCBsLJs@fG2hgpXAxzo?UdK185n8r>mdKI;Vst0DN#gB>(^b literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_brigmed.rsi/unlocked.png b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_brigmed.rsi/unlocked.png new file mode 100644 index 0000000000000000000000000000000000000000..94b89fa655da949cd72a05f4ca4438bb89764b66 GIT binary patch literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}9-c0aArY-_ zFCOG%P!w>!nBl!LLFdle1Jma0)vpjq{rP@YBa0goP~nI2d3^rIwe)wN4!xr4xzg-a n#Xj@W=MCBxvgf{XH$0BhzQQx>vT)Q^pi%};S3j3^P60oneEP)Px#;7LS5R9J=W&@pPmFcik|zaXFl(jeJ6O@`tl=oZdmyk;mg&>^$8rgN@rKUr+ydP+h^u7-Xlu}A5rBsKA++{7(RQ}s(h7P+y+uhDA(^O99 zGi6z}b0Gxr&S9-(?meHE3v=%QxHV0i6?xC=di|@fw-G`R06QAtl)`= zFW~EXWjdPy@Vr=1Rn<>n6!E^_1CS(1ZzjvKws-IcUREpVzT#;z;np-1MPc$h7l708 sh>v6Jc-*`9w%PodZOmY;Qc69TZ;Wzr1AKHN?EnA(07*qoM6N<$f;^dk6951J literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure1.rsi/base.png b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure1.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..785a80d59e25f6177e58b279a36ab6a65dfc2c8f GIT binary patch literal 401 zcmV;C0dD?@P)Px$OG!jQR9J=Wl`&4kFcgOWpwOfhQ3Rw=At7agA;7}kD{vPiW)6VF#Kg=6=n1$0 zBSx9$;q+ivn$MDXu2nM7GjtHjg~C-l*D1Z@j7b>5a~-f` zF3l&Dqi1|yd~FLd?kwFcUtXh5$XDE=K^N8xZsEY&cz00000NkvXXu0mjfD&MCj literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure1.rsi/closed.png b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure1.rsi/closed.png new file mode 100644 index 0000000000000000000000000000000000000000..162038bd19d7e9801afd8fbd2cc42d9cd95c0369 GIT binary patch literal 253 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}+dW+zLn2z= zPO;@;G8AZyH<9Y?ING)70i#XRcYT|t-nkDR$$N81xH?L2R#EE~DA+!8J=f>Gj~r(( zax^JOwcR|PWL9^SY4@Kqt7=vi?+s7bI;U#k*Jlix77P!n>JNQgd9EtDVYkz4_X{QS zco`UO@8tq2%M6`0YXMWpf;&u_7Hxm~)R#VZQF=RY{;M}S8UY#2lXq1fbdr8D|HF3w z(z3M7KisFhEl#>!ocvS2PyA@za-g*xQWebnC)1b38E+8+dV#^y)z4*}Q$iB}hTLWl literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure1.rsi/icon.png b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure1.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..cd040327df99ae0e398c71dcb6358de970f37976 GIT binary patch literal 469 zcmV;`0V@89P)Px$k4Z#9R9J=WmcL5FKpe-v)wD^gAxKkO3xy7%NU4jHOJBiv5uAMh!O6+l7qCy@ z=H#fNbSMaEV~D(e0y-k|+QGKAZ{sKCN@T8$j?2YJG;1*2`-EfSzWCd|KycCDts6 zEI<~(+XW?2fLzRTvLp(S3agPmt#ijh0SL7)GHtGqPz!^f;-F9K+%cD>FM)RwZkCnE zBlE9#eKYx!P%PxJU01xdi{tKDM_rY%u`Y7sggMX*ii4eM%*=1>@f1DH^zOMPB+Lmt zI7q9h;=XT$#x;YY)l^}Rr-}0kbE2CtimTH$EII^bHjXbT7b1v1ctw#SpBHRK;Fl(} z=nzG@2K(JiDocD>wAu$_-O#l?;3P6~HiX!3s;sF3~v)_oU^LD{* zvob5Px#%Sl8*R9J=WlR*oDFcin1p{@lcVMGN%hoJBOae@v(P$9`M4{Ive$>Ewx$%dEr zJ8kFs*lm{8VH+w%=Ub}moB7bJ&ad~UE)dP9 zZL-EmUT-PjeurF?z%p*7@gkr=iP};VU>OJEdsYNk#(|PRIh$DN^am(_0;3DaZz%Et zxNw2^9?XdLJB`6b2_i4#-svh_MPWsJ4@6!-oTQy~ef)Aq?-Q7qgw1Ip2!bF8f*9cg XLyb%g9!qd^00000NkvXXu0mjfQXSZ^$5X5FCBsLJs@fG2hgpXAxzo?UdK185n8r>mdKI;Vst0DN#gB>(^b literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure1.rsi/unlocked.png b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure1.rsi/unlocked.png new file mode 100644 index 0000000000000000000000000000000000000000..94b89fa655da949cd72a05f4ca4438bb89764b66 GIT binary patch literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}9-c0aArY-_ zFCOG%P!w>!nBl!LLFdle1Jma0)vpjq{rP@YBa0goP~nI2d3^rIwe)wN4!xr4xzg-a n#Xj@W=MCBxvgf{XH$0BhzQQx>vT)Q^pi%};S3j3^P60oneEP)Px#;7LS5R9J=W&@pPmFcik|zaXFl(jeJ6O@`tl=oZdmyk;mg&>^$8rgN@rKUr+ydP+h^u7-Xlu}A5rBsKA++{7(RQ}s(h7P+y+uhDA(^O99 zGi6z}b0Gxr&S9-(?meHE3v=%QxHV0i6?xC=di|@fw-G`R06QAtl)`= zFW~EXWjdPy@Vr=1Rn<>n6!E^_1CS(1ZzjvKws-IcUREpVzT#;z;np-1MPc$h7l708 sh>v6Jc-*`9w%PodZOmY;Qc69TZ;Wzr1AKHN?EnA(07*qoM6N<$f;^dk6951J literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure2.rsi/base.png b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure2.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..785a80d59e25f6177e58b279a36ab6a65dfc2c8f GIT binary patch literal 401 zcmV;C0dD?@P)Px$OG!jQR9J=Wl`&4kFcgOWpwOfhQ3Rw=At7agA;7}kD{vPiW)6VF#Kg=6=n1$0 zBSx9$;q+ivn$MDXu2nM7GjtHjg~C-l*D1Z@j7b>5a~-f` zF3l&Dqi1|yd~FLd?kwFcUtXh5$XDE=K^N8xZsEY&cz00000NkvXXu0mjfD&MCj literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure2.rsi/closed.png b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure2.rsi/closed.png new file mode 100644 index 0000000000000000000000000000000000000000..28c7ba32d20729db6a8b4b4037c25afd18998107 GIT binary patch literal 313 zcmV-90mlA`P)Px#^GQTOR9J=W)L#q1P#DMY-xy=^Uqlo)%8h&P|H4afqbOxz%vy{H7o2sDowYjo zbMt(!);`b0FKGZpQPiK)*h8mTyUPw1maRp(s_`xi7!4Z2(Ri|gY3Kleo#RUDcQ`EL$89)uC2?K6sxqzC_%B zZx{Rm``H}rdqu$ge246?D|J<49vTo;&UQX-e8B+I(2>uk1T+mDnRHU>s>a@h1~{IN zje8Of9nXjLI(~OmWA9jh{}TpZ!g{qR{bYWt_14wmuPBP5s2}tI0(70up{B?#00000 LNkvXXu0mjfOW=u> literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure2.rsi/icon.png b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure2.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..6151a92ed2164486018cca444f3e49b3424c9fa3 GIT binary patch literal 534 zcmV+x0_pvUP)Px$&`Cr=R9J=Wmdi@RKoo}mYTEQ-te2>@C`6Eo6y3OT<16?sf@>c@aOKLiFJPa* zohz3rieRD8i$=#V(ImB67dkQ1Oi~)WEX=n`<~y1EBqxUeF)=YQe@ucM%+IP_Q9-St zCxU!b=k;8G_2n6^=;We>tSkWlo}CW7KB{A$1(3XgS}(q&#mO81;JR-3d{pPf4KTK# z;jJWdax5_lI7H~9I_7H)oevPilREx!K)=s<8R{3{r*WUa<4qNF-3d-URv(aA)r3B( zW8N1ah@4Ko-Fa~XWMv6TCdtXHEFqm57W$};t@#2FYT?eXxk5rMG(L-aeN@NR7=PY` z?j)R^%nL{6PjP#1@RLwZC9zn{yYDWD)2kMWs)F$mez*|RL0zXpDeQQ(?DXL$4>MBW^+whdV2Px$14%?dR9J=WlV5AXFcig4XPa0d>Zr^=ASi73{XdROuprD;Dy_{!Oe=Ix2D{p# z(x4CdJtg;Cat|j7@MNs>Vlf-#*BX}ouT`Z#s$J^Jz;rywKPSCH)9U9?*k9_8YG-}3 z4a)|+Zu^?q#@Q!FWx)O~3VA}rg_gnZ%!NyfBTEJ%E$TOf&5EhswS>ZaJg&3YthlXPO3s!C){L b42|#yud-h0QXSZ^$5X5FCBsLJs@fG2hgpXAxzo?UdK185n8r>mdKI;Vst0DN#gB>(^b literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure2.rsi/unlocked.png b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure2.rsi/unlocked.png new file mode 100644 index 0000000000000000000000000000000000000000..94b89fa655da949cd72a05f4ca4438bb89764b66 GIT binary patch literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}9-c0aArY-_ zFCOG%P!w>!nBl!LLFdle1Jma0)vpjq{rP@YBa0goP~nI2d3^rIwe)wN4!xr4xzg-a n#Xj@W=MCBxvgf{XH$0BhzQQx>vT)Q^pi%};S3j3^P60oneEP)Px#;7LS5R9J=W&@pPmFcik|zaXFl(jeJ6O@`tl=oZdmyk;mg&>^$8rgN@rKUr+ydP+h^u7-Xlu}A5rBsKA++{7(RQ}s(h7P+y+uhDA(^O99 zGi6z}b0Gxr&S9-(?meHE3v=%QxHV0i6?xC=di|@fw-G`R06QAtl)`= zFW~EXWjdPy@Vr=1Rn<>n6!E^_1CS(1ZzjvKws-IcUREpVzT#;z;np-1MPc$h7l708 sh>v6Jc-*`9w%PodZOmY;Qc69TZ;Wzr1AKHN?EnA(07*qoM6N<$f;^dk6951J literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/_NF/Structures/Storage/closet.rsi/meta.json index 13068d45ac8..0f165e76433 100644 --- a/Resources/Textures/_NF/Structures/Storage/closet.rsi/meta.json +++ b/Resources/Textures/_NF/Structures/Storage/closet.rsi/meta.json @@ -52,6 +52,60 @@ { "name": "mail_open" }, + { + "name": "nfsd" + }, + { + "name": "nfsd_door" + }, + { + "name": "nfsd_open" + }, + { + "name": "nfsd_brigmed" + }, + { + "name": "nfsd_brigmed_door" + }, + { + "name": "nfsd_brigmed_open" + }, + { + "name": "nfsd_copper" + }, + { + "name": "nfsd_copper_door" + }, + { + "name": "nfsd_copper_open" + }, + { + "name": "nfsd_silver" + }, + { + "name": "nfsd_silver_door" + }, + { + "name": "nfsd_silver_open" + }, + { + "name": "nfsd_gold" + }, + { + "name": "nfsd_gold_door" + }, + { + "name": "nfsd_gold_open" + }, + { + "name": "nfsd_sheriff" + }, + { + "name": "nfsd_sheriff_door" + }, + { + "name": "nfsd_sheriff_open" + }, { "name": "unlocked" }, diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd.png new file mode 100644 index 0000000000000000000000000000000000000000..eb932fac514b4b7c86fd2e68a9afb43b6f1879e5 GIT binary patch literal 329 zcmV-P0k-~$P)Px$14%?dR9J=WmE8-$U>L=Z&zX;wNGK&KH_CtR&v5O+jankLNj?&$G3M6Ia-O88 z)t>9~p8Yz{dG`X!lVXLPRy~v$uiYKxon=4XZ(AtjGXQ|}u!+}f6RCF(9{jr%Zuh6J z5NQVBpOXMk9RL7lf5oU*0{}cr1~O(YQoHa28h~o*pxX?O=NoMb0M&|#`Ev8spGv^< z13ZG42*4v#pjQ9@xhz*139Nbv6MzIjbPJ4p^v~yW9)VALswbchAX-7u;N%xCMk^2{ zV3G+)CSD0t%Lb)e2|VMKfbE=g0s3u=(oOB{e*k(7t^-q>_f+qII)G>eC literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_brigmed.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_brigmed.png new file mode 100644 index 0000000000000000000000000000000000000000..45b08aeb5452fdfd399eae295239f2559ce4fad6 GIT binary patch literal 411 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|CI|S0xB_V# zK|yZ~E`KqxPzi}JNy!9h=|mZs9C`UtC8a85<$4vBnL0YFBL&wR8SOAMJfW+5-@)N& zy}BSjub42utfYv#f`oy(jH9u#r=?n$lXkMF)`CLOZB4Sr`xKvU3b?b>;`~g5IkA@8 zO8n!kRh#?`m!!MI$Hgp|H?ym&D=5IXw4}(-MzbK=r7b^nK}YV&DYcu8OIHJ(WmppA z7tHXVMDR-B(KVpvcuyC{5R2Zcm#w)N6nR_&%M;5CcxIgc7jE7v5NvZoK;Yw+xS))j zxBCST6dP9O2w912c(q!1af4=pKmh**mRH#a&K|5flgqd}OJSYViq&i{eU}NJ$>pB3 zRJQQ#!}mw+{(P}iR(z>a544IeHNrE^*Ox&H$mRfI5V#aP8AN%y`njxgN@xNA2hgPX literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_brigmed_door.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_brigmed_door.png new file mode 100644 index 0000000000000000000000000000000000000000..9818f3f848c3723dbdc53f5368c9f3e7fa400704 GIT binary patch literal 521 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|)&=;4xB_V# zK|yZ~E`KqxPzi}JNy!9h=|mZs9C`UtC8a85<$4vBnL0YFBL&wR8SOAMJfW+5-@)N& zy}BSjub42utfYv#f`oy(jH9u#r=?n$lXkMF)`CLOZB4Sr`xKvU3b?b>;`~g5IkA@8 zO8n!kRh#?`m!!MI$Hgp|H?ym&D=5IXw4}(-MzbK=r7b^nK}YV&DYg9-ag(bP=QO4D zmqbjiieJ)QFugu)az*TtzS85?r+a}ewkiqo3ugFFE|`0AnJCbdm7Xq+Ar`%FFFEoZ zGT>o3@K4EdYEhGr_rwk1X8-?7_%(8Oon^lvV|#Op*R-ee*G~yr_jIo1i`w^dXEuuD zEcX>UVDX<})4b~(9~jCbRsXQvyLn#V=?cg4r^&1iJAZyLG-6H2-50&k;X=bRXRVM- zz6ZP)cp{7&G+3UwOT0QE(_zXaIg@pN=A~7kD}@>_D(utQ#r@Od$b%x2l!Q0_(od!` zOeyk~e`|12;iPa!xVFdfuaY4^NAsmdc&7RKGH3zW96$^Lmx3pQC{I^Emvv4FO#pYU B-@E_- literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_brigmed_open.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_brigmed_open.png new file mode 100644 index 0000000000000000000000000000000000000000..717153f3aad915f6eb52c58e6a88495f22e31943 GIT binary patch literal 414 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|CI|S0xB_V# zK|yZ~E`KqxPzi}JNy!9h=|mZs9C`UtC8a85<$4vBnL0YFBL&wR8SOAMJfW+5-@)N& zy}BSjub42utfYv#f`oy(jH9u#r=?n$lXkMF)`CLOZB4Sr`xKvU3b?b>;`~g5IkA@8 zO8n!kRh#?`m!!MI$Hgp|H?ym&D=5IXw4}(-MzbK=r7b^nK}YV&DYcu8OIHJ(WmppA z7tHXVMDR-B(KVpvBu^K|5R2ZYlN`Ak40u?6cRyiQ@}2zWf9bMUrNIkB_|KKLsa}}& zNm)x!(S7dSyNLql&gyW!NlCr1Zb5D3;mZdS6c#ru6VF?3aAAW|roy2)Y-iT%Xw<#i z7Z5tRH9@+zTBVtJF00bYNpT*kK->6IBRtc5eHpZXYz`m>flI-YL6oPfpUXO@geCxe CN2l5V literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_copper.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_copper.png new file mode 100644 index 0000000000000000000000000000000000000000..0b9eacee6f06f4e21bdf414ea23ae1f7933e8fd7 GIT binary patch literal 372 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|N&|dCT!FNW zprE$~m%o@;sDwnAq-27$bfSz*j=X%Sl2Vnja=nVmOdXxok%H@ujCL3rp3v33@8IyX zUR{u%S4@~+R#HS=LBc>?#?e^W(^4(WNjuq7YeAvtwkFx*eTq*v1>9L`aek)3oLI|k zCI0c&s!jfeOVV95^~LrAEmkiH@(X78PZWr3(E#}?TfNTyR T27yb#lR=cHtDnm{r-UW|i64a! literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_copper_door.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_copper_door.png new file mode 100644 index 0000000000000000000000000000000000000000..9761e28bfd1e258fe150210f189607fb3eab0916 GIT binary patch literal 452 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|+5>z-T!FNW zprE$~m%o@;sDwnAq-27$bfSz*j=X%Sl2Vnja=nVmOdXxok%H@ujCL3rp3v33@8IyX zUR{u%S4@~+R#HS=LBc>?#?e^W(^4(WNjuq7YeAvtwkFx*eTq*v1>9L`aek)3oLI|k zCI0c&s!jfeOVVB9<6;)fo7vUX6%^oGT2ka{rc!dqDiY`v-I5@`V21xBfDaWSSwM|5 zJY5_^EPCHwa1?5G;9zn1pAcyMWJ92^?b-kL#V^bWvi{M?<6hNxEA!WLb%wYTTdo~D z@VB5`D2`F@JgaKNdxv;y)(4f$Ri(_Iy{0!Dzgf2RP;K`&Wn-3)%+Y=whXf)RCYiZ& zHt5!EWV+5WnSt?urE<7QTHtzvG)MWH6P7Ye5Ej_(vEjb&jn8{S8Nyi%s&AV+PjEBs ts$tmKAS)mBX5uWM8~IWrJkxxA8MJ_G4j=}BOTm*tl&7no%Q~loCIA~evCjYi literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_copper_open.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_copper_open.png new file mode 100644 index 0000000000000000000000000000000000000000..8e7287312af42b41aa1f8029bf52b437a1d1746f GIT binary patch literal 369 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|N&|dCT!FNW zprE$~m%o@;sDwnAq-27$bfSz*j=X%Sl2Vnja=nVmOdXxok%H@ujCL3rp3v33@8IyX zUR{u%S4@~+R#HS=LBc>?#?e^W(^4(WNjuq7YeAvtwkFx*eTq*v1>9L`aek)3oLI|k zCI0c&s!jfeOVV95^~LrAEmkiH@(X78PZWr3(E#}<*3-o?#G?12E*Nebx0`BrKHPUeS3~pyXKwQ@ z=e6FGmO31p;KdM^X)ulV@|p~eTieecdcY!fMI>qcg5`cdi}+F_JkxxA8MJ_G4j=}B ROTm*tl&7no%Q~loCIIygj1T|- literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_door.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_door.png new file mode 100644 index 0000000000000000000000000000000000000000..072caf4b638737f84bb6352d77f9a5e81442cc63 GIT binary patch literal 446 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|rUm$fxB_V# zK|yZ~E`KqxPzi}JNy!9h=|mZs9C`UtC8a85<$4vBnL0YFBL&wR8SOAMJfW+5-@)N& zy}BSjub42utfYv#f`oy(jH9u#r=?n$lXkMF)`CLOZB4Sr`xKvU3b?b>;`~g5IkA@8 zO8n!kRh#?`m!!MI$Hgp|H?ym&D=5IXw4}(@OvO9ZF1WzeJ;7Sn%ET_jL~csVL7>Zw zN`m}?8UB+BCPbx!{5-?c#WBR9_w5Bop=JjT7Ki@{f!0qpT>LHZ_`kjQg*idiKN@-5 zs~T@*{(7#?5O-qBwPOcri_3-L81>Gxsz$tbh__~aP{~|X%KX`Ddc*CTWm^x`_J310 zX8Fim?bmTgAcA3%nLB5LZQVwu>nxKQ7!Oz~hnu7Yt~W??l)pJ)DZ>O|f$bgzcYG~A o?G0rJXECV0ZSFk5&9tkAL9?#?e^W(^4(WNjuq7YeAvtwkFx*eTq*v1>9L`aek&j%b69= zfHotP7aihYZrjA>`$~5Uidbtc^qau zDz-T!FNW zprE$~m%o@;sDwnAq-27$bfSz*j=X%Sl2Vnja=nVmOdXxok%H@ujCL3rp3v33@8IyX zUR{u%S4@~+R#HS=LBc>?#?e^W(^4(WNjuq7YeAvtwkFx*eTq*v1>9L`aek)3oLI|k zCI0c&s!jfeOVVB9<6;)fo7vUX6%^oGT2ka{rc!dqDiY`v-I5@`V21xBfDaWSSwM|b zJY5_^EPCHwILLd%fP>}07Xd|m^`jgA->$D^Ke^X0?vlea^<;;8+sx}34JKr+UEBD( zpj;@9v9EXm%V*9nH#Hg7OJ7(mJtKSo_D7!7yo?J7@h7+6}(JC+eg{$^$=X%h`kkl$9a4C2)i1Kvxb6Mw<&;$UrcCx7e literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_gold_open.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_gold_open.png new file mode 100644 index 0000000000000000000000000000000000000000..352dc5918fd0013faff9235830288a3d5bac5de7 GIT binary patch literal 350 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|(gJ)!T!FNW zprE$~m%o@;sDwnAq-27$bfSz*j=X%Sl2Vnja=nVmOdXxok%H@ujCL3rp3v33@8IyX zUR{u%S4@~+R#HS=LBc>?#?e^W(^4(WNjuq7YeAvtwkFx*eTq*v1>9L`aek&j%b69= zfHoA6YdghUYM0d3x6 zn-a~nrJBCI-E3gN_$*AsH7UY$1<)qG)CkWsUtb0-Ae#e-LEuvGWDw=)>gTe~DWM4f DjLm<$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_open.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_open.png new file mode 100644 index 0000000000000000000000000000000000000000..58cfb0fa2b93a6888d8dc92158c14629f665e1a7 GIT binary patch literal 327 zcmV-N0l5B&P)Px$0ZBwbR9J=Wm&*!*Kp2HjVpLLzT?m7ALDafUo3_0`uiO*V%1uF}LHCSOBWyKN z;@HMtTg=(b%z^J?m>Coh5fRBaxv0tUbm%WsI7UI?t6UZ_`;6DV6 z&4pW_exM`(I9zG3+E0OcmG-Lr6wqr5x8Qg$dVw&+I^JO&@1$TB`E$Ua>`cV%42b{( zr+Fs61Q=NC029&51)OefdIAhQnDpSyw}C_|0*?1Wx2*yIOvA<5Px$14%?dR9J=WmE8-$U>L=Z&zX;wNGK&KH_CtR&v5O+jankLNj?&$G3M6Ia-O88 z)t>9~p8Yz{dG`X!lVXLPRy~v$uiYKxon=4XZ(AtjGXQ|}u!+}f6RCF(9{jr%Zuh6J z5NQVBpOXMk9RL7lf5oU*0{}cr1~O(YQoHa28h~o*pxX?O=NoMb0M&|#`Ev8spGv^< z13ZG42*4v#pjQ9@xhz*139Nbv6MzIjbPJ4p^v~yW9)VALswbchAX-7u;N%xCMk^2{ zV3G+)CSD0t%Lb)e2|VMKfbE=g0s3u=(oOB{e*k(7t^-q>_f+qII)G>eC literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_sheriff_door.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_sheriff_door.png new file mode 100644 index 0000000000000000000000000000000000000000..7649e758e74f3a62fa19d6992d09e5bb4b4a78b0 GIT binary patch literal 542 zcmV+(0^$9MP)Px$*hxe|R9J=WmETI-P!Ps{$w_yk>{ea>)D?u%7V3R_>xIu!yi)`pzz6Wc8w*08 z!1w42Sn#5Pl%StF}<53DMZ#m4=UvtuIP_5W3Z#m)` zA_BcKTgu?);WyU5v~iA)u~hDv?$!_`t1jPk@HTeAE}3lX8kz5TA^sy(q4%&fmJXwM z2rXq2UPZ*W3RuddI`SfuGf^qCcX0Hy1niR1-I-)NZeL#MD+!~RFiIY%RFJ@a!)0N9 zT*r5%-fy^goq)<{S=+oQFat@(FEV(KB5-%rEM;gVBwc6fNs@0mHu_?(6J+vw<0m6< z({Vxxa9TdoV>V99=i~cVItKXu>zuPzJ6FxZS8#ga544gEC`2GVVDhC+7$tpH3gKJO zJ>c}h$5KY00@C-O&<*3&-}?Uq g^YtnDxIb511Hq%r0WT|pJOBUy07*qoM6N<$g0f`xQ~&?~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_sheriff_open.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_sheriff_open.png new file mode 100644 index 0000000000000000000000000000000000000000..58cfb0fa2b93a6888d8dc92158c14629f665e1a7 GIT binary patch literal 327 zcmV-N0l5B&P)Px$0ZBwbR9J=Wm&*!*Kp2HjVpLLzT?m7ALDafUo3_0`uiO*V%1uF}LHCSOBWyKN z;@HMtTg=(b%z^J?m>Coh5fRBaxv0tUbm%WsI7UI?t6UZ_`;6DV6 z&4pW_exM`(I9zG3+E0OcmG-Lr6wqr5x8Qg$dVw&+I^JO&@1$TB`E$Ua>`cV%42b{( zr+Fs61Q=NC029&51)OefdIAhQnDpSyw}C_|0*?1Wx2*yIOvA<5?#?e^W(^4(WNjuq7YeAvtwkFx*eTq*v1>9L`aek)3oLI|k zCI0c&s!jfeOVVB9<6;)fo7vUX6%^oGT2k~}X9~!*Iwe7V!3_V22NiGQJc0TWJY5_^ zEP9g@6y!RT7}tCfnl$OvBmo6IBL}V{OO}`{RdC>$&15L3qR@7hB~hi}?EFQCIGEcu zF}b8%@@bTinXuYHhVMkE0wenqErl1pO==#88PAFccx*{JF;hHx({V-yrOV2{Gng;* i0qx>TjqptK^<~fkvN?bl1TF literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_silver_door.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_silver_door.png new file mode 100644 index 0000000000000000000000000000000000000000..1ea649ec9432a849cc941326ca9064004f8c1467 GIT binary patch literal 452 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|+5>z-T!FNW zprE$~m%o@;sDwnAq-27$bfSz*j=X%Sl2Vnja=nVmOdXxok%H@ujCL3rp3v33@8IyX zUR{u%S4@~+R#HS=LBc>?#?e^W(^4(WNjuq7YeAvtwkFx*eTq*v1>9L`aek)3oLI|k zCI0c&s!jfeOVVB9<6;)fo7vUX6%^oGT2ka{rc!dqDiY`v-I5@`V21xBfDaWSSwM|5 zJY5_^EPCHwa1?5G;9zn1pAcyMB;iZSnREZ|i(i-%Wc{O&$GxiYR_3qg>I`uwwp=@Q z;BP^>P#ojB^P;LZ-W}MaE7I_sH)56ajPPA7Hs`jj7JX-XtN)C^5&kc81X>k0FsS7A z2{G8#ZDhL6GMRz#fTeP{Nm}4~gEU9^n-i8YOb`~>?y=#%?~TuULm9$Z461LNJ5O*k u?W$pDJ|;UqXn)%gpd0y8BRtc5eHpZXYz`m>flI-YL6oPfpUXO@geCyzGPNoI literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_silver_open.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_silver_open.png new file mode 100644 index 0000000000000000000000000000000000000000..b6e479625677d5b50368063e92f8dc2d69196f84 GIT binary patch literal 391 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|S^|7RT!FNW zprE$~m%o@;sDwnAq-27$bfSz*j=X%Sl2Vnja=nVmOdXxok%H@ujCL3rp3v33@8IyX zUR{u%S4@~+R#HS=LBc>?#?e^W(^4(WNjuq7YeAvtwkFx*eTq*v1>9L`aek)3oLI|k zCI0c&s!jfeOVVB9<6;)fo7vUX6%^oGT2k~}X9~!*Iwe7V!3_V22NiGQJc0V+JzX3_ zEP9_#+Q{4Bz{6b6dAd-{;l=m+{We!TxmZMEUQbSSm3-{(!w}ha^xeCa0yDj}SmxSj z-cY?UUHTpO9+ss{Rts|j%2$+nZW1{m5yW{woA=nJ#95-e2e0j|6=P#JZ51h!cyLq# iXcb>-glC$sFM}44%>l$9a4C2)i1Kvxb6Mw<&;$V8zLk~$ literal 0 HcmV?d00001 From 7a0b0649c594541898b983214b0faf2c960be384 Mon Sep 17 00:00:00 2001 From: AndresE55 <80334192+Leander-0@users.noreply.github.com> Date: Mon, 8 Apr 2024 17:40:37 -0400 Subject: [PATCH 04/13] remove gravity guns (#1202) --- .../Prototypes/Research/experimental.yml | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Resources/Prototypes/Research/experimental.yml b/Resources/Prototypes/Research/experimental.yml index 277242bf621..c2245961ba2 100644 --- a/Resources/Prototypes/Research/experimental.yml +++ b/Resources/Prototypes/Research/experimental.yml @@ -170,18 +170,18 @@ - SuperMatterBinStockPart - PicoManipulatorStockPart -- type: technology - id: GravityManipulation - name: research-technology-gravity-manipulation - icon: - sprite: Objects/Weapons/Guns/Launchers/tether_gun.rsi - state: base - discipline: Experimental - tier: 3 - cost: 10000 - recipeUnlocks: - - WeaponForceGun - - WeaponTetherGun +#- type: technology # Frontier - too many physics issues, bugs and exploits, the less we look like gmod the better. +# id: GravityManipulation +# name: research-technology-gravity-manipulation +# icon: +# sprite: Objects/Weapons/Guns/Launchers/tether_gun.rsi +# state: base +# discipline: Experimental +# tier: 3 +# cost: 10000 +# recipeUnlocks: +# - WeaponForceGun +# - WeaponTetherGun #- type: technology # Frontier - disabled because why the fuck are we adding a god damned FOURTH exploit to the game intentionally holy shit # id: QuantumLeaping From 82c1362dbcd36636652c0059ae939aab4b3d1059 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Mon, 8 Apr 2024 21:41:00 +0000 Subject: [PATCH 05/13] Automatic Changelog (#1202) --- Resources/Changelog/Changelog.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 81d44cb1c40..a3da8b2e611 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -3995,3 +3995,9 @@ Entries: staffs, and wands), blood cult items (armor, weapons). id: 4906 time: '2024-04-08T20:23:48.0000000+00:00' +- author: Leander + changes: + - type: Remove + message: Gravity guns have disappeared from the public research database forever. + id: 4907 + time: '2024-04-08T21:40:38.0000000+00:00' From 3172d567fef73fb5c3824ee2db78fc2e6db8736c Mon Sep 17 00:00:00 2001 From: AndresE55 <80334192+Leander-0@users.noreply.github.com> Date: Mon, 8 Apr 2024 17:43:54 -0400 Subject: [PATCH 06/13] Change NFSD radio color (#1187) * Chat color and keys * solving radio channel issues and new nfsd intercom * intercom channel NFSD * guard radio and encryption key sprite * Update encryption_keys.yml * Update events.yml For the best --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- .../SharedShipyardConsoleComponent.cs | 2 +- .../en-US/_NF/headset/headset-component.ftl | 3 ++- .../en-US/headset/headset-component.ftl | 2 +- .../VendingMachines/Inventories/cart.yml | 1 + .../Objects/Devices/encryption_keys.yml | 3 ++- .../Structures/Machines/telecomms.yml | 1 + .../Structures/Wallmounts/intercom.yml | 1 + .../_NF/Catalog/Fills/Boxes/general.yml | 12 +++++++++- .../_NF/Catalog/security_uplink_catalog.yml | 2 +- .../_NF/Entities/Clothing/Ears/headsets.yml | 22 +++++++++++++++--- .../Entities/Clothing/Ears/headsets_alt.yml | 3 ++- .../Objects/Devices/encryption_keys.yml | 20 +++++++++++++++- .../Entities/Structures/Machines/m_emp.yml | 2 +- .../Structures/Machines/telecomms.yml | 1 + .../Structures/Wallmounts/intercom.yml | 10 ++++++++ Resources/Prototypes/_NF/radio_channels.yml | 7 ++++++ Resources/Prototypes/radio_channels.yml | 2 +- .../Devices/encryption_keys.rsi/meta.json | 7 +++--- .../encryption_keys.rsi/nfsd_label.png | Bin 0 -> 201 bytes 19 files changed, 85 insertions(+), 16 deletions(-) create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Wallmounts/intercom.yml create mode 100644 Resources/Textures/_NF/Objects/Devices/encryption_keys.rsi/nfsd_label.png diff --git a/Content.Shared/Shipyard/Components/SharedShipyardConsoleComponent.cs b/Content.Shared/Shipyard/Components/SharedShipyardConsoleComponent.cs index 6231b2ca2ca..6a0bed0507d 100644 --- a/Content.Shared/Shipyard/Components/SharedShipyardConsoleComponent.cs +++ b/Content.Shared/Shipyard/Components/SharedShipyardConsoleComponent.cs @@ -25,7 +25,7 @@ public sealed partial class ShipyardConsoleComponent : Component public string ShipyardChannel = "Traffic"; [DataField("securityShipyardChannel")] - public string SecurityShipyardChannel = "Security"; + public string SecurityShipyardChannel = "NFSD"; [DataField("blackMarketShipyardChannel")] public string BlackMarketShipyardChannel = "Syndicate"; diff --git a/Resources/Locale/en-US/_NF/headset/headset-component.ftl b/Resources/Locale/en-US/_NF/headset/headset-component.ftl index adfe6efd865..4e561fcf312 100644 --- a/Resources/Locale/en-US/_NF/headset/headset-component.ftl +++ b/Resources/Locale/en-US/_NF/headset/headset-component.ftl @@ -1 +1,2 @@ -chat-radio-traffic = Traffic \ No newline at end of file +chat-radio-traffic = Traffic +chat-radio-nfsd = NFSD diff --git a/Resources/Locale/en-US/headset/headset-component.ftl b/Resources/Locale/en-US/headset/headset-component.ftl index 6896ca2b129..dcd758ddd02 100644 --- a/Resources/Locale/en-US/headset/headset-component.ftl +++ b/Resources/Locale/en-US/headset/headset-component.ftl @@ -10,7 +10,7 @@ chat-radio-command = Command chat-radio-engineering = Engineering chat-radio-medical = Medical chat-radio-science = Science -chat-radio-security = NFSD +chat-radio-security = Guard chat-radio-service = Service chat-radio-supply = Supply chat-radio-syndicate = Syndicate diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml index cba0210c493..35693279d90 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml @@ -42,6 +42,7 @@ DeskBell: 3 # Frontier EncryptionKeyCommand: 3 # Frontier EncryptionKeySecurity: 10 # Frontier 1<10 + EncryptionKeyNFSD: 10 # Frontier 1<10 EncryptionKeyCargo: 20 # Frontier 2<20 EncryptionKeyEngineering: 20 # Frontier 2<20 EncryptionKeyMedical: 20 # Frontier 2<20 diff --git a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml index 8a099e95a10..2ddc10518e5 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml @@ -76,6 +76,7 @@ - Medical - Science - Security + - NFSD - Service - Supply - Traffic # Frontier @@ -184,7 +185,7 @@ - type: entity parent: EncryptionKey id: EncryptionKeySecurity - name: nfsd encryption key + name: security encryption key suffix: DO NOT MAP # Frontier - Add DO NOT MAP suffix description: An encryption key used by the New Frontier Sheriff's Department. components: diff --git a/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml b/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml index e7e17cbf94e..df4f3c596fb 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml @@ -81,6 +81,7 @@ - EncryptionKeyMedical - EncryptionKeyScience - EncryptionKeySecurity + - EncryptionKeyNFSD - EncryptionKeyService - EncryptionKeyCommand - EncryptionKeyTraffic # Frontier - Add Traffic channel diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml index ec29cdc930e..228596acfcd 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml @@ -237,6 +237,7 @@ - Medical - Science - Security + - NFSD #Frontier - Add NFSD channel - Service - Supply - Traffic # Frontier - Add Traffic channel diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml index 63c294f5149..37faa87eb9a 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml @@ -88,7 +88,7 @@ - state: box - type: VendPrice price: 1200 - + - type: entity name: Thruster upgrade kit parent: BoxCardboard @@ -110,3 +110,13 @@ layers: - state: box # - state: wet_floor_sign + +- type: entity + name: nfsd encryption key box + parent: BoxEncryptionKeyPassenger + id: BoxEncryptionKeyNFSD + components: + - type: StorageFill + contents: + - id: EncryptionKeyNFSD + amount: 4 diff --git a/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml b/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml index 139b53a350d..9c420c52ed8 100644 --- a/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml +++ b/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml @@ -492,7 +492,7 @@ id: UplinkSecurityKey name: uplink-security-key-name description: uplink-security-key-desc - productEntity: BoxEncryptionKeySecurity + productEntity: BoxEncryptionKeyNFSD icon: { sprite: Objects/Storage/boxes.rsi, state: box } cost: FrontierUplinkCoin: 1 diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets.yml index 83df47bbdd7..ca4eb733edf 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets.yml @@ -19,10 +19,26 @@ key_slots: - EncryptionKeyService - EncryptionKeyCargo + +- type: entity + parent: ClothingHeadset + id: ClothingHeadsetNFSD + name: nfsd headset + description: This is used by your elite sheriff's department force. + abstract: true + components: + - type: ContainerFill + containers: + key_slots: + - EncryptionKeyNFSD - EncryptionKeyCommon + - type: Sprite + sprite: _NF/Clothing/Ears/Headsets/nfsd_e_green.rsi + - type: Clothing + sprite: _NF/Clothing/Ears/Headsets/nfsd_e_green.rsi - type: entity - parent: ClothingHeadsetSecurity + parent: ClothingHeadsetNFSD id: ClothingHeadsetNFSDgreen # Ask SR or Sheriff for keys name: nfsd headset description: A headset for deputy sheriff's. @@ -33,7 +49,7 @@ sprite: _NF/Clothing/Ears/Headsets/nfsd_e_green.rsi - type: entity - parent: ClothingHeadsetSecurity + parent: ClothingHeadsetNFSD id: ClothingHeadsetNFSDbrown # Ask SR or Sheriff for keys name: nfsd headset description: A headset for deputy sheriff's. @@ -44,7 +60,7 @@ sprite: _NF/Clothing/Ears/Headsets/nfsd_e_brown.rsi - type: entity - parent: ClothingHeadsetSecurity + parent: ClothingHeadsetNFSD id: ClothingHeadsetNFSDcb # Ask SR or Sheriff for keys name: nfsd headset description: A headset for deputy sheriff's. diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets_alt.yml b/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets_alt.yml index 5925634085c..824610cb9d8 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets_alt.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets_alt.yml @@ -6,8 +6,9 @@ - type: ContainerFill containers: key_slots: - - EncryptionKeySecurity +# - EncryptionKeySecurity # - EncryptionKeyCommand + - EncryptionKeyNFSD - EncryptionKeyCommon - type: Sprite sprite: Clothing/Ears/Headsets/security.rsi diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/encryption_keys.yml index 3fd6b67e7da..944bc5c51a2 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/encryption_keys.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/encryption_keys.yml @@ -10,9 +10,27 @@ defaultChannel: Traffic - type: Item sprite: _NF/Objects/Devices/encryption_keys.rsi - size: Tiny # Frontier - 5 to 2 size - type: Sprite sprite: _NF/Objects/Devices/encryption_keys.rsi layers: - state: crypt_gray - state: stc_label + +- type: entity + parent: EncryptionKey + id: EncryptionKeyNFSD + name: nfsd encryption key + suffix: DO NOT MAP + description: An encryption key for the new frontier security department channel. + components: + - type: EncryptionKey + channels: + - NFSD + defaultChannel: NFSD + - type: Item + sprite: _NF/Objects/Devices/encryption_keys.rsi + - type: Sprite + sprite: _NF/Objects/Devices/encryption_keys.rsi + layers: + - state: crypt_gray + - state: nfsd_label diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/m_emp.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/m_emp.yml index a7da111023b..b240e8a29f7 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/m_emp.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/m_emp.yml @@ -56,7 +56,7 @@ - type: IntrinsicRadioReceiver - type: ActiveRadio channels: - - Security + - NFSD - type: M_EmpGenerator - type: ActivatableUI key: enum.M_EmpUiKey.Key diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/telecomms.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/telecomms.yml index 3d4798c542e..27764b6b06f 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/telecomms.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/telecomms.yml @@ -27,6 +27,7 @@ - EncryptionKeyEngineering - EncryptionKeyMedical - EncryptionKeyScience + - EncryptionKeyNFSD - EncryptionKeySecurity - EncryptionKeyService - EncryptionKeyTraffic diff --git a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/intercom.yml b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/intercom.yml new file mode 100644 index 00000000000..c53532742cb --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/intercom.yml @@ -0,0 +1,10 @@ +- type: entity + id: IntercomNFSD + parent: Intercom + suffix: NFSD # Frontier - Not adding DO NOT MAP. (Prototype is already matched by "Security" for sec shipyard.) + components: + - type: Intercom + supportedChannels: + - Common + - NFSD + - Traffic # Frontier - Add Traffic channel diff --git a/Resources/Prototypes/_NF/radio_channels.yml b/Resources/Prototypes/_NF/radio_channels.yml index db40a67ea18..74a83de9f6d 100644 --- a/Resources/Prototypes/_NF/radio_channels.yml +++ b/Resources/Prototypes/_NF/radio_channels.yml @@ -4,3 +4,10 @@ keycode: 'd' frequency: 1022 color: "#CC6633" + +- type: radioChannel + id: NFSD + name: chat-radio-nfsd + keycode: 's' + frequency: 1023 + color: "#7eac69" diff --git a/Resources/Prototypes/radio_channels.yml b/Resources/Prototypes/radio_channels.yml index 48cc0872a1a..7788ca82208 100644 --- a/Resources/Prototypes/radio_channels.yml +++ b/Resources/Prototypes/radio_channels.yml @@ -44,7 +44,7 @@ - type: radioChannel id: Security name: chat-radio-security - keycode: 's' + keycode: 'g' frequency: 1359 color: "#dd3535" diff --git a/Resources/Textures/_NF/Objects/Devices/encryption_keys.rsi/meta.json b/Resources/Textures/_NF/Objects/Devices/encryption_keys.rsi/meta.json index ab06395a890..221c50f895d 100644 --- a/Resources/Textures/_NF/Objects/Devices/encryption_keys.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Devices/encryption_keys.rsi/meta.json @@ -1,13 +1,14 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by data_redacted@394589156048633866 for New Frontier 14.", + "copyright": "Created by data_redacted@394589156048633866 and GhostPrince for New Frontier 14.", "size": { "x": 32, "y": 32 }, "states": [ {"name": "crypt_gray"}, - {"name": "stc_label"} + {"name": "stc_label"}, + {"name": "nfsd_label"} ] -} \ No newline at end of file +} diff --git a/Resources/Textures/_NF/Objects/Devices/encryption_keys.rsi/nfsd_label.png b/Resources/Textures/_NF/Objects/Devices/encryption_keys.rsi/nfsd_label.png new file mode 100644 index 0000000000000000000000000000000000000000..72bfceb0ba95f6a58a9f239161ca8e31ece7883f GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}nVv3=ArY-_ zFJ0tpFyLXi(7hvSw}Z8Zb!WFlcS z*JdjHE<3Y^nc>W4mq`p0viFD>Za!Wa%$k?j$JD*tVRH7H@QTptJrloky1Ka7l{2-k pH&(MxacBlw%9k49nda-upao=e05J$$3Z4w2JYD@<);T3K0RUVDLB{|9 literal 0 HcmV?d00001 From 8903757e966dc236add05c1d017a53ae45a1f3af Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Mon, 8 Apr 2024 21:44:29 +0000 Subject: [PATCH 07/13] Automatic Changelog (#1187) --- Resources/Changelog/Changelog.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index a3da8b2e611..696cf70d66a 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -4001,3 +4001,9 @@ Entries: message: Gravity guns have disappeared from the public research database forever. id: 4907 time: '2024-04-08T21:40:38.0000000+00:00' +- author: Leander + changes: + - type: Add + message: 'NFSD got a new color on their radio with new frequency. ' + id: 4908 + time: '2024-04-08T21:43:54.0000000+00:00' From 570d4ab1390dc77f4eb215bbe05705272da4364b Mon Sep 17 00:00:00 2001 From: Checkraze <71046427+Cheackraze@users.noreply.github.com> Date: Mon, 8 Apr 2024 18:40:23 -0400 Subject: [PATCH 08/13] April 2024 Smuggling Tweaks (#1203) * lower spawn frequency * lower value --- .../Structures/Storage/Crates/crates.yml | 6 +++--- .../_NF/Markers/Spawners/posters.yml | 21 +++++++++++++++++-- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml index 2b30fb1ac0d..6e9ed784fed 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml @@ -101,7 +101,7 @@ layer: - MachineLayer - type: StaticPrice - price: 10000 + price: 7500 - type: Contraband value: 5 @@ -129,7 +129,7 @@ layer: - MachineLayer - type: StaticPrice - price: 20000 + price: 15000 - type: Contraband value: 5 @@ -157,7 +157,7 @@ layer: - MachineLayer - type: StaticPrice - price: 20000 + price: 15000 - type: Contraband value: 5 diff --git a/Resources/Prototypes/_NF/Markers/Spawners/posters.yml b/Resources/Prototypes/_NF/Markers/Spawners/posters.yml index 5cd492d7d5b..279ed77069f 100644 --- a/Resources/Prototypes/_NF/Markers/Spawners/posters.yml +++ b/Resources/Prototypes/_NF/Markers/Spawners/posters.yml @@ -2,7 +2,25 @@ parent: MarkerBase id: RandomPosterContrabandDeadDrop name: random contraband poster spawner - suffix: DeadDrop + suffix: DeadDrop, 50 + components: + - type: Sprite + layers: + - state: red + - sprite: Structures/Wallmounts/posters.rsi + state: random_contraband + - type: RandomSpawner + offset: 0 + prototypes: + - RandomPosterContrabandDeadDrop100 + - RandomPosterContraband #this is the entire non-deaddrop contraband poster list, making this essentially a 50/50 chance + chance: 0.9 + +- type: entity + parent: MarkerBase + id: RandomPosterContrabandDeadDrop100 + name: random contraband poster spawner + suffix: DeadDrop, 100 components: - type: Sprite layers: @@ -72,5 +90,4 @@ - PosterContrabandEnlistGorlexDD - PosterContrabandInterdyneDD - PosterContrabandWaffleCorpDD - - RandomPosterContraband #this is the entire non-deaddrop contraband poster list, making this essentially a 50/50 chance chance: 1 From 4bc97cb5016b94e1d4a4c10549c089b79bc88089 Mon Sep 17 00:00:00 2001 From: Checkraze <71046427+Cheackraze@users.noreply.github.com> Date: Mon, 8 Apr 2024 18:40:38 -0400 Subject: [PATCH 09/13] lower health penalty for clipping (#1204) --- Content.Server/Botany/Systems/PlantHolderSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/Botany/Systems/PlantHolderSystem.cs b/Content.Server/Botany/Systems/PlantHolderSystem.cs index 525e4972492..f2ca44af2c3 100644 --- a/Content.Server/Botany/Systems/PlantHolderSystem.cs +++ b/Content.Server/Botany/Systems/PlantHolderSystem.cs @@ -287,7 +287,7 @@ private void OnInteractUsing(Entity entity, ref InteractUs return; } - component.Health -= (_random.Next(3, 5) * 5); + component.Health -= (_random.Next(3, 5) * 2); component.Seed.Unique = false; var seed = _botany.SpawnSeedPacket(component.Seed, Transform(args.User).Coordinates, args.User, component.Health); _randomHelper.RandomOffset(seed, 0.25f); From 0c1753c4d75e9d896eae6e3acf00f64106906703 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Mon, 8 Apr 2024 22:40:50 +0000 Subject: [PATCH 10/13] Automatic Changelog (#1203) --- Resources/Changelog/Changelog.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 696cf70d66a..1822676863e 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -4007,3 +4007,11 @@ Entries: message: 'NFSD got a new color on their radio with new frequency. ' id: 4908 time: '2024-04-08T21:43:54.0000000+00:00' +- author: Cheackraze + changes: + - type: Tweak + message: Slightly lowered the value of smuggled crates + - type: Fix + message: Fixed dead drop spawn rate + id: 4909 + time: '2024-04-08T22:40:23.0000000+00:00' From d25285f5c4232e318977b353ac533bbc7b8277f5 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Mon, 8 Apr 2024 22:42:54 +0000 Subject: [PATCH 11/13] Automatic Changelog (#1204) --- Resources/Changelog/Changelog.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 1822676863e..3f72c946e57 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -4015,3 +4015,9 @@ Entries: message: Fixed dead drop spawn rate id: 4909 time: '2024-04-08T22:40:23.0000000+00:00' +- author: Cheackraze + changes: + - type: Tweak + message: Temporarily changed plants to lose less health when clipped + id: 4910 + time: '2024-04-08T22:40:38.0000000+00:00' From 0a1e70bbaab3d0385326e0d009c81e9fc46ca4d6 Mon Sep 17 00:00:00 2001 From: Vonsant <118206719+Vonsant@users.noreply.github.com> Date: Wed, 10 Apr 2024 17:06:17 +0300 Subject: [PATCH 12/13] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D1=88=D0=BB=D0=B5=D0=BC=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit У нас нет комбата --- Resources/Prototypes/_NF/Entities/Spawners/syndicatemobs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Spawners/syndicatemobs.yml b/Resources/Prototypes/_NF/Entities/Spawners/syndicatemobs.yml index 714667eac68..59c864cdca1 100644 --- a/Resources/Prototypes/_NF/Entities/Spawners/syndicatemobs.yml +++ b/Resources/Prototypes/_NF/Entities/Spawners/syndicatemobs.yml @@ -258,7 +258,7 @@ - sprite: Mobs/Species/Human/parts.rsi state: full - sprite: Clothing/Head/Hardsuits/syndicate.rsi - state: combat-equipped-HELMET + state: equipped-HELMET - sprite: Clothing/OuterClothing/Hardsuits/syndicate.rsi state: equipped-OUTERCLOTHING - sprite: Objects/Weapons/Guns/Rifles/ak.rsi From cfbd0f384b185cebf8a27432c8827f31cd43a445 Mon Sep 17 00:00:00 2001 From: Vonsant <118206719+Vonsant@users.noreply.github.com> Date: Wed, 10 Apr 2024 17:28:01 +0300 Subject: [PATCH 13/13] Update syndicatemobs.yml --- Resources/Prototypes/_NF/Entities/Spawners/syndicatemobs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Spawners/syndicatemobs.yml b/Resources/Prototypes/_NF/Entities/Spawners/syndicatemobs.yml index 59c864cdca1..2ee155bc672 100644 --- a/Resources/Prototypes/_NF/Entities/Spawners/syndicatemobs.yml +++ b/Resources/Prototypes/_NF/Entities/Spawners/syndicatemobs.yml @@ -258,7 +258,7 @@ - sprite: Mobs/Species/Human/parts.rsi state: full - sprite: Clothing/Head/Hardsuits/syndicate.rsi - state: equipped-HELMET + state: off-equipped-HELMET - sprite: Clothing/OuterClothing/Hardsuits/syndicate.rsi state: equipped-OUTERCLOTHING - sprite: Objects/Weapons/Guns/Rifles/ak.rsi