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); 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/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 875ddd27966..3f72c946e57 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -3968,3 +3968,56 @@ 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' +- 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' +- 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' +- 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' +- 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' 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/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/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/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/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/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/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/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/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/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/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/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/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/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 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/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/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/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/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/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/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/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/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/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/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/Ears/headsets.yml b/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets.yml index 05eb08f2f5a..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. @@ -53,3 +69,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..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 @@ -45,7 +46,7 @@ sprite: _NF/Clothing/Ears/Headsets/pilot.rsi - type: entity - parent: ClothingHeadsetAlt + parent: ClothingHeadsetAltSecurityWarden id: ClothingHeadsetAltNFSDgreen name: nfsd over-ear headset components: @@ -55,7 +56,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 +66,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/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/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 15371dd597b..43a9f2f2b5d 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/helmets.yml @@ -12,3 +12,49 @@ 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 + +- 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/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/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/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..cbaf78b0255 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 @@ -225,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/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/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/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/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/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/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/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/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/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..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,6 +157,42 @@ layer: - MachineLayer - type: StaticPrice - price: 20000 + price: 15000 - 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/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/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/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 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/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/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/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 00000000000..4501db12d6d Binary files /dev/null and b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-sheriff.png differ diff --git a/Resources/Textures/Structures/Machines/techfab.rsi/meta.json b/Resources/Textures/Structures/Machines/techfab.rsi/meta.json index 701516a92e2..ec90ace0e57 100644 --- a/Resources/Textures/Structures/Machines/techfab.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/techfab.rsi/meta.json @@ -31,6 +31,9 @@ { "name": "cargo" }, + { + "name": "nfsd" + }, { "name": "ammo" }, diff --git a/Resources/Textures/Structures/Machines/techfab.rsi/nfsd.png b/Resources/Textures/Structures/Machines/techfab.rsi/nfsd.png new file mode 100644 index 00000000000..ae2e88fc7b6 Binary files /dev/null and b/Resources/Textures/Structures/Machines/techfab.rsi/nfsd.png differ 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 00000000000..7b4ae24563b Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_ak.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_ak.rsi/icon.png b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_ak.rsi/icon.png new file mode 100644 index 00000000000..59d0d46baa1 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_ak.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_ak.rsi/meta.json b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_ak.rsi/meta.json new file mode 100644 index 00000000000..21ac0427689 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_ak.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e fused with Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/pull/6042/commits/64916c98f4847acc4adf3a2416bf78c005fd7dd7, https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi by erhardsteinhauer", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_china_lake.rsi/equipped-HAND.png b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_china_lake.rsi/equipped-HAND.png new file mode 100644 index 00000000000..b4f7a3e0148 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_china_lake.rsi/equipped-HAND.png differ 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 00000000000..59d0d46baa1 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_china_lake.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_china_lake.rsi/meta.json b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_china_lake.rsi/meta.json new file mode 100644 index 00000000000..c0351248365 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_china_lake.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e fused with Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/pull/6042/commits/64916c98f4847acc4adf3a2416bf78c005fd7dd7, https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/launcher/grenadelauncher.dmi, by erhardsteinhauer", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_crossbow.rsi/equipped-HAND.png b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_crossbow.rsi/equipped-HAND.png new file mode 100644 index 00000000000..79488d5070f Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_crossbow.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_crossbow.rsi/icon.png b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_crossbow.rsi/icon.png new file mode 100644 index 00000000000..59d0d46baa1 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_crossbow.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_crossbow.rsi/meta.json b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_crossbow.rsi/meta.json new file mode 100644 index 00000000000..8da930f45d7 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_crossbow.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_laser_pistol.rsi/equipped-HAND.png b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_laser_pistol.rsi/equipped-HAND.png new file mode 100644 index 00000000000..30e064a79b7 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_laser_pistol.rsi/equipped-HAND.png differ 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 00000000000..59d0d46baa1 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_laser_pistol.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_laser_pistol.rsi/meta.json b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_laser_pistol.rsi/meta.json new file mode 100644 index 00000000000..bf8a1f4cc88 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_laser_pistol.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e fused with tgstation at https://github.com/tgstation/tgstation/commit/f7337f1aa9efdcc1403ca4771d638e0634074537 by erhardsteinhauer", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_pistol.rsi/equipped-HAND.png b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_pistol.rsi/equipped-HAND.png new file mode 100644 index 00000000000..046003ba6b0 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_pistol.rsi/equipped-HAND.png differ 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 00000000000..59d0d46baa1 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_pistol.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_pistol.rsi/meta.json b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_pistol.rsi/meta.json new file mode 100644 index 00000000000..673a46e2a46 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_pistol.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e fused with Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/41804/commits/1baf679a544505960cebd071425f1df60669cdf3 by erhardsteinhauer", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_python.rsi/equipped-HAND.png b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_python.rsi/equipped-HAND.png new file mode 100644 index 00000000000..fb4537b73e6 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_python.rsi/equipped-HAND.png differ 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 00000000000..59d0d46baa1 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_python.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_python.rsi/meta.json b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_python.rsi/meta.json new file mode 100644 index 00000000000..56defca84a3 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_python.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e fused with Taken from desertrose at https://github.com/DesertRose2/desertrose/commit/0b8f7b7694a4a814724ba8ed59f695916ce845ce , https://github.com/DesertRose2/desertrose/blob/master/icons/obj/guns/projectile.dmi by erhardsteinhauer", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_shotgun.rsi/equipped-HAND.png b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_shotgun.rsi/equipped-HAND.png new file mode 100644 index 00000000000..fed22a4f35c Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_shotgun.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_shotgun.rsi/icon.png b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_shotgun.rsi/icon.png new file mode 100644 index 00000000000..59d0d46baa1 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_shotgun.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_shotgun.rsi/meta.json b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_shotgun.rsi/meta.json new file mode 100644 index 00000000000..9dbe5204d9d --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_shotgun.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e fused with shotgun visuals from base SS14 (which were taken from Paradise Station) by erhardsteinhauer", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_smg.rsi/equipped-HAND.png b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_smg.rsi/equipped-HAND.png new file mode 100644 index 00000000000..1853de9d1f4 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_smg.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_smg.rsi/icon.png b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_smg.rsi/icon.png new file mode 100644 index 00000000000..59d0d46baa1 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_smg.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_smg.rsi/meta.json b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_smg.rsi/meta.json new file mode 100644 index 00000000000..61145614d03 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_smg.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e fused with Taken from tgstation at https://github.com/tgstation/tgstation/commit/58c39351887ee7f3793d96fafa28238ff693756f, by erhardsteinhauer", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_spray_nozzle.rsi/equipped-HAND.png b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_spray_nozzle.rsi/equipped-HAND.png new file mode 100644 index 00000000000..2355478bce7 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_spray_nozzle.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_spray_nozzle.rsi/icon.png b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_spray_nozzle.rsi/icon.png new file mode 100644 index 00000000000..59d0d46baa1 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_spray_nozzle.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_spray_nozzle.rsi/meta.json b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_spray_nozzle.rsi/meta.json new file mode 100644 index 00000000000..bf8a1f4cc88 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_spray_nozzle.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e fused with tgstation at https://github.com/tgstation/tgstation/commit/f7337f1aa9efdcc1403ca4771d638e0634074537 by erhardsteinhauer", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/icon-flash.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/icon-flash.png new file mode 100644 index 00000000000..58e30fab96e Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/icon-flash.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/icon.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/icon.png new file mode 100644 index 00000000000..0921fc0f7ab Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/icon.png differ 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 00000000000..1dcc905a2da Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/off-equipped-HELMET-lizard.png differ 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 00000000000..110b4ec14ef Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/off-equipped-HELMET-vulpkanin.png differ 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 00000000000..7128251c669 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/off-inhand-left.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/off-inhand-left.png new file mode 100644 index 00000000000..f057caf27db Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/off-inhand-left.png differ 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 00000000000..8efbba27495 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/on-equipped-HELMET-lizard.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/on-equipped-HELMET-lizard.png new file mode 100644 index 00000000000..7fdfdc6f1e6 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/on-equipped-HELMET-lizard.png differ 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 00000000000..8fa68bf147c Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/on-equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/on-equipped-HELMET.png new file mode 100644 index 00000000000..96d8e7b816d Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/on-inhand-left.png b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/on-inhand-left.png new file mode 100644 index 00000000000..6216cc5d838 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/on-inhand-left.png differ 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 00000000000..0611ca6e8c5 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi/on-inhand-right.png differ 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 00000000000..25a1a5f2270 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Helmets/nfsd.rsi/equipped-HELMET.png differ 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 00000000000..3342716faf2 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Helmets/nfsd.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/nfsd.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Head/Helmets/nfsd.rsi/inhand-left.png new file mode 100644 index 00000000000..1c7a90c4daa Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Helmets/nfsd.rsi/inhand-left.png differ 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 00000000000..c28c4a8b695 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Helmets/nfsd.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/nfsd.rsi/light-equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Helmets/nfsd.rsi/light-equipped-HELMET.png new file mode 100644 index 00000000000..0039bba8292 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Helmets/nfsd.rsi/light-equipped-HELMET.png differ 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 00000000000..e2619c70d78 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Helmets/nfsd.rsi/lighton-equipped-HELMET.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/nfsd.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Helmets/nfsd.rsi/meta.json new file mode 100644 index 00000000000..c902693af8a --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Head/Helmets/nfsd.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by Ghost Prince for Frontier Server.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "light-equipped-HELMET", + "directions": 4 + }, + { + "name": "lighton-equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/syndicate_bombsuit.rsi/equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Helmets/syndicate_bombsuit.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..cbe8fbca0a4 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Helmets/syndicate_bombsuit.rsi/equipped-HELMET.png differ 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 00000000000..5ee08fa9202 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Helmets/syndicate_bombsuit.rsi/icon.png differ 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 00000000000..6024b36156e Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Helmets/syndicate_bombsuit.rsi/inhand-left.png differ 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 00000000000..0e6f76da069 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Helmets/syndicate_bombsuit.rsi/inhand-right.png differ 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 00000000000..43c3ffc07b4 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hoods/Bio/syndicate.rsi/equipped-HELMET.png differ 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 00000000000..b097523f1c3 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hoods/Bio/syndicate.rsi/icon.png differ 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 00000000000..96ad13fecc4 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hoods/Bio/syndicate.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/Bio/syndicate.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Head/Hoods/Bio/syndicate.rsi/inhand-right.png new file mode 100644 index 00000000000..54c791f2245 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hoods/Bio/syndicate.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/Bio/syndicate.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Hoods/Bio/syndicate.rsi/meta.json new file mode 100644 index 00000000000..5536fbabaee --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Head/Hoods/Bio/syndicate.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e recolored by erhardsteinhauer", + "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/Neck/Misc/ascended_cultist_amulet.rsi/equipped-NECK.png b/Resources/Textures/_NF/Clothing/Neck/Misc/ascended_cultist_amulet.rsi/equipped-NECK.png new file mode 100644 index 00000000000..fc702bf553a Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Neck/Misc/ascended_cultist_amulet.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_NF/Clothing/Neck/Misc/ascended_cultist_amulet.rsi/icon.png b/Resources/Textures/_NF/Clothing/Neck/Misc/ascended_cultist_amulet.rsi/icon.png new file mode 100644 index 00000000000..d8c7b84b322 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Neck/Misc/ascended_cultist_amulet.rsi/icon.png differ 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 00000000000..51e418ee4ff Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Neck/Misc/ascended_cultist_amulet.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/Neck/Misc/ascended_cultist_amulet.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Neck/Misc/ascended_cultist_amulet.rsi/inhand-right.png new file mode 100644 index 00000000000..7651419d1f8 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Neck/Misc/ascended_cultist_amulet.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/Neck/Misc/ascended_cultist_amulet.rsi/meta.json b/Resources/Textures/_NF/Clothing/Neck/Misc/ascended_cultist_amulet.rsi/meta.json new file mode 100644 index 00000000000..c1b470988ca --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Neck/Misc/ascended_cultist_amulet.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified files from tg station (used amulet of the eye from https://github.com/tgstation/tgstation/blob/master/icons/mob/clothing/neck.dmi and rusty medalion from https://github.com/tgstation/tgstation/blob/master/icons/obj/antags/eldritch.dmi); edits made by erhardsteinhauer (discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-NECK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Neck/Scarfs/nfsd_silvercross_badge.rsi/equipped-NECK.png b/Resources/Textures/_NF/Clothing/Neck/Scarfs/nfsd_silvercross_badge.rsi/equipped-NECK.png new file mode 100644 index 00000000000..86675a744ee Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Neck/Scarfs/nfsd_silvercross_badge.rsi/equipped-NECK.png differ 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 00000000000..67b23059b88 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Neck/Scarfs/nfsd_silvercross_badge.rsi/icon.png differ 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 00000000000..ef9d8820cb1 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Neck/Scarfs/nfsd_silvercross_badge.rsi/inhand-left.png differ 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 00000000000..8611117cb86 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Neck/Scarfs/nfsd_silvercross_badge.rsi/inhand-right.png differ 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/Bio/syndicate.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Bio/syndicate.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..bb074220dcd Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Bio/syndicate.rsi/equipped-OUTERCLOTHING.png differ 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 00000000000..b4c613edc35 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Bio/syndicate.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Bio/syndicate.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Bio/syndicate.rsi/inhand-left.png new file mode 100644 index 00000000000..0f929d1b25a Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Bio/syndicate.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Bio/syndicate.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Bio/syndicate.rsi/inhand-right.png new file mode 100644 index 00000000000..f1d92031fb2 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Bio/syndicate.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Bio/syndicate.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Bio/syndicate.rsi/meta.json new file mode 100644 index 00000000000..71a408b7144 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/OuterClothing/Bio/syndicate.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | recolored and fused with https://github.com/tgstation/tgstation/commit/6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae by erhardsteinhauer", + "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/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 00000000000..ce1a18c940a Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi/icon.png new file mode 100644 index 00000000000..de143bc8a22 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi/icon.png differ 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 00000000000..6a3d25f79f7 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi/inhand-left.png differ 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 00000000000..8184691feba Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi/inhand-right.png differ 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/Clothing/OuterClothing/Suits/syndicate_bombsuit.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/syndicate_bombsuit.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..f7b2ebf40b2 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/syndicate_bombsuit.rsi/equipped-OUTERCLOTHING.png differ 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 00000000000..8fe092d8997 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/syndicate_bombsuit.rsi/icon.png differ 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 00000000000..3a1d5744b0f Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/syndicate_bombsuit.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Suits/syndicate_bombsuit.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/syndicate_bombsuit.rsi/inhand-right.png new file mode 100644 index 00000000000..77253729ca0 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/syndicate_bombsuit.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Suits/syndicate_bombsuit.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/syndicate_bombsuit.rsi/meta.json new file mode 100644 index 00000000000..659ed1dddfd --- /dev/null +++ b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/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/760f0be7af33a31f5a08a3291864e91539d0ebb7", + "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/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 00000000000..72bfceb0ba9 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Devices/encryption_keys.rsi/nfsd_label.png differ 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 00000000000..6d6e1757a9e Binary files /dev/null and b/Resources/Textures/_NF/Objects/Misc/stamps.rsi/stamp-sheriff.png differ 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 00000000000..393a1084d5d Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Security/nfsdbarrier.rsi/idle.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Security/nfsdbarrier.rsi/locked.png b/Resources/Textures/_NF/Objects/Specific/Security/nfsdbarrier.rsi/locked.png new file mode 100644 index 00000000000..adcf04c264c Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Security/nfsdbarrier.rsi/locked.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Security/nfsdbarrier.rsi/meta.json b/Resources/Textures/_NF/Objects/Specific/Security/nfsdbarrier.rsi/meta.json new file mode 100644 index 00000000000..1d01a702740 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Specific/Security/nfsdbarrier.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-4.0", + "copyright": "Created by Ghost Prince for Frontier Station.", + "states": [ + { + "name": "idle" + }, + { + "name": "locked", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.5 + ] + ] + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/meta.json b/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/meta.json index 469f8ef10cb..a4a1bfdd17f 100644 --- a/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/meta.json @@ -21,6 +21,12 @@ }, { "name": "refill_pottedplant" + }, + { + "name": "refill_nfsddrobe" + }, + { + "name": "refill_nfsdtec" } ] } diff --git a/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/refill_nfsddrobe.png b/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/refill_nfsddrobe.png new file mode 100644 index 00000000000..66d879a984a Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/refill_nfsddrobe.png differ 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 00000000000..7b10539f133 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/refill_nfsdtec.png differ diff --git a/Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..a2985eabfc9 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/equipped-BACKPACK.png differ 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 00000000000..3ddd5baa83a Binary files /dev/null and b/Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/icon-on.png differ 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 00000000000..dc523910967 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/icon.png differ 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 00000000000..9b5482e0f17 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/inhand-left.png differ 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 00000000000..fdb5f76e7b7 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/meta.json b/Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/meta.json new file mode 100644 index 00000000000..32111d1a3cc --- /dev/null +++ b/Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/meta.json @@ -0,0 +1,59 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Made by GhostPrince for Frontier Server.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "icon-on", + "directions": 1, + "delays": [ + [ + 0.2, + 0.2 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "on-equipped-BACKPACK", + "directions": 4, + "delays": [ + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ] + ] + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/on-equipped-BACKPACK.png b/Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/on-equipped-BACKPACK.png new file mode 100644 index 00000000000..3846e862a1e Binary files /dev/null and b/Resources/Textures/_NF/Objects/Tanks/Jetpacks/nfsd.rsi/on-equipped-BACKPACK.png differ diff --git a/Resources/Textures/_NF/Structures/Decoration/banner.rsi/meta.json b/Resources/Textures/_NF/Structures/Decoration/banner.rsi/meta.json new file mode 100644 index 00000000000..7fc64c6765c --- /dev/null +++ b/Resources/Textures/_NF/Structures/Decoration/banner.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by Ghost Prince for Frontier Station.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "nfsd-banner" + }, + { + "name": "nfsd-flag" + } + ] +} diff --git a/Resources/Textures/_NF/Structures/Decoration/banner.rsi/nfsd-banner.png b/Resources/Textures/_NF/Structures/Decoration/banner.rsi/nfsd-banner.png new file mode 100644 index 00000000000..313f8518b82 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Decoration/banner.rsi/nfsd-banner.png differ 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 00000000000..f946fa91c65 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Decoration/banner.rsi/nfsd-flag.png differ 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 00000000000..d8ad6dcd30d Binary files /dev/null and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/assembly.png differ 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 00000000000..6857f2a2415 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/closed.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/closed.png new file mode 100644 index 00000000000..6411512fa90 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/closed.png differ 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 00000000000..c78d01c42d0 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/closed_unlit.png differ 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 00000000000..ba70dac7d35 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/closing.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/closing_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/closing_unlit.png new file mode 100644 index 00000000000..2a71f76d5d0 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/closing_unlit.png differ 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 00000000000..7c56263f839 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/deny_unlit.png differ 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 00000000000..817f2fb3f95 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/meta.json b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/meta.json new file mode 100644 index 00000000000..8df66c72cab --- /dev/null +++ b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/meta.json @@ -0,0 +1,195 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Modified NFSD door by GhostPrince for use on Frontier Station ", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "assembly" + }, + { + "name": "bolted_unlit" + }, + { + "name": "closed" + }, + { + "name": "closed_unlit" + }, + { + "name": "closing", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "closing_unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "deny_unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "open", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "opening", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "opening_unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "panel_closing", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "panel_opening", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "sparks", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "sparks_broken", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "sparks_damaged", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 1.7 + ] + ] + }, + { + "name": "sparks_open", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "welded" + }, + { + "name": "emergency_unlit", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + } + ] +} diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/open.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/open.png new file mode 100644 index 00000000000..61e42e5452c Binary files /dev/null and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/open.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/opening.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/opening.png new file mode 100644 index 00000000000..5b6c14e5641 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/opening.png differ 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 00000000000..84933bd5ed9 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/opening_unlit.png differ 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 00000000000..db7be0bc4a0 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/panel_closing.png differ 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 00000000000..24eb2aedc22 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/panel_open.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/panel_opening.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/panel_opening.png new file mode 100644 index 00000000000..fc90acd637a Binary files /dev/null and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/panel_opening.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/sparks.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/sparks.png new file mode 100644 index 00000000000..dd67e88a315 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/sparks.png differ 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 00000000000..fb5d774588a Binary files /dev/null and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/sparks_broken.png differ 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 00000000000..f16a028dee5 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/sparks_damaged.png differ 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 00000000000..630eabb976e Binary files /dev/null and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/sparks_open.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/welded.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/welded.png new file mode 100644 index 00000000000..a0040dfdc73 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Doors/Airlocks/Glass/nfsd.rsi/welded.png differ diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsddrobe.rsi/broken.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsddrobe.rsi/broken.png new file mode 100644 index 00000000000..8e7f84797c5 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsddrobe.rsi/broken.png differ 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 00000000000..4011a1c3c07 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsddrobe.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsddrobe.rsi/off.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsddrobe.rsi/off.png new file mode 100644 index 00000000000..5e3d04750e5 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsddrobe.rsi/off.png differ 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 00000000000..33f9ed5033a Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsddrobe.rsi/panel.png differ 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 00000000000..dcb84122d24 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsdtec.rsi/broken.png differ 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 00000000000..4e4e6ffa24c Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsdtec.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsdtec.rsi/off.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsdtec.rsi/off.png new file mode 100644 index 00000000000..a9129eddb82 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsdtec.rsi/off.png differ diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsdtec.rsi/panel.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsdtec.rsi/panel.png new file mode 100644 index 00000000000..d11af49c0b3 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nfsdtec.rsi/panel.png differ diff --git a/Resources/Textures/_NF/Structures/Machines/computers.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/computers.rsi/meta.json index b4c600840b4..4453ab73ea1 100644 --- a/Resources/Textures/_NF/Structures/Machines/computers.rsi/meta.json +++ b/Resources/Textures/_NF/Structures/Machines/computers.rsi/meta.json @@ -87,6 +87,36 @@ ] ] }, + { + "name": "shipyard_nfsd", + "directions": 4, + "delays": [ + [ + 1.0, + 0.3, + 1.0, + 0.3 + ], + [ + 1.0, + 0.3, + 1.0, + 0.3 + ], + [ + 1.0, + 0.3, + 1.0, + 0.3 + ], + [ + 1.0, + 0.3, + 1.0, + 0.3 + ] + ] + }, { "name": "shipyard_blackmarket", "directions": 4, diff --git a/Resources/Textures/_NF/Structures/Machines/computers.rsi/shipyard_nfsd.png b/Resources/Textures/_NF/Structures/Machines/computers.rsi/shipyard_nfsd.png new file mode 100644 index 00000000000..65204b6538d Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/computers.rsi/shipyard_nfsd.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_brigmed.rsi/base.png b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_brigmed.rsi/base.png new file mode 100644 index 00000000000..297b2ea32ac Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_brigmed.rsi/base.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_brigmed.rsi/closed.png b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_brigmed.rsi/closed.png new file mode 100644 index 00000000000..28c7ba32d20 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_brigmed.rsi/closed.png differ 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 00000000000..3760e73a481 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_brigmed.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_brigmed.rsi/locked.png b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_brigmed.rsi/locked.png new file mode 100644 index 00000000000..aceacfce597 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_brigmed.rsi/locked.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_brigmed.rsi/meta.json b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_brigmed.rsi/meta.json new file mode 100644 index 00000000000..3c358db5b97 --- /dev/null +++ b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_brigmed.rsi/meta.json @@ -0,0 +1,45 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-4.0", + "copyright": "Created by GhostPrince for Frontier Station.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "closed" + }, + { + "name": "open" + }, + { + "name": "welded" + }, + { + "name": "sparking", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "locked" + }, + { + "name": "unlocked" + } + ] +} diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_brigmed.rsi/open.png b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_brigmed.rsi/open.png new file mode 100644 index 00000000000..264119e4d78 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_brigmed.rsi/open.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_brigmed.rsi/sparking.png b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_brigmed.rsi/sparking.png new file mode 100644 index 00000000000..87b78b9b465 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_brigmed.rsi/sparking.png differ 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 00000000000..94b89fa655d Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_brigmed.rsi/unlocked.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_brigmed.rsi/welded.png b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_brigmed.rsi/welded.png new file mode 100644 index 00000000000..311739a2701 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_brigmed.rsi/welded.png differ 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 00000000000..785a80d59e2 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure1.rsi/base.png differ 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 00000000000..162038bd19d Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure1.rsi/closed.png differ 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 00000000000..cd040327df9 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure1.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure1.rsi/locked.png b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure1.rsi/locked.png new file mode 100644 index 00000000000..aceacfce597 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure1.rsi/locked.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure1.rsi/meta.json b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure1.rsi/meta.json new file mode 100644 index 00000000000..3c358db5b97 --- /dev/null +++ b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure1.rsi/meta.json @@ -0,0 +1,45 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-4.0", + "copyright": "Created by GhostPrince for Frontier Station.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "closed" + }, + { + "name": "open" + }, + { + "name": "welded" + }, + { + "name": "sparking", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "locked" + }, + { + "name": "unlocked" + } + ] +} diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure1.rsi/open.png b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure1.rsi/open.png new file mode 100644 index 00000000000..e644ea0c422 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure1.rsi/open.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure1.rsi/sparking.png b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure1.rsi/sparking.png new file mode 100644 index 00000000000..87b78b9b465 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure1.rsi/sparking.png differ 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 00000000000..94b89fa655d Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure1.rsi/unlocked.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure1.rsi/welded.png b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure1.rsi/welded.png new file mode 100644 index 00000000000..311739a2701 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure1.rsi/welded.png differ 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 00000000000..785a80d59e2 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure2.rsi/base.png differ 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 00000000000..28c7ba32d20 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure2.rsi/closed.png differ 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 00000000000..6151a92ed21 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure2.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure2.rsi/locked.png b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure2.rsi/locked.png new file mode 100644 index 00000000000..aceacfce597 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure2.rsi/locked.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure2.rsi/meta.json b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure2.rsi/meta.json new file mode 100644 index 00000000000..3c358db5b97 --- /dev/null +++ b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure2.rsi/meta.json @@ -0,0 +1,45 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-4.0", + "copyright": "Created by GhostPrince for Frontier Station.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "closed" + }, + { + "name": "open" + }, + { + "name": "welded" + }, + { + "name": "sparking", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "locked" + }, + { + "name": "unlocked" + } + ] +} diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure2.rsi/open.png b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure2.rsi/open.png new file mode 100644 index 00000000000..264119e4d78 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure2.rsi/open.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure2.rsi/sparking.png b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure2.rsi/sparking.png new file mode 100644 index 00000000000..87b78b9b465 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure2.rsi/sparking.png differ 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 00000000000..94b89fa655d Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure2.rsi/unlocked.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure2.rsi/welded.png b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure2.rsi/welded.png new file mode 100644 index 00000000000..311739a2701 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Crates/nfsd_secure2.rsi/welded.png differ 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 00000000000..eb932fac514 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd.png differ 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 00000000000..45b08aeb545 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_brigmed.png differ 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 00000000000..9818f3f848c Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_brigmed_door.png differ 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 00000000000..717153f3aad Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_brigmed_open.png differ 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 00000000000..0b9eacee6f0 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_copper.png differ 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 00000000000..9761e28bfd1 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_copper_door.png differ 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 00000000000..8e7287312af Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_copper_open.png differ 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 00000000000..072caf4b638 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_door.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_gold.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_gold.png new file mode 100644 index 00000000000..07ae9d005b5 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_gold.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_gold_door.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_gold_door.png new file mode 100644 index 00000000000..6dabc139d3e Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_gold_door.png differ 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 00000000000..352dc5918fd Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_gold_open.png differ 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 00000000000..58cfb0fa2b9 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_open.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_sheriff.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_sheriff.png new file mode 100644 index 00000000000..eb932fac514 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_sheriff.png differ 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 00000000000..7649e758e74 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_sheriff_door.png differ 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 00000000000..58cfb0fa2b9 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_sheriff_open.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_silver.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_silver.png new file mode 100644 index 00000000000..d55883bdc67 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_silver.png differ 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 00000000000..1ea649ec943 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_silver_door.png differ 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 00000000000..b6e47962567 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/closet.rsi/nfsd_silver_open.png differ