From 7137764a0b623f10b7ee624bd7141fd2f68e9bfc Mon Sep 17 00:00:00 2001 From: leo <136020119+leonardo-dabepis@users.noreply.github.com> Date: Fri, 5 Jan 2024 10:24:30 +1000 Subject: [PATCH 01/94] legal departmant --- .../en-US/deltav/job/department-desc.ftl | 1 + .../Locale/en-US/deltav/job/department.ftl | 1 + .../en-US/deltav/job/job-description.ftl | 2 + .../Locale/en-US/deltav/job/job-names.ftl | 6 ++ .../en-US/deltav/job/job-supervisors.ftl | 1 + .../en-US/deltav/paper/stamp-component.ftl | 1 + .../Entities/Clothing/Ears/headsets.yml | 39 +++++++++++++ .../DeltaV/Entities/Clothing/Head/hats.yml | 10 ++++ .../Entities/Clothing/OuterClothing/coats.yml | 13 +++++ .../Entities/Clothing/OuterClothing/vests.yml | 11 ++++ .../Entities/Clothing/Uniforms/jumpskirts.yml | 22 ++++++++ .../Entities/Clothing/Uniforms/jumpsuits.yml | 24 +++++++- .../DeltaV/Entities/Objects/Devices/pda.yml | 52 +++++++++++++++++ .../Objects/Misc/identification_cards.yml | 25 +++++++++ .../DeltaV/Entities/Objects/Misc/paper.yml | 14 +++++ .../DeltaV/Roles/Jobs/Legal/chief_justice.yml | 53 ++++++++++++++++++ .../DeltaV/Roles/Jobs/Legal/clerk.yml | 33 +++++++++++ .../Prototypes/DeltaV/Status Effects/jobs.yml | 13 +++++ .../Entities/Objects/Devices/pda.yml | 2 +- .../Objects/Misc/identification_cards.yml | 3 +- .../Prototypes/Palettes/departmental.yml | 3 +- .../Prototypes/Roles/Jobs/Civilian/lawyer.yml | 4 +- Resources/Prototypes/StatusEffects/job.yml | 4 +- .../Headsets/legal.rsi/alt-equipped-EARS.png | Bin 0 -> 847 bytes .../Ears/Headsets/legal.rsi/equipped-EARS.png | Bin 0 -> 628 bytes .../Clothing/Ears/Headsets/legal.rsi/icon.png | Bin 0 -> 728 bytes .../Ears/Headsets/legal.rsi/icon_alt.png | Bin 0 -> 876 bytes .../Ears/Headsets/legal.rsi/meta.json | 25 +++++++++ .../Hats/cj_toque.rsi/equipped-HELMET.png | Bin 0 -> 781 bytes .../Clothing/Head/Hats/cj_toque.rsi/icon.png | Bin 0 -> 647 bytes .../Head/Hats/cj_toque.rsi/inhand-left.png | Bin 0 -> 832 bytes .../Head/Hats/cj_toque.rsi/inhand-right.png | Bin 0 -> 806 bytes .../Clothing/Head/Hats/cj_toque.rsi/meta.json | 26 +++++++++ .../Neck/Cloaks/cjcloak.rsi/equipped-NECK.png | Bin 0 -> 1771 bytes .../Clothing/Neck/Cloaks/cjcloak.rsi/icon.png | Bin 0 -> 1016 bytes .../Neck/Cloaks/cjcloak.rsi/inhand-left.png | Bin 0 -> 831 bytes .../Neck/Cloaks/cjcloak.rsi/inhand-right.png | Bin 0 -> 840 bytes .../Neck/Cloaks/cjcloak.rsi/meta.json | 26 +++++++++ .../mantles/cjmantle.rsi/equipped-NECK.png | Bin 0 -> 1346 bytes .../Neck/mantles/cjmantle.rsi/icon.png | Bin 0 -> 744 bytes .../Neck/mantles/cjmantle.rsi/meta.json | 18 ++++++ .../cjrobe.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 1830 bytes .../OuterClothing/Coats/cjrobe.rsi/icon.png | Bin 0 -> 979 bytes .../Coats/cjrobe.rsi/inhand-left.png | Bin 0 -> 1058 bytes .../Coats/cjrobe.rsi/inhand-right.png | Bin 0 -> 1028 bytes .../OuterClothing/Coats/cjrobe.rsi/meta.json | 26 +++++++++ .../clerkvest.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 1137 bytes .../Vests/clerkvest.rsi/icon.png | Bin 0 -> 709 bytes .../Vests/clerkvest.rsi/inhand-left.png | Bin 0 -> 785 bytes .../Vests/clerkvest.rsi/inhand-right.png | Bin 0 -> 787 bytes .../Vests/clerkvest.rsi/meta.json | 26 +++++++++ .../cj.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1719 bytes .../Uniforms/Jumpskirt/cj.rsi/icon.png | Bin 0 -> 995 bytes .../Uniforms/Jumpskirt/cj.rsi/inhand-left.png | Bin 0 -> 955 bytes .../Jumpskirt/cj.rsi/inhand-right.png | Bin 0 -> 939 bytes .../Uniforms/Jumpskirt/cj.rsi/meta.json | 26 +++++++++ .../clerk.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1384 bytes .../Uniforms/Jumpskirt/clerk.rsi/icon.png | Bin 0 -> 884 bytes .../Jumpskirt/clerk.rsi/inhand-left.png | Bin 0 -> 967 bytes .../Jumpskirt/clerk.rsi/inhand-right.png | Bin 0 -> 952 bytes .../Uniforms/Jumpskirt/clerk.rsi/meta.json | 26 +++++++++ .../cj.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1559 bytes .../Uniforms/Jumpsuit/cj.rsi/icon.png | Bin 0 -> 902 bytes .../Uniforms/Jumpsuit/cj.rsi/inhand-left.png | Bin 0 -> 955 bytes .../Uniforms/Jumpsuit/cj.rsi/inhand-right.png | Bin 0 -> 939 bytes .../Uniforms/Jumpsuit/cj.rsi/meta.json | 26 +++++++++ .../clerk.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1447 bytes .../Uniforms/Jumpsuit/clerk.rsi/icon.png | Bin 0 -> 910 bytes .../Jumpsuit/clerk.rsi/inhand-left.png | Bin 0 -> 967 bytes .../Jumpsuit/clerk.rsi/inhand-right.png | Bin 0 -> 952 bytes .../Uniforms/Jumpsuit/clerk.rsi/meta.json | 26 +++++++++ .../Misc/job_icons.rsi/ChiefJustice.png | Bin 0 -> 568 bytes .../Interface/Misc/job_icons.rsi/Clerk.png | Bin 0 -> 537 bytes .../Interface/Misc/job_icons.rsi/lawyer.png | Bin 0 -> 539 bytes .../Interface/Misc/job_icons.rsi/meta.json | 8 ++- .../DeltaV/Objects/Devices/pda.rsi/meta.json | 10 +++- .../Objects/Devices/pda.rsi/pda-clerk.png | Bin 0 -> 1022 bytes .../DeltaV/Objects/Devices/pda.rsi/pda_cj.png | Bin 0 -> 943 bytes .../Objects/Misc/bureaucracy.rsi/meta.json | 27 +++++---- .../Misc/bureaucracy.rsi/stamp-notary.png | Bin 0 -> 777 bytes .../Misc/id_cards.rsi/idchiefjustice.png | Bin 0 -> 662 bytes .../Objects/Misc/id_cards.rsi/idclerk.png | Bin 0 -> 624 bytes .../Objects/Misc/id_cards.rsi/idlawyer.png | Bin 0 -> 627 bytes .../Objects/Misc/bureaucracy.rsi/meta.json | 7 ++- .../bureaucracy.rsi/paper_stamp-notary.png | Bin 0 -> 625 bytes buildclient.cmd | 1 + buildserver.cmd | 1 + 87 files changed, 617 insertions(+), 25 deletions(-) create mode 100644 Resources/Locale/en-US/deltav/job/department-desc.ftl create mode 100644 Resources/Locale/en-US/deltav/job/job-description.ftl create mode 100644 Resources/Locale/en-US/deltav/job/job-names.ftl create mode 100644 Resources/Locale/en-US/deltav/job/job-supervisors.ftl create mode 100644 Resources/Locale/en-US/deltav/paper/stamp-component.ftl create mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml create mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml create mode 100644 Resources/Prototypes/DeltaV/Roles/Jobs/Legal/chief_justice.yml create mode 100644 Resources/Prototypes/DeltaV/Roles/Jobs/Legal/clerk.yml create mode 100644 Resources/Prototypes/DeltaV/Status Effects/jobs.yml create mode 100644 Resources/Textures/DeltaV/Clothing/Ears/Headsets/legal.rsi/alt-equipped-EARS.png create mode 100644 Resources/Textures/DeltaV/Clothing/Ears/Headsets/legal.rsi/equipped-EARS.png create mode 100644 Resources/Textures/DeltaV/Clothing/Ears/Headsets/legal.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/Ears/Headsets/legal.rsi/icon_alt.png create mode 100644 Resources/Textures/DeltaV/Clothing/Ears/Headsets/legal.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Clothing/Head/Hats/cj_toque.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/DeltaV/Clothing/Head/Hats/cj_toque.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/Head/Hats/cj_toque.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/Head/Hats/cj_toque.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/Head/Hats/cj_toque.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi/equipped-NECK.png create mode 100644 Resources/Textures/DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Clothing/Neck/mantles/cjmantle.rsi/equipped-NECK.png create mode 100644 Resources/Textures/DeltaV/Clothing/Neck/mantles/cjmantle.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/Neck/mantles/cjmantle.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/ChiefJustice.png create mode 100644 Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Clerk.png create mode 100644 Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/lawyer.png create mode 100644 Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-clerk.png create mode 100644 Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda_cj.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/stamp-notary.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/idchiefjustice.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/idclerk.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/idlawyer.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-notary.png create mode 100644 buildclient.cmd create mode 100644 buildserver.cmd diff --git a/Resources/Locale/en-US/deltav/job/department-desc.ftl b/Resources/Locale/en-US/deltav/job/department-desc.ftl new file mode 100644 index 00000000000..e54892aee32 --- /dev/null +++ b/Resources/Locale/en-US/deltav/job/department-desc.ftl @@ -0,0 +1 @@ +department-Legal-description = Uphold justice on the station. diff --git a/Resources/Locale/en-US/deltav/job/department.ftl b/Resources/Locale/en-US/deltav/job/department.ftl index fc6d81e938c..b9e08811245 100644 --- a/Resources/Locale/en-US/deltav/job/department.ftl +++ b/Resources/Locale/en-US/deltav/job/department.ftl @@ -1,2 +1,3 @@ department-Epistemics = Epistemics department-Logistics = Logistics +department-Legal = Legal diff --git a/Resources/Locale/en-US/deltav/job/job-description.ftl b/Resources/Locale/en-US/deltav/job/job-description.ftl new file mode 100644 index 00000000000..8b6339e0f28 --- /dev/null +++ b/Resources/Locale/en-US/deltav/job/job-description.ftl @@ -0,0 +1,2 @@ +job-description-chief-justice = Manage the legal department, act as a judge, and ensure everyone recieves fair and just treatment. +job-description-clerk = Organize trials, notarize documents, and act as a judge if needed. diff --git a/Resources/Locale/en-US/deltav/job/job-names.ftl b/Resources/Locale/en-US/deltav/job/job-names.ftl new file mode 100644 index 00000000000..019823c0a8e --- /dev/null +++ b/Resources/Locale/en-US/deltav/job/job-names.ftl @@ -0,0 +1,6 @@ +job-name-chiefjustice = Chief Justice +job-name-clerk = Clerk + +# Role timers - Make these alphabetical or I cut you +JobChiefJustice = Chief Justice +JobClerk = Clerk diff --git a/Resources/Locale/en-US/deltav/job/job-supervisors.ftl b/Resources/Locale/en-US/deltav/job/job-supervisors.ftl new file mode 100644 index 00000000000..3cf44813098 --- /dev/null +++ b/Resources/Locale/en-US/deltav/job/job-supervisors.ftl @@ -0,0 +1 @@ +job-supervisors-cj = the chief justice diff --git a/Resources/Locale/en-US/deltav/paper/stamp-component.ftl b/Resources/Locale/en-US/deltav/paper/stamp-component.ftl new file mode 100644 index 00000000000..8b03958d9fe --- /dev/null +++ b/Resources/Locale/en-US/deltav/paper/stamp-component.ftl @@ -0,0 +1 @@ +stamp-component-stamped-name-notary = NOTARY diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml index 25c7252987c..350b8323d30 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml @@ -39,3 +39,42 @@ - EncryptionKeySyndie - EncryptionKeyStationMaster +- type: entity + parent: ClothingHeadset + id: ClothingHeadsetLegal + name: legal headset + description: This is used by your elite security force. + components: + - type: ContainerFill + containers: + key_slots: + - EncryptionKeyLegal + - EncryptionKeySecurity + - EncryptionKeyCommon + - type: Sprite + sprite: DeltaV/Clothing/Ears/Headsets/legal.rsi + state: icon + - type: Clothing + sprite: DeltaV/Clothing/Ears/Headsets/legal.rsi + state: equipped-EARS + + +- type: entity + parent: ClothingHeadset + id: ClothingHeadsetCJ + name: chief justice's headset + description: The headset used by the chief justice. + components: + - type: ContainerFill + containers: + key_slots: + - EncryptionKeyLegal + - EncryptionKeySecurity + - EncryptionKeyCommon + - EncryptionKeyCommand + - type: Sprite + sprite: DeltaV/Clothing/Ears/Headsets/legal.rsi + state: icon_alt + - type: Clothing + sprite: DeltaV/Clothing/Ears/Headsets/legal.rsi + state: alt-equipped-EARS diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml index 22167ae0385..636f87eea91 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml @@ -210,3 +210,13 @@ tags: - HamsterWearable +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatCJToque + name: chief justice's toque + description: A standard-issue judicial hat. Wigs are old-fashioned anyway. + components: + - type: Sprite + sprite: DeltaV/Clothing/Head/Hats/cj_toque.rsi + - type: Clothing + sprite: DeltaV/Clothing/Head/Hats/cj_toque.rsi diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml index e0a38b169f0..da9e6aa0a46 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml @@ -123,3 +123,16 @@ sprite: DeltaV/Clothing/OuterClothing/Coats/repcoat.rsi - type: TemperatureProtection coefficient: 0.1 + +- type: entity + parent: ClothingOuterStorageBase + id: ClothingOuterChiefJustice + name: chief justice's robes + description: Heavy black robes with magenta and gold trim. It smells old. + components: + - type: Sprite + sprite: DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi + - type: Clothing + sprite: DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi + - type: TemperatureProtection + coefficient: 0.1 diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/vests.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/vests.yml index cdc79584076..77a2a66e415 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/vests.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/vests.yml @@ -37,3 +37,14 @@ Heat: 0.9 - type: ExplosionResistance damageCoefficient: 0.9 + +- type: entity + parent: ClothingOuterBase + id: CltohingOuterClerkVest + name: clerk's vest + description: a silken magenta vest with a pocket to put your notary stamp. + components: + - type: Sprite + sprite: DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi + - type: Clothing + sprite: DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml index 4c027637645..4c0b718a8ea 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml @@ -93,3 +93,25 @@ sprite: DeltaV/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpskirtChiefJustice + name: chief justice's jumpskirt + description: A fancy black jumpskirt with a lace cravat to make it even more fancy. Proper judicial attire. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniform/Jumpskirt/cj.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpskirtClerk + name: clerk's dress skirt + description: A modest dress skirt for the person with the power to notarize anything. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml index f5497646d6c..be4e049507e 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml @@ -242,4 +242,26 @@ - type: Sprite sprite: DeltaV/Clothing/Uniforms/Jumpsuit/kilt.rsi - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/kilt.rsi \ No newline at end of file + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/kilt.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitChiefJustice + name: chief justice's jumpsuit + description: A fancy black jumpsuit with a lace cravat to make it even more fancy. Proper judicial attire. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniform/Jumpsuit/cj.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitClerk + name: clerk's suit + description: A modest suit for the person with the power to notarize anything. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml index 6a73f727b6e..f733fcfb8c2 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml @@ -35,3 +35,55 @@ scanDelay: 1 scanningEndSound: path: "/Audio/Items/Medical/healthscanner.ogg" + +- type: entity + parent: BasePDA + id: CJPDA + name: chief justice PDA + description: Whosoever bears this PDA is the law. + components: + - type: Pda + id: CJIDCard + state: pda-cj + penSlot: + startingItem: LuxuryPen + priority: -1 + whitelist: + tags: + - Write + - type: PdaBorderColor + borderColor: "#470823" + - type: Icon + state: pda-cj + - type: CartridgeLoader + preinstalled: + - CrewManifestCartridge + - NotekeeperCartridge + - NewsReadCartridge + - CrimeAssistCartridge + +- type: entity + parent: BasePDA + id: ClerkPDA + name: clerk PDA + description: It has the stamp to prove it's been officially notarized! + components: + - type: Pda + id: ClerkIDCard + state: pda-clerk + penSlot: + startingItem: LuxuryPen + priority: -1 + whitelist: + tags: + - Write + - type: PdaBorderColor + borderColor: "#611528" + - type: Icon + state: pda-cj + - type: CartridgeLoader + preinstalled: + - CrewManifestCartridge + - NotekeeperCartridge + - NewsReadCartridge + - CrimeAssistCartridge diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml new file mode 100644 index 00000000000..b27300ba6bf --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml @@ -0,0 +1,25 @@ +- type: entity + parent: IDCardStandard + id: CJIDCard + name: chief justice ID card + components: + - type: Sprite + layers: + - state: default + - sprite: DeltaV/Objects/Misc/id_cards.rsi + state: idchiefjustice + - type: PresetIdCard + job: ChiefJustice + +- type: entity + parent: IDCardStandard + id: ClerkIDCard + name: clerk ID card + components: + - type: Sprite + layers: + - state: default + - sprite: DeltaV/Objects/Misc/id_cards.rsi + state: idclerk + - type: PresetIdCard + job: Clerk diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml new file mode 100644 index 00000000000..b554441d77b --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml @@ -0,0 +1,14 @@ +- type: entity + name: notary stamp + parent: RubberStampBase + id: RubberStampNotary + suffix: DO NOT MAP + description: An old-fashioned seal for marking important documents, made of polished bronze. + components: + - type: Stamp + stampedName: stamp-component-stamped-notary + stampedColor: "#a81f3d" + stampState: "paper_stamp-notary" + - type: Sprite + sprite: DeltaV/Objects/Misc/bureaucracy.rsi + state: stamp-notary diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Legal/chief_justice.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Legal/chief_justice.yml new file mode 100644 index 00000000000..4134b85adf2 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Legal/chief_justice.yml @@ -0,0 +1,53 @@ +- type: job + id: ChiefJustice + name: job-name-chiefjustice + description: job-description-chiefjustice + playTimeTracker: JobChiefJustice + antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff + requirements: +# - !type:RoleTimeRequirement +# role: JobClerk +# time: 36000 # DeltaV - 10 hours +# Commenting out the clerk requirement for now until clerk has been around long enough for people to actually get the hours required. + - !type:RoleTimeRequirement + department: JobLawyer + time: 72000 # 20 hours + - !type:OverallPlaytimeRequirement + time: 90000 # 25 hours + weight: 10 # DeltaV - Changed HoP weight from 20 to 10 due to them not being more important than other Heads + startingGear: CJGear + icon: "JobIconChiefJustice" + requireAdminNotify: true + supervisors: job-supervisors-captain + canBeAntag: false + access: + - Command + - Lawyer + - Security + - Maintenance + - External + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant ] + - !type:AddComponentSpecial + components: + - type: CommandStaff + - !type:AddComponentSpecial + components: + - type: PsionicBonusChance #Nyano - Summary: makes it more likely to become psionic. + flatBonus: 0.025 + +- type: startingGear + id: CJGear + equipment: + jumpsuit: ClothingUniformJumpsuitChiefJustice + back: ClothingBackpackFilled # TODO- make legal department bags + shoes: ClothingShoesLeather + head: ClothingHeadHatCJToque + outerClothing: ClothingOuterChiefJustice + id: CJPDA + ears: ClothingHeadsetCJ + gloves: ClothingHandsGlovesColorWhite + innerClothingSkirt: ClothingUniformJumpskirtChiefJustice + satchel: ClothingBackpackSatchelFilled # TODO- make legal departmebt bags + duffelbag: ClothingBackpackDuffelFilled # E. diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Legal/clerk.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Legal/clerk.yml new file mode 100644 index 00000000000..3beed512f85 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Legal/clerk.yml @@ -0,0 +1,33 @@ +- type: job + id: Clerk + name: job-name-clerk + description: job-description-clerk + playTimeTracker: JobClerk + antagAdvantage: 2 # DeltaV - Reduced TC: Security Radio and Access + requirements: + - !type:OverallPlaytimeRequirement + time: 36000 # 10 hrs + - !type:RoleTimeRequirement + department: JobLawyer + time: 72000 # 20 hours + startingGear: ClerkGear + icon: "JobIconClerk" + requireAdminNotify: true + supervisors: job-supervisors-cj + access: + - Service + - Lawyer + - Maintenance + +- type: startingGear + id: ClerkGear + equipment: + jumpsuit: ClothingUniformJumpsuitClerk + back: ClothingBackpackFilled + shoes: ClothingShoesBootsLaceup + pocket1: RubberStampNotary + id: ClerkPDA + ears: ClothingHeadsetLegal + innerClothingSkirt: ClothingUniformJumpskirtClerk + satchel: ClothingBackpackSatchelFilled + duffelbag: ClothingBackpackDuffelFilled diff --git a/Resources/Prototypes/DeltaV/Status Effects/jobs.yml b/Resources/Prototypes/DeltaV/Status Effects/jobs.yml new file mode 100644 index 00000000000..eb6d0d33337 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Status Effects/jobs.yml @@ -0,0 +1,13 @@ +- type: statusIcon + parent: JobIcon + id: JobIconChiefJustice + icon: + sprite: DeltaV/Interface/Misc/job_icons.rsi + state: ChiefJustice + +- type: statusIcon + parent: JobIcon + id: JobIconClerk + icon: + sprite: DeltaV/Interface/Misc/job_icons.rsi + state: Clerk diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 970562b8265..3fcd59d70ed 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -629,7 +629,7 @@ parent: BasePDA id: HoSPDA name: head of security PDA - description: Whosoever bears this PDA is the law. + description: Smells like donuts and gunpowder residue. components: - type: Pda id: HoSIDCard diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index a13a9d28d31..0dc000cea40 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -367,7 +367,8 @@ - type: Sprite layers: - state: default - - state: idlawyer + - sprite: DeltaV/Objects/Misc/id_cards.rsi # DeltaV - Give Lawyer ID Legal colors + state: idlawyer - type: PresetIdCard job: Lawyer diff --git a/Resources/Prototypes/Palettes/departmental.yml b/Resources/Prototypes/Palettes/departmental.yml index 7eb2290ede1..e5d1a516e40 100644 --- a/Resources/Prototypes/Palettes/departmental.yml +++ b/Resources/Prototypes/Palettes/departmental.yml @@ -1,4 +1,4 @@ -- type: palette +- type: palette id: Departmental name: Departmental colors: @@ -10,5 +10,6 @@ bar: "#79150096" epistemics: "#D381C996" # DeltaV - Epistemics Department replacing Science logistics: "#A4610696" # DeltaV - Logistics Department replacing Cargo + legal: "#6b2833" #DeltaV - Added Legal (let me know if this needs to be moved. just figured it's easier to put it here.) neutral: "#D4D4D496" neutralLight: "#D4D4D428" diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml index cd1dce5ac03..fb097ada8bd 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml @@ -12,7 +12,7 @@ time: 14400 # 4 hours startingGear: LawyerGear icon: "JobIconLawyer" - supervisors: job-supervisors-hop + supervisors: job-supervisors-cj # DeltaV - changes supervisor to Chief Justice access: - Service - Lawyer @@ -26,7 +26,7 @@ back: ClothingBackpackFilled shoes: ClothingShoesBootsLaceup id: LawyerPDA - ears: ClothingHeadsetSecurity + ears: ClothingHeadsetLegal # DeltaV - replaces sec headset with legal headset # TODO add copy of space law inhand: - BriefcaseBrownFilled diff --git a/Resources/Prototypes/StatusEffects/job.yml b/Resources/Prototypes/StatusEffects/job.yml index e467efc7835..f2e5665ce11 100644 --- a/Resources/Prototypes/StatusEffects/job.yml +++ b/Resources/Prototypes/StatusEffects/job.yml @@ -120,8 +120,8 @@ parent: JobIcon id: JobIconLawyer icon: - sprite: Interface/Misc/job_icons.rsi - state: Lawyer + sprite: DeltaV/Interface/Misc/job_icons.rsi # DeltaV - Moved Lawyer to Legal + state: Lawyer # DeltaV - Moved Lawyer to Legal - type: statusIcon parent: JobIcon diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/legal.rsi/alt-equipped-EARS.png b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/legal.rsi/alt-equipped-EARS.png new file mode 100644 index 0000000000000000000000000000000000000000..9522966b6c7a6a8cc38823770e570fc7d6e24ecd GIT binary patch literal 847 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>aTthP&_ z#Ibtg4hbEPNk?OOB70_OOzd^rcrdBQ=*FF$pO-$nxAU&`h2p0&+$<%N1E*)vB zS)(9R^rYd?bT9uYKRpYVoyqT-8&M+jXVvm)KM!`w=cLF6@9?+Cc-H0i)aI31;}lbK z?XBKv=6Zo@oeL%|IALVT^~HOu%I5vG5A*NyRDP8Bv_0~upnKbz3g<;)OS8SQqP|S2 zu?!1+xBqj=B1R(&bLiX^rmfIwWhd+eWPjRBJCS@o8xZY z-}QyHZ$XC7ZKqc&fDyo1;1OBOz`!j8!i<;h*8KrSN4uwsV@O5Z+gls`ngc|ReT-I4 zR6cmKW#i&*=JgK_FjzP5Y4v{){lMW7hqL?w{R>CK3z9C)G)U;<`Ml>dSFO78H?-9? zkS8_rUG`)ZNwe9#THeeGe-~*OISNQvwrtB?D_~;$XT`*Y^VYv-Q%~IA;<4|`MCOQ1 z{Z_vf_r#VMoSYu*Z~LI}5cl-NNu~9rk4p{|?lZjptgd|T>*;$e`r4OH``@?Wg;Me1 z)WVg~3;p2sZ^=pDP-P+2_VC}H9QK*TA1=pTmVB0CvD57Irt|4d zkJnGWpzM5X-nREDEAGFVp%;67tJU)pwfu2v#%s2(fA+C<`MdRcTO{v}k2=C4)-uBu%dGnra?@zw2P=ENu{Qv`pLIVR6CUIaUR}I6#sFcjhCxlag P@xgTe~DWM4f39E$c literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/legal.rsi/equipped-EARS.png b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/legal.rsi/equipped-EARS.png new file mode 100644 index 0000000000000000000000000000000000000000..0633bb36441674a5eddb9d7907ca1a5b08699128 GIT binary patch literal 628 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>aTthP&_ z#Ibtg4hbEPNk?OOB70_OOzd^rcrdBQ=*FF$pO-$nxAU&`h2p0&+$<%N1E*)vB zS)(9R^rYd?bT9uYKRpYVoyqT-8&M+jXVvm)KM!`w=cLF6@9?+Cc-H0i)aI31;}lbK z?XBKv=6Zo@oeL%|IALVT^~HOu%I5vG5A*NyRDP8Bv_0~upnKbz3g<;)OS8SQqP|S2 zu?!1+xBqj=B1R(&bLiX^rmfIwWhd+eWPjRBJCS@o8xZY z-}QyHZ$XC7ZKqc&fDyo1;1OBOz`%C|gc+x5^GO2**Lb=(hE&A8y|t0IK|z2u;E~L_ z2MT90AI-{2PU37~?n?h#Trn-UoKJbaBeXWy?yT}1n?a;u$h>hXKz2(g#_i`P}^{@Un{6BCZw#M`GOv&sQ o;qr&hXurt8riDWwL%4#$q+NJ@K~vOgpt~77UHx3vIVCg!0LP{XRR910 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/legal.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/legal.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..0ce0c363f81ec594bc330d63cd30799599611907 GIT binary patch literal 728 zcmV;}0w?{6P)0NRq`}3|WktD3OguvB6@DGT7X?^QGqAx!pUHWUFi}l!e&% zTKEsxDqBh^Qj(p$uZ^bbJ!Wbo&h6ay*K^MEcFuFaKb12~w>Au>RdAw{5p6!cpw&MU zpoI=b7}X8eo}QhE@$dM!#i!~`zv}h>zCTA(GUXcJYY-kXY^NYRCOoxLuoZ6#w;NeK zDSRLta^!%*mr75R`AKo6%x{XFSaclxs;8Fu!HFMiWF1quPdI4iibmx;>L!7dH8(4@ zOJ+ANQ6`C?k)X&jISTYkwIs8@ec^B440-Vw^0!&V5l4osctfHVrE5xRTJ)5BIaXEf zzw>m{g9GL6fe6$+dfsaf)Ney+%kw@DJ+E{GH4kuZRsDI%Y4~0At*RE>ht_pCy{Kx5 z9XQ*7&U;&T^lzy~razsAmlJ4?L)$epE|#;ZtaE$^u{C+3E7;wGUfJKe^aYNfXiVEe z>Zkw!010qNS#tmY3labT3lag+-G2N4009t5L_t(oN9|Ox4uUWcJ&Y3xj>5!-i%$Fm zD}Tb`H^K*qi)>6qH;E+10l6j+FbG%L#KB%d3iR&YyLasYXwwR41^!(DLqq__aq5j_ z!M!YjF(wo%f-~xi;CY^R4}ME0r6%Zu`@XM~#EMD+{lYMW%=3$OKv-(=_=jwgl&atdWPw z&hzU1;lP1WjdPm9CCdi!wrzK_p(qMc?lrXn1Zyhh07;TePC_a;<`QZF_B@W`$=-{A zQ;Q$?^=0mFeEYu$WG?6vOa`2EP{s%?IdF4@>3yw$RzNH869wM2dTcC2di%!!0000< KMNUMnLSTYB21$$n literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/legal.rsi/icon_alt.png b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/legal.rsi/icon_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..2142eee0392083d55fbd91f71fb92f30607e72ee GIT binary patch literal 876 zcmV-y1C#uTP)0NRq`}3|WktD3OguvB6@DGT7X?^QGqAx!pUHWUFi}l!e&% zTKEsxDqBh^Qj(p$uZ^bbJ!Wbo&h6ay*K^MEcFuFaKb12~w>Au>RdAw{5p6!cpw&MU zpoI=b7}X8eo}QhE@$dM!#i!~`zv}h>zCTA(GUXcJYY-kXY^NYRCOoxLuoZ6#w;NeK zDSRLta^!%*mr75R`AKo6%x{XFSaclxs;8Fu!HFMiWF1quPdI4iibmx;>L!7dH8(4@ zOJ+ANQ6`C?k)X&jISTYkwIs8@ec^B440-Vw^0!&V5l4osctfHVrE5xRTJ)5BIaXEf zzw>m{g9GL6fe6$+dfsaf)Ney+%kw@DJ+E{GH4kuZRsDI%Y4~0At*RE>ht_pCy{Kx5 z9XQ*7&U;&T^lzy~razsAmlJ4?L)$epE|#;ZtaE$^u{C+3E7;wGUfJKe^aYNfXiVEe z>Zkw!010qNS#tmY3labT3lag+-G2N400E>)L_t(oN9~j`Pr^_T#}608gt}QKHe75R z7)TnN7-WS{!s4f6U~R&vbrBO1rh+U&Y$XoW|0UPd(E8qMH7>oRd2QdlyWjoayGK-6 zr9h>?KPyl(&41bH#8`7$uP00Iecw2aEH+wr?KqrV?EP?H5E+YrXak^fN%pi@@VYD@ znbTEP3qTT~(yRoSPpe@9p#-=c4B{|~XtUjZ+jmr$mRun4-vr=9CDn8`tDQ9(N6D>b zlK>~{0l3@m`H_RFij8@t0(n7DF(6>i%O%a{^Tf5+>k;Nml+b}a^0{%{xYcUKtJR91 zZnqmpQN-`~uM+40La{Kw`nq&P#A{v@bK4CaOVElz z5GdPR>0sM-(oXC3I@2E)&z0jOML+uf@7@7`NP}d_iaTthP&_ z#Ibtg4hbEPNk?OOB70_OOzd^rcrdBQ=*FF$pO-$nxAU&`h2p0&+$<%N1E*)vB zS)(9R^rYd?bT9uYKRpYVoyqT-8&M+jXVvm)KM!`w=cLF6@9?+Cc-H0i)aI31;}lbK z?XBKv=6Zo@oeL%|IALVT^~HOu%I5vG5A*NyRDP8Bv_0~upnKbz3g<;)OS8SQqP|S2 zu?!1+xBqj=B1R(&bLiX^rmfIwWhd+eWPjRBJCS@o8xZY z-}QyHZ$XC7ZKqc&fDyo1;1OBOz@VoL!i*J5?aP4C;p*w)7*Y}U_LgDxp#XscAA?T_ zO}NoyRU%lTXJJwP`L@UYM(6#GA8(fwzf-W-@#2keARCIiqZ&_LX zz50FXPT`-={m%x~FaBB5v*^Wn|E@(7?tVMH<=NWD;eKW!>rb+^SoHbtd|s)yu%gyR zV9%p)Hjbmc@#@Eqx3_)SC3~}GxlvW+wEmk;x7POQgs+tOW<7J?{+ZXd%wg#Nu`J~) z*PQqJ#1e3F= zf2PlceHaqiPgQ-H|9R`{nucTYe80kH`x`J%`TAnBPOaelF{r5}E)VQCV03 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/cj_toque.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Head/Hats/cj_toque.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a06285c67cf62e498813b9a494d5a41ea86ab70 GIT binary patch literal 647 zcmV;20(kw2P)0NRq`}3|WktD3OguvB6@DGT7X?^QGqAx!pUHWUFi}l!e&% zTKEsxDqBh^Qj(p$uZ^bbJ!Wbo&h6ay*K^MEcFuFaKb12~w>Au>RdAw{5p6!cpw&MU zpoI=b7}X8eo}QhE@$dM!#i!~`zv}h>zCTA(GUXcJYY-kXY^NYRCOoxLuoZ6#w;NeK zDSRLta^!%*mr75R`AKo6%x{XFSaclxs;8Fu!HFMiWF1quPdI4iibmx;>L!7dH8(4@ zOJ+ANQ6`C?k)X&jISTYkwIs8@ec^B440-Vw^0!&V5l4osctfHVrE5xRTJ)5BIaXEf zzw>m{g9GL6fe6$+dfsaf)Ney+%kw@DJ+E{GH4kuZRsDI%Y4~0At*RE>ht_pCy{Kx5 z9XQ*7&U;&T^lzy~razsAmlJ4?L)$epE|#;ZtaE$^u{C+3E7;wGUfJKe^aYNfXiVEe z>Zkw!010qNS#tmYE+YT{E+YYWr9XB6006&9L_t(oM`K_Z1*0J_8UmvsFd6~_90H7_ z+Ak!k@E@0+cds9iY#s|K4&W7#{?En5g;UFKp#0|#Pf2nF(TYKqv$C>+Eyw1FZ{NOw z<$nME%|MDHn1~GlkfG60abOETmZ4*iI7prp%RzP%9ReW5pin3(C}2=l5NCMx`Xz&# zy&l7^gO?b@M8z4d-G0e1b?OA#I{*|7xT1j6;3qi*V4;93+DHw4Vxxal-Dn7mhQMeD hjE2By2n_EK000Y@PE)UtxyAqh002ovPDHLkV1oKU9f$w` literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/cj_toque.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Head/Hats/cj_toque.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..60426ff87fd29312e636f4662f9e04a2e77339e0 GIT binary patch literal 832 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 C3xgN{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi/meta.json new file mode 100644 index 00000000000..85edfaef171 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Spritework by leonardo-dabepis", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Neck/mantles/cjmantle.rsi/equipped-NECK.png b/Resources/Textures/DeltaV/Clothing/Neck/mantles/cjmantle.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..9a881bf0dd0d24b2a35d5f4b346901bcaba2c084 GIT binary patch literal 1346 zcmV-I1-<%-P)0NRq`}3|WktD3OguvB6@DGT7X?^QGqAx!pUHWUFi}l!e&% zTKEsxDqBh^Qj(p$uZ^bbJ!Wbo&h6ay*K^MEcFuFaKb12~w>Au>RdAw{5p6!cpw&MU zpoI=b7}X8eo}QhE@$dM!#i!~`zv}h>zCTA(GUXcJYY-kXY^NYRCOoxLuoZ6#w;NeK zDSRLta^!%*mr75R`AKo6%x{XFSaclxs;8Fu!HFMiWF1quPdI4iibmx;>L!7dH8(4@ zOJ+ANQ6`C?k)X&jISTYkwIs8@ec^B440-Vw^0!&V5l4osctfHVrE5xRTJ)5BIaXEf zzw>m{g9GL6fe6$+dfsaf)Ney+%kw@DJ+E{GH4kuZRsDI%Y4~0At*RE>ht_pCy{Kx5 z9XQ*7&U;&T^lzy~razsAmlJ4?L)$epE|#;ZtaE$^u{C+3E7;wGUfJKe^aYNfXiVEe z>Zkw!010qNS#tmYE+YT{E+YYWr9XB600VkSL_t(|UhSH{Yg17a$8S@A;HaQ!X%}4_ zL_1_CZtg+?LjQq+75oQU3OX1lag2kYLjM7$1l+qxhYTtXF70Azql2SJZDYPSIggW< z_j=BIFE>y;7Xte3J@*V&ZF~ItJRC=U8~i?dr1=J ziAeKBVPk*%k_OEc)kuwpz>lM&UcKHNqmLjw$9yOVq!07ZiT~(%R(;jASzV}j)3w*n zUA0m*ZuIZ0`eKq0zjb`U3+!F| z>l&R8?s~aA0s-cKcDrt)^3d_MlYqeWIjpdTbvWMWWSpQXs4?JIQ zbluy{dH40xiK94eB5CWe544jYB*l<HW8v3Gm*`$YCiOZ36;6{LB5kCHxmSxz7E znQlN@a+AFBX&V0a^&w!MK8k!TjALl8KE(z-wY=9{io>6;Jq3ZP1iegS~FF*i5WKe0m-WqMSmd0ztMi2O7|m9$i&2LvjS zhwjzE$pSpg!#GBf{s0j`nt4ta%?gwhK!myt{M6BpK*rIJ@P1=q?7%fm66#j~yC)SO zQKR#Tu#OGQ)yuPnx57XZ#;G5H=f>-Xl8zbx1gQSTH$|O}Uqet2HPD1XT`0(h_anS& z4{C!L)XbsDLj{1$C)VFs!BQhwbPaM@+d6bl>er%143yV|1CTTqb zMU5uKQ`?KSA3@V5BLeX6{;b?|G>z&kX}nol6dN%#Im4T}MJB|F=G}7|{Rktup&p-9 zlh11)bliE%H#861-v}51BVYuKfDtePM!*OdfpG%=03&uuhB5S%XaE2J07*qoM6N<$ Ef*^o--~a#s literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Neck/mantles/cjmantle.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Neck/mantles/cjmantle.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..7fd93b7fd5b97f8fd15cad9174ba1618fa234c1c GIT binary patch literal 744 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 U)yR3|H~;_u07*qoM6N<$f@f8Te*gdg literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..eb6ff72244d2c3e507ee9e791fb11826a1dc5a5f GIT binary patch literal 979 zcmV;^11$WBP)0NRq`}3|WktD3OguvB6@DGT7X?^QGqAx!pUHWUFi}l!e&% zTKEsxDqBh^Qj(p$uZ^bbJ!Wbo&h6ay*K^MEcFuFaKb12~w>Au>RdAw{5p6!cpw&MU zpoI=b7}X8eo}QhE@$dM!#i!~`zv}h>zCTA(GUXcJYY-kXY^NYRCOoxLuoZ6#w;NeK zDSRLta^!%*mr75R`AKo6%x{XFSaclxs;8Fu!HFMiWF1quPdI4iibmx;>L!7dH8(4@ zOJ+ANQ6`C?k)X&jISTYkwIs8@ec^B440-Vw^0!&V5l4osctfHVrE5xRTJ)5BIaXEf zzw>m{g9GL6fe6$+dfsaf)Ney+%kw@DJ+E{GH4kuZRsDI%Y4~0At*RE>ht_pCy{Kx5 z9XQ*7&U;&T^lzy~razsAmlJ4?L)$epE|#;ZtaE$^u{C+3E7;wGUfJKe^aYNfXiVEe z>Zkw!010qNS#tmYE+YT{E+YYWr9XB600Ik1L_t(oN9|R+N&`U@y?GduVAKS0jf$O$ zk(8Q3|3F9@KR^U)vGxP3EVLEHM#M%);UB0FEJZ`G6E%s*iVxz0#MLv)EUWHhW=SKs z7lxhLd+#~t-kF^x^33bNfA4_LZ3CwI#tc!;QKje_&s74*uj@6T=7C_8+=}q4cA&I1 zXmt4k1QI91d-xHjiitQS0sD(dV`;gY;esU97Gv|Z&2{#~8t-9}5@Cb``} zp3P=05q6(byhxDr3{3P6vuZ;Apj9Q-2RElwC=@7@$9HFbXL1(m4SrYq&D)a za>T)Sp6o101ppu%3Nsv3#zpWp+t={h<7MRV3)_>==M7EM=<>46aOUP0m=J7-$WZm` z`zvj4ZLpA`p(ItSRm$aZLY}4_h@a0g5RBcOO{+Q({T#eYh~qiPmzjA|98A|A>DaeI zRJ{1*ZMMJ2!(fJdJ{RyvKNFtU+0|$8szsu)Js6J<6=htdLnv!wD}GOa@DPgHIvj{F z7ytQS&M&88!@LLFm@5Hep%}Y}_-$t=8jr>a{?ixpCR8=$GmwtN8Kx7t{XLIU6`=gN z05ICoBmK|Up6^^?stR?C`??!i%J-7J4*ZD@d;-fKyUB0_YmNW_002ovPDHLkV1iZo B&shKf literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..f7b9b21ebdba468b4db6d332a66132674c01058f GIT binary patch literal 1058 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 D_Phh$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..443dbf1af9775da318c591b41f8813205b7e22ee GIT binary patch literal 709 zcmV;$0y_PPP)0NRq`}3|WktD3OguvB6@DGT7X?^QGqAx!pUHWUFi}l!e&% zTKEsxDqBh^Qj(p$uZ^bbJ!Wbo&h6ay*K^MEcFuFaKb12~w>Au>RdAw{5p6!cpw&MU zpoI=b7}X8eo}QhE@$dM!#i!~`zv}h>zCTA(GUXcJYY-kXY^NYRCOoxLuoZ6#w;NeK zDSRLta^!%*mr75R`AKo6%x{XFSaclxs;8Fu!HFMiWF1quPdI4iibmx;>L!7dH8(4@ zOJ+ANQ6`C?k)X&jISTYkwIs8@ec^B440-Vw^0!&V5l4osctfHVrE5xRTJ)5BIaXEf zzw>m{g9GL6fe6$+dfsaf)Ney+%kw@DJ+E{GH4kuZRsDI%Y4~0At*RE>ht_pCy{Kx5 z9XQ*7&U;&T^lzy~razsAmlJ4?L)$epE|#;ZtaE$^u{C+3E7;wGUfJKe^aYNfXiVEe z>Zkw!010qNS#tmYE+YT{E+YYWr9XB6008|-L_t(oM`K_Z1*0J_8UmvsFu)^~bTJL9oek5P>L{P{CpE68#HHwVO0WbpOJX9i@45$iD~ zVim&Ffh-4EhHg1FM-gK-$qpdKP*T*8H%Dq r6RHb{38hgrqaiRF0;3@?yh8v0o7h!0tg)Lb00000NkvXXu0mjfp!7G| literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..cf49f4588a69013853e1b0e5505a5b2b01fec9d6 GIT binary patch literal 785 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>aTthP&_ z#Ibtg4hbEPNk?OOB70_OOzd^rcrdBQ=*FF$pO-$nxAU&`h2p0&+$<%N1E*)vB zS)(9R^rYd?bT9uYKRpYVoyqT-8&M+jXVvm)KM!`w=cLF6@9?+Cc-H0i)aI31;}lbK z?XBKv=6Zo@oeL%|IALVT^~HOu%I5vG5A*NyRDP8Bv_0~upnKbz3g<;)OS8SQqP|S2 zu?!1+xBqj=B1R(&bLiX^rmfIwWhd+eWPjRBJCS@o8xZY z-}QyHZ$XC7ZKqc&fDyo1;1OBOz@VoL!i*J5?aP4C;pyq(7*Y}U_SQzOLk0p34>g(= zbxiJF(EUK|2b1hB>)#yj>^iICkEs_178D8z-q8}z)LgnW*CJZ0e%S@J>5sGf_&N}eermlwNsiF@Ta>8d9 z-1uL&@$Ri|Z^wDNQ>2f2AM^SaoAhrFOG@M6e_7Wj23_!oc;qQ__L7(LiZ>0{e`h|H zYu>rjKCe*I<^1Zpje9CWA5W3IuWh^{&agUbv|-wAAyQsCbAYGO?`$MDvg uQ?H`;{KWkZU(`LmN&ELeJ)O~hfZbtoblQ97(!0QrX7F_Nb6Mw<&;$T8JyaaTthP&_ z#Ibtg4hbEPNk?OOB70_OOzd^rcrdBQ=*FF$pO-$nxAU&`h2p0&+$<%N1E*)vB zS)(9R^rYd?bT9uYKRpYVoyqT-8&M+jXVvm)KM!`w=cLF6@9?+Cc-H0i)aI31;}lbK z?XBKv=6Zo@oeL%|IALVT^~HOu%I5vG5A*NyRDP8Bv_0~upnKbz3g<;)OS8SQqP|S2 zu?!1+xBqj=B1R(&bLiX^rmfIwWhd+eWPjRBJCS@o8xZY z-}QyHZ$XC7ZKqc&fDyo1;1OBOz@VoL!i*J5?aP4C;qB?-7*Y}U_SRmmLk1#k4>g(= ziKvSoRN}~MGJkO4?#nJBTwBC7@zDh5Uz4LM<~o_G$Isgm+js1P zBLgFgfCCzFKy$*8?k&D9QTNuJPg`;$L*S=R=AZ3RarzA>D{lR0TgCT)<%Zt%`?qVi z-&*qh_*tIc6Hmskw+gsfHRUPP_f&F-uM&RnwJxpr`|+6* zFK_Q}*cnQ{XI6Nds0;vvhH zf7Lrwj)n!zUK|y<_W!!G`M;|58|w4A#aq8HO>q5`n=YCC_xqxQPG>)}O-R`GKhJvO z!b8_K_K7=0|JM)DoU`Za+u8Q^>q-Q>6d_hPa5VCZ?TIUx`}AKsFsvCoUHx3vIVCg! E05ED~Z~y=R literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/meta.json new file mode 100644 index 00000000000..5e5c71fbc73 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Spritework by leonardo-dabepis", + "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/DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..24c2af227bb3225ef1a887fbcb027fa911c53dd0 GIT binary patch literal 1719 zcmV;o21xmdP)0NRq`}3|WktD3OguvB6@DGT7X?^QGqAx!pUHWUFi}l!e&% zTKEsxDqBh^Qj(p$uZ^bbJ!Wbo&h6ay*K^MEcFuFaKb12~w>Au>RdAw{5p6!cpw&MU zpoI=b7}X8eo}QhE@$dM!#i!~`zv}h>zCTA(GUXcJYY-kXY^NYRCOoxLuoZ6#w;NeK zDSRLta^!%*mr75R`AKo6%x{XFSaclxs;8Fu!HFMiWF1quPdI4iibmx;>L!7dH8(4@ zOJ+ANQ6`C?k)X&jISTYkwIs8@ec^B440-Vw^0!&V5l4osctfHVrE5xRTJ)5BIaXEf zzw>m{g9GL6fe6$+dfsaf)Ney+%kw@DJ+E{GH4kuZRsDI%Y4~0At*RE>ht_pCy{Kx5 z9XQ*7&U;&T^lzy~razsAmlJ4?L)$epE|#;ZtaE$^u{C+3E7;wGUfJKe^aYNfXiVEe z>Zkw!010qNS#tmYE+YT{E+YYWr9XB600i$zL_t(|UhP{=PZU8AtrbWVVo1=4341^< za`8+^^e@PTUtr|K)fi(uni!QU2gQRwfP)Z!fJPJKz(KvB2jH+IViZHraZ^9$J zo!ObLo}FEcU1T#mGu{2FUe(mhP8A|S0t118z(8OiFc26B4E(1IRQ^S~XJ==l{{DWc zR;yC0)nt8rT}DSoy=+lUs#dQ?AZ%*tK^-6znwYqsa9OK;Qmv_R0P(ZtXz`tu1$bvy zmvqIS-JKnonVE(MDzOKmv9WPE)7>rm`}=Ybf3!-tkU)Hlg$}@?nEP7%Q?B4Jkizc+ z0|QA!*ymh4<$}vGSdSPmmL#NYF;0V@OMnRub}3t1Te7ycCfHJVUaLeF8IADM=J?>} z55PKKPjt@aEx`tSm3e1Ltr0S7}Bguz$BFTyervcGY4q# zou31ea5;JmHlO@(9Qz;z=gSnXZ{LZy?}M+p1V{pnG!r4SewhSt?X(==V?5SVMF16m zx5+xT*l&jvNq*GVivW{|b{O7FObr2*JjRdCJ116+AxNw)_}T>QOhCM_Jbm^kdD=_6 z25}tcF|I6e!PjCt6TpQ(et0b}XI~r>0mHG678*JhZ)G9emJtE%#xKLBux4N& zFc26B3<8(+ZzCE6#-_GgsnK<4ZeFjm#kSpGHdFy3Rj`?S)v1HjmHE z%?Wcu9TK1YX@;lP{m&Coe!xia;0W1l_cv@)qlJtO8+sQX;^tOqCh|VAy;u zj_+ml1!Z~DF3acD3>vMaPJ(GQIA3sWxN^L0ys48`7Zm}l&)bTlMh`*1z?GZ6X1UE{ zPXb1xKcJ|nbATNI=6=zxFc)LkC&aO7RVqymP(^^PpqT($od?W^9&Om0c6brsTZ?z` zu+JFk<3oh{IUp_cTHPpR-+6otrybq|aDjF;M*zPW*jfVel4jm{p9r_- N002ovPDHLkV1fg`A9(-( literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..77371a3ba8c82b2b47d2bfbd3159a13792c60827 GIT binary patch literal 995 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 KMNUMnLSTZ`0gvGT literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..5dcb8e026ee553ee2026f27b8edb10f6232c786e GIT binary patch literal 967 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>aTthP&_ z#Ibtg4hbEPNk?OOB70_OOzd^rcrdBQ=*FF$pO-$nxAU&`h2p0&+$<%N1E*)vB zS)(9R^rYd?bT9uYKRpYVoyqT-8&M+jXVvm)KM!`w=cLF6@9?+Cc-H0i)aI31;}lbK z?XBKv=6Zo@oeL%|IALVT^~HOu%I5vG5A*NyRDP8Bv_0~upnKbz3g<;)OS8SQqP|S2 zu?!1+xBqj=B1R(&bLiX^rmfIwWhd+eWPjRBJCS@o8xZY z-}QyHZ$XC7ZKqc&fDyo1;1OBOz@VoL!i*J5?aP4C@!!+MF{C2y?X3M?EQSKd7RxM> zyD_gKBUMqU?AC7{GqHUQy{)|orEAynKhloT%ur9-I<=^&wYTD*_MgwJ&v~kMPv5Dc zty8!1P}(Qe&$nlq7#}N`z`%(W{n2L<*1ThD`L4!k`Q5ykZ}0BaIQ#Qjm!;K>ja9$f z=W6Ko=1-Pd9B5Whmt1_;>i+Ay{4=>^-dYyKec4i-^kxx5$LAdf4w*AJoZz=u+&bZU zccIU2bBTuPo4e=R^K-1*Y;@g0JoYY<@J@nmIOTzaopF5LOqM*f^Y7Z>J+7uQ~G;=Q_a<^6`L zn*SS~m#*Ku@w~=m?u(z6Iv!465P5#yva>#$Gv%Z@hIdobH1BIDdTS%&RBanBYklhLovW_7sitgx3WisRr`Yu}2{L}rdleae~* z|Cr15UeDT8^Ok`j>(soKC?%QW literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..5e7d37745187ab3867fdeb0e22655dceb99718e9 GIT binary patch literal 952 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 JPDHLkV1nJ{-6a43 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..03f703a26ccf83f715569b0cfc22840f2dfb1b9b GIT binary patch literal 902 zcmV;119|+3P)0NRq`}3|WktD3OguvB6@DGT7X?^QGqAx!pUHWUFi}l!e&% zTKEsxDqBh^Qj(p$uZ^bbJ!Wbo&h6ay*K^MEcFuFaKb12~w>Au>RdAw{5p6!cpw&MU zpoI=b7}X8eo}QhE@$dM!#i!~`zv}h>zCTA(GUXcJYY-kXY^NYRCOoxLuoZ6#w;NeK zDSRLta^!%*mr75R`AKo6%x{XFSaclxs;8Fu!HFMiWF1quPdI4iibmx;>L!7dH8(4@ zOJ+ANQ6`C?k)X&jISTYkwIs8@ec^B440-Vw^0!&V5l4osctfHVrE5xRTJ)5BIaXEf zzw>m{g9GL6fe6$+dfsaf)Ney+%kw@DJ+E{GH4kuZRsDI%Y4~0At*RE>ht_pCy{Kx5 z9XQ*7&U;&T^lzy~razsAmlJ4?L)$epE|#;ZtaE$^u{C+3E7;wGUfJKe^aYNfXiVEe z>Zkw!010qNS#tmYE+YT{E+YYWr9XB600F*9L_t(oN9|NGPQySDT!&bKNGJsekn9K0 z@BsdiFYp5@K0rZ!z!%c^38|>4Xk0;KOMpNq!cI^O95Y@==TZOz10m2{WaNcE322c?yMn@NPsL9O{Mv2(*9^#_LiLqATEQ z;3WJs&AAkShykqu(w#BT)dDz!ujg3DzSKkjq``gs{~Um*51=BnTiYN;vpM-x-uv_n c{2K;-0LZK71P8U)CjbBd07*qoM6N<$f=F?czyJUM literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..9b19bead358e0fc8be9ce1a23807753f7df8b751 GIT binary patch literal 955 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..5dcb8e026ee553ee2026f27b8edb10f6232c786e GIT binary patch literal 967 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>aTthP&_ z#Ibtg4hbEPNk?OOB70_OOzd^rcrdBQ=*FF$pO-$nxAU&`h2p0&+$<%N1E*)vB zS)(9R^rYd?bT9uYKRpYVoyqT-8&M+jXVvm)KM!`w=cLF6@9?+Cc-H0i)aI31;}lbK z?XBKv=6Zo@oeL%|IALVT^~HOu%I5vG5A*NyRDP8Bv_0~upnKbz3g<;)OS8SQqP|S2 zu?!1+xBqj=B1R(&bLiX^rmfIwWhd+eWPjRBJCS@o8xZY z-}QyHZ$XC7ZKqc&fDyo1;1OBOz@VoL!i*J5?aP4C@!!+MF{C2y?X3M?EQSKd7RxM> zyD_gKBUMqU?AC7{GqHUQy{)|orEAynKhloT%ur9-I<=^&wYTD*_MgwJ&v~kMPv5Dc zty8!1P}(Qe&$nlq7#}N`z`%(W{n2L<*1ThD`L4!k`Q5ykZ}0BaIQ#Qjm!;K>ja9$f z=W6Ko=1-Pd9B5Whmt1_;>i+Ay{4=>^-dYyKec4i-^kxx5$LAdf4w*AJoZz=u+&bZU zccIU2bBTuPo4e=R^K-1*Y;@g0JoYY<@J@nmIOTzaopF5LOqM*f^Y7Z>J+7uQ~G;=Q_a<^6`L zn*SS~m#*Ku@w~=m?u(z6Iv!465P5#yva>#$Gv%Z@hIdobH1BIDdTS%&RBanBYklhLovW_7sitgx3WisRr`Yu}2{L}rdleae~* z|Cr15UeDT8^Ok`j>(soKC?%QW literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..5e7d37745187ab3867fdeb0e22655dceb99718e9 GIT binary patch literal 952 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>aTthP&_ z#Ibtg4hbEPNk?OOB70_OOzd^rcrdBQ=*FF$pO-$nxAU&`h2p0&+$<%N1E*)vB zS)(9R^rYd?bT9uYKRpYVoyqT-8&M+jXVvm)KM!`w=cLF6@9?+Cc-H0i)aI31;}lbK z?XBKv=6Zo@oeL%|IALVT^~HOu%I5vG5A*NyRDP8Bv_0~upnKbz3g<;)OS8SQqP|S2 zu?!1+xBqj=B1R(&bLiX^rmfIwWhd+eWPjRBJCS@o8xZY z-}QyHZ$XC7ZKqc&fDyo1;1OBOz@VoL!i*J5?aP4C@xjx@F{C2y?X3M?EQSKd7RxM> zyAd&`A|q8%sqEHoF}v2*-h|S%YkTz*Rtm z?-y>J?J<*f{;ZpPM%37=Z~_A-R`f@oDcP>5zn|~3&Tj2(Iq$#i`S$CN--)g4zxVDr zdH>@s`N_S%Y>t%gmfgB<W;nci+m2YW)8VTaUV#RuXkV9 zP-nx|KRIjF-LUU#Uw(Q${kr;B8<{q*O9$Vk{9H4A|1}LgopsYZUH9zWxo^um?saD_ zCS?7yI`zm%NP!U_`Vq)fJoo9TNfuri6$bMkt$53CaP-aFoX}}!0u_%n|Fq{`urA&~ zTqb$t9aV*E!V9|H=ic4^@7<##`RfW-ee~SVaO%+|%cftu|Mdlxtoh62+c1~mfWxZ4 zOxrF$}M{P)0NRq`}3|WktD3OguvB6@DGT7X?^QGqAx!pUHWUFi}l!e&% zTKEsxDqBh^Qj(p$uZ^bbJ!Wbo&h6ay*K^MEcFuFaKb12~w>Au>RdAw{5p6!cpw&MU zpoI=b7}X8eo}QhE@$dM!#i!~`zv}h>zCTA(GUXcJYY-kXY^NYRCOoxLuoZ6#w;NeK zDSRLta^!%*mr75R`AKo6%x{XFSaclxs;8Fu!HFMiWF1quPdI4iibmx;>L!7dH8(4@ zOJ+ANQ6`C?k)X&jISTYkwIs8@ec^B440-Vw^0!&V5l4osctfHVrE5xRTJ)5BIaXEf zzw>m{g9GL6fe6$+dfsaf)Ney+%kw@DJ+E{GH4kuZRsDI%Y4~0At*RE>ht_pCy{Kx5 z9XQ*7&U;&T^lzy~razsAmlJ4?L)$epE|#;ZtaE$^u{C+3E7;wGUfJKe^aYNfXiVEe z>Zkw!010qNS#tmYE+YT{E+YYWr9XB6003}FL_t&-S7T%V0@1*x|KG0eVc^nsVL+z8 z-a5p{$gO7gU%)XPqz(+8%!p!;$yf$v|9W+ofeEAwSrVoQM1xFY0GS}2zVtr`pwl3$ z;U>V0g_#E8gG^uo8-oLYtS9IOMv!KZJJ7ud;=f*B#|Qv96iQmwy+H8*00000NRq`}3|WktD3OguvB6@DGT7X?^QGqAx!pUHWUFi}l!e&% zTKEsxDqBh^Qj(p$uZ^bbJ!Wbo&h6ay*K^MEcFuFaKb12~w>Au>RdAw{5p6!cpw&MU zpoI=b7}X8eo}QhE@$dM!#i!~`zv}h>zCTA(GUXcJYY-kXY^NYRCOoxLuoZ6#w;NeK zDSRLta^!%*mr75R`AKo6%x{XFSaclxs;8Fu!HFMiWF1quPdI4iibmx;>L!7dH8(4@ zOJ+ANQ6`C?k)X&jISTYkwIs8@ec^B440-Vw^0!&V5l4osctfHVrE5xRTJ)5BIaXEf zzw>m{g9GL6fe6$+dfsaf)Ney+%kw@DJ+E{GH4kuZRsDI%Y4~0At*RE>ht_pCy{Kx5 z9XQ*7&U;&T^lzy~razsAmlJ4?L)$epE|#;ZtaE$^u{C+3E7;wGUfJKe^aYNfXiVEe z>Zkw!010qNS#tmYE+YT{E+YYWr9XB6002=*L_t&-S7T%V0v|rv{~#J2Z29z0NRq`}3|WktD3OguvB6@DGT7X?^QGqAx!pUHWUFi}l!e&% zTKEsxDqBh^Qj(p$uZ^bbJ!Wbo&h6ay*K^MEcFuFaKb12~w>Au>RdAw{5p6!cpw&MU zpoI=b7}X8eo}QhE@$dM!#i!~`zv}h>zCTA(GUXcJYY-kXY^NYRCOoxLuoZ6#w;NeK zDSRLta^!%*mr75R`AKo6%x{XFSaclxs;8Fu!HFMiWF1quPdI4iibmx;>L!7dH8(4@ zOJ+ANQ6`C?k)X&jISTYkwIs8@ec^B440-Vw^0!&V5l4osctfHVrE5xRTJ)5BIaXEf zzw>m{g9GL6fe6$+dfsaf)Ney+%kw@DJ+E{GH4kuZRsDI%Y4~0At*RE>ht_pCy{Kx5 z9XQ*7&U;&T^lzy~razsAmlJ4?L)$epE|#;ZtaE$^u{C+3E7;wGUfJKe^aYNfXiVEe z>Zkw!010qNS#tmYE+YT{E+YYWr9XB6002`-L_t&-S7T%V0v|rv{~#J2Z29z3;wK literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json index af8fd25b2e7..e741c09ad7e 100644 --- a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | nyanoPrisonGuard, nyanoMartialArtist, nyanoGladiator made by Floofers", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | nyanoPrisonGuard, nyanoMartialArtist, nyanoGladiator made by Floofers | ChiefJustice, Clerk by leonardo-dabepis", "size": { "x": 8, "y": 8 @@ -24,6 +24,12 @@ }, { "name": "nyanoMantis" + }, + { + "name": "ChiefJustice" + }, + { + "name": "Clerk" } ] } diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json index 24d83ed6a04..0ccf4276391 100644 --- a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d | pda-corpsman from yogstation at https://github.com/yogstation13/Yogstation/commit/a75671b22476ed8e117229f38501b9b63f8d6bc1 | pda-martialartist by Floofers", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d | pda-corpsman from yogstation at https://github.com/yogstation13/Yogstation/commit/a75671b22476ed8e117229f38501b9b63f8d6bc1 | pda-martialartist by Floofers | pda-cj and pda-clerk by leonardo-dabepis", "size": { "x": 32, "y": 32 @@ -30,7 +30,13 @@ "name": "pda-martialartist" }, { - "name": "pda-corpsman" + "name": "pda-corpsman" + }, + { + "name": "pda-cj" + }, + { + "name": "pda-clerk" } ] } diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-clerk.png b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-clerk.png new file mode 100644 index 0000000000000000000000000000000000000000..6f690e235d826c957098322cbea4a474f77d7b21 GIT binary patch literal 1022 zcmV0NRq`}3|WktD3OguvB6@DGT7X?^QGqAx!pUHWUFi}l!e&% zTKEsxDqBh^Qj(p$uZ^bbJ!Wbo&h6ay*K^MEcFuFaKb12~w>Au>RdAw{5p6!cpw&MU zpoI=b7}X8eo}QhE@$dM!#i!~`zv}h>zCTA(GUXcJYY-kXY^NYRCOoxLuoZ6#w;NeK zDSRLta^!%*mr75R`AKo6%x{XFSaclxs;8Fu!HFMiWF1quPdI4iibmx;>L!7dH8(4@ zOJ+ANQ6`C?k)X&jISTYkwIs8@ec^B440-Vw^0!&V5l4osctfHVrE5xRTJ)5BIaXEf zzw>m{g9GL6fe6$+dfsaf)Ney+%kw@DJ+E{GH4kuZRsDI%Y4~0At*RE>ht_pCy{Kx5 z9XQ*7&U;&T^lzy~razsAmlJ4?L)$epE|#;ZtaE$^u{C+3E7;wGUfJKe^aYNfXiVEe z>Zkw!010qNS#tmY3labT3lag+-G2N400K5iL_t(oM`K_Z1*0J_8UjRyfQ6aaePCq)ihAdNQ9aHO-U#cMLy& zeqmr|=K;&}a0)RzetCsq%bs~4E?zrW2zm{u;Ntzc3}3%~XJAmkqWact25xRn22JUB z6iF_2K4Oe!Aj$zC%S&5J7;Zhhgkh+fydFb$bq~Ya504lYPW{AC(P#iy1ByBvQ3F>) zlmkGjkDWdM*CZk)1ZKZ^^$v&;;$L>}1&SgZKui!2?EpSOUJUcl#afOP6JsZe8ltn| zr}v*3U>IfsI=`d-0?7`bY6!rh;MkQZ;DkvGAldXF(+fOsRVE@M;`1KRRo73+YxZl5F_#>vo5P652C!yg8QXIx4Q+&|wiy!m*CLGm9_MiW;M=_@9K<5cq4Wehj4aDQju zU%41CQsfJd0Qf?zFcNAF<^TWy07*qoM6N<$g23v+W&i*H literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda_cj.png b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda_cj.png new file mode 100644 index 0000000000000000000000000000000000000000..ec2543a97c485ef4710ae730048895506a68461a GIT binary patch literal 943 zcmV;g15o^lP)0NRq`}3|WktD3OguvB6@DGT7X?^QGqAx!pUHWUFi}l!e&% zTKEsxDqBh^Qj(p$uZ^bbJ!Wbo&h6ay*K^MEcFuFaKb12~w>Au>RdAw{5p6!cpw&MU zpoI=b7}X8eo}QhE@$dM!#i!~`zv}h>zCTA(GUXcJYY-kXY^NYRCOoxLuoZ6#w;NeK zDSRLta^!%*mr75R`AKo6%x{XFSaclxs;8Fu!HFMiWF1quPdI4iibmx;>L!7dH8(4@ zOJ+ANQ6`C?k)X&jISTYkwIs8@ec^B440-Vw^0!&V5l4osctfHVrE5xRTJ)5BIaXEf zzw>m{g9GL6fe6$+dfsaf)Ney+%kw@DJ+E{GH4kuZRsDI%Y4~0At*RE>ht_pCy{Kx5 z9XQ*7&U;&T^lzy~razsAmlJ4?L)$epE|#;ZtaE$^u{C+3E7;wGUfJKe^aYNfXiVEe z>Zkw!010qNS#tmY3labT3lag+-G2N400HMoL_t(oM`K_Z1*0J_8UjRyfQ6aaePCq)ihAdNQ9aHO-S%@(RP2J@Y_Zymqh<^cqmX#rty^zJC3VQzLQJ0CGdGZ5tf zkmaSVB@DM7UcxX`O?Fd4oQb`Q}GU}I&) zFb!P{76pM1R2g0Z)4(y6#{^wKbQHi$f+Rc$MhCDc0ENIs{Wk{5*zP7VLsszZ=O?1n z6RNHL`?w^54I;K|hgl4*h(KEL+Cj(xAOk3Ah!A5wQ6V*|Xfy;yLtyxZ000-9lfX5b RbU^?B002ovPDHLkV1kb2nQ{OC literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/meta.json index 75c5548e647..810fa9d79e0 100644 --- a/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/meta.json @@ -1,14 +1,17 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432 | modified by Floofers", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "folder-hop-ian" - } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432 | modified by Floofers. Stamp icon taken from tgstation at https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93 | modified by leonardo-dabepis", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "folder-hop-ian" + }, + { + "name": "stamp-notary" + } + ] } diff --git a/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/stamp-notary.png b/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/stamp-notary.png new file mode 100644 index 0000000000000000000000000000000000000000..b726cab3d3aa4c490adc09b14135bb1b8d658072 GIT binary patch literal 777 zcmV+k1NQuhP)0NRq`}3|WktD3OguvB6@DGT7X?^QGqAx!pUHWUFi}l!e&% zTKEsxDqBh^Qj(p$uZ^bbJ!Wbo&h6ay*K^MEcFuFaKb12~w>Au>RdAw{5p6!cpw&MU zpoI=b7}X8eo}QhE@$dM!#i!~`zv}h>zCTA(GUXcJYY-kXY^NYRCOoxLuoZ6#w;NeK zDSRLta^!%*mr75R`AKo6%x{XFSaclxs;8Fu!HFMiWF1quPdI4iibmx;>L!7dH8(4@ zOJ+ANQ6`C?k)X&jISTYkwIs8@ec^B440-Vw^0!&V5l4osctfHVrE5xRTJ)5BIaXEf zzw>m{g9GL6fe6$+dfsaf)Ney+%kw@DJ+E{GH4kuZRsDI%Y4~0At*RE>ht_pCy{Kx5 z9XQ*7&U;&T^lzy~razsAmlJ4?L)$epE|#;ZtaE$^u{C+3E7;wGUfJKe^aYNfXiVEe z>Zkw!010qNS#tmY3labT3lag+-G2N400BWsL_t(oM`K_Z1*0J_8UmvsFd6~_90H8w z+Mg(7{a@lgBf|^E{|xir9VOcw7IGW_vfP%9i$RRxFM~M49|i^>pIk?f=JJgK&H00000NkvXX Hu0mjfH4R;e literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/idchiefjustice.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/idchiefjustice.png new file mode 100644 index 0000000000000000000000000000000000000000..54b75e16dc9ebb7bf76c2b1e7f35b83d4692455d GIT binary patch literal 662 zcmV;H0%`q;P)0NRq`}3|WktD3OguvB6@DGT7X?^QGqAx!pUHWUFi}l!e&% zTKEsxDqBh^Qj(p$uZ^bbJ!Wbo&h6ay*K^MEcFuFaKb12~w>Au>RdAw{5p6!cpw&MU zpoI=b7}X8eo}QhE@$dM!#i!~`zv}h>zCTA(GUXcJYY-kXY^NYRCOoxLuoZ6#w;NeK zDSRLta^!%*mr75R`AKo6%x{XFSaclxs;8Fu!HFMiWF1quPdI4iibmx;>L!7dH8(4@ zOJ+ANQ6`C?k)X&jISTYkwIs8@ec^B440-Vw^0!&V5l4osctfHVrE5xRTJ)5BIaXEf zzw>m{g9GL6fe6$+dfsaf)Ney+%kw@DJ+E{GH4kuZRsDI%Y4~0At*RE>ht_pCy{Kx5 z9XQ*7&U;&T^lzy~razsAmlJ4?L)$epE|#;ZtaE$^u{C+3E7;wGUfJKe^aYNfXiVEe z>Zkw!010qNS#tmY3labT3lag+-G2N4007QOL_t(oM`K_Z1*0J_8UmvsFw#SSk=Ov> zRj0NRq`}3|WktD3OguvB6@DGT7X?^QGqAx!pUHWUFi}l!e&% zTKEsxDqBh^Qj(p$uZ^bbJ!Wbo&h6ay*K^MEcFuFaKb12~w>Au>RdAw{5p6!cpw&MU zpoI=b7}X8eo}QhE@$dM!#i!~`zv}h>zCTA(GUXcJYY-kXY^NYRCOoxLuoZ6#w;NeK zDSRLta^!%*mr75R`AKo6%x{XFSaclxs;8Fu!HFMiWF1quPdI4iibmx;>L!7dH8(4@ zOJ+ANQ6`C?k)X&jISTYkwIs8@ec^B440-Vw^0!&V5l4osctfHVrE5xRTJ)5BIaXEf zzw>m{g9GL6fe6$+dfsaf)Ney+%kw@DJ+E{GH4kuZRsDI%Y4~0At*RE>ht_pCy{Kx5 z9XQ*7&U;&T^lzy~razsAmlJ4?L)$epE|#;ZtaE$^u{C+3E7;wGUfJKe^aYNfXiVEe z>Zkw!010qNS#tmY3labT3lag+-G2N4005{-L_t(oM`K_Z1*0J_8UmvsFw#SSk=Ow6 z;gkK3u6E0($3*MLWe*cE4ggs$!OFz|!ka%n0@EOj%~8adhpdJu2f#GUescrNgwdp0 zMz(s8PeC9>SRI9?YY3!@XrOoiolmasNQwe-Ey1UcBnQwU4G^7;Xq63V5voJWOroLy zRuGZmwHLp?F%VNy66FAp#iZtWVk{@cL!)X(Ltr!nMnhouh5!JZF*WrI?m0RD0000< KMNUMnLSTYRK@tuC literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/idlawyer.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/idlawyer.png new file mode 100644 index 0000000000000000000000000000000000000000..044079dd7e82c3ee8b6d167d00017ff9f8bc3651 GIT binary patch literal 627 zcmV-(0*w8MP)0NRq`}3|WktD3OguvB6@DGT7X?^QGqAx!pUHWUFi}l!e&% zTKEsxDqBh^Qj(p$uZ^bbJ!Wbo&h6ay*K^MEcFuFaKb12~w>Au>RdAw{5p6!cpw&MU zpoI=b7}X8eo}QhE@$dM!#i!~`zv}h>zCTA(GUXcJYY-kXY^NYRCOoxLuoZ6#w;NeK zDSRLta^!%*mr75R`AKo6%x{XFSaclxs;8Fu!HFMiWF1quPdI4iibmx;>L!7dH8(4@ zOJ+ANQ6`C?k)X&jISTYkwIs8@ec^B440-Vw^0!&V5l4osctfHVrE5xRTJ)5BIaXEf zzw>m{g9GL6fe6$+dfsaf)Ney+%kw@DJ+E{GH4kuZRsDI%Y4~0At*RE>ht_pCy{Kx5 z9XQ*7&U;&T^lzy~razsAmlJ4?L)$epE|#;ZtaE$^u{C+3E7;wGUfJKe^aYNfXiVEe z>Zkw!010qNS#tmY3labT3lag+-G2N40065=L_t(oM`K_Z1*0J_8UmvsFw#SSk=Ow6 z;gkK3u6E0($3*MLWe*cE4ggs$!OFz|!ka%n0@EOj%~8adhpdJu2f#GUescrNgwdp0 zhD|+54oDTzfSW-rN08(Ikfkt3AUlSVkRaLtw6GlHaH1VREgz$Y7SY*=R@sn}=o=n- ziHZVPK}3p|U;O^YKuk$VlmkE(lUnK#V>u}v8dW0NRq`}3|WktD3OguvB6@DGT7X?^QGqAx!pUHWUFi}l!e&% zTKEsxDqBh^Qj(p$uZ^bbJ!Wbo&h6ay*K^MEcFuFaKb12~w>Au>RdAw{5p6!cpw&MU zpoI=b7}X8eo}QhE@$dM!#i!~`zv}h>zCTA(GUXcJYY-kXY^NYRCOoxLuoZ6#w;NeK zDSRLta^!%*mr75R`AKo6%x{XFSaclxs;8Fu!HFMiWF1quPdI4iibmx;>L!7dH8(4@ zOJ+ANQ6`C?k)X&jISTYkwIs8@ec^B440-Vw^0!&V5l4osctfHVrE5xRTJ)5BIaXEf zzw>m{g9GL6fe6$+dfsaf)Ney+%kw@DJ+E{GH4kuZRsDI%Y4~0At*RE>ht_pCy{Kx5 z9XQ*7&U;&T^lzy~razsAmlJ4?L)$epE|#;ZtaE$^u{C+3E7;wGUfJKe^aYNfXiVEe z>Zkw!010qNS#tmY3labT3lag+-G2N4005~;L_t(oN9~d^4udcZMeTru)TIj>3r9hm zjFVM43JV)cmkI`A@(~@nHIWd@k7Om16aVk$h;Wer36KB@kN^pgz|90SM}KH~dzeZc z+|Tpb1^KASFune+Tjm&m_}hhXRU4bF@Tf5rTeqmS&*0jWnpp Date: Wed, 10 Jan 2024 13:32:10 +1000 Subject: [PATCH 02/94] god i wish i knew what i was doing --- .../DeltaV/Objects/Misc/bureaucracy.rsi/meta.json | 3 +++ .../Misc/bureaucracy.rsi/paper_stamp-notary.png | Bin .../DeltaV/Objects/Misc/id_cards.rsi/meta.json | 13 +++++++++++-- .../Objects/Misc/bureaucracy.rsi/meta.json | 7 ++----- buildclient.cmd | 1 - buildserver.cmd | 1 - 6 files changed, 16 insertions(+), 9 deletions(-) rename Resources/Textures/{ => DeltaV}/Objects/Misc/bureaucracy.rsi/paper_stamp-notary.png (100%) delete mode 100644 buildclient.cmd delete mode 100644 buildserver.cmd diff --git a/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/meta.json index 810fa9d79e0..b06b34d0705 100644 --- a/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/meta.json @@ -12,6 +12,9 @@ }, { "name": "stamp-notary" + }, + { + "name": "paper_stamp-notary" } ] } diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-notary.png b/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/paper_stamp-notary.png similarity index 100% rename from Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-notary.png rename to Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/paper_stamp-notary.png diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json index 521c6e58fa7..9f3bfca6901 100644 --- a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | nyanoprisonguard, nyanogladiator, nyanomartialartist made by Floofers", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | nyanoprisonguard, nyanogladiator, nyanomartialartist made by Floofers, idchiefjustice idclerk and idlawyer made by leonardo-dabepis", "size": { "x": 32, "y": 32 @@ -26,7 +26,16 @@ "name": "nyanomartialartist" }, { - "name": "nyanomantis" + "name": "nyanomantis" + }, + { + "name": "idchiefjustice" + }, + { + "name": "idclerk" + }, + { + "name": "idlawyer" } ] } diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json index 19d21f6e7f5..d5e5a3441df 100644 --- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. paper_stamp-syndicate by Veritius. paper_receipt, paper_receipt_horizontal by eoineoineoin. pen_centcom is a resprited version of pen_cap by PuroSlavKing (Github). New stamp- icons taken from tgstation at https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93. stamp-warden is a darker version of stamp-hos. Luxury pen is drawn by Ubaser. Notary stamp by leonardo-dabepis", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. paper_stamp-syndicate by Veritius. paper_receipt, paper_receipt_horizontal by eoineoineoin. pen_centcom is a resprited version of pen_cap by PuroSlavKing (Github). New stamp- icons taken from tgstation at https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93. stamp-warden is a darker version of stamp-hos. Luxury pen is drawn by Ubaser.", "size": { "x": 32, "y": 32 @@ -150,9 +150,6 @@ { "name": "paper_stamp-mantis" }, - { - "name": "paper-stamp-notary" - }, { "name": "paper_talisman" }, @@ -300,7 +297,7 @@ "name": "stamp-trader" }, { - "name": "stamp-warden" + "name": "stamp-warden" } ] } diff --git a/buildclient.cmd b/buildclient.cmd deleted file mode 100644 index 7c09b8a78d8..00000000000 --- a/buildclient.cmd +++ /dev/null @@ -1 +0,0 @@ -dotnet run --project Content.Client --configuration RELEASE \ No newline at end of file diff --git a/buildserver.cmd b/buildserver.cmd deleted file mode 100644 index a616338db9b..00000000000 --- a/buildserver.cmd +++ /dev/null @@ -1 +0,0 @@ -dotnet run --project Content.Server --configuration RELEASE \ No newline at end of file From f1f0a8b049d707577ba648718c3ce1feb52eeba1 Mon Sep 17 00:00:00 2001 From: leo <136020119+leonardo-dabepis@users.noreply.github.com> Date: Wed, 10 Jan 2024 14:44:16 +1000 Subject: [PATCH 03/94] minor rsi fixes --- .../DeltaV/Interface/Misc/job_icons.rsi/meta.json | 3 +++ .../Devices/pda.rsi/{pda_cj.png => pda-cj.png} | Bin 2 files changed, 3 insertions(+) rename Resources/Textures/DeltaV/Objects/Devices/pda.rsi/{pda_cj.png => pda-cj.png} (100%) diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json index e741c09ad7e..fcb72e238e8 100644 --- a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json @@ -30,6 +30,9 @@ }, { "name": "Clerk" + }, + { + "name": "Lawyer" } ] } diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda_cj.png b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-cj.png similarity index 100% rename from Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda_cj.png rename to Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-cj.png From 8205d40cebc82911cef75612c464d519225e3582 Mon Sep 17 00:00:00 2001 From: leo <136020119+leonardo-dabepis@users.noreply.github.com> Date: Fri, 12 Jan 2024 17:36:49 +1000 Subject: [PATCH 04/94] i forgor the legal radio frequency --- .../DeltaV/Device/devicenet_frequencies.yml | 4 ++++ .../Entities/Objects/Devices/encryption_keys.yml | 15 +++++++++++++++ .../Devices/encryption_keys.rsi/law_label.png | Bin 0 -> 570 bytes .../Devices/encryption_keys.rsi/meta.json | 12 ++++++++++++ 4 files changed, 31 insertions(+) create mode 100644 Resources/Prototypes/DeltaV/Device/devicenet_frequencies.yml create mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Devices/encryption_keys.yml create mode 100644 Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/law_label.png create mode 100644 Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/meta.json diff --git a/Resources/Prototypes/DeltaV/Device/devicenet_frequencies.yml b/Resources/Prototypes/DeltaV/Device/devicenet_frequencies.yml new file mode 100644 index 00000000000..5ead38be216 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Device/devicenet_frequencies.yml @@ -0,0 +1,4 @@ +- type: deviceFrequency + id: SurveillanceCameraLegal + name: device-frequency-prototype-name-surveillance-camera-legal + frequency: 1420 diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/encryption_keys.yml new file mode 100644 index 00000000000..0c8fe6cb468 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/encryption_keys.yml @@ -0,0 +1,15 @@ +- type: entity + parent: EncryptionKey + id: EncryptionKeyLegal + name: legal encryption key + description: An encryption key used by the legal department. + components: + - type: EncryptionKey + channels: + - Legal + defaultChannel: Legal + - type: Sprite + layers: + - state: crypt_gray + - sprite: DeltaV/Objects/Devices/encryption_keys.rsi + state: law_label diff --git a/Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/law_label.png b/Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/law_label.png new file mode 100644 index 0000000000000000000000000000000000000000..962d09200d0fa80cb449f988564a89f3a2b96c3c GIT binary patch literal 570 zcmV-A0>%A_P)azfiQ&K?f0s3{@OjC<@{z73@+S+6q=(k~C?BCJjl76j#B;q2M68 z_%-++=qk7>2!bMrI6C{aNQoy+p+(yJc)34L?zy~oAK*`yWz7mE08O{eOe!g?=GTP2 zclZ!OkSi?8ma&vw%%NxeJhGbc5O;g^uIn0u1;vs9Uq5+PHcXp5Pfl;yhRb{85xFE5 z$S35O$peyaU0w3{&E=xUUoM-u%mUzddkV!4mO5B2nHqVD9M#HIxpf}*CSgTi$uf^| zkHbO+DI_64LKT}R!$zE0=ghkM5>4MSD)h+w8mPgfqlgl{F{)K|RhU)k3Rf95ckch^ zX{j^QUiWYk2)#Pa=LFEV4>anI^Ly$zjWZzd0$l5De}!|J`=(xRYtdsMvIAV+v^D7f zxY`9qpAFFzn^J(=ud2Yu1u&EchVOxab#GR!|2TgFa@%~OJK*pLm}Grq;}2zOXT$y2 z2E+gW010qNS#tmYHPiqAHPiuKW#tF}0044HL_t(oM`K_Z1*0J_8UmvsFd71*Auzxp zz(|h$DZ=XiVftpjxxtVsq5 Date: Tue, 23 Jan 2024 22:25:19 +1000 Subject: [PATCH 05/94] Minor fixes to radio, stamp, PDA, etc... --- .../Prototypes/DeltaV/Entities/Objects/Devices/pda.yml | 4 +++- .../Prototypes/DeltaV/Entities/Objects/Misc/paper.yml | 1 - .../DeltaV/Roles/Jobs/Legal/chief_justice.yml | 10 +++++----- Resources/Prototypes/DeltaV/radio_channels.yml | 6 ++++++ .../Entities/Objects/Devices/encryption_keys.yml | 1 + 5 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 Resources/Prototypes/DeltaV/radio_channels.yml diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml index f733fcfb8c2..91a5184a0a5 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml @@ -54,6 +54,7 @@ - type: PdaBorderColor borderColor: "#470823" - type: Icon + sprite: DeltaV/Objects/Devices/pda.rsi state: pda-cj - type: CartridgeLoader preinstalled: @@ -80,7 +81,8 @@ - type: PdaBorderColor borderColor: "#611528" - type: Icon - state: pda-cj + sprite: DeltaV/Objects/Devices/pda.rsi + state: pda-clerk - type: CartridgeLoader preinstalled: - CrewManifestCartridge diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml index b554441d77b..448ba1ba206 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml @@ -2,7 +2,6 @@ name: notary stamp parent: RubberStampBase id: RubberStampNotary - suffix: DO NOT MAP description: An old-fashioned seal for marking important documents, made of polished bronze. components: - type: Stamp diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Legal/chief_justice.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Legal/chief_justice.yml index 4134b85adf2..d69a6f0ea25 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Legal/chief_justice.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Legal/chief_justice.yml @@ -5,16 +5,16 @@ playTimeTracker: JobChiefJustice antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff requirements: -# - !type:RoleTimeRequirement -# role: JobClerk -# time: 36000 # DeltaV - 10 hours -# Commenting out the clerk requirement for now until clerk has been around long enough for people to actually get the hours required. + - !type:RoleTimeRequirement + role: JobClerk + time: 36000 # DeltaV - 10 hours - !type:RoleTimeRequirement department: JobLawyer time: 72000 # 20 hours - !type:OverallPlaytimeRequirement time: 90000 # 25 hours - weight: 10 # DeltaV - Changed HoP weight from 20 to 10 due to them not being more important than other Heads + - !type:WhitelistRequirement # whitelist requirement because I don't want any dingus judges + weight: 20 startingGear: CJGear icon: "JobIconChiefJustice" requireAdminNotify: true diff --git a/Resources/Prototypes/DeltaV/radio_channels.yml b/Resources/Prototypes/DeltaV/radio_channels.yml new file mode 100644 index 00000000000..b7853e3675f --- /dev/null +++ b/Resources/Prototypes/DeltaV/radio_channels.yml @@ -0,0 +1,6 @@ +- type: radioChannel + id: Legal + name: chat-radio-legal + keycode: "j" + frequency: 1420 + color: "#701442" diff --git a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml index 1c8a14dc76b..e090b2f8da7 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml @@ -67,6 +67,7 @@ - Common - Command - Engineering + - Legal # Delta V- adds legal department - Medical - Science - Security From 0aca607f91750fac7f98bd063cae2e7fb28d1256 Mon Sep 17 00:00:00 2001 From: leo <136020119+leonardo-dabepis@users.noreply.github.com> Date: Wed, 7 Feb 2024 19:33:56 +1000 Subject: [PATCH 06/94] add department hehe --- Resources/Prototypes/DeltaV/Roles/Jobs/departments.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 Resources/Prototypes/DeltaV/Roles/Jobs/departments.yml diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/departments.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/departments.yml new file mode 100644 index 00000000000..a8b62fb76b9 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/departments.yml @@ -0,0 +1,8 @@ +- type: department + id: Justice + description: department-Legal-description + color: "#701442" + roles: + - ChiefJustice + - Clerk + - Lawyer From b961de0cc2f542f27ed90ed2c75d88043ae3c893 Mon Sep 17 00:00:00 2001 From: Jeff Date: Wed, 28 Feb 2024 12:06:18 -0600 Subject: [PATCH 07/94] Edits from Velcroboy --- .../Components/IdCardConsoleComponent.cs | 2 + .../en-US/deltav/job/job-description.ftl | 1 + .../Locale/en-US/deltav/job/job-names.ftl | 5 +- Resources/Maps/shoukou.yml | 23 ++++++++- Resources/Prototypes/Access/misc.yml | 2 + Resources/Prototypes/DeltaV/Access/legal.yml | 13 +++++ Resources/Prototypes/DeltaV/Access/misc.yml | 1 + .../DeltaV/Entities/Clothing/Head/hats.yml | 17 ------- .../DeltaV/Entities/Markers/Spawners/jobs.yml | 42 ++++++++++++++++ .../Structures/Doors/Airlocks/access.yml | 50 +++++++++++++++++++ .../Structures/Doors/Windoors/windoor.yml | 16 ++++++ .../DeltaV/Roles/Jobs/Legal/chief_justice.yml | 17 ++++--- .../DeltaV/Roles/Jobs/Legal/clerk.yml | 13 +++-- .../DeltaV/Roles/Jobs/Legal/prosecuter.yml | 30 +++++++++++ .../DeltaV/Roles/Jobs/departments.yml | 2 +- .../DeltaV/Roles/play_time_trackers.yml | 9 ++++ .../Prototypes/DeltaV/Status Effects/jobs.yml | 13 ----- .../Prototypes/DeltaV/StatusEffects/job.yml | 21 ++++++++ .../Objects/Tools/access_configurator.yml | 2 + Resources/Prototypes/Maps/shoukou.yml | 4 ++ .../Prototypes/Roles/Jobs/Civilian/lawyer.yml | 4 +- .../Objects/Misc/bureaucracy.rsi/meta.json | 12 ----- 22 files changed, 238 insertions(+), 61 deletions(-) create mode 100644 Resources/Prototypes/DeltaV/Access/legal.yml create mode 100644 Resources/Prototypes/DeltaV/Roles/Jobs/Legal/prosecuter.yml delete mode 100644 Resources/Prototypes/DeltaV/Status Effects/jobs.yml diff --git a/Content.Shared/Access/Components/IdCardConsoleComponent.cs b/Content.Shared/Access/Components/IdCardConsoleComponent.cs index eafc78cad15..ee637c6d3fc 100644 --- a/Content.Shared/Access/Components/IdCardConsoleComponent.cs +++ b/Content.Shared/Access/Components/IdCardConsoleComponent.cs @@ -86,6 +86,8 @@ public WriteToTargetIdMessage(string fullName, string jobTitle, List acc "Mail", // Nyanotrasen - Mail, see Resources/Prototypes/Nyanotrasen/Access/cargo.yml "Mantis", // DeltaV - Psionic Mantis, see Resources/Prototypes/DeltaV/Access/epistemics.yml "Zookeeper", // DeltaV - Add Zookeeper access + "ChiefJustice", // DeltaV - Add Chief Justice access + "Legal", // DeltaV - Add Legal access }; [Serializable, NetSerializable] diff --git a/Resources/Locale/en-US/deltav/job/job-description.ftl b/Resources/Locale/en-US/deltav/job/job-description.ftl index fa2a380daf4..e93bc79722b 100644 --- a/Resources/Locale/en-US/deltav/job/job-description.ftl +++ b/Resources/Locale/en-US/deltav/job/job-description.ftl @@ -1,3 +1,4 @@ job-description-medical-borg = Half-human, Half-machine. Follow your laws, serve the crew, and assist the medical department. job-description-chief-justice = Manage the legal department, act as a judge, and ensure everyone recieves fair and just treatment. job-description-clerk = Organize trials, notarize documents, and act as a judge if needed. +job-description-prosecuter = Prepare cases against those accused of commiting crimes. diff --git a/Resources/Locale/en-US/deltav/job/job-names.ftl b/Resources/Locale/en-US/deltav/job/job-names.ftl index ff6ba4dddfc..6084413c434 100644 --- a/Resources/Locale/en-US/deltav/job/job-names.ftl +++ b/Resources/Locale/en-US/deltav/job/job-names.ftl @@ -1,7 +1,4 @@ job-name-medical-borg = Medical Cyborg job-name-chiefjustice = Chief Justice job-name-clerk = Clerk - -# Role timers - Make these alphabetical or I cut you -JobChiefJustice = Chief Justice -JobClerk = Clerk +job-name-prosecuter = Prosecuter diff --git a/Resources/Maps/shoukou.yml b/Resources/Maps/shoukou.yml index e98590ba894..34e636b8e09 100644 --- a/Resources/Maps/shoukou.yml +++ b/Resources/Maps/shoukou.yml @@ -35427,7 +35427,7 @@ entities: pos: -36.5,-22.5 parent: 34 - type: Door - secondsUntilStateChange: -47813.645 + secondsUntilStateChange: -47890.125 state: Closing - uid: 1274 components: @@ -70470,6 +70470,13 @@ entities: - type: Transform pos: 50.5,-33.5 parent: 34 +- proto: SpawnPointChiefJustice + entities: + - uid: 13446 + components: + - type: Transform + pos: -9.5,-15.5 + parent: 34 - proto: SpawnPointChiefMedicalOfficer entities: - uid: 13183 @@ -70477,6 +70484,13 @@ entities: - type: Transform pos: 50.5,-35.5 parent: 34 +- proto: SpawnPointClerk + entities: + - uid: 13448 + components: + - type: Transform + pos: -7.5,-15.5 + parent: 34 - proto: SpawnPointClown entities: - uid: 10437 @@ -70925,6 +70939,13 @@ entities: - type: Transform pos: 47.5,-9.5 parent: 34 +- proto: SpawnPointProsecuter + entities: + - uid: 13447 + components: + - type: Transform + pos: -8.5,-15.5 + parent: 34 - proto: SpawnPointPsychologist entities: - uid: 3924 diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml index ab17f6e41e5..132ef79c72c 100644 --- a/Resources/Prototypes/Access/misc.yml +++ b/Resources/Prototypes/Access/misc.yml @@ -44,3 +44,5 @@ - Musician # DeltaV - Add Musician access - Reporter # DeltaV - Add Reporter access - Zookeeper # DeltaV - Add Zookeeper access + - Legal # DeltaV - Add Legal dept access + - ChiefJustice # DeltaV - Add Chief Justice access diff --git a/Resources/Prototypes/DeltaV/Access/legal.yml b/Resources/Prototypes/DeltaV/Access/legal.yml new file mode 100644 index 00000000000..cc54cd689a7 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Access/legal.yml @@ -0,0 +1,13 @@ +- type: accessLevel + id: ChiefJustice + name: id-card-access-level-cj + +- type: accessLevel + id: Legal + name: id-card-access-level-legal + +- type: accessGroup + id: Legal + tags: + - Legal + - ChiefJustice diff --git a/Resources/Prototypes/DeltaV/Access/misc.yml b/Resources/Prototypes/DeltaV/Access/misc.yml index c1260b39958..d2201917154 100644 --- a/Resources/Prototypes/DeltaV/Access/misc.yml +++ b/Resources/Prototypes/DeltaV/Access/misc.yml @@ -46,3 +46,4 @@ - Musician - Reporter - Zookeeper + - Legal diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml index 636f87eea91..fc6b7067528 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml @@ -193,23 +193,6 @@ - type: Clothing sprite: DeltaV/Clothing/Head/Hats/beret_corpsman.rsi -- type: entity - parent: ClothingHeadBase - id: ClothingHeadHatStrawHat - name: straw hat - description: A fancy hat for hot days! Not recommended to wear near fires. - components: - - type: Sprite - sprite: DeltaV/Clothing/Head/Hats/straw_hat.rsi - - type: Clothing - sprite: DeltaV/Clothing/Head/Hats/straw_hat.rsi - - type: Construction - graph: StrawHat - node: strawhat - - type: Tag - tags: - - HamsterWearable - - type: entity parent: ClothingHeadBase id: ClothingHeadHatCJToque diff --git a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml index e662ecca743..b117b6924e4 100644 --- a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml @@ -13,3 +13,45 @@ state: medical - sprite: Mobs/Silicon/chassis.rsi state: medical_e + +- type: entity + id: SpawnPointChiefJustice + parent: SpawnPointJobBase + name: chief justice + components: + - type: SpawnPoint + job_id: ChiefJustice + - type: Sprite + layers: + - state: green + - state: lawyer + #- sprite: DeltaV/Markers/jobs.rsi + # state: chiefjustice + +- type: entity + id: SpawnPointClerk + parent: SpawnPointJobBase + name: clerk + components: + - type: SpawnPoint + job_id: Clerk + - type: Sprite + layers: + - state: green + - state: lawyer + #- sprite: DeltaV/Markers/jobs.rsi + # state: clerk + +- type: entity + id: SpawnPointProsecuter + parent: SpawnPointJobBase + name: prosecuter + components: + - type: SpawnPoint + job_id: Prosecuter + - type: Sprite + layers: + - state: green + - state: lawyer + #- sprite: DeltaV/Markers/jobs.rsi + # state: prosecuter diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml index 2e60a19c4a7..bb30ef6f028 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml @@ -13,3 +13,53 @@ components: - type: AccessReader access: [["Mantis"]] + +- type: entity + parent: AirlockCommand + id: AirlockChiefJusticeLocked + suffix: Chief Justice, Locked + components: + - type: AccessReader + access: [["ChiefJustice"]] + +- type: entity + parent: AirlockCommandGlass + id: AirlockChiefJusticeGlassLocked + suffix: ChiefJustice, Locked + components: + - type: AccessReader + access: [["ChiefJustice"]] + +- type: entity + parent: AirlockSecurity + id: AirlockLegalLocked + suffix: Legal, Locked + components: + - type: AccessReader + access: [["Legal"]] + +- type: entity + parent: AirlockSecurityGlass + id: AirlockLegalGlassLocked + suffix: Legal, Locked + components: + - type: AccessReader + access: [["Legal"]] + + +# Maintenance +- type: entity + parent: AirlockMaint + id: AirlockMaintChiefJusticeLocked + suffix: ChiefJustice, Locked + components: + - type: AccessReader + access: [["ChiefJustice"]] + +- type: entity + parent: AirlockMaint + id: AirlockMaintLegalLocked + suffix: Legal, Locked + components: + - type: AccessReader + access: [["Legal"]] diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml index d27a8d8e70e..7624df5d7da 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml @@ -21,3 +21,19 @@ components: - type: AccessReader access: [["Paramedic"]] + +- type: entity + parent: WindoorSecure + id: WindoorSecureChiefJusticeLocked + suffix: ChiefJustice, Locked + components: + - type: AccessReader + access: [["ChiefJustice"]] + +- type: entity + parent: WindoorSecure + id: WindoorSecureLegalLocked + suffix: Legal, Locked + components: + - type: AccessReader + access: [["Legal"]] diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Legal/chief_justice.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Legal/chief_justice.yml index d69a6f0ea25..354a1608d12 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Legal/chief_justice.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Legal/chief_justice.yml @@ -7,11 +7,14 @@ requirements: - !type:RoleTimeRequirement role: JobClerk - time: 36000 # DeltaV - 10 hours - - !type:RoleTimeRequirement - department: JobLawyer - time: 72000 # 20 hours - - !type:OverallPlaytimeRequirement + time: 36000 # DeltaV - 10 hours + - !type:RoleTimeRequirement + role: JobLawyer + time: 36000 # 10 hours + - !type:RoleTimeRequirement + role: JobProsecuter + time: 36000 # 10 hours + - !type:OverallPlaytimeRequirement time: 90000 # 25 hours - !type:WhitelistRequirement # whitelist requirement because I don't want any dingus judges weight: 20 @@ -22,7 +25,8 @@ canBeAntag: false access: - Command - - Lawyer + - ChiefJustice + - Legal - Security - Maintenance - External @@ -48,6 +52,7 @@ id: CJPDA ears: ClothingHeadsetCJ gloves: ClothingHandsGlovesColorWhite + # Todo - pocket1: Gavel innerClothingSkirt: ClothingUniformJumpskirtChiefJustice satchel: ClothingBackpackSatchelFilled # TODO- make legal departmebt bags duffelbag: ClothingBackpackDuffelFilled # E. diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Legal/clerk.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Legal/clerk.yml index 3beed512f85..d329978f726 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Legal/clerk.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Legal/clerk.yml @@ -7,16 +7,19 @@ requirements: - !type:OverallPlaytimeRequirement time: 36000 # 10 hrs - - !type:RoleTimeRequirement - department: JobLawyer - time: 72000 # 20 hours + - !type:RoleTimeRequirement + role: JobLawyer + time: 36000 # 10 hours + - !type:RoleTimeRequirement + role: JobProsecuter + time: 36000 # 10 hours startingGear: ClerkGear icon: "JobIconClerk" requireAdminNotify: true supervisors: job-supervisors-cj access: - - Service - - Lawyer + - Legal + - Security - Maintenance - type: startingGear diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Legal/prosecuter.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Legal/prosecuter.yml new file mode 100644 index 00000000000..a8be0519525 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Legal/prosecuter.yml @@ -0,0 +1,30 @@ +- type: job + id: Prosecuter + name: job-name-prosecuter + description: job-description-prosecuter + playTimeTracker: JobProsecuter + requirements: + - !type:OverallPlaytimeRequirement + time: 36000 # 10 hrs + startingGear: ProsecuterGear + icon: "JobIconLawyer" + supervisors: job-supervisors-hop + access: + - Legal + - Security + - Maintenance + +- type: startingGear # Need prosecuter stuff + id: ProsecuterGear + equipment: + jumpsuit: ClothingUniformJumpsuitLawyerBlack # TODO change jumpsuit to randomiser of the 4 variants + back: ClothingBackpackFilled + shoes: ClothingShoesBootsLaceup + id: LawyerPDA + ears: ClothingHeadsetSecurity + # TODO add copy of space law + inhand: + - BriefcaseBrownFilled + innerClothingSkirt: ClothingUniformJumpskirtLawyerBlack + satchel: ClothingBackpackSatchelFilled + duffelbag: ClothingBackpackDuffelFilled diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/departments.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/departments.yml index a8b62fb76b9..abaebb432bf 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/departments.yml @@ -5,4 +5,4 @@ roles: - ChiefJustice - Clerk - - Lawyer + - Prosecuter diff --git a/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml b/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml index d3b983f01cd..3b3c8ea4ae4 100644 --- a/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml @@ -3,3 +3,12 @@ - type: playTimeTracker id: JobMedicalBorg + +- type: playTimeTracker + id: JobChiefJustice + +- type: playTimeTracker + id: JobClerk + +- type: playTimeTracker + id: JobProsecuter diff --git a/Resources/Prototypes/DeltaV/Status Effects/jobs.yml b/Resources/Prototypes/DeltaV/Status Effects/jobs.yml deleted file mode 100644 index eb6d0d33337..00000000000 --- a/Resources/Prototypes/DeltaV/Status Effects/jobs.yml +++ /dev/null @@ -1,13 +0,0 @@ -- type: statusIcon - parent: JobIcon - id: JobIconChiefJustice - icon: - sprite: DeltaV/Interface/Misc/job_icons.rsi - state: ChiefJustice - -- type: statusIcon - parent: JobIcon - id: JobIconClerk - icon: - sprite: DeltaV/Interface/Misc/job_icons.rsi - state: Clerk diff --git a/Resources/Prototypes/DeltaV/StatusEffects/job.yml b/Resources/Prototypes/DeltaV/StatusEffects/job.yml index 4b61fd46d7d..97ce0409640 100644 --- a/Resources/Prototypes/DeltaV/StatusEffects/job.yml +++ b/Resources/Prototypes/DeltaV/StatusEffects/job.yml @@ -4,3 +4,24 @@ icon: sprite: DeltaV/Interface/Misc/job_icons.rsi state: MedicalBorg + +- type: statusIcon + parent: JobIcon + id: JobIconChiefJustice + icon: + sprite: DeltaV/Interface/Misc/job_icons.rsi + state: ChiefJustice + +- type: statusIcon + parent: JobIcon + id: JobIconClerk + icon: + sprite: DeltaV/Interface/Misc/job_icons.rsi + state: Clerk + +- type: statusIcon + parent: JobIcon + id: JobIconProsecuter + icon: + sprite: DeltaV/Interface/Misc/job_icons.rsi + state: Clerk #need prosecuter diff --git a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml index 721a0654689..5b7d3f9bfb4 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml @@ -57,6 +57,8 @@ - Service - Theatre - Zookeeper #Delta V: Add Zookeeper Access + - ChiefJustice #Delta V: Add Chief Justice Access + - Legal #Delta V: Add Legal Access privilegedIdSlot: name: id-card-console-privileged-id ejectSound: /Audio/Machines/id_swipe.ogg diff --git a/Resources/Prototypes/Maps/shoukou.yml b/Resources/Prototypes/Maps/shoukou.yml index d7242ce908b..ee835d957ad 100644 --- a/Resources/Prototypes/Maps/shoukou.yml +++ b/Resources/Prototypes/Maps/shoukou.yml @@ -66,4 +66,8 @@ SalvageSpecialist: [ 2, 4 ] MailCarrier: [ 1, 2 ] CargoTechnician: [ 2, 3 ] + #Legal + ChiefJustice: [ 1, 1 ] + Clerk: [ 1, 1 ] + Prosecuter: [ 1, 1 ] diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml index 34b830aca3a..f89f39308ce 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml @@ -12,7 +12,7 @@ time: 14400 # 4 hours startingGear: LawyerGear icon: "JobIconLawyer" - supervisors: job-supervisors-cj # DeltaV - changes supervisor to Chief Justice + supervisors: job-supervisors-hop access: - Service - Lawyer @@ -25,7 +25,7 @@ back: ClothingBackpackFilled shoes: ClothingShoesBootsLaceup id: LawyerPDA - ears: ClothingHeadsetLegal # DeltaV - replaces sec headset with legal headset + ears: ClothingHeadsetSecurity # TODO add copy of space law inhand: - BriefcaseBrownFilled diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json index ba45dcc090b..0b58a2fec96 100644 --- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json @@ -250,18 +250,6 @@ }, { "name": "scrap_bloodied" - }, - { - "name": "paper_stamp-syndicate" - }, - { - "name": "paper_stamp-trader" - }, - { - "name": "paper_stamp-warden" - }, - { - "name": "paper_stamp-generic" } ] } From 8458d66a833ef8c1c235f6137423eda11ea5e0cc Mon Sep 17 00:00:00 2001 From: leo <136020119+leonardo-dabepis@users.noreply.github.com> Date: Fri, 1 Mar 2024 19:02:21 +1000 Subject: [PATCH 08/94] Add trial timer --- .../Objects/Specific/Justice/trialtimer.yml | 22 ++++++++++++++++++ .../Specific/Justice/trialtimer.rsi/meta.json | 14 +++++++++++ .../Justice/trialtimer.rsi/trialtimer.png | Bin 0 -> 1170 bytes 3 files changed, 36 insertions(+) create mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/trialtimer.yml create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Justice/trialtimer.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Justice/trialtimer.rsi/trialtimer.png diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/trialtimer.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/trialtimer.yml new file mode 100644 index 00000000000..d5a4bbadde3 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/trialtimer.yml @@ -0,0 +1,22 @@ +- type: entity + id: TrialTimer + parent: SignalTimer + name: trial timer + description: A fancy timer with a screen, designed for use in court rooms. + components: + - type: SignalTimer + canEditLabel: true + - type: TextScreenVisuals + color: "#b03060" + textOffset: 1,8 + timerOffset: 1,8 + textLength: 5 + rows: 1 + - type: Sprite + drawdepth: SmallObjects + sprite: DeltaV/Objects/Specific/Justice/trialtimer.rsi + state: trialtimer + noRot: true + - type: Construction + graph: Timer + node: screen diff --git a/Resources/Textures/DeltaV/Objects/Specific/Justice/trialtimer.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Specific/Justice/trialtimer.rsi/meta.json new file mode 100644 index 00000000000..9d4d77e383f --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Specific/Justice/trialtimer.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Original screen timer sprite by brainfood1183 (Github) for Space Station 14, modified by Leonardo-DaBepis", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "trialtimer" + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Specific/Justice/trialtimer.rsi/trialtimer.png b/Resources/Textures/DeltaV/Objects/Specific/Justice/trialtimer.rsi/trialtimer.png new file mode 100644 index 0000000000000000000000000000000000000000..34c8f1b90a973a28041bc16e327ca95415305509 GIT binary patch literal 1170 zcmV;D1a13?P)aQ>CJn4l0N^WT@iMLQxP$sbH7t&{nYOlDsCZkfh-yMT)E7;!to9 zUHlsS4|Ek=6$C*ML>!&{TBOALnnH`TFWlT8=e=`zIRT`!!Az$o0hpG{GpVG!nqQMc z?~pJ;6#*3H*h|^P9J;QbM+8KFh>Ka>&vje_1xjVd@fiYSpcMrwtoYSeYoHF^wGMehIe zbo7~Ne|k6x^uBuD=L8Vi2kJG?`#tr%`WX;>0j{l6rJ-WRi(u z7lb^fyTAIrs;;g9_|MJC@_&41Tb|o?T9xJD^RGEv4Y+Rnlp_yrZpkYbj=}9)XOusK zp_>w7Hu2*3pP$CHM0$DfOU)}1p$q&t)c0?kg2_}U@=u-~)*`paq(}EgphZZI?+QPe z>oOVjk7xHl;ukJB2*yEzz@II!@S~(F@?Ho5QsA47$wYTD^@w9Q2ixgE;Q7FOA9m&2 zDveV3`|eeoFCYj4;4Fye(IE1KN4_uuLvzq0dKP$boL6LbkAKL0F5T>$F_?_&rFjyC zqX=ZZejmVJBuAn#oB<0Ml4t6Ju<;T|&cYy|&_vN!ONXL|64A2`&0<)k0(cm)CJo(Q zYPkT(vxq#C7+EAcWkoVB0;awaNji`xX`;UEOtMruStm*-KPLADPeesj>{foUvK_qyWS;X0t2s$SOWf zLWo{HuPPd-6#kz3z8=7wSy}vC22hhi%}SYNi%51)Ij#fD3k#lBI|*9U1SPT7jUNl} z`ilkAnFYfQA3lF)Q2Ku$YGqdmPf;7(6@ID{+!=9r@s4s^wHd2$tTR`3fuGs}!$BW* zM$Ml8MM@leE7qqA{9FyVcIh;Xrygu>xUJnsCmi`~|3~2gw{HAgA5bTE|K&Mx6s}*~ zQpf$}p@c!dU0vQBNqBX5l*<70VeR-SC$tD{N3@8%#v~EC#BUqhtZx)B3K#{90!9I& kfKk9GU=%P4{2dDX1|sUKK8xh*;Q#;t07*qoM6N<$g0DRnGXMYp literal 0 HcmV?d00001 From d95415f88246be1cf2dc0b3f2316f1947cedf035 Mon Sep 17 00:00:00 2001 From: leo <136020119+leonardo-dabepis@users.noreply.github.com> Date: Tue, 5 Mar 2024 08:42:36 +1000 Subject: [PATCH 09/94] add department signs --- .../Structures/Wallmounts/Signs/signs.yml | 22 +++++++++++++++++- .../Wallmounts/signs.rsi/direction_court.png | Bin 0 -> 898 bytes .../signs.rsi/direction_justice.png | Bin 0 -> 926 bytes .../Structures/Wallmounts/signs.rsi/meta.json | 12 ++++++++-- 4 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/direction_court.png create mode 100644 Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/direction_justice.png diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml index 2b0048f1a48..bf29379876b 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml @@ -56,4 +56,24 @@ components: - type: Sprite sprite: DeltaV/Structures/Wallmounts/signs.rsi - state: barbershop \ No newline at end of file + state: barbershop + +- type: entity + parent: BaseSignDirectional + id: SignDirectionalJustice + name: justice department sign + description: A direction sign, pointing out which way the Justice department is. + components: + - type: Sprite + sprite: DeltaV/Structures/Wallmounts/signs.rsi + state: direction_justice + +- type: entity + parent: BaseSignDirectional + id: SignDirectionaCourt + name: court room sign + description: A direction sign, pointing out which way the court room is. + components: + - type: Sprite + sprite: DeltaV/Structures/Wallmounts/signs.rsi + state: direction_court diff --git a/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/direction_court.png b/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/direction_court.png new file mode 100644 index 0000000000000000000000000000000000000000..dcb76fc2635c1393f1aa9c065db5a2c489a08795 GIT binary patch literal 898 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU@XXVb`Ho)PG(@xm{>Y-zxQDW zk>mSwr*?&Ptx$M0VWC*NSXYyU7whhj_H9j})1S=R;xwtvyGtbe;L(K-6n6c{{$PJ0 zv>;S~#Z{oN-Nj(7Z5uBgTXTf>k>;b0h2asOZ62v9UX3{! zB)8m@QCf1zgccT7(Hy7tW{cFxY1eK}&-gJdP>p}_{#Gpu%Px(H=5AT7yH-sxy%hSZ zB;@Fw|K~4XOIx=0-9nWMzhCW|KiQ!`e#P~e@87SKzD{>|z`DaM`k&F+%y+ZDM0t11 zFh7)i@M+mnP4)v<^$fn{oQ%oyV2rBsWwz66IA~)~!~bP{_2#U1kN3SB;ar4dD zl(c<0dPo19GgM$;c%<|*o_Dh@x9{qbZd4J4$Z?D><`!W`mAJ-O6 z`p@|J`OMuj=IwU<8@J=k^SoD>vs?{IziTefh7iU39PMeOf%}qEP*p zc*fVx2l?QRNAd>}^G_wy;`cnftN1y#yZ6~Ce0#r2+9UV6<5$L8&%T7)ZC?t!I$ z*M0X=z2BafU{Kqjb|-_|=nG>}|AzhdL(L~NS^Qex@OA4EREPbDXNhBUXJzqU^*ii8 QFk%@zUHx3vIVCg!08QzehX4Qo literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/direction_justice.png b/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/direction_justice.png new file mode 100644 index 0000000000000000000000000000000000000000..ef94a9998f3367c89c30de82e90cbf633de39a8a GIT binary patch literal 926 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU@XXVb`Ho)PG(@xm{>Y-zxQDW zk>mSwr*?&Ptx$M0VWC*NSXYyU7whhj_H9j})1S=R;xwtvyGtbe;L(K-6n6c{{$PJ0 zv>;S~#Z{oN-Nj(7Z5uBgTXTf>k>;b0h2asOZ62v9UX3{! zB)8m@QCf1zgccT7(Hy7tW{cFxY1eK}&-gJdP>p}_{#Gpu%Px(H=5AT7yH-sxy%hSZ zB;@Fw|K~4XOIx=0-9nWMzhCW|KiQ!`e#P~e@87SKzD{>|z`DaM`k&F+%y+ZDM0t11 zFh7)i@M+mnP4)v<^$fn{oQ%oyV2rBsWwz66IA~)~!~bP{_2#U1kN8^(X5h?sO8vwLg&x%%9~G)#rR$MEq3V5 z+cS53_Q~!@QezQgQD9)?aA05(XkY*`8^wffX#9U(x8FXy>u`$E%1pGGosE8{JUsdB zssd~8?&UiCQsb24i`LmMbL;ZXM_t_aS;}YD+M6ejpWB-)`*Hu16n^eUpG801<0^x= z7|HRd%m?d*GiuW{Zc5Aa%YW{+eLe5ESaIO2pttFBPb;4GJM{7Px0pnmw|jPXr%tTD zyC;a##7aJ)_UEd9HCmcKWm}sU%)fbcuC&KduP}$Jp({<-ww(I*blMKv=+uhof3CKg z?YC~P4~=`r^+9FV8vFGx1>a9_vYhv4&DM40l|?~QYtq#gZv4rhy603)!!zzTvax~y&ulpXjC2N1S3j3^P6 Date: Mon, 4 Mar 2024 23:51:41 -0600 Subject: [PATCH 10/94] Changes all references of legal -> justice and adds prosecutor access --- .../Components/IdCardConsoleComponent.cs | 3 +- .../en-US/deltav/devices/device-network.ftl | 1 + .../deltav/headset/headset-component.ftl | 1 + .../en-US/deltav/job/department-desc.ftl | 2 +- .../Locale/en-US/deltav/job/department.ftl | 2 +- .../en-US/deltav/job/job-description.ftl | 4 +- .../Locale/en-US/deltav/job/job-names.ftl | 2 +- .../deltav/prototypes/access/accesses.ftl | 3 ++ Resources/Prototypes/Access/misc.yml | 3 +- .../Prototypes/DeltaV/Access/justice.yml | 18 ++++++++ Resources/Prototypes/DeltaV/Access/legal.yml | 13 ------ .../DeltaV/Device/devicenet_frequencies.yml | 4 +- .../Entities/Clothing/Ears/headsets.yml | 12 +++--- .../Objects/Devices/encryption_keys.yml | 10 ++--- .../Objects/Misc/identification_cards.yml | 19 +++++++-- .../Structures/Doors/Airlocks/access.yml | 41 +++++++++++++++---- .../Structures/Doors/Windoors/windoor.yml | 14 +++++-- .../DeltaV/Roles/Jobs/Legal/chief_justice.yml | 6 +-- .../DeltaV/Roles/Jobs/Legal/clerk.yml | 4 +- .../DeltaV/Roles/Jobs/Legal/prosecuter.yml | 3 +- .../DeltaV/Roles/Jobs/departments.yml | 3 +- .../Prototypes/DeltaV/radio_channels.yml | 4 +- .../Objects/Devices/encryption_keys.yml | 2 +- .../Objects/Tools/access_configurator.yml | 3 +- Resources/Prototypes/Maps/shoukou.yml | 5 --- .../Prototypes/Roles/Jobs/departments.yml | 2 +- 26 files changed, 119 insertions(+), 65 deletions(-) create mode 100644 Resources/Locale/en-US/deltav/devices/device-network.ftl create mode 100644 Resources/Locale/en-US/deltav/headset/headset-component.ftl create mode 100644 Resources/Prototypes/DeltaV/Access/justice.yml delete mode 100644 Resources/Prototypes/DeltaV/Access/legal.yml diff --git a/Content.Shared/Access/Components/IdCardConsoleComponent.cs b/Content.Shared/Access/Components/IdCardConsoleComponent.cs index ee637c6d3fc..9e8f72240e1 100644 --- a/Content.Shared/Access/Components/IdCardConsoleComponent.cs +++ b/Content.Shared/Access/Components/IdCardConsoleComponent.cs @@ -87,7 +87,8 @@ public WriteToTargetIdMessage(string fullName, string jobTitle, List acc "Mantis", // DeltaV - Psionic Mantis, see Resources/Prototypes/DeltaV/Access/epistemics.yml "Zookeeper", // DeltaV - Add Zookeeper access "ChiefJustice", // DeltaV - Add Chief Justice access - "Legal", // DeltaV - Add Legal access + "Justice", // DeltaV - Add Justice access + "Prosecutor", // Delta V - Add Prosecutor access }; [Serializable, NetSerializable] diff --git a/Resources/Locale/en-US/deltav/devices/device-network.ftl b/Resources/Locale/en-US/deltav/devices/device-network.ftl new file mode 100644 index 00000000000..a9d0c8cbffd --- /dev/null +++ b/Resources/Locale/en-US/deltav/devices/device-network.ftl @@ -0,0 +1 @@ +device-frequency-prototype-name-surveillance-camera-justice = Justice Cameras diff --git a/Resources/Locale/en-US/deltav/headset/headset-component.ftl b/Resources/Locale/en-US/deltav/headset/headset-component.ftl new file mode 100644 index 00000000000..e684f3d4aed --- /dev/null +++ b/Resources/Locale/en-US/deltav/headset/headset-component.ftl @@ -0,0 +1 @@ +chat-radio-justice = Justice diff --git a/Resources/Locale/en-US/deltav/job/department-desc.ftl b/Resources/Locale/en-US/deltav/job/department-desc.ftl index e54892aee32..0c71091acf4 100644 --- a/Resources/Locale/en-US/deltav/job/department-desc.ftl +++ b/Resources/Locale/en-US/deltav/job/department-desc.ftl @@ -1 +1 @@ -department-Legal-description = Uphold justice on the station. +department-Justice-description = Uphold justice on the station. diff --git a/Resources/Locale/en-US/deltav/job/department.ftl b/Resources/Locale/en-US/deltav/job/department.ftl index b9e08811245..43d9ad464bc 100644 --- a/Resources/Locale/en-US/deltav/job/department.ftl +++ b/Resources/Locale/en-US/deltav/job/department.ftl @@ -1,3 +1,3 @@ department-Epistemics = Epistemics department-Logistics = Logistics -department-Legal = Legal +department-Justice = Justice diff --git a/Resources/Locale/en-US/deltav/job/job-description.ftl b/Resources/Locale/en-US/deltav/job/job-description.ftl index e93bc79722b..0d8fff83c48 100644 --- a/Resources/Locale/en-US/deltav/job/job-description.ftl +++ b/Resources/Locale/en-US/deltav/job/job-description.ftl @@ -1,4 +1,4 @@ job-description-medical-borg = Half-human, Half-machine. Follow your laws, serve the crew, and assist the medical department. job-description-chief-justice = Manage the legal department, act as a judge, and ensure everyone recieves fair and just treatment. -job-description-clerk = Organize trials, notarize documents, and act as a judge if needed. -job-description-prosecuter = Prepare cases against those accused of commiting crimes. +job-description-clerk = Organize trials, notarize documents, keep records, and act as a judge if needed. +job-description-prosecutor = Take statments from sec and prepare cases against those accused of commiting crimes. diff --git a/Resources/Locale/en-US/deltav/job/job-names.ftl b/Resources/Locale/en-US/deltav/job/job-names.ftl index 6084413c434..25588f91038 100644 --- a/Resources/Locale/en-US/deltav/job/job-names.ftl +++ b/Resources/Locale/en-US/deltav/job/job-names.ftl @@ -1,4 +1,4 @@ job-name-medical-borg = Medical Cyborg job-name-chiefjustice = Chief Justice job-name-clerk = Clerk -job-name-prosecuter = Prosecuter +job-name-prosecutor = Prosecutor diff --git a/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl b/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl index 239cecc6e0a..cb1a8f48eb7 100644 --- a/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl +++ b/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl @@ -1,2 +1,5 @@ id-card-access-level-orders = Orders id-card-access-level-mantis = Psionic Mantis +id-card-access-level-cj = Chief Justice +id-card-access-level-prosecutor = Prosecutor +id-card-access-level-justice = Justice diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml index 132ef79c72c..2f5baab63d4 100644 --- a/Resources/Prototypes/Access/misc.yml +++ b/Resources/Prototypes/Access/misc.yml @@ -44,5 +44,6 @@ - Musician # DeltaV - Add Musician access - Reporter # DeltaV - Add Reporter access - Zookeeper # DeltaV - Add Zookeeper access - - Legal # DeltaV - Add Legal dept access + - Justice # DeltaV - Add Justice dept access - ChiefJustice # DeltaV - Add Chief Justice access + - Prosecutor # DeltaV - Add Prosecutor access diff --git a/Resources/Prototypes/DeltaV/Access/justice.yml b/Resources/Prototypes/DeltaV/Access/justice.yml new file mode 100644 index 00000000000..5de7a6c5775 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Access/justice.yml @@ -0,0 +1,18 @@ +- type: accessLevel + id: ChiefJustice + name: id-card-access-level-cj + +- type: accessLevel + id: Prosecutor + name: id-card-access-level-prosecutor + +- type: accessLevel + id: Justice + name: id-card-access-level-justice + +- type: accessGroup + id: Justice + tags: + - Justice + - Prosecutor + - ChiefJustice diff --git a/Resources/Prototypes/DeltaV/Access/legal.yml b/Resources/Prototypes/DeltaV/Access/legal.yml deleted file mode 100644 index cc54cd689a7..00000000000 --- a/Resources/Prototypes/DeltaV/Access/legal.yml +++ /dev/null @@ -1,13 +0,0 @@ -- type: accessLevel - id: ChiefJustice - name: id-card-access-level-cj - -- type: accessLevel - id: Legal - name: id-card-access-level-legal - -- type: accessGroup - id: Legal - tags: - - Legal - - ChiefJustice diff --git a/Resources/Prototypes/DeltaV/Device/devicenet_frequencies.yml b/Resources/Prototypes/DeltaV/Device/devicenet_frequencies.yml index 5ead38be216..b2e49bc85b4 100644 --- a/Resources/Prototypes/DeltaV/Device/devicenet_frequencies.yml +++ b/Resources/Prototypes/DeltaV/Device/devicenet_frequencies.yml @@ -1,4 +1,4 @@ - type: deviceFrequency - id: SurveillanceCameraLegal - name: device-frequency-prototype-name-surveillance-camera-legal + id: SurveillanceCameraJustice + name: device-frequency-prototype-name-surveillance-camera-justice frequency: 1420 diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml index 810a4b23e72..97e1c28c33a 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml @@ -26,7 +26,7 @@ sprite: DeltaV/Clothing/Ears/Headsets/service.rsi - type: Clothing sprite: DeltaV/Clothing/Ears/Headsets/service.rsi - + - type: entity parent: ClothingHeadsetAltSyndicate id: ClothingHeadsetAltSyndicateListening @@ -45,14 +45,14 @@ - type: entity parent: ClothingHeadset - id: ClothingHeadsetLegal - name: legal headset - description: This is used by your elite security force. + id: ClothingHeadsetJustice + name: justice headset + description: This is used by the justice department. components: - type: ContainerFill containers: key_slots: - - EncryptionKeyLegal + - EncryptionKeyJustice - EncryptionKeySecurity - EncryptionKeyCommon - type: Sprite @@ -72,7 +72,7 @@ - type: ContainerFill containers: key_slots: - - EncryptionKeyLegal + - EncryptionKeyJustice - EncryptionKeySecurity - EncryptionKeyCommon - EncryptionKeyCommand diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/encryption_keys.yml index 0c8fe6cb468..4cd18ab7a5a 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/encryption_keys.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/encryption_keys.yml @@ -1,13 +1,13 @@ - type: entity parent: EncryptionKey - id: EncryptionKeyLegal - name: legal encryption key - description: An encryption key used by the legal department. + id: EncryptionKeyJustice + name: justice encryption key + description: An encryption key used by the justice department. components: - type: EncryptionKey channels: - - Legal - defaultChannel: Legal + - Justice + defaultChannel: Justice - type: Sprite layers: - state: crypt_gray diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml index b27300ba6bf..a4ffcf8e57d 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml @@ -3,23 +3,36 @@ id: CJIDCard name: chief justice ID card components: + - type: PresetIdCard + job: ChiefJustice - type: Sprite layers: - state: default - sprite: DeltaV/Objects/Misc/id_cards.rsi state: idchiefjustice - - type: PresetIdCard - job: ChiefJustice - type: entity parent: IDCardStandard id: ClerkIDCard name: clerk ID card components: + - type: PresetIdCard + job: Clerk - type: Sprite layers: - state: default - sprite: DeltaV/Objects/Misc/id_cards.rsi state: idclerk + +- type: entity + parent: IDCardStandard + id: ProsecutorIDCard + name: presecutor ID card + components: - type: PresetIdCard - job: Clerk + job: Prosecutor + - type: Sprite + layers: + - state: default + - sprite: DeltaV/Objects/Misc/id_cards.rsi + state: idclerk #NEED diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml index bb30ef6f028..ee4c0de1b23 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml @@ -32,20 +32,35 @@ - type: entity parent: AirlockSecurity - id: AirlockLegalLocked - suffix: Legal, Locked + id: AirlockJusticeLocked + suffix: Justice, Locked components: - type: AccessReader - access: [["Legal"]] + access: [["Justice"]] - type: entity parent: AirlockSecurityGlass - id: AirlockLegalGlassLocked - suffix: Legal, Locked + id: AirlockJusticeGlassLocked + suffix: Justice, Locked components: - type: AccessReader - access: [["Legal"]] + access: [["Justice"]] +- type: entity + parent: AirlockSecurity + id: AirlockProsecutorLocked + suffix: Prosecutor, Locked + components: + - type: AccessReader + access: [["Prosecutor"]] + +- type: entity + parent: AirlockSecurityGlass + id: AirlockProsecutorGlassLocked + suffix: Prosecutor, Locked + components: + - type: AccessReader + access: [["Prosecutor"]] # Maintenance - type: entity @@ -58,8 +73,16 @@ - type: entity parent: AirlockMaint - id: AirlockMaintLegalLocked - suffix: Legal, Locked + id: AirlockMaintJusticeLocked + suffix: Justice, Locked + components: + - type: AccessReader + access: [["Justice"]] + +- type: entity + parent: AirlockMaint + id: AirlockMaintProsecutorLocked + suffix: Prosecutor, Locked components: - type: AccessReader - access: [["Legal"]] + access: [["Prosecutor"]] diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml index 7624df5d7da..82ff8868d29 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml @@ -32,8 +32,16 @@ - type: entity parent: WindoorSecure - id: WindoorSecureLegalLocked - suffix: Legal, Locked + id: WindoorSecureJusticeLocked + suffix: Justice, Locked components: - type: AccessReader - access: [["Legal"]] + access: [["Justice"]] + +- type: entity + parent: WindoorSecure + id: WindoorSecureProsecutorLocked + suffix: Prosecutor, Locked + components: + - type: AccessReader + access: [["Prosecutor"]] diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Legal/chief_justice.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Legal/chief_justice.yml index 354a1608d12..7b02504f9b8 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Legal/chief_justice.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Legal/chief_justice.yml @@ -26,7 +26,7 @@ access: - Command - ChiefJustice - - Legal + - Justice - Security - Maintenance - External @@ -45,7 +45,7 @@ id: CJGear equipment: jumpsuit: ClothingUniformJumpsuitChiefJustice - back: ClothingBackpackFilled # TODO- make legal department bags + back: ClothingBackpackFilled # TODO- make Justice department bags shoes: ClothingShoesLeather head: ClothingHeadHatCJToque outerClothing: ClothingOuterChiefJustice @@ -54,5 +54,5 @@ gloves: ClothingHandsGlovesColorWhite # Todo - pocket1: Gavel innerClothingSkirt: ClothingUniformJumpskirtChiefJustice - satchel: ClothingBackpackSatchelFilled # TODO- make legal departmebt bags + satchel: ClothingBackpackSatchelFilled # TODO- make Justice departmebt bags duffelbag: ClothingBackpackDuffelFilled # E. diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Legal/clerk.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Legal/clerk.yml index d329978f726..4c307baeb9a 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Legal/clerk.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Legal/clerk.yml @@ -18,7 +18,7 @@ requireAdminNotify: true supervisors: job-supervisors-cj access: - - Legal + - Justice - Security - Maintenance @@ -30,7 +30,7 @@ shoes: ClothingShoesBootsLaceup pocket1: RubberStampNotary id: ClerkPDA - ears: ClothingHeadsetLegal + ears: ClothingHeadsetJustice innerClothingSkirt: ClothingUniformJumpskirtClerk satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Legal/prosecuter.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Legal/prosecuter.yml index a8be0519525..02c0a039b5a 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Legal/prosecuter.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Legal/prosecuter.yml @@ -10,7 +10,8 @@ icon: "JobIconLawyer" supervisors: job-supervisors-hop access: - - Legal + - Justice + - Prosecutor - Security - Maintenance diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/departments.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/departments.yml index abaebb432bf..e38cbe0c5db 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/departments.yml @@ -1,8 +1,9 @@ - type: department id: Justice - description: department-Legal-description + description: department-justice-description color: "#701442" roles: - ChiefJustice - Clerk - Prosecuter + - Lawyer diff --git a/Resources/Prototypes/DeltaV/radio_channels.yml b/Resources/Prototypes/DeltaV/radio_channels.yml index b7853e3675f..7723f6fcc25 100644 --- a/Resources/Prototypes/DeltaV/radio_channels.yml +++ b/Resources/Prototypes/DeltaV/radio_channels.yml @@ -1,6 +1,6 @@ - type: radioChannel - id: Legal - name: chat-radio-legal + id: Justice + name: chat-radio-justice keycode: "j" frequency: 1420 color: "#701442" diff --git a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml index 76e33757e85..a5b87f254c8 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml @@ -67,7 +67,7 @@ - Common - Command - Engineering - - Legal # Delta V- adds legal department + - Justice # Delta V- adds Justice department - Medical - Science - Security diff --git a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml index 5b7d3f9bfb4..d52480d08c9 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml @@ -58,7 +58,8 @@ - Theatre - Zookeeper #Delta V: Add Zookeeper Access - ChiefJustice #Delta V: Add Chief Justice Access - - Legal #Delta V: Add Legal Access + - Prosecutor #Delta V: Add Prosecutor Access + - Justice #Delta V: Add Justice Access privilegedIdSlot: name: id-card-console-privileged-id ejectSound: /Audio/Machines/id_swipe.ogg diff --git a/Resources/Prototypes/Maps/shoukou.yml b/Resources/Prototypes/Maps/shoukou.yml index ee835d957ad..61c16a04ad3 100644 --- a/Resources/Prototypes/Maps/shoukou.yml +++ b/Resources/Prototypes/Maps/shoukou.yml @@ -66,8 +66,3 @@ SalvageSpecialist: [ 2, 4 ] MailCarrier: [ 1, 2 ] CargoTechnician: [ 2, 3 ] - #Legal - ChiefJustice: [ 1, 1 ] - Clerk: [ 1, 1 ] - Prosecuter: [ 1, 1 ] - diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 83534425097..1609969f7e6 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -23,7 +23,7 @@ - Clown - HeadOfPersonnel - Janitor - - Lawyer + # - Lawyer # DeltaV - Move Lawyer into Justice - Librarian - Mime - Musician From 99c365ed6b8edc8794afb5080c391a44d67f0a99 Mon Sep 17 00:00:00 2001 From: Jeff Date: Mon, 4 Mar 2024 23:54:22 -0600 Subject: [PATCH 11/94] Missed one --- Resources/Prototypes/DeltaV/Access/misc.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Access/misc.yml b/Resources/Prototypes/DeltaV/Access/misc.yml index d2201917154..83a88754ebb 100644 --- a/Resources/Prototypes/DeltaV/Access/misc.yml +++ b/Resources/Prototypes/DeltaV/Access/misc.yml @@ -46,4 +46,5 @@ - Musician - Reporter - Zookeeper - - Legal + - Justice + - Prosecutor From 5438a6fc58ed56d3de2b59395284772d3ded5cbb Mon Sep 17 00:00:00 2001 From: Jeff Date: Mon, 4 Mar 2024 23:57:15 -0600 Subject: [PATCH 12/94] Adjust lawyer --- Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml index f89f39308ce..4105f02b192 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml @@ -12,10 +12,11 @@ time: 14400 # 4 hours startingGear: LawyerGear icon: "JobIconLawyer" - supervisors: job-supervisors-hop + supervisors: job-supervisors-cj # Delta V - Change supervisor to chief justice access: - Service - Lawyer + - Justice # Delta V - Add justice departement access - Maintenance - type: startingGear From 9720f910c3e8abe1a65adf8b75f2fc605edd0381 Mon Sep 17 00:00:00 2001 From: Jeff Date: Tue, 5 Mar 2024 00:27:15 -0600 Subject: [PATCH 13/94] update lawyer icon --- Resources/Prototypes/StatusEffects/job.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/StatusEffects/job.yml b/Resources/Prototypes/StatusEffects/job.yml index 782cacfdd52..f95b81e118a 100644 --- a/Resources/Prototypes/StatusEffects/job.yml +++ b/Resources/Prototypes/StatusEffects/job.yml @@ -120,8 +120,8 @@ parent: JobIcon id: JobIconLawyer icon: - sprite: /Textures/Interface/Misc/job_icons.rsi - state: Lawyer + sprite: DeltaV/Textures/Interface/Misc/job_icons.rsi # DeltaV - Move Lawyer into Justice + state: Lawyer # DeltaV - Move Lawyer into Justice - type: statusIcon parent: JobIcon From b7df6f25ca3eedb58613b0ed22858d6e02b387bf Mon Sep 17 00:00:00 2001 From: Jeff Date: Tue, 5 Mar 2024 00:32:19 -0600 Subject: [PATCH 14/94] temp to fix --- .../job_icons.rsi/{lawyer.png => deltavLawyer.png} | Bin .../DeltaV/Interface/Misc/job_icons.rsi/meta.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/{lawyer.png => deltavLawyer.png} (100%) diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/lawyer.png b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/deltavLawyer.png similarity index 100% rename from Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/lawyer.png rename to Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/deltavLawyer.png diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json index 395fd3a3eff..40888ea5a3b 100644 --- a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json @@ -35,7 +35,7 @@ "name": "Clerk" }, { - "name": "Lawyer" + "name": "deltavLawyer" } ] } From 9a1bf9e6b6a376a1e22df346996f0b9f83541347 Mon Sep 17 00:00:00 2001 From: Jeff Date: Tue, 5 Mar 2024 00:33:13 -0600 Subject: [PATCH 15/94] revert to fix --- .../job_icons.rsi/{deltavLawyer.png => Lawyer.png} | Bin .../DeltaV/Interface/Misc/job_icons.rsi/meta.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/{deltavLawyer.png => Lawyer.png} (100%) diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/deltavLawyer.png b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Lawyer.png similarity index 100% rename from Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/deltavLawyer.png rename to Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Lawyer.png diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json index 40888ea5a3b..395fd3a3eff 100644 --- a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json @@ -35,7 +35,7 @@ "name": "Clerk" }, { - "name": "deltavLawyer" + "name": "Lawyer" } ] } From 9627350fa891452178b463717cd143e0b6733af4 Mon Sep 17 00:00:00 2001 From: leo <136020119+leonardo-dabepis@users.noreply.github.com> Date: Sat, 9 Mar 2024 07:48:45 +1000 Subject: [PATCH 16/94] add airlock texture adds justice department airlock texture. Still need to do the yaml part of it but the texture's there. --- .../Doors/Glass/justice.rsi/assembly.png | Bin 0 -> 1645 bytes .../Doors/Glass/justice.rsi/bolted_unlit.png | Bin 0 -> 144 bytes .../Doors/Glass/justice.rsi/closed.png | Bin 0 -> 1763 bytes .../Doors/Glass/justice.rsi/closed_unlit.png | Bin 0 -> 144 bytes .../Doors/Glass/justice.rsi/closing.png | Bin 0 -> 3014 bytes .../Doors/Glass/justice.rsi/closing_unlit.png | Bin 0 -> 432 bytes .../Doors/Glass/justice.rsi/deny_unlit.png | Bin 0 -> 321 bytes .../Glass/justice.rsi/emergency_unlit.png | Bin 0 -> 588 bytes .../Doors/Glass/justice.rsi/meta.json | 195 ++++++++++++++++++ .../Doors/Glass/justice.rsi/open.png | Bin 0 -> 760 bytes .../Doors/Glass/justice.rsi/opening.png | Bin 0 -> 3247 bytes .../Doors/Glass/justice.rsi/opening_unlit.png | Bin 0 -> 284 bytes .../Doors/Glass/justice.rsi/panel_closing.png | Bin 0 -> 445 bytes .../Doors/Glass/justice.rsi/panel_open.png | Bin 0 -> 315 bytes .../Doors/Glass/justice.rsi/panel_opening.png | Bin 0 -> 470 bytes .../Doors/Glass/justice.rsi/sparks.png | Bin 0 -> 697 bytes .../Doors/Glass/justice.rsi/sparks_broken.png | Bin 0 -> 183 bytes .../Glass/justice.rsi/sparks_damaged.png | Bin 0 -> 184 bytes .../Doors/Glass/justice.rsi/sparks_open.png | Bin 0 -> 175 bytes .../Doors/Glass/justice.rsi/welded.png | Bin 0 -> 296 bytes .../Doors/Standard/justice.rsi/assembly.png | Bin 0 -> 1369 bytes .../Standard/justice.rsi/bolted_unlit.png | Bin 0 -> 144 bytes .../Doors/Standard/justice.rsi/closed.png | Bin 0 -> 1488 bytes .../Standard/justice.rsi/closed_unlit.png | Bin 0 -> 144 bytes .../Doors/Standard/justice.rsi/closing.png | Bin 0 -> 2683 bytes .../Standard/justice.rsi/closing_unlit.png | Bin 0 -> 432 bytes .../Doors/Standard/justice.rsi/deny_unlit.png | Bin 0 -> 321 bytes .../Standard/justice.rsi/emergency_unlit.png | Bin 0 -> 588 bytes .../Doors/Standard/justice.rsi/meta.json | 195 ++++++++++++++++++ .../Doors/Standard/justice.rsi/open.png | Bin 0 -> 729 bytes .../Doors/Standard/justice.rsi/opening.png | Bin 0 -> 2825 bytes .../Standard/justice.rsi/opening_unlit.png | Bin 0 -> 284 bytes .../Standard/justice.rsi/panel_closing.png | Bin 0 -> 445 bytes .../Doors/Standard/justice.rsi/panel_open.png | Bin 0 -> 315 bytes .../Standard/justice.rsi/panel_opening.png | Bin 0 -> 470 bytes .../Doors/Standard/justice.rsi/sparks.png | Bin 0 -> 697 bytes .../Standard/justice.rsi/sparks_broken.png | Bin 0 -> 183 bytes .../Standard/justice.rsi/sparks_damaged.png | Bin 0 -> 184 bytes .../Standard/justice.rsi/sparks_open.png | Bin 0 -> 175 bytes .../Doors/Standard/justice.rsi/welded.png | Bin 0 -> 296 bytes 40 files changed, 390 insertions(+) create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/assembly.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/bolted_unlit.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/closed.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/closed_unlit.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/closing.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/closing_unlit.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/deny_unlit.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/emergency_unlit.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/open.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/opening.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/opening_unlit.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/panel_closing.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/panel_open.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/panel_opening.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/sparks.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/sparks_broken.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/sparks_damaged.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/sparks_open.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/welded.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/assembly.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/bolted_unlit.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/closed.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/closed_unlit.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/closing.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/closing_unlit.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/deny_unlit.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/emergency_unlit.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/open.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/opening.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/opening_unlit.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/panel_closing.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/panel_open.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/panel_opening.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/sparks.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/sparks_broken.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/sparks_damaged.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/sparks_open.png create mode 100644 Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/welded.png diff --git a/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/assembly.png b/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/assembly.png new file mode 100644 index 0000000000000000000000000000000000000000..056fcc5c14180f45674a4b128b840a76a31ef1f4 GIT binary patch literal 1645 zcmV-z29o)SP)!NdSiF@JuQxt>)LH z;5!2FVH87%%FMQwvWq!%jh{!VrFe*oUft_D#y~-}8Q|+9o@Ewyi06sZTaG1ok9dTY zE@~=<%0ep35u%e$i7Zwz1O2ti%oCDdLEsS6K5r;wB;0T**=% zr!@f^8KjVe1O*jrLWhGmWs_#s*_UYemQf}TqrZhJI5~bjqkKyV+Z*If7a)OG7;K;Q+qHe3EO&1vqN^jb@c90TDU;PR%W zDF?vSE-?0N$y{zo0a|`d13oT*!8|a05A?5lvuf_+{0Ycy(-YkRhetq^>cbm<+Gc0@ ziLXu;00009a7bBm000id000id0mpBsWB>pJqe(ghw%Oc5L5H zw=4?ypa19`>5dooqlYCP5%Z248XB@p+o7-jZ34)3K&L$M(z{$Y9ENR~d%kV=frEXe zOUm%bh-*tZttZ@q_T1M`FW=QiW)N$YnuKNr0%}53Qer!{JHpZxW$cCb4}u5VGCult zz4q2}a?!K8no;xlteRiRw%qE=t9rS1N{NM2p45ee%A0%gl@FkU0RSnAk}l;^fm&s) zioR0=cJj~<-MnEe0)WSAx3}+H`Eo9R-mI`tuGrbIn`btJ#^j9%V4xWv(2OV1o3;76 zue}mlAY*AZ0C3}A0))5--t!2Aw{+WiYB_IqijSFF+TbS5D00%U`*9e7MDGv%q@Ne& z(-3z7_~z4)>)?^y=)=Wg@oyY&ECL(Gn~?wZW!BOgtE1S;ICz2%MKB((k<2a*=h?rC zG6^#i>Av<6pfwF)^We3y)niJ3C7*M4(i! zvIuBt*t`O@3GlBc!8nYfWilCJV0a3&-Y7wQqZF^Fap+Q2l@=El>G#J@(C1GbVPlqp zTekNawveNIHWgOat7pLvkGqLh8*hTp$w6#DOMC+lG*<|!CLS*s@{x~6_3uf&bDsJ$ zPj~Oq2OGu{ipvq1)A-}_K1$XaPvuVc0HHW;-o(3eZjSDEX}9mBj=(rwxN#P)^=hJB z3Q%&mc+4`Ns0rGwL@bwTM=uQz57WHXD$ywQYh#eyBRLGu#g*V&(X(9vUn^r0LZx&2=R^BZcntE<2tx; z$ch)9aTx)GOtomch+HcOtb^y`dbiKdYME7m>yIPvJ^A*h2UJNaI;g(&%(+zY^sk34 z?V+yu1=9(jV07FUxiR3BNoGgvcl(~+i(bad7c{-^nKyo%PZy>?o35R&y7l+C1>rXQ z@L10BHbi;0`Zu^(cb1QT`$OfIWKreDVVnJ!*gc&^9G(7{*y&~|z}p{aTK$-G5^64s z2Mpd3cDkLSV4kca&t*CRB0gdOqLpq|1>%!S^nmlBtkXxSDBo_a^XIhwN1M&!_0#Hi rfb(1b8AAv5MyjcWq|{gC?)Yg=ABppUv000000NkvXXu0mjfO|dJ^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/bolted_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/bolted_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..6857f2a24154b06497367e4b2474465b750393e2 GIT binary patch literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJa8DP!NdSiF@JuQxt>)LH z;5!2FVH87%%FMQwvWq!%jh{!VrFe*oUft_D#y~-}8Q|+9o@Ewyi06sZTaG1ok9dTY zE@~=<%0ep35u%e$i7Zwz1O2ti%oCDdLEsS6K5r;wB;0T**=% zr!@f^8KjVe1O*jrLWhGmWs_#s*_UYemQf}TqrZhJI5~bjqkKyV+Z*If7a)OG7;K;Q+qHe3EO&1vqN^jb@c90TDU;PR%W zDF?vSE-?0N$y{zo0a|`d13oT*!8|a05A?5lvuf_+{0Ycy(-YkRhetq^>cbm<+Gc0@ ziLXu;00009a7bBm000XT000XT0n*)m`~Uz28A(JzR9Hu?S6fURWfVR$%yw9Im%>tZ z#oDE$Af*XyYKT^A6ctl7u`vxMHokg^`lLSSQ;o(nHjTbn-+VERP4q!Av0gCs(xz=B zY5}`7i%r>H7Iw=5yDaR$UYzeA&g|^$?1D{CGMSnGT)yv||1NcRcNa;Q-rims9Ua9d zWwTlFE*6FAwumH2)ZE-GVs&+O(b(9S_*NJ^5{b~`p@L{Ub;C;o0|VsO9X7SLngnhp z5|o^srQzXWdUW$LeSJxz=XZI8e(18irq6?|8DV=`$3ns&Aq@@=76A^WuU_z}De<&M z0iP;tj$g=_1lIDi>KC*e{TBC#N+{!lN}f`SE8@RlL#e$M zXssAtRiP)gX!MV%Q zxP!d$Pz$|sf0GysP7w?mfy8XqEkHUsY@ca@4kQK9T+V}dq)3Hg<{QQiT zN+q?_Y*MR6V0zw|uGJ(uanTdM5!Lu{_rH3KtI3rV1ni=!YGQFN?l0t)^LW=psi8z1 z#NY@2R&#W}69Htb)q9(+Wf$iBc-t}3+1z?LiCC7W!q2e+u+qWXbnqD7cCYoU7gZQm zbf+T$21gK(um(f+T!G-m`kIxnlXptSoYYusRx`g#2Ss0%jegc!v;XK)*4HRoie6Ur{blP zV^g$!?_8^$#FeoOJz0MTu`QE`FJGrvGE_kpvBH$5=(%s->Fev$vqEMr8W|ZOEJM(9 ztgwG=zUe%0(A$p---Ynpm=6xW=N2+iQ_cnDX80On2NUo4j)a^XmWCr{(R~@ zef7)<@oyKU?Ga-nV?^%=H=26%T`Cz5YAg9GJ9aiwu*Xd_U%nFrE^MZ@U6nHdvBKfB z87uTzr}5oyyn_2nvCJ_*a*-}BrRafuhS4f`RCU#b#z#}s6Y){3P@X}xF@RXqRmyeG z_&7c6(s#&ygTeIBk{Qc!Z)I>%#+7`uRu_D(Md_egIS}EaFTK>>-cAwy$#ry4i~e8H z1=fZJsm{#Y-tI)=xeX!m%Pu;W{g?1<7Yx1*9T?*Edc|NYb+Tb?j)94v(zLbLG^8otXiG=lxxE2YvWpLP6+t_5Mtra9>Du~Xj zR*|(xK#$C=c5YwuRlA?Un+tCcuD?!vxc|K`j%bpUsiWei%h%$WOTQm?#KU~IZY*}A z){Y)u=uW>PlPs3f9}gXP8}G8sh%0~-FHXLYp+nEU^-Cm?9{O^qa6Ruf&f^Y(-SCsM zb5-vKQ$;0v?uVaqXJQ$R!TEH};iT6FI>q^rE3uvGGl&xr>tO{Xs>OgWz=18}f+$Gnm4H}}Tnxf( z3|{R}YHhD|aAk0DIkjHTaZiLKlg8=jc8lL{EOyrG`G4STl?ehIlk)%o002ovPDHLk FV1n3VX|ezS literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/closed_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/closed_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..c78d01c42d084dd5be78e8a33a599a90cc86107f GIT binary patch literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJa8DPP>^Ss#&mpghvZkX~#s0-h3N2b6`K?}O)meqDd+l#VI$hWM`6MlQ q&#%(rqf#%I&Hk(pG?9U!&gT+u#1#>y1s3nVf%u-TelF{r5}E)5_cy%& literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/closing.png b/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/closing.png new file mode 100644 index 0000000000000000000000000000000000000000..fd27f05b3a2cc24421e7756fbdca2d77b94cac00 GIT binary patch literal 3014 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 IM6N<$f(|R_lK=n! literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/closing_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/closing_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..2a71f76d5d0c792fe84b136920ab32a386dfc7a5 GIT binary patch literal 432 zcmeAS@N?(olHy`uVBq!ia0vp^2|(UR&i(je0cL#ec*0}-@j8|{(iQzwzWT#=l!&5f jT;0h840aHhFykh_!rG~;5AeP$1@S#y{an^LB{Ts5_a?jl literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/deny_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/deny_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..7c56263f83958a17893b3db0b04ce3078c15cea0 GIT binary patch literal 321 zcmeAS@N?(olHy`uVBq!ia0vp^2|(x;TbZ%z1lzVbEa*5x0l` zFLCLtQfk)goBm*9Wqa5)W5IyH?gg7O+Vq@#{gzqI_j{ICbSF<}<0|vo?Y_6yOll7; z+AsO(r`@v>Kf7}$KR*umYV~i&zP&s*_xJv-=38t1deYzEyLbMqy6^o$Z`IbavsGXD zr!(F8`6z;|L6RYjVFqIYc7~Z}LvrZvRZ(vk567Q>-*~3QX2MKG<^wzo#tdf|3@{iQ zO7s8d*3Gv+{xi?r|HRuDl15mS!8LAhWr_IppL3FmClFnFq60fUCY M)78&qol`;+0G5h<`v3p{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/emergency_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/emergency_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..817f2fb3f95c53ee8720a7c5be418b6208a6a7e6 GIT binary patch literal 588 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/opening_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/opening_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..84933bd5ed9cd40a972aee792b227f9aec95f233 GIT binary patch literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^2|(X)s_s z#KIwr!I-V$V11^#dUpKLjjy-9DY|#Kuw+Jjzzl{&rWQ^CH3uAwt;hGhNWR~>|B3$l qhyP2a-~C|qG6v`^C}^l(vC57yE3)EC^YOwKkf5ilpUXO@geCx+nr^EA literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/panel_closing.png b/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/panel_closing.png new file mode 100644 index 0000000000000000000000000000000000000000..db7be0bc4a0ec0b2bc29e8718fb6b71796846f16 GIT binary patch literal 445 zcmeAS@N?(olHy`uVBq!ia0vp^2|(qk=b{5eiK-()1~xQ&@cMV`(mao8yQ?TZq;#^Y}m${ zacWZ!Yev-i>$j948lYsxftl|YY`yljZkp{(pFL*+-lj#WWzI6YweB*{ESZG)8eLCP zH-4D=_wruJUKQWqugks*3w-~bxAmsS_S>R@6K&4#1!`fty>^f8^xkc+O+xqazTJA; z{=7~2>uGDRIhyR%SJ)ONH}BrkKUz=f@~-S!d-avVtb5`KJrkcF_ZOUaf4N)v?bouY zpX0AZna`Cr-@$dKByUdGcPkF5{Og%j`&-%%FXZlavSVWw{8-KzzB@7SM0TXvt!o+A zif+H$q2jsc@9*!WwR0M*e5Y<-(ETyu&`qBj{lx9nl5Os{*Qk05m8bu?%XoF&`KQ?? l*%zfe7FQS8+W~`WRsIyAi(3!btSA5lf~TvW%Q~loCIEIM%9sEE literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/panel_open.png b/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/panel_open.png new file mode 100644 index 0000000000000000000000000000000000000000..24eb2aedc2248aeb772b38f63ff992254e7aaec0 GIT binary patch literal 315 zcmV-B0mS}^P)G_@Zv*NK(#C83< z0hCg#mPY_q%Og#e`P2l!*GQEjpT`0MYBKbMv^%3TIE=g7KF`WXCR28pn>(x2n zemoXytpJ?bfcIZ;wOEjBHdt%rI!S!%PGhZ=2c^1AoGrxJR_5RoDx&OEP+E*gAHf&mPbH>ZE8FCH9e&*rpCoP%1 zIy_fR`1DT4EhW}ImG2+Fy>#^EcBOlIu{N4r8M|lHdv8DdMa^XX`Q)41s%D;5@l3t_ z>U!DiCu(!NfiicFek|lsbn*16WPNgF)9u86nlDcO+<9uZb*sRm>zlTKo#3wDtk_cV zGUiQg0fX*;t18(yxo?DbZh3Nv5#oCg`Gddm{r7*~nV;{o)~0;#=kiD}oLj`YgzrYV zCx61j+EYJuRBRcZ$AIaEWtl7E0M--(oM3v-T6o|50rvB z?(X|$_9K~q!b>Jme`5^XKVF&j%`2QtMsN-@c!MQ;uYX{&xPXV-MV4h*a7^*H)mTo% z^duKBlw8QrI7#Az6a!+!k42gRM*{jVXw(2^)BtAG0A@rO5W6r+TTo*dR0c>itn&u= ziYhf*#29dhKzXbye)sb`x`T#9jF|@skRQx^J~1)&r}u;k?=m8#VH_qLszE1c7I|*U z-vi17+kNaSpCz%9yQ#rS&sN2x0`#dRVZ$Zo3 z(YozxD(tDJ*Nd^#9ngM11*`#hZL|qqUX-aA#5S}G^!n=WLLU@GQ4~c{6dSK|xP5Tx z!-H@vnhtn%y49-Lc3NyR!WG{&^FjpmIbAy+o5nPrx)V}}E%fz`bB+BtcI@^)8^rTf zBx((Ky3EXU1aLM2IGxVm^KA+58-UdY;QHA(FXNaPN!aD?zV8}<6&DioA6qwm%&S`B zG(?rf)v;@BC^IYu=$f%ZGhhqXw5SF!qXsa;V!%*uXSl{qZh&O*G5ePMUQntINQ83i z$upoRb}H)fv5TKDu*ZP$-hvmY3!Atq6ENBh(WYFFM67|7l05p#?E1nmayZKasmvEs z4%uF#@2=U$hCc&#<3^>qaoRUjD5t(Q@!@5>eLn%YPa&y@Wk6F&Jf;Amr=S&p`TF~H zKQmyzZBbK@-3j_NfaCqFrZteLVgLD`ViBgsl+FQ!832*%0DhkaTq4i015y-4Q4~c{ f6h%=KHvsSpwHV1KmpgiI00000NkvXXu0mjf++aJ5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/sparks_broken.png b/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/sparks_broken.png new file mode 100644 index 0000000000000000000000000000000000000000..fb5d774588ae44eab5608571cb6aafad7375e158 GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^2|(DFD66%%n7hj|c25u0=Hbzuz>&Md dbBcZ?)Aw7<0^jOhxdW|Y@O1TaS?83{1ORW&Jrn={ literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/sparks_damaged.png b/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/sparks_damaged.png new file mode 100644 index 0000000000000000000000000000000000000000..f16a028dee5bbe41a7f4e35f686043e8a112ce4e GIT binary patch literal 184 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeK3?y%aJ*@^(YymzYu0Z<#e`9lQK{p_au_VYZ zn8D%MjWi%9!PCVtL_+fI!HvAl4m=D8Hh=XH6ZQR;XyVo{y01gP^_0k+pXD$8l*-N4 z&iUk!V5<=?maE{?*yyS)-udN6;H*Pi5*L(-Fs)pAdDY$x8SUGCM{GTG-~v& dN}IerjGt7Q1>7HnEC$-e;OXk;vd$@?2>`@EK-2&L literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/sparks_open.png b/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/sparks_open.png new file mode 100644 index 0000000000000000000000000000000000000000..630eabb976ecf11fa59ba29f03502b02bde399aa GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^2|(GM)~O;5D{Ad0LZe;7N97KJC6BX-upNVgWUu;=WLfz+qP_d4j_bJ3vh=hfa5r9 z0qVN81qdO4*#ozUc?-;6LK?t17pG~m0|2;<_}}aJ8%Xzkw*de?p>!O_N2;HSWO<%5 ub^zoJEX!gGaL3n-QrC61fn;4*wm#k_G(h}nBOLz#0000!NdSiF@JuQxt>)LH z;5!2FVH87%%FMQwvWq!%jh{!VrFe*oUft_D#y~-}8Q|+9o@Ewyi06sZTaG1ok9dTY zE@~=<%0ep35u%e$i7Zwz1O2ti%oCDdLEsS6K5r;wB;0T**=% zr!@f^8KjVe1O*jrLWhGmWs_#s*_UYemQf}TqrZhJI5~bjqkKyV+Z*If7a)OG7;K;Q+qHe3EO&1vqN^jb@c90TDU;PR%W zDF?vSE-?0N$y{zo0a|`d13oT*!8|a05A?5lvuf_+{0Ycy(-YkRhetq^>cbm<+Gc0@ ziLXu;00009a7bBm000id000id0mpBsWB>pIk4Z#9R9HvFS6fdLK@>h)wioC{C~_%; zB1vt8L`@6{nixgJM2#jsYWxMh^5n1JQGb9j_~_-u2MCEVAtXeD5-JyoK%`oX zQ^~j_Nzl;HK)&Vc@e=tMTMfa$zyL(`f#Xe0WuTvHYmi-EhmnyHxZ1uAFF&i6Mjo6E zlCf8d9$T!7O$AEk(d|>VE@$#8G>83U!n3IYSVds)M$%CPcqN%NB6VJ<_12Wfwsv+Q zx4A>wb-ulR*B0~%)vyTxRG3)!Wx(!BG!ha)f0?Ii`*zqKUZJ}!0_=yDSVY8(>*(k( zUACb&a|VJ8L&Qdh(YA+qjtWj>@KPf@yigA!iS1%Z!k-xl5trFQ+a4TrY8-WcY|!m` zP+>L+f&VFv3FMXHk??d(ARO5LPN>GbOrV;FIL5|Xjs*@J3Eo!OE%Xovcu(;#LgD*{ z-qQ0zJPolHV83`8G7QFAv{A7HVwm5*&YF5_b`+Z#$3785v>|`}Q~+g$da7t82uPIE z_gw{U23jFKR=Mpm+utmgK-5LWgdBntLX ztqx1jI2uLi>gpn7=0<1fLG&*~RaID8T7nO^Cg8>0=YVY#x#vs-Vr|CE?pcjMOSc}G zjmk>UJk^c~Xv#Tu#fXEuCY8#U_2W+y^t+$_$ul2wP(SN40M4j6=$;Qlx>R`qahn5x zo8#mj{Q2o=xa`%dZ$D+QuhRv$92Opt^{~1O_x*9x==lA9=$EBca{qaqjdfIf@#n)X&_hK{0o8ZGxjRwQD7fk5F$`;_166E8 zu^#YuL^noxT{{fJQG8To*UAAx0N0y|UD-X1YRKF4;LTSgQ7zn94WEqvHm!!ZJ)OJ_ zn8RpW#%niz;02M71dQW~<#%iJMVrmy?Z@in%lfTf#)yFr*Gl2_E9XX| b^pN`tggBXyxtD+e00000NkvXXu0mjf4R4AJ literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/bolted_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/bolted_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..6857f2a24154b06497367e4b2474465b750393e2 GIT binary patch literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJa8DP1uy!EP)!NdSiF@JuQxt>)LH z;5!2FVH87%%FMQwvWq!%jh{!VrFe*oUft_D#y~-}8Q|+9o@Ewyi06sZTaG1ok9dTY zE@~=<%0ep35u%e$i7Zwz1O2ti%oCDdLEsS6K5r;wB;0T**=% zr!@f^8KjVe1O*jrLWhGmWs_#s*_UYemQf}TqrZhJI5~bjqkKyV+Z*If7a)OG7;K;Q+qHe3EO&1vqN^jb@c90TDU;PR%W zDF?vSE-?0N$y{zo0a|`d13oT*!8|a05A?5lvuf_+{0Ycy(-YkRhetq^>cbm<+Gc0@ ziLXu;00009a7bBm000XT000XT0n*)m`~Uz121!IgR9HvFS8YoaQ4~JAj_&HNo35!@ zqzNmgAVLTgMOhhCP(&CM{er&sL;6@hAfi6@^1%WlFhK;Ve8H`D3oP=rw%qk)r&hOl z?r_GtcV=f+3p%ju%suBk=eg&eJLg_sdwYAH4C(6XqKSzKJW@8B7619XQ2i6}`FvDc zTPv{I+S+Jxa#B2N96XUo(AnlqG5B&eOnrTQ6g3=n*VkJFzAY_L>c6sB* z!_31<@X_RV8}{K?ogfi1oV^6W-7w(qGk%EeN80hiGiS$+y%FLcbes{kWfE8hRoGU= z05-_U;>QbWU1kl(QsmZ&I=XqZM%03rFea1W{Ur!sRx)cZFxD?Do7=TiVG@YNnG^*6 zmtgsKL?DyR{WH!xB2dcrqEv>C1l(o_9qSu+1xt-%`KS)orpCvH1v5ktd8VwF$8Haq z-wXa6v%idmv0_-zSs8f!G*v)OO|zLL&w}Yk4y)?H{ObgS%PM{2E}RsSk$%!b7X3YPL>-Tve#s=@MPV>^6sr3`F@~(rt1NF zA;K*X2vAE)3nh$S&ZvPpCna-Mha^ISdgpT%SNkzYjwVZ-9*oa zh?2Q2ENcl4U5q-OVmKo7d@S==6=JN<$u&pQV^`{lTe-Cj)PA7q-AHW5)?cjg za6j;x?ceIfnGnJa1nbS>)pobj4S~tnaP>^Ss#&mpghvZkX~#s0-h3N2b6`K?}O)meqDd+l#VI$hWM`6MlQ q&#%(rqf#%I&Hk(pG?9U!&gT+u#1#>y1s3nVf%u-TelF{r5}E)5_cy%& literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/closing.png b/Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/closing.png new file mode 100644 index 0000000000000000000000000000000000000000..2a33b5d48af43b76c044ea70b1f28fee76866d9b GIT binary patch literal 2683 zcmV->3WW8EP)!NdSiF@JuQxt>)LH z;5!2FVH87%%FMQwvWq!%jh{!VrFe*oUft_D#y~-}8Q|+9o@Ewyi06sZTaG1ok9dTY zE@~=<%0ep35u%e$i7Zwz1O2ti%oCDdLEsS6K5r;wB;0T**=% zr!@f^8KjVe1O*jrLWhGmWs_#s*_UYemQf}TqrZhJI5~bjqkKyV+Z*If7a)OG7;K;Q+qHe3EO&1vqN^jb@c90TDU;PR%W zDF?vSE-?0N$y{zo0a|`d13oT*!8|a05A?5lvuf_+{0Ycy(-YkRhetq^>cbm<+Gc0@ ziLXu;00009a7bBm000XT000XT0n*)m`~Uz5u}MThRCr$PoZoL$MHI)+wzu7d{s4-! z6w>k|tx#em8WJ=b1+57hMPq`|_~5gzKKbZhz@ra7Y7FX=;sa<(FiK*Ypae>&&`N{~ zg@PrtKzI9Vy=Sgxdv&3&1ugUkZb~|#fNt;LH4(=;lWG}4)09+ z|4v2=a^dQakoAdwOI^>EmM|u^xawtXV|~>$bgaw3?EE53KbjXBlG4(;wgJ{O)Qc`x z_0lBn!s?WtMkWP#f6qpdge0_J@Q23!5!^azHciG!gyHDPD@7Q2_IIU4=AwwcEv-Te z_C_qWwWyfHLbgc2M=xxI51(BRt{TpxJ-4uw!XK3|ms)gORmY1P7ZavP!0r1u9o0rz zX<7N<*BHd1k7X?Y9{(gYN?q7v}CHc5|T5Yq!y6?TnksTV2`6-x6-tTZg=$O zU`-ll-@`P4xIZFRJBJ=GyoL8TS6WnDt{Fd!VX>(tj7coy6^5WBf=>u;V0>`Z{NPv1SB1F&dcR;;B_9%K>PWvH~}Z71({*R zrIs-6o|~=E(YFTRe(_F_4J|4ruJlGmW<&^9{2YKmxRjfQzR?z#SSmgjaWw}3E(Cjn zE?8Iv(UK{N+u&I4dRdGsEjq4BR9r3PnCWyHQXe#J7whu2x(4_(`zPe)ml8W0elOjv zOoU4<7*NhFS_MgWfUUU5%+9(rjP%aH^txTa9DoH63EF?Hjk&0F@p}f)6+6`58(zsf5JFrEc1LE%bMY)q}X*U#CKv?(|F>g!U zxTxAnEM(WtF;tWcT6irU0O8*Mfxh-4W0r-gL#rSr`j60uR5Qjb66Uh;a@}f_gUhj#r*-?!i1g1&u#FV8S2yC#6mXpwzxW?a!~`ZaT1h+ zuZss>r(KRJ z7cmK|)5C1aTd;Aw@+O{mx{Y~HimRhiE+w2F$VAm5e;Sq#cf#U}Y%v7Mw^UrOyv`FJ zb{oglQ7ISo$Za;&qS}gxQkQpb@E&CIOOQzg(}4}Iyv`GkwrnbY{qPxNF9r7SxH_V6 z&z?OCt^Sb+y$3z}Cx&lD)-o|w>h9zIf8JJN;&tMB=#S^+>O$!!yUM4|(s!aD6oO^P zjvd0AFKfVSwspu{{QJtO%S8fhYcXMJS3x#|k9DCZ{@S%`aPGAs`1Y-@Y*!yzpUlO- zT^AE(!5d0qYYh*2*drP%* z|37alF*^<~KZ_uq58%ayS6=xH81uv<@0p7i;l+jq_++sG)?aQc>5P@=h{7E@5M-e6 z9$(+3+3CnyRC56L|MRvI^Y-!C!m|jGY$>?Z!%Z*Ut&5)cFzY#b;9$y1`u548jDbx`2Qi7q9m|wp+gemkY!ClwawKT#l{fLk^9diF4|q-* zS4UJXYC!glsacV9ax7P(#l#y#!6&B&#Xx)x;5`ukj_Z}zdE)sHA~&30i>f0Emj^<& zjZ+d#w5Wowx|=BB^!=oT1dvai{=tn|HpW_&CthZ8zq~CSCR}8lxzi;4IaK0kF=Z0# z#CRG!@~NwWZNn?C^2Bo%7ma>-TRL=H;-Ebcy_%E+8jdQ_V#-7|1|QiaN0PR^@+QZQ z{K%046IX``7g=bK6-n^#1T1m1m@+B&!kioB%UW&Q)3L#AZNUT5Q&Z}1tWw<(DjiYm p>6}ZpcydTb)e>cxrnYi>`oA(9fB?(0zd8T_002ovPDHLkV1kIOCo=#5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/closing_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/closing_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..2a71f76d5d0c792fe84b136920ab32a386dfc7a5 GIT binary patch literal 432 zcmeAS@N?(olHy`uVBq!ia0vp^2|(UR&i(je0cL#ec*0}-@j8|{(iQzwzWT#=l!&5f jT;0h840aHhFykh_!rG~;5AeP$1@S#y{an^LB{Ts5_a?jl literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/deny_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/deny_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..7c56263f83958a17893b3db0b04ce3078c15cea0 GIT binary patch literal 321 zcmeAS@N?(olHy`uVBq!ia0vp^2|(x;TbZ%z1lzVbEa*5x0l` zFLCLtQfk)goBm*9Wqa5)W5IyH?gg7O+Vq@#{gzqI_j{ICbSF<}<0|vo?Y_6yOll7; z+AsO(r`@v>Kf7}$KR*umYV~i&zP&s*_xJv-=38t1deYzEyLbMqy6^o$Z`IbavsGXD zr!(F8`6z;|L6RYjVFqIYc7~Z}LvrZvRZ(vk567Q>-*~3QX2MKG<^wzo#tdf|3@{iQ zO7s8d*3Gv+{xi?r|HRuDl15mS!8LAhWr_IppL3FmClFnFq60fUCY M)78&qol`;+0G5h<`v3p{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/emergency_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/emergency_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..817f2fb3f95c53ee8720a7c5be418b6208a6a7e6 GIT binary patch literal 588 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/opening_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/opening_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..84933bd5ed9cd40a972aee792b227f9aec95f233 GIT binary patch literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^2|(X)s_s z#KIwr!I-V$V11^#dUpKLjjy-9DY|#Kuw+Jjzzl{&rWQ^CH3uAwt;hGhNWR~>|B3$l qhyP2a-~C|qG6v`^C}^l(vC57yE3)EC^YOwKkf5ilpUXO@geCx+nr^EA literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/panel_closing.png b/Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/panel_closing.png new file mode 100644 index 0000000000000000000000000000000000000000..db7be0bc4a0ec0b2bc29e8718fb6b71796846f16 GIT binary patch literal 445 zcmeAS@N?(olHy`uVBq!ia0vp^2|(qk=b{5eiK-()1~xQ&@cMV`(mao8yQ?TZq;#^Y}m${ zacWZ!Yev-i>$j948lYsxftl|YY`yljZkp{(pFL*+-lj#WWzI6YweB*{ESZG)8eLCP zH-4D=_wruJUKQWqugks*3w-~bxAmsS_S>R@6K&4#1!`fty>^f8^xkc+O+xqazTJA; z{=7~2>uGDRIhyR%SJ)ONH}BrkKUz=f@~-S!d-avVtb5`KJrkcF_ZOUaf4N)v?bouY zpX0AZna`Cr-@$dKByUdGcPkF5{Og%j`&-%%FXZlavSVWw{8-KzzB@7SM0TXvt!o+A zif+H$q2jsc@9*!WwR0M*e5Y<-(ETyu&`qBj{lx9nl5Os{*Qk05m8bu?%XoF&`KQ?? l*%zfe7FQS8+W~`WRsIyAi(3!btSA5lf~TvW%Q~loCIEIM%9sEE literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/panel_open.png b/Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/panel_open.png new file mode 100644 index 0000000000000000000000000000000000000000..24eb2aedc2248aeb772b38f63ff992254e7aaec0 GIT binary patch literal 315 zcmV-B0mS}^P)G_@Zv*NK(#C83< z0hCg#mPY_q%Og#e`P2l!*GQEjpT`0MYBKbMv^%3TIE=g7KF`WXCR28pn>(x2n zemoXytpJ?bfcIZ;wOEjBHdt%rI!S!%PGhZ=2c^1AoGrxJR_5RoDx&OEP+E*gAHf&mPbH>ZE8FCH9e&*rpCoP%1 zIy_fR`1DT4EhW}ImG2+Fy>#^EcBOlIu{N4r8M|lHdv8DdMa^XX`Q)41s%D;5@l3t_ z>U!DiCu(!NfiicFek|lsbn*16WPNgF)9u86nlDcO+<9uZb*sRm>zlTKo#3wDtk_cV zGUiQg0fX*;t18(yxo?DbZh3Nv5#oCg`Gddm{r7*~nV;{o)~0;#=kiD}oLj`YgzrYV zCx61j+EYJuRBRcZ$AIaEWtl7E0M--(oM3v-T6o|50rvB z?(X|$_9K~q!b>Jme`5^XKVF&j%`2QtMsN-@c!MQ;uYX{&xPXV-MV4h*a7^*H)mTo% z^duKBlw8QrI7#Az6a!+!k42gRM*{jVXw(2^)BtAG0A@rO5W6r+TTo*dR0c>itn&u= ziYhf*#29dhKzXbye)sb`x`T#9jF|@skRQx^J~1)&r}u;k?=m8#VH_qLszE1c7I|*U z-vi17+kNaSpCz%9yQ#rS&sN2x0`#dRVZ$Zo3 z(YozxD(tDJ*Nd^#9ngM11*`#hZL|qqUX-aA#5S}G^!n=WLLU@GQ4~c{6dSK|xP5Tx z!-H@vnhtn%y49-Lc3NyR!WG{&^FjpmIbAy+o5nPrx)V}}E%fz`bB+BtcI@^)8^rTf zBx((Ky3EXU1aLM2IGxVm^KA+58-UdY;QHA(FXNaPN!aD?zV8}<6&DioA6qwm%&S`B zG(?rf)v;@BC^IYu=$f%ZGhhqXw5SF!qXsa;V!%*uXSl{qZh&O*G5ePMUQntINQ83i z$upoRb}H)fv5TKDu*ZP$-hvmY3!Atq6ENBh(WYFFM67|7l05p#?E1nmayZKasmvEs z4%uF#@2=U$hCc&#<3^>qaoRUjD5t(Q@!@5>eLn%YPa&y@Wk6F&Jf;Amr=S&p`TF~H zKQmyzZBbK@-3j_NfaCqFrZteLVgLD`ViBgsl+FQ!832*%0DhkaTq4i015y-4Q4~c{ f6h%=KHvsSpwHV1KmpgiI00000NkvXXu0mjf++aJ5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/sparks_broken.png b/Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/sparks_broken.png new file mode 100644 index 0000000000000000000000000000000000000000..fb5d774588ae44eab5608571cb6aafad7375e158 GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^2|(DFD66%%n7hj|c25u0=Hbzuz>&Md dbBcZ?)Aw7<0^jOhxdW|Y@O1TaS?83{1ORW&Jrn={ literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/sparks_damaged.png b/Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/sparks_damaged.png new file mode 100644 index 0000000000000000000000000000000000000000..f16a028dee5bbe41a7f4e35f686043e8a112ce4e GIT binary patch literal 184 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeK3?y%aJ*@^(YymzYu0Z<#e`9lQK{p_au_VYZ zn8D%MjWi%9!PCVtL_+fI!HvAl4m=D8Hh=XH6ZQR;XyVo{y01gP^_0k+pXD$8l*-N4 z&iUk!V5<=?maE{?*yyS)-udN6;H*Pi5*L(-Fs)pAdDY$x8SUGCM{GTG-~v& dN}IerjGt7Q1>7HnEC$-e;OXk;vd$@?2>`@EK-2&L literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/sparks_open.png b/Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/sparks_open.png new file mode 100644 index 0000000000000000000000000000000000000000..630eabb976ecf11fa59ba29f03502b02bde399aa GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^2|(GM)~O;5D{Ad0LZe;7N97KJC6BX-upNVgWUu;=WLfz+qP_d4j_bJ3vh=hfa5r9 z0qVN81qdO4*#ozUc?-;6LK?t17pG~m0|2;<_}}aJ8%Xzkw*de?p>!O_N2;HSWO<%5 ub^zoJEX!gGaL3n-QrC61fn;4*wm#k_G(h}nBOLz#0000 Date: Fri, 8 Mar 2024 16:34:54 -0600 Subject: [PATCH 17/94] fix bureaucracy meta --- .../Objects/Misc/bureaucracy.rsi/meta.json | 108 +++++++++--------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json index 0b58a2fec96..2bf653c3925 100644 --- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. paper_stamp-syndicate by Veritius. paper_receipt, paper_receipt_horizontal by eoineoineoin. pen_centcom is a resprited version of pen_cap by PuroSlavKing (Github). Luxury pen is drawn by Ubaser.", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. paper_stamp-syndicate by Veritius. paper_receipt, paper_receipt_horizontal by eoineoineoin. pen_centcom is a resprited version of pen_cap by PuroSlavKing (Github). Luxury pen is drawn by Ubaser. Lawyer and psychologist paper stamp resprited by Guess-My-Name", "size": { "x": 32, "y": 32 @@ -97,159 +97,159 @@ "name": "paper_plane" }, { - "name": "paper_stamp-cap" + "name": "paper_talisman" }, { - "name": "paper_stamp-ce" + "name": "paper_talisman_armor" }, { - "name": "paper_stamp-centcom" + "name": "paper_talisman_blind" }, { - "name": "paper_stamp-chaplain" + "name": "paper_talisman_communicate" }, { - "name": "paper_stamp-clown" + "name": "paper_talisman_conceal" }, { - "name": "paper_stamp-cmo" + "name": "paper_talisman_deafen" }, { - "name": "paper_stamp-deny" + "name": "paper_talisman_emp" }, { - "name": "paper_stamp-hop" + "name": "paper_talisman_newtome" }, { - "name": "paper_stamp-hos" + "name": "paper_talisman_revealrunes" }, { - "name": "paper_stamp-ok" + "name": "paper_talisman_runestun" }, { - "name": "paper_stamp-mime" + "name": "paper_talisman_supply" }, { - "name": "paper_stamp-qm" + "name": "paper_talisman_travel" }, { - "name": "paper_stamp-rd" + "name": "paper_talisman_travel_unused" }, { - "name": "paper_stamp-syndicate" + "name": "paper_words" }, { - "name": "paper_stamp-trader" + "name": "paper_words-blood" }, { - "name": "paper_stamp-warden" + "name": "paper_receipt" }, { - "name": "paper_stamp-generic" + "name": "paper_receipt_words" }, { - "name": "paper_stamp-mantis" + "name": "paper_receipt_horizontal" }, { - "name": "paper_talisman" + "name": "paper_receipt_horizontal_words" }, { - "name": "paper_talisman_armor" + "name": "paper_dotmatrix" }, { - "name": "paper_talisman_blind" + "name": "paper_dotmatrix_words" }, { - "name": "paper_talisman_communicate" + "name": "pen" }, { - "name": "paper_talisman_conceal" + "name": "pen_cap" }, { - "name": "paper_talisman_deafen" + "name": "pen_centcom" }, { - "name": "paper_talisman_emp" + "name": "pen_hop" }, { - "name": "paper_talisman_newtome" + "name": "overpriced_pen" }, { - "name": "paper_talisman_revealrunes" + "name": "luxury_pen" }, { - "name": "paper_talisman_runestun" + "name": "pen_blue" }, { - "name": "paper_talisman_supply" + "name": "pen_red" }, { - "name": "paper_talisman_travel" + "name": "pen-inhand-left", + "directions": 4 }, { - "name": "paper_talisman_travel_unused" + "name": "pen-inhand-right", + "directions": 4 }, { - "name": "paper_words" + "name": "scrap" }, { - "name": "paper_words-blood" + "name": "scrap_bloodied" }, { - "name": "paper_receipt" + "name": "paper_stamp-cap" }, { - "name": "paper_receipt_words" + "name": "paper_stamp-ce" }, { - "name": "paper_receipt_horizontal" + "name": "paper_stamp-centcom" }, { - "name": "paper_receipt_horizontal_words" + "name": "paper_stamp-chaplain" }, { - "name": "paper_dotmatrix" + "name": "paper_stamp-clown" }, { - "name": "paper_dotmatrix_words" + "name": "paper_stamp-cmo" }, { - "name": "pen" + "name": "paper_stamp-deny" }, { - "name": "pen_cap" + "name": "paper_stamp-hop" }, { - "name": "pen_centcom" + "name": "paper_stamp-hos" }, { - "name": "pen_hop" + "name": "paper_stamp-ok" }, { - "name": "overpriced_pen" + "name": "paper_stamp-mime" }, { - "name": "luxury_pen" + "name": "paper_stamp-qm" }, { - "name": "pen_blue" + "name": "paper_stamp-rd" }, { - "name": "pen_red" + "name": "paper_stamp-syndicate" }, { - "name": "pen-inhand-left", - "directions": 4 + "name": "paper_stamp-trader" }, { - "name": "pen-inhand-right", - "directions": 4 + "name": "paper_stamp-warden" }, { - "name": "scrap" + "name": "paper_stamp-generic" }, { - "name": "scrap_bloodied" + "name": "paper_stamp-mantis" } ] } From 585a41191a60d8f99a475ade6d665bc82643fc08 Mon Sep 17 00:00:00 2001 From: Jeff Date: Fri, 8 Mar 2024 16:48:11 -0600 Subject: [PATCH 18/94] More meta fixes --- .../Entities/Objects/Misc/identification_cards.yml | 2 +- .../Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json | 8 ++++---- .../Textures/Objects/Misc/bureaucracy.rsi/meta.json | 9 +++++++++ 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 4fa31baa2b3..9e45cf6c9c3 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -360,7 +360,7 @@ - type: Sprite layers: - state: default - - sprite: DeltaV/Objects/Misc/id_cards.rsi # DeltaV - Give Lawyer ID Legal colors + - sprite: DeltaV/Objects/Misc/id_cards.rsi # DeltaV - Give Lawyer ID Justice colors state: idlawyer - type: PresetIdCard job: Lawyer diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json index 9f3bfca6901..f97a1ac7662 100644 --- a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json @@ -26,16 +26,16 @@ "name": "nyanomartialartist" }, { - "name": "nyanomantis" + "name": "nyanomantis" }, { - "name": "idchiefjustice" + "name": "idchiefjustice" }, { - "name": "idclerk" + "name": "idclerk" }, { - "name": "idlawyer" + "name": "idlawyer" } ] } diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json index 2bf653c3925..5117df77356 100644 --- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json @@ -218,6 +218,9 @@ { "name": "paper_stamp-deny" }, + { + "name": "paper_stamp-detective" + }, { "name": "paper_stamp-hop" }, @@ -250,6 +253,12 @@ }, { "name": "paper_stamp-mantis" + }, + { + "name": "paper_stamp-lawyer" + }, + { + "name": "paper_stamp-psychologist" } ] } From bf5cdd3246ad1a7e77dae4bdede21dbc1bf28c7a Mon Sep 17 00:00:00 2001 From: Jeff Date: Fri, 8 Mar 2024 17:06:08 -0600 Subject: [PATCH 19/94] Connect airlocks to yaml --- .../Structures/Doors/Airlocks/access.yml | 8 +++---- .../Structures/Doors/Airlocks/airlocks.yml | 21 ++++++++++++++++++ .../Structures/Doors/Airlocks/access.yml | 4 ++-- .../Glass/justice.rsi/assembly.png | Bin .../Glass/justice.rsi/bolted_unlit.png | Bin .../Glass/justice.rsi/closed.png | Bin .../Glass/justice.rsi/closed_unlit.png | Bin .../Glass/justice.rsi/closing.png | Bin .../Glass/justice.rsi/closing_unlit.png | Bin .../Glass/justice.rsi/deny_unlit.png | Bin .../Glass/justice.rsi/emergency_unlit.png | Bin .../Glass/justice.rsi/meta.json | 0 .../{ => Airlocks}/Glass/justice.rsi/open.png | Bin .../Glass/justice.rsi/opening.png | Bin .../Glass/justice.rsi/opening_unlit.png | Bin .../Glass/justice.rsi/panel_closing.png | Bin .../Glass/justice.rsi/panel_open.png | Bin .../Glass/justice.rsi/panel_opening.png | Bin .../Glass/justice.rsi/sparks.png | Bin .../Glass/justice.rsi/sparks_broken.png | Bin .../Glass/justice.rsi/sparks_damaged.png | Bin .../Glass/justice.rsi/sparks_open.png | Bin .../Glass/justice.rsi/welded.png | Bin .../Standard/justice.rsi/assembly.png | Bin .../Standard/justice.rsi/bolted_unlit.png | Bin .../Standard/justice.rsi/closed.png | Bin .../Standard/justice.rsi/closed_unlit.png | Bin .../Standard/justice.rsi/closing.png | Bin .../Standard/justice.rsi/closing_unlit.png | Bin .../Standard/justice.rsi/deny_unlit.png | Bin .../Standard/justice.rsi/emergency_unlit.png | Bin .../Standard/justice.rsi/meta.json | 0 .../Standard/justice.rsi/open.png | Bin .../Standard/justice.rsi/opening.png | Bin .../Standard/justice.rsi/opening_unlit.png | Bin .../Standard/justice.rsi/panel_closing.png | Bin .../Standard/justice.rsi/panel_open.png | Bin .../Standard/justice.rsi/panel_opening.png | Bin .../Standard/justice.rsi/sparks.png | Bin .../Standard/justice.rsi/sparks_broken.png | Bin .../Standard/justice.rsi/sparks_damaged.png | Bin .../Standard/justice.rsi/sparks_open.png | Bin .../Standard/justice.rsi/welded.png | Bin 43 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/airlocks.yml rename Resources/Textures/DeltaV/Structures/Doors/{ => Airlocks}/Glass/justice.rsi/assembly.png (100%) rename Resources/Textures/DeltaV/Structures/Doors/{ => Airlocks}/Glass/justice.rsi/bolted_unlit.png (100%) rename Resources/Textures/DeltaV/Structures/Doors/{ => Airlocks}/Glass/justice.rsi/closed.png (100%) rename Resources/Textures/DeltaV/Structures/Doors/{ => Airlocks}/Glass/justice.rsi/closed_unlit.png (100%) rename Resources/Textures/DeltaV/Structures/Doors/{ => Airlocks}/Glass/justice.rsi/closing.png (100%) rename Resources/Textures/DeltaV/Structures/Doors/{ => Airlocks}/Glass/justice.rsi/closing_unlit.png (100%) rename Resources/Textures/DeltaV/Structures/Doors/{ => Airlocks}/Glass/justice.rsi/deny_unlit.png (100%) rename Resources/Textures/DeltaV/Structures/Doors/{ => Airlocks}/Glass/justice.rsi/emergency_unlit.png (100%) rename Resources/Textures/DeltaV/Structures/Doors/{ => Airlocks}/Glass/justice.rsi/meta.json (100%) rename Resources/Textures/DeltaV/Structures/Doors/{ => Airlocks}/Glass/justice.rsi/open.png (100%) rename Resources/Textures/DeltaV/Structures/Doors/{ => Airlocks}/Glass/justice.rsi/opening.png (100%) rename Resources/Textures/DeltaV/Structures/Doors/{ => Airlocks}/Glass/justice.rsi/opening_unlit.png (100%) rename Resources/Textures/DeltaV/Structures/Doors/{ => Airlocks}/Glass/justice.rsi/panel_closing.png (100%) rename Resources/Textures/DeltaV/Structures/Doors/{ => Airlocks}/Glass/justice.rsi/panel_open.png (100%) rename Resources/Textures/DeltaV/Structures/Doors/{ => Airlocks}/Glass/justice.rsi/panel_opening.png (100%) rename Resources/Textures/DeltaV/Structures/Doors/{ => Airlocks}/Glass/justice.rsi/sparks.png (100%) rename Resources/Textures/DeltaV/Structures/Doors/{ => Airlocks}/Glass/justice.rsi/sparks_broken.png (100%) rename Resources/Textures/DeltaV/Structures/Doors/{ => Airlocks}/Glass/justice.rsi/sparks_damaged.png (100%) rename Resources/Textures/DeltaV/Structures/Doors/{ => Airlocks}/Glass/justice.rsi/sparks_open.png (100%) rename Resources/Textures/DeltaV/Structures/Doors/{ => Airlocks}/Glass/justice.rsi/welded.png (100%) rename Resources/Textures/DeltaV/Structures/Doors/{ => Airlocks}/Standard/justice.rsi/assembly.png (100%) rename Resources/Textures/DeltaV/Structures/Doors/{ => Airlocks}/Standard/justice.rsi/bolted_unlit.png (100%) rename Resources/Textures/DeltaV/Structures/Doors/{ => Airlocks}/Standard/justice.rsi/closed.png (100%) rename Resources/Textures/DeltaV/Structures/Doors/{ => Airlocks}/Standard/justice.rsi/closed_unlit.png (100%) rename Resources/Textures/DeltaV/Structures/Doors/{ => Airlocks}/Standard/justice.rsi/closing.png (100%) rename Resources/Textures/DeltaV/Structures/Doors/{ => Airlocks}/Standard/justice.rsi/closing_unlit.png (100%) rename Resources/Textures/DeltaV/Structures/Doors/{ => Airlocks}/Standard/justice.rsi/deny_unlit.png (100%) rename Resources/Textures/DeltaV/Structures/Doors/{ => Airlocks}/Standard/justice.rsi/emergency_unlit.png (100%) rename Resources/Textures/DeltaV/Structures/Doors/{ => Airlocks}/Standard/justice.rsi/meta.json (100%) rename Resources/Textures/DeltaV/Structures/Doors/{ => Airlocks}/Standard/justice.rsi/open.png (100%) rename Resources/Textures/DeltaV/Structures/Doors/{ => Airlocks}/Standard/justice.rsi/opening.png (100%) rename Resources/Textures/DeltaV/Structures/Doors/{ => Airlocks}/Standard/justice.rsi/opening_unlit.png (100%) rename Resources/Textures/DeltaV/Structures/Doors/{ => Airlocks}/Standard/justice.rsi/panel_closing.png (100%) rename Resources/Textures/DeltaV/Structures/Doors/{ => Airlocks}/Standard/justice.rsi/panel_open.png (100%) rename Resources/Textures/DeltaV/Structures/Doors/{ => Airlocks}/Standard/justice.rsi/panel_opening.png (100%) rename Resources/Textures/DeltaV/Structures/Doors/{ => Airlocks}/Standard/justice.rsi/sparks.png (100%) rename Resources/Textures/DeltaV/Structures/Doors/{ => Airlocks}/Standard/justice.rsi/sparks_broken.png (100%) rename Resources/Textures/DeltaV/Structures/Doors/{ => Airlocks}/Standard/justice.rsi/sparks_damaged.png (100%) rename Resources/Textures/DeltaV/Structures/Doors/{ => Airlocks}/Standard/justice.rsi/sparks_open.png (100%) rename Resources/Textures/DeltaV/Structures/Doors/{ => Airlocks}/Standard/justice.rsi/welded.png (100%) diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml index ee4c0de1b23..db871859931 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml @@ -31,7 +31,7 @@ access: [["ChiefJustice"]] - type: entity - parent: AirlockSecurity + parent: AirlockJustice id: AirlockJusticeLocked suffix: Justice, Locked components: @@ -39,7 +39,7 @@ access: [["Justice"]] - type: entity - parent: AirlockSecurityGlass + parent: AirlockJusticeGlass id: AirlockJusticeGlassLocked suffix: Justice, Locked components: @@ -47,7 +47,7 @@ access: [["Justice"]] - type: entity - parent: AirlockSecurity + parent: AirlockJustice id: AirlockProsecutorLocked suffix: Prosecutor, Locked components: @@ -55,7 +55,7 @@ access: [["Prosecutor"]] - type: entity - parent: AirlockSecurityGlass + parent: AirlockJusticeGlass id: AirlockProsecutorGlassLocked suffix: Prosecutor, Locked components: diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/airlocks.yml new file mode 100644 index 00000000000..79837d7413a --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/airlocks.yml @@ -0,0 +1,21 @@ +- type: entity + parent: Airlock + id: AirlockJustice + suffix: Justice + components: + - type: Sprite + sprite: DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi + - type: PaintableAirlock + department: Justice + +# Glass + +- type: entity + parent: AirlockGlass + id: AirlockJusticeGlass + suffix: Justice + components: + - type: Sprite + sprite: DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi + - type: PaintableAirlock + department: Justice diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml index 82cdcde7c05..045dab87525 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml @@ -8,7 +8,7 @@ access: [["Service"]] - type: entity - parent: Airlock + parent: AirlockJustice # DeltaV - Lawyer is in Justice Dept id: AirlockLawyerLocked suffix: Lawyer, Locked components: @@ -459,7 +459,7 @@ - type: entity parent: AirlockGlass - id: AirlockLawyerGlassLocked + id: AirlockJusticeGlass # DeltaV - Lawyer is in Justice Dept suffix: Lawyer, Locked components: - type: AccessReader diff --git a/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/assembly.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/assembly.png similarity index 100% rename from Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/assembly.png rename to Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/assembly.png diff --git a/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/bolted_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/bolted_unlit.png similarity index 100% rename from Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/bolted_unlit.png rename to Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/bolted_unlit.png diff --git a/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/closed.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/closed.png similarity index 100% rename from Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/closed.png rename to Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/closed.png diff --git a/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/closed_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/closed_unlit.png rename to Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/closed_unlit.png diff --git a/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/closing.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/closing.png similarity index 100% rename from Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/closing.png rename to Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/closing.png diff --git a/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/closing_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/closing_unlit.png rename to Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/closing_unlit.png diff --git a/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/deny_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/deny_unlit.png similarity index 100% rename from Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/deny_unlit.png rename to Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/deny_unlit.png diff --git a/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/emergency_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/emergency_unlit.png similarity index 100% rename from Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/emergency_unlit.png rename to Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/emergency_unlit.png diff --git a/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/meta.json b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/meta.json rename to Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/open.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/open.png similarity index 100% rename from Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/open.png rename to Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/open.png diff --git a/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/opening.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/opening.png similarity index 100% rename from Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/opening.png rename to Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/opening.png diff --git a/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/opening_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/opening_unlit.png rename to Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/opening_unlit.png diff --git a/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/panel_closing.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/panel_closing.png rename to Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/panel_closing.png diff --git a/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/panel_open.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/panel_open.png similarity index 100% rename from Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/panel_open.png rename to Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/panel_open.png diff --git a/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/panel_opening.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/panel_opening.png rename to Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/panel_opening.png diff --git a/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/sparks.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/sparks.png similarity index 100% rename from Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/sparks.png rename to Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/sparks.png diff --git a/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/sparks_broken.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/sparks_broken.png rename to Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/sparks_broken.png diff --git a/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/sparks_damaged.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/sparks_damaged.png rename to Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/sparks_damaged.png diff --git a/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/sparks_open.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/sparks_open.png rename to Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/sparks_open.png diff --git a/Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/welded.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/welded.png similarity index 100% rename from Resources/Textures/DeltaV/Structures/Doors/Glass/justice.rsi/welded.png rename to Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/welded.png diff --git a/Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/assembly.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/assembly.png similarity index 100% rename from Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/assembly.png rename to Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/assembly.png diff --git a/Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/bolted_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/bolted_unlit.png similarity index 100% rename from Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/bolted_unlit.png rename to Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/bolted_unlit.png diff --git a/Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/closed.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/closed.png similarity index 100% rename from Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/closed.png rename to Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/closed.png diff --git a/Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/closed_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/closed_unlit.png similarity index 100% rename from Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/closed_unlit.png rename to Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/closed_unlit.png diff --git a/Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/closing.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/closing.png similarity index 100% rename from Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/closing.png rename to Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/closing.png diff --git a/Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/closing_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/closing_unlit.png similarity index 100% rename from Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/closing_unlit.png rename to Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/closing_unlit.png diff --git a/Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/deny_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/deny_unlit.png similarity index 100% rename from Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/deny_unlit.png rename to Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/deny_unlit.png diff --git a/Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/emergency_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/emergency_unlit.png similarity index 100% rename from Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/emergency_unlit.png rename to Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/emergency_unlit.png diff --git a/Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/meta.json b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/meta.json rename to Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/open.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/open.png similarity index 100% rename from Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/open.png rename to Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/open.png diff --git a/Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/opening.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/opening.png similarity index 100% rename from Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/opening.png rename to Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/opening.png diff --git a/Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/opening_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/opening_unlit.png similarity index 100% rename from Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/opening_unlit.png rename to Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/opening_unlit.png diff --git a/Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/panel_closing.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/panel_closing.png similarity index 100% rename from Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/panel_closing.png rename to Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/panel_closing.png diff --git a/Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/panel_open.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/panel_open.png similarity index 100% rename from Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/panel_open.png rename to Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/panel_open.png diff --git a/Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/panel_opening.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/panel_opening.png similarity index 100% rename from Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/panel_opening.png rename to Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/panel_opening.png diff --git a/Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/sparks.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/sparks.png similarity index 100% rename from Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/sparks.png rename to Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/sparks.png diff --git a/Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/sparks_broken.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/sparks_broken.png similarity index 100% rename from Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/sparks_broken.png rename to Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/sparks_broken.png diff --git a/Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/sparks_damaged.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/sparks_damaged.png similarity index 100% rename from Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/sparks_damaged.png rename to Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/sparks_damaged.png diff --git a/Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/sparks_open.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/sparks_open.png similarity index 100% rename from Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/sparks_open.png rename to Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/sparks_open.png diff --git a/Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/welded.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/welded.png similarity index 100% rename from Resources/Textures/DeltaV/Structures/Doors/Standard/justice.rsi/welded.png rename to Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/welded.png From 6a371c98417dd787141b0435944855d3b410c4d0 Mon Sep 17 00:00:00 2001 From: Jeff Date: Fri, 8 Mar 2024 17:28:21 -0600 Subject: [PATCH 20/94] Fixes, tweaks, and last reference of "legal" maybe --- .../Roles/Jobs/{Legal => Justice}/chief_justice.yml | 0 .../DeltaV/Roles/Jobs/{Legal => Justice}/clerk.yml | 0 .../DeltaV/Roles/Jobs/{Legal => Justice}/prosecuter.yml | 0 Resources/Prototypes/DeltaV/StatusEffects/job.yml | 8 ++++---- .../Entities/Structures/Doors/Airlocks/access.yml | 4 ++-- Resources/Prototypes/StatusEffects/job.yml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) rename Resources/Prototypes/DeltaV/Roles/Jobs/{Legal => Justice}/chief_justice.yml (100%) rename Resources/Prototypes/DeltaV/Roles/Jobs/{Legal => Justice}/clerk.yml (100%) rename Resources/Prototypes/DeltaV/Roles/Jobs/{Legal => Justice}/prosecuter.yml (100%) diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Legal/chief_justice.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Roles/Jobs/Legal/chief_justice.yml rename to Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Legal/clerk.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Roles/Jobs/Legal/clerk.yml rename to Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Legal/prosecuter.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecuter.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Roles/Jobs/Legal/prosecuter.yml rename to Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecuter.yml diff --git a/Resources/Prototypes/DeltaV/StatusEffects/job.yml b/Resources/Prototypes/DeltaV/StatusEffects/job.yml index 97ce0409640..b6db591904b 100644 --- a/Resources/Prototypes/DeltaV/StatusEffects/job.yml +++ b/Resources/Prototypes/DeltaV/StatusEffects/job.yml @@ -2,26 +2,26 @@ parent: JobIcon id: JobIconMedicalBorg icon: - sprite: DeltaV/Interface/Misc/job_icons.rsi + sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi state: MedicalBorg - type: statusIcon parent: JobIcon id: JobIconChiefJustice icon: - sprite: DeltaV/Interface/Misc/job_icons.rsi + sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi state: ChiefJustice - type: statusIcon parent: JobIcon id: JobIconClerk icon: - sprite: DeltaV/Interface/Misc/job_icons.rsi + sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi state: Clerk - type: statusIcon parent: JobIcon id: JobIconProsecuter icon: - sprite: DeltaV/Interface/Misc/job_icons.rsi + sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi state: Clerk #need prosecuter diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml index 045dab87525..52cd591a5bc 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml @@ -458,8 +458,8 @@ access: [["Service"]] - type: entity - parent: AirlockGlass - id: AirlockJusticeGlass # DeltaV - Lawyer is in Justice Dept + parent: AirlockJusticeGlass + id: AirlockLawyerGlassLocked # DeltaV - Lawyer is in Justice Dept suffix: Lawyer, Locked components: - type: AccessReader diff --git a/Resources/Prototypes/StatusEffects/job.yml b/Resources/Prototypes/StatusEffects/job.yml index f95b81e118a..e425f5e0ece 100644 --- a/Resources/Prototypes/StatusEffects/job.yml +++ b/Resources/Prototypes/StatusEffects/job.yml @@ -120,7 +120,7 @@ parent: JobIcon id: JobIconLawyer icon: - sprite: DeltaV/Textures/Interface/Misc/job_icons.rsi # DeltaV - Move Lawyer into Justice + sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi # DeltaV - Move Lawyer into Justice state: Lawyer # DeltaV - Move Lawyer into Justice - type: statusIcon From fb8525cc05ba3893d88bf7d6638b8a1dd163e440 Mon Sep 17 00:00:00 2001 From: Jeff Date: Fri, 8 Mar 2024 18:09:54 -0600 Subject: [PATCH 21/94] Add justice to airlock groups --- .../Prototypes/Entities/Structures/Doors/airlock_groups.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml b/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml index dfb37f49869..2cb30277d20 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml @@ -13,6 +13,7 @@ science: Structures/Doors/Airlocks/Standard/science.rsi security: Structures/Doors/Airlocks/Standard/security.rsi virology: Structures/Doors/Airlocks/Standard/virology.rsi + justice: DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi # Delta V - Add Justice Dept - type: AirlockGroup id: Glass @@ -28,6 +29,7 @@ medical: Structures/Doors/Airlocks/Glass/medical.rsi security: Structures/Doors/Airlocks/Glass/security.rsi virology: Structures/Doors/Airlocks/Glass/virology.rsi + justice: DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi # Delta V - Add Justice Dept - type: AirlockGroup id: Windoor From 52f5e753a6c4dd22958b8289d1cb0b662e24ae23 Mon Sep 17 00:00:00 2001 From: leo <136020119+leonardo-dabepis@users.noreply.github.com> Date: Tue, 12 Mar 2024 13:38:48 +1000 Subject: [PATCH 22/94] add prosc. drip and fix prosecutor typos adds prosecutor badge and suit, as well as fixes the spelling of "prosecuter" to "prosecutor" --- .../DeltaV/Entities/Clothing/Neck/misc.yml | 12 ++++++++ .../Entities/Clothing/Uniforms/jumpskirts.yml | 11 ++++++++ .../Entities/Clothing/Uniforms/jumpsuits.yml | 11 ++++++++ .../DeltaV/Entities/Markers/Spawners/jobs.yml | 6 ++-- .../Roles/Jobs/Justice/chief_justice.yml | 2 +- .../DeltaV/Roles/Jobs/Justice/clerk.yml | 2 +- .../{prosecuter.yml => prosecutor.yml} | 16 +++++------ .../DeltaV/Roles/Jobs/departments.yml | 2 +- .../DeltaV/Roles/play_time_trackers.yml | 2 +- .../Prototypes/DeltaV/StatusEffects/job.yml | 4 +-- .../prosecutorbadge.rsi/equipped-NECK.png | Bin 0 -> 607 bytes .../Neck/Misc/prosecutorbadge.rsi/icon.png | Bin 0 -> 1018 bytes .../Neck/Misc/prosecutorbadge.rsi/meta.json | 18 ++++++++++++ .../equipped-INNERCLOTHING.png | Bin 0 -> 1681 bytes .../Jumpskirt/prosecutorred.rsi/icon.png | Bin 0 -> 877 bytes .../prosecutorred.rsi/inhand-left.png | Bin 0 -> 983 bytes .../prosecutorred.rsi/inhand-right.png | Bin 0 -> 985 bytes .../Jumpskirt/prosecutorred.rsi/meta.json | 26 ++++++++++++++++++ .../equipped-INNERCLOTHING.png | Bin 0 -> 1615 bytes .../Jumpsuit/prosecutorred.rsi/icon.png | Bin 0 -> 868 bytes .../prosecutorred.rsi/inhand-left.png | Bin 0 -> 983 bytes .../prosecutorred.rsi/inhand-right.png | Bin 0 -> 985 bytes .../Jumpsuit/prosecutorred.rsi/meta.json | 26 ++++++++++++++++++ 23 files changed, 121 insertions(+), 17 deletions(-) create mode 100644 Resources/Prototypes/DeltaV/Entities/Clothing/Neck/misc.yml rename Resources/Prototypes/DeltaV/Roles/Jobs/Justice/{prosecuter.yml => prosecutor.yml} (62%) create mode 100644 Resources/Textures/DeltaV/Clothing/Neck/Misc/prosecutorbadge.rsi/equipped-NECK.png create mode 100644 Resources/Textures/DeltaV/Clothing/Neck/Misc/prosecutorbadge.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/Neck/Misc/prosecutorbadge.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/meta.json diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/misc.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/misc.yml new file mode 100644 index 00000000000..2b331cab8aa --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/misc.yml @@ -0,0 +1,12 @@ +- type: entity + parent: ClothingNeckBase + id: ClothingNeckProsecutorbadge + name: prosecutor badge + description: A badge to show that the owner is a 'legitimate' prosecutor who passed the NT bar exam required to practice law. + components: + - type: Sprite + sprite: DeltaV/Clothing/Neck/Misc/prosecutorbadge.rsi + - type: Clothing + sprite: DeltaV/Clothing/Neck/Misc/prosecutorbadge.rsi + - type: TypingIndicatorClothing + proto: lawyer diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml index 4c0b718a8ea..71865948d3b 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml @@ -115,3 +115,14 @@ sprite: DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpskirtProsecutorRed + name: prosecutor's dress skirt + description: A red suit and skirt with a fancy cravat. Perfect for a prosecutor. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml index a0b90ee4812..d0d8dcd4c3e 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml @@ -276,3 +276,14 @@ sprite: DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitProsecutorRed + name: prosecutor's suit + description: A red suit with a fancy cravat. Perfect for a prosecutor. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi diff --git a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml index b117b6924e4..60220c3ba3a 100644 --- a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml @@ -43,12 +43,12 @@ # state: clerk - type: entity - id: SpawnPointProsecuter + id: SpawnPointProsecutor parent: SpawnPointJobBase - name: prosecuter + name: prosecutor components: - type: SpawnPoint - job_id: Prosecuter + job_id: Prosecutor - type: Sprite layers: - state: green diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml index 7b02504f9b8..11d30a5256c 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml @@ -12,7 +12,7 @@ role: JobLawyer time: 36000 # 10 hours - !type:RoleTimeRequirement - role: JobProsecuter + role: JobProsecutor time: 36000 # 10 hours - !type:OverallPlaytimeRequirement time: 90000 # 25 hours diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml index 4c307baeb9a..581e81c4735 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml @@ -11,7 +11,7 @@ role: JobLawyer time: 36000 # 10 hours - !type:RoleTimeRequirement - role: JobProsecuter + role: JobProsecutor time: 36000 # 10 hours startingGear: ClerkGear icon: "JobIconClerk" diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecuter.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml similarity index 62% rename from Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecuter.yml rename to Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml index 02c0a039b5a..169951d8f58 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecuter.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml @@ -1,12 +1,12 @@ - type: job - id: Prosecuter - name: job-name-prosecuter - description: job-description-prosecuter - playTimeTracker: JobProsecuter + id: Prosecutor + name: job-name-prosecutor + description: job-description-prosecutor + playTimeTracker: JobProsecutor requirements: - !type:OverallPlaytimeRequirement time: 36000 # 10 hrs - startingGear: ProsecuterGear + startingGear: ProsecutorGear icon: "JobIconLawyer" supervisors: job-supervisors-hop access: @@ -16,9 +16,9 @@ - Maintenance - type: startingGear # Need prosecuter stuff - id: ProsecuterGear + id: ProsecutorGear equipment: - jumpsuit: ClothingUniformJumpsuitLawyerBlack # TODO change jumpsuit to randomiser of the 4 variants + jumpsuit: ClothingUniformJumpsuitProsecutorRed back: ClothingBackpackFilled shoes: ClothingShoesBootsLaceup id: LawyerPDA @@ -26,6 +26,6 @@ # TODO add copy of space law inhand: - BriefcaseBrownFilled - innerClothingSkirt: ClothingUniformJumpskirtLawyerBlack + innerClothingSkirt: ClothingUniformJumpskirtProsecutorRed satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/departments.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/departments.yml index e38cbe0c5db..411df996706 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/departments.yml @@ -5,5 +5,5 @@ roles: - ChiefJustice - Clerk - - Prosecuter + - Prosecutor - Lawyer diff --git a/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml b/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml index 3b3c8ea4ae4..d2716f8073e 100644 --- a/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml @@ -11,4 +11,4 @@ id: JobClerk - type: playTimeTracker - id: JobProsecuter + id: JobProsecutor diff --git a/Resources/Prototypes/DeltaV/StatusEffects/job.yml b/Resources/Prototypes/DeltaV/StatusEffects/job.yml index b6db591904b..4287fd9a3a4 100644 --- a/Resources/Prototypes/DeltaV/StatusEffects/job.yml +++ b/Resources/Prototypes/DeltaV/StatusEffects/job.yml @@ -21,7 +21,7 @@ - type: statusIcon parent: JobIcon - id: JobIconProsecuter + id: JobIconProsecutor icon: sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi - state: Clerk #need prosecuter + state: Clerk #need prosecutor diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Misc/prosecutorbadge.rsi/equipped-NECK.png b/Resources/Textures/DeltaV/Clothing/Neck/Misc/prosecutorbadge.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..ce4e527400f155d092f564064b37b9a6fd13deb3 GIT binary patch literal 607 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU@XXVb`Ho)PG(@xm{>Y-zxQDW zk>mSwr*?&Ptx$M0VWC*NSXYyU7whhj_H9j})1S=R;xwtvyGtbe;L(K-6n6c{{$PJ0 zv>;S~#Z{oN-Nj(7Z5uBgTXTf>k>;b0h2asOZ62v9UX3{! zB)8m@QCf1zgccT7(Hy7tW{cFxY1eK}&-gJdP>p}_{#Gpu%Px(H=5AT7yH-sxy%hSZ zB;@Fw|K~4XOIx=0-9nWMzhCW|KiQ!`e#P~e@87SKzD{>|z`DaM`k&F+%y+ZDM0t11 zFh7)i@M+mnP4)v<^$fn{oQ%oyV2rBsWwz66IA~)~!~bP{_2#U1kNEakt5%>1OLf!@gfwqfP z%N&eTMB7>oG*y2LVZ>D1_nkZ77hUg2N2^cQ=$LQ+H)Gw z@#XZnbg!NdSiF@JuQxt>)LH z;5!2FVH87%%FMQwvWq!%jh{!VrFe*oUft_D#y~-}8Q|+9o@Ewyi06sZTaG1ok9dTY zE@~=<%0ep35u%e$i7Zwz1O2ti%oCDdLEsS6K5r;wB;0T**=% zr!@f^8KjVe1O*jrLWhGmWs_#s*_UYemQf}TqrZhJI5~bjqkKyV+Z*If7a)OG7;K;Q+qHe3EO&1vqN^jb@c90TDU;PR%W zDF?vSE-?0N$y{zo0a|`d13oT*!8|a05A?5lvuf_+{0Ycy(-YkRhetq^>cbm<+Gc0@ ziLXu;00009a7bBm000ie000ie0hKEb8vpVGweA)h=c>RI08mE6fXoW zx}XL@xy`#lo(6 zllNZ@cn~Bhm-~UX;V+U(&*%SQoZ8$Uk?D7`8^Q#={k`8tJTpKLtz{R;EeeKlY+Unv z&+keXUK@$H1*(GD*X}Fu>^Di#SCdG8_=N1}fB=i7n}AdY^mo(p*uS*pTHi5%;5`$w zvSR|#2uAR()k9>>81}4th`g#Tzn4C&#!{(gn0nLY+Js{Ry^RU;c_LmG9BF4G1h4s= z!S9cmYfTV1ULBW4mj~ZtJ8xj}d)^Vl69e`&k&WZdw@61WG`hDTPFhWT-s+HPJL zh&pMYuIgdt*UAE(G`Hg9^bZaW3c|oq{tV}cV$F;Scq&rD=HVt{$(OjeEJ^HK-)muD zt7r^4VK`m^>8A!rJtWZWO5^y-1iklF)iOtd!}p+Lh|%{;kHmOl`+> z{ZZJ1)mf@@tFL>E!q1}Yocs3+&f1=T#r8&cZWNok_sa8gV>K`XN)yxrr>*o}cJ8OS oTVs_lEB!wy9u^51xOWWv1&=&5X?=^%A^-pY07*qoM6N<$f?3eo#{d8T literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Misc/prosecutorbadge.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Neck/Misc/prosecutorbadge.rsi/meta.json new file mode 100644 index 00000000000..d1eafae3de6 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Neck/Misc/prosecutorbadge.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "sprites by leonardo-dabepis", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..a1ae36f210240775acbee0af6e45c1bc4edcc7f2 GIT binary patch literal 1681 zcmV;C25$L@P)!NdSiF@JuQxt>)LH z;5!2FVH87%%FMQwvWq!%jh{!VrFe*oUft_D#y~-}8Q|+9o@Ewyi06sZTaG1ok9dTY zE@~=<%0ep35u%e$i7Zwz1O2ti%oCDdLEsS6K5r;wB;0T**=% zr!@f^8KjVe1O*jrLWhGmWs_#s*_UYemQf}TqrZhJI5~bjqkKyV+Z*If7a)OG7;K;Q+qHe3EO&1vqN^jb@c90TDU;PR%W zDF?vSE-?0N$y{zo0a|`d13oT*!8|a05A?5lvuf_+{0Ycy(-YkRhetq^>cbm<+Gc0@ ziLXu;00009a7bBm000ie000ie0hKEb8vpedF5)*fHdfR- zS<2>G==P37)Y?=}&-0(D|H~U|y%PM~+KlR+|Fy7WnBFGAUu|OmJI{ULJe-E$ihCB2 z)Js&97-6y@j!)A|M}T}tE7gneSJ{B;eE>8vGD5Fjyi|{I#XTFqePOgow@rJJ9$+mx zto^O)v&A)gP#*>V*?qGjT;*) zuKXPR;$-=*1|2_X1B8BlF2!G#fbD(f=DsD5gk{@*KI9!HDwjsPg@#k;?pPEx@{XBn3^RVL!;A$#g$?Lc4-HGTSG(Q9>ZbE zE7exNRR|<0o0*wakNIi~m}WnYdmo)n1Ry4{0d}uxRM)g)-sBJ*#}6xx|2B=O)^7D8 zqz?utmSI=4?Rr)_ z`(57&L?NJ#ptqI(6v5SM&(o$sKLT~#zDHr&b_RWcfxtjuATSUZ2n+-U0t118z(8Q& zzh}Vd1IEC>fJ%IJbac?({rjkXea1;8gc%m6?8h`cg%`fHW;HA|RfpM>Yl|9DQ;}6-!_yTxLN+0-VRnLt)0l zgJ+cUdNx{GpdtPu#9v<6d9D|LK`^Y=!p?I|0w#bHvo2qS#9xGRO{FpwUAR7=*3Lse zRvFhMG$+&{NWTn=2w2WRt{12^30E#(TT+wYgDDPyI9R-1z{eQdv0R(L*tX-6`iWNn zD#Re0$~&+Rcv@po2Y{0ZGP-G(NUfLvl*2(d7l%!#TGfWg5{J%=oj-Y=UOT4d#00RN z@m%0a)(PlXzBx%J0^&2S>IHuPQS}1-H0dyx_CtU%gqnmO(e}j|>GE(FGQ!NdSiF@JuQxt>)LH z;5!2FVH87%%FMQwvWq!%jh{!VrFe*oUft_D#y~-}8Q|+9o@Ewyi06sZTaG1ok9dTY zE@~=<%0ep35u%e$i7Zwz1O2ti%oCDdLEsS6K5r;wB;0T**=% zr!@f^8KjVe1O*jrLWhGmWs_#s*_UYemQf}TqrZhJI5~bjqkKyV+Z*If7a)OG7;K;Q+qHe3EO&1vqN^jb@c90TDU;PR%W zDF?vSE-?0N$y{zo0a|`d13oT*!8|a05A?5lvuf_+{0Ycy(-YkRhetq^>cbm<+Gc0@ ziLXu;00009a7bBm000ie000ie0hKEb8vpD|l-4u)ULo zl+tru7q)G~P9|^_n@4I%AP0D-&Fcv+FFS!Cq3bkMPy(&AkBTXdqrN@aF3iPnvlzoi zzYie<w&&q{v6L%x7&wTfb~s8-q&=$!1x zo(on9i1fbO1uXxD5Q_WcxPV@_17XE+@Ey&0e;L?0-0%RqS@vhrs`J+@KMNn1i8$)D z8q%2z_8J}aPX+gJ@m6Q^vPuw!G)!>fWhbCTP5RGm7)JdcSB%gJXu@`TAiG}21sZi8 zDFLcAHQ?FmhFW#)qa?v@79!V;c(}R#Bi8w?4Bdd_z)paM5!IQ-?I_S3pr`mNqgc-Y zwES5xBncfnY&qBp1WTZ2K~RY(GayRO7$2j+|5M-#9|Wea#}d$500000NkvXXu0mjf D52}=N literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..d04680f3ca65d0edec4b2d879fbca4607012024c GIT binary patch literal 983 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU@XXVb`Ho)PG(@xm{>Y-zxQDW zk>mSwr*?&Ptx$M0VWC*NSXYyU7whhj_H9j})1S=R;xwtvyGtbe;L(K-6n6c{{$PJ0 zv>;S~#Z{oN-Nj(7Z5uBgTXTf>k>;b0h2asOZ62v9UX3{! zB)8m@QCf1zgccT7(Hy7tW{cFxY1eK}&-gJdP>p}_{#Gpu%Px(H=5AT7yH-sxy%hSZ zB;@Fw|K~4XOIx=0-9nWMzhCW|KiQ!`e#P~e@87SKzD{>|z`DaM`k&F+%y+ZDM0t11 zFh7)i@M+mnP4)v<^$fn{oQ%oyV2rBsWwz66IA~)~!~bP{_2#U1kN*?YcQW5ud=0>l>0U~Yv zN-r)2X>ny8b^IWECsw3}<>0}iZ(M7b*bf>`ZoVZhz~y)CYI=rw=0@kO)0Ql9H7L^B zZjyQV&XM5PQ|-Myiq8F?|NHLk>V@qb;v5YOIFLgS)9&KzID_pmdew*T^?!O$agO`g zk*gOak8kmt;Kw7reWD+Ki{A6Fj{C30)|Xi5R~)@~aplb9BMchOx3^UrKi{`)@1dtt z^K|!FoO}EyaaSjc^Q2`eN3N{NeKu{yt%A(w-xjG?Z{F&^np<<%`l~A+S%lQob9|k0 zsndAbOpAkw8*it(Z>gxe`#VN!Dw~t!xnBnrMRm2W1bL~So8c11ApPmm`#B=JHqWhJ zH~IAzjj87@y!`Wh)ePHv%BMFe{asR0qS*14(Pqc)W69UeXP^D??oV9$hdC-sKfh*} zqIkaSzi7=hT^}#?Q~o)u8jGWrzx~W(=Ps(UR`{tpUjy&#vtif6?=J4*_^r3p_*DE8 zkr(C<7N7h3W6ARATKN@mPjw}eHRmq*Fp-@}fdL2lu${xBbkXF$$(D&?L31G1Diup5L*l%Vq2+hq{ y%=p3UMY-zxQDW zk>mSwr*?&Ptx$M0VWC*NSXYyU7whhj_H9j})1S=R;xwtvyGtbe;L(K-6n6c{{$PJ0 zv>;S~#Z{oN-Nj(7Z5uBgTXTf>k>;b0h2asOZ62v9UX3{! zB)8m@QCf1zgccT7(Hy7tW{cFxY1eK}&-gJdP>p}_{#Gpu%Px(H=5AT7yH-sxy%hSZ zB;@Fw|K~4XOIx=0-9nWMzhCW|KiQ!`e#P~e@87SKzD{>|z`DaM`k&F+%y+ZDM0t11 zFh7)i@M+mnP4)v<^$fn{oQ%oyV2rBsWwz66IA~)~!~bP{_2#U1kNymC>d*GaVx586#CacAgYdV1UXll||Em+#guIc*hb|Jy^#_|u{V zJAz}Dy4_y>_xS9OpANqh%+=AqRJ_^sYh1t9ef`GwxBg@{H3kFZEi_&hwxAY?HoA zU;b}qiTgVSv+q~xWUuOqd}>rbzdK`|tKVwtZ$eML$~UrpEY)yod=@+o1z$5fs|_#Gy+| z)^Foo_3gS9V~on`l^eMlzR4Qo{#qrJP#r7XAdod{-z~Ehx9&?cWP-)+N-%JndB*2T uhrC_?Rcu1HLT#wxQ7euHhiM#t7&rWup3(B$#{`&O7(8A5T-G@yGywn;ZoQHK literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/meta.json new file mode 100644 index 00000000000..3b15d15f4bf --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Heavily modified by leonardo-dabepis, original sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..f21dce44e2fa4b813ac37e5a2badf8f056b79a6f GIT binary patch literal 1615 zcmV-V2C(^wP)!NdSiF@JuQxt>)LH z;5!2FVH87%%FMQwvWq!%jh{!VrFe*oUft_D#y~-}8Q|+9o@Ewyi06sZTaG1ok9dTY zE@~=<%0ep35u%e$i7Zwz1O2ti%oCDdLEsS6K5r;wB;0T**=% zr!@f^8KjVe1O*jrLWhGmWs_#s*_UYemQf}TqrZhJI5~bjqkKyV+Z*If7a)OG7;K;Q+qHe3EO&1vqN^jb@c90TDU;PR%W zDF?vSE-?0N$y{zo0a|`d13oT*!8|a05A?5lvuf_+{0Ycy(-YkRhetq^>cbm<+Gc0@ ziLXu;00009a7bBm000ie000ie0hKEb8vpWK77DBZU0I!mqb7)@k<(&JxW0_&CFC->AT@$C9aNjJSsg1!g)B2f*QZM zfTUicyu=7U8=UwwU)lrYqqI^?gkKW`T$cgR=;$bY{`g5fMvdQW0L#K?Kixsv-Shx! z%VF)it}iIQF9A@BQN`3An);?NzV{8#^z^iH95sHUpdE6MkFq%Ny>y%4mt6up_25)y zX{iYJ(Zc~+URtDBeFI(AT9jONgS4 zifVoiIVV|RXM>LKwgEyvKbPW{CE#G+4LbMX72SF>DDnaF=!gDc%EgyYm7eoYZj01F z9{teYuZWJTOMBb$r{f95_WPCwnw^=Uw)S>9HMdAOhQ{V|TQkKE*rXl!9rg9DdkimA zo~c3g2U-Gd$`%$D)nl%M0!Asv>pqN5BLc7{u>n3ikWzKjYu?WxIF1iy9Dn!gnC|j(2XH5Ni^bWU|1=Uc=-A zJAJrQDZzJj5(x1{1hBabHa3+b7=>3;=bNC+HJLQyW9fCQZ;)bIjP?L9&1W-eud~_I zsB-<7XdNH&rUPI^KqVZjmQG7RwU{@>^*Z}a-w8yUAl6-Gs`yV49PxT?>ZDgcg+rzI z&Z97DT&vGAU>UFsSOzQumI2FvWxz6E8L$lecMOOwMcMoQ{(f~inM$ST_{kF#+gE3# zCoG%D4?u7h@kx}Po*uCs;tqP$6?bvRhVLs9UJMNz8DK&J2Hh2EnjO z7j~X=5-);kN z@zW=I6NEC(6VjuxrujL3#(A~7@Og+jtYy9g*(5QIX(Go2!-`QTb!_SO%)Vz(013TN3ImS-=1Q N002ovPDHLkV1lje?7jd1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..0d2266c7ff736f194c2cde2bab940aa2e7391054 GIT binary patch literal 868 zcmV-q1DpJbP)!NdSiF@JuQxt>)LH z;5!2FVH87%%FMQwvWq!%jh{!VrFe*oUft_D#y~-}8Q|+9o@Ewyi06sZTaG1ok9dTY zE@~=<%0ep35u%e$i7Zwz1O2ti%oCDdLEsS6K5r;wB;0T**=% zr!@f^8KjVe1O*jrLWhGmWs_#s*_UYemQf}TqrZhJI5~bjqkKyV+Z*If7a)OG7;K;Q+qHe3EO&1vqN^jb@c90TDU;PR%W zDF?vSE-?0N$y{zo0a|`d13oT*!8|a05A?5lvuf_+{0Ycy(-YkRhetq^>cbm<+Gc0@ ziLXu;00009a7bBm000ie000ie0hKEb8vp8t*Wl%MceETLAbp92>;#T}qWK@MLqDGz9$+`i;apaB{<U1UjTT!HJihfD$zwjoWV+w?C;E+6gGaPG=~)vXcUhJCBtB z)tVacVr^4eRr@$eu$zU*RU;lG9r@Q&pz*tE2igr7s|Sv^He_)1PasQc+K&S*1(XV; ufSP$4OKLz;Kz9P-By8>&1&jiJuD~~;2cX7Z7GrY&0000Y-zxQDW zk>mSwr*?&Ptx$M0VWC*NSXYyU7whhj_H9j})1S=R;xwtvyGtbe;L(K-6n6c{{$PJ0 zv>;S~#Z{oN-Nj(7Z5uBgTXTf>k>;b0h2asOZ62v9UX3{! zB)8m@QCf1zgccT7(Hy7tW{cFxY1eK}&-gJdP>p}_{#Gpu%Px(H=5AT7yH-sxy%hSZ zB;@Fw|K~4XOIx=0-9nWMzhCW|KiQ!`e#P~e@87SKzD{>|z`DaM`k&F+%y+ZDM0t11 zFh7)i@M+mnP4)v<^$fn{oQ%oyV2rBsWwz66IA~)~!~bP{_2#U1kN*?YcQW5ud=0>l>0U~Yv zN-r)2X>ny8b^IWECsw3}<>0}iZ(M7b*bf>`ZoVZhz~y)CYI=rw=0@kO)0Ql9H7L^B zZjyQV&XM5PQ|-Myiq8F?|NHLk>V@qb;v5YOIFLgS)9&KzID_pmdew*T^?!O$agO`g zk*gOak8kmt;Kw7reWD+Ki{A6Fj{C30)|Xi5R~)@~aplb9BMchOx3^UrKi{`)@1dtt z^K|!FoO}EyaaSjc^Q2`eN3N{NeKu{yt%A(w-xjG?Z{F&^np<<%`l~A+S%lQob9|k0 zsndAbOpAkw8*it(Z>gxe`#VN!Dw~t!xnBnrMRm2W1bL~So8c11ApPmm`#B=JHqWhJ zH~IAzjj87@y!`Wh)ePHv%BMFe{asR0qS*14(Pqc)W69UeXP^D??oV9$hdC-sKfh*} zqIkaSzi7=hT^}#?Q~o)u8jGWrzx~W(=Ps(UR`{tpUjy&#vtif6?=J4*_^r3p_*DE8 zkr(C<7N7h3W6ARATKN@mPjw}eHRmq*Fp-@}fdL2lu${xBbkXF$$(D&?L31G1Diup5L*l%Vq2+hq{ y%=p3UMY-zxQDW zk>mSwr*?&Ptx$M0VWC*NSXYyU7whhj_H9j})1S=R;xwtvyGtbe;L(K-6n6c{{$PJ0 zv>;S~#Z{oN-Nj(7Z5uBgTXTf>k>;b0h2asOZ62v9UX3{! zB)8m@QCf1zgccT7(Hy7tW{cFxY1eK}&-gJdP>p}_{#Gpu%Px(H=5AT7yH-sxy%hSZ zB;@Fw|K~4XOIx=0-9nWMzhCW|KiQ!`e#P~e@87SKzD{>|z`DaM`k&F+%y+ZDM0t11 zFh7)i@M+mnP4)v<^$fn{oQ%oyV2rBsWwz66IA~)~!~bP{_2#U1kNymC>d*GaVx586#CacAgYdV1UXll||Em+#guIc*hb|Jy^#_|u{V zJAz}Dy4_y>_xS9OpANqh%+=AqRJ_^sYh1t9ef`GwxBg@{H3kFZEi_&hwxAY?HoA zU;b}qiTgVSv+q~xWUuOqd}>rbzdK`|tKVwtZ$eML$~UrpEY)yod=@+o1z$5fs|_#Gy+| z)^Foo_3gS9V~on`l^eMlzR4Qo{#qrJP#r7XAdod{-z~Ehx9&?cWP-)+N-%JndB*2T uhrC_?Rcu1HLT#wxQ7euHhiM#t7&rWup3(B$#{`&O7(8A5T-G@yGywn;ZoQHK literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/meta.json new file mode 100644 index 00000000000..3b15d15f4bf --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Heavily modified by leonardo-dabepis, original sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From 00592037f4c8405a0d5bc27a914debe55288c398 Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Wed, 13 Mar 2024 19:44:43 -0400 Subject: [PATCH 23/94] Changes prosecutor's supervisor to CJ Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> --- Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml index 169951d8f58..952bcefa452 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml @@ -8,7 +8,7 @@ time: 36000 # 10 hrs startingGear: ProsecutorGear icon: "JobIconLawyer" - supervisors: job-supervisors-hop + supervisors: job-supervisors-cj access: - Justice - Prosecutor From 962fc6b7853cb3149bf4cc64cb615513a264e3c7 Mon Sep 17 00:00:00 2001 From: Timemaster99 Date: Wed, 13 Mar 2024 20:01:33 -0400 Subject: [PATCH 24/94] Attorney <- Lawyer locale edit --- Resources/Locale/en-US/job/job-names.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl index f58e560010f..fffc8e456ea 100644 --- a/Resources/Locale/en-US/job/job-names.ftl +++ b/Resources/Locale/en-US/job/job-names.ftl @@ -24,7 +24,7 @@ job-name-centcomoff = CentCom Official job-name-reporter = Reporter job-name-musician = Musician job-name-librarian = Librarian -job-name-lawyer = Lawyer +job-name-lawyer = Attorney # DeltaV - Justice dept rename job-name-mime = Mime job-name-ce = Chief Engineer job-name-janitor = Janitor From 3e6a65fb8b54dd5c1ea3d7d8790a8204706177b1 Mon Sep 17 00:00:00 2001 From: Timemaster99 Date: Wed, 13 Mar 2024 20:04:46 -0400 Subject: [PATCH 25/94] Removed modified shoukou file --- Resources/Maps/shoukou.yml | 15389 ++++++++++++++++++++--------------- 1 file changed, 8988 insertions(+), 6401 deletions(-) diff --git a/Resources/Maps/shoukou.yml b/Resources/Maps/shoukou.yml index 697167e4dbf..ea91cb0b433 100644 --- a/Resources/Maps/shoukou.yml +++ b/Resources/Maps/shoukou.yml @@ -12,35 +12,41 @@ tilemap: 22: FloorCarpetOffice 30: FloorDark 31: FloorDarkDiagonal + 32: FloorDarkDiagonalMini + 33: FloorDarkHerringbone + 34: FloorDarkMini 35: FloorDarkMono 36: FloorDarkOffset + 37: FloorDarkPavement + 38: FloorDarkPavementVertical 39: FloorDarkPlastic 42: FloorEighties 45: FloorFreezer 46: FloorGlass 48: FloorGrass - 52: FloorGrayConcrete + 54: FloorGrayConcreteSmooth 55: FloorGreenCircuit 56: FloorGym 57: FloorHull - 58: FloorHullReinforced 59: FloorHydro 61: FloorKitchen 62: FloorLaundry 63: FloorLino 65: FloorMetalDiamond 66: FloorMime - 74: FloorPlanetDirt - 75: FloorPlanetGrass 76: FloorPlastic 77: FloorRGlass 78: FloorReinforced 80: FloorRockVault + 82: FloorShuttleBlack 83: FloorShuttleBlue 92: FloorSteel + 93: FloorSteelBurnt 97: FloorSteelDiagonal + 98: FloorSteelDiagonalMini 99: FloorSteelDirty 100: FloorSteelHerringbone + 102: FloorSteelMini 103: FloorSteelMono 104: FloorSteelOffset 105: FloorSteelPavement @@ -55,8 +61,6 @@ tilemap: 122: FloorWoodTile 123: Lattice 124: Plating - 126: PlatingBurnt - 127: PlatingDamaged entities: - proto: "" entities: @@ -78,11 +82,11 @@ entities: version: 6 0,0: ind: 0,0 - tiles: XAAAAAAALgAAAAACXAAAAAADXAAAAAAALgAAAAACXAAAAAAAawAAAAAAYQAAAAABYQAAAAABYQAAAAADYQAAAAABYQAAAAABYQAAAAADYQAAAAAAagAAAAAATgAAAAAAXAAAAAABXAAAAAAAXAAAAAABXAAAAAADXAAAAAAAXAAAAAAATgAAAAAAaQAAAAAAaQAAAAACaQAAAAABaQAAAAADaQAAAAACZAAAAAAAYQAAAAABagAAAAACTgAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAAAXAAAAAACXAAAAAAAXAAAAAAAXAAAAAACagAAAAADYQAAAAADagAAAAABfAAAAAAAeQAAAAACeQAAAAADeQAAAAABeQAAAAACeQAAAAADeQAAAAADfAAAAAAAXAAAAAABXAAAAAACXAAAAAACXAAAAAAAXAAAAAABagAAAAADYQAAAAAAagAAAAADTgAAAAAAeQAAAAACeQAAAAAAeQAAAAADeQAAAAADeQAAAAACeQAAAAACfAAAAAAATgAAAAAATgAAAAAAawAAAAAATgAAAAAAfAAAAAAAagAAAAABYQAAAAADagAAAAADawAAAAAAeQAAAAACeQAAAAABeQAAAAAAeQAAAAABeQAAAAABeQAAAAADfAAAAAAAeQAAAAABeQAAAAAAeQAAAAAAeQAAAAADfAAAAAAAagAAAAACYQAAAAACagAAAAADTgAAAAAAeQAAAAADeQAAAAAAeQAAAAABeQAAAAAAeQAAAAADeQAAAAADfAAAAAAAeQAAAAADeQAAAAABeQAAAAABeQAAAAADTgAAAAAAagAAAAADYQAAAAAAagAAAAABfAAAAAAAeQAAAAADeQAAAAABeQAAAAADeQAAAAABeQAAAAAAeQAAAAAAfAAAAAAAeQAAAAADeQAAAAADeQAAAAADeQAAAAACTgAAAAAAagAAAAACYQAAAAADagAAAAABfAAAAAAAeQAAAAAAeQAAAAACeQAAAAACeQAAAAABeQAAAAACeQAAAAADfAAAAAAAeQAAAAACeQAAAAAAeQAAAAADeQAAAAADTgAAAAAAagAAAAADYQAAAAAAagAAAAADawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAYQAAAAAAagAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAagAAAAAAYQAAAAACagAAAAADfAAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAagAAAAABYQAAAAADagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAAawAAAAAATgAAAAAAfAAAAAAATQAAAAAAXAAAAAADTQAAAAACfAAAAAAAXAAAAAADXAAAAAAAXAAAAAADXAAAAAADTAAAAAACXAAAAAACXAAAAAABXAAAAAACXAAAAAADXAAAAAABXAAAAAABfAAAAAAATQAAAAABTQAAAAAATQAAAAAAawAAAAAAXAAAAAABXAAAAAADXAAAAAADXAAAAAACXAAAAAABXAAAAAACXAAAAAACXAAAAAAAXAAAAAAAXAAAAAADXAAAAAADTgAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAADHwAAAAAAHwAAAAABHwAAAAADHwAAAAABHwAAAAABHwAAAAAAHwAAAAACHwAAAAADHwAAAAAAXAAAAAADTgAAAAAA + tiles: XAAAAAAALgAAAAACXAAAAAADXAAAAAAALgAAAAACXAAAAAAAawAAAAAAYQAAAAABYQAAAAABYQAAAAADYQAAAAABYQAAAAABYQAAAAADYQAAAAAAagAAAAAATgAAAAAAXAAAAAABXAAAAAAAXAAAAAABXAAAAAADXAAAAAAAXAAAAAAATgAAAAAAaQAAAAAAaQAAAAACaQAAAAABaQAAAAADaQAAAAACZAAAAAAAYQAAAAABagAAAAACfAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAAAXAAAAAACXAAAAAAAXAAAAAAAXAAAAAACagAAAAADYQAAAAADagAAAAABfAAAAAAAeQAAAAACeQAAAAADeQAAAAABeQAAAAACeQAAAAADeQAAAAADfAAAAAAAXAAAAAABXAAAAAACXAAAAAACXAAAAAAAXAAAAAABagAAAAADYQAAAAAAagAAAAADTgAAAAAAeQAAAAACeQAAAAAAeQAAAAADeQAAAAADeQAAAAACeQAAAAACfAAAAAAATgAAAAAATgAAAAAAawAAAAAATgAAAAAAfAAAAAAAagAAAAABYQAAAAADagAAAAADawAAAAAAeQAAAAACeQAAAAABeQAAAAAAeQAAAAABeQAAAAABeQAAAAADfAAAAAAAeQAAAAABeQAAAAAAeQAAAAAAeQAAAAADfAAAAAAAagAAAAACYQAAAAACagAAAAADTgAAAAAAeQAAAAADeQAAAAAAeQAAAAABeQAAAAAAeQAAAAADeQAAAAADfAAAAAAAeQAAAAADeQAAAAABeQAAAAABeQAAAAADTgAAAAAAagAAAAADYQAAAAAAagAAAAABfAAAAAAAeQAAAAADeQAAAAABeQAAAAADeQAAAAABeQAAAAAAeQAAAAAAfAAAAAAAeQAAAAADeQAAAAADeQAAAAADeQAAAAACTgAAAAAAagAAAAACYQAAAAADagAAAAABfAAAAAAAeQAAAAAAeQAAAAACeQAAAAACeQAAAAABeQAAAAACeQAAAAADfAAAAAAAeQAAAAACeQAAAAAAeQAAAAADeQAAAAADTgAAAAAAagAAAAADYQAAAAAAagAAAAADawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAYQAAAAAAagAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAagAAAAAAYQAAAAACagAAAAADfAAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAagAAAAABYQAAAAADagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAAawAAAAAATgAAAAAAfAAAAAAATQAAAAAAXAAAAAADTQAAAAACfAAAAAAAXAAAAAADXAAAAAAAXAAAAAADXAAAAAADTAAAAAACXAAAAAACXAAAAAABXAAAAAACXAAAAAADXAAAAAABXAAAAAABfAAAAAAATQAAAAABTQAAAAAATQAAAAAAawAAAAAAXAAAAAABXAAAAAADXAAAAAADXAAAAAACXAAAAAABXAAAAAACXAAAAAACXAAAAAAAXAAAAAAAXAAAAAADXAAAAAADTgAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAADHwAAAAAAHwAAAAABHwAAAAADHwAAAAABHwAAAAABHwAAAAAAHwAAAAACHwAAAAADHwAAAAAAXAAAAAADTgAAAAAA version: 6 0,-1: ind: 0,-1 - tiles: fAAAAAAAbAAAAAAAbAAAAAAAfAAAAAAAbAAAAAAAfAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfAAAAAAAfAAAAAAAMAAAAAAAagAAAAADYQAAAAAAagAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAMAAAAAAAagAAAAADYQAAAAADagAAAAADXAAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAbAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAMAAAAAAAagAAAAAAYQAAAAADagAAAAABXAAAAAADDgAAAAACDgAAAAABDgAAAAACDgAAAAACDgAAAAAADgAAAAABfAAAAAAAbAAAAAAAfAAAAAAAfAAAAAAAZwAAAAADXAAAAAABagAAAAACYQAAAAACagAAAAAAXAAAAAABDgAAAAACDgAAAAACDgAAAAACDgAAAAAADgAAAAABDgAAAAADfAAAAAAAbAAAAAAAfAAAAAAAawAAAAAAXAAAAAACXAAAAAABagAAAAACYQAAAAACagAAAAADfAAAAAAAeQAAAAAAeQAAAAACeQAAAAAAeQAAAAACeQAAAAADeQAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAZwAAAAADXAAAAAABagAAAAADYQAAAAABagAAAAAAfAAAAAAAegAAAAAALgAAAAABLgAAAAAAegAAAAADLgAAAAADegAAAAAAfAAAAAAAKgAAAAAAKgAAAAAAfAAAAAAAfAAAAAAAMAAAAAAAagAAAAADYQAAAAADagAAAAABfAAAAAAAeQAAAAAAeQAAAAAAeQAAAAABeQAAAAACeQAAAAAAeQAAAAACawAAAAAAKgAAAAAAKgAAAAAAKgAAAAAATgAAAAAAMAAAAAAAagAAAAADYQAAAAACagAAAAADfAAAAAAADgAAAAADDgAAAAACDgAAAAADDgAAAAABDgAAAAAADgAAAAADfAAAAAAAKgAAAAAAKgAAAAAAKgAAAAAATgAAAAAAMAAAAAAAagAAAAAAYQAAAAAAagAAAAADfAAAAAAADgAAAAADDgAAAAAADgAAAAAADgAAAAADDgAAAAADDgAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAMAAAAAAAagAAAAACYQAAAAAAagAAAAABTgAAAAAADgAAAAABDgAAAAAADgAAAAABDgAAAAACDgAAAAAADgAAAAADDgAAAAABfAAAAAAAeQAAAAAAeQAAAAAATgAAAAAAMAAAAAAAagAAAAABYQAAAAADagAAAAACTgAAAAAADgAAAAADDgAAAAABDgAAAAAADgAAAAABDgAAAAAADgAAAAACDgAAAAADawAAAAAAeQAAAAABeQAAAAAATgAAAAAAMAAAAAAAagAAAAAAYQAAAAADagAAAAADTgAAAAAAeQAAAAACeQAAAAADeQAAAAACeQAAAAACeQAAAAABeQAAAAAAeQAAAAABfAAAAAAAeQAAAAADeQAAAAACfAAAAAAAMAAAAAAAagAAAAAAYQAAAAAAagAAAAABfAAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAAawAAAAAATgAAAAAAfAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAfAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAagAAAAAAYQAAAAABagAAAAAATgAAAAAAXAAAAAAAXAAAAAACXAAAAAADXAAAAAABXAAAAAACXAAAAAADTgAAAAAAaQAAAAABaQAAAAAAaQAAAAABaQAAAAACaQAAAAABZAAAAAABYQAAAAAAagAAAAABawAAAAAA + tiles: fAAAAAAAbAAAAAAAbAAAAAAAfAAAAAAAbAAAAAAAfAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfAAAAAAAfAAAAAAAMAAAAAAAagAAAAADYQAAAAAAagAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAMAAAAAAAagAAAAADYQAAAAADagAAAAADTgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAbAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAMAAAAAAAagAAAAAAYQAAAAADagAAAAABTQAAAAAADgAAAAACDgAAAAABDgAAAAACDgAAAAACDgAAAAAADgAAAAABfAAAAAAAbAAAAAAAfAAAAAAAfAAAAAAAZwAAAAADXAAAAAABagAAAAACYQAAAAACagAAAAAATgAAAAAADgAAAAACDgAAAAACDgAAAAACDgAAAAAADgAAAAABDgAAAAADfAAAAAAAbAAAAAAAfAAAAAAAawAAAAAAXAAAAAACXAAAAAABagAAAAACYQAAAAACagAAAAADfAAAAAAAeQAAAAAAeQAAAAACeQAAAAAAeQAAAAACeQAAAAADeQAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAZwAAAAADXAAAAAABagAAAAADYQAAAAABagAAAAAATgAAAAAAegAAAAAALgAAAAABLgAAAAAAegAAAAADLgAAAAADegAAAAAAfAAAAAAAKgAAAAAAKgAAAAAAfAAAAAAAfAAAAAAAMAAAAAAAagAAAAADYQAAAAADagAAAAABTgAAAAAAeQAAAAAAeQAAAAAAeQAAAAABeQAAAAACeQAAAAAAeQAAAAACawAAAAAAKgAAAAAAKgAAAAAAKgAAAAAATgAAAAAAMAAAAAAAagAAAAADYQAAAAACagAAAAADfAAAAAAADgAAAAADDgAAAAACDgAAAAADDgAAAAABDgAAAAAADgAAAAADfAAAAAAAKgAAAAAAKgAAAAAAKgAAAAAATgAAAAAAMAAAAAAAagAAAAAAYQAAAAAAagAAAAADTgAAAAAADgAAAAADDgAAAAAADgAAAAAADgAAAAADDgAAAAADDgAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAMAAAAAAAagAAAAACYQAAAAAAagAAAAABTgAAAAAADgAAAAABDgAAAAAADgAAAAABDgAAAAACDgAAAAAADgAAAAADDgAAAAABfAAAAAAAeQAAAAAAeQAAAAAATgAAAAAAMAAAAAAAagAAAAABYQAAAAADagAAAAACfAAAAAAADgAAAAADDgAAAAABDgAAAAAADgAAAAABDgAAAAAADgAAAAACDgAAAAADawAAAAAAeQAAAAABeQAAAAAATgAAAAAAMAAAAAAAagAAAAAAYQAAAAADagAAAAADTgAAAAAAeQAAAAACeQAAAAADeQAAAAACeQAAAAACeQAAAAABeQAAAAAAeQAAAAABfAAAAAAAeQAAAAADeQAAAAACfAAAAAAAMAAAAAAAagAAAAAAYQAAAAAAagAAAAABTgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAAawAAAAAATgAAAAAAfAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAfAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAagAAAAAAYQAAAAABagAAAAAAfAAAAAAAXAAAAAAAXAAAAAACXAAAAAADXAAAAAABXAAAAAACXAAAAAADTgAAAAAAaQAAAAABaQAAAAAAaQAAAAABaQAAAAACaQAAAAABZAAAAAABYQAAAAAAagAAAAABIwAAAAAA version: 6 -2,0: ind: -2,0 @@ -162,7 +166,7 @@ entities: version: 6 1,-2: ind: 1,-2 - tiles: fAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAYQAAAAAAagAAAAAATgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAfAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAfAAAAAAAagAAAAAAYQAAAAAAagAAAAAATgAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAeQAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAfAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAfAAAAAAAagAAAAAAYQAAAAAAagAAAAAATgAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAeQAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAawAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAfAAAAAAAagAAAAAAYQAAAAAAagAAAAAATgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAawAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAfAAAAAAAagAAAAAAYQAAAAAAagAAAAAAfAAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAeQAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAfAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAfAAAAAAAagAAAAAAYQAAAAAAagAAAAAAfAAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAeQAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAYQAAAAAAagAAAAAAfAAAAAAATgAAAAAATgAAAAAAfAAAAAAAawAAAAAAfAAAAAAATgAAAAAATgAAAAAAXAAAAAACaQAAAAAAaQAAAAACaQAAAAABaQAAAAAAZAAAAAAAYQAAAAAAZAAAAAAAaQAAAAADaQAAAAAAaQAAAAADaQAAAAACaQAAAAABaQAAAAABaQAAAAABaQAAAAACYQAAAAADYQAAAAAAYQAAAAACYQAAAAAAYQAAAAADYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAACYQAAAAADYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAADaQAAAAACaQAAAAACaQAAAAACaQAAAAABaQAAAAADaQAAAAABZAAAAAABaQAAAAAAaQAAAAAAaQAAAAABaQAAAAAAaQAAAAAAaQAAAAABaQAAAAADaQAAAAAAaQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAfAAAAAAAHgAAAAADHgAAAAADHgAAAAACHgAAAAACfAAAAAAAHgAAAAACHgAAAAACHgAAAAACHgAAAAACHgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAADTQAAAAABXAAAAAABXAAAAAACTQAAAAABfAAAAAAAHgAAAAADHgAAAAABHgAAAAABHgAAAAACHgAAAAABfAAAAAAAHgAAAAABFgAAAAAAFgAAAAAAfAAAAAAAHgAAAAADXAAAAAACTQAAAAABXAAAAAACXAAAAAABTgAAAAAAXAAAAAABXAAAAAAAXAAAAAABXAAAAAAAXAAAAAACfAAAAAAAHgAAAAADFgAAAAAAFgAAAAAAfAAAAAAAHgAAAAABXAAAAAADXAAAAAADTQAAAAACXAAAAAAAawAAAAAAXAAAAAABXAAAAAADXAAAAAADXAAAAAAAXAAAAAADawAAAAAAHgAAAAADFgAAAAAAFgAAAAAAfAAAAAAAHgAAAAAATQAAAAABXAAAAAACXAAAAAAATQAAAAADTgAAAAAAXAAAAAACXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAACfAAAAAAAHgAAAAABFgAAAAAAFgAAAAAAfAAAAAAA + tiles: fAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAYQAAAAAAagAAAAAATgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAfAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAfAAAAAAAagAAAAAAYQAAAAAAagAAAAAATgAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAeQAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAfAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAfAAAAAAAagAAAAAAYQAAAAAAagAAAAAATgAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAeQAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAawAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAfAAAAAAAagAAAAAAYQAAAAAAagAAAAAATgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAawAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAfAAAAAAAagAAAAAAYQAAAAAAagAAAAAAfAAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAeQAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAfAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAfAAAAAAAagAAAAAAYQAAAAAAagAAAAAAfAAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAeQAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAYQAAAAAAagAAAAAAfAAAAAAATgAAAAAATgAAAAAAfAAAAAAAawAAAAAAfAAAAAAATgAAAAAATgAAAAAAXAAAAAACaQAAAAAAaQAAAAACaQAAAAABaQAAAAAAZAAAAAAAYQAAAAAAZAAAAAAAaQAAAAADaQAAAAAAaQAAAAADaQAAAAACaQAAAAABaQAAAAABaQAAAAABaQAAAAACYQAAAAADYQAAAAAAYQAAAAACYQAAAAAAYQAAAAADYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAACYQAAAAADYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAADaQAAAAACaQAAAAACaQAAAAACaQAAAAABaQAAAAADaQAAAAABZAAAAAABaQAAAAAAaQAAAAAAaQAAAAABaQAAAAAAaQAAAAAAaQAAAAABaQAAAAADaQAAAAAAaQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAfAAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAIQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAbAAAAAAAHwAAAAAAIAAAAAAAIAAAAAAAHwAAAAAATgAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAJgAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAHwAAAAAAIAAAAAAAIAAAAAAAHwAAAAAATQAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAJgAAAAAAfAAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAIAAAAAAAIAAAAAAAHwAAAAAATgAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAJgAAAAAAfAAAAAAAHwAAAAAAJAAAAAAAJAAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfAAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAJgAAAAAAfAAAAAAAHwAAAAAAJAAAAAAAHwAAAAAA version: 6 -2,-4: ind: -2,-4 @@ -170,27 +174,27 @@ entities: version: 6 1,-1: ind: 1,-1 - tiles: fAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAAAHgAAAAABXAAAAAABXAAAAAABXAAAAAADfAAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAawAAAAAAHgAAAAACHgAAAAACHgAAAAAAHgAAAAADTgAAAAAAHgAAAAADHgAAAAAAXAAAAAAAXAAAAAABXAAAAAABXAAAAAADXAAAAAABXAAAAAAAXAAAAAABXAAAAAADawAAAAAAHgAAAAACHgAAAAABHgAAAAACHgAAAAACawAAAAAAHgAAAAAAHgAAAAADXAAAAAADXAAAAAAAXAAAAAABXAAAAAABXAAAAAAAXAAAAAACXAAAAAABXAAAAAADTgAAAAAAHgAAAAAAHgAAAAABHgAAAAABHgAAAAABTgAAAAAAHgAAAAADHgAAAAACXAAAAAACXAAAAAACfAAAAAAATgAAAAAAawAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAHgAAAAACHgAAAAAAXAAAAAAAXAAAAAABfAAAAAAAHgAAAAABHgAAAAADHgAAAAAAHgAAAAAAawAAAAAAHgAAAAACHgAAAAADTgAAAAAAXAAAAAABXAAAAAADXAAAAAAAXAAAAAADXAAAAAAAXAAAAAADXAAAAAACTgAAAAAAHgAAAAACHgAAAAACHgAAAAABHgAAAAADfAAAAAAAHgAAAAABHgAAAAABawAAAAAAXAAAAAAAXAAAAAADXAAAAAAAXAAAAAAAXAAAAAACXAAAAAADXAAAAAABTgAAAAAAHgAAAAAAHgAAAAABHgAAAAADHgAAAAABfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAACXAAAAAACXAAAAAADXAAAAAACXAAAAAAATgAAAAAAXAAAAAACXAAAAAAAXAAAAAAATgAAAAAAHgAAAAADHgAAAAADHgAAAAACHgAAAAACfAAAAAAAOgAAAAAATQAAAAAATQAAAAABXAAAAAACTQAAAAABTQAAAAACTgAAAAAAXAAAAAACXAAAAAABXAAAAAAATgAAAAAAHgAAAAACHgAAAAACHgAAAAABHgAAAAABfAAAAAAAOgAAAAAAXAAAAAAAXAAAAAACXAAAAAAAXAAAAAADXAAAAAADTgAAAAAAXAAAAAAAXAAAAAABXAAAAAABTgAAAAAAHgAAAAACHgAAAAACHgAAAAABHgAAAAACfAAAAAAAOgAAAAAATQAAAAAATQAAAAADXAAAAAAATQAAAAAATQAAAAACTgAAAAAAXAAAAAACXAAAAAADXAAAAAACfAAAAAAATgAAAAAATgAAAAAAawAAAAAATgAAAAAAfAAAAAAATgAAAAAAXAAAAAABXAAAAAADXAAAAAACXAAAAAAAXAAAAAACfAAAAAAAXAAAAAADXAAAAAACXAAAAAADXAAAAAACXAAAAAACXAAAAAADXAAAAAACXAAAAAABXAAAAAABTAAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAABXAAAAAAAXAAAAAABXAAAAAABXAAAAAABXAAAAAACXAAAAAAAXAAAAAADXAAAAAADTAAAAAACeAAAAAABeAAAAAAAeAAAAAABeAAAAAAAfAAAAAAAXAAAAAACXAAAAAACXAAAAAACfAAAAAAATgAAAAAATgAAAAAAawAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAeAAAAAACeAAAAAAAeAAAAAACeAAAAAAAfAAAAAAAXAAAAAAAXAAAAAADXAAAAAAAHgAAAAABHgAAAAAAHgAAAAADHgAAAAACHgAAAAADHgAAAAACHgAAAAAAfAAAAAAA + tiles: TgAAAAAAIwAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAATQAAAAAATgAAAAAAfAAAAAAAfAAAAAAAHwAAAAAAJAAAAAAAHwAAAAAAJQAAAAAAJQAAAAAAJQAAAAAATgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAIwAAAAAAHwAAAAAAJAAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAATQAAAAAAHwAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAIwAAAAAAJAAAAAAAJAAAAAAAHwAAAAAAJQAAAAAAJQAAAAAAJQAAAAAATgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAJAAAAAAAHwAAAAAAHwAAAAAAIwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAIgAAAAAAHwAAAAAAJAAAAAAAHwAAAAAAIgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAZgAAAAAAZgAAAAAAZwAAAAAAZgAAAAAAaAAAAAAAaAAAAAAAfAAAAAAAIgAAAAAAHwAAAAAAJAAAAAAAHwAAAAAAIgAAAAAAfAAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAZgAAAAAAZgAAAAAATgAAAAAAZwAAAAAAaAAAAAAAaAAAAAAATgAAAAAAIgAAAAAAHwAAAAAAJAAAAAAAHwAAAAAAIgAAAAAAfAAAAAAAIQAAAAAAJQAAAAAAJQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAAAaAAAAAAAaAAAAAAATQAAAAAAIgAAAAAAHwAAAAAAJAAAAAAAHwAAAAAAIgAAAAAAfAAAAAAAJgAAAAAAUgAAAAAAUgAAAAAAZgAAAAAAZgAAAAAAZwAAAAAAZgAAAAAAaAAAAAAAaAAAAAAAfAAAAAAAIgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAIgAAAAAAfAAAAAAAJgAAAAAAUgAAAAAAUgAAAAAAZgAAAAAAZgAAAAAATgAAAAAAZwAAAAAAaAAAAAAAaAAAAAAAfAAAAAAAfAAAAAAATgAAAAAATQAAAAAATgAAAAAAfAAAAAAAfAAAAAAAIQAAAAAAJQAAAAAAJQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAAAaAAAAAAAaAAAAAAATQAAAAAAIQAAAAAAJgAAAAAAHwAAAAAAJgAAAAAAJgAAAAAAfAAAAAAAfAAAAAAAIwAAAAAAIwAAAAAAZgAAAAAAZgAAAAAAZwAAAAAAZgAAAAAAaAAAAAAAaAAAAAAATgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAAZgAAAAAAZgAAAAAATgAAAAAAZwAAAAAAaAAAAAAAaAAAAAAAfAAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAAJwAAAAAAJwAAAAAAJwAAAAAAJwAAAAAAfAAAAAAAJQAAAAAAJQAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAAJwAAAAAAJwAAAAAAJwAAAAAAJwAAAAAAIwAAAAAAHwAAAAAAHwAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAA version: 6 1,0: ind: 1,0 - tiles: eAAAAAAAeAAAAAACeAAAAAADeAAAAAABawAAAAAAXAAAAAACXAAAAAABXAAAAAACHgAAAAACHgAAAAABHgAAAAAAHgAAAAADHgAAAAADHgAAAAADHgAAAAABfAAAAAAAeAAAAAABeAAAAAACeAAAAAADeAAAAAADfAAAAAAAXAAAAAAAXAAAAAACXAAAAAACTgAAAAAAHgAAAAADHgAAAAACHgAAAAADHgAAAAAAHgAAAAAAHgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAAawAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAeQAAAAADfAAAAAAAfAAAAAAAbAAAAAAAbQAAAAAAfAAAAAAAHgAAAAAAHgAAAAABHgAAAAACHgAAAAACfAAAAAAAfAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAeQAAAAADfAAAAAAAfAAAAAAAbAAAAAAAbAAAAAAAfAAAAAAAHgAAAAAAHgAAAAADHgAAAAADHgAAAAAAfAAAAAAAfAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAeQAAAAADfAAAAAAAfAAAAAAAbAAAAAAAbQAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAeQAAAAACeQAAAAADeQAAAAADeQAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAeQAAAAACfAAAAAAAawAAAAAAfAAAAAAAeQAAAAACfAAAAAAAewAAAAAAAAAAAAAAewAAAAAAAAAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAeQAAAAADfAAAAAAAawAAAAAAfAAAAAAAeQAAAAAAfAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAeQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAeQAAAAADfAAAAAAAewAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAewAAAAAAAAAAAAAATQAAAAAAeAAAAAAATQAAAAAAeAAAAAAATgAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAewAAAAAAAAAAAAAAeAAAAAAATQAAAAAAeAAAAAAATQAAAAAATgAAAAAAewAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAA + tiles: JwAAAAAAJwAAAAAAJwAAAAAAJwAAAAAAfAAAAAAAJQAAAAAAJQAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAAJwAAAAAAJwAAAAAAJwAAAAAAJwAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAbAAAAAAAbAAAAAAAfAAAAAAATgAAAAAAIwAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAbAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAJgAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAeQAAAAADfAAAAAAAfAAAAAAAbAAAAAAAfAAAAAAAJQAAAAAAJQAAAAAAfAAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAJgAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAeQAAAAADfAAAAAAAfAAAAAAAbAAAAAAAfAAAAAAAeQAAAAAAeQAAAAAAegAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAJgAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAeQAAAAADfAAAAAAAfAAAAAAAbAAAAAAAfAAAAAAAJQAAAAAAJQAAAAAAfAAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAJgAAAAAAeQAAAAACeQAAAAADeQAAAAADeQAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAeQAAAAACfAAAAAAAawAAAAAAfAAAAAAAeQAAAAACfAAAAAAAewAAAAAAAAAAAAAAewAAAAAAAAAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAeQAAAAADfAAAAAAAawAAAAAAfAAAAAAAeQAAAAAAfAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAeQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAeQAAAAADfAAAAAAAewAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAewAAAAAAAAAAAAAATQAAAAAAeAAAAAAATQAAAAAAeAAAAAAATgAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAewAAAAAAAAAAAAAAeAAAAAAATQAAAAAAeAAAAAAATQAAAAAATgAAAAAAewAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAA version: 6 2,-2: ind: 2,-2 - tiles: TgAAAAAAagAAAAAAYQAAAAAAagAAAAAAfAAAAAAAeQAAAAAALgAAAAAAeQAAAAAALgAAAAAAfAAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAATgAAAAAAagAAAAAAYQAAAAAAagAAAAAAfAAAAAAALgAAAAAAeQAAAAAALgAAAAAAeQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAATgAAAAAAfAAAAAAAfAAAAAAATgAAAAAAagAAAAAAYQAAAAAAagAAAAAAfAAAAAAAeQAAAAAALgAAAAAAeQAAAAAALgAAAAAAfAAAAAAAHgAAAAAAHgAAAAAAHwAAAAAAHgAAAAAAHgAAAAAAfAAAAAAATgAAAAAAagAAAAAAYQAAAAAAagAAAAAAfAAAAAAALgAAAAAAeQAAAAAALgAAAAAAeQAAAAAAawAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAawAAAAAAfAAAAAAAagAAAAAAYQAAAAAAagAAAAAAfAAAAAAAeQAAAAAALgAAAAAAeQAAAAAALgAAAAAAfAAAAAAAHgAAAAAAHwAAAAAAHgAAAAAAHwAAAAAAHgAAAAAAfAAAAAAAfAAAAAAAagAAAAAAYQAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAAawAAAAAAfAAAAAAAawAAAAAATgAAAAAAfAAAAAAAfAAAAAAAagAAAAAAYQAAAAAAagAAAAAAfAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAfAAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAfAAAAAAAaQAAAAAAZAAAAAAAYQAAAAAAZAAAAAAAaQAAAAADaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAYQAAAAADYQAAAAACYQAAAAAAYQAAAAABYQAAAAADYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAaQAAAAADaQAAAAACaQAAAAABaQAAAAACaQAAAAADaQAAAAADaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAADaQAAAAADMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAANAAAAAADfAAAAAAANAAAAAABfAAAAAAASwAAAAAASwAAAAAAegAAAAABfAAAAAAAewAAAAAAewAAAAAAAAAAAAAAewAAAAAAAAAAAAAAawAAAAAAfAAAAAAAfAAAAAAANAAAAAACfAAAAAAANAAAAAAAfAAAAAAASwAAAAADSgAAAAAAeQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAASgAAAAAAeQAAAAABFAAAAAAGfAAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAAAAAAAAAawAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfwAAAAACFAAAAAAGeQAAAAADfAAAAAAATQAAAAAAeAAAAAAATQAAAAAATgAAAAAAAAAAAAAA + tiles: TgAAAAAAagAAAAAAYQAAAAAAagAAAAAAfAAAAAAAeQAAAAAALgAAAAAAeQAAAAAALgAAAAAAfAAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAATgAAAAAAagAAAAAAYQAAAAAAagAAAAAAfAAAAAAALgAAAAAAeQAAAAAALgAAAAAAeQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAATgAAAAAAfAAAAAAAfAAAAAAATgAAAAAAagAAAAAAYQAAAAAAagAAAAAAfAAAAAAAeQAAAAAALgAAAAAAeQAAAAAALgAAAAAAfAAAAAAAHgAAAAAAHgAAAAAAHwAAAAAAHgAAAAAAHgAAAAAAfAAAAAAATgAAAAAAagAAAAAAYQAAAAAAagAAAAAAfAAAAAAALgAAAAAAeQAAAAAALgAAAAAAeQAAAAAAawAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAawAAAAAAfAAAAAAAagAAAAAAYQAAAAAAagAAAAAAfAAAAAAAeQAAAAAALgAAAAAAeQAAAAAALgAAAAAAfAAAAAAAHgAAAAAAHwAAAAAAHgAAAAAAHwAAAAAAHgAAAAAAfAAAAAAAfAAAAAAAagAAAAAAYQAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAAawAAAAAAfAAAAAAAawAAAAAATgAAAAAAfAAAAAAAfAAAAAAAagAAAAAAYQAAAAAAagAAAAAAfAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAfAAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAfAAAAAAAaQAAAAAAZAAAAAAAYQAAAAAAZAAAAAAAaQAAAAADaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAYQAAAAADYQAAAAACYQAAAAAAYQAAAAABYQAAAAADYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAaQAAAAADZAAAAAAAYQAAAAAAZAAAAAAAaQAAAAADaQAAAAADaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAfAAAAAAAZAAAAAAAaQAAAAAAZAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAfAAAAAAAfAAAAAAATgAAAAAATQAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfAAAAAAAIQAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAIQAAAAAAfAAAAAAAewAAAAAAewAAAAAAAAAAAAAAewAAAAAAAAAAAAAAHwAAAAAAHwAAAAAAJAAAAAAAHwAAAAAAIwAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAHwAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAAAAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAIwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfAAAAAAATQAAAAAAeAAAAAAATQAAAAAATgAAAAAAewAAAAAA version: 6 2,-1: ind: 2,-1 - tiles: fAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfgAAAAAAfAAAAAAAfAAAAAAAeAAAAAAATQAAAAAAeAAAAAAATgAAAAAAAAAAAAAAXAAAAAAAXAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAAawAAAAAATgAAAAAAfAAAAAAAfAAAAAAAXAAAAAADXAAAAAABfAAAAAAAawAAAAAAfAAAAAAAawAAAAAAfAAAAAAAHgAAAAAAHgAAAAAAawAAAAAAXAAAAAADXAAAAAACXAAAAAADXAAAAAABTgAAAAAAHgAAAAABfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAAAHgAAAAABTgAAAAAATQAAAAAAXAAAAAADXAAAAAAATQAAAAAAawAAAAAAHgAAAAABHgAAAAACJwAAAAADfAAAAAAAawAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATQAAAAACXAAAAAABXAAAAAADTQAAAAABfAAAAAAAfAAAAAAAHgAAAAABHgAAAAABfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAAAHgAAAAACawAAAAAAXAAAAAAATQAAAAADTQAAAAACXAAAAAABTgAAAAAAHgAAAAADHgAAAAACHgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAHgAAAAADHgAAAAADTgAAAAAAXAAAAAADTQAAAAADTQAAAAABXAAAAAACawAAAAAAHgAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATQAAAAAAXAAAAAABXAAAAAACTQAAAAADfAAAAAAAfAAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAHgAAAAAAHgAAAAABawAAAAAATQAAAAACXAAAAAACXAAAAAAATQAAAAABTgAAAAAAHgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAAAHgAAAAACTgAAAAAAXAAAAAACXAAAAAABXAAAAAABXAAAAAAAawAAAAAAHgAAAAAAOgAAAAAAOgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAAawAAAAAAawAAAAAATgAAAAAAfAAAAAAAfAAAAAAAXAAAAAABTgAAAAAAfAAAAAAAXAAAAAADXAAAAAACTgAAAAAAHgAAAAABHgAAAAAATgAAAAAAXAAAAAAATQAAAAADXAAAAAADTQAAAAADXAAAAAABfAAAAAAAeQAAAAADXAAAAAABXAAAAAABXAAAAAAAXAAAAAABXAAAAAADawAAAAAAHgAAAAABHgAAAAACawAAAAAAXAAAAAAAXAAAAAACXAAAAAADXAAAAAADXAAAAAACawAAAAAAeQAAAAABXAAAAAABXAAAAAABXAAAAAADXAAAAAADXAAAAAADTgAAAAAAHgAAAAACHgAAAAABTgAAAAAAXAAAAAAATQAAAAACXAAAAAACTQAAAAAAXAAAAAACTgAAAAAAeQAAAAAAXAAAAAACXAAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAABXAAAAAABXAAAAAABXAAAAAACXAAAAAABTgAAAAAAeQAAAAABfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfAAAAAAAXAAAAAADTQAAAAABXAAAAAAATQAAAAAAXAAAAAABTgAAAAAAeQAAAAAC + tiles: fAAAAAAATgAAAAAAIwAAAAAATgAAAAAAfAAAAAAAfAAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfAAAAAAAeAAAAAAATQAAAAAAeAAAAAAATgAAAAAAewAAAAAATgAAAAAAJgAAAAAAJQAAAAAAJQAAAAAAJgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAAawAAAAAATgAAAAAAfAAAAAAAfAAAAAAATgAAAAAAJgAAAAAAIAAAAAAAIAAAAAAAJgAAAAAAfAAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAfAAAAAAAXAAAAAADXAAAAAACXAAAAAADXAAAAAABTgAAAAAAHgAAAAABTgAAAAAAJgAAAAAAIAAAAAAAIAAAAAAAJgAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAfAAAAAAATQAAAAAAXAAAAAADXAAAAAAATQAAAAAAawAAAAAAHgAAAAABfAAAAAAAJgAAAAAAJQAAAAAAJQAAAAAAJgAAAAAAfAAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAfAAAAAAATQAAAAACXAAAAAABXAAAAAADTQAAAAABfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAAIwAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAAATQAAAAADTQAAAAACXAAAAAABTgAAAAAAHgAAAAADJQAAAAAAJQAAAAAAIQAAAAAAQQAAAAAAfAAAAAAAQQAAAAAAYgAAAAAAfAAAAAAAbwAAAAAAZwAAAAAAXAAAAAADTQAAAAADTQAAAAABXAAAAAACawAAAAAAHgAAAAACUgAAAAAAUgAAAAAAJgAAAAAAQQAAAAAAfAAAAAAAQQAAAAAAYgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATQAAAAAAXAAAAAABXAAAAAACTQAAAAADfAAAAAAAfAAAAAAAUgAAAAAAUgAAAAAAJgAAAAAAQQAAAAAAfAAAAAAAQQAAAAAAYgAAAAAAQQAAAAAAfAAAAAAAZwAAAAAATQAAAAACXAAAAAACXAAAAAAATQAAAAABTgAAAAAAHgAAAAAAJQAAAAAAJQAAAAAAIQAAAAAAQQAAAAAAfAAAAAAAQQAAAAAAYgAAAAAAQQAAAAAAfAAAAAAAZwAAAAAAXAAAAAACXAAAAAABXAAAAAABXAAAAAAAawAAAAAAHgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAATQAAAAAATgAAAAAAfAAAAAAAfAAAAAAATgAAAAAAawAAAAAAawAAAAAATgAAAAAAfAAAAAAAfAAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAATgAAAAAAaQAAAAAAaQAAAAAAaQAAAAAATgAAAAAAXAAAAAAATQAAAAADXAAAAAADTQAAAAADXAAAAAABfAAAAAAAeQAAAAADHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAATQAAAAAAXAAAAAAAXAAAAAAAXAAAAAAATQAAAAAAXAAAAAAAXAAAAAACXAAAAAADXAAAAAADXAAAAAACawAAAAAAeQAAAAABJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAATgAAAAAAaQAAAAAAaQAAAAAAaQAAAAAATgAAAAAAXAAAAAAATQAAAAACXAAAAAACTQAAAAAAXAAAAAACTgAAAAAAeQAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAZwAAAAAAXAAAAAABXAAAAAABXAAAAAACXAAAAAABTgAAAAAAeQAAAAABfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfAAAAAAAXAAAAAADTQAAAAABXAAAAAAATQAAAAAAXAAAAAABTgAAAAAAeQAAAAAC version: 6 2,0: ind: 2,0 - tiles: awAAAAAAfAAAAAAAawAAAAAAfAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfAAAAAAAXAAAAAAAXAAAAAADXAAAAAAAXAAAAAACXAAAAAADawAAAAAAeQAAAAAAawAAAAAAfAAAAAAAawAAAAAAfAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfAAAAAAAXAAAAAACTQAAAAACXAAAAAACTQAAAAAAXAAAAAAAfAAAAAAAXAAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAATgAAAAAAawAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAOwAAAAAAOwAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAXAAAAAADXAAAAAADXAAAAAAAXAAAAAAAfAAAAAAAewAAAAAAawAAAAAAfAAAAAAAawAAAAAAfAAAAAAAOwAAAAAAOwAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAATQAAAAABTQAAAAAAXAAAAAACXAAAAAAATgAAAAAAewAAAAAAawAAAAAAfAAAAAAAawAAAAAAfAAAAAAAOwAAAAAAOwAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAXAAAAAACXAAAAAAATQAAAAACTQAAAAADTgAAAAAAewAAAAAAawAAAAAAfAAAAAAAawAAAAAAfAAAAAAAOwAAAAAAOwAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAXAAAAAAAXAAAAAADXAAAAAACXAAAAAABfAAAAAAAewAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAewAAAAAAawAAAAAAawAAAAAAfAAAAAAAewAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAewAAAAAATgAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAewAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAewAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAewAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: fAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfAAAAAAAXAAAAAAAXAAAAAADXAAAAAAAXAAAAAACXAAAAAADawAAAAAAeQAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfAAAAAAAXAAAAAACTQAAAAACXAAAAAACTQAAAAAAXAAAAAAAfAAAAAAAXAAAAAADfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAATgAAAAAAawAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAOwAAAAAAOwAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAXAAAAAADXAAAAAADXAAAAAAAXAAAAAAAfAAAAAAAewAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAOwAAAAAAOwAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAATQAAAAABTQAAAAAAXAAAAAACXAAAAAAATgAAAAAAewAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAOwAAAAAAOwAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAXAAAAAACXAAAAAAATQAAAAACTQAAAAADTgAAAAAAewAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAOwAAAAAAOwAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAXQAAAAAAXAAAAAADXAAAAAACXAAAAAABfAAAAAAAewAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAewAAAAAAawAAAAAAawAAAAAAfAAAAAAAewAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAewAAAAAATgAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAewAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAewAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAewAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 2,-3: ind: 2,-3 - tiles: fAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATgAAAAAAfAAAAAAAfAAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAZAAAAAAAaQAAAAAAZAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfAAAAAAAagAAAAAAYQAAAAAAagAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAHgAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAHgAAAAAAfAAAAAAAagAAAAAAYQAAAAAAagAAAAAAfAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAATgAAAAAAHgAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAHgAAAAAAfAAAAAAAagAAAAAAYQAAAAAAagAAAAAAawAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAawAAAAAAHgAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAHgAAAAAAawAAAAAAagAAAAAAYQAAAAAAagAAAAAAfAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAATgAAAAAAHgAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAHgAAAAAAfAAAAAAAagAAAAAAYQAAAAAAagAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAHgAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAHgAAAAAA + tiles: fAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATgAAAAAAfAAAAAAAfAAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAZAAAAAAAaQAAAAAAZAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfAAAAAAAagAAAAAAYQAAAAAAagAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAHgAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAHgAAAAAAfAAAAAAAagAAAAAAYQAAAAAAagAAAAAAfAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAATgAAAAAAHgAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAHgAAAAAAfAAAAAAAagAAAAAAYQAAAAAAagAAAAAAfAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAawAAAAAAHgAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAHgAAAAAAawAAAAAAagAAAAAAYQAAAAAAagAAAAAAfAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAATgAAAAAAHgAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAHgAAAAAAfAAAAAAAagAAAAAAYQAAAAAAagAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAHgAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAHgAAAAAA version: 6 -1,-4: ind: -1,-4 @@ -210,7 +214,7 @@ entities: version: 6 0,1: ind: 0,1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAXAAAAAABHwAAAAAAHwAAAAAAHwAAAAACHwAAAAACHwAAAAADHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAABXAAAAAADawAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAXAAAAAAAHwAAAAACHwAAAAABHwAAAAABHwAAAAADHwAAAAADHwAAAAADHwAAAAABHwAAAAAAHwAAAAADXAAAAAABTgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAXAAAAAADXAAAAAAAXAAAAAABXAAAAAABXAAAAAACXAAAAAADXAAAAAAAXAAAAAAAXAAAAAACXAAAAAACXAAAAAADTgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAATAAAAAADXAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAXAAAAAACXAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAATgAAAAAAawAAAAAAfAAAAAAAAAAAAAAAewAAAAAAewAAAAAAfAAAAAAAawAAAAAATgAAAAAAfAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAXAAAAAABHwAAAAAAHwAAAAAAHwAAAAACHwAAAAACHwAAAAADHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAABXAAAAAADawAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAXAAAAAAAHwAAAAACHwAAAAABHwAAAAABHwAAAAADHwAAAAADHwAAAAADHwAAAAABHwAAAAAAHwAAAAADXAAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAXAAAAAADXAAAAAAAXAAAAAABXAAAAAABXAAAAAACXAAAAAADXAAAAAAAXAAAAAAAXAAAAAACXAAAAAACXAAAAAADTgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAATAAAAAADXAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAXAAAAAACXAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAATgAAAAAAawAAAAAAfAAAAAAAAAAAAAAAewAAAAAAewAAAAAAfAAAAAAAawAAAAAATgAAAAAAfAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 1,-4: ind: 1,-4 @@ -242,7 +246,7 @@ entities: version: 6 1,1: ind: 1,1 - tiles: TQAAAAAAeAAAAAAATQAAAAAAeAAAAAAATgAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAeAAAAAAATQAAAAAAeAAAAAAATQAAAAAATgAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAewAAAAAATQAAAAAAeAAAAAAATQAAAAAAeAAAAAAATgAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: TQAAAAAAeAAAAAAATQAAAAAAeAAAAAAATgAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 2,1: ind: 2,1 @@ -276,8 +280,8 @@ entities: color: '#FFFFFFFF' id: BotRight decals: - 423: -39,1 - 424: -39,2 + 347: -39,1 + 348: -39,2 - node: color: '#FFFFFFFF' id: Box @@ -295,128 +299,201 @@ entities: 16: -33,-40 17: -34,-40 18: -33,-36 - 627: -53,-31 - 628: -53,-32 - 629: -53,-33 - 630: -53,-34 - 635: -46,-19 - - node: - color: '#FFFFFFFF' - id: BoxGreyscale - decals: - 619: 34.024876,-6.9936233 - 620: 34.0405,-7.9779983 + 541: -53,-31 + 542: -53,-32 + 543: -53,-33 + 544: -53,-34 + 549: -46,-19 - node: color: '#FFFFFFFF' id: BrickTileDarkCornerNe decals: - 157: -8,5 + 144: -8,5 + 694: 18,-18 + 740: 26,-17 + 849: 30,-14 + 850: 34,-18 - node: color: '#FFFFFFFF' id: BrickTileDarkCornerNw decals: - 156: -9,5 + 143: -9,5 + 700: 17,-18 + 741: 21,-17 - node: color: '#FFFFFFFF' id: BrickTileDarkCornerSe decals: - 158: -8,2 + 145: -8,2 + 701: 18,-20 + 742: 26,-20 - node: color: '#FFFFFFFF' id: BrickTileDarkCornerSw decals: - 159: -9,2 - 399: -42,-27 + 146: -9,2 + 323: -42,-27 + 702: 17,-20 + 743: 21,-20 + 848: 30,-18 + - node: + color: '#FFFFFFFF' + id: BrickTileDarkEndE + decals: + 874: 27,-14 + - node: + color: '#FFFFFFFF' + id: BrickTileDarkEndN + decals: + 804: 25,-9 + - node: + color: '#FFFFFFFF' + id: BrickTileDarkEndS + decals: + 805: 34,-19 - node: color: '#FFFFFFFF' id: BrickTileDarkEndW decals: - 155: -12,4 + 142: -12,4 + 806: 21,-14 + 873: 29,-14 - node: color: '#FFFFFFFF' - id: BrickTileDarkInnerNw + id: BrickTileDarkInnerNe decals: - 110: 24,-17 - 168: -9,4 + 837: 25,-14 + 847: 30,-18 - node: color: '#FFFFFFFF' - id: BrickTileDarkInnerSe + id: BrickTileDarkInnerNw decals: - 119: 21,-11 + 155: -9,4 + 838: 25,-14 - node: color: '#FFFFFFFF' id: BrickTileDarkInnerSw decals: - 116: 24,-11 - 167: -9,4 + 154: -9,4 + 842: 30,-14 + 843: 34,-18 - node: color: '#FFFFFFFF' id: BrickTileDarkLineE decals: - 130: 38,-39 - 165: -8,3 - 166: -8,4 + 117: 38,-39 + 152: -8,3 + 153: -8,4 + 703: 18,-19 + 744: 26,-19 + 745: 26,-18 + 832: 25,-10 + 834: 25,-11 + 835: 25,-12 + 836: 25,-13 + 844: 30,-15 + 845: 30,-16 + 846: 30,-17 + 851: 21,-4 + 852: 21,-5 + 853: 21,-6 + 854: 21,-7 + 855: 21,-8 + 856: 21,-9 + 857: 21,-10 + 858: 21,-11 - node: color: '#FFFFFFFF' id: BrickTileDarkLineN decals: - 108: 22,-17 - 109: 23,-17 - 163: -11,4 - 164: -10,4 + 150: -11,4 + 151: -10,4 + 749: 22,-17 + 751: 23,-17 + 752: 24,-17 + 753: 25,-17 + 825: 26,-14 + 826: 31,-18 + 827: 32,-18 + 828: 33,-18 + 839: 22,-14 + 840: 23,-14 + 841: 24,-14 - node: color: '#FFFFFFFF' id: BrickTileDarkLineS decals: - 117: 23,-11 - 118: 22,-11 - 161: -10,4 - 162: -11,4 - 402: -41,-27 - 403: -40,-27 - 404: -39,-27 - 405: -38,-27 - 406: -37,-27 - 407: -36,-27 - 408: -35,-27 + 148: -10,4 + 149: -11,4 + 326: -41,-27 + 327: -40,-27 + 328: -39,-27 + 329: -38,-27 + 330: -37,-27 + 331: -36,-27 + 332: -35,-27 + 754: 22,-20 + 756: 23,-20 + 759: 24,-20 + 761: 25,-20 + 807: 22,-14 + 808: 23,-14 + 809: 24,-14 + 810: 25,-14 + 811: 26,-14 + 812: 31,-18 + 813: 32,-18 + 814: 33,-18 - node: color: '#FFFFFFFF' id: BrickTileDarkLineW decals: - 111: 24,-16 - 112: 24,-15 - 113: 24,-14 - 114: 24,-13 - 115: 24,-12 - 160: -9,3 - 400: -42,-26 - 401: -42,-25 - 492: 29,-20 - 493: 29,-19 - 494: 29,-18 - 495: 29,-17 + 147: -9,3 + 324: -42,-26 + 325: -42,-25 + 705: 17,-19 + 763: 21,-19 + 764: 21,-18 + 816: 25,-13 + 817: 25,-12 + 818: 25,-11 + 819: 25,-10 + 820: 30,-15 + 821: 30,-16 + 822: 30,-17 - node: color: '#FFFFFFFF' id: BrickTileSteelCornerNe decals: 86: -17,-25 - 566: 13,17 + 486: 13,17 + 650: 31,0 - node: color: '#FFFFFFFF' id: BrickTileSteelCornerNw decals: 87: -20,-25 - 565: 5,17 + 485: 5,17 + 651: 23,0 - node: color: '#FFFFFFFF' id: BrickTileSteelCornerSe decals: - 577: 13,15 + 497: 13,15 + 652: 31,-5 - node: color: '#FFFFFFFF' id: BrickTileSteelCornerSw decals: - 576: 5,15 + 496: 5,15 + 653: 23,-5 + - node: + color: '#FFFFFFFF' + id: BrickTileSteelEndE + decals: + 860: 19,-7 + 861: 19,-4 + 862: 19,-10 - node: color: '#FFFFFFFF' id: BrickTileSteelEndN @@ -433,33 +510,33 @@ entities: color: '#FFFFFFFF' id: BrickTileSteelInnerNe decals: - 398: -49,-28 - 491: -39,-51 + 322: -49,-28 + 415: -39,-51 - node: color: '#FFFFFFFF' id: BrickTileSteelInnerNw decals: - 397: -45,-28 - 490: -37,-51 + 321: -45,-28 + 414: -37,-51 - node: color: '#FFFFFFFF' id: BrickTileSteelInnerSe decals: - 395: -49,-25 - 489: -39,-49 + 319: -49,-25 + 413: -39,-49 - node: color: '#FFFFFFFF' id: BrickTileSteelInnerSw decals: - 396: -45,-25 - 488: -37,-49 + 320: -45,-25 + 412: -37,-49 - node: color: '#FF0000FF' id: BrickTileSteelLineE decals: - 621: -49,-17 - 622: -49,-18 - 623: -49,-19 + 536: -49,-17 + 537: -49,-18 + 538: -49,-19 - node: color: '#FFFFFFFF' id: BrickTileSteelLineE @@ -469,47 +546,65 @@ entities: 90: -17,-28 100: -20,-26 101: -20,-27 - 104: 41,3 - 105: 41,4 - 106: 41,5 - 107: 41,6 - 385: -49,-27 - 386: -49,-26 - 484: -39,-50 - 567: 13,16 + 103: 41,3 + 104: 41,4 + 105: 41,5 + 106: 41,6 + 309: -49,-27 + 310: -49,-26 + 408: -39,-50 + 487: 13,16 + 654: 31,-4 + 655: 31,-3 + 656: 31,-2 + 657: 31,-1 - node: color: '#FFFFFFFF' id: BrickTileSteelLineN decals: - 387: -48,-28 - 388: -47,-28 - 389: -46,-28 - 419: -40,-3 - 420: -39,-3 - 421: -38,-3 - 485: -38,-51 - 569: 6,17 - 570: 7,17 - 571: 8,17 - 572: 9,17 - 573: 10,17 - 574: 11,17 - 575: 12,17 + 311: -48,-28 + 312: -47,-28 + 313: -46,-28 + 343: -40,-3 + 344: -39,-3 + 345: -38,-3 + 409: -38,-51 + 489: 6,17 + 490: 7,17 + 491: 8,17 + 492: 9,17 + 493: 10,17 + 494: 11,17 + 495: 12,17 + 658: 24,0 + 659: 25,0 + 660: 26,0 + 661: 27,0 + 662: 28,0 + 663: 30,0 + 782: 29,0 - node: color: '#FFFFFFFF' id: BrickTileSteelLineS decals: - 392: -48,-25 - 393: -47,-25 - 394: -46,-25 - 487: -38,-49 - 578: 6,15 - 579: 7,15 - 580: 8,15 - 581: 9,15 - 582: 10,15 - 583: 11,15 - 584: 12,15 + 316: -48,-25 + 317: -47,-25 + 318: -46,-25 + 411: -38,-49 + 498: 6,15 + 499: 7,15 + 500: 8,15 + 501: 9,15 + 502: 10,15 + 503: 11,15 + 504: 12,15 + 664: 24,-5 + 665: 26,-5 + 666: 27,-5 + 667: 28,-5 + 668: 29,-5 + 669: 30,-5 + 781: 25,-5 - node: color: '#FFFFFFFF' id: BrickTileSteelLineW @@ -519,520 +614,504 @@ entities: 93: -20,-28 98: -17,-26 99: -17,-27 - 390: -45,-27 - 391: -45,-26 - 486: -37,-50 - 568: 5,16 + 314: -45,-27 + 315: -45,-26 + 410: -37,-50 + 488: 5,16 + 670: 23,-4 + 671: 23,-3 + 672: 23,-2 + 673: 23,-1 + 863: 20,-11 + 864: 20,-10 + 865: 20,-9 + 866: 20,-8 + 867: 20,-7 + 868: 20,-6 + 869: 20,-5 + 870: 20,-4 - node: color: '#34BFFF84' id: BrickTileWhiteCornerNe decals: - 607: 19,1 + 524: 19,1 - node: color: '#34FFFFFF' id: BrickTileWhiteCornerNe decals: - 641: 1,-40 + 555: 1,-40 - node: color: '#7FDFFFFF' id: BrickTileWhiteCornerNe decals: - 651: 8,-40 + 565: 8,-40 - node: color: '#FFFFFFFF' id: BrickTileWhiteCornerNe decals: - 435: 6,-33 + 359: 6,-33 - node: color: '#34BFFF84' id: BrickTileWhiteCornerNw decals: - 606: 16,1 + 523: 16,1 - node: color: '#34FFFFFF' id: BrickTileWhiteCornerNw decals: - 638: -2,-40 + 552: -2,-40 - node: color: '#7FDFFFFF' id: BrickTileWhiteCornerNw decals: - 650: 6,-40 + 564: 6,-40 - node: color: '#FFFFFFFF' id: BrickTileWhiteCornerNw decals: - 432: 3,-33 + 356: 3,-33 - node: color: '#34BFFF84' id: BrickTileWhiteCornerSe decals: - 608: 19,-2 + 525: 19,-2 - node: color: '#34FFFFFF' id: BrickTileWhiteCornerSe decals: - 644: 1,-44 + 558: 1,-44 - node: color: '#7FDFFFFF' id: BrickTileWhiteCornerSe decals: - 653: 8,-43 + 567: 8,-43 - node: color: '#FFFFFFFF' id: BrickTileWhiteCornerSe decals: - 525: 6,-37 + 445: 6,-37 - node: color: '#34BFFF84' id: BrickTileWhiteCornerSw decals: - 609: 16,-2 + 526: 16,-2 - node: color: '#34FFFFFF' id: BrickTileWhiteCornerSw decals: - 645: -2,-44 + 559: -2,-44 - node: color: '#7FDFFFFF' id: BrickTileWhiteCornerSw decals: - 652: 6,-43 + 566: 6,-43 - node: color: '#FFFFFFFF' id: BrickTileWhiteEndE decals: - 434: 7,-34 + 358: 7,-34 - node: angle: 6.283185307179586 rad color: '#FFFFFFFF' id: BrickTileWhiteEndE decals: - 600: 13,-38 + 517: 13,-38 - node: color: '#FFFFFFFF' id: BrickTileWhiteEndW decals: - 433: 2,-34 - 439: 9,-38 + 357: 2,-34 + 363: 9,-38 - node: color: '#FFFFFFFF' id: BrickTileWhiteInnerNe decals: - 437: 4,-33 - 542: 3,-37 - 543: 6,-34 - 692: 6,-29 + 361: 4,-33 + 462: 3,-37 + 463: 6,-34 + 606: 6,-29 - node: color: '#FFFFFFFF' id: BrickTileWhiteInnerNw decals: - 438: 4,-33 - 540: 3,-34 - 541: 6,-37 - 693: 6,-29 + 362: 4,-33 + 460: 3,-34 + 461: 6,-37 + 607: 6,-29 - node: color: '#FFFFFFFF' id: BrickTileWhiteInnerSe decals: - 537: 6,-34 - 538: 3,-37 - 539: 3,-34 - 694: 6,-29 + 457: 6,-34 + 458: 3,-37 + 459: 3,-34 + 608: 6,-29 - node: color: '#FFFFFFFF' id: BrickTileWhiteInnerSw decals: - 535: 6,-34 - 536: 3,-34 - 695: 6,-29 + 455: 6,-34 + 456: 3,-34 + 609: 6,-29 - node: color: '#252637FF' id: BrickTileWhiteLineE decals: - 696: 40,-35 - 706: 40,-36 - 707: 40,-34 + 610: 40,-35 + 620: 40,-36 + 621: 40,-34 - node: color: '#34FFFFFF' id: BrickTileWhiteLineE decals: - 642: 1,-42 - 643: 1,-43 + 556: 1,-42 + 557: 1,-43 - node: color: '#505050FF' id: BrickTileWhiteLineE decals: - 719: 46,-35 - 720: 46,-36 - 721: 46,-37 - 722: 46,-34 - 723: 46,-33 + 633: 46,-35 + 634: 46,-36 + 635: 46,-37 + 636: 46,-34 + 637: 46,-33 - node: color: '#FF000066' id: BrickTileWhiteLineE decals: - 616: 19,0 - 617: 19,-1 + 533: 19,0 + 534: 19,-1 - node: color: '#FFFFFFFF' id: BrickTileWhiteLineE decals: - 519: 3,-36 - 520: 3,-35 - 526: 6,-36 - 527: 6,-35 - 682: 6,-27 - 683: 6,-28 - 684: 6,-30 + 439: 3,-36 + 440: 3,-35 + 446: 6,-36 + 447: 6,-35 + 596: 6,-27 + 597: 6,-28 + 598: 6,-30 - node: color: '#252637FF' id: BrickTileWhiteLineN decals: - 698: 40,-34 - 699: 39,-34 - 700: 38,-34 - 701: 37,-34 + 612: 40,-34 + 613: 39,-34 + 614: 38,-34 + 615: 37,-34 - node: color: '#34FFFFFF' id: BrickTileWhiteLineN decals: - 639: -1,-40 - 640: 0,-40 + 553: -1,-40 + 554: 0,-40 - node: color: '#505050FF' id: BrickTileWhiteLineN decals: - 724: 46,-33 - 725: 45,-33 - 726: 44,-33 - 727: 43,-33 + 638: 46,-33 + 639: 45,-33 + 640: 44,-33 + 641: 43,-33 - node: color: '#FF000066' id: BrickTileWhiteLineN decals: - 610: 17,1 - 611: 18,1 + 527: 17,1 + 528: 18,1 - node: color: '#FFFFFFFF' id: BrickTileWhiteLineN decals: - 436: 5,-33 - 440: 10,-38 - 521: 4,-37 - 522: 5,-37 - 680: 4,-33 - 690: 5,-29 - 691: 7,-29 + 360: 5,-33 + 364: 10,-38 + 441: 4,-37 + 442: 5,-37 + 594: 4,-33 + 604: 5,-29 + 605: 7,-29 - node: angle: 6.283185307179586 rad color: '#FFFFFFFF' id: BrickTileWhiteLineN decals: - 596: 11,-38 - 597: 12,-38 + 513: 11,-38 + 514: 12,-38 - node: color: '#252637FF' id: BrickTileWhiteLineS decals: - 702: 40,-36 - 703: 39,-36 - 704: 38,-36 - 705: 37,-36 + 616: 40,-36 + 617: 39,-36 + 618: 38,-36 + 619: 37,-36 - node: color: '#34FFFFFF' id: BrickTileWhiteLineS decals: - 647: -1,-44 - 648: 0,-44 + 561: -1,-44 + 562: 0,-44 - node: color: '#505050FF' id: BrickTileWhiteLineS decals: - 715: 43,-37 - 716: 44,-37 - 717: 45,-37 - 718: 46,-37 + 629: 43,-37 + 630: 44,-37 + 631: 45,-37 + 632: 46,-37 - node: color: '#7FDFFFFF' id: BrickTileWhiteLineS decals: - 654: 7,-43 + 568: 7,-43 - node: color: '#FF000066' id: BrickTileWhiteLineS decals: - 612: 17,-2 - 613: 18,-2 + 529: 17,-2 + 530: 18,-2 - node: color: '#FFFFFFFF' id: BrickTileWhiteLineS decals: - 441: 10,-38 - 523: 4,-37 - 524: 5,-37 - 528: 5,-34 - 529: 4,-34 - 655: 3,-37 - 688: 7,-29 - 689: 5,-29 + 365: 10,-38 + 443: 4,-37 + 444: 5,-37 + 448: 5,-34 + 449: 4,-34 + 569: 3,-37 + 602: 7,-29 + 603: 5,-29 - node: angle: 6.283185307179586 rad color: '#FFFFFFFF' id: BrickTileWhiteLineS decals: - 598: 11,-38 - 599: 12,-38 + 515: 11,-38 + 516: 12,-38 - node: color: '#252637FF' id: BrickTileWhiteLineW decals: - 697: 37,-35 - 708: 37,-34 - 709: 37,-36 + 611: 37,-35 + 622: 37,-34 + 623: 37,-36 - node: color: '#34FFFFFF' id: BrickTileWhiteLineW decals: - 636: -2,-42 - 637: -2,-41 - 646: -2,-43 + 550: -2,-42 + 551: -2,-41 + 560: -2,-43 - node: color: '#505050FF' id: BrickTileWhiteLineW decals: - 710: 43,-35 - 711: 43,-36 - 712: 43,-34 - 713: 43,-33 - 714: 43,-37 + 624: 43,-35 + 625: 43,-36 + 626: 43,-34 + 627: 43,-33 + 628: 43,-37 - node: color: '#FF000066' id: BrickTileWhiteLineW decals: - 614: 16,-1 - 615: 16,0 + 531: 16,-1 + 532: 16,0 - node: color: '#FFFFFFFF' id: BrickTileWhiteLineW decals: - 530: 6,-36 - 531: 6,-35 - 532: 3,-36 - 533: 3,-35 - 534: 3,-37 - 685: 6,-30 - 686: 6,-28 - 687: 6,-27 + 450: 6,-36 + 451: 6,-35 + 452: 3,-36 + 453: 3,-35 + 454: 3,-37 + 599: 6,-30 + 600: 6,-28 + 601: 6,-27 - node: color: '#FFFFFFFF' id: BushDOne decals: - 658: 38,-22 + 572: 38,-22 - node: color: '#FFFFFFFF' id: Bushe1 decals: - 458: 7.269473,-2.0562599 + 382: 7.269473,-2.0562599 - node: color: '#FFFFFFFF' id: Bushe2 decals: - 457: 10.660098,-2.024987 - 659: 39,-22 + 381: 10.660098,-2.024987 + 573: 39,-22 - node: cleanable: True color: '#FFFFFFFF' id: Bushe2 decals: - 183: 10.829859,-5.895931 - 184: 11.152776,-6.114833 + 170: 10.829859,-5.895931 + 171: 11.152776,-6.114833 - node: color: '#FFFFFFFF' id: Bushe3 decals: - 456: 11.050723,-2.1500747 + 380: 11.050723,-2.1500747 - node: cleanable: True color: '#FFFFFFFF' id: Bushe3 decals: - 181: 10.736109,-8.064104 - 182: 11.069442,-7.959864 + 168: 10.736109,-8.064104 + 169: 11.069442,-7.959864 - node: color: '#FFFFFFFF' id: Bushe4 decals: - 455: 6.816348,-2.1188037 - 664: 46,-22 + 379: 6.816348,-2.1188037 + 578: 46,-22 - node: color: '#FFFFFFFF' id: Bushg3 decals: - 660: 40,-22 + 574: 40,-22 - node: color: '#FFFFFFFF' id: Bushj3 decals: - 661: 42,-22 - - node: - cleanable: True - color: '#FFFFFFFF' - id: Bushk1 - decals: - 192: 35,-22 + 575: 42,-22 - node: color: '#FFFFFFFF' id: Bushk2 decals: - 472: 2.7216585,-2.0846055 - - node: - cleanable: True - color: '#FFFFFFFF' - id: Bushk2 - decals: - 191: 30,-22 + 396: 2.7216585,-2.0846055 - node: color: '#FFFFFFFF' id: Bushk3 decals: - 471: 0.5549917,-2.0533326 - 665: 49,-22 - 672: 40,-26 + 395: 0.5549917,-2.0533326 + 579: 49,-22 + 586: 40,-26 - node: cleanable: True color: '#FFFFFFFF' id: Bushk3 decals: - 189: 29,-22 - 190: 36,-22 + 173: 36,-22 - node: color: '#FFFFFFFF' id: Bushl4 decals: - 662: 41,-22 - 673: 37,-26 + 576: 41,-22 + 587: 37,-26 - node: color: '#FFFFFFFF' id: Bushn1 decals: 63: -29.570997,-20.070805 67: -25.456413,-20.206316 - 473: 1.6279085,-2.063757 - 663: 43,-22 + 397: 1.6279085,-2.063757 + 577: 43,-22 - node: color: '#52B4E996' id: CheckerNESW decals: - 496: 2,-32 - 497: 3,-32 - 498: 7,-32 - 499: 7,-33 - 500: 7,-35 - 501: 7,-36 - 502: 2,-36 - 503: 2,-35 - 504: 5,-38 - 544: 2,-37 - 545: 2,-38 - 546: 6,-38 - 547: 7,-38 - 548: 7,-37 - 549: 6,-32 - 550: 5,-32 - 551: 2,-33 + 416: 2,-32 + 417: 3,-32 + 418: 7,-32 + 419: 7,-33 + 420: 7,-35 + 421: 7,-36 + 422: 2,-36 + 423: 2,-35 + 424: 5,-38 + 464: 2,-37 + 465: 2,-38 + 466: 6,-38 + 467: 7,-38 + 468: 7,-37 + 469: 6,-32 + 470: 5,-32 + 471: 2,-33 - node: color: '#9FED5896' id: CheckerNESW decals: - 131: -19,4 - 132: -18,4 - 133: -17,4 - 134: -16,4 - 135: -15,4 - 136: -14,4 - 137: -19,3 - 138: -19,2 - 139: -14,3 - 140: -14,2 + 118: -19,4 + 119: -18,4 + 120: -17,4 + 121: -16,4 + 122: -15,4 + 123: -14,4 + 124: -19,3 + 125: -19,2 + 126: -14,3 + 127: -14,2 - node: color: '#A4C9DAFF' id: CheckerNESW decals: - 681: 4,-32 - - node: - color: '#DE3A3A96' - id: CheckerNESW - decals: - 249: 22,-19 - 250: 23,-19 - 251: 24,-19 - 252: 25,-19 - 253: 26,-19 - 254: 26,-17 - 255: 26,-16 - 256: 24,-8 - 257: 24,-6 - 258: 24,-5 - 259: 22,-8 - 260: 22,-7 - 261: 22,-6 - 262: 22,-5 - 263: 22,-4 - 264: 22,-3 - 265: 21,-2 - 266: 21,-1 + 595: 4,-32 - node: - color: '#DE3A3A96' - id: CheckerNWSE + color: '#951710FF' + id: Delivery decals: - 285: 31,-5 - 286: 32,-5 - 287: 33,-5 - 288: 19,-10 - 289: 19,-11 + 859: 41,-2 - node: color: '#FFFFFFFF' id: Delivery decals: - 591: -13.001509,-32.022694 - 656: -42,-14 - 657: -43,-14 + 511: -13.001509,-32.022694 + 570: -42,-14 + 571: -43,-14 - node: cleanable: True color: '#FFFFFFFF' id: Delivery decals: - 585: -13,-33 + 505: -13,-33 + - node: + color: '#FF5C5CFF' + id: DeliveryGreyscale + decals: + 644: 35,-7 + 645: 35,-8 + 646: 35,-9 + 647: 35,-10 + 674: 29,-11 + 675: 30,-11 + 676: 31,-11 - node: angle: 4.71238898038469 rad color: '#FFFFFFFF' id: DeliveryGreyscale decals: - 587: -7.990714,-34.033375 - 588: -8.006339,-35.048996 - 589: -7.990714,-36.03337 - 590: -8.006339,-37.017746 + 507: -7.990714,-34.033375 + 508: -8.006339,-35.048996 + 509: -7.990714,-36.03337 + 510: -8.006339,-37.017746 - node: color: '#D381C996' id: DiagonalCheckerAOverlay decals: - 337: -31,-11 - 338: -30,-11 - 339: -31,-9 - 340: -30,-9 - 345: -30,-10 - 346: -31,-10 + 265: -31,-11 + 266: -30,-11 + 267: -31,-9 + 268: -30,-9 + 273: -30,-10 + 274: -31,-10 - node: color: '#DE3A3A96' id: DiagonalCheckerAOverlay decals: - 141: -12,2 - 142: -11,2 - 143: -10,2 - 169: -12,3 - 170: -11,3 - 171: -10,3 + 128: -12,2 + 129: -11,2 + 130: -10,2 + 156: -12,3 + 157: -11,3 + 158: -10,3 - node: cleanable: True color: '#A4610696' @@ -1056,299 +1135,275 @@ entities: color: '#FFFFFFFF' id: Dirt decals: - 123: 19,-5 - 325: 4,-16 - 358: -52,-4 - 367: 18.962013,12.027142 + 110: 19,-5 + 253: 4,-16 + 286: -52,-4 + 295: 18.962013,12.027142 - node: cleanable: True angle: -1.5707963267948966 rad color: '#FFFFFFFF' id: DirtHeavy decals: - 324: 11,-11 + 252: 11,-11 - node: cleanable: True color: '#FFFFFFFF' id: DirtHeavy decals: - 122: 16,-8 - 306: 8,3 - 307: 14,17 - 322: -5,0 - 357: -20,-12 - 369: 21,11 - 370: 20,-11 - 373: 15,-15 - 413: -43,8 + 109: 16,-8 + 234: 8,3 + 235: 14,17 + 250: -5,0 + 285: -20,-12 + 297: 21,11 + 337: -43,8 - node: cleanable: True color: '#FFFFFFFF' id: DirtLight decals: - 120: 17,-6 - 302: -38.097836,-16.711924 - 303: -36.792118,-22.963575 - 308: 10,13 - 309: 18,-5 - 310: 15,-14 - 311: 24.508926,-23.4825 - 312: 36.185944,-24.985134 - 319: -23,0 - 320: -30,-1 - 321: -43,-2 - 349: -2,-45 - 350: -4,-42 - 368: 20,11 - 371: 29,-15 - 372: 19,-19 - 374: 11,-12 - 377: -2,-23 - 414: -43,10 - 415: -42,8 + 107: 17,-6 + 230: -38.097836,-16.711924 + 231: -36.792118,-22.963575 + 236: 10,13 + 237: 18,-5 + 238: 15,-14 + 239: 24.508926,-23.4825 + 240: 36.185944,-24.985134 + 247: -23,0 + 248: -30,-1 + 249: -43,-2 + 277: -2,-45 + 278: -4,-42 + 296: 20,11 + 298: 19,-19 + 299: 11,-12 + 302: -2,-23 + 338: -43,10 + 339: -42,8 - node: cleanable: True angle: 0.7853981633974483 rad color: '#FFFFFFFF' id: DirtLight decals: - 351: 13,-24 - 352: 9,-1 - 353: -10,-13 - 354: -5,-24 - 355: -19,-23 - 356: -35,-23 - 375: 21,-30 + 279: 13,-24 + 280: 9,-1 + 281: -10,-13 + 282: -5,-24 + 283: -19,-23 + 284: -35,-23 + 300: 21,-30 - node: cleanable: True color: '#FFFFFFFF' id: DirtMedium decals: - 121: 19,-8 - 304: -18,-26 - 305: -6,-5 - 318: -15,-2 - 359: -50,-5 - 376: 9,-25 + 108: 19,-8 + 232: -18,-26 + 233: -6,-5 + 246: -15,-2 + 287: -50,-5 + 301: 9,-25 - node: cleanable: True angle: 1.5707963267948966 rad color: '#FFFFFFFF' id: DirtMedium decals: - 323: 11,1 + 251: 11,1 - node: color: '#FFFFFFFF' id: Flowersbr1 decals: - 425: 0.46875298,-52.976757 - 426: 1.250003,-52.945484 - 470: 3.5133247,-2.0533326 - 666: 50,-22 + 349: 0.46875298,-52.976757 + 350: 1.250003,-52.945484 + 394: 3.5133247,-2.0533326 + 580: 50,-22 - node: color: '#FFFFFFFF' id: Flowersbr2 decals: - 469: 4.2945747,-2.0950284 - 670: 38,-26 + 393: 4.2945747,-2.0950284 + 584: 38,-26 - node: color: '#FFFFFFFF' id: Flowersbr3 decals: - 429: 1.9687531,-53.0393 - 430: -0.03124702,-53.01845 - 468: 5.0758247,-2.0950284 + 353: 1.9687531,-53.0393 + 354: -0.03124702,-53.01845 + 392: 5.0758247,-2.0950284 - node: color: '#FFFFFFFF' id: Flowerspv1 decals: - 467: -0.26523253,-2.1367245 + 391: -0.26523253,-2.1367245 - node: color: '#FFFFFFFF' id: Flowerspv2 decals: - 671: 39,-26 + 585: 39,-26 - node: cleanable: True color: '#FFFFFFFF' id: Flowerspv2 decals: - 185: 28,-22 - 186: 31,-22 - 187: 37,-22 - 188: 34,-22 + 172: 37,-22 - node: color: '#FFFFFFFF' id: Flowerspv3 decals: - 465: -1.8485659,-1.9803662 - 466: -1.0985659,-2.0950284 + 389: -1.8485659,-1.9803662 + 390: -1.0985659,-2.0950284 - node: color: '#FFFFFFFF' id: Flowersy1 decals: 65: -25.831413,-20.112501 - 454: 8.925723,-2.1344383 + 378: 8.925723,-2.1344383 - node: color: '#FFFFFFFF' id: Flowersy2 decals: 62: -29.998081,-20.195892 - 669: 45,-22 + 583: 45,-22 - node: cleanable: True color: '#FFFFFFFF' id: Flowersy2 decals: - 179: 11,-9 - 180: 11,-7 + 166: 11,-9 + 167: 11,-7 - node: color: '#FFFFFFFF' id: Flowersy3 decals: 61: -29.102247,-20.133348 - 453: 9.847598,-2.1188037 + 377: 9.847598,-2.1188037 - node: cleanable: True color: '#FFFFFFFF' id: Flowersy3 decals: - 176: 11,-10 - 177: 11,-4 - 178: 11,-5 + 163: 11,-10 + 164: 11,-4 + 165: 11,-5 - node: color: '#FFFFFFFF' id: Flowersy4 decals: 66: -25.081413,-20.091654 - 452: 7.972598,-2.0875309 - 667: 48,-22 - 668: 44,-22 + 376: 7.972598,-2.0875309 + 581: 48,-22 + 582: 44,-22 - node: cleanable: True color: '#FFFFFFFF' id: Flowersy4 decals: - 172: 11,-14 - 173: 11,-17 + 159: 11,-14 + 160: 11,-17 - node: color: '#52B4E996' id: FullTileOverlayGreyscale decals: - 515: 4,-36 - 516: 5,-36 - 517: 4,-35 - 518: 5,-35 - 552: 1,-38 - 553: 1,-37 - - node: - color: '#DE3A3A96' - id: FullTileOverlayGreyscale - decals: - 247: 22,-14 - 248: 23,-14 + 435: 4,-36 + 436: 5,-36 + 437: 4,-35 + 438: 5,-35 + 472: 1,-38 + 473: 1,-37 - node: color: '#FFFFFFFF' id: Grassd2 decals: - 431: 1.0208364,-52.95591 + 355: 1.0208364,-52.95591 - node: cleanable: True color: '#FFFFFFFF' id: Grasse1 decals: - 174: 11,-15 + 161: 11,-15 - node: cleanable: True color: '#FFFFFFFF' id: Grasse2 decals: - 175: 11,-16 + 162: 11,-16 - node: color: '#FFFFFFFF' id: Grasse3 decals: - 427: 2.0104196,-52.976757 - 428: -0.020830393,-52.96633 - - node: - color: '#334E6DC8' - id: HalfTileOverlayGreyscale - decals: - 290: 27,-14 - 291: 29,-14 - 295: 28,-14 - 296: 26,-14 - 299: 30,-14 - 593: 31,-14 - 594: 32,-14 - 595: 33,-14 - 624: 34,-14 + 351: 2.0104196,-52.976757 + 352: -0.020830393,-52.96633 - node: color: '#52B4E996' id: HalfTileOverlayGreyscale decals: - 507: -1,-36 - 508: 0,-36 - 510: 9,-37 - 511: 10,-37 - 512: 11,-37 - 601: 12,-37 - 602: 13,-37 + 427: -1,-36 + 428: 0,-36 + 430: 9,-37 + 431: 10,-37 + 432: 11,-37 + 518: 12,-37 + 519: 13,-37 - node: - color: '#A4C9DAFF' + color: '#9D9D97FF' id: HalfTileOverlayGreyscale decals: - 677: 10,-27 - 678: 11,-27 - 679: 9,-27 + 738: 27,-3 + 739: 28,-3 + 773: 30,-5 - node: - color: '#DE3A3A96' + color: '#A4C9DAFF' id: HalfTileOverlayGreyscale decals: - 273: 24,-3 - 274: 25,-3 - 275: 26,-3 - 276: 27,-3 - 277: 28,-3 - 278: 29,-3 - 279: 30,-3 - 280: 31,-3 - 281: 22,1 + 591: 10,-27 + 592: 11,-27 + 593: 9,-27 - node: color: '#F9801DBC' id: HalfTileOverlayGreyscale decals: - 446: -1,-27 - 447: 0,-27 - 448: 1,-27 + 370: -1,-27 + 371: 0,-27 + 372: 1,-27 - node: angle: 6.283185307179586 rad color: '#34B8FF88' id: HalfTileOverlayGreyscale180 decals: - 603: 12,-39 - 604: 11,-39 - 605: 13,-39 + 520: 12,-39 + 521: 11,-39 + 522: 13,-39 - node: color: '#52B4E996' id: HalfTileOverlayGreyscale180 decals: - 513: 10,-39 - 514: 9,-39 + 433: 10,-39 + 434: 9,-39 + - node: + color: '#9D9D97FF' + id: HalfTileOverlayGreyscale180 + decals: + 768: 27,-3 + 769: 28,-3 + 778: 24,0 - node: color: '#A4C9DAFF' id: HalfTileOverlayGreyscale180 decals: - 674: 10,-30 - 675: 9,-30 - 676: 11,-30 + 588: 10,-30 + 589: 9,-30 + 590: 11,-30 - node: color: '#F9801DBC' id: HalfTileOverlayGreyscale180 decals: - 449: -1,-30 - 450: 0,-30 - 451: 1,-30 + 373: -1,-30 + 374: 0,-30 + 375: 1,-30 - node: color: '#0000009A' id: HalfTileOverlayGreyscale270 @@ -1360,53 +1415,68 @@ entities: color: '#52B4E996' id: HalfTileOverlayGreyscale270 decals: - 505: -2,-38 - 506: -2,-37 - 554: 9,-35 - 555: 9,-34 - 556: 9,-33 - 557: 9,-32 + 425: -2,-38 + 426: -2,-37 + 474: 9,-35 + 475: 9,-34 + 476: 9,-33 + 477: 9,-32 - node: - color: '#D381C996' + color: '#9D9D97FF' id: HalfTileOverlayGreyscale270 decals: - 332: -36,-9 - 333: -36,-12 - 334: -36,-11 - 335: -36,-10 - 380: -36,-8 + 690: 26,-1 + 691: 26,-2 + 692: 26,-3 + 693: 26,-4 + 711: 27,-2 + 755: 29,-4 + 757: 29,-3 + 758: 29,-2 + 760: 29,-2 + 762: 29,-1 + 770: 28,-4 - node: - color: '#F9801DBC' + color: '#D381C996' id: HalfTileOverlayGreyscale270 decals: - 444: -2,-29 - 445: -2,-28 + 260: -36,-9 + 261: -36,-12 + 262: -36,-11 + 263: -36,-10 + 305: -36,-8 - node: - color: '#334E6DC8' - id: HalfTileOverlayGreyscale90 + color: '#F9801DBC' + id: HalfTileOverlayGreyscale270 decals: - 292: 25,-12 - 293: 25,-10 - 294: 25,-11 - 297: 25,-13 + 368: -2,-29 + 369: -2,-28 - node: - color: '#DE3A3A96' + color: '#9D9D97FF' id: HalfTileOverlayGreyscale90 decals: - 269: 23,-1 - 270: 23,0 - 271: 23,-2 + 695: 25,-1 + 696: 25,-2 + 697: 25,-2 + 698: 25,-3 + 699: 25,-4 + 708: 26,-2 + 714: 27,-2 + 746: 28,-3 + 747: 28,-4 + 748: 28,-2 + 750: 28,-1 - node: color: '#FFFFFFFF' id: LoadingArea decals: - 626: -21.999445,-42.990807 + 540: -21.999445,-42.990807 - node: angle: 3.141592653589793 rad color: '#FFFFFFFF' id: LoadingArea decals: - 625: -17.999445,-43.022057 + 539: -17.999445,-43.022057 - node: color: '#FFFFFFFF' id: MiniTileDarkLineE @@ -1423,163 +1493,285 @@ entities: 28: -12,-27 29: -12,-26 30: -12,-25 + - node: + color: '#9C2020FF' + id: MiniTileDiagonalCheckerBOverlay + decals: + 684: 17,-18 + 685: 18,-18 + 686: 18,-19 + 687: 17,-19 + 688: 17,-20 + 689: 18,-20 + - node: + color: '#951710FF' + id: MiniTileLineOverlayN + decals: + 679: 29,-7 + 680: 32,-7 + 681: 33,-7 + - node: + color: '#951710FF' + id: MiniTileLineOverlayS + decals: + 649: 33,-10 + 683: 32,-10 + 815: 29,-10 + 823: 30,-10 + 824: 31,-10 + - node: + color: '#951710FF' + id: MiniTileLineOverlayW + decals: + 648: 29,-9 + 677: 29,-8 + 678: 29,-10 + 682: 29,-7 - node: color: '#FFFFFFFF' id: MiniTileSteelCornerNe decals: - 344: -30,-9 + 272: -30,-9 - node: color: '#FFFFFFFF' id: MiniTileSteelCornerNw decals: - 343: -31,-9 + 271: -31,-9 - node: color: '#FFFFFFFF' id: MiniTileSteelCornerSe decals: - 342: -30,-11 + 270: -30,-11 - node: color: '#FFFFFFFF' id: MiniTileSteelCornerSw decals: - 341: -31,-11 + 269: -31,-11 - node: color: '#FFFFFFFF' id: MiniTileSteelLineE decals: - 347: -30,-10 + 275: -30,-10 - node: color: '#FFFFFFFF' id: MiniTileSteelLineW decals: - 348: -31,-10 + 276: -31,-10 + - node: + color: '#951710FF' + id: MiniTileWhiteLineE + decals: + 829: 34,-10 + 830: 34,-9 + 831: 34,-8 + 833: 34,-7 - node: color: '#D381C996' id: MonoOverlay decals: - 326: -36,-20 - 327: -34,-20 - 328: -32,-20 - 329: -36,-18 - 330: -36,-16 - 331: -36,-14 + 254: -36,-20 + 255: -34,-20 + 256: -32,-20 + 257: -36,-18 + 258: -36,-16 + 259: -36,-14 - node: color: '#DE3A3A96' id: OffsetCheckerAOverlay decals: - 144: -9,2 - 145: -8,2 - 146: -8,3 - 147: -9,3 - 148: -9,4 - 149: -8,4 - 150: -8,5 - 151: -9,5 - 152: -10,4 - 153: -11,4 - 154: -12,4 + 131: -9,2 + 132: -8,2 + 133: -8,3 + 134: -9,3 + 135: -9,4 + 136: -8,4 + 137: -8,5 + 138: -9,5 + 139: -10,4 + 140: -11,4 + 141: -12,4 + - node: + color: '#9C2020FF' + id: OffsetCheckerBOverlay + decals: + 712: 21,-17 + 713: 22,-17 + 715: 23,-17 + 716: 24,-17 + 717: 25,-17 + 718: 26,-17 + 719: 26,-18 + 720: 25,-18 + 721: 24,-18 + 722: 23,-18 + 723: 22,-18 + 725: 21,-18 + 726: 21,-19 + 727: 22,-19 + 728: 23,-19 + 729: 24,-19 + 730: 25,-19 + 731: 26,-19 + 732: 26,-20 + 733: 25,-20 + 734: 24,-20 + 735: 23,-20 + 736: 22,-20 + 737: 21,-20 + 783: 21,-14 + 784: 22,-14 + 785: 23,-14 + 786: 24,-14 + 787: 25,-14 + 788: 25,-13 + 789: 25,-12 + 790: 25,-11 + 791: 25,-10 + 792: 25,-9 + 793: 26,-14 + 794: 30,-14 + 795: 30,-15 + 796: 30,-16 + 797: 30,-17 + 798: 30,-18 + 799: 31,-18 + 800: 32,-18 + 801: 33,-18 + 802: 34,-18 + 803: 34,-19 + 871: 29,-14 + 872: 27,-14 - node: color: '#FFFFFFFF' id: OffsetCheckerBOverlay decals: - 618: -52,-18 + 535: -52,-18 - node: - color: '#DE3A3A96' + color: '#9D9D97FF' id: QuarterTileOverlayGreyscale decals: - 284: 32,-3 + 704: 26,-5 + 767: 29,-5 + 774: 31,-5 - node: - color: '#334E6DC8' - id: QuarterTileOverlayGreyscale90 + color: '#9D9D97FF' + id: QuarterTileOverlayGreyscale180 decals: - 298: 25,-14 + 706: 25,0 + 710: 26,-1 + 765: 28,0 + 777: 23,0 - node: - color: '#DE3A3A96' - id: QuarterTileOverlayGreyscale90 + color: '#9D9D97FF' + id: QuarterTileOverlayGreyscale270 decals: - 272: 23,-3 + 707: 26,0 + 724: 27,-1 + 772: 28,-2 + 780: 29,0 - node: - color: '#FFFFFFFF' - id: Remains + color: '#9D9D97FF' + id: QuarterTileOverlayGreyscale90 decals: - 384: 35,-20 + 709: 26,-3 + 766: 28,-5 + 771: 27,-4 + 779: 25,-5 - node: color: '#FFFFFFFF' id: SpaceStationSign1 decals: - 558: 6,16 + 478: 6,16 - node: color: '#FFFFFFFF' id: SpaceStationSign2 decals: - 559: 7,16 + 479: 7,16 - node: color: '#FFFFFFFF' id: SpaceStationSign3 decals: - 560: 8,16 + 480: 8,16 - node: color: '#FFFFFFFF' id: SpaceStationSign4 decals: - 561: 9,16 + 481: 9,16 - node: color: '#FFFFFFFF' id: SpaceStationSign5 decals: - 562: 10,16 + 482: 10,16 - node: color: '#FFFFFFFF' id: SpaceStationSign6 decals: - 563: 11,16 + 483: 11,16 - node: color: '#FFFFFFFF' id: SpaceStationSign7 decals: - 564: 12,16 + 484: 12,16 - node: color: '#FFFFFFFF' id: StandClear decals: - 586: -8.9951935,-32.015106 + 506: -8.9951935,-32.015106 - node: - color: '#52B4E996' + color: '#37789B7F' id: ThreeQuarterTileOverlayGreyscale decals: - 509: -2,-36 + 878: 18,-1 - node: - color: '#DE3A3A96' + color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale decals: - 267: 21,1 - 282: 32,-2 + 429: -2,-36 - node: color: '#F9801DBC' id: ThreeQuarterTileOverlayGreyscale decals: - 442: -2,-27 + 366: -2,-27 + - node: + color: '#37789B7F' + id: ThreeQuarterTileOverlayGreyscale180 + decals: + 877: 17,0 + - node: + color: '#37789B7F' + id: ThreeQuarterTileOverlayGreyscale270 + decals: + 876: 18,0 + - node: + color: '#9D9D97FF' + id: ThreeQuarterTileOverlayGreyscale270 + decals: + 775: 30,-4 - node: color: '#F9801DBC' id: ThreeQuarterTileOverlayGreyscale270 decals: - 443: -2,-30 + 367: -2,-30 - node: - color: '#DE3A3A96' + color: '#37789B7F' + id: ThreeQuarterTileOverlayGreyscale90 + decals: + 875: 17,-1 + - node: + color: '#9D9D97FF' id: ThreeQuarterTileOverlayGreyscale90 decals: - 268: 23,1 - 283: 33,-2 + 776: 24,-1 - node: color: '#FFFFFFFF' id: WarnBox decals: - 422: -39,5 + 346: -39,5 - node: color: '#7FFFFFFF' id: WarnBoxGreyscale decals: - 649: 7,-40 + 563: 7,-40 - node: cleanable: True color: '#FFFFFFFF' @@ -1591,30 +1783,30 @@ entities: id: WarnCornerSW decals: 75: -48,-34 - 409: -37,4 + 333: -37,4 - node: color: '#FFFFFFFF' id: WarnCornerSmallGreyscaleSW decals: - 418: -35,4 + 342: -35,4 - node: color: '#FFFFFFFF' id: WarnEndS decals: - 416: -35,3 + 340: -35,3 - node: color: '#FFFFFFFF' id: WarnLineE decals: - 412: -35,5 - 417: -35,4 - 634: -47,-19 + 336: -35,5 + 341: -35,4 + 548: -47,-19 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' id: WarnLineE decals: - 592: -23.011345,-38.778404 + 512: -23.011345,-38.778404 - node: color: '#FFFFFFFF' id: WarnLineN @@ -1624,18 +1816,18 @@ entities: 72: -45,-34 73: -46,-34 74: -47,-34 - 410: -36,4 - 478: -37,-48 - 479: -38,-48 - 480: -39,-48 - 633: -46,-18 + 334: -36,4 + 402: -37,-48 + 403: -38,-48 + 404: -39,-48 + 547: -46,-18 - node: cleanable: True color: '#FFFFFFFF' id: WarnLineN decals: - 228: -29.995993,-5.4813967 - 229: -30.011618,-5.684663 + 209: -29.995993,-5.4813967 + 210: -30.011618,-5.684663 - node: color: '#FFFFFFFF' id: WarnLineS @@ -1643,23 +1835,23 @@ entities: 3: -26,-4 4: -26,-5 5: -26,-6 - 411: -37,5 - 474: -32,-51 - 475: -32,-50 - 476: -32,-49 - 477: -32,-48 - 631: -45,-19 + 335: -37,5 + 398: -32,-51 + 399: -32,-50 + 400: -32,-49 + 401: -32,-48 + 545: -45,-19 - node: color: '#FFFFFFFF' id: WarnLineW decals: 68: -31,-7 69: -30,-7 - 336: -32,-7 - 481: -37,-52 - 482: -38,-52 - 483: -39,-52 - 632: -46,-20 + 264: -32,-7 + 405: -37,-52 + 406: -38,-52 + 407: -39,-52 + 546: -46,-20 - node: cleanable: True color: '#FFFFFFFF' @@ -1671,27 +1863,37 @@ entities: id: WoodTrimThinCornerNe decals: 59: -29,-20 - 124: 19,5 - 223: -28,-24 - 313: -18,-2 - 360: -53,12 + 111: 19,5 + 204: -28,-24 + 241: -18,-2 + 288: -53,12 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerNw decals: 58: -26,-20 - 222: -33,-24 - 314: -21,-2 - 364: -54,12 + 203: -33,-24 + 242: -21,-2 + 292: -54,12 + - node: + color: '#FFFFFFFF' + id: WoodTrimThinEndE + decals: + 643: 26,4 + - node: + color: '#FFFFFFFF' + id: WoodTrimThinEndW + decals: + 642: 25,4 - node: color: '#FFFFFFFF' id: WoodTrimThinInnerNe decals: 53: -15,-28 54: -10,-28 - 361: -53,11 - 362: -55,12 - 383: -33,-15 + 289: -53,11 + 290: -55,12 + 308: -33,-15 - node: color: '#FFFFFFFF' id: WoodTrimThinInnerNw @@ -1722,20 +1924,20 @@ entities: 41: -15,-27 44: -10,-26 45: -10,-27 - 125: 19,4 - 126: 19,3 - 217: -40,-20 - 218: -40,-19 - 219: -40,-18 - 220: -40,-17 - 221: -40,-16 - 382: -33,-14 - 459: -1,3 - 460: -1,4 - 461: -1,5 - 462: -1,6 - 463: -1,7 - 464: -1,8 + 112: 19,4 + 113: 19,3 + 198: -40,-20 + 199: -40,-19 + 200: -40,-18 + 201: -40,-17 + 202: -40,-16 + 307: -33,-14 + 383: -1,3 + 384: -1,4 + 385: -1,5 + 386: -1,6 + 387: -1,7 + 388: -1,8 - node: color: '#FFFFFFFF' id: WoodTrimThinLineN @@ -1744,65 +1946,64 @@ entities: 43: -9,-28 60: -30,-20 64: -25,-20 - 127: 18,5 - 128: 17,5 - 129: 16,5 - 209: -2,-11 - 210: -1,-11 - 211: 0,-11 - 212: 1,-11 - 213: 2,-11 - 214: 3,-11 - 215: 4,-11 - 216: 5,-11 - 224: -29,-24 - 225: -30,-24 - 226: -31,-24 - 227: -32,-24 - 230: 2,-12 - 231: 1,-12 - 232: 0,-12 - 233: -1,-12 - 234: -2,-12 - 235: -2,-5 - 236: -1,-5 - 237: 0,-5 - 238: 1,-5 - 239: 2,-5 - 240: 3,-5 - 241: 4,-5 - 242: 5,-5 - 243: 6,-5 - 244: 3,-12 - 245: 4,-12 - 246: 5,-12 - 315: -20,-2 - 316: -19,-2 - 381: -32,-15 + 114: 18,5 + 115: 17,5 + 116: 16,5 + 190: -2,-11 + 191: -1,-11 + 192: 0,-11 + 193: 1,-11 + 194: 2,-11 + 195: 3,-11 + 196: 4,-11 + 197: 5,-11 + 205: -29,-24 + 206: -30,-24 + 207: -31,-24 + 208: -32,-24 + 211: 2,-12 + 212: 1,-12 + 213: 0,-12 + 214: -1,-12 + 215: -2,-12 + 216: -2,-5 + 217: -1,-5 + 218: 0,-5 + 219: 1,-5 + 220: 2,-5 + 221: 3,-5 + 222: 4,-5 + 223: 5,-5 + 224: 6,-5 + 225: 3,-12 + 226: 4,-12 + 227: 5,-12 + 243: -20,-2 + 244: -19,-2 + 306: -32,-15 - node: color: '#FFFFFFFF' id: WoodTrimThinLineS decals: 38: -14,-25 39: -9,-25 - 102: 45,1 - 103: 46,1 - 193: -2,-8 - 194: -1,-8 - 195: 0,-8 - 196: 1,-8 - 197: 2,-8 - 198: 3,-8 - 199: 4,-8 - 200: 5,-8 - 201: -2,-9 - 202: -1,-9 - 203: 0,-9 - 204: 1,-9 - 205: 2,-9 - 206: 3,-9 - 207: 4,-9 - 208: 5,-9 + 102: 46,1 + 174: -2,-8 + 175: -1,-8 + 176: 0,-8 + 177: 1,-8 + 178: 2,-8 + 179: 3,-8 + 180: 4,-8 + 181: 5,-8 + 182: -2,-9 + 183: -1,-9 + 184: 0,-9 + 185: 1,-9 + 186: 2,-9 + 187: 3,-9 + 188: 4,-9 + 189: 5,-9 - node: color: '#FFFFFFFF' id: WoodTrimThinLineW @@ -1818,43 +2019,43 @@ entities: 55: -32,3 56: -32,2 57: -32,1 - 365: -54,11 - 366: -54,10 + 293: -54,11 + 294: -54,10 - node: color: '#FFFFFFFF' id: b decals: - 317: 3.065634,-14.026064 + 245: 3.065634,-14.026064 - node: cleanable: True color: '#8932B8FF' id: bottle decals: - 301: -55.860275,-1.0248116 + 229: -55.860275,-1.0248116 - node: cleanable: True color: '#8932B8FF' id: face decals: - 300: -56.28215,-1.1186265 + 228: -56.28215,-1.1186265 - node: cleanable: True color: '#EC0300FF' id: rune1 decals: - 378: 27.040031,11.035053 + 303: 27.040031,11.035053 - node: cleanable: True color: '#EC0300FF' id: rune2 decals: - 379: 24.998365,11.045477 + 304: 24.998365,11.045477 - node: cleanable: True color: '#18A2D5FF' id: shop decals: - 363: -51.038948,13.269489 + 291: -51.038948,13.269489 - type: GridAtmosphere version: 2 data: @@ -2556,7 +2757,7 @@ entities: 10,-1: 0: 65535 11,-4: - 0: 65527 + 0: 65535 11,-3: 0: 65535 11,-2: @@ -2642,8 +2843,7 @@ entities: 8,-14: 0: 30578 8,-13: - 0: 62071 - 2: 3072 + 0: 65143 -4,3: 0: 3839 -8,2: @@ -2687,8 +2887,7 @@ entities: 9,-14: 0: 4369 9,-13: - 0: 12305 - 2: 20366 + 0: 32671 -14,1: 0: 65535 -3,3: @@ -2810,7 +3009,7 @@ entities: 9,3: 0: 14 10,3: - 0: 15 + 0: 79 11,2: 0: 48059 11,3: @@ -2830,8 +3029,7 @@ entities: 12,-4: 0: 65392 13,-4: - 0: 8448 - 2: 15 + 0: 8463 13,-3: 0: 17479 13,-1: @@ -2855,11 +3053,9 @@ entities: 10,-14: 0: 16384 10,-13: - 0: 17612 - 2: 37635 + 0: 55247 11,-13: - 0: 25360 - 2: 98 + 0: 25458 12,-8: 0: 65535 12,-7: @@ -2867,24 +3063,19 @@ entities: 12,-6: 0: 65535 13,-8: - 0: 55295 - 2: 2048 + 0: 57343 13,-7: 0: 65337 13,-6: 0: 65535 13,-5: - 0: 2009 - 2: 4100 + 0: 6109 14,-7: - 0: 62257 - 2: 3268 + 0: 65525 14,-6: - 0: 13311 - 2: 52224 + 0: 65535 14,-5: - 0: 1 - 2: 8944 + 0: 8945 -4,4: 0: 15 -3,4: @@ -2908,8 +3099,7 @@ entities: -9,4: 0: 15 12,-12: - 0: 4369 - 2: 3754 + 0: 8123 12,-11: 0: 65523 12,-10: @@ -2999,20 +3189,17 @@ entities: -3,-15: 0: 4096 10,-5: - 0: 65399 - 2: 8 + 0: 65535 2,-14: 0: 13107 11,-5: - 0: 30464 - 2: 5 + 0: 63285 4,5: 0: 15 5,5: 0: 3 14,-8: - 0: 31 - 2: 20224 + 0: 20255 13,-11: 0: 65520 13,-10: @@ -3024,25 +3211,19 @@ entities: 14,-9: 0: 4383 15,-4: - 0: 12 - 2: 3 + 0: 15 15,-8: - 0: 3 - 2: 62240 + 0: 62243 15,-7: - 0: 65520 - 2: 7 + 0: 65527 15,-6: 0: 65535 15,-5: - 0: 32776 - 2: 28401 + 0: 61177 13,-12: - 0: 8 - 2: 4006 + 0: 4014 14,-12: - 0: 17969 - 2: 256 + 0: 18225 14,-11: 0: 61692 15,-11: @@ -3052,41 +3233,33 @@ entities: 15,-10: 0: 8738 16,-8: - 0: 40704 - 2: 24576 + 0: 65280 16,-7: - 0: 65521 - 2: 14 + 0: 65535 16,-6: - 0: 32767 - 2: 32768 + 0: 65535 16,-5: - 0: 6087 - 2: 24 + 0: 6111 17,-8: 0: 4096 17,-7: - 0: 17523 - 2: 13056 + 0: 30579 17,-6: - 0: 26228 - 2: 4355 + 0: 30583 17,-5: - 0: 50 - 2: 1 + 0: 51 13,-13: - 0: 35840 - 2: 881 + 0: 36721 14,-4: - 2: 15 + 0: 15 11,-14: - 2: 57344 + 0: 57344 12,-5: - 2: 11 + 0: 11 12,-14: - 2: 28672 + 0: 28672 12,-13: - 2: 40733 + 0: 40733 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -3191,6 +3364,7 @@ entities: - type: SpreaderGrid - type: GravityShake shakeTimes: 10 + - type: NavMap - uid: 35 components: - type: MetaData @@ -3286,6 +3460,67 @@ entities: - 5925 - type: AtmosDevice joinedGrid: 34 + - uid: 2410 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 22.5,-2.5 + parent: 34 + - type: DeviceList + devices: + - 4750 + - 13469 + - 6932 + - 1078 + - 12213 + - 7677 + - 12401 + - 3703 + - 4079 + - 4155 + - 4672 + - 4159 + - 3507 + - 12396 + - 6957 + - type: AtmosDevice + joinedGrid: 34 + - uid: 2525 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-34.5 + parent: 34 + - type: DeviceList + devices: + - 10578 + - 1295 + - 10715 + - 9637 + - 9609 + - 12427 + - 12487 + - 9594 + - 9598 + - 13245 + - 8817 + - 8920 + - 8685 + - type: AtmosDevice + joinedGrid: 34 + - uid: 3295 + components: + - type: Transform + pos: 18.5,2.5 + parent: 34 + - type: DeviceList + devices: + - 8776 + - 9904 + - 6933 + - 13664 + - type: AtmosDevice + joinedGrid: 34 - uid: 3874 components: - type: Transform @@ -3307,12 +3542,14 @@ entities: parent: 34 - type: DeviceList devices: - - 4373 - - 4449 + - 9638 + - 13241 - 1301 - 2505 - 2667 - 5250 + - 9620 + - 4449 - type: AtmosDevice joinedGrid: 34 - uid: 5244 @@ -3380,6 +3617,29 @@ entities: - 11116 - type: AtmosDevice joinedGrid: 34 + - uid: 6342 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 32.5,-19.5 + parent: 34 + - type: DeviceList + devices: + - 13497 + - 13499 + - 13498 + - 13496 + - 4697 + - 8831 + - 3560 + - 6936 + - 7610 + - 78 + - 8911 + - 8836 + - 12534 + - type: AtmosDevice + joinedGrid: 34 - uid: 7099 components: - type: Transform @@ -3407,6 +3667,58 @@ entities: - 12072 - type: AtmosDevice joinedGrid: 34 + - uid: 7683 + components: + - type: Transform + pos: 27.5,-6.5 + parent: 34 + - type: DeviceList + devices: + - 12177 + - 12490 + - 6936 + - 7610 + - 78 + - 6932 + - 13468 + - 3771 + - 7612 + - type: AtmosDevice + joinedGrid: 34 + - uid: 7684 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 32.5,-11.5 + parent: 34 + - type: DeviceList + devices: + - 1078 + - 12213 + - 12464 + - 12173 + - 3560 + - 12457 + - 12141 + - 12168 + - 4849 + - type: AtmosDevice + joinedGrid: 34 + - uid: 8028 + components: + - type: Transform + pos: 37.5,-1.5 + parent: 34 + - type: DeviceList + devices: + - 12475 + - 6096 + - 12477 + - 12476 + - 4750 + - 1870 + - type: AtmosDevice + joinedGrid: 34 - uid: 9601 components: - type: Transform @@ -3424,12 +3736,9 @@ entities: - 12372 - 1101 - 4677 - - 2964 - - 6226 - 2986 - 2965 - 12368 - - 12381 - type: AtmosDevice joinedGrid: 34 - uid: 10291 @@ -3441,11 +3750,13 @@ entities: - type: DeviceList devices: - 10339 - - 10590 - - 3340 - 9925 - 8805 - 10598 + - 12186 + - 13452 + - 3771 + - 3553 - type: AtmosDevice joinedGrid: 34 - uid: 10323 @@ -3477,27 +3788,6 @@ entities: - 6113 - type: AtmosDevice joinedGrid: 34 - - uid: 10334 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,-34.5 - parent: 34 - - type: DeviceList - devices: - - 9609 - - 9610 - - 9637 - - 9594 - - 9598 - - 10578 - - 10715 - - 10712 - - 6873 - - 7843 - - 12487 - - type: AtmosDevice - joinedGrid: 34 - uid: 10395 components: - type: Transform @@ -3780,55 +4070,6 @@ entities: - 10859 - type: AtmosDevice joinedGrid: 34 - - uid: 10585 - components: - - type: Transform - pos: 26.5,-12.5 - parent: 34 - - type: DeviceList - devices: - - 10592 - - 3638 - - 9958 - - 8831 - - 8830 - - 9957 - - 8843 - - 9968 - - type: AtmosDevice - joinedGrid: 34 - - uid: 10588 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 19.5,-15.5 - parent: 34 - - type: DeviceList - devices: - - 10590 - - 10340 - - 10587 - - 8827 - - 9936 - - 8824 - - 9943 - - 10586 - - 3340 - - type: AtmosDevice - joinedGrid: 34 - - uid: 10594 - components: - - type: Transform - pos: 30.5,-1.5 - parent: 34 - - type: DeviceList - devices: - - 10592 - - 3638 - - 8872 - - 9980 - - type: AtmosDevice - joinedGrid: 34 - uid: 10597 components: - type: Transform @@ -3845,7 +4086,6 @@ entities: - 8741 - 9886 - 10598 - - 10599 - 8751 - 10600 - 8724 @@ -4068,6 +4308,43 @@ entities: - 11005 - type: AtmosDevice joinedGrid: 34 + - uid: 13671 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 20.5,-20.5 + parent: 34 + - type: DeviceList + devices: + - 13450 + - 13451 + - 13465 + - 3553 + - 13448 + - 13449 + - 7612 + - type: AtmosDevice + joinedGrid: 34 + - uid: 13672 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-6.5 + parent: 34 + - type: DeviceList + devices: + - 12187 + - 12485 + - 12402 + - 12483 + - 12431 + - 12480 + - 13453 + - 13454 + - 13469 + - 13468 + - type: AtmosDevice + joinedGrid: 34 - proto: AirCanister entities: - uid: 1799 @@ -4091,13 +4368,6 @@ entities: parent: 34 - type: AtmosDevice joinedGrid: 34 - - uid: 4513 - components: - - type: Transform - pos: 32.5,-16.5 - parent: 34 - - type: AtmosDevice - joinedGrid: 34 - uid: 6874 components: - type: Transform @@ -4122,21 +4392,38 @@ entities: - type: Transform pos: -49.5,-8.5 parent: 34 + - uid: 4169 + components: + - type: MetaData + name: Extended Confinement Custodial Closet + - type: Transform + pos: 41.5,-9.5 + parent: 34 - proto: AirlockArmoryGlassLocked entities: - - uid: 3748 + - uid: 3696 components: + - type: MetaData + name: Armory - type: Transform - pos: 28.5,-4.5 + rot: 1.5707963267948966 rad + pos: 34.5,-10.5 + parent: 34 + - uid: 5532 + components: + - type: MetaData + name: Warden's Office + - type: Transform + pos: 34.5,-15.5 parent: 34 - proto: AirlockArmoryLocked entities: - - uid: 3699 + - uid: 3689 components: - type: MetaData - name: armory - level I + name: Warden's Bedroom - type: Transform - pos: 27.5,-1.5 + pos: 37.5,-12.5 parent: 34 - proto: AirlockAtmosphericsGlassLocked entities: @@ -4428,6 +4715,14 @@ entities: - type: Transform pos: -21.5,-29.5 parent: 34 + - uid: 3643 + components: + - type: MetaData + name: Security South Engineering Entrance + - type: Transform + rot: -1.5707963267948966 rad + pos: 30.5,-21.5 + parent: 34 - uid: 3785 components: - type: Transform @@ -4438,13 +4733,10 @@ entities: - type: Transform pos: 9.5,-17.5 parent: 34 - - uid: 4864 - components: - - type: Transform - pos: 36.5,-17.5 - parent: 34 - uid: 8119 components: + - type: MetaData + name: Security North Engineering Entrance - type: Transform pos: 22.5,6.5 parent: 34 @@ -4887,19 +5179,23 @@ entities: - type: Transform pos: -15.5,-17.5 parent: 34 -- proto: AirlockHeadOfSecurityLocked +- proto: AirlockHeadOfSecurityGlassLocked entities: - - uid: 692 + - uid: 3721 components: + - type: MetaData + name: Head of Security's Office - type: Transform - pos: 31.5,-11.5 + pos: 29.5,1.5 parent: 34 - - uid: 3606 +- proto: AirlockHeadOfSecurityLocked + entities: + - uid: 4634 components: - type: MetaData - name: head of security's office + name: Head of Security's Bedroom - type: Transform - pos: 28.5,-12.5 + pos: 27.5,4.5 parent: 34 - proto: AirlockHydroGlassLocked entities: @@ -4955,13 +5251,6 @@ entities: - type: Transform pos: 9.5,4.5 parent: 34 -- proto: AirlockMaint - entities: - - uid: 3381 - components: - - type: Transform - pos: 38.5,-16.5 - parent: 34 - proto: AirlockMaintAtmoLocked entities: - uid: 12538 @@ -5129,11 +5418,6 @@ entities: - type: Transform pos: -2.5,12.5 parent: 34 - - uid: 7154 - components: - - type: Transform - pos: 33.5,-20.5 - parent: 34 - uid: 7155 components: - type: Transform @@ -5238,27 +5522,29 @@ entities: parent: 34 - proto: AirlockMaintSecLocked entities: - - uid: 4757 + - uid: 4649 components: + - type: MetaData + name: Security North Engineering Entrance - type: Transform - pos: 36.5,-5.5 + pos: 22.5,1.5 parent: 34 - - uid: 8115 + - uid: 7618 components: + - type: MetaData + name: Security South Engineering Entrance - type: Transform - pos: 22.5,2.5 + rot: -1.5707963267948966 rad + pos: 30.5,-19.5 parent: 34 - proto: AirlockMaintSecurityLawyerLocked entities: - - uid: 78 - components: - - type: Transform - pos: 33.5,-15.5 - parent: 34 - - uid: 160 + - uid: 3673 components: + - type: MetaData + name: Security Mainteance Entrance - type: Transform - pos: 33.5,-0.5 + pos: 33.5,-1.5 parent: 34 - proto: AirlockMaintTheatreLocked entities: @@ -5462,142 +5748,210 @@ entities: entities: - uid: 4798 components: + - type: MetaData + name: Extended Confinement Bathroom - type: Transform pos: 38.5,2.5 parent: 34 - proto: AirlockSecurityGlass entities: - - uid: 92 - components: - - type: Transform - pos: 41.5,-10.5 - parent: 34 - - uid: 3306 - components: - - type: Transform - pos: 16.5,-13.5 - parent: 34 - - uid: 3389 - components: - - type: Transform - pos: 16.5,-14.5 - parent: 34 - uid: 4129 components: + - type: MetaData + name: Extended Confinement Cell 2 - type: Transform pos: 46.5,-9.5 parent: 34 - uid: 4153 components: + - type: MetaData + name: Extended Confinement Cells - type: Transform pos: 44.5,-5.5 parent: 34 - uid: 4156 components: + - type: MetaData + name: Extended Confinement Cells - type: Transform pos: 43.5,-5.5 parent: 34 - - uid: 4159 - components: - - type: Transform - pos: 41.5,-13.5 - parent: 34 - uid: 4160 components: + - type: MetaData + name: Extended Confinement Cell 1 - type: Transform pos: 46.5,-12.5 parent: 34 - - uid: 4438 - components: - - type: Transform - pos: 41.5,-7.5 - parent: 34 - uid: 4448 components: + - type: MetaData + name: Extended Confinement Cell 3 - type: Transform pos: 46.5,-6.5 parent: 34 - uid: 4453 components: + - type: MetaData + name: Extended Confinement Common Room - type: Transform pos: 46.5,-3.5 parent: 34 - uid: 4796 components: + - type: MetaData + name: Extended Confinement Kitchen - type: Transform pos: 42.5,2.5 parent: 34 - uid: 6699 components: + - type: MetaData + name: Extended Confinement Common Room - type: Transform rot: 3.141592653589793 rad pos: 46.5,0.5 parent: 34 - uid: 13067 components: + - type: MetaData + name: Extended Confinement Cyro - type: Transform rot: -1.5707963267948966 rad pos: 44.5,-14.5 parent: 34 - proto: AirlockSecurityGlassLocked entities: - - uid: 3391 + - uid: 331 components: - type: MetaData - name: communal cell + name: Corpsman's Office - type: Transform - pos: 18.5,-9.5 + pos: 15.5,-0.5 parent: 34 - - type: DeviceLinkSink - links: - - 3514 - - uid: 3561 + - uid: 1067 components: - type: MetaData - name: locker room + name: Security Office - type: Transform - pos: 21.5,-17.5 + pos: 20.5,-18.5 parent: 34 - - uid: 4799 + - uid: 1354 components: - type: MetaData - name: extended confinement + name: Brig Cell 3 - type: Transform - pos: 37.5,-3.5 + rot: -1.5707963267948966 rad + pos: 18.5,-4.5 + parent: 34 + - uid: 3526 + components: + - type: MetaData + name: Extended Confinement EVA + - type: Transform + pos: 38.5,-5.5 + parent: 34 + - uid: 3540 + components: + - type: MetaData + name: Brig + - type: Transform + pos: 22.5,-5.5 + parent: 34 + - uid: 3770 + components: + - type: MetaData + name: Brig Cell 1 + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.5,-10.5 + parent: 34 + - uid: 4149 + components: + - type: MetaData + name: Brig Cell 2 + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.5,-7.5 + parent: 34 + - uid: 4752 + components: + - type: MetaData + name: Extended Confinement Airlock + - type: Transform + pos: 36.5,-3.5 + parent: 34 + - uid: 6693 + components: + - type: MetaData + name: Locker Room + - type: Transform + pos: 25.5,-15.5 + parent: 34 + - uid: 6795 + components: + - type: MetaData + name: Security Plaza + - type: Transform + pos: 25.5,-6.5 parent: 34 - uid: 12845 components: + - type: MetaData + name: Extended Confinement Airlock - type: Transform rot: -1.5707963267948966 rad pos: 40.5,-3.5 parent: 34 - proto: AirlockSecurityLawyerGlassLocked entities: - - uid: 4633 + - uid: 1080 components: + - type: MetaData + name: Security Secondary Entrance - type: Transform - rot: 1.5707963267948966 rad - pos: 23.5,-8.5 + pos: 34.5,-20.5 parent: 34 - - uid: 12195 + - uid: 3582 components: + - type: MetaData + name: Security Lobby - type: Transform - pos: 22.5,-8.5 + pos: 15.5,-13.5 parent: 34 -- proto: AirlockSecurityLawyerLocked - entities: - - uid: 3475 + - type: DeviceLinkSink + invokeCounter: 1 + links: + - 12927 + - 4532 + - type: DeviceLinkSource + linkedPorts: + 4532: + - DoorStatus: DoorBolt + - uid: 3671 components: - type: MetaData - name: security + name: Brig - type: Transform - pos: 20.5,-11.5 + pos: 22.5,-8.5 parent: 34 - - uid: 4889 + - uid: 4532 components: + - type: MetaData + name: Security Primary Entrance - type: Transform - pos: 27.5,-17.5 + pos: 19.5,-13.5 parent: 34 + - type: DeviceLinkSink + invokeCounter: 1 + links: + - 3582 + - type: DeviceLinkSource + linkedPorts: + 3582: + - DoorStatus: DoorBolt +- proto: AirlockSecurityLawyerLocked + entities: - uid: 10148 components: - type: Transform @@ -5610,32 +5964,26 @@ entities: parent: 34 - proto: AirlockSecurityLocked entities: - - uid: 220 - components: - - type: Transform - pos: 20.5,0.5 - parent: 34 - - uid: 470 + - uid: 606 components: + - type: MetaData + name: Interrogation Observation Room - type: Transform - pos: 15.5,-0.5 + pos: 36.5,-16.5 parent: 34 - - uid: 999 + - uid: 3593 components: - type: MetaData - name: communal cell + name: Corpsman's Office - type: Transform - pos: 16.5,-8.5 + pos: 20.5,-0.5 parent: 34 - - type: DeviceLinkSink - links: - - 3514 - - uid: 3388 + - uid: 13471 components: - type: MetaData - name: locker room + name: Interrogation Room - type: Transform - pos: 18.5,-15.5 + pos: 36.5,-18.5 parent: 34 - proto: AirlockServiceGlassLocked entities: @@ -5770,13 +6118,12 @@ entities: - type: Transform pos: 6.5,-13.5 parent: 34 - - uid: 1890 + - uid: 470 components: - type: MetaData - name: Prison's north APC + name: Extended Confinement North APC - type: Transform - rot: 1.5707963267948966 rad - pos: 40.5,-1.5 + pos: 38.5,-1.5 parent: 34 - uid: 2140 components: @@ -5870,6 +6217,12 @@ entities: rot: 1.5707963267948966 rad pos: 4.5,-29.5 parent: 34 + - uid: 3340 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 32.5,-26.5 + parent: 34 - uid: 3400 components: - type: MetaData @@ -5913,7 +6266,7 @@ entities: - uid: 4579 components: - type: MetaData - name: Prison's south APC + name: Extended Confinement South APC - type: Transform rot: 3.141592653589793 rad pos: 41.5,-5.5 @@ -5949,28 +6302,19 @@ entities: - type: Transform pos: 31.5,-42.5 parent: 34 - - uid: 6792 - components: - - type: MetaData - name: South Security's APC - - type: Transform - rot: -1.5707963267948966 rad - pos: 27.5,-18.5 - parent: 34 - - uid: 6869 + - uid: 6990 components: - type: MetaData - name: Security's front APC + name: Security APC - type: Transform - pos: 18.5,-11.5 + pos: 21.5,-11.5 parent: 34 - - uid: 6870 + - uid: 6991 components: - type: MetaData - name: North Security's APC + name: Prison APC - type: Transform - rot: 1.5707963267948966 rad - pos: 21.5,-3.5 + pos: 21.5,-2.5 parent: 34 - uid: 7003 components: @@ -5980,13 +6324,6 @@ entities: rot: 1.5707963267948966 rad pos: 11.5,-17.5 parent: 34 - - uid: 7206 - components: - - type: MetaData - name: Bridge's hall APC - - type: Transform - pos: 32.5,-20.5 - parent: 34 - uid: 7314 components: - type: MetaData @@ -6109,6 +6446,11 @@ entities: rot: 1.5707963267948966 rad pos: 60.5,-24.5 parent: 34 + - uid: 13575 + components: + - type: Transform + pos: 17.5,2.5 + parent: 34 - proto: APCHighCapacity entities: - uid: 1222 @@ -6135,12 +6477,13 @@ entities: rot: 1.5707963267948966 rad pos: -39.5,-49.5 parent: 34 - - uid: 6871 + - uid: 3763 components: - type: MetaData - name: Armoury's APC + name: Head of Security APC - type: Transform - pos: 26.5,5.5 + rot: 3.141592653589793 rad + pos: 31.5,1.5 parent: 34 - uid: 7413 components: @@ -6164,6 +6507,13 @@ entities: - type: Transform pos: -21.5,-9.5 parent: 34 + - uid: 12478 + components: + - type: MetaData + name: Armory APC + - type: Transform + pos: 36.5,-10.5 + parent: 34 - proto: AppraisalTool entities: - uid: 895 @@ -6406,28 +6756,18 @@ entities: parent: 34 - proto: BannerSecurity entities: - - uid: 11342 - components: - - type: Transform - pos: 22.5,-16.5 - parent: 34 -- proto: Barricade - entities: - - uid: 4510 - components: - - type: Transform - pos: 35.5,-15.5 - parent: 34 - - uid: 4529 + - uid: 3983 components: - type: Transform - pos: 37.5,-14.5 + pos: 33.5,-21.5 parent: 34 - - uid: 4542 + - uid: 6092 components: - type: Transform - pos: 35.5,-14.5 + pos: 35.5,-21.5 parent: 34 +- proto: Barricade + entities: - uid: 5881 components: - type: Transform @@ -6456,16 +6796,6 @@ entities: parent: 34 - proto: BarricadeBlock entities: - - uid: 4509 - components: - - type: Transform - pos: 36.5,-14.5 - parent: 34 - - uid: 11348 - components: - - type: Transform - pos: 38.5,-16.5 - parent: 34 - uid: 13238 components: - type: Transform @@ -6473,12 +6803,6 @@ entities: parent: 34 - proto: BarricadeDirectional entities: - - uid: 4658 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 39.5,-16.5 - parent: 34 - uid: 12798 components: - type: Transform @@ -6615,11 +6939,6 @@ entities: - type: Transform pos: -15.5,-38.5 parent: 34 - - uid: 1354 - components: - - type: Transform - pos: 32.5,-9.5 - parent: 34 - uid: 2174 components: - type: Transform @@ -6655,20 +6974,15 @@ entities: - type: Transform pos: -31.5,-15.5 parent: 34 - - uid: 3494 - components: - - type: Transform - pos: 20.5,-3.5 - parent: 34 - - uid: 3615 + - uid: 3624 components: - type: Transform - pos: 18.5,-3.5 + pos: 26.5,5.5 parent: 34 - - uid: 3616 + - uid: 3695 components: - type: Transform - pos: 16.5,-3.5 + pos: 18.5,1.5 parent: 34 - uid: 3772 components: @@ -6680,20 +6994,25 @@ entities: - type: Transform pos: 15.5,-34.5 parent: 34 - - uid: 4540 + - uid: 4152 components: - type: Transform - pos: 39.5,-9.5 + pos: 17.5,-9.5 parent: 34 - - uid: 4549 + - uid: 4172 components: - type: Transform - pos: 39.5,-6.5 + pos: 17.5,-3.5 parent: 34 - - uid: 4555 + - uid: 4505 components: - type: Transform - pos: 39.5,-12.5 + pos: 39.5,-11.5 + parent: 34 + - uid: 4534 + components: + - type: Transform + pos: 17.5,-6.5 parent: 34 - uid: 4556 components: @@ -6710,11 +7029,6 @@ entities: - type: Transform pos: 48.5,-7.5 parent: 34 - - uid: 4574 - components: - - type: Transform - pos: 41.5,-15.5 - parent: 34 - uid: 4790 components: - type: Transform @@ -6765,15 +7079,10 @@ entities: parent: 34 - proto: BedsheetBrigmedic entities: - - uid: 1080 - components: - - type: Transform - pos: 17.5,1.5 - parent: 34 - - uid: 12276 + - uid: 8906 components: - type: Transform - pos: 16.5,1.5 + pos: 18.5,1.5 parent: 34 - proto: BedsheetBrown entities: @@ -6813,10 +7122,15 @@ entities: parent: 34 - proto: BedsheetHOS entities: - - uid: 8074 + - uid: 2964 components: - type: Transform - pos: 32.5,-9.5 + pos: 39.5,-11.5 + parent: 34 + - uid: 3246 + components: + - type: Transform + pos: 26.5,5.5 parent: 34 - proto: BedsheetIan entities: @@ -6847,6 +7161,11 @@ entities: - type: Transform pos: -1.5,-37.5 parent: 34 + - uid: 6718 + components: + - type: Transform + pos: 18.5,-1.5 + parent: 34 - proto: BedsheetMime entities: - uid: 5951 @@ -6854,6 +7173,23 @@ entities: - type: Transform pos: 2.5,-20.5 parent: 34 +- proto: BedsheetOrange + entities: + - uid: 3580 + components: + - type: Transform + pos: 17.5,-6.5 + parent: 34 + - uid: 3581 + components: + - type: Transform + pos: 17.5,-9.5 + parent: 34 + - uid: 4799 + components: + - type: Transform + pos: 17.5,-3.5 + parent: 34 - proto: BedsheetQM entities: - uid: 10595 @@ -6874,11 +7210,6 @@ entities: - type: Transform pos: -49.5,-6.5 parent: 34 - - uid: 4531 - components: - - type: Transform - pos: 41.5,-15.5 - parent: 34 - uid: 4744 components: - type: Transform @@ -6889,11 +7220,6 @@ entities: - type: Transform pos: 48.5,-10.5 parent: 34 - - uid: 4849 - components: - - type: Transform - pos: 39.5,-6.5 - parent: 34 - uid: 5856 components: - type: Transform @@ -6919,21 +7245,11 @@ entities: - type: Transform pos: 9.5,-8.5 parent: 34 - - uid: 12478 - components: - - type: Transform - pos: 39.5,-12.5 - parent: 34 - uid: 12479 components: - type: Transform pos: 48.5,-13.5 parent: 34 - - uid: 12480 - components: - - type: Transform - pos: 39.5,-9.5 - parent: 34 - proto: BedsheetWiz entities: - uid: 2204 @@ -6941,23 +7257,6 @@ entities: - type: Transform pos: -45.5,-6.5 parent: 34 -- proto: BedsheetYellow - entities: - - uid: 3617 - components: - - type: Transform - pos: 20.5,-3.5 - parent: 34 - - uid: 3618 - components: - - type: Transform - pos: 18.5,-3.5 - parent: 34 - - uid: 3619 - components: - - type: Transform - pos: 16.5,-3.5 - parent: 34 - proto: BenchSofaCorpLeft entities: - uid: 13177 @@ -6984,10 +7283,11 @@ entities: parent: 34 - proto: BenchSofaLeft entities: - - uid: 12281 + - uid: 4930 components: - type: Transform - pos: 30.5,-13.5 + rot: -1.5707963267948966 rad + pos: 27.5,-9.5 parent: 34 - uid: 13178 components: @@ -6997,6 +7297,12 @@ entities: parent: 34 - proto: BenchSofaMiddle entities: + - uid: 4931 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 27.5,-8.5 + parent: 34 - uid: 13174 components: - type: Transform @@ -7005,10 +7311,11 @@ entities: parent: 34 - proto: BenchSofaRight entities: - - uid: 12282 + - uid: 4929 components: - type: Transform - pos: 29.5,-13.5 + rot: -1.5707963267948966 rad + pos: 27.5,-7.5 parent: 34 - uid: 13179 components: @@ -7103,41 +7410,6 @@ entities: - type: DeviceLinkSink links: - 12307 -- proto: BlastDoorOpen - entities: - - uid: 3639 - components: - - type: Transform - pos: 15.5,-6.5 - parent: 34 - - type: DeviceLinkSink - links: - - 3750 - - uid: 3640 - components: - - type: Transform - pos: 15.5,-5.5 - parent: 34 - - type: DeviceLinkSink - links: - - 3750 - - uid: 3641 - components: - - type: Transform - pos: 15.5,-4.5 - parent: 34 - - type: DeviceLinkSink - links: - - 3750 - - uid: 8683 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 32.5,-4.5 - parent: 34 - - type: DeviceLinkSink - links: - - 7996 - proto: BlueLightTube entities: - uid: 5065 @@ -7150,13 +7422,6 @@ entities: - type: Transform pos: -19.61977,7.4961514 parent: 34 -- proto: BoardGameSpawner - entities: - - uid: 4696 - components: - - type: Transform - pos: 41.5,-18.5 - parent: 34 - proto: Bonfire entities: - uid: 6029 @@ -7224,10 +7489,10 @@ entities: parent: 34 - proto: BookSecurity entities: - - uid: 11332 + - uid: 4889 components: - type: Transform - pos: 22.669678,-12.33404 + pos: 23.521662,-11.245161 parent: 34 - proto: Bookshelf entities: @@ -7241,16 +7506,6 @@ entities: - type: Transform pos: -45.5,2.5 parent: 34 - - uid: 3626 - components: - - type: Transform - pos: 17.5,-3.5 - parent: 34 - - uid: 4079 - components: - - type: Transform - pos: 40.5,-9.5 - parent: 34 - proto: BookshelfFilled entities: - uid: 3473 @@ -7316,19 +7571,17 @@ entities: - type: Transform pos: 1.5,-50.5 parent: 34 -- proto: BoxBeaker - entities: - - uid: 12443 + - uid: 13663 components: - type: Transform - pos: 0.31644678,-43.509476 + pos: 23.5,2.5 parent: 34 -- proto: BoxBeanbag +- proto: BoxBeaker entities: - - uid: 3580 + - uid: 12443 components: - type: Transform - pos: 25.475487,1.7896924 + pos: 0.31644678,-43.509476 parent: 34 - proto: BoxBodyBag entities: @@ -7356,13 +7609,16 @@ entities: - type: Transform pos: 6.7010136,-18.662865 parent: 34 -- proto: BoxFolderBlue +- proto: BoxFolderBase entities: - - uid: 3767 + - uid: 3542 components: - type: Transform - pos: 29.333155,-10.290697 + rot: -1.5707963267948966 rad + pos: 41.444542,-16.106535 parent: 34 +- proto: BoxFolderBlue + entities: - uid: 4011 components: - type: Transform @@ -7373,11 +7629,6 @@ entities: - type: Transform pos: 10.813127,-32.038227 parent: 34 - - uid: 6096 - components: - - type: Transform - pos: 18.749836,-0.9969661 - parent: 34 - uid: 10072 components: - type: Transform @@ -7390,6 +7641,12 @@ entities: - type: Transform pos: 13.740211,-27.600729 parent: 34 + - uid: 8820 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 41.553917,-15.84091 + parent: 34 - proto: BoxFolderGrey entities: - uid: 2259 @@ -7405,10 +7662,11 @@ entities: rot: 3.141592653589793 rad pos: 10.032458,7.7103887 parent: 34 - - uid: 3766 + - uid: 6716 components: - type: Transform - pos: 27.260237,-6.2879176 + rot: 3.141592653589793 rad + pos: 30.46565,3.662427 parent: 34 - uid: 10073 components: @@ -7420,6 +7678,12 @@ entities: - type: Transform pos: -5.3270607,4.6644883 parent: 34 + - uid: 12961 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 35.44456,-14.501591 + parent: 34 - proto: BoxFolderWhite entities: - uid: 2694 @@ -7452,13 +7716,6 @@ entities: rot: 1.5707963267948966 rad pos: -58.5,7.5 parent: 34 -- proto: BoxLethalshot - entities: - - uid: 4497 - components: - - type: Transform - pos: 28.47903,4.62251 - parent: 34 - proto: BoxLightbulb entities: - uid: 5933 @@ -7473,6 +7730,27 @@ entities: - type: Transform pos: 6.7546015,-18.306509 parent: 34 +- proto: BoxMagazinePistol + entities: + - uid: 7162 + components: + - type: Transform + pos: 29.5,-8 + parent: 34 +- proto: BoxMagazinePistolSubMachineGun + entities: + - uid: 7085 + components: + - type: Transform + pos: 29.5,-7.5 + parent: 34 +- proto: BoxMagazineRifle + entities: + - uid: 7154 + components: + - type: Transform + pos: 29.5,-8.5 + parent: 34 - proto: BoxMouthSwab entities: - uid: 2670 @@ -7496,23 +7774,24 @@ entities: parent: 34 - proto: BrigTimer entities: - - uid: 3514 + - uid: 3562 components: - type: Transform - pos: 19.5,-8.5 + rot: 3.141592653589793 rad + pos: 18.5,-5.5 + parent: 34 + - uid: 3638 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 18.5,-8.5 + parent: 34 + - uid: 3694 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-11.5 parent: 34 - - type: SignalTimer - label: COMM - - type: DeviceLinkSource - linkedPorts: - 3391: - - Start: Close - - Timer: Open - - Timer: AutoClose - 999: - - Start: Close - - Timer: Open - - Timer: AutoClose - proto: BrokenBottle entities: - uid: 6036 @@ -7533,11 +7812,6 @@ entities: - type: Transform pos: -49.6156,6.6717114 parent: 34 - - uid: 8328 - components: - - type: Transform - pos: 19.563652,-20.443884 - parent: 34 - proto: Bucket entities: - uid: 3076 @@ -7550,6 +7824,11 @@ entities: - type: Transform pos: -17.6769,2.4594078 parent: 34 + - uid: 3630 + components: + - type: Transform + pos: 40.804543,-9.601732 + parent: 34 - uid: 4715 components: - type: Transform @@ -7602,6 +7881,11 @@ entities: - type: Transform pos: -47.5,-39.5 parent: 34 + - uid: 73 + components: + - type: Transform + pos: 26.5,4.5 + parent: 34 - uid: 79 components: - type: Transform @@ -7762,6 +8046,16 @@ entities: - type: Transform pos: -3.5,-45.5 parent: 34 + - uid: 993 + components: + - type: Transform + pos: 20.5,-0.5 + parent: 34 + - uid: 999 + components: + - type: Transform + pos: 38.5,-1.5 + parent: 34 - uid: 1011 components: - type: Transform @@ -7792,6 +8086,11 @@ entities: - type: Transform pos: -10.5,-33.5 parent: 34 + - uid: 1053 + components: + - type: Transform + pos: 32.5,-26.5 + parent: 34 - uid: 1056 components: - type: Transform @@ -7802,11 +8101,6 @@ entities: - type: Transform pos: -25.5,-32.5 parent: 34 - - uid: 1103 - components: - - type: Transform - pos: 40.5,-12.5 - parent: 34 - uid: 1111 components: - type: Transform @@ -7937,11 +8231,6 @@ entities: - type: Transform pos: 6.5,-39.5 parent: 34 - - uid: 1373 - components: - - type: Transform - pos: 30.5,-10.5 - parent: 34 - uid: 1379 components: - type: Transform @@ -7977,11 +8266,6 @@ entities: - type: Transform pos: 48.5,-3.5 parent: 34 - - uid: 1494 - components: - - type: Transform - pos: 32.5,-10.5 - parent: 34 - uid: 1524 components: - type: Transform @@ -8522,6 +8806,11 @@ entities: - type: Transform pos: 50.5,-3.5 parent: 34 + - uid: 1890 + components: + - type: Transform + pos: 42.5,-4.5 + parent: 34 - uid: 1911 components: - type: Transform @@ -8552,6 +8841,11 @@ entities: - type: Transform pos: -29.5,-33.5 parent: 34 + - uid: 2087 + components: + - type: Transform + pos: 28.5,4.5 + parent: 34 - uid: 2091 components: - type: Transform @@ -9919,11 +10213,26 @@ entities: - type: Transform pos: -56.5,-40.5 parent: 34 + - uid: 3306 + components: + - type: Transform + pos: 33.5,-26.5 + parent: 34 - uid: 3314 components: - type: Transform pos: -33.5,-41.5 parent: 34 + - uid: 3338 + components: + - type: Transform + pos: 34.5,-26.5 + parent: 34 + - uid: 3343 + components: + - type: Transform + pos: 27.5,8.5 + parent: 34 - uid: 3344 components: - type: Transform @@ -9994,6 +10303,51 @@ entities: - type: Transform pos: -8.5,-26.5 parent: 34 + - uid: 3545 + components: + - type: Transform + pos: 31.5,-5.5 + parent: 34 + - uid: 3547 + components: + - type: Transform + pos: 38.5,-6.5 + parent: 34 + - uid: 3549 + components: + - type: Transform + pos: 38.5,-3.5 + parent: 34 + - uid: 3604 + components: + - type: Transform + pos: 31.5,2.5 + parent: 34 + - uid: 3646 + components: + - type: Transform + pos: 38.5,-4.5 + parent: 34 + - uid: 3648 + components: + - type: Transform + pos: 41.5,-4.5 + parent: 34 + - uid: 3650 + components: + - type: Transform + pos: 37.5,-3.5 + parent: 34 + - uid: 3652 + components: + - type: Transform + pos: 38.5,-5.5 + parent: 34 + - uid: 3677 + components: + - type: Transform + pos: 21.5,-11.5 + parent: 34 - uid: 3683 components: - type: Transform @@ -10004,15 +10358,50 @@ entities: - type: Transform pos: -29.5,-26.5 parent: 34 + - uid: 3691 + components: + - type: Transform + pos: 39.5,-3.5 + parent: 34 + - uid: 3697 + components: + - type: Transform + pos: 38.5,-2.5 + parent: 34 + - uid: 3699 + components: + - type: Transform + pos: 33.5,-6.5 + parent: 34 + - uid: 3707 + components: + - type: Transform + pos: 19.5,-0.5 + parent: 34 + - uid: 3710 + components: + - type: Transform + pos: 31.5,3.5 + parent: 34 + - uid: 3740 + components: + - type: Transform + pos: 39.5,-6.5 + parent: 34 + - uid: 3751 + components: + - type: Transform + pos: 29.5,4.5 + parent: 34 - uid: 3753 components: - type: Transform pos: -29.5,-43.5 parent: 34 - - uid: 3759 + - uid: 3755 components: - type: Transform - pos: 31.5,-10.5 + pos: 41.5,-5.5 parent: 34 - uid: 3773 components: @@ -10164,15 +10553,15 @@ entities: - type: Transform pos: 13.5,-42.5 parent: 34 - - uid: 4137 + - uid: 4164 components: - type: Transform - pos: 33.5,-10.5 + pos: -53.5,-21.5 parent: 34 - - uid: 4164 + - uid: 4173 components: - type: Transform - pos: -53.5,-21.5 + pos: 31.5,4.5 parent: 34 - uid: 4186 components: @@ -10339,6 +10728,11 @@ entities: - type: Transform pos: -0.5,-11.5 parent: 34 + - uid: 4255 + components: + - type: Transform + pos: 30.5,4.5 + parent: 34 - uid: 4268 components: - type: Transform @@ -10409,6 +10803,11 @@ entities: - type: Transform pos: 9.5,-47.5 parent: 34 + - uid: 4424 + components: + - type: Transform + pos: 40.5,-9.5 + parent: 34 - uid: 4430 components: - type: Transform @@ -10472,12 +10871,12 @@ entities: - uid: 4552 components: - type: Transform - pos: 42.5,-12.5 + pos: 31.5,-17.5 parent: 34 - - uid: 4553 + - uid: 4555 components: - type: Transform - pos: 41.5,-12.5 + pos: 27.5,4.5 parent: 34 - uid: 4578 components: @@ -10504,25 +10903,15 @@ entities: - type: Transform pos: 43.5,-5.5 parent: 34 - - uid: 4672 - components: - - type: Transform - pos: 36.5,-16.5 - parent: 34 - uid: 4674 components: - type: Transform pos: -22.5,-34.5 parent: 34 - - uid: 4697 - components: - - type: Transform - pos: 40.5,-9.5 - parent: 34 - - uid: 4742 + - uid: 4696 components: - type: Transform - pos: 40.5,-7.5 + pos: 39.5,-7.5 parent: 34 - uid: 4767 components: @@ -10549,30 +10938,15 @@ entities: - type: Transform pos: 42.5,-5.5 parent: 34 - - uid: 4804 - components: - - type: Transform - pos: 40.5,-1.5 - parent: 34 - uid: 4806 components: - type: Transform pos: 40.5,-3.5 parent: 34 - - uid: 4807 - components: - - type: Transform - pos: 39.5,-3.5 - parent: 34 - uid: 4808 components: - type: Transform - pos: 38.5,-3.5 - parent: 34 - - uid: 4811 - components: - - type: Transform - pos: 38.5,-0.5 + pos: 31.5,1.5 parent: 34 - uid: 4812 components: @@ -10729,25 +11103,80 @@ entities: - type: Transform pos: 42.5,-3.5 parent: 34 - - uid: 4843 + - uid: 4876 components: - type: Transform - pos: 41.5,-3.5 + pos: -19.5,-40.5 parent: 34 - - uid: 4858 + - uid: 4877 components: - type: Transform - pos: 41.5,-7.5 + pos: 21.5,-12.5 parent: 34 - - uid: 4865 + - uid: 4897 components: - type: Transform - pos: 36.5,-17.5 + pos: 33.5,7.5 parent: 34 - - uid: 4876 + - uid: 4898 components: - type: Transform - pos: -19.5,-40.5 + pos: 33.5,6.5 + parent: 34 + - uid: 4899 + components: + - type: Transform + pos: 33.5,5.5 + parent: 34 + - uid: 4900 + components: + - type: Transform + pos: 33.5,5.5 + parent: 34 + - uid: 4901 + components: + - type: Transform + pos: 33.5,4.5 + parent: 34 + - uid: 4902 + components: + - type: Transform + pos: 33.5,4.5 + parent: 34 + - uid: 4908 + components: + - type: Transform + pos: 33.5,3.5 + parent: 34 + - uid: 4912 + components: + - type: Transform + pos: 33.5,2.5 + parent: 34 + - uid: 4913 + components: + - type: Transform + pos: 33.5,2.5 + parent: 34 + - uid: 4914 + components: + - type: Transform + pos: 33.5,1.5 + parent: 34 + - uid: 4915 + components: + - type: Transform + pos: 33.5,1.5 + parent: 34 + - uid: 4917 + components: + - type: Transform + pos: 33.5,0.5 + parent: 34 + - uid: 4919 + components: + - type: Transform + pos: 33.5,-0.5 parent: 34 - uid: 4928 components: @@ -10759,6 +11188,11 @@ entities: - type: Transform pos: 10.5,-28.5 parent: 34 + - uid: 4946 + components: + - type: Transform + pos: 16.5,-0.5 + parent: 34 - uid: 5045 components: - type: Transform @@ -11349,11 +11783,6 @@ entities: - type: Transform pos: 42.5,-8.5 parent: 34 - - uid: 6024 - components: - - type: Transform - pos: 41.5,-9.5 - parent: 34 - uid: 6063 components: - type: Transform @@ -11564,6 +11993,11 @@ entities: - type: Transform pos: 4.5,-33.5 parent: 34 + - uid: 6565 + components: + - type: Transform + pos: 27.5,-22.5 + parent: 34 - uid: 6567 components: - type: Transform @@ -11584,510 +12018,380 @@ entities: - type: Transform pos: -19.5,-39.5 parent: 34 - - uid: 6793 - components: - - type: Transform - pos: 21.5,-3.5 - parent: 34 - - uid: 6794 - components: - - type: Transform - pos: 21.5,-4.5 - parent: 34 - - uid: 6795 - components: - - type: Transform - pos: 21.5,-5.5 - parent: 34 - - uid: 6796 + - uid: 6706 components: - type: Transform - pos: 21.5,-6.5 + pos: 41.5,-9.5 parent: 34 - - uid: 6797 + - uid: 6870 components: - type: Transform - pos: 21.5,-7.5 + pos: 22.5,-0.5 parent: 34 - - uid: 6798 + - uid: 6871 components: - type: Transform - pos: 20.5,-5.5 + pos: 22.5,0.5 parent: 34 - uid: 6879 components: - type: Transform - pos: 19.5,-5.5 + pos: 21.5,-0.5 parent: 34 - uid: 6880 components: - type: Transform - pos: 18.5,-5.5 + pos: 21.5,-5.5 parent: 34 - uid: 6881 components: - type: Transform - pos: 17.5,-5.5 - parent: 34 - - uid: 6882 - components: - - type: Transform - pos: 16.5,-5.5 + pos: 20.5,-4.5 parent: 34 - uid: 6883 components: - type: Transform - pos: 16.5,-4.5 + pos: 19.5,-4.5 parent: 34 - uid: 6884 components: - type: Transform - pos: 18.5,-6.5 + pos: 19.5,-7.5 parent: 34 - uid: 6885 components: - type: Transform - pos: 16.5,-6.5 + pos: 20.5,-7.5 parent: 34 - uid: 6886 components: - type: Transform - pos: 18.5,-4.5 + pos: 19.5,-10.5 parent: 34 - uid: 6887 components: - type: Transform - pos: 16.5,-7.5 + pos: 20.5,-6.5 parent: 34 - uid: 6888 components: - type: Transform - pos: 16.5,-8.5 + pos: 20.5,-10.5 parent: 34 - uid: 6889 components: - type: Transform - pos: 17.5,-13.5 + pos: 20.5,-9.5 parent: 34 - uid: 6890 components: - type: Transform - pos: 18.5,-11.5 - parent: 34 - - uid: 6891 - components: - - type: Transform - pos: 18.5,-12.5 + pos: 20.5,-8.5 parent: 34 - uid: 6892 components: - type: Transform - pos: 18.5,-13.5 + pos: 22.5,-5.5 parent: 34 - uid: 6893 components: - type: Transform - pos: 16.5,-13.5 + pos: 24.5,-8.5 parent: 34 - uid: 6894 components: - type: Transform - pos: 18.5,-14.5 + pos: 25.5,-8.5 parent: 34 - uid: 6895 components: - type: Transform - pos: 18.5,-15.5 + pos: 25.5,-7.5 parent: 34 - uid: 6896 components: - type: Transform - pos: 18.5,-16.5 + pos: 23.5,-8.5 parent: 34 - uid: 6897 components: - type: Transform - pos: 18.5,-17.5 + pos: 18.5,-4.5 parent: 34 - uid: 6898 components: - type: Transform - pos: 18.5,-18.5 + pos: 17.5,-4.5 parent: 34 - uid: 6899 components: - type: Transform - pos: 17.5,-18.5 + pos: 25.5,-6.5 parent: 34 - uid: 6900 components: - type: Transform - pos: 18.5,-19.5 + pos: 18.5,-7.5 parent: 34 - uid: 6901 components: - type: Transform - pos: 19.5,-18.5 + pos: 17.5,-7.5 parent: 34 - uid: 6902 components: - type: Transform - pos: 20.5,-18.5 + pos: 18.5,-10.5 parent: 34 - uid: 6903 components: - type: Transform - pos: 19.5,-13.5 + pos: 17.5,-10.5 parent: 34 - uid: 6904 components: - type: Transform - pos: 20.5,-13.5 + pos: 15.5,-13.5 parent: 34 - uid: 6905 components: - type: Transform - pos: 27.5,-18.5 + pos: 16.5,-13.5 parent: 34 - uid: 6906 components: - type: Transform - pos: 28.5,-18.5 + pos: 17.5,-13.5 parent: 34 - uid: 6907 components: - type: Transform - pos: 29.5,-18.5 + pos: 18.5,-13.5 parent: 34 - uid: 6908 components: - type: Transform - pos: 29.5,-17.5 + pos: 19.5,-13.5 parent: 34 - uid: 6909 components: - type: Transform - pos: 26.5,-18.5 + pos: 20.5,-13.5 parent: 34 - uid: 6910 components: - type: Transform - pos: 25.5,-18.5 + pos: 19.5,-18.5 parent: 34 - uid: 6911 components: - type: Transform - pos: 24.5,-18.5 + pos: 20.5,-18.5 parent: 34 - uid: 6912 components: - type: Transform - pos: 24.5,-19.5 + pos: 21.5,-18.5 parent: 34 - uid: 6913 components: - type: Transform - pos: 24.5,-17.5 + pos: 22.5,-18.5 parent: 34 - uid: 6914 components: - type: Transform - pos: 24.5,-16.5 + pos: 24.5,-18.5 parent: 34 - uid: 6915 components: - type: Transform - pos: 24.5,-15.5 + pos: 23.5,-18.5 parent: 34 - uid: 6916 components: - type: Transform - pos: 24.5,-14.5 + pos: 24.5,-18.5 parent: 34 - uid: 6917 components: - type: Transform - pos: 24.5,-13.5 + pos: 25.5,-18.5 parent: 34 - uid: 6918 components: - type: Transform - pos: 25.5,-13.5 + pos: 25.5,-17.5 parent: 34 - uid: 6919 components: - type: Transform - pos: 26.5,-13.5 + pos: 25.5,-16.5 parent: 34 - uid: 6920 components: - type: Transform - pos: 27.5,-13.5 + pos: 18.5,-18.5 parent: 34 - uid: 6921 components: - type: Transform - pos: 28.5,-13.5 + pos: 25.5,-14.5 parent: 34 - uid: 6922 components: - type: Transform - pos: 28.5,-12.5 + pos: 25.5,-13.5 parent: 34 - uid: 6923 components: - type: Transform - pos: 28.5,-11.5 + pos: 24.5,-13.5 parent: 34 - uid: 6924 components: - type: Transform - pos: 28.5,-10.5 + pos: 23.5,-13.5 parent: 34 - uid: 6925 components: - type: Transform - pos: 22.5,-3.5 + pos: 21.5,-13.5 parent: 34 - uid: 6926 components: - type: Transform - pos: 23.5,-3.5 + pos: 22.5,-13.5 parent: 34 - uid: 6927 components: - type: Transform - pos: 24.5,-3.5 + pos: 25.5,-15.5 parent: 34 - uid: 6928 components: - type: Transform - pos: 25.5,-3.5 + pos: 34.5,-16.5 parent: 34 - uid: 6929 components: - type: Transform - pos: 26.5,-3.5 + pos: 34.5,-17.5 parent: 34 - uid: 6930 components: - type: Transform - pos: 27.5,-3.5 + pos: 34.5,-18.5 parent: 34 - uid: 6931 components: - type: Transform - pos: 26.5,5.5 - parent: 34 - - uid: 6932 - components: - - type: Transform - pos: 26.5,4.5 - parent: 34 - - uid: 6933 - components: - - type: Transform - pos: 27.5,4.5 - parent: 34 - - uid: 6934 - components: - - type: Transform - pos: 27.5,3.5 - parent: 34 - - uid: 6935 - components: - - type: Transform - pos: 27.5,2.5 - parent: 34 - - uid: 6936 - components: - - type: Transform - pos: 27.5,1.5 - parent: 34 - - uid: 6937 - components: - - type: Transform - pos: 27.5,0.5 + pos: 34.5,-19.5 parent: 34 - uid: 6938 components: - type: Transform - pos: 26.5,0.5 + pos: 36.5,-12.5 parent: 34 - uid: 6939 components: - type: Transform - pos: 28.5,0.5 + pos: 34.5,-12.5 parent: 34 - uid: 6940 components: - type: Transform - pos: 28.5,-3.5 + pos: 34.5,-13.5 parent: 34 - uid: 6941 components: - type: Transform - pos: 29.5,-3.5 + pos: 34.5,-14.5 parent: 34 - uid: 6942 components: - type: Transform - pos: 30.5,-3.5 + pos: 35.5,-12.5 parent: 34 - uid: 6943 components: - type: Transform - pos: 31.5,-3.5 + pos: 38.5,-12.5 parent: 34 - uid: 6944 components: - type: Transform - pos: 32.5,-3.5 + pos: 39.5,-12.5 parent: 34 - uid: 6945 components: - type: Transform - pos: 33.5,-3.5 + pos: 37.5,-12.5 parent: 34 - uid: 6946 components: - type: Transform - pos: 34.5,-3.5 + pos: 34.5,-11.5 parent: 34 - - uid: 6948 + - uid: 6947 components: - type: Transform - pos: 28.5,-14.5 + pos: 34.5,-10.5 parent: 34 - - uid: 6949 + - uid: 6948 components: - type: Transform - pos: 29.5,-14.5 + pos: 34.5,-5.5 parent: 34 - - uid: 6950 + - uid: 6951 components: - type: Transform - pos: 32.5,-18.5 + pos: 34.5,-6.5 parent: 34 - - uid: 6951 + - uid: 6953 components: - type: Transform - pos: 32.5,-19.5 + pos: 34.5,-7.5 parent: 34 - uid: 6954 components: - type: Transform - pos: 32.5,-16.5 + pos: 34.5,-8.5 parent: 34 - uid: 6955 components: - type: Transform - pos: 32.5,-17.5 - parent: 34 - - uid: 6959 - components: - - type: Transform - pos: 32.5,-10.5 + pos: 34.5,-9.5 parent: 34 - - uid: 6960 + - uid: 6956 components: - type: Transform - pos: 32.5,-9.5 + pos: 34.5,-10.5 parent: 34 - uid: 6962 components: - type: Transform - pos: 33.5,-16.5 + pos: 36.5,-11.5 parent: 34 - uid: 6963 components: - type: Transform - pos: 34.5,-16.5 - parent: 34 - - uid: 6964 - components: - - type: Transform - pos: 35.5,-16.5 - parent: 34 - - uid: 6966 - components: - - type: Transform - pos: 23.5,-4.5 - parent: 34 - - uid: 6967 - components: - - type: Transform - pos: 23.5,-5.5 - parent: 34 - - uid: 6968 - components: - - type: Transform - pos: 23.5,-6.5 - parent: 34 - - uid: 6969 - components: - - type: Transform - pos: 28.5,-4.5 - parent: 34 - - uid: 6970 - components: - - type: Transform - pos: 24.5,-12.5 - parent: 34 - - uid: 6971 - components: - - type: Transform - pos: 24.5,-11.5 - parent: 34 - - uid: 6972 - components: - - type: Transform - pos: 24.5,-10.5 - parent: 34 - - uid: 6973 - components: - - type: Transform - pos: 24.5,-9.5 - parent: 34 - - uid: 6974 - components: - - type: Transform - pos: 16.5,-9.5 - parent: 34 - - uid: 6975 - components: - - type: Transform - pos: 17.5,-9.5 - parent: 34 - - uid: 6976 - components: - - type: Transform - pos: 23.5,-9.5 - parent: 34 - - uid: 6977 - components: - - type: Transform - pos: 28.5,-5.5 - parent: 34 - - uid: 6978 - components: - - type: Transform - pos: 28.5,-6.5 + pos: 36.5,-10.5 parent: 34 - - uid: 6979 + - uid: 6992 components: - type: Transform - pos: 27.5,-6.5 + pos: 21.5,-2.5 parent: 34 - - uid: 6980 + - uid: 6993 components: - type: Transform - pos: 29.5,-10.5 + pos: 21.5,-3.5 parent: 34 - - uid: 6981 + - uid: 6994 components: - type: Transform - pos: 15.5,-13.5 + pos: 21.5,-4.5 parent: 34 - uid: 7004 components: @@ -12189,6 +12493,36 @@ entities: - type: Transform pos: 45.5,-8.5 parent: 34 + - uid: 7026 + components: + - type: Transform + pos: 42.5,-2.5 + parent: 34 + - uid: 7031 + components: + - type: Transform + pos: 30.5,-18.5 + parent: 34 + - uid: 7032 + components: + - type: Transform + pos: 17.5,-16.5 + parent: 34 + - uid: 7059 + components: + - type: Transform + pos: 32.5,-6.5 + parent: 34 + - uid: 7061 + components: + - type: Transform + pos: 30.5,-6.5 + parent: 34 + - uid: 7062 + components: + - type: Transform + pos: 31.5,-6.5 + parent: 34 - uid: 7065 components: - type: Transform @@ -12199,6 +12533,11 @@ entities: - type: Transform pos: 44.5,-6.5 parent: 34 + - uid: 7087 + components: + - type: Transform + pos: 30.5,-10.5 + parent: 34 - uid: 7103 components: - type: Transform @@ -12427,17 +12766,17 @@ entities: - uid: 7207 components: - type: Transform - pos: 32.5,-20.5 + pos: 30.5,-9.5 parent: 34 - uid: 7208 components: - type: Transform - pos: 32.5,-21.5 + pos: 30.5,-8.5 parent: 34 - uid: 7209 components: - type: Transform - pos: 32.5,-22.5 + pos: 30.5,-7.5 parent: 34 - uid: 7210 components: @@ -13829,51 +14168,16 @@ entities: - type: Transform pos: 13.5,14.5 parent: 34 - - uid: 7610 - components: - - type: Transform - pos: 22.5,-2.5 - parent: 34 - - uid: 7611 - components: - - type: Transform - pos: 22.5,-1.5 - parent: 34 - - uid: 7612 - components: - - type: Transform - pos: 22.5,-0.5 - parent: 34 - uid: 7613 components: - type: Transform - pos: 22.5,0.5 - parent: 34 - - uid: 7614 - components: - - type: Transform - pos: 21.5,0.5 - parent: 34 - - uid: 7615 - components: - - type: Transform - pos: 20.5,0.5 - parent: 34 - - uid: 7616 - components: - - type: Transform - pos: 19.5,0.5 + pos: 25.5,-20.5 parent: 34 - uid: 7617 components: - type: Transform pos: 18.5,0.5 parent: 34 - - uid: 7618 - components: - - type: Transform - pos: 17.5,0.5 - parent: 34 - uid: 7619 components: - type: Transform @@ -13939,11 +14243,6 @@ entities: - type: Transform pos: 17.5,8.5 parent: 34 - - uid: 7636 - components: - - type: Transform - pos: 26.5,7.5 - parent: 34 - uid: 7637 components: - type: Transform @@ -13974,41 +14273,6 @@ entities: - type: Transform pos: 32.5,7.5 parent: 34 - - uid: 7643 - components: - - type: Transform - pos: 32.5,6.5 - parent: 34 - - uid: 7644 - components: - - type: Transform - pos: 32.5,5.5 - parent: 34 - - uid: 7645 - components: - - type: Transform - pos: 32.5,4.5 - parent: 34 - - uid: 7646 - components: - - type: Transform - pos: 32.5,3.5 - parent: 34 - - uid: 7647 - components: - - type: Transform - pos: 32.5,2.5 - parent: 34 - - uid: 7648 - components: - - type: Transform - pos: 32.5,1.5 - parent: 34 - - uid: 7649 - components: - - type: Transform - pos: 32.5,0.5 - parent: 34 - uid: 7706 components: - type: Transform @@ -14429,6 +14693,111 @@ entities: - type: Transform pos: -21.5,-37.5 parent: 34 + - uid: 8822 + components: + - type: Transform + pos: 26.5,-17.5 + parent: 34 + - uid: 8845 + components: + - type: Transform + pos: 27.5,-17.5 + parent: 34 + - uid: 8850 + components: + - type: Transform + pos: 22.5,-18.5 + parent: 34 + - uid: 8851 + components: + - type: Transform + pos: 22.5,-19.5 + parent: 34 + - uid: 8852 + components: + - type: Transform + pos: 22.5,-20.5 + parent: 34 + - uid: 8855 + components: + - type: Transform + pos: 25.5,-19.5 + parent: 34 + - uid: 8858 + components: + - type: Transform + pos: 19.5,-19.5 + parent: 34 + - uid: 8863 + components: + - type: Transform + pos: 19.5,-17.5 + parent: 34 + - uid: 8864 + components: + - type: Transform + pos: 19.5,-16.5 + parent: 34 + - uid: 8867 + components: + - type: Transform + pos: 21.5,-14.5 + parent: 34 + - uid: 8868 + components: + - type: Transform + pos: 21.5,-6.5 + parent: 34 + - uid: 8869 + components: + - type: Transform + pos: 17.5,-12.5 + parent: 34 + - uid: 8876 + components: + - type: Transform + pos: 16.5,-7.5 + parent: 34 + - uid: 8878 + components: + - type: Transform + pos: 16.5,-10.5 + parent: 34 + - uid: 8879 + components: + - type: Transform + pos: 24.5,-1.5 + parent: 34 + - uid: 8880 + components: + - type: Transform + pos: 16.5,-4.5 + parent: 34 + - uid: 8881 + components: + - type: Transform + pos: 17.5,-1.5 + parent: 34 + - uid: 8888 + components: + - type: Transform + pos: 22.5,-1.5 + parent: 34 + - uid: 8891 + components: + - type: Transform + pos: 23.5,-1.5 + parent: 34 + - uid: 8910 + components: + - type: Transform + pos: 25.5,-1.5 + parent: 34 + - uid: 8912 + components: + - type: Transform + pos: 25.5,-1.5 + parent: 34 - uid: 8919 components: - type: Transform @@ -14439,11 +14808,46 @@ entities: - type: Transform pos: 45.5,-10.5 parent: 34 + - uid: 8925 + components: + - type: Transform + pos: 25.5,-1.5 + parent: 34 + - uid: 8926 + components: + - type: Transform + pos: 26.5,-1.5 + parent: 34 + - uid: 8933 + components: + - type: Transform + pos: 27.5,-1.5 + parent: 34 + - uid: 8938 + components: + - type: Transform + pos: 28.5,-1.5 + parent: 34 + - uid: 8939 + components: + - type: Transform + pos: 28.5,-2.5 + parent: 34 - uid: 8940 components: - type: Transform pos: 46.5,-12.5 parent: 34 + - uid: 8941 + components: + - type: Transform + pos: 28.5,-3.5 + parent: 34 + - uid: 8942 + components: + - type: Transform + pos: 28.5,-4.5 + parent: 34 - uid: 8978 components: - type: Transform @@ -14454,11 +14858,41 @@ entities: - type: Transform pos: 2.5,-40.5 parent: 34 + - uid: 9100 + components: + - type: Transform + pos: 29.5,-1.5 + parent: 34 + - uid: 9107 + components: + - type: Transform + pos: 30.5,-1.5 + parent: 34 + - uid: 9108 + components: + - type: Transform + pos: 31.5,-1.5 + parent: 34 + - uid: 9109 + components: + - type: Transform + pos: 25.5,0.5 + parent: 34 + - uid: 9110 + components: + - type: Transform + pos: 25.5,-0.5 + parent: 34 - uid: 9314 components: - type: Transform pos: 46.5,-9.5 parent: 34 + - uid: 9317 + components: + - type: Transform + pos: 25.5,1.5 + parent: 34 - uid: 9339 components: - type: Transform @@ -14514,11 +14948,76 @@ entities: - type: Transform pos: -49.5,-17.5 parent: 34 + - uid: 9933 + components: + - type: Transform + pos: 23.5,-2.5 + parent: 34 + - uid: 9934 + components: + - type: Transform + pos: 23.5,-3.5 + parent: 34 + - uid: 9948 + components: + - type: Transform + pos: 26.5,-8.5 + parent: 34 + - uid: 9949 + components: + - type: Transform + pos: 27.5,-8.5 + parent: 34 + - uid: 9955 + components: + - type: Transform + pos: 26.5,-13.5 + parent: 34 + - uid: 9956 + components: + - type: Transform + pos: 28.5,-13.5 + parent: 34 + - uid: 9957 + components: + - type: Transform + pos: 29.5,-13.5 + parent: 34 + - uid: 9958 + components: + - type: Transform + pos: 30.5,-13.5 + parent: 34 + - uid: 9960 + components: + - type: Transform + pos: 27.5,-13.5 + parent: 34 + - uid: 9962 + components: + - type: Transform + pos: 30.5,-12.5 + parent: 34 + - uid: 9964 + components: + - type: Transform + pos: 29.5,-17.5 + parent: 34 + - uid: 9965 + components: + - type: Transform + pos: 30.5,-17.5 + parent: 34 - uid: 9984 components: - type: Transform pos: -20.5,-29.5 parent: 34 + - uid: 10000 + components: + - type: Transform + pos: 35.5,-19.5 + parent: 34 - uid: 10019 components: - type: Transform @@ -14969,6 +15468,11 @@ entities: - type: Transform pos: -0.5,-42.5 parent: 34 + - uid: 10506 + components: + - type: Transform + pos: 17.5,-18.5 + parent: 34 - uid: 10577 components: - type: Transform @@ -14979,6 +15483,11 @@ entities: - type: Transform pos: 40.5,-34.5 parent: 34 + - uid: 10591 + components: + - type: Transform + pos: 34.5,-15.5 + parent: 34 - uid: 10601 components: - type: Transform @@ -15094,6 +15603,11 @@ entities: - type: Transform pos: 6.5,-37.5 parent: 34 + - uid: 10716 + components: + - type: Transform + pos: 31.5,-3.5 + parent: 34 - uid: 10746 components: - type: Transform @@ -15209,11 +15723,6 @@ entities: - type: Transform pos: 49.5,-32.5 parent: 34 - - uid: 10825 - components: - - type: Transform - pos: 32.5,-4.5 - parent: 34 - uid: 10826 components: - type: Transform @@ -15934,26 +16443,41 @@ entities: - type: Transform pos: -16.5,-40.5 parent: 34 - - uid: 12135 + - uid: 12113 components: - type: Transform - pos: -18.5,-40.5 + pos: 17.5,-17.5 parent: 34 - - uid: 12168 + - uid: 12114 components: - type: Transform - pos: 22.5,-9.5 + pos: 16.5,-17.5 parent: 34 - - uid: 12169 + - uid: 12135 components: - type: Transform - pos: 21.5,-9.5 + pos: -18.5,-40.5 parent: 34 - uid: 12172 components: - type: Transform pos: -45.5,-25.5 parent: 34 + - uid: 12175 + components: + - type: Transform + pos: 31.5,-2.5 + parent: 34 + - uid: 12195 + components: + - type: Transform + pos: 32.5,-3.5 + parent: 34 + - uid: 12197 + components: + - type: Transform + pos: 32.5,-4.5 + parent: 34 - uid: 12216 components: - type: Transform @@ -16064,26 +16588,11 @@ entities: - type: Transform pos: -13.5,-42.5 parent: 34 - - uid: 12485 - components: - - type: Transform - pos: 35.5,-3.5 - parent: 34 - uid: 12489 components: - type: Transform pos: -54.5,-31.5 parent: 34 - - uid: 12490 - components: - - type: Transform - pos: 36.5,-4.5 - parent: 34 - - uid: 12492 - components: - - type: Transform - pos: 36.5,-3.5 - parent: 34 - uid: 12495 components: - type: Transform @@ -16524,31 +17033,6 @@ entities: - type: Transform pos: -9.5,7.5 parent: 34 - - uid: 12850 - components: - - type: Transform - pos: 30.5,-13.5 - parent: 34 - - uid: 12851 - components: - - type: Transform - pos: 30.5,-14.5 - parent: 34 - - uid: 12852 - components: - - type: Transform - pos: 31.5,-13.5 - parent: 34 - - uid: 12853 - components: - - type: Transform - pos: 32.5,-13.5 - parent: 34 - - uid: 12854 - components: - - type: Transform - pos: 33.5,-13.5 - parent: 34 - uid: 12856 components: - type: Transform @@ -16644,16 +17128,6 @@ entities: - type: Transform pos: 15.5,16.5 parent: 34 - - uid: 13149 - components: - - type: Transform - pos: 18.5,17.5 - parent: 34 - - uid: 13150 - components: - - type: Transform - pos: 18.5,18.5 - parent: 34 - uid: 13151 components: - type: Transform @@ -16734,6 +17208,236 @@ entities: - type: Transform pos: 66.5,-23.5 parent: 34 + - uid: 13461 + components: + - type: Transform + pos: 19.5,-1.5 + parent: 34 + - uid: 13472 + components: + - type: Transform + pos: 40.5,-19.5 + parent: 34 + - uid: 13473 + components: + - type: Transform + pos: 41.5,-19.5 + parent: 34 + - uid: 13476 + components: + - type: Transform + pos: 39.5,-19.5 + parent: 34 + - uid: 13477 + components: + - type: Transform + pos: 38.5,-19.5 + parent: 34 + - uid: 13478 + components: + - type: Transform + pos: 37.5,-19.5 + parent: 34 + - uid: 13479 + components: + - type: Transform + pos: 37.5,-18.5 + parent: 34 + - uid: 13480 + components: + - type: Transform + pos: 36.5,-18.5 + parent: 34 + - uid: 13481 + components: + - type: Transform + pos: 35.5,-18.5 + parent: 34 + - uid: 13482 + components: + - type: Transform + pos: 35.5,-16.5 + parent: 34 + - uid: 13515 + components: + - type: Transform + pos: 36.5,-16.5 + parent: 34 + - uid: 13516 + components: + - type: Transform + pos: 31.5,-10.5 + parent: 34 + - uid: 13518 + components: + - type: Transform + pos: 29.5,-10.5 + parent: 34 + - uid: 13522 + components: + - type: Transform + pos: 33.5,-13.5 + parent: 34 + - uid: 13524 + components: + - type: Transform + pos: 30.5,-5.5 + parent: 34 + - uid: 13531 + components: + - type: Transform + pos: 16.5,-26.5 + parent: 34 + - uid: 13532 + components: + - type: Transform + pos: 15.5,-26.5 + parent: 34 + - uid: 13533 + components: + - type: Transform + pos: 15.5,-27.5 + parent: 34 + - uid: 13534 + components: + - type: Transform + pos: 15.5,-28.5 + parent: 34 + - uid: 13535 + components: + - type: Transform + pos: 15.5,-29.5 + parent: 34 + - uid: 13536 + components: + - type: Transform + pos: 14.5,-29.5 + parent: 34 + - uid: 13537 + components: + - type: Transform + pos: 16.5,-28.5 + parent: 34 + - uid: 13538 + components: + - type: Transform + pos: 17.5,-28.5 + parent: 34 + - uid: 13539 + components: + - type: Transform + pos: 18.5,-28.5 + parent: 34 + - uid: 13540 + components: + - type: Transform + pos: 18.5,-29.5 + parent: 34 + - uid: 13541 + components: + - type: Transform + pos: 18.5,-27.5 + parent: 34 + - uid: 13542 + components: + - type: Transform + pos: 14.5,-26.5 + parent: 34 + - uid: 13565 + components: + - type: Transform + pos: 41.5,6.5 + parent: 34 + - uid: 13566 + components: + - type: Transform + pos: 41.5,7.5 + parent: 34 + - uid: 13569 + components: + - type: Transform + pos: 25.5,-5.5 + parent: 34 + - uid: 13570 + components: + - type: Transform + pos: 24.5,-5.5 + parent: 34 + - uid: 13571 + components: + - type: Transform + pos: 23.5,-5.5 + parent: 34 + - uid: 13572 + components: + - type: Transform + pos: 30.5,-22.5 + parent: 34 + - uid: 13573 + components: + - type: Transform + pos: 30.5,-21.5 + parent: 34 + - uid: 13574 + components: + - type: Transform + pos: 30.5,-20.5 + parent: 34 + - uid: 13584 + components: + - type: Transform + pos: 18.5,1.5 + parent: 34 + - uid: 13585 + components: + - type: Transform + pos: 32.5,-17.5 + parent: 34 + - uid: 13586 + components: + - type: Transform + pos: 34.5,-17.5 + parent: 34 + - uid: 13587 + components: + - type: Transform + pos: 17.5,1.5 + parent: 34 + - uid: 13588 + components: + - type: Transform + pos: 33.5,-17.5 + parent: 34 + - uid: 13589 + components: + - type: Transform + pos: 17.5,2.5 + parent: 34 + - uid: 13590 + components: + - type: Transform + pos: 29.5,-0.5 + parent: 34 + - uid: 13591 + components: + - type: Transform + pos: 31.5,-20.5 + parent: 34 + - uid: 13623 + components: + - type: Transform + pos: 29.5,-16.5 + parent: 34 + - uid: 13627 + components: + - type: Transform + pos: 29.5,-15.5 + parent: 34 + - uid: 13670 + components: + - type: Transform + pos: 23.5,2.5 + parent: 34 - proto: CableApcStack1 entities: - uid: 5561 @@ -16750,11 +17454,6 @@ entities: parent: 34 - proto: CableHV entities: - - uid: 9 - components: - - type: Transform - pos: 36.5,-8.5 - parent: 34 - uid: 139 components: - type: Transform @@ -16780,16 +17479,6 @@ entities: - type: Transform pos: -21.5,-29.5 parent: 34 - - uid: 1060 - components: - - type: Transform - pos: 36.5,-4.5 - parent: 34 - - uid: 1085 - components: - - type: Transform - pos: 36.5,-14.5 - parent: 34 - uid: 1102 components: - type: Transform @@ -16905,11 +17594,6 @@ entities: - type: Transform pos: -20.5,-29.5 parent: 34 - - uid: 1285 - components: - - type: Transform - pos: 35.5,-16.5 - parent: 34 - uid: 1374 components: - type: Transform @@ -16945,11 +17629,6 @@ entities: - type: Transform pos: -54.5,-16.5 parent: 34 - - uid: 1844 - components: - - type: Transform - pos: 36.5,-16.5 - parent: 34 - uid: 2221 components: - type: Transform @@ -17460,41 +18139,6 @@ entities: - type: Transform pos: -22.5,-29.5 parent: 34 - - uid: 4634 - components: - - type: Transform - pos: 36.5,-16.5 - parent: 34 - - uid: 4650 - components: - - type: Transform - pos: 36.5,-17.5 - parent: 34 - - uid: 4671 - components: - - type: Transform - pos: 36.5,-5.5 - parent: 34 - - uid: 4750 - components: - - type: Transform - pos: 35.5,-3.5 - parent: 34 - - uid: 4752 - components: - - type: Transform - pos: 33.5,-3.5 - parent: 34 - - uid: 4846 - components: - - type: Transform - pos: 36.5,-7.5 - parent: 34 - - uid: 4854 - components: - - type: Transform - pos: 37.5,-19.5 - parent: 34 - uid: 4972 components: - type: Transform @@ -18240,16 +18884,6 @@ entities: - type: Transform pos: -27.5,3.5 parent: 34 - - uid: 6025 - components: - - type: Transform - pos: 36.5,-6.5 - parent: 34 - - uid: 6150 - components: - - type: Transform - pos: 36.5,-19.5 - parent: 34 - uid: 6334 components: - type: Transform @@ -18870,156 +19504,6 @@ entities: - type: Transform pos: 33.5,-20.5 parent: 34 - - uid: 6678 - components: - - type: Transform - pos: 33.5,-19.5 - parent: 34 - - uid: 6679 - components: - - type: Transform - pos: 33.5,-18.5 - parent: 34 - - uid: 6680 - components: - - type: Transform - pos: 33.5,-17.5 - parent: 34 - - uid: 6681 - components: - - type: Transform - pos: 33.5,-16.5 - parent: 34 - - uid: 6682 - components: - - type: Transform - pos: 34.5,-16.5 - parent: 34 - - uid: 6683 - components: - - type: Transform - pos: 35.5,-16.5 - parent: 34 - - uid: 6684 - components: - - type: Transform - pos: 36.5,-16.5 - parent: 34 - - uid: 6693 - components: - - type: Transform - pos: 32.5,-10.5 - parent: 34 - - uid: 6694 - components: - - type: Transform - pos: 32.5,-9.5 - parent: 34 - - uid: 6702 - components: - - type: Transform - pos: 33.5,-2.5 - parent: 34 - - uid: 6703 - components: - - type: Transform - pos: 33.5,-1.5 - parent: 34 - - uid: 6704 - components: - - type: Transform - pos: 33.5,-0.5 - parent: 34 - - uid: 6705 - components: - - type: Transform - pos: 33.5,0.5 - parent: 34 - - uid: 6706 - components: - - type: Transform - pos: 33.5,1.5 - parent: 34 - - uid: 6707 - components: - - type: Transform - pos: 33.5,2.5 - parent: 34 - - uid: 6708 - components: - - type: Transform - pos: 33.5,3.5 - parent: 34 - - uid: 6709 - components: - - type: Transform - pos: 33.5,4.5 - parent: 34 - - uid: 6710 - components: - - type: Transform - pos: 33.5,5.5 - parent: 34 - - uid: 6711 - components: - - type: Transform - pos: 33.5,6.5 - parent: 34 - - uid: 6712 - components: - - type: Transform - pos: 33.5,7.5 - parent: 34 - - uid: 6713 - components: - - type: Transform - pos: 32.5,7.5 - parent: 34 - - uid: 6714 - components: - - type: Transform - pos: 31.5,7.5 - parent: 34 - - uid: 6715 - components: - - type: Transform - pos: 30.5,7.5 - parent: 34 - - uid: 6716 - components: - - type: Transform - pos: 29.5,7.5 - parent: 34 - - uid: 6717 - components: - - type: Transform - pos: 28.5,7.5 - parent: 34 - - uid: 6718 - components: - - type: Transform - pos: 27.5,7.5 - parent: 34 - - uid: 6719 - components: - - type: Transform - pos: 26.5,7.5 - parent: 34 - - uid: 6720 - components: - - type: Transform - pos: 25.5,7.5 - parent: 34 - - uid: 6721 - components: - - type: Transform - pos: 24.5,7.5 - parent: 34 - - uid: 6722 - components: - - type: Transform - pos: 23.5,7.5 - parent: 34 - uid: 6723 components: - type: Transform @@ -19050,11 +19534,6 @@ entities: - type: Transform pos: 23.5,4.5 parent: 34 - - uid: 6729 - components: - - type: Transform - pos: 24.5,4.5 - parent: 34 - uid: 6731 components: - type: Transform @@ -19695,55 +20174,60 @@ entities: - type: Transform pos: -21.5,-0.5 parent: 34 - - uid: 6953 + - uid: 7033 components: - type: Transform - pos: 34.5,-3.5 + pos: 32.5,-23.5 parent: 34 - - uid: 7023 + - uid: 7037 components: - type: Transform - pos: 36.5,-13.5 + pos: 31.5,-23.5 parent: 34 - - uid: 7704 + - uid: 7040 components: - type: Transform - pos: 17.5,-44.5 + pos: 30.5,-23.5 parent: 34 - - uid: 7721 + - uid: 7041 components: - type: Transform - pos: 18.5,-44.5 + pos: 30.5,-22.5 parent: 34 - - uid: 7870 + - uid: 7043 components: - type: Transform - pos: 16.5,-44.5 + pos: 30.5,-21.5 parent: 34 - - uid: 8361 + - uid: 7044 components: - type: Transform - pos: -28.5,-31.5 + pos: 30.5,-20.5 parent: 34 - - uid: 8906 + - uid: 7045 components: - type: Transform - pos: 36.5,-18.5 + pos: 29.5,-20.5 parent: 34 - - uid: 9109 + - uid: 7704 components: - type: Transform - pos: 36.5,-3.5 + pos: 17.5,-44.5 parent: 34 - - uid: 9110 + - uid: 7721 components: - type: Transform - pos: 36.5,-15.5 + pos: 18.5,-44.5 parent: 34 - - uid: 10022 + - uid: 7870 components: - type: Transform - pos: 36.5,-10.5 + pos: 16.5,-44.5 + parent: 34 + - uid: 8361 + components: + - type: Transform + pos: -28.5,-31.5 parent: 34 - uid: 10361 components: @@ -19800,16 +20284,6 @@ entities: - type: Transform pos: -50.5,-31.5 parent: 34 - - uid: 11058 - components: - - type: Transform - pos: 36.5,-3.5 - parent: 34 - - uid: 11059 - components: - - type: Transform - pos: 36.5,-12.5 - parent: 34 - uid: 11226 components: - type: Transform @@ -19850,16 +20324,6 @@ entities: - type: Transform pos: -28.5,-32.5 parent: 34 - - uid: 12456 - components: - - type: Transform - pos: 36.5,-9.5 - parent: 34 - - uid: 12457 - components: - - type: Transform - pos: 36.5,-11.5 - parent: 34 - uid: 12710 components: - type: Transform @@ -19999,6 +20463,11 @@ entities: parent: 34 - proto: CableMV entities: + - uid: 92 + components: + - type: Transform + pos: 31.5,1.5 + parent: 34 - uid: 162 components: - type: Transform @@ -20064,15 +20533,25 @@ entities: - type: Transform pos: -7.5,-31.5 parent: 34 + - uid: 1085 + components: + - type: Transform + pos: 34.5,-23.5 + parent: 34 - uid: 1149 components: - type: Transform - pos: 41.5,-3.5 + pos: 36.5,-3.5 parent: 34 - uid: 1152 components: - type: Transform - pos: 41.5,-2.5 + pos: 23.5,-5.5 + parent: 34 + - uid: 1281 + components: + - type: Transform + pos: 30.5,-23.5 parent: 34 - uid: 1286 components: @@ -20204,6 +20683,31 @@ entities: - type: Transform pos: -48.5,-25.5 parent: 34 + - uid: 2645 + components: + - type: Transform + pos: 35.5,-23.5 + parent: 34 + - uid: 2646 + components: + - type: Transform + pos: 35.5,-25.5 + parent: 34 + - uid: 2647 + components: + - type: Transform + pos: 35.5,-26.5 + parent: 34 + - uid: 2683 + components: + - type: Transform + pos: 17.5,17.5 + parent: 34 + - uid: 2707 + components: + - type: Transform + pos: 35.5,-24.5 + parent: 34 - uid: 2812 components: - type: Transform @@ -20504,6 +21008,16 @@ entities: - type: Transform pos: 4.5,-28.5 parent: 34 + - uid: 2962 + components: + - type: Transform + pos: 16.5,17.5 + parent: 34 + - uid: 2963 + components: + - type: Transform + pos: 34.5,-26.5 + parent: 34 - uid: 2989 components: - type: Transform @@ -20594,16 +21108,6 @@ entities: - type: Transform pos: -30.5,-40.5 parent: 34 - - uid: 3246 - components: - - type: Transform - pos: 37.5,-4.5 - parent: 34 - - uid: 3380 - components: - - type: Transform - pos: 33.5,-14.5 - parent: 34 - uid: 3418 components: - type: Transform @@ -20669,6 +21173,51 @@ entities: - type: Transform pos: 5.5,-31.5 parent: 34 + - uid: 3483 + components: + - type: Transform + pos: 33.5,-26.5 + parent: 34 + - uid: 3484 + components: + - type: Transform + pos: 37.5,-3.5 + parent: 34 + - uid: 3494 + components: + - type: Transform + pos: 32.5,-26.5 + parent: 34 + - uid: 3551 + components: + - type: Transform + pos: 33.5,-23.5 + parent: 34 + - uid: 3556 + components: + - type: Transform + pos: 29.5,-23.5 + parent: 34 + - uid: 3559 + components: + - type: Transform + pos: 32.5,-23.5 + parent: 34 + - uid: 3598 + components: + - type: Transform + pos: 31.5,1.5 + parent: 34 + - uid: 3610 + components: + - type: Transform + pos: 22.5,-0.5 + parent: 34 + - uid: 3663 + components: + - type: Transform + pos: 31.5,-18.5 + parent: 34 - uid: 3674 components: - type: Transform @@ -20694,11 +21243,21 @@ entities: - type: Transform pos: -30.5,-30.5 parent: 34 + - uid: 3760 + components: + - type: Transform + pos: 31.5,1.5 + parent: 34 - uid: 3761 components: - type: Transform pos: -29.5,-40.5 parent: 34 + - uid: 3769 + components: + - type: Transform + pos: 31.5,-23.5 + parent: 34 - uid: 3799 components: - type: Transform @@ -20784,11 +21343,6 @@ entities: - type: Transform pos: -10.5,-31.5 parent: 34 - - uid: 4532 - components: - - type: Transform - pos: 36.5,-18.5 - parent: 34 - uid: 4551 components: - type: Transform @@ -20804,11 +21358,6 @@ entities: - type: Transform pos: -14.5,-30.5 parent: 34 - - uid: 4576 - components: - - type: Transform - pos: 36.5,-17.5 - parent: 34 - uid: 4605 components: - type: Transform @@ -20849,21 +21398,31 @@ entities: - type: Transform pos: -21.5,-37.5 parent: 34 - - uid: 4866 + - uid: 4885 components: - type: Transform - pos: 37.5,-19.5 + pos: 38.5,-1.5 parent: 34 - - uid: 4873 + - uid: 4887 components: - type: Transform - pos: 33.5,-15.5 + pos: 39.5,-3.5 + parent: 34 + - uid: 4888 + components: + - type: Transform + pos: 38.5,-2.5 parent: 34 - uid: 4892 components: - type: Transform pos: -21.5,-39.5 parent: 34 + - uid: 4896 + components: + - type: Transform + pos: 38.5,-3.5 + parent: 34 - uid: 5135 components: - type: Transform @@ -20934,6 +21493,11 @@ entities: - type: Transform pos: -14.5,-31.5 parent: 34 + - uid: 6533 + components: + - type: Transform + pos: 20.5,17.5 + parent: 34 - uid: 6534 components: - type: Transform @@ -20949,85 +21513,110 @@ entities: - type: Transform pos: -17.5,-25.5 parent: 34 - - uid: 6947 + - uid: 6965 components: - type: Transform - pos: 37.5,-2.5 + pos: 36.5,-10.5 parent: 34 - - uid: 6982 + - uid: 6966 components: - type: Transform - pos: 8.5,-13.5 + pos: 36.5,-11.5 parent: 34 - - uid: 6983 + - uid: 6967 components: - type: Transform - pos: 8.5,-12.5 + pos: 36.5,-12.5 parent: 34 - - uid: 6984 + - uid: 6968 components: - type: Transform - pos: 8.5,-11.5 + pos: 35.5,-12.5 parent: 34 - - uid: 6985 + - uid: 6969 components: - type: Transform - pos: 9.5,-11.5 + pos: 34.5,-12.5 parent: 34 - - uid: 6986 + - uid: 6970 components: - type: Transform - pos: 10.5,-11.5 + pos: 34.5,-13.5 parent: 34 - - uid: 6987 + - uid: 6971 components: - type: Transform - pos: 11.5,-11.5 + pos: 34.5,-14.5 parent: 34 - - uid: 6988 + - uid: 6972 components: - type: Transform - pos: 12.5,-11.5 + pos: 34.5,-15.5 parent: 34 - - uid: 6989 + - uid: 6973 components: - type: Transform - pos: 12.5,-12.5 + pos: 34.5,-16.5 parent: 34 - - uid: 6990 + - uid: 6974 components: - type: Transform - pos: 13.5,-12.5 + pos: 34.5,-17.5 parent: 34 - - uid: 6991 + - uid: 6975 components: - type: Transform - pos: 14.5,-12.5 + pos: 34.5,-18.5 parent: 34 - - uid: 6992 + - uid: 6977 components: - type: Transform - pos: 15.5,-12.5 + pos: 29.5,-20.5 parent: 34 - - uid: 6993 + - uid: 6980 components: - type: Transform - pos: 16.5,-12.5 + pos: 22.5,0.5 parent: 34 - - uid: 6994 + - uid: 6982 components: - type: Transform - pos: 17.5,-12.5 + pos: 8.5,-13.5 parent: 34 - - uid: 6995 + - uid: 6983 components: - type: Transform - pos: 18.5,-12.5 + pos: 8.5,-12.5 parent: 34 - - uid: 6996 + - uid: 6984 components: - type: Transform - pos: 18.5,-11.5 + pos: 8.5,-11.5 + parent: 34 + - uid: 6985 + components: + - type: Transform + pos: 9.5,-11.5 + parent: 34 + - uid: 6986 + components: + - type: Transform + pos: 10.5,-11.5 + parent: 34 + - uid: 6987 + components: + - type: Transform + pos: 11.5,-11.5 + parent: 34 + - uid: 6988 + components: + - type: Transform + pos: 12.5,-11.5 + parent: 34 + - uid: 6989 + components: + - type: Transform + pos: 12.5,-12.5 parent: 34 - uid: 6997 components: @@ -21059,166 +21648,81 @@ entities: - type: Transform pos: 11.5,-17.5 parent: 34 - - uid: 7025 - components: - - type: Transform - pos: 36.5,-16.5 - parent: 34 - - uid: 7026 - components: - - type: Transform - pos: 35.5,-16.5 - parent: 34 - - uid: 7027 - components: - - type: Transform - pos: 34.5,-16.5 - parent: 34 - - uid: 7028 - components: - - type: Transform - pos: 33.5,-16.5 - parent: 34 - - uid: 7031 - components: - - type: Transform - pos: 32.5,-14.5 - parent: 34 - - uid: 7032 - components: - - type: Transform - pos: 31.5,-14.5 - parent: 34 - - uid: 7033 - components: - - type: Transform - pos: 30.5,-14.5 - parent: 34 - - uid: 7034 - components: - - type: Transform - pos: 29.5,-14.5 - parent: 34 - uid: 7035 components: - type: Transform - pos: 28.5,-14.5 + pos: 35.5,-3.5 parent: 34 - uid: 7036 components: - type: Transform - pos: 27.5,-14.5 - parent: 34 - - uid: 7037 - components: - - type: Transform - pos: 26.5,-14.5 - parent: 34 - - uid: 7038 - components: - - type: Transform - pos: 25.5,-14.5 - parent: 34 - - uid: 7040 - components: - - type: Transform - pos: 25.5,-15.5 - parent: 34 - - uid: 7041 - components: - - type: Transform - pos: 25.5,-16.5 + pos: 34.5,-3.5 parent: 34 - uid: 7042 components: - type: Transform - pos: 25.5,-17.5 - parent: 34 - - uid: 7043 - components: - - type: Transform - pos: 25.5,-18.5 - parent: 34 - - uid: 7044 - components: - - type: Transform - pos: 26.5,-18.5 - parent: 34 - - uid: 7045 - components: - - type: Transform - pos: 27.5,-18.5 + pos: 34.5,-8.5 parent: 34 - - uid: 7049 + - uid: 7047 components: - type: Transform - pos: 32.5,-10.5 + pos: 21.5,-3.5 parent: 34 - uid: 7050 components: - type: Transform - pos: 32.5,-9.5 - parent: 34 - - uid: 7056 - components: - - type: Transform - pos: 32.5,-3.5 + pos: 33.5,-3.5 parent: 34 - - uid: 7057 + - uid: 7063 components: - type: Transform - pos: 33.5,-3.5 + pos: 21.5,-2.5 parent: 34 - - uid: 7058 + - uid: 7064 components: - type: Transform - pos: 34.5,-3.5 + pos: 40.5,-3.5 parent: 34 - - uid: 7059 + - uid: 7074 components: - type: Transform - pos: 35.5,-3.5 + pos: 21.5,-11.5 parent: 34 - - uid: 7060 + - uid: 7171 components: - type: Transform - pos: 36.5,-3.5 + pos: 31.5,-3.5 parent: 34 - - uid: 7061 + - uid: 7173 components: - type: Transform - pos: 37.5,-3.5 + pos: 21.5,-4.5 parent: 34 - - uid: 7062 + - uid: 7186 components: - type: Transform - pos: 38.5,-3.5 + pos: 21.5,-5.5 parent: 34 - - uid: 7063 + - uid: 7187 components: - type: Transform - pos: 39.5,-3.5 + pos: 22.5,-5.5 parent: 34 - - uid: 7064 + - uid: 7189 components: - type: Transform - pos: 40.5,-3.5 + pos: 33.5,-3.5 parent: 34 - - uid: 7066 + - uid: 7204 components: - type: Transform - pos: 40.5,-1.5 + pos: 21.5,-12.5 parent: 34 - uid: 7415 components: - type: Transform pos: -27.5,-32.5 parent: 34 - - uid: 7581 - components: - - type: Transform - pos: 24.5,4.5 - parent: 34 - uid: 7582 components: - type: Transform @@ -21359,20 +21863,35 @@ entities: - type: Transform pos: 11.5,12.5 parent: 34 - - uid: 7621 + - uid: 7623 components: - type: Transform - pos: 25.5,4.5 + pos: 30.5,-20.5 parent: 34 - - uid: 7622 + - uid: 7636 components: - type: Transform - pos: 26.5,4.5 + pos: 30.5,-19.5 parent: 34 - - uid: 7623 + - uid: 7643 components: - type: Transform - pos: 26.5,5.5 + pos: 30.5,-18.5 + parent: 34 + - uid: 7644 + components: + - type: Transform + pos: 32.5,-18.5 + parent: 34 + - uid: 7645 + components: + - type: Transform + pos: 33.5,-18.5 + parent: 34 + - uid: 7646 + components: + - type: Transform + pos: 24.5,-5.5 parent: 34 - uid: 7650 components: @@ -21597,27 +22116,27 @@ entities: - uid: 7901 components: - type: Transform - pos: 33.5,-20.5 + pos: 25.5,-12.5 parent: 34 - uid: 7902 components: - type: Transform - pos: 32.5,-20.5 + pos: 24.5,-12.5 parent: 34 - uid: 7903 components: - type: Transform - pos: 33.5,-19.5 + pos: 23.5,-12.5 parent: 34 - uid: 7904 components: - type: Transform - pos: 33.5,-18.5 + pos: 22.5,-12.5 parent: 34 - uid: 7905 components: - type: Transform - pos: 33.5,-17.5 + pos: 23.5,0.5 parent: 34 - uid: 7906 components: @@ -21934,6 +22453,11 @@ entities: - type: Transform pos: -2.5,-2.5 parent: 34 + - uid: 7996 + components: + - type: Transform + pos: 24.5,0.5 + parent: 34 - uid: 8002 components: - type: Transform @@ -21969,6 +22493,11 @@ entities: - type: Transform pos: 27.5,-23.5 parent: 34 + - uid: 8074 + components: + - type: Transform + pos: 26.5,0.5 + parent: 34 - uid: 8095 components: - type: Transform @@ -21989,16 +22518,46 @@ entities: - type: Transform pos: 28.5,-26.5 parent: 34 + - uid: 8102 + components: + - type: Transform + pos: 27.5,0.5 + parent: 34 + - uid: 8103 + components: + - type: Transform + pos: 28.5,0.5 + parent: 34 - uid: 8104 components: - type: Transform pos: -20.5,-32.5 parent: 34 + - uid: 8113 + components: + - type: Transform + pos: 29.5,0.5 + parent: 34 + - uid: 8114 + components: + - type: Transform + pos: 29.5,0.5 + parent: 34 + - uid: 8115 + components: + - type: Transform + pos: 29.5,1.5 + parent: 34 - uid: 8118 components: - type: Transform pos: 28.5,-27.5 parent: 34 + - uid: 8120 + components: + - type: Transform + pos: 29.5,1.5 + parent: 34 - uid: 8121 components: - type: Transform @@ -22009,6 +22568,46 @@ entities: - type: Transform pos: 28.5,-29.5 parent: 34 + - uid: 8123 + components: + - type: Transform + pos: 30.5,2.5 + parent: 34 + - uid: 8124 + components: + - type: Transform + pos: 31.5,2.5 + parent: 34 + - uid: 8125 + components: + - type: Transform + pos: 31.5,2.5 + parent: 34 + - uid: 8126 + components: + - type: Transform + pos: 30.5,2.5 + parent: 34 + - uid: 8127 + components: + - type: Transform + pos: 29.5,2.5 + parent: 34 + - uid: 8128 + components: + - type: Transform + pos: 29.5,0.5 + parent: 34 + - uid: 8130 + components: + - type: Transform + pos: 29.5,1.5 + parent: 34 + - uid: 8131 + components: + - type: Transform + pos: 25.5,0.5 + parent: 34 - uid: 8132 components: - type: Transform @@ -22114,11 +22713,6 @@ entities: - type: Transform pos: 39.5,-28.5 parent: 34 - - uid: 8915 - components: - - type: Transform - pos: 41.5,-1.5 - parent: 34 - uid: 8927 components: - type: Transform @@ -22379,11 +22973,136 @@ entities: - type: Transform pos: 16.5,-42.5 parent: 34 + - uid: 10189 + components: + - type: Transform + pos: 30.5,-3.5 + parent: 34 + - uid: 10200 + components: + - type: Transform + pos: 30.5,-17.5 + parent: 34 + - uid: 10201 + components: + - type: Transform + pos: 30.5,-17.5 + parent: 34 + - uid: 10202 + components: + - type: Transform + pos: 30.5,-16.5 + parent: 34 + - uid: 10221 + components: + - type: Transform + pos: 30.5,-15.5 + parent: 34 + - uid: 10267 + components: + - type: Transform + pos: 30.5,-14.5 + parent: 34 + - uid: 10268 + components: + - type: Transform + pos: 30.5,-13.5 + parent: 34 + - uid: 10340 + components: + - type: Transform + pos: 25.5,-13.5 + parent: 34 + - uid: 10345 + components: + - type: Transform + pos: 26.5,-13.5 + parent: 34 + - uid: 10374 + components: + - type: Transform + pos: 27.5,-13.5 + parent: 34 + - uid: 10403 + components: + - type: Transform + pos: 28.5,-13.5 + parent: 34 + - uid: 10459 + components: + - type: Transform + pos: 29.5,-13.5 + parent: 34 + - uid: 10507 + components: + - type: Transform + pos: 32.5,-3.5 + parent: 34 + - uid: 10508 + components: + - type: Transform + pos: 29.5,-3.5 + parent: 34 + - uid: 10509 + components: + - type: Transform + pos: 29.5,-2.5 + parent: 34 + - uid: 10510 + components: + - type: Transform + pos: 29.5,-1.5 + parent: 34 + - uid: 10511 + components: + - type: Transform + pos: 29.5,-0.5 + parent: 34 + - uid: 10537 + components: + - type: Transform + pos: 40.5,-3.5 + parent: 34 - uid: 10550 components: - type: Transform pos: -44.5,-24.5 parent: 34 + - uid: 10585 + components: + - type: Transform + pos: 41.5,-3.5 + parent: 34 + - uid: 10587 + components: + - type: Transform + pos: 36.5,-4.5 + parent: 34 + - uid: 10718 + components: + - type: Transform + pos: 25.5,-5.5 + parent: 34 + - uid: 10719 + components: + - type: Transform + pos: 25.5,-6.5 + parent: 34 + - uid: 10720 + components: + - type: Transform + pos: 25.5,-7.5 + parent: 34 + - uid: 10723 + components: + - type: Transform + pos: 25.5,-8.5 + parent: 34 + - uid: 10773 + components: + - type: Transform + pos: 25.5,-9.5 + parent: 34 - uid: 10795 components: - type: Transform @@ -22479,35 +23198,15 @@ entities: - type: Transform pos: 31.5,-42.5 parent: 34 - - uid: 10918 - components: - - type: Transform - pos: 21.5,-3.5 - parent: 34 - - uid: 10919 - components: - - type: Transform - pos: 22.5,-3.5 - parent: 34 - - uid: 10920 - components: - - type: Transform - pos: 22.5,-2.5 - parent: 34 - - uid: 10921 - components: - - type: Transform - pos: 22.5,-1.5 - parent: 34 - - uid: 10922 + - uid: 10825 components: - type: Transform - pos: 22.5,-0.5 + pos: 25.5,-10.5 parent: 34 - - uid: 10923 + - uid: 10830 components: - type: Transform - pos: 22.5,0.5 + pos: 25.5,-11.5 parent: 34 - uid: 10924 components: @@ -22754,6 +23453,11 @@ entities: - type: Transform pos: 7.5,-41.5 parent: 34 + - uid: 11804 + components: + - type: Transform + pos: 19.5,17.5 + parent: 34 - uid: 11845 components: - type: Transform @@ -22989,16 +23693,6 @@ entities: - type: Transform pos: -44.5,-23.5 parent: 34 - - uid: 12417 - components: - - type: Transform - pos: 31.5,-3.5 - parent: 34 - - uid: 12534 - components: - - type: Transform - pos: 36.5,-19.5 - parent: 34 - uid: 12598 components: - type: Transform @@ -23019,45 +23713,25 @@ entities: - type: Transform pos: -52.5,-12.5 parent: 34 - - uid: 12955 - components: - - type: Transform - pos: 30.5,-3.5 - parent: 34 - - uid: 12956 - components: - - type: Transform - pos: 29.5,-3.5 - parent: 34 - - uid: 12957 - components: - - type: Transform - pos: 27.5,-3.5 - parent: 34 - - uid: 12958 - components: - - type: Transform - pos: 28.5,-3.5 - parent: 34 - - uid: 12959 + - uid: 13076 components: - type: Transform - pos: 26.5,-3.5 + pos: 18.5,17.5 parent: 34 - - uid: 12960 + - uid: 13082 components: - type: Transform - pos: 25.5,-3.5 + pos: 20.5,15.5 parent: 34 - - uid: 12961 + - uid: 13092 components: - type: Transform - pos: 24.5,-3.5 + pos: 20.5,14.5 parent: 34 - - uid: 12962 + - uid: 13097 components: - type: Transform - pos: 23.5,-3.5 + pos: 20.5,16.5 parent: 34 - uid: 13130 components: @@ -23089,11 +23763,6 @@ entities: - type: Transform pos: 16.5,16.5 parent: 34 - - uid: 13136 - components: - - type: Transform - pos: 17.5,16.5 - parent: 34 - uid: 13137 components: - type: Transform @@ -23149,6 +23818,66 @@ entities: - type: Transform pos: 66.5,-24.5 parent: 34 + - uid: 13527 + components: + - type: Transform + pos: 15.5,-24.5 + parent: 34 + - uid: 13528 + components: + - type: Transform + pos: 15.5,-25.5 + parent: 34 + - uid: 13529 + components: + - type: Transform + pos: 15.5,-26.5 + parent: 34 + - uid: 13530 + components: + - type: Transform + pos: 16.5,-26.5 + parent: 34 + - uid: 13576 + components: + - type: Transform + pos: 21.5,-0.5 + parent: 34 + - uid: 13577 + components: + - type: Transform + pos: 20.5,-0.5 + parent: 34 + - uid: 13578 + components: + - type: Transform + pos: 19.5,-0.5 + parent: 34 + - uid: 13579 + components: + - type: Transform + pos: 18.5,-0.5 + parent: 34 + - uid: 13580 + components: + - type: Transform + pos: 17.5,-0.5 + parent: 34 + - uid: 13581 + components: + - type: Transform + pos: 17.5,0.5 + parent: 34 + - uid: 13582 + components: + - type: Transform + pos: 17.5,1.5 + parent: 34 + - uid: 13583 + components: + - type: Transform + pos: 17.5,2.5 + parent: 34 - proto: CableTerminal entities: - uid: 1127 @@ -23221,30 +23950,6 @@ entities: rot: 3.141592653589793 rad pos: 10.5,8.5 parent: 34 - - uid: 7710 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 32.5,-9.5 - parent: 34 - - uid: 10830 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 32.5,-10.5 - parent: 34 - - uid: 10831 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 33.5,-10.5 - parent: 34 - - uid: 10893 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 33.5,-9.5 - parent: 34 - proto: CarpetBlack entities: - uid: 781 @@ -23618,11 +24323,6 @@ entities: parent: 34 - proto: CarpetPink entities: - - uid: 4743 - components: - - type: Transform - pos: 39.5,-6.5 - parent: 34 - uid: 5847 components: - type: Transform @@ -23970,11 +24670,6 @@ entities: - type: Transform pos: -39.5,-29.5 parent: 34 - - uid: 1300 - components: - - type: Transform - pos: 36.5,-13.5 - parent: 34 - uid: 1321 components: - type: Transform @@ -24191,11 +24886,6 @@ entities: - type: Transform pos: -42.5,-41.5 parent: 34 - - uid: 1824 - components: - - type: Transform - pos: 36.5,-14.5 - parent: 34 - uid: 1834 components: - type: Transform @@ -24554,26 +25244,6 @@ entities: rot: 3.141592653589793 rad pos: -4.5,10.5 parent: 34 - - uid: 2635 - components: - - type: Transform - pos: 36.5,-9.5 - parent: 34 - - uid: 2645 - components: - - type: Transform - pos: 36.5,-8.5 - parent: 34 - - uid: 2646 - components: - - type: Transform - pos: 36.5,-7.5 - parent: 34 - - uid: 2647 - components: - - type: Transform - pos: 36.5,-6.5 - parent: 34 - uid: 2665 components: - type: Transform @@ -24602,11 +25272,6 @@ entities: rot: -1.5707963267948966 rad pos: 17.5,-32.5 parent: 34 - - uid: 2707 - components: - - type: Transform - pos: 36.5,-10.5 - parent: 34 - uid: 2744 components: - type: Transform @@ -24781,12 +25446,27 @@ entities: rot: 3.141592653589793 rad pos: 2.5,10.5 parent: 34 + - uid: 3552 + components: + - type: Transform + pos: 33.5,0.5 + parent: 34 + - uid: 3586 + components: + - type: Transform + pos: 22.5,2.5 + parent: 34 - uid: 3603 components: - type: Transform rot: 3.141592653589793 rad pos: 3.5,10.5 parent: 34 + - uid: 3641 + components: + - type: Transform + pos: 41.5,-9.5 + parent: 34 - uid: 3775 components: - type: Transform @@ -24931,6 +25611,11 @@ entities: rot: -1.5707963267948966 rad pos: 13.5,-43.5 parent: 34 + - uid: 4044 + components: + - type: Transform + pos: 33.5,5.5 + parent: 34 - uid: 4094 components: - type: Transform @@ -24951,22 +25636,36 @@ entities: - type: Transform pos: 4.5,-54.5 parent: 34 + - uid: 4168 + components: + - type: Transform + pos: 33.5,2.5 + parent: 34 + - uid: 4191 + components: + - type: Transform + pos: 33.5,6.5 + parent: 34 + - uid: 4194 + components: + - type: Transform + pos: 33.5,6.5 + parent: 34 - uid: 4196 components: - type: Transform pos: 9.5,10.5 parent: 34 - - uid: 4320 + - uid: 4201 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -29.5,-32.5 + pos: 33.5,3.5 parent: 34 - - uid: 4498 + - uid: 4320 components: - type: Transform rot: -1.5707963267948966 rad - pos: 36.5,-19.5 + pos: -29.5,-32.5 parent: 34 - uid: 4565 components: @@ -24997,6 +25696,11 @@ entities: - type: Transform pos: -14.5,-30.5 parent: 34 + - uid: 4690 + components: + - type: Transform + pos: 28.5,7.5 + parent: 34 - uid: 4749 components: - type: Transform @@ -25014,6 +25718,21 @@ entities: rot: 1.5707963267948966 rad pos: -22.5,-34.5 parent: 34 + - uid: 4859 + components: + - type: Transform + pos: 29.5,7.5 + parent: 34 + - uid: 5005 + components: + - type: Transform + pos: 25.5,7.5 + parent: 34 + - uid: 5008 + components: + - type: Transform + pos: 24.5,7.5 + parent: 34 - uid: 5066 components: - type: Transform @@ -25675,6 +26394,16 @@ entities: - type: Transform pos: 4.5,11.5 parent: 34 + - uid: 6340 + components: + - type: Transform + pos: 32.5,7.5 + parent: 34 + - uid: 6343 + components: + - type: Transform + pos: 33.5,1.5 + parent: 34 - uid: 6374 components: - type: Transform @@ -25701,108 +26430,64 @@ entities: - type: Transform pos: -42.5,-22.5 parent: 34 - - uid: 7160 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -30.5,-59.5 - parent: 34 - - uid: 7233 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -32.5,-59.5 - parent: 34 - - uid: 7390 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -31.5,-59.5 - parent: 34 - - uid: 7419 - components: - - type: Transform - pos: -30.5,-30.5 - parent: 34 - - uid: 7672 - components: - - type: Transform - pos: 33.5,0.5 - parent: 34 - - uid: 7673 - components: - - type: Transform - pos: 33.5,1.5 - parent: 34 - - uid: 7674 - components: - - type: Transform - pos: 33.5,2.5 - parent: 34 - - uid: 7675 + - uid: 6703 components: - type: Transform - pos: 33.5,3.5 + pos: 33.5,7.5 parent: 34 - - uid: 7676 + - uid: 6704 components: - type: Transform pos: 33.5,4.5 parent: 34 - - uid: 7677 - components: - - type: Transform - pos: 33.5,5.5 - parent: 34 - - uid: 7678 - components: - - type: Transform - pos: 33.5,6.5 - parent: 34 - - uid: 7679 + - uid: 6709 components: - type: Transform - pos: 33.5,7.5 + pos: 27.5,7.5 parent: 34 - - uid: 7680 + - uid: 6710 components: - type: Transform - pos: 32.5,7.5 + pos: 26.5,7.5 parent: 34 - - uid: 7681 + - uid: 6711 components: - type: Transform pos: 31.5,7.5 parent: 34 - - uid: 7683 + - uid: 6950 components: - type: Transform - pos: 29.5,7.5 + rot: -1.5707963267948966 rad + pos: 30.5,-20.5 parent: 34 - - uid: 7684 + - uid: 7160 components: - type: Transform - pos: 28.5,7.5 + rot: -1.5707963267948966 rad + pos: -30.5,-59.5 parent: 34 - - uid: 7685 + - uid: 7233 components: - type: Transform - pos: 27.5,7.5 + rot: -1.5707963267948966 rad + pos: -32.5,-59.5 parent: 34 - - uid: 7686 + - uid: 7390 components: - type: Transform - pos: 26.5,7.5 + rot: -1.5707963267948966 rad + pos: -31.5,-59.5 parent: 34 - - uid: 7687 + - uid: 7419 components: - type: Transform - pos: 25.5,7.5 + pos: -30.5,-30.5 parent: 34 - - uid: 7688 + - uid: 7680 components: - type: Transform - pos: 24.5,7.5 + pos: 33.5,-0.5 parent: 34 - uid: 7689 components: @@ -25864,26 +26549,6 @@ entities: - type: Transform pos: 22.5,3.5 parent: 34 - - uid: 7712 - components: - - type: Transform - pos: 33.5,-16.5 - parent: 34 - - uid: 7713 - components: - - type: Transform - pos: 33.5,-17.5 - parent: 34 - - uid: 7714 - components: - - type: Transform - pos: 33.5,-18.5 - parent: 34 - - uid: 7715 - components: - - type: Transform - pos: 33.5,-19.5 - parent: 34 - uid: 7716 components: - type: Transform @@ -26172,16 +26837,6 @@ entities: rot: 1.5707963267948966 rad pos: -21.5,-37.5 parent: 34 - - uid: 8939 - components: - - type: Transform - pos: 36.5,-16.5 - parent: 34 - - uid: 9111 - components: - - type: Transform - pos: 34.5,-16.5 - parent: 34 - uid: 9330 components: - type: Transform @@ -26459,11 +27114,6 @@ entities: - type: Transform pos: -28.5,-41.5 parent: 34 - - uid: 11686 - components: - - type: Transform - pos: 36.5,-15.5 - parent: 34 - uid: 11695 components: - type: Transform @@ -26513,12 +27163,6 @@ entities: rot: 3.141592653589793 rad pos: 49.5,-27.5 parent: 34 - - uid: 12186 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 36.5,-18.5 - parent: 34 - uid: 12234 components: - type: Transform @@ -26601,26 +27245,11 @@ entities: - type: Transform pos: -53.5,-39.5 parent: 34 - - uid: 12390 - components: - - type: Transform - pos: 36.5,-12.5 - parent: 34 - - uid: 12391 - components: - - type: Transform - pos: 36.5,-11.5 - parent: 34 - uid: 12404 components: - type: Transform pos: -53.5,-40.5 parent: 34 - - uid: 12431 - components: - - type: Transform - pos: 35.5,-16.5 - parent: 34 - uid: 12446 components: - type: Transform @@ -26799,6 +27428,12 @@ entities: parent: 34 - proto: Chair entities: + - uid: 923 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 16.5,-10.5 + parent: 34 - uid: 1960 components: - type: Transform @@ -26857,22 +27492,26 @@ entities: rot: -1.5707963267948966 rad pos: 0.5,-32.5 parent: 34 + - uid: 3621 + components: + - type: Transform + pos: 17.5,-12.5 + parent: 34 - uid: 3637 components: - type: Transform - pos: 27.5,-5.5 + pos: 16.5,-12.5 parent: 34 - - uid: 3755 + - uid: 3733 components: - type: Transform rot: 3.141592653589793 rad - pos: 30.5,-11.5 + pos: 16.5,-7.5 parent: 34 - - uid: 3760 + - uid: 3752 components: - type: Transform - rot: 3.141592653589793 rad - pos: 29.5,-11.5 + pos: 18.5,-12.5 parent: 34 - uid: 3925 components: @@ -26976,6 +27615,12 @@ entities: - type: Transform pos: 11.5,-47.5 parent: 34 + - uid: 4531 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 16.5,-4.5 + parent: 34 - uid: 4729 components: - type: Transform @@ -27000,24 +27645,6 @@ entities: rot: -1.5707963267948966 rad pos: 45.5,6.5 parent: 34 - - uid: 4887 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 28.5,-18.5 - parent: 34 - - uid: 4888 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 30.5,-19.5 - parent: 34 - - uid: 4906 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 28.5,-19.5 - parent: 34 - uid: 5967 components: - type: Transform @@ -27144,11 +27771,29 @@ entities: - type: Transform pos: 11.5,3.5 parent: 34 + - uid: 7028 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 29.5,-16.5 + parent: 34 - uid: 7051 components: - type: Transform pos: 9.5,-47.5 parent: 34 + - uid: 9577 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 38.5,-19.5 + parent: 34 + - uid: 9915 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 40.5,-19.5 + parent: 34 - uid: 10256 components: - type: Transform @@ -27169,26 +27814,23 @@ entities: - type: Transform pos: -14.5,-18.5 parent: 34 - - uid: 11076 - components: - - type: Transform - pos: 17.5,-12.5 - parent: 34 - - uid: 11077 + - uid: 11351 components: - type: Transform - pos: 18.5,-12.5 + rot: 3.141592653589793 rad + pos: -28.5,-9.5 parent: 34 - - uid: 11078 + - uid: 13596 components: - type: Transform - pos: 19.5,-12.5 + rot: 3.141592653589793 rad + pos: 21.5,-14.5 parent: 34 - - uid: 11351 + - uid: 13598 components: - type: Transform rot: 3.141592653589793 rad - pos: -28.5,-9.5 + pos: 23.5,-14.5 parent: 34 - proto: ChairCursed entities: @@ -27297,23 +27939,6 @@ entities: rot: -1.5707963267948966 rad pos: -5.5,-17.5 parent: 34 - - uid: 3620 - components: - - type: Transform - pos: 18.563585,-6.5362997 - parent: 34 - - uid: 3621 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 19.324001,-7.370212 - parent: 34 - - uid: 3623 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 17.740667,-7.140886 - parent: 34 - uid: 3814 components: - type: Transform @@ -27330,12 +27955,6 @@ entities: rot: -1.5707963267948966 rad pos: 33.5,-29.5 parent: 34 - - uid: 4690 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 41.5,-19.5 - parent: 34 - uid: 5560 components: - type: Transform @@ -27388,17 +28007,6 @@ entities: rot: 1.5707963267948966 rad pos: 38.5,-44.5 parent: 34 - - uid: 10267 - components: - - type: Transform - pos: 18.5,-19.5 - parent: 34 - - uid: 10268 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 19.5,-17.5 - parent: 34 - uid: 10827 components: - type: Transform @@ -27512,6 +28120,34 @@ entities: - type: Transform pos: 49.5,-2.5 parent: 34 + - uid: 12388 + components: + - type: Transform + pos: 20.5,-3.5 + parent: 34 + - uid: 12389 + components: + - type: Transform + pos: 21.5,-3.5 + parent: 34 + - uid: 13592 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 22,-17.5 + parent: 34 + - uid: 13593 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 23,-17.5 + parent: 34 + - uid: 13594 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 26,-19.5 + parent: 34 - proto: ChairFoldingSpawnFolded entities: - uid: 1098 @@ -27520,10 +28156,25 @@ entities: rot: 1.5707963267948966 rad pos: 23.505953,-30.266048 parent: 34 - - uid: 8120 + - uid: 6684 + components: + - type: Transform + parent: 6683 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 6690 + components: + - type: Transform + parent: 6683 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 8191 components: - type: Transform - pos: 23.479801,5.683676 + rot: 1.5707963267948966 rad + pos: 21.376013,-10.429995 parent: 34 - proto: ChairOfficeDark entities: @@ -27532,6 +28183,12 @@ entities: - type: Transform pos: -10.5,2.5 parent: 34 + - uid: 1330 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.5,-16.5 + parent: 34 - uid: 1887 components: - type: Transform @@ -27582,27 +28239,21 @@ entities: - type: Transform pos: 14.5,-26.5 parent: 34 - - uid: 3543 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 26.946102,-7.2489953 - parent: 34 - - uid: 3747 + - uid: 3563 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 25.621107,0.18286085 + pos: 18,-19.5 parent: 34 - - uid: 3756 + - uid: 3595 components: - type: Transform - pos: 29.624441,-9.429204 + pos: 29.5,4.5 parent: 34 - - uid: 4917 + - uid: 4699 components: - type: Transform - pos: 22.811316,-14.405392 + rot: -1.5707963267948966 rad + pos: 36.5,-13.5 parent: 34 - uid: 5424 components: @@ -27620,6 +28271,17 @@ entities: - type: Transform pos: 10.5,8.5 parent: 34 + - uid: 7616 + components: + - type: Transform + pos: 39.5,-15.5 + parent: 34 + - uid: 8834 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 40.5,-16 + parent: 34 - uid: 11258 components: - type: Transform @@ -27638,10 +28300,11 @@ entities: rot: -1.5707963267948966 rad pos: -47.5,-31.5 parent: 34 - - uid: 12383 + - uid: 12417 components: - type: Transform - pos: 41.5,-17.5 + rot: 1.5707963267948966 rad + pos: 30.5,-6.5 parent: 34 - uid: 13042 components: @@ -27673,6 +28336,12 @@ entities: - type: Transform pos: -35.240707,2.4782186 parent: 34 + - uid: 7674 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.5,-1.5 + parent: 34 - uid: 9032 components: - type: Transform @@ -27879,11 +28548,29 @@ entities: - type: Transform pos: -32.70509,-14.717291 parent: 34 - - uid: 4342 + - uid: 3504 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 34.5,-14 + parent: 34 + - uid: 3505 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 34.5,-13 + parent: 34 + - uid: 3536 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 29,2.5 + parent: 34 + - uid: 3750 components: - type: Transform rot: 3.141592653589793 rad - pos: 35.5,-11.5 + pos: 30,2.5 parent: 34 - uid: 5038 components: @@ -27954,12 +28641,6 @@ entities: rot: 1.5707963267948966 rad pos: 47.5,-9.5 parent: 34 - - uid: 11506 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 40.5,-7.5 - parent: 34 - uid: 11598 components: - type: Transform @@ -28172,11 +28853,6 @@ entities: rot: -1.5707963267948966 rad pos: 20.615124,12.090332 parent: 34 - - uid: 11244 - components: - - type: Transform - pos: 19.422993,-6.7809806 - parent: 34 - proto: CigarGoldCase entities: - uid: 12290 @@ -28223,6 +28899,13 @@ entities: rot: 1.5707963267948966 rad pos: -56.47226,-1.463746 parent: 34 +- proto: CigPackMixed + entities: + - uid: 5007 + components: + - type: Transform + pos: 29.496567,-17.394358 + parent: 34 - proto: CircuitImprinter entities: - uid: 12277 @@ -28237,13 +28920,6 @@ entities: - type: Transform pos: 7.5,-18.5 parent: 34 -- proto: ClosetBombFilled - entities: - - uid: 12912 - components: - - type: Transform - pos: 32.5,-1.5 - parent: 34 - proto: ClosetEmergencyFilledRandom entities: - uid: 1303 @@ -28261,6 +28937,11 @@ entities: - type: Transform pos: 7.5,18.5 parent: 34 + - uid: 3393 + components: + - type: Transform + pos: 34.5,1.5 + parent: 34 - uid: 3818 components: - type: Transform @@ -28286,11 +28967,6 @@ entities: - type: Transform pos: 22.5,9.5 parent: 34 - - uid: 11292 - components: - - type: Transform - pos: 32.5,1.5 - parent: 34 - uid: 11661 components: - type: Transform @@ -28301,11 +28977,6 @@ entities: - type: Transform pos: 17.5,-22.5 parent: 34 - - uid: 12111 - components: - - type: Transform - pos: 14.5,-9.5 - parent: 34 - uid: 12176 components: - type: Transform @@ -28328,6 +28999,11 @@ entities: parent: 34 - proto: ClosetFireFilled entities: + - uid: 3766 + components: + - type: Transform + pos: 34.5,0.5 + parent: 34 - uid: 3825 components: - type: Transform @@ -28338,11 +29014,6 @@ entities: - type: Transform pos: 9.5,13.5 parent: 34 - - uid: 4868 - components: - - type: Transform - pos: 32.5,-19.5 - parent: 34 - uid: 5282 components: - type: Transform @@ -28404,13 +29075,6 @@ entities: - type: Transform pos: -26.5,-11.5 parent: 34 -- proto: ClosetL3SecurityFilled - entities: - - uid: 3721 - components: - - type: Transform - pos: 26.5,-20.5 - parent: 34 - proto: ClosetL3VirologyFilled entities: - uid: 1944 @@ -28425,8 +29089,20 @@ entities: - type: Transform pos: 16.5,-45.5 parent: 34 +- proto: ClosetMaintenance + entities: + - uid: 3571 + components: + - type: Transform + pos: 15.5,-30.5 + parent: 34 - proto: ClosetMaintenanceFilledRandom entities: + - uid: 692 + components: + - type: Transform + pos: 33.5,8.5 + parent: 34 - uid: 1608 components: - type: Transform @@ -28442,16 +29118,6 @@ entities: - type: Transform pos: 5.5,10.5 parent: 34 - - uid: 4511 - components: - - type: Transform - pos: 37.5,-7.5 - parent: 34 - - uid: 4547 - components: - - type: Transform - pos: 37.5,-10.5 - parent: 34 - uid: 4759 components: - type: Transform @@ -28472,11 +29138,6 @@ entities: - type: Transform pos: -22.5,-17.5 parent: 34 - - uid: 11353 - components: - - type: Transform - pos: 32.5,0.5 - parent: 34 - uid: 11660 components: - type: Transform @@ -28569,15 +29230,10 @@ entities: parent: 34 - proto: ClosetToolFilled entities: - - uid: 3720 - components: - - type: Transform - pos: 22.5,-20.5 - parent: 34 - - uid: 8113 + - uid: 3565 components: - type: Transform - pos: 24.5,5.5 + pos: 23.5,5.5 parent: 34 - uid: 10257 components: @@ -28662,12 +29318,6 @@ entities: - type: Transform pos: 3.5,12.5 parent: 34 - - uid: 4548 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 38.5,-8.5 - parent: 34 - uid: 9630 components: - type: Transform @@ -28685,6 +29335,38 @@ entities: - type: Transform pos: 41.5,-38.5 parent: 34 +- proto: ClosetWallOrange + entities: + - uid: 3585 + components: + - type: Transform + pos: 17.5,-8.5 + parent: 34 + - uid: 3627 + components: + - type: Transform + pos: 48.5,-11.5 + parent: 34 + - uid: 3645 + components: + - type: Transform + pos: 48.5,-8.5 + parent: 34 + - uid: 3713 + components: + - type: Transform + pos: 48.5,-5.5 + parent: 34 + - uid: 4514 + components: + - type: Transform + pos: 17.5,-2.5 + parent: 34 + - uid: 4805 + components: + - type: Transform + pos: 17.5,-5.5 + parent: 34 - proto: ClothingBackpackDuffel entities: - uid: 10525 @@ -28885,10 +29567,10 @@ entities: parent: 34 - proto: ClothingHeadHatSecsoftFlipped entities: - - uid: 11105 + - uid: 13597 components: - type: Transform - pos: 19.88635,-20.1419 + pos: 23.490412,-10.453516 parent: 34 - proto: ClothingHeadHatSurgcapBlue entities: @@ -28916,23 +29598,6 @@ entities: - type: Transform pos: -32.044968,-25.916649 parent: 34 -- proto: ClothingHeadHelmetEVA - entities: - - uid: 1067 - components: - - type: Transform - pos: 38.516422,-2.6021488 - parent: 34 - - uid: 6965 - components: - - type: Transform - pos: 38.313297,-2.2427738 - parent: 34 - - uid: 10024 - components: - - type: Transform - pos: 38.657047,-2.2740238 - parent: 34 - proto: ClothingHeadHelmetKendoMen entities: - uid: 201 @@ -28945,23 +29610,6 @@ entities: - type: Transform pos: -1.6040713,8.884319 parent: 34 -- proto: ClothingHeadHelmetRiot - entities: - - uid: 12475 - components: - - type: Transform - pos: 26.226002,-19.658371 - parent: 34 - - uid: 12476 - components: - - type: Transform - pos: 26.538502,-19.783371 - parent: 34 - - uid: 12477 - components: - - type: Transform - pos: 26.835377,-19.642746 - parent: 34 - proto: ClothingKimonoBlue entities: - uid: 2233 @@ -29017,23 +29665,6 @@ entities: - type: Transform pos: -56.298004,-8.57724 parent: 34 -- proto: ClothingMaskBreath - entities: - - uid: 2963 - components: - - type: Transform - pos: 38.391422,-4.570899 - parent: 34 - - uid: 4850 - components: - - type: Transform - pos: 38.625797,-4.305274 - parent: 34 - - uid: 9108 - components: - - type: Transform - pos: 38.313297,-4.305274 - parent: 34 - proto: ClothingMaskBreathMedical entities: - uid: 8983 @@ -29067,19 +29698,19 @@ entities: - type: Transform pos: 11.547624,-26.478827 parent: 34 -- proto: ClothingNeckMantleHOP +- proto: ClothingNeckHeadphones entities: - - uid: 11019 + - uid: 4499 components: - type: Transform - pos: -18.673035,-16.724771 + pos: 41.522667,-15.46591 parent: 34 -- proto: ClothingNeckMantleHOS +- proto: ClothingNeckMantleHOP entities: - - uid: 11020 + - uid: 11019 components: - type: Transform - pos: 30.0086,-10.640028 + pos: -18.673035,-16.724771 parent: 34 - proto: ClothingNeckMantleMystagogue entities: @@ -29102,23 +29733,6 @@ entities: rot: -1.5707963267948966 rad pos: -2.4165714,8.717537 parent: 34 -- proto: ClothingOuterArmorRiot - entities: - - uid: 3589 - components: - - type: Transform - pos: 26.505474,-19.430716 - parent: 34 - - uid: 3590 - components: - - type: Transform - pos: 26.7086,-19.22745 - parent: 34 - - uid: 3591 - components: - - type: Transform - pos: 26.317974,-19.22745 - parent: 34 - proto: ClothingOuterCoatDetective entities: - uid: 2270 @@ -29312,23 +29926,6 @@ entities: rot: 1.5707963267948966 rad pos: -57.718834,-4.253128 parent: 34 -- proto: ClothingUniformJumpsuitPrisoner - entities: - - uid: 3536 - components: - - type: Transform - pos: 17.322996,-10.366264 - parent: 34 - - uid: 3537 - components: - - type: Transform - pos: 17.71883,-10.366264 - parent: 34 - - uid: 3549 - components: - - type: Transform - pos: 17.520914,-10.574743 - parent: 34 - proto: ClothingUniformJumpsuitTshirtJeans entities: - uid: 10938 @@ -29429,12 +30026,6 @@ entities: rot: 3.141592653589793 rad pos: 49.5,-0.5 parent: 34 - - uid: 1078 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 19.5,-1.5 - parent: 34 - uid: 1359 components: - type: Transform @@ -29459,12 +30050,6 @@ entities: rot: -1.5707963267948966 rad pos: -41.5,-6.5 parent: 34 - - uid: 3624 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 20.5,-7.5 - parent: 34 - uid: 4252 components: - type: Transform @@ -29477,11 +30062,6 @@ entities: rot: 3.141592653589793 rad pos: 47.5,-0.5 parent: 34 - - uid: 4955 - components: - - type: Transform - pos: 40.5,-12.5 - parent: 34 - uid: 6232 components: - type: Transform @@ -29593,11 +30173,16 @@ entities: parent: 34 - proto: ComputerCriminalRecords entities: - - uid: 5025 + - uid: 3537 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 25.5,-12.5 + pos: 28.5,5.5 + parent: 34 + - uid: 4342 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 16.5,-18.5 parent: 34 - uid: 13037 components: @@ -29623,11 +30208,10 @@ entities: rot: 1.5707963267948966 rad pos: -19.5,-19.5 parent: 34 - - uid: 2493 + - uid: 3502 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 30.5,-9.5 + pos: 29.5,5.5 parent: 34 - uid: 3991 components: @@ -29776,6 +30360,11 @@ entities: rot: -1.5707963267948966 rad pos: -29.5,2.5 parent: 34 + - uid: 4540 + components: + - type: Transform + pos: 30.5,5.5 + parent: 34 - uid: 10791 components: - type: Transform @@ -29790,22 +30379,11 @@ entities: parent: 34 - proto: ComputerSurveillanceCameraMonitor entities: - - uid: 3634 - components: - - type: Transform - pos: 26.5,-6.5 - parent: 34 - - uid: 4915 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 22.5,-15.5 - parent: 34 - - uid: 6956 + - uid: 4438 components: - type: Transform rot: 1.5707963267948966 rad - pos: 27.5,-9.5 + pos: 16.5,-19.5 parent: 34 - uid: 13032 components: @@ -29830,11 +30408,6 @@ entities: parent: 34 - proto: ComputerTelevision entities: - - uid: 3625 - components: - - type: Transform - pos: 20.5,-6.5 - parent: 34 - uid: 4953 components: - type: Transform @@ -30135,6 +30708,13 @@ entities: - 0 - 0 - 0 +- proto: CrateEmergencyExplosive + entities: + - uid: 4924 + components: + - type: Transform + pos: 35.5,-7.5 + parent: 34 - proto: CrateEmergencyInternals entities: - uid: 5563 @@ -30245,13 +30825,6 @@ entities: - 0 - 0 - 0 -- proto: CrateEngineeringCableBulk - entities: - - uid: 4533 - components: - - type: Transform - pos: 37.5,-18.5 - parent: 34 - proto: CrateEngineeringSolar entities: - uid: 5629 @@ -30314,28 +30887,21 @@ entities: - type: Transform pos: -7.5,-34.5 parent: 34 -- proto: CrateFunArtSupplies +- proto: CrateGenericSteel entities: - - uid: 626 - components: - - type: Transform - pos: 39.5,-15.5 - parent: 34 -- proto: CrateFunBoardGames - entities: - - uid: 3629 + - uid: 8871 components: - type: Transform - pos: 20.5,-5.5 + pos: 32.5,-6.5 parent: 34 - type: EntityStorage air: volume: 200 immutable: False - temperature: 293.14957 + temperature: 293.14673 moles: - - 4.3114347 - - 16.219208 + - 1.7459903 + - 6.568249 - 0 - 0 - 0 @@ -30346,6 +30912,19 @@ entities: - 0 - 0 - 0 + - type: ContainerContainer + containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 8874 + - 8873 + - 8872 + paper_label: !type:ContainerSlot + showEnts: False + occludes: True + ent: null - proto: CrateHydroponics entities: - uid: 431 @@ -30478,6 +31057,20 @@ entities: - 0 - 0 - 0 +- proto: CrateSecurityNonlethal + entities: + - uid: 4925 + components: + - type: Transform + pos: 35.5,-8.5 + parent: 34 +- proto: CrateSecurityRiot + entities: + - uid: 4923 + components: + - type: Transform + pos: 35.5,-9.5 + parent: 34 - proto: CrateServiceBureaucracy entities: - uid: 1917 @@ -30510,19 +31103,55 @@ entities: - type: Transform pos: 9.5,-26.5 parent: 34 -- proto: CrayonBlack +- proto: CrateTrainingBombs entities: - - uid: 5947 + - uid: 9991 components: - type: Transform - pos: 1.8039385,-17.44404 + pos: 33.5,-9.5 parent: 34 -- proto: CrayonBox +- proto: CrateTrashCart entities: - - uid: 3630 + - uid: 3564 components: - type: Transform - pos: 19.63428,-3.22361 + pos: 41.5,-1.5 + parent: 34 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14673 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - type: ContainerContainer + containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 3594 + paper_label: !type:ContainerSlot + showEnts: False + occludes: True + ent: null +- proto: CrayonBlack + entities: + - uid: 5947 + components: + - type: Transform + pos: 1.8039385,-17.44404 parent: 34 - proto: CrayonWhite entities: @@ -30615,30 +31244,17 @@ entities: rot: -1.5707963267948966 rad pos: 19.5,14.5 parent: 34 - - uid: 13091 + - uid: 13094 components: - type: Transform rot: 1.5707963267948966 rad - pos: 16.5,18.5 + pos: 16.5,14.5 parent: 34 - - uid: 13092 + - uid: 13105 components: - type: Transform - rot: -1.5707963267948966 rad pos: 19.5,16.5 parent: 34 - - uid: 13093 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 19.5,18.5 - parent: 34 - - uid: 13094 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 16.5,14.5 - parent: 34 - proto: CryogenicSleepUnitSpawnerPrisoner entities: - uid: 181 @@ -30695,64 +31311,350 @@ entities: - type: Transform pos: 17.480783,3.5951743 parent: 34 -- proto: DefibrillatorCabinetFilled +- proto: DefaultStationBeaconAICore entities: - - uid: 3284 + - uid: 13697 components: - type: Transform - rot: 3.141592653589793 rad - pos: 17.5,-2.5 + pos: 64.5,-23.5 + parent: 34 +- proto: DefaultStationBeaconAnomalyGenerator + entities: + - uid: 13698 + components: + - type: Transform + pos: -36.5,3.5 + parent: 34 +- proto: DefaultStationBeaconArmory + entities: + - uid: 13548 + components: + - type: Transform + pos: 30.5,-5.5 + parent: 34 +- proto: DefaultStationBeaconArrivals + entities: + - uid: 11326 + components: + - type: Transform + pos: 9.5,16.5 + parent: 34 +- proto: DefaultStationBeaconBar + entities: + - uid: 11712 + components: + - type: Transform + pos: 1.5,-9.5 + parent: 34 +- proto: DefaultStationBeaconBotany + entities: + - uid: 13154 + components: + - type: Transform + pos: -16.5,-6.5 + parent: 34 +- proto: DefaultStationBeaconBrig + entities: + - uid: 13552 + components: + - type: Transform + pos: 21.5,-6.5 + parent: 34 +- proto: DefaultStationBeaconCaptainsQuarters + entities: + - uid: 13165 + components: + - type: Transform + pos: 39.5,-29.5 + parent: 34 +- proto: DefaultStationBeaconCargoReception + entities: + - uid: 13096 + components: + - type: Transform + pos: -10.5,-31.5 + parent: 34 +- proto: DefaultStationBeaconChapel + entities: + - uid: 13696 + components: + - type: Transform + pos: -26.5,-15.5 + parent: 34 +- proto: DefaultStationBeaconChemistry + entities: + - uid: 13006 + components: + - type: Transform + pos: 1.5,-27.5 + parent: 34 +- proto: DefaultStationBeaconCMORoom + entities: + - uid: 4560 + components: + - type: Transform + pos: 14.5,-33.5 + parent: 34 +- proto: DefaultStationBeaconCommand + entities: + - uid: 13680 + components: + - type: Transform + pos: 45.5,-35.5 + parent: 34 +- proto: DefaultStationBeaconCryosleep + entities: + - uid: 13159 + components: + - type: Transform + pos: 17.5,15.5 + parent: 34 +- proto: DefaultStationBeaconDetectiveRoom + entities: + - uid: 13164 + components: + - type: Transform + pos: -8.5,4.5 + parent: 34 +- proto: DefaultStationBeaconDisposals + entities: + - uid: 13161 + components: + - type: Transform + pos: -41.5,8.5 + parent: 34 +- proto: DefaultStationBeaconEngineering + entities: + - uid: 11713 + components: + - type: Transform + pos: -32.5,-32.5 + parent: 34 +- proto: DefaultStationBeaconEscapePod + entities: + - uid: 13682 + components: + - type: Transform + pos: -0.5,14.5 + parent: 34 + - uid: 13683 + components: + - type: Transform + pos: 11.5,-48.5 + parent: 34 +- proto: DefaultStationBeaconEvac + entities: + - uid: 13684 + components: + - type: Transform + pos: 1.5,-49.5 + parent: 34 +- proto: DefaultStationBeaconEVAStorage + entities: + - uid: 13681 + components: + - type: Transform + pos: -4.5,-53.5 + parent: 34 +- proto: DefaultStationBeaconGravGen + entities: + - uid: 11324 + components: + - type: Transform + pos: -27.5,-38.5 + parent: 34 +- proto: DefaultStationBeaconHOPOffice + entities: + - uid: 13685 + components: + - type: Transform + pos: -18.5,-17.5 + parent: 34 +- proto: DefaultStationBeaconHOSRoom + entities: + - uid: 13550 + components: + - type: Transform + pos: 26.5,4.5 + parent: 34 +- proto: DefaultStationBeaconJanitorsCloset + entities: + - uid: 13163 + components: + - type: Transform + pos: 5.5,-17.5 + parent: 34 +- proto: DefaultStationBeaconKitchen + entities: + - uid: 13162 + components: + - type: Transform + pos: -9.5,-6.5 + parent: 34 +- proto: DefaultStationBeaconLawOffice + entities: + - uid: 13686 + components: + - type: Transform + pos: 8.5,7.5 + parent: 34 +- proto: DefaultStationBeaconMedical + entities: + - uid: 13155 + components: + - type: Transform + pos: 5.5,-34.5 + parent: 34 +- proto: DefaultStationBeaconMorgue + entities: + - uid: 13687 + components: + - type: Transform + pos: 11.5,-41.5 + parent: 34 +- proto: DefaultStationBeaconPermaBrig + entities: + - uid: 3672 + components: + - type: Transform + pos: 45.5,1.5 + parent: 34 +- proto: DefaultStationBeaconRDRoom + entities: + - uid: 13153 + components: + - type: Transform + pos: -34.5,-4.5 + parent: 34 +- proto: DefaultStationBeaconSalvage + entities: + - uid: 13688 + components: + - type: Transform + pos: -32.5,-56.5 + parent: 34 +- proto: DefaultStationBeaconScience + entities: + - uid: 13695 + components: + - type: Transform + pos: -30.5,-8.5 + parent: 34 +- proto: DefaultStationBeaconSecurity + entities: + - uid: 13551 + components: + - type: Transform + pos: 25.5,-13.5 + parent: 34 +- proto: DefaultStationBeaconSolars + entities: + - uid: 13689 + components: + - type: Transform + pos: 32.5,-44.5 parent: 34 +- proto: DefaultStationBeaconTEG + entities: + - uid: 13694 + components: + - type: Transform + pos: -53.5,-26.5 + parent: 34 +- proto: DefaultStationBeaconTelecoms + entities: + - uid: 13691 + components: + - type: Transform + pos: -37.5,-49.5 + parent: 34 +- proto: DefaultStationBeaconToolRoom + entities: + - uid: 13693 + components: + - type: Transform + pos: -15.5,3.5 + parent: 34 +- proto: DefaultStationBeaconVault + entities: + - uid: 13692 + components: + - type: Transform + pos: 38.5,-34.5 + parent: 34 +- proto: DefaultStationBeaconWardensOffice + entities: + - uid: 13549 + components: + - type: Transform + pos: 39.5,-12.5 + parent: 34 +- proto: DefibrillatorCabinetFilled + entities: - uid: 5245 components: - type: Transform pos: 4.5,-30.5 parent: 34 + - uid: 6720 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 18.5,-2.5 + parent: 34 - proto: DeployableBarrier entities: - - uid: 4923 + - uid: 3749 + components: + - type: Transform + pos: 21.5,0.5 + parent: 34 + - uid: 7615 components: - type: Transform pos: 21.5,-1.5 parent: 34 - - uid: 4924 + - uid: 10004 components: - type: Transform - pos: 21.5,-0.5 + pos: 35.5,-2.5 parent: 34 - - uid: 4925 + - uid: 10011 components: - type: Transform - pos: 26.5,-16.5 + pos: 35.5,-19.5 parent: 34 - - uid: 4926 + - uid: 10024 components: - type: Transform - pos: 26.5,-15.5 + pos: 33.5,-19.5 parent: 34 -- proto: DeskBell - entities: - - uid: 1412 + - uid: 10186 components: - type: Transform - pos: -20.592945,-26.566446 + pos: 34.5,-2.5 parent: 34 - - uid: 1421 + - uid: 12193 components: - type: Transform - pos: -1.7226835,-30.526058 + pos: 20.5,-14.5 parent: 34 - - uid: 4139 + - uid: 12194 components: - type: Transform - pos: 21.280338,-13.184029 + pos: 20.5,-12.5 parent: 34 -- proto: DiceBag +- proto: DeskBell entities: - - uid: 3628 + - uid: 1412 + components: + - type: Transform + pos: -20.592945,-26.566446 + parent: 34 + - uid: 1421 components: - type: Transform - pos: 18.355251,-7.464027 + pos: -1.7226835,-30.526058 parent: 34 - proto: DiseaseDiagnoser entities: @@ -30785,12 +31687,6 @@ entities: - type: Transform pos: 8.5,13.5 parent: 34 - - uid: 8185 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 25.5,-13.5 - parent: 34 - uid: 8513 components: - type: Transform @@ -30857,6 +31753,16 @@ entities: rot: 1.5707963267948966 rad pos: -41.5,9.5 parent: 34 + - uid: 13630 + components: + - type: Transform + pos: 29.5,-13.5 + parent: 34 + - uid: 13645 + components: + - type: Transform + pos: 24.5,-7.5 + parent: 34 - proto: DisposalJunction entities: - uid: 2335 @@ -30887,12 +31793,6 @@ entities: rot: -1.5707963267948966 rad pos: 15.5,-22.5 parent: 34 - - uid: 8191 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 17.5,-22.5 - parent: 34 - uid: 8262 components: - type: Transform @@ -30929,6 +31829,12 @@ entities: rot: -1.5707963267948966 rad pos: 8.5,-0.5 parent: 34 + - uid: 13636 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,-13.5 + parent: 34 - proto: DisposalJunctionFlipped entities: - uid: 5789 @@ -31094,21 +32000,6 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,-46.5 parent: 34 - - uid: 8125 - components: - - type: Transform - pos: 42.5,7.5 - parent: 34 - - uid: 8126 - components: - - type: Transform - pos: 42.5,8.5 - parent: 34 - - uid: 8127 - components: - - type: Transform - pos: 42.5,9.5 - parent: 34 - uid: 8143 components: - type: Transform @@ -31249,71 +32140,6 @@ entities: rot: -1.5707963267948966 rad pos: 14.5,-13.5 parent: 34 - - uid: 8175 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 15.5,-13.5 - parent: 34 - - uid: 8176 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 16.5,-13.5 - parent: 34 - - uid: 8177 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 17.5,-13.5 - parent: 34 - - uid: 8178 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 18.5,-13.5 - parent: 34 - - uid: 8179 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 19.5,-13.5 - parent: 34 - - uid: 8180 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 20.5,-13.5 - parent: 34 - - uid: 8181 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 21.5,-13.5 - parent: 34 - - uid: 8182 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 22.5,-13.5 - parent: 34 - - uid: 8183 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 23.5,-13.5 - parent: 34 - - uid: 8184 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 24.5,-13.5 - parent: 34 - - uid: 8187 - components: - - type: Transform - pos: 25.5,-12.5 - parent: 34 - uid: 8192 components: - type: Transform @@ -31856,11 +32682,6 @@ entities: rot: 3.141592653589793 rad pos: 12.5,-21.5 parent: 34 - - uid: 8330 - components: - - type: Transform - pos: 17.5,-21.5 - parent: 34 - uid: 8331 components: - type: Transform @@ -32743,6 +33564,12 @@ entities: rot: 1.5707963267948966 rad pos: -39.5,9.5 parent: 34 + - uid: 12390 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 17.5,-22.5 + parent: 34 - uid: 12929 components: - type: Transform @@ -32761,6 +33588,156 @@ entities: rot: 1.5707963267948966 rad pos: 2.5,-5.5 parent: 34 + - uid: 13547 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 24.5,-11.5 + parent: 34 + - uid: 13622 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 24.5,-8.5 + parent: 34 + - uid: 13624 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 24.5,-9.5 + parent: 34 + - uid: 13625 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 24.5,-10.5 + parent: 34 + - uid: 13626 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 24.5,-12.5 + parent: 34 + - uid: 13629 + components: + - type: Transform + pos: 29.5,-14.5 + parent: 34 + - uid: 13631 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 28.5,-13.5 + parent: 34 + - uid: 13632 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 27.5,-13.5 + parent: 34 + - uid: 13633 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 26.5,-13.5 + parent: 34 + - uid: 13634 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 25.5,-13.5 + parent: 34 + - uid: 13635 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 23.5,-13.5 + parent: 34 + - uid: 13637 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-13.5 + parent: 34 + - uid: 13638 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,-13.5 + parent: 34 + - uid: 13639 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 20.5,-13.5 + parent: 34 + - uid: 13640 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 19.5,-13.5 + parent: 34 + - uid: 13641 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.5,-13.5 + parent: 34 + - uid: 13642 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 17.5,-13.5 + parent: 34 + - uid: 13643 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 16.5,-13.5 + parent: 34 + - uid: 13644 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 15.5,-13.5 + parent: 34 + - uid: 13650 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 19.5,-7.5 + parent: 34 + - uid: 13651 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 18.5,-7.5 + parent: 34 + - uid: 13652 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 20.5,-7.5 + parent: 34 +- proto: DisposalPipeBroken + entities: + - uid: 13562 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 42.5,8.5 + parent: 34 + - uid: 13563 + components: + - type: Transform + pos: 42.5,9.5 + parent: 34 + - uid: 13567 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 42.5,9.5 + parent: 34 - proto: DisposalTrunk entities: - uid: 1343 @@ -32787,17 +33764,6 @@ entities: rot: -1.5707963267948966 rad pos: 0.5,-46.5 parent: 34 - - uid: 8123 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 42.5,6.5 - parent: 34 - - uid: 8124 - components: - - type: Transform - pos: 42.5,10.5 - parent: 34 - uid: 8136 components: - type: Transform @@ -32816,16 +33782,6 @@ entities: rot: 1.5707963267948966 rad pos: 7.5,2.5 parent: 34 - - uid: 8186 - components: - - type: Transform - pos: 25.5,-11.5 - parent: 34 - - uid: 8188 - components: - - type: Transform - pos: 17.5,-20.5 - parent: 34 - uid: 8189 components: - type: Transform @@ -32912,6 +33868,35 @@ entities: rot: -1.5707963267948966 rad pos: -38.5,9.5 parent: 34 + - uid: 13564 + components: + - type: Transform + pos: 42.5,10.5 + parent: 34 + - uid: 13628 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 29.5,-15.5 + parent: 34 + - uid: 13646 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 23.5,-7.5 + parent: 34 + - uid: 13647 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,-7.5 + parent: 34 + - uid: 13648 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 17.5,-7.5 + parent: 34 - proto: DisposalUnit entities: - uid: 789 @@ -32969,13 +33954,6 @@ entities: - type: Transform pos: 5.5,-31.5 parent: 34 - - uid: 4760 - components: - - type: MetaData - desc: We all know where this is going. - - type: Transform - pos: 42.5,6.5 - parent: 34 - uid: 6157 components: - type: Transform @@ -32986,20 +33964,15 @@ entities: - type: Transform pos: 7.5,2.5 parent: 34 - - uid: 8083 - components: - - type: Transform - pos: -32.5,-23.5 - parent: 34 - - uid: 8130 + - uid: 7647 components: - type: Transform - pos: 25.5,-11.5 + pos: 29.5,-15.5 parent: 34 - - uid: 8131 + - uid: 8083 components: - type: Transform - pos: 17.5,-20.5 + pos: -32.5,-23.5 parent: 34 - uid: 8133 components: @@ -33021,6 +33994,11 @@ entities: - type: Transform pos: 4.5,13.5 parent: 34 + - uid: 8330 + components: + - type: Transform + pos: 23.5,-7.5 + parent: 34 - uid: 9147 components: - type: Transform @@ -33036,6 +34014,14 @@ entities: - type: Transform pos: -9.5,-38.5 parent: 34 + - uid: 13649 + components: + - type: MetaData + desc: A pneumatic criminal detainment unit. + name: Decoy Shute + - type: Transform + pos: 21.5,-7.5 + parent: 34 - proto: DisposalYJunction entities: - uid: 2403 @@ -33083,6 +34069,11 @@ entities: - type: Transform pos: 9.5,-34.5 parent: 34 + - uid: 3632 + components: + - type: Transform + pos: 38.5,-11.5 + parent: 34 - uid: 6050 components: - type: Transform @@ -33098,22 +34089,22 @@ entities: - type: Transform pos: -39.5,-4.5 parent: 34 - - uid: 10987 + - uid: 11743 components: - type: Transform - pos: 27.5,-13.5 + pos: 40.5,-29.5 parent: 34 - - uid: 11743 + - uid: 12456 components: - type: Transform - pos: 40.5,-29.5 + pos: 27.5,-5.5 parent: 34 - proto: DonkpocketBoxSpawner entities: - - uid: 4932 + - uid: 6964 components: - type: Transform - pos: 20.5,-16.5 + pos: 22.5,-16.5 parent: 34 - uid: 10538 components: @@ -33181,10 +34172,10 @@ entities: parent: 34 - proto: DresserHeadOfSecurityFilled entities: - - uid: 4014 + - uid: 4547 components: - type: Transform - pos: 33.5,-9.5 + pos: 25.5,5.5 parent: 34 - proto: DresserQuarterMasterFilled entities: @@ -33202,10 +34193,10 @@ entities: parent: 34 - proto: DresserWardenFilled entities: - - uid: 11015 + - uid: 3660 components: - type: Transform - pos: 29.5,-7.5 + pos: 40.5,-11.5 parent: 34 - proto: DrinkAleBottleFull entities: @@ -33303,6 +34294,11 @@ entities: - type: Transform pos: -28.792316,-8.542484 parent: 34 + - uid: 13600 + components: + - type: Transform + pos: 22.743269,-14.30632 + parent: 34 - proto: DrinkEnergyDrinkCan entities: - uid: 11933 @@ -33644,35 +34640,30 @@ entities: - type: Transform pos: 10.752976,-38.638725 parent: 34 - - uid: 7549 - components: - - type: Transform - pos: -31.421936,-29.090164 - parent: 34 - - uid: 7550 + - uid: 3475 components: - type: Transform - pos: -31.22402,-29.090164 + pos: 18.581495,-20.245495 parent: 34 - - uid: 7551 + - uid: 3476 components: - type: Transform - pos: -31.31777,-29.225676 + pos: 18.922266,-20.45836 parent: 34 - - uid: 11341 + - uid: 7549 components: - type: Transform - pos: 20.285599,-16.020523 + pos: -31.421936,-29.090164 parent: 34 - - uid: 11343 + - uid: 7550 components: - type: Transform - pos: 20.358517,-15.947556 + pos: -31.22402,-29.090164 parent: 34 - - uid: 11344 + - uid: 7551 components: - type: Transform - pos: 20.181433,-15.947556 + pos: -31.31777,-29.225676 parent: 34 - uid: 11932 components: @@ -33701,12 +34692,6 @@ entities: parent: 34 - proto: DrinkWaterCup entities: - - uid: 212 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 32.255108,-13.224632 - parent: 34 - uid: 872 components: - type: Transform @@ -33717,25 +34702,45 @@ entities: - type: Transform pos: -10.472759,5.497151 parent: 34 - - uid: 10990 + - uid: 3608 components: - type: Transform - pos: 7.386877,7.710605 + rot: 3.141592653589793 rad + pos: 16.317234,-14.3150215 parent: 34 - - uid: 11109 + - uid: 3609 components: - type: Transform - pos: 7.652502,7.679355 + rot: 3.141592653589793 rad + pos: 16.572813,-14.272448 parent: 34 - - uid: 12173 + - uid: 6794 components: - type: Transform - pos: 32.380108,-13.427757 + rot: 3.141592653589793 rad + pos: 27.329897,-11.304871 parent: 34 - - uid: 12228 + - uid: 6796 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 27.584114,-11.470356 + parent: 34 + - uid: 6798 components: - type: Transform - pos: 32.255108,-13.412132 + rot: 3.141592653589793 rad + pos: 16.672205,-14.527887 + parent: 34 + - uid: 10990 + components: + - type: Transform + pos: 7.386877,7.710605 + parent: 34 + - uid: 11109 + components: + - type: Transform + pos: 7.652502,7.679355 parent: 34 - uid: 12525 components: @@ -33752,6 +34757,16 @@ entities: - type: Transform pos: -46.73523,-24.307888 parent: 34 + - uid: 13466 + components: + - type: Transform + pos: 41.725792,-16.387785 + parent: 34 + - uid: 13467 + components: + - type: Transform + pos: 41.444542,-16.55966 + parent: 34 - proto: DrinkWhiskeyGlass entities: - uid: 12285 @@ -33857,6 +34872,16 @@ entities: rot: 3.141592653589793 rad pos: -8.5,-38.5 parent: 34 + - uid: 8815 + components: + - type: Transform + pos: 22.5,-12.5 + parent: 34 + - uid: 8862 + components: + - type: Transform + pos: 19.5,-16.5 + parent: 34 - uid: 10415 components: - type: Transform @@ -34124,32 +35149,6 @@ entities: - type: PointLight enabled: True - type: ActiveEmergencyLight - - uid: 10681 - components: - - type: Transform - pos: 24.5,-2.5 - parent: 34 - - type: PointLight - enabled: True - - type: ActiveEmergencyLight - - uid: 10682 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 26.5,-16.5 - parent: 34 - - type: PointLight - enabled: True - - type: ActiveEmergencyLight - - uid: 10683 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 16.5,-7.5 - parent: 34 - - type: PointLight - enabled: True - - type: ActiveEmergencyLight - uid: 10685 components: - type: Transform @@ -34167,15 +35166,6 @@ entities: - type: PointLight enabled: True - type: ActiveEmergencyLight - - uid: 10773 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 33.5,3.5 - parent: 34 - - type: PointLight - enabled: True - - type: ActiveEmergencyLight - uid: 10779 components: - type: Transform @@ -34334,6 +35324,77 @@ entities: rot: 3.141592653589793 rad pos: 42.5,-29.5 parent: 34 + - uid: 13708 + components: + - type: Transform + pos: 31.5,-12.5 + parent: 34 + - uid: 13709 + components: + - type: Transform + pos: 32.5,-6.5 + parent: 34 + - uid: 13710 + components: + - type: Transform + pos: 36.5,-11.5 + parent: 34 + - uid: 13711 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 33.5,-19.5 + parent: 34 + - uid: 13712 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 23.5,-2.5 + parent: 34 + - uid: 13713 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 31.5,-1.5 + parent: 34 + - uid: 13714 + components: + - type: Transform + pos: 18.5,1.5 + parent: 34 + - uid: 13715 + components: + - type: Transform + pos: 38.5,-2.5 + parent: 34 + - uid: 13716 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 38.5,-8.5 + parent: 34 + - uid: 13717 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 19.5,-5.5 + parent: 34 + - uid: 13718 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 19.5,-8.5 + parent: 34 + - uid: 13719 + components: + - type: Transform + pos: 27.5,-7.5 + parent: 34 + - uid: 13720 + components: + - type: Transform + pos: 23.5,-7.5 + parent: 34 - proto: EmergencyRollerBed entities: - uid: 12267 @@ -34396,14 +35457,6 @@ entities: parent: 12052 - type: Physics canCollide: False -- proto: EncryptionKeySecurity - entities: - - uid: 3763 - components: - - type: Transform - parent: 3762 - - type: Physics - canCollide: False - proto: EncryptionKeyService entities: - uid: 12059 @@ -34507,16 +35560,6 @@ entities: - type: Transform pos: 20.5,-2.5 parent: 34 - - uid: 8102 - components: - - type: Transform - pos: 27.5,-16.5 - parent: 34 - - uid: 8103 - components: - - type: Transform - pos: 31.5,-1.5 - parent: 34 - uid: 8106 components: - type: Transform @@ -34594,13 +35637,13 @@ entities: parent: 34 - type: FaxMachine name: Service, Lawyer - - uid: 4202 + - uid: 3498 components: - type: Transform - pos: 30.5,-10.5 + pos: 16.5,-17.5 parent: 34 - type: FaxMachine - name: Security, HoS + name: Security - uid: 4203 components: - type: Transform @@ -34608,13 +35651,13 @@ entities: parent: 34 - type: FaxMachine name: Engie, South Solar - - uid: 4918 + - uid: 4341 components: - type: Transform - pos: 22.5,-11.5 + pos: 28.5,3.5 parent: 34 - type: FaxMachine - name: Security, Main + name: HoS - uid: 5029 components: - type: Transform @@ -34650,13 +35693,6 @@ entities: parent: 34 - type: FaxMachine name: Engie, Main - - uid: 8686 - components: - - type: Transform - pos: 18.5,-0.5 - parent: 34 - - type: FaxMachine - name: Security, Corpsman - uid: 10069 components: - type: Transform @@ -34699,6 +35735,11 @@ entities: - type: Transform pos: 7.5,7.5 parent: 34 + - uid: 12852 + components: + - type: Transform + pos: 36.5,-14.5 + parent: 34 - proto: filingCabinetRandom entities: - uid: 12938 @@ -34716,8 +35757,37 @@ entities: - type: Transform pos: 45.5,-33.5 parent: 34 +- proto: filingCabinetTallRandom + entities: + - uid: 1077 + components: + - type: Transform + pos: 19.260582,-16.5 + parent: 34 + - uid: 4655 + components: + - type: Transform + pos: 19.713707,-16.5 + parent: 34 - proto: FireAlarm entities: + - uid: 6707 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 32.5,0.5 + parent: 34 + - type: DeviceList + devices: + - 3507 + - 13664 + - 13469 + - 6932 + - 4750 + - 1078 + - 3703 + - type: AtmosDevice + joinedGrid: 34 - uid: 8199 components: - type: Transform @@ -34884,45 +35954,6 @@ entities: - 10859 - type: AtmosDevice joinedGrid: 34 - - uid: 10861 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 15.5,-8.5 - parent: 34 - - type: DeviceList - devices: - - 10339 - - 10590 - - 10598 - - type: AtmosDevice - joinedGrid: 34 - - uid: 10862 - components: - - type: Transform - pos: 21.5,-8.5 - parent: 34 - - type: DeviceList - devices: - - 3638 - - 10340 - - 10592 - - 10586 - - 10587 - - type: AtmosDevice - joinedGrid: 34 - - uid: 10863 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 25.5,-4.5 - parent: 34 - - type: DeviceList - devices: - - 10592 - - 3638 - - type: AtmosDevice - joinedGrid: 34 - uid: 10865 components: - type: Transform @@ -34944,7 +35975,6 @@ entities: - type: DeviceList devices: - 10598 - - 10599 - 10600 - type: AtmosDevice joinedGrid: 34 @@ -34984,18 +36014,6 @@ entities: - 10712 - type: AtmosDevice joinedGrid: 34 - - uid: 12706 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 41.5,-11.5 - parent: 34 - - type: DeviceList - devices: - - 8922 - - 12372 - - type: AtmosDevice - joinedGrid: 34 - proto: FireAxeCabinetFilled entities: - uid: 1840 @@ -35091,6 +36109,23 @@ entities: - type: Transform pos: 3.5,-14.5 parent: 34 + - uid: 3703 + components: + - type: Transform + pos: 33.5,-1.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 6707 + - 2410 + - uid: 4697 + components: + - type: Transform + pos: 36.5,-16.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 6342 - uid: 5925 components: - type: Transform @@ -35139,15 +36174,18 @@ entities: rot: 1.5707963267948966 rad pos: -12.5,-39.5 parent: 34 - - uid: 10281 + - uid: 8831 components: - type: Transform - pos: -43.5,4.5 + pos: 36.5,-18.5 parent: 34 - - uid: 10340 + - type: DeviceNetwork + deviceLists: + - 6342 + - uid: 10281 components: - type: Transform - pos: 20.5,-11.5 + pos: -43.5,4.5 parent: 34 - uid: 10563 components: @@ -35164,11 +36202,6 @@ entities: - type: Transform pos: -31.5,-2.5 parent: 34 - - uid: 10599 - components: - - type: Transform - pos: 15.5,-0.5 - parent: 34 - uid: 10615 components: - type: Transform @@ -35179,6 +36212,9 @@ entities: - type: Transform pos: 8.5,-33.5 parent: 34 + - type: DeviceNetwork + deviceLists: + - 2525 - uid: 10859 components: - type: Transform @@ -35229,11 +36265,17 @@ entities: - type: Transform pos: 5.5,-40.5 parent: 34 + - type: DeviceNetwork + deviceLists: + - 2525 - uid: 12487 components: - type: Transform pos: 2.5,-40.5 parent: 34 + - type: DeviceNetwork + deviceLists: + - 2525 - uid: 12641 components: - type: Transform @@ -35270,6 +36312,15 @@ entities: - type: DeviceNetwork deviceLists: - 13433 + - uid: 13664 + components: + - type: Transform + pos: 20.5,-0.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 3295 + - 6707 - proto: FirelockEdge entities: - uid: 735 @@ -35358,6 +36409,16 @@ entities: parent: 34 - proto: FirelockGlass entities: + - uid: 78 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 28.5,-12.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 7683 + - 6342 - uid: 115 components: - type: Transform @@ -35421,13 +36482,24 @@ entities: - type: Transform pos: -4.5,-3.5 parent: 34 + - uid: 1078 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 30.5,-5.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 2410 + - 7684 + - 6707 - uid: 1121 components: - type: Transform pos: -36.5,-22.5 parent: 34 - type: Door - secondsUntilStateChange: -47890.125 + secondsUntilStateChange: -65927.375 state: Closing - uid: 1274 components: @@ -35444,6 +36516,9 @@ entities: - type: Transform pos: 6.5,-30.5 parent: 34 + - type: DeviceNetwork + deviceLists: + - 2525 - uid: 1302 components: - type: Transform @@ -35460,6 +36535,14 @@ entities: - type: DeviceNetwork deviceLists: - 13443 + - uid: 1870 + components: + - type: Transform + pos: 40.5,-3.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 8028 - uid: 1952 components: - type: Transform @@ -35498,16 +36581,42 @@ entities: - type: Transform pos: -15.5,-22.5 parent: 34 - - uid: 3340 + - uid: 3507 components: - type: Transform - pos: 16.5,-13.5 + pos: 29.5,1.5 parent: 34 - - uid: 3638 + - type: DeviceNetwork + deviceLists: + - 6707 + - 2410 + - uid: 3553 components: - type: Transform - pos: 22.5,-8.5 + pos: 17.5,-15.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 10291 + - 13671 + - uid: 3560 + components: + - type: Transform + pos: 34.5,-15.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 7684 + - 6342 + - uid: 3771 + components: + - type: Transform + pos: 19.5,-13.5 parent: 34 + - type: DeviceNetwork + deviceLists: + - 7683 + - 10291 - uid: 4700 components: - type: Transform @@ -35517,6 +36626,18 @@ entities: - type: DeviceNetwork deviceLists: - 10548 + - uid: 4750 + components: + - type: MetaData + name: glass firelock + - type: Transform + pos: 36.5,-3.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 6707 + - 2410 + - 8028 - uid: 5251 components: - type: Transform @@ -35569,6 +36690,62 @@ entities: - type: Transform pos: -6.5,-43.5 parent: 34 + - uid: 6932 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 25.5,-6.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 2410 + - 7683 + - 6707 + - uid: 6933 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 15.5,-0.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 3295 + - uid: 6936 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 28.5,-14.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 7683 + - 6342 + - uid: 7034 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 30.5,-21.5 + parent: 34 + - uid: 7610 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 28.5,-13.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 7683 + - 6342 + - uid: 7612 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 25.5,-15.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 7683 + - 13671 - uid: 8724 components: - type: Transform @@ -35584,6 +36761,15 @@ entities: - type: Transform pos: -18.5,-2.5 parent: 34 + - uid: 8911 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 34.5,-20.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 6342 - uid: 8922 components: - type: Transform @@ -35594,7 +36780,6 @@ entities: deviceLists: - 10611 - 9601 - - 12706 - uid: 9616 components: - type: Transform @@ -35841,6 +37026,9 @@ entities: - type: Transform pos: 1.5,-33.5 parent: 34 + - type: DeviceNetwork + deviceLists: + - 2525 - uid: 10579 components: - type: Transform @@ -35856,26 +37044,6 @@ entities: - type: Transform pos: -4.5,-39.5 parent: 34 - - uid: 10586 - components: - - type: Transform - pos: 21.5,-17.5 - parent: 34 - - uid: 10587 - components: - - type: Transform - pos: 21.5,-13.5 - parent: 34 - - uid: 10590 - components: - - type: Transform - pos: 16.5,-14.5 - parent: 34 - - uid: 10592 - components: - - type: Transform - pos: 23.5,-8.5 - parent: 34 - uid: 10598 components: - type: Transform @@ -36035,6 +37203,16 @@ entities: - type: Transform pos: -8.5,1.5 parent: 34 + - uid: 12213 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 31.5,-5.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 2410 + - 7684 - uid: 12360 components: - type: Transform @@ -36056,7 +37234,6 @@ entities: deviceLists: - 10611 - 9601 - - 12706 - uid: 12855 components: - type: Transform @@ -36077,6 +37254,36 @@ entities: - type: DeviceNetwork deviceLists: - 11539 + - uid: 13465 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 20.5,-18.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 13671 + - uid: 13468 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-8.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 7683 + - 13672 + - uid: 13469 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-5.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 13672 + - 2410 + - 6707 - proto: Fireplace entities: - uid: 2186 @@ -36096,16 +37303,6 @@ entities: parent: 34 - proto: Floodlight entities: - - uid: 4927 - components: - - type: Transform - pos: 25.210653,-9.219074 - parent: 34 - - uid: 4929 - components: - - type: Transform - pos: 25.476278,-9.437975 - parent: 34 - uid: 10693 components: - type: Transform @@ -36118,11 +37315,6 @@ entities: - type: Transform pos: 46.286488,-43.63476 parent: 34 - - uid: 10494 - components: - - type: Transform - pos: 39.290485,-19.296558 - parent: 34 - proto: FloorDrain entities: - uid: 99 @@ -36160,6 +37352,13 @@ entities: parent: 34 - type: Fixtures fixtures: {} + - uid: 3525 + components: + - type: Transform + pos: 40.5,-9.5 + parent: 34 + - type: Fixtures + fixtures: {} - uid: 3970 components: - type: Transform @@ -36254,6 +37453,16 @@ entities: - type: Transform pos: 40.212296,-43.93322 parent: 34 + - uid: 13543 + components: + - type: MetaData + desc: Cracked and dusty. Never used again after the incident. + name: Shiva's Food Bowl + - type: Transform + pos: 26.570406,-5.5294776 + parent: 34 + missingComponents: + - SpaceGarbage - proto: FoodBoxDonkpocketPizza entities: - uid: 1994 @@ -36264,6 +37473,11 @@ entities: parent: 34 - proto: FoodBoxDonut entities: + - uid: 3519 + components: + - type: Transform + pos: 18.28332,-20.522223 + parent: 34 - uid: 13014 components: - type: Transform @@ -36350,6 +37564,13 @@ entities: - type: Transform pos: 52.436928,-33.381863 parent: 34 +- proto: FoodCannabisButter + entities: + - uid: 1300 + components: + - type: Transform + pos: 38.57096,-13.383774 + parent: 34 - proto: FoodChili entities: - uid: 1 @@ -36443,13 +37664,6 @@ entities: - type: Transform pos: -15.762994,-32.17715 parent: 34 -- proto: FoodPlateSmallTrash - entities: - - uid: 11061 - components: - - type: Transform - pos: 40.281178,-17.254995 - parent: 34 - proto: FoodPotato entities: - uid: 11377 @@ -36498,13 +37712,6 @@ entities: - type: Transform pos: -48.674168,-30.394135 parent: 34 -- proto: FoodSpaceshroomCooked - entities: - - uid: 9107 - components: - - type: Transform - pos: 41.046803,-17.192495 - parent: 34 - proto: FoodTartGapple entities: - uid: 11177 @@ -36514,16 +37721,6 @@ entities: parent: 34 - proto: FoodTinPeachesMaint entities: - - uid: 4341 - components: - - type: Transform - pos: 35.22465,-10.347923 - parent: 34 - - uid: 4507 - components: - - type: Transform - pos: 35.646526,-10.644798 - parent: 34 - uid: 9628 components: - type: Transform @@ -36541,14 +37738,6 @@ entities: - type: Transform pos: -53.505413,-22.109913 parent: 34 -- proto: FoodTinPeachesMaintTrash - entities: - - uid: 8941 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 40.312428,-16.52062 - parent: 34 - proto: FoodTomato entities: - uid: 33 @@ -36686,7 +37875,7 @@ entities: - uid: 3244 components: - type: MetaData - name: Nitro oxide filter + name: Nitrous Oxide filter - type: Transform rot: 3.141592653589793 rad pos: 0.5,-41.5 @@ -37265,6 +38454,13 @@ entities: parent: 34 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 4417 + components: + - type: Transform + pos: 29.5,3.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 4439 components: - type: Transform @@ -37288,13 +38484,6 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 4896 - components: - - type: Transform - pos: 28.5,-14.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 5011 components: - type: Transform @@ -37514,10 +38703,10 @@ entities: parent: 34 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 8802 + - uid: 8799 components: - type: Transform - pos: 17.5,-4.5 + pos: 13.5,-33.5 parent: 34 - type: AtmosPipeColor color: '#0335FCFF' @@ -37528,11 +38717,40 @@ entities: parent: 34 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 8878 + - uid: 8818 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 27.5,3.5 + pos: 14.5,-32.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 8833 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 31.5,-18.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 8893 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 30.5,-17.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 8913 + components: + - type: Transform + pos: 30.5,-13.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 8915 + components: + - type: Transform + pos: 31.5,-12.5 parent: 34 - type: AtmosPipeColor color: '#0335FCFF' @@ -37750,22 +38968,21 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 9942 + - uid: 10006 components: - type: Transform - rot: 3.141592653589793 rad - pos: 17.5,-20.5 + rot: -1.5707963267948966 rad + pos: 38.5,1.5 parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 10006 + - uid: 10017 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 38.5,1.5 + pos: 34.5,-6.5 parent: 34 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#0335FCFF' - uid: 10081 components: - type: Transform @@ -37782,6 +38999,13 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 10188 + components: + - type: Transform + pos: 30.5,-1.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 10333 components: - type: Transform @@ -37797,6 +39021,37 @@ entities: parent: 34 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 10655 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 31.5,-6.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 10683 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 30.5,-7.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 10709 + components: + - type: Transform + pos: 33.5,-7.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 10863 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 40.5,-12.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 10903 components: - type: Transform @@ -37805,6 +39060,36 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 11059 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 20.5,-9.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 11061 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,-10.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 11076 + components: + - type: Transform + pos: 20.5,-3.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 11077 + components: + - type: Transform + pos: 21.5,-4.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 11291 components: - type: Transform @@ -37934,6 +39219,14 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 12115 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 38.5,-7.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 12180 components: - type: Transform @@ -37965,6 +39258,13 @@ entities: parent: 34 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 12282 + components: + - type: Transform + pos: 31.5,-0.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 12611 components: - type: Transform @@ -38003,6 +39303,22 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF0000FF' + - uid: 12848 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 17.5,-16.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 12850 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.5,-17.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 12863 components: - type: Transform @@ -38034,6 +39350,14 @@ entities: parent: 34 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 12967 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 25.5,-16.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 13109 components: - type: Transform @@ -38042,11 +39366,19 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 13111 + - uid: 13446 components: - type: Transform rot: -1.5707963267948966 rad - pos: 16.5,16.5 + pos: 26.5,-17.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 13447 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 21.5,-17.5 parent: 34 - type: AtmosPipeColor color: '#0335FCFF' @@ -38066,6 +39398,13 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 3692 + components: + - type: Transform + pos: 43.5,-34.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 3892 components: - type: Transform @@ -38115,6 +39454,13 @@ entities: parent: 34 - type: AtmosPipeColor color: '#03FCD3FF' + - uid: 7206 + components: + - type: Transform + pos: 34.5,-12.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 8370 components: - type: Transform @@ -38136,6 +39482,13 @@ entities: parent: 34 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 8823 + components: + - type: Transform + pos: 25.5,-13.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 9085 components: - type: Transform @@ -38185,20 +39538,27 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 9949 + - uid: 11884 components: - type: Transform - pos: 22.5,-13.5 + pos: -57.5,-32.5 parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 11884 + - uid: 12492 components: - type: Transform - pos: -57.5,-32.5 + pos: 18.5,-13.5 parent: 34 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 12854 + components: + - type: Transform + pos: 26.5,-12.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' - proto: GasPipeStraight entities: - uid: 43 @@ -38293,6 +39653,14 @@ entities: parent: 34 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 626 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 27.5,4.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 683 components: - type: Transform @@ -39171,6 +40539,14 @@ entities: rot: -1.5707963267948966 rad pos: -49.5,-38.5 parent: 34 + - uid: 3396 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 31.5,-5.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 3416 components: - type: Transform @@ -39179,6 +40555,81 @@ entities: parent: 34 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 3613 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 41.5,-34.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 3614 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 42.5,-34.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 3679 + components: + - type: Transform + pos: 33.5,-34.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 3709 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 26.5,4.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 3712 + components: + - type: Transform + pos: 28.5,1.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 3715 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 26.5,3.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 3735 + components: + - type: Transform + pos: 28.5,2.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 3736 + components: + - type: Transform + pos: 28.5,1.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 3738 + components: + - type: Transform + pos: 28.5,3.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 3748 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 13.5,-27.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 3754 components: - type: Transform @@ -39258,6 +40709,13 @@ entities: parent: 34 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 4171 + components: + - type: Transform + pos: 29.5,1.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 4277 components: - type: Transform @@ -39327,6 +40785,14 @@ entities: parent: 34 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 4429 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 28.5,3.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 4444 components: - type: Transform @@ -39412,11 +40878,11 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 4512 + - uid: 4498 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 26.5,-14.5 + rot: 3.141592653589793 rad + pos: 34.5,-16.5 parent: 34 - type: AtmosPipeColor color: '#0335FCFF' @@ -39427,22 +40893,14 @@ entities: parent: 34 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 4537 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 41.5,-7.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 4539 + - uid: 4563 components: - type: Transform rot: -1.5707963267948966 rad - pos: 42.5,-7.5 + pos: 27.5,3.5 parent: 34 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#FF1212FF' - uid: 4568 components: - type: Transform @@ -39489,81 +40947,79 @@ entities: parent: 34 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 4679 + - uid: 4680 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 41.5,-10.5 + rot: 1.5707963267948966 rad + pos: 35.5,-16.5 parent: 34 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 4680 + color: '#FF1212FF' + - uid: 4681 components: - type: Transform rot: -1.5707963267948966 rad - pos: 42.5,-10.5 + pos: 45.5,-9.5 parent: 34 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 4681 + - uid: 4763 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 45.5,-9.5 + pos: 43.5,-5.5 parent: 34 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 4684 + color: '#FF1212FF' + - uid: 4782 components: - type: Transform rot: -1.5707963267948966 rad - pos: 43.5,-13.5 + pos: 46.5,-2.5 parent: 34 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 4687 + color: '#FF1212FF' + - uid: 4851 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 42.5,-13.5 + pos: 31.5,-16.5 parent: 34 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 4763 + - uid: 4860 components: - type: Transform - pos: 43.5,-5.5 + rot: -1.5707963267948966 rad + pos: 45.5,-2.5 parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 4782 + - uid: 4891 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 46.5,-2.5 + pos: -10.5,-33.5 parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 4789 + - uid: 4927 components: - type: Transform rot: 1.5707963267948966 rad - pos: 31.5,-11.5 + pos: 34.5,-16.5 parent: 34 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 4860 + color: '#FF1212FF' + - uid: 4942 components: - type: Transform rot: -1.5707963267948966 rad - pos: 45.5,-2.5 + pos: 29.5,-13.5 parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 4891 + - uid: 4944 components: - type: Transform - pos: -10.5,-33.5 + pos: 30.5,-14.5 parent: 34 - type: AtmosPipeColor color: '#FF1212FF' @@ -39571,10 +41027,17 @@ entities: components: - type: Transform rot: 1.5707963267948966 rad - pos: 35.5,-3.5 + pos: 16.5,-28.5 parent: 34 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 4949 + components: + - type: Transform + pos: 15.5,-28.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 4951 components: - type: Transform @@ -39613,14 +41076,6 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 5910 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 30.5,-11.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 5911 components: - type: Transform @@ -40164,6 +41619,54 @@ entities: parent: 34 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 6708 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 22.5,0.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 6713 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 22.5,1.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 6719 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 22.5,-0.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 6722 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 34.5,-3.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 6797 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 34.5,-13.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 6869 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 35.5,-13.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 6876 components: - type: Transform @@ -40172,6 +41675,54 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 6882 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 24.5,-1.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 6891 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 34.5,-14.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 6937 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 34.5,-15.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 6959 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 34.5,-17.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 6979 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 29.5,-0.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 7027 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 32.5,-2.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 7052 components: - type: Transform @@ -40299,6 +41850,14 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 7172 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 16.5,-27.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 7175 components: - type: Transform @@ -40344,46 +41903,6 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 7186 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 34.5,-34.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 7187 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 35.5,-34.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 7188 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 36.5,-34.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 7189 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 37.5,-34.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 7190 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 38.5,-34.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 7193 components: - type: Transform @@ -40456,14 +41975,6 @@ entities: parent: 34 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 7204 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 35.5,-24.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 7205 components: - type: Transform @@ -40647,6 +42158,22 @@ entities: parent: 34 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 7648 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 33.5,-9.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 7649 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 33.5,-10.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 7664 components: - type: Transform @@ -40687,6 +42214,46 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 7672 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 31.5,-4.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 7710 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 33.5,-11.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 7713 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 33.5,-15.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 7714 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 33.5,-12.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 7715 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 29.5,-12.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 7717 components: - type: Transform @@ -40781,6 +42348,14 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 7869 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 33.5,-14.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 7971 components: - type: Transform @@ -40900,6 +42475,77 @@ entities: parent: 34 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 8177 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 10.5,-32.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 8178 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 33.5,-19.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 8180 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 11.5,-32.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 8182 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 33.5,-18.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 8183 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 32.5,-17.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 8184 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 31.5,-17.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 8185 + components: + - type: Transform + pos: 30.5,-16.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 8187 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 28.5,-13.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 8188 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 27.5,-13.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 8196 components: - type: Transform @@ -40940,6 +42586,14 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 8328 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 10.5,-33.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 8355 components: - type: Transform @@ -41432,6 +43086,14 @@ entities: parent: 34 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 8471 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 26.5,-13.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 8497 components: - type: Transform @@ -42505,22 +44167,6 @@ entities: parent: 34 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 8799 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 15.5,-4.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8800 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 16.5,-4.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 8807 components: - type: Transform @@ -42545,169 +44191,98 @@ entities: parent: 34 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 8811 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 15.5,-12.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8812 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 16.5,-12.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8813 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 17.5,-12.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8814 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 18.5,-12.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8816 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 21.5,-12.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8817 + - uid: 8821 components: - type: Transform rot: 1.5707963267948966 rad - pos: 22.5,-12.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8818 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 19.5,-12.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8820 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 20.5,-15.5 + pos: 13.5,-32.5 parent: 34 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8821 + color: '#FF1212FF' + - uid: 8824 components: - type: Transform rot: 3.141592653589793 rad - pos: 20.5,-17.5 + pos: 35.5,-23.5 parent: 34 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 8822 + - uid: 8825 components: - type: Transform rot: 3.141592653589793 rad - pos: 20.5,-18.5 + pos: 35.5,-22.5 parent: 34 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 8823 + - uid: 8826 components: - type: Transform rot: 3.141592653589793 rad - pos: 20.5,-19.5 + pos: 35.5,-21.5 parent: 34 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 8826 + - uid: 8827 components: - type: Transform rot: 3.141592653589793 rad - pos: 20.5,-13.5 + pos: 35.5,-20.5 parent: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8828 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 21.5,-16.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8829 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 22.5,-16.5 + rot: 3.141592653589793 rad + pos: 35.5,-19.5 parent: 34 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 8834 + - uid: 8835 components: - type: Transform rot: 3.141592653589793 rad - pos: 23.5,-17.5 + pos: 31.5,-15.5 parent: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8838 components: - type: Transform - pos: 23.5,-15.5 + rot: 3.141592653589793 rad + pos: 31.5,-13.5 parent: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8839 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 24.5,-14.5 + rot: 1.5707963267948966 rad + pos: 30.5,-12.5 parent: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8840 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 25.5,-14.5 + rot: 1.5707963267948966 rad + pos: 28.5,-12.5 parent: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8842 components: - type: Transform - rot: 3.141592653589793 rad - pos: 28.5,-15.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8844 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 27.5,-13.5 + rot: 1.5707963267948966 rad + pos: 28.5,-12.5 parent: 34 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 8845 + - uid: 8843 components: - type: Transform - rot: 3.141592653589793 rad + rot: 1.5707963267948966 rad pos: 27.5,-12.5 parent: 34 - type: AtmosPipeColor @@ -42715,231 +44290,163 @@ entities: - uid: 8847 components: - type: Transform - pos: 23.5,-13.5 + rot: 1.5707963267948966 rad + pos: 24.5,-12.5 parent: 34 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 8851 + - uid: 8848 components: - type: Transform - pos: 23.5,-11.5 + rot: 1.5707963267948966 rad + pos: 23.5,-12.5 parent: 34 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 8852 + - uid: 8849 components: - type: Transform - pos: 23.5,-10.5 + rot: 1.5707963267948966 rad + pos: 22.5,-12.5 parent: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8853 components: - type: Transform - pos: 23.5,-9.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8854 - components: - - type: Transform - pos: 23.5,-8.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8855 - components: - - type: Transform - pos: 23.5,-7.5 + rot: 1.5707963267948966 rad + pos: 25.5,-12.5 parent: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8856 components: - type: Transform - pos: 23.5,-5.5 + rot: 1.5707963267948966 rad + pos: 21.5,-12.5 parent: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8857 components: - type: Transform - pos: 23.5,-4.5 + rot: 1.5707963267948966 rad + pos: 20.5,-12.5 parent: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8859 components: - type: Transform - pos: 23.5,-2.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8861 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 24.5,-3.5 + rot: 1.5707963267948966 rad + pos: 19.5,-12.5 parent: 34 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 8862 + - uid: 8860 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 25.5,-3.5 + rot: 1.5707963267948966 rad + pos: 18.5,-12.5 parent: 34 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 8863 + - uid: 8861 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 26.5,-3.5 + rot: 1.5707963267948966 rad + pos: 18.5,-12.5 parent: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8865 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 28.5,-3.5 + rot: 1.5707963267948966 rad + pos: 16.5,-12.5 parent: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8866 components: - type: Transform - rot: 3.141592653589793 rad - pos: 29.5,-4.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8867 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 29.5,-5.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8869 - components: - - type: Transform - pos: 23.5,-1.5 + rot: 1.5707963267948966 rad + pos: 15.5,-12.5 parent: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8870 components: - type: Transform - pos: 23.5,-0.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8871 - components: - - type: Transform - pos: 23.5,0.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8873 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 27.5,-2.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8874 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 27.5,-1.5 + rot: 1.5707963267948966 rad + pos: 16.5,-13.5 parent: 34 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#FF1212FF' - uid: 8875 components: - type: Transform - rot: 3.141592653589793 rad - pos: 27.5,-0.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8876 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 27.5,1.5 + rot: 1.5707963267948966 rad + pos: 15.5,-13.5 parent: 34 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#FF1212FF' - uid: 8877 components: - type: Transform - rot: 3.141592653589793 rad - pos: 27.5,2.5 + rot: 1.5707963267948966 rad + pos: 17.5,-13.5 parent: 34 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#FF1212FF' - uid: 8882 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 30.5,-3.5 + rot: 1.5707963267948966 rad + pos: 19.5,-13.5 parent: 34 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#FF1212FF' - uid: 8883 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 32.5,-3.5 + rot: 1.5707963267948966 rad + pos: 21.5,-13.5 parent: 34 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#FF1212FF' - uid: 8884 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 33.5,-3.5 + rot: 1.5707963267948966 rad + pos: 22.5,-13.5 parent: 34 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#FF1212FF' - uid: 8885 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 34.5,-3.5 + rot: 1.5707963267948966 rad + pos: 24.5,-13.5 parent: 34 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#FF1212FF' - uid: 8886 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 36.5,-3.5 + rot: 1.5707963267948966 rad + pos: 23.5,-13.5 parent: 34 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#FF1212FF' - uid: 8887 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 37.5,-3.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8888 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 38.5,-3.5 + rot: 1.5707963267948966 rad + pos: 20.5,-13.5 parent: 34 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#FF1212FF' - uid: 8896 components: - type: Transform @@ -43752,14 +45259,6 @@ entities: parent: 34 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 9100 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 43.5,-10.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 9101 components: - type: Transform @@ -47440,38 +48939,13 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 9912 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 15.5,-5.5 - parent: 34 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9913 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 16.5,-5.5 - parent: 34 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9914 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 17.5,-5.5 - parent: 34 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9915 + - uid: 9916 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 18.5,-5.5 + pos: 44.5,-13.5 parent: 34 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#0335FCFF' - uid: 9917 components: - type: Transform @@ -47534,312 +49008,209 @@ entities: components: - type: Transform rot: 1.5707963267948966 rad - pos: 15.5,-13.5 + pos: 12.5,-33.5 parent: 34 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#0335FCFF' - uid: 9929 components: - type: Transform rot: 1.5707963267948966 rad - pos: 16.5,-13.5 - parent: 34 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9930 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 18.5,-13.5 - parent: 34 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9931 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 19.5,-13.5 - parent: 34 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9932 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 20.5,-13.5 + pos: 11.5,-33.5 parent: 34 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9933 + color: '#0335FCFF' + - uid: 9935 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 21.5,-13.5 + pos: 25.5,-12.5 parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9937 components: - type: Transform - rot: 3.141592653589793 rad - pos: 17.5,-15.5 + pos: 25.5,-10.5 parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9938 components: - type: Transform - rot: 3.141592653589793 rad - pos: 17.5,-16.5 + pos: 25.5,-10.5 parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 9940 + - uid: 9939 components: - type: Transform - rot: 3.141592653589793 rad - pos: 17.5,-18.5 + pos: 25.5,-9.5 parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9941 components: - type: Transform - rot: 3.141592653589793 rad - pos: 17.5,-19.5 - parent: 34 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9944 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 18.5,-17.5 + pos: 25.5,-7.5 parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 9945 + - uid: 9942 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 19.5,-17.5 + pos: 25.5,-6.5 parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 9946 + - uid: 9943 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 20.5,-17.5 + pos: 25.5,-5.5 parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 9947 + - uid: 9945 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 21.5,-17.5 + pos: 25.5,-4.5 parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 9950 + - uid: 9946 components: - type: Transform - rot: 3.141592653589793 rad - pos: 22.5,-14.5 + pos: 25.5,-3.5 parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 9951 + - uid: 9947 components: - type: Transform - rot: 3.141592653589793 rad - pos: 22.5,-15.5 + pos: 25.5,-2.5 parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9952 components: - type: Transform - rot: 3.141592653589793 rad - pos: 22.5,-16.5 + rot: -1.5707963267948966 rad + pos: 26.5,-1.5 parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9953 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 23.5,-17.5 - parent: 34 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9954 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 24.5,-17.5 - parent: 34 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9955 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 25.5,-17.5 - parent: 34 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9956 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 27.5,-17.5 - parent: 34 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9961 - components: - - type: Transform - pos: 22.5,-10.5 - parent: 34 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9962 - components: - - type: Transform - pos: 22.5,-12.5 - parent: 34 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9963 - components: - - type: Transform - pos: 22.5,-11.5 - parent: 34 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9964 components: - type: Transform rot: -1.5707963267948966 rad - pos: 23.5,-9.5 + pos: 27.5,-1.5 parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 9965 + - uid: 9954 components: - type: Transform rot: -1.5707963267948966 rad - pos: 24.5,-9.5 + pos: 28.5,-1.5 parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 9966 + - uid: 9959 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 25.5,-9.5 + rot: 3.141592653589793 rad + pos: 29.5,-0.5 parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 9967 + - uid: 9961 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 26.5,-9.5 + rot: 3.141592653589793 rad + pos: 29.5,0.5 parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 9969 + - uid: 9968 components: - type: Transform rot: 3.141592653589793 rad - pos: 22.5,-8.5 + pos: 26.5,-11.5 parent: 34 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#0335FCFF' - uid: 9970 components: - type: Transform rot: 3.141592653589793 rad - pos: 22.5,-7.5 + pos: 26.5,-9.5 parent: 34 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#0335FCFF' - uid: 9971 components: - type: Transform rot: 3.141592653589793 rad - pos: 22.5,-6.5 + pos: 26.5,-8.5 parent: 34 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#0335FCFF' - uid: 9972 components: - type: Transform rot: 3.141592653589793 rad - pos: 22.5,-5.5 + pos: 26.5,-7.5 parent: 34 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#0335FCFF' - uid: 9973 components: - type: Transform rot: 3.141592653589793 rad - pos: 22.5,-4.5 - parent: 34 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9974 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 22.5,-3.5 + pos: 26.5,-6.5 parent: 34 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#0335FCFF' - uid: 9975 components: - type: Transform rot: 3.141592653589793 rad - pos: 22.5,-1.5 + pos: 26.5,-4.5 parent: 34 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#0335FCFF' - uid: 9976 components: - type: Transform rot: 3.141592653589793 rad - pos: 22.5,-0.5 + pos: 26.5,-3.5 parent: 34 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#0335FCFF' - uid: 9977 components: - type: Transform rot: 3.141592653589793 rad - pos: 22.5,0.5 + pos: 26.5,-2.5 parent: 34 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9988 + color: '#0335FCFF' + - uid: 9978 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 34.5,-2.5 + rot: 3.141592653589793 rad + pos: 26.5,-1.5 parent: 34 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9989 + color: '#0335FCFF' + - uid: 9982 components: - type: Transform rot: 1.5707963267948966 rad - pos: 35.5,-2.5 + pos: 37.5,-2.5 parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 9990 + - uid: 9985 components: - type: Transform rot: 1.5707963267948966 rad @@ -47847,11 +49218,11 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 9991 + - uid: 9986 components: - type: Transform rot: 1.5707963267948966 rad - pos: 37.5,-2.5 + pos: 35.5,-2.5 parent: 34 - type: AtmosPipeColor color: '#FF1212FF' @@ -47859,55 +49230,47 @@ entities: components: - type: Transform rot: 1.5707963267948966 rad - pos: 32.5,-2.5 + pos: 27.5,-0.5 parent: 34 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#0335FCFF' - uid: 9993 components: - type: Transform rot: 1.5707963267948966 rad - pos: 31.5,-2.5 + pos: 25.5,-0.5 parent: 34 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#0335FCFF' - uid: 9994 components: - type: Transform rot: 1.5707963267948966 rad - pos: 30.5,-2.5 + pos: 24.5,-0.5 parent: 34 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#0335FCFF' - uid: 9995 components: - type: Transform rot: 1.5707963267948966 rad - pos: 28.5,-2.5 + pos: 23.5,-0.5 parent: 34 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#0335FCFF' - uid: 9996 components: - type: Transform rot: 1.5707963267948966 rad - pos: 27.5,-2.5 + pos: 22.5,-0.5 parent: 34 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#0335FCFF' - uid: 9997 components: - type: Transform rot: 1.5707963267948966 rad - pos: 26.5,-2.5 - parent: 34 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9998 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 25.5,-2.5 + pos: 23.5,-1.5 parent: 34 - type: AtmosPipeColor color: '#FF1212FF' @@ -47915,34 +49278,34 @@ entities: components: - type: Transform rot: 1.5707963267948966 rad - pos: 24.5,-2.5 + pos: 39.5,-3.5 parent: 34 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 10000 + color: '#0335FCFF' + - uid: 10001 components: - type: Transform rot: 1.5707963267948966 rad - pos: 23.5,-2.5 + pos: 37.5,-3.5 parent: 34 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#0335FCFF' - uid: 10002 components: - type: Transform - rot: 3.141592653589793 rad - pos: 29.5,-0.5 + rot: 1.5707963267948966 rad + pos: 36.5,-3.5 parent: 34 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#0335FCFF' - uid: 10003 components: - type: Transform - rot: 3.141592653589793 rad - pos: 29.5,-1.5 + rot: 1.5707963267948966 rad + pos: 35.5,-3.5 parent: 34 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#0335FCFF' - uid: 10007 components: - type: Transform @@ -47971,14 +49334,6 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 10017 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 39.5,-2.5 - parent: 34 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 10018 components: - type: Transform @@ -47995,14 +49350,14 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 10021 + - uid: 10022 components: - type: Transform rot: -1.5707963267948966 rad - pos: 43.5,-7.5 + pos: 34.5,-2.5 parent: 34 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#FF1212FF' - uid: 10026 components: - type: Transform @@ -48323,143 +49678,66 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 10154 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 33.5,-40.5 - parent: 34 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 10178 - components: - - type: Transform - pos: 31.5,-24.5 - parent: 34 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 10186 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 23.5,-13.5 - parent: 34 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 10187 + - uid: 10153 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 24.5,-13.5 + pos: 14.5,-33.5 parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 10188 + - uid: 10154 components: - type: Transform rot: -1.5707963267948966 rad - pos: 25.5,-13.5 + pos: 33.5,-40.5 parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 10189 + - uid: 10178 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 26.5,-13.5 + pos: 31.5,-24.5 parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 10190 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 27.5,-13.5 + rot: 1.5707963267948966 rad + pos: 32.5,-18.5 parent: 34 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#0335FCFF' - uid: 10191 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 28.5,-13.5 + pos: 31.5,-17.5 parent: 34 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#0335FCFF' - uid: 10192 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 29.5,-13.5 - parent: 34 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 10193 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 30.5,-13.5 + pos: 44.5,-7.5 parent: 34 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#0335FCFF' - uid: 10194 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 31.5,-13.5 - parent: 34 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 10195 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 32.5,-13.5 - parent: 34 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 10197 - components: - - type: Transform - pos: 33.5,-14.5 - parent: 34 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 10198 - components: - - type: Transform - pos: 33.5,-15.5 - parent: 34 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 10199 - components: - - type: Transform - pos: 33.5,-16.5 - parent: 34 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 10200 - components: - - type: Transform - pos: 33.5,-17.5 - parent: 34 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 10201 - components: - - type: Transform + rot: 1.5707963267948966 rad pos: 33.5,-18.5 parent: 34 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 10202 + color: '#0335FCFF' + - uid: 10195 components: - type: Transform - pos: 33.5,-19.5 + rot: 3.141592653589793 rad + pos: 28.5,0.5 parent: 34 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#0335FCFF' - uid: 10203 components: - type: Transform @@ -48665,6 +49943,34 @@ entities: parent: 34 - type: AtmosPipeColor color: '#03FCD3FF' + - uid: 10491 + components: + - type: Transform + pos: 38.5,-5.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 10494 + components: + - type: Transform + pos: 39.5,-3.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 10504 + components: + - type: Transform + pos: 39.5,-4.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 10505 + components: + - type: Transform + pos: 39.5,-5.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 10575 components: - type: Transform @@ -48673,6 +49979,61 @@ entities: parent: 34 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 10586 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 34.5,-11.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 10588 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 34.5,-10.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 10589 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 34.5,-9.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 10590 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 34.5,-8.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 10592 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 32.5,-7.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 10593 + components: + - type: Transform + pos: 30.5,-6.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 10594 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 33.5,-6.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 10596 components: - type: Transform @@ -48680,11 +50041,43 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 10599 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 31.5,-7.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 10626 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 32.5,-6.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 10681 components: - type: Transform rot: 3.141592653589793 rad - pos: 33.5,-12.5 + pos: 30.5,-5.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 10682 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 30.5,-4.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 10831 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 34.5,-13.5 parent: 34 - type: AtmosPipeColor color: '#FF1212FF' @@ -48728,6 +50121,22 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 10861 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 37.5,-13.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 10893 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 35.5,-12.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 10901 components: - type: Transform @@ -48752,10 +50161,112 @@ entities: - type: AtmosPipeColor color: '#FF1212FF' - uid: 10905 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 36.5,-12.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 10917 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 37.5,-12.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 10918 components: - type: Transform rot: -1.5707963267948966 rad - pos: 23.5,3.5 + pos: 38.5,-12.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 10919 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 39.5,-12.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 10920 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 25.5,-5.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 10921 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,-5.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 10922 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 23.5,-5.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 10923 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-5.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 10973 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,-5.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 10983 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,-8.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 10985 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 23.5,-8.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 10987 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-8.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 11078 + components: + - type: Transform + pos: 21.5,-6.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 11079 + components: + - type: Transform + pos: 21.5,-5.5 parent: 34 - type: AtmosPipeColor color: '#FF1212FF' @@ -48767,6 +50278,13 @@ entities: parent: 34 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 11105 + components: + - type: Transform + pos: 20.5,-7.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 11193 components: - type: Transform @@ -48830,6 +50348,22 @@ entities: parent: 34 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 11290 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 20.5,-10.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 11292 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 19.5,-10.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 11310 components: - type: Transform @@ -48854,6 +50388,22 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 11319 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.5,-10.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 11320 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 17.5,-10.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 11321 components: - type: Transform @@ -48870,6 +50420,94 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 11329 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 19.5,-9.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 11330 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.5,-9.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 11331 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 17.5,-9.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 11332 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 20.5,-7.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 11340 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 19.5,-7.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 11341 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 20.5,-4.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 11342 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.5,-7.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 11343 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 17.5,-7.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 11344 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 19.5,-6.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 11348 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.5,-6.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 11353 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 17.5,-6.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 11354 components: - type: Transform @@ -48938,6 +50576,14 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 11449 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 17.5,-6.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 11461 components: - type: Transform @@ -48999,6 +50645,14 @@ entities: parent: 34 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 11506 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 19.5,-4.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 11507 components: - type: Transform @@ -49044,6 +50698,8 @@ entities: rot: 1.5707963267948966 rad pos: 51.5,-39.5 parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 11536 components: - type: Transform @@ -49091,6 +50747,14 @@ entities: parent: 34 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 11549 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.5,-4.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 11582 components: - type: Transform @@ -49099,6 +50763,14 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 11592 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 17.5,-4.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 11603 components: - type: Transform @@ -49121,6 +50793,30 @@ entities: parent: 34 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 11622 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 19.5,-3.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 11632 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.5,-3.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 11686 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 17.5,-3.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 11708 components: - type: Transform @@ -49204,16 +50900,8 @@ entities: - uid: 11843 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 28.5,-11.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11848 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 29.5,-11.5 + rot: 3.141592653589793 rad + pos: 20.5,-4.5 parent: 34 - type: AtmosPipeColor color: '#0335FCFF' @@ -49378,8 +51066,7 @@ entities: - uid: 11898 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 41.5,-13.5 + pos: 38.5,-6.5 parent: 34 - type: AtmosPipeColor color: '#0335FCFF' @@ -49520,6 +51207,14 @@ entities: parent: 34 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 12111 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 15.5,-28.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 12137 components: - type: Transform @@ -49544,6 +51239,14 @@ entities: parent: 34 - type: AtmosPipeColor color: '#F84000FF' + - uid: 12190 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 33.5,-3.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 12199 components: - type: Transform @@ -49629,6 +51332,21 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 12228 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 30.5,-3.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 12261 + components: + - type: Transform + pos: 44.5,-10.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 12283 components: - type: Transform @@ -49709,6 +51427,13 @@ entities: parent: 34 - type: AtmosPipeColor color: '#03FCD3FF' + - uid: 12383 + components: + - type: Transform + pos: 31.5,-1.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 12386 components: - type: Transform @@ -49717,6 +51442,30 @@ entities: parent: 34 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 12387 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 30.5,-0.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 12391 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 31.5,-2.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 12397 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 31.5,-2.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 12405 components: - type: Transform @@ -49829,6 +51578,30 @@ entities: parent: 34 - type: AtmosPipeColor color: '#03FCD3FF' + - uid: 12702 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 18.5,-14.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 12703 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 18.5,-15.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 12706 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 18.5,-16.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 12708 components: - type: Transform @@ -49837,6 +51610,30 @@ entities: parent: 34 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 12780 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.5,-15.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 12851 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 17.5,-17.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 12853 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.5,-13.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 12858 components: - type: Transform @@ -50001,6 +51798,46 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 12888 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 14.5,-28.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 12912 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 26.5,-13.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 12922 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 26.5,-14.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 12923 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 26.5,-15.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 12924 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 26.5,-16.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 12930 components: - type: Transform @@ -50080,6 +51917,60 @@ entities: parent: 34 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 12955 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 25.5,-17.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 12956 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 24.5,-17.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 12957 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 23.5,-17.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 12958 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 22.5,-17.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 12959 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 24.5,-16.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 12960 + components: + - type: Transform + pos: 25.5,-14.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 12962 + components: + - type: Transform + pos: 25.5,-15.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 12963 components: - type: Transform @@ -50203,30 +52094,90 @@ entities: rot: 1.5707963267948966 rad pos: 52.5,-39.5 parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 13213 components: - type: Transform rot: 1.5707963267948966 rad pos: 53.5,-39.5 parent: 34 -- proto: GasPipeTJunction - entities: - - uid: 106 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 13244 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 12.5,-32.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 13485 components: - type: Transform rot: -1.5707963267948966 rad - pos: -41.5,-38.5 + pos: 37.5,-18.5 parent: 34 - type: AtmosPipeColor - color: '#FF0000FF' - - uid: 606 + color: '#0335FCFF' + - uid: 13488 components: - type: Transform rot: -1.5707963267948966 rad - pos: 44.5,-13.5 + pos: 36.5,-18.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 13489 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 36.5,-16.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 13490 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 37.5,-16.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 13491 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 38.5,-16.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 13493 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 38.5,-17.5 parent: 34 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 13494 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 39.5,-17.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' +- proto: GasPipeTJunction + entities: + - uid: 106 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -41.5,-38.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF0000FF' - uid: 806 components: - type: Transform @@ -50480,14 +52431,6 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 3251 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 31.5,-3.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 3378 components: - type: Transform @@ -50503,6 +52446,14 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 3639 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 35.5,-24.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 3783 components: - type: Transform @@ -50541,6 +52492,29 @@ entities: parent: 34 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 4250 + components: + - type: Transform + pos: 9.5,-33.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 4344 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 15.5,-27.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 4373 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,-32.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 4389 components: - type: Transform @@ -50549,6 +52523,14 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 4425 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 29.5,2.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 4441 components: - type: Transform @@ -50571,6 +52553,29 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 4650 + components: + - type: Transform + pos: 28.5,4.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 4673 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 33.5,-17.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 4687 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 33.5,-16.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 4785 components: - type: Transform @@ -50667,22 +52672,29 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 6690 + - uid: 6701 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 33.5,-13.5 + rot: 3.141592653589793 rad + pos: 34.5,-18.5 parent: 34 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 6701 + color: '#0335FCFF' + - uid: 6712 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 44.5,-7.5 + rot: 1.5707963267948966 rad + pos: 31.5,-3.5 parent: 34 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 6721 + components: + - type: Transform + pos: 38.5,-2.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 6877 components: - type: Transform @@ -50698,14 +52710,22 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 7162 + - uid: 6949 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 33.5,-34.5 + rot: -1.5707963267948966 rad + pos: 34.5,-7.5 parent: 34 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 6976 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 22.5,-1.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 7163 components: - type: Transform @@ -50722,6 +52742,14 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 7188 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 33.5,-13.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 7192 components: - type: Transform @@ -50769,6 +52797,14 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 7675 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 32.5,-3.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 7735 components: - type: Transform @@ -50829,27 +52865,21 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 8159 - components: - - type: Transform - pos: 38.5,-2.5 - parent: 34 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 8160 + - uid: 8161 components: - type: Transform - pos: 39.5,-3.5 + pos: -12.5,-33.5 parent: 34 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 8161 + - uid: 8186 components: - type: Transform - pos: -12.5,-33.5 + rot: 1.5707963267948966 rad + pos: 30.5,-15.5 parent: 34 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#FF1212FF' - uid: 8198 components: - type: Transform @@ -51247,105 +53277,10 @@ entities: parent: 34 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 8815 - components: - - type: Transform - pos: 20.5,-12.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8819 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 20.5,-14.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8825 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 20.5,-16.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8832 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 23.5,-16.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8833 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 23.5,-18.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8835 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 23.5,-14.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8836 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 27.5,-14.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8848 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 23.5,-12.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8849 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 23.5,-6.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8858 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 23.5,-3.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8860 - components: - - type: Transform - pos: 29.5,-3.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8864 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 27.5,-3.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8881 + - uid: 8829 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 27.5,0.5 + pos: 35.5,-18.5 parent: 34 - type: AtmosPipeColor color: '#0335FCFF' @@ -51357,14 +53292,6 @@ entities: parent: 34 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 8911 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 27.5,-11.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 8937 components: - type: Transform @@ -51595,14 +53522,6 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 9317 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 43.5,-34.5 - parent: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 9319 components: - type: Transform @@ -52052,83 +53971,90 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 9934 + - uid: 9930 components: - type: Transform - pos: 17.5,-13.5 + rot: -1.5707963267948966 rad + pos: 17.5,-14.5 parent: 34 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9935 + color: '#0335FCFF' + - uid: 9931 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 17.5,-14.5 + pos: 17.5,-12.5 parent: 34 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9939 + color: '#0335FCFF' + - uid: 9936 components: - type: Transform rot: 1.5707963267948966 rad - pos: 17.5,-17.5 + pos: 25.5,-11.5 parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 9948 + - uid: 9940 components: - type: Transform - rot: 3.141592653589793 rad - pos: 22.5,-17.5 + rot: -1.5707963267948966 rad + pos: 26.5,-5.5 parent: 34 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9959 + color: '#0335FCFF' + - uid: 9950 components: - type: Transform - pos: 26.5,-17.5 + pos: 25.5,-1.5 parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 9960 + - uid: 9951 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 22.5,-9.5 + pos: 26.5,-0.5 parent: 34 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9978 + color: '#0335FCFF' + - uid: 9963 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 22.5,-2.5 + rot: 3.141592653589793 rad + pos: 29.5,-1.5 parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 9979 + - uid: 9969 components: - type: Transform rot: -1.5707963267948966 rad - pos: 22.5,1.5 + pos: 26.5,-10.5 parent: 34 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9986 + color: '#0335FCFF' + - uid: 9974 components: - type: Transform - pos: 33.5,-2.5 + rot: -1.5707963267948966 rad + pos: 25.5,-8.5 parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 10001 + - uid: 9979 components: - type: Transform - rot: 3.141592653589793 rad - pos: 29.5,-2.5 + pos: 39.5,-2.5 parent: 34 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 9988 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 38.5,-4.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 10016 components: - type: Transform @@ -52182,6 +54108,28 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 10193 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 28.5,-0.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 10197 + components: + - type: Transform + pos: 33.5,-2.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 10199 + components: + - type: Transform + pos: 38.5,-3.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 10207 components: - type: Transform @@ -52205,6 +54153,14 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 10334 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 13.5,-28.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 10382 components: - type: Transform @@ -52220,6 +54176,22 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 10717 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 33.5,-8.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 10862 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 36.5,-13.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 10941 components: - type: Transform @@ -52228,6 +54200,38 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 11015 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 21.5,-8.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 11020 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,-7.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 11058 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 20.5,-6.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 11244 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 20.5,-8.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 11249 components: - type: Transform @@ -52235,6 +54239,14 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 11261 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,-9.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 11325 components: - type: Transform @@ -52258,6 +54270,14 @@ entities: parent: 34 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 11848 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 20.5,-5.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 11895 components: - type: Transform @@ -52288,6 +54308,14 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 12169 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 31.5,-14.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 12209 components: - type: Transform @@ -52296,14 +54324,14 @@ entities: parent: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 12261 + - uid: 12281 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 44.5,-10.5 + rot: 1.5707963267948966 rad + pos: 30.5,-2.5 parent: 34 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#FF1212FF' - uid: 12420 components: - type: Transform @@ -52352,6 +54380,22 @@ entities: parent: 34 - type: AtmosPipeColor color: '#03FCD3FF' + - uid: 13483 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 38.5,-18.5 + parent: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 13484 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 39.5,-16.5 + parent: 34 + - type: AtmosPipeColor + color: '#FF1212FF' - proto: GasPort entities: - uid: 938 @@ -52396,16 +54440,6 @@ entities: joinedGrid: 34 - type: AtmosPipeColor color: '#F84000FF' - - uid: 2161 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 24.5,3.5 - parent: 34 - - type: AtmosDevice - joinedGrid: 34 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 2416 components: - type: Transform @@ -52440,6 +54474,16 @@ entities: joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 4539 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 23.5,3.5 + parent: 34 + - type: AtmosDevice + joinedGrid: 34 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 11487 components: - type: Transform @@ -52831,19 +54875,6 @@ entities: joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 2964 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 40.5,-10.5 - parent: 34 - - type: DeviceNetwork - deviceLists: - - 9601 - - type: AtmosDevice - joinedGrid: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 2965 components: - type: Transform @@ -52870,10 +54901,11 @@ entities: joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 3285 + - uid: 3724 components: - type: Transform - pos: 31.5,-2.5 + rot: 1.5707963267948966 rad + pos: 40.5,-34.5 parent: 34 - type: AtmosDevice joinedGrid: 34 @@ -52905,6 +54937,19 @@ entities: joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 4155 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 25.5,4.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 2410 + - type: AtmosDevice + joinedGrid: 34 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 4391 components: - type: Transform @@ -52921,8 +54966,8 @@ entities: - uid: 4449 components: - type: Transform - rot: 3.141592653589793 rad - pos: 13.5,-27.5 + rot: -1.5707963267948966 rad + pos: 17.5,-28.5 parent: 34 - type: DeviceNetwork deviceLists: @@ -52931,6 +54976,19 @@ entities: joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 4672 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 29.5,4.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 2410 + - type: AtmosDevice + joinedGrid: 34 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 4677 components: - type: Transform @@ -52963,6 +55021,18 @@ entities: joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 4849 + components: + - type: Transform + pos: 40.5,-11.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 7684 + - type: AtmosDevice + joinedGrid: 34 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 5137 components: - type: Transform @@ -52986,15 +55056,6 @@ entities: joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 6009 - components: - - type: Transform - pos: 27.5,-10.5 - parent: 34 - - type: AtmosDevice - joinedGrid: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 6015 components: - type: Transform @@ -53021,25 +55082,15 @@ entities: joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 6226 + - uid: 6957 components: - type: Transform rot: 1.5707963267948966 rad - pos: 40.5,-13.5 + pos: 21.5,-0.5 parent: 34 - type: DeviceNetwork deviceLists: - - 9601 - - type: AtmosDevice - joinedGrid: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 7087 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 39.5,-4.5 - parent: 34 + - 2410 - type: AtmosDevice joinedGrid: 34 - type: AtmosPipeColor @@ -53066,25 +55117,27 @@ entities: joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 7191 + - uid: 7665 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 39.5,-34.5 + rot: 1.5707963267948966 rad + pos: 40.5,-27.5 parent: 34 + - type: DeviceNetwork + deviceLists: + - 13430 - type: AtmosDevice joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 7665 + - uid: 7677 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 40.5,-27.5 + pos: 32.5,-2.5 parent: 34 - type: DeviceNetwork deviceLists: - - 13430 + - 2410 - type: AtmosDevice joinedGrid: 34 - type: AtmosPipeColor @@ -53292,6 +55345,19 @@ entities: joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 8685 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 13.5,-34.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 2525 + - type: AtmosDevice + joinedGrid: 34 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 8697 components: - type: Transform @@ -53369,6 +55435,9 @@ entities: - type: Transform pos: 17.5,1.5 parent: 34 + - type: DeviceNetwork + deviceLists: + - 3295 - type: AtmosDevice joinedGrid: 34 - type: AtmosPipeColor @@ -53402,16 +55471,6 @@ entities: joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 8801 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 17.5,-5.5 - parent: 34 - - type: AtmosDevice - joinedGrid: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 8804 components: - type: Transform @@ -53432,105 +55491,6 @@ entities: joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 8824 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 20.5,-20.5 - parent: 34 - - type: AtmosDevice - joinedGrid: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8827 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 19.5,-14.5 - parent: 34 - - type: AtmosDevice - joinedGrid: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8830 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 23.5,-19.5 - parent: 34 - - type: AtmosDevice - joinedGrid: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8831 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 22.5,-18.5 - parent: 34 - - type: AtmosDevice - joinedGrid: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8843 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 28.5,-16.5 - parent: 34 - - type: AtmosDevice - joinedGrid: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8850 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 24.5,-6.5 - parent: 34 - - type: AtmosDevice - joinedGrid: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8868 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 29.5,-6.5 - parent: 34 - - type: AtmosDevice - joinedGrid: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8872 - components: - - type: Transform - pos: 23.5,1.5 - parent: 34 - - type: AtmosDevice - joinedGrid: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8879 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 28.5,3.5 - parent: 34 - - type: AtmosDevice - joinedGrid: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8880 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 28.5,0.5 - parent: 34 - - type: AtmosDevice - joinedGrid: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 8968 components: - type: Transform @@ -53812,6 +55772,9 @@ entities: rot: 1.5707963267948966 rad pos: 0.5,-37.5 parent: 34 + - type: DeviceNetwork + deviceLists: + - 2525 - type: AtmosDevice joinedGrid: 34 - type: AtmosPipeColor @@ -53834,6 +55797,9 @@ entities: - type: Transform pos: 7.5,-36.5 parent: 34 + - type: DeviceNetwork + deviceLists: + - 2525 - type: AtmosDevice joinedGrid: 34 - type: AtmosPipeColor @@ -53851,16 +55817,6 @@ entities: joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 9620 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 9.5,-33.5 - parent: 34 - - type: AtmosDevice - joinedGrid: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 9782 components: - type: Transform @@ -53997,30 +55953,30 @@ entities: joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 11985 + - uid: 11906 components: - type: Transform - pos: -2.5,3.5 + rot: -1.5707963267948966 rad + pos: 16.5,16.5 parent: 34 - type: AtmosDevice joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 12072 + - uid: 11985 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -36.5,-49.5 + pos: -2.5,3.5 parent: 34 - type: AtmosDevice joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 12190 + - uid: 12072 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 32.5,-11.5 + rot: 1.5707963267948966 rad + pos: -36.5,-49.5 parent: 34 - type: AtmosDevice joinedGrid: 34 @@ -54069,15 +56025,119 @@ entities: joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 12381 + - uid: 12457 components: - type: Transform rot: 1.5707963267948966 rad - pos: 40.5,-7.5 + pos: 33.5,-12.5 parent: 34 - type: DeviceNetwork deviceLists: - - 9601 + - 7684 + - type: AtmosDevice + joinedGrid: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 12464 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 33.5,-7.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 7684 + - type: AtmosDevice + joinedGrid: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 12475 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 39.5,-4.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 8028 + - type: AtmosDevice + joinedGrid: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 12476 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 39.5,-7.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 8028 + - type: AtmosDevice + joinedGrid: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 12480 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 16.5,-3.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 13672 + - type: AtmosDevice + joinedGrid: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 12483 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 16.5,-6.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 13672 + - type: AtmosDevice + joinedGrid: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 12485 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 16.5,-9.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 13672 + - type: AtmosDevice + joinedGrid: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 12490 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 25.5,-10.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 7683 + - type: AtmosDevice + joinedGrid: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 12534 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 30.5,-14.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 6342 - type: AtmosDevice joinedGrid: 34 - type: AtmosPipeColor @@ -54135,15 +56195,6 @@ entities: joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 13105 - components: - - type: Transform - pos: 16.5,17.5 - parent: 34 - - type: AtmosDevice - joinedGrid: 34 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 13126 components: - type: Transform @@ -54175,6 +56226,110 @@ entities: - 13432 - type: AtmosDevice joinedGrid: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 13241 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 13.5,-29.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 5208 + - type: AtmosDevice + joinedGrid: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 13245 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,-34.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 2525 + - type: AtmosDevice + joinedGrid: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 13448 + components: + - type: Transform + pos: 21.5,-16.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 13671 + - type: AtmosDevice + joinedGrid: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 13451 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 16.5,-16.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 13671 + - type: AtmosDevice + joinedGrid: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 13452 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 16.5,-14.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 10291 + - type: AtmosDevice + joinedGrid: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 13454 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,-8.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 13672 + - type: AtmosDevice + joinedGrid: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 13496 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 38.5,-19.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 6342 + - type: AtmosDevice + joinedGrid: 34 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 13497 + components: + - type: Transform + pos: 38.5,-16.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 6342 + - type: AtmosDevice + joinedGrid: 34 + - type: AtmosPipeColor + color: '#0335FCFF' - proto: GasVentScrubber entities: - uid: 831 @@ -54273,38 +56428,41 @@ entities: joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 3247 + - uid: 3881 components: - type: Transform - rot: 3.141592653589793 rad - pos: 33.5,-3.5 + rot: 1.5707963267948966 rad + pos: 5.5,-27.5 parent: 34 + - type: DeviceNetwork + deviceLists: + - 5244 - type: AtmosDevice joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 3881 + - uid: 4079 components: - type: Transform rot: 1.5707963267948966 rad - pos: 5.5,-27.5 + pos: 25.5,3.5 parent: 34 - type: DeviceNetwork deviceLists: - - 5244 + - 2410 - type: AtmosDevice joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 4373 + - uid: 4159 components: - type: Transform - rot: 3.141592653589793 rad - pos: 15.5,-27.5 + rot: -1.5707963267948966 rad + pos: 30.5,2.5 parent: 34 - type: DeviceNetwork deviceLists: - - 5208 + - 2410 - type: AtmosDevice joinedGrid: 34 - type: AtmosPipeColor @@ -54378,6 +56536,19 @@ entities: joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 6096 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 38.5,-3.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 8028 + - type: AtmosDevice + joinedGrid: 34 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 6113 components: - type: Transform @@ -54408,16 +56579,6 @@ entities: joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 7085 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 38.5,-3.5 - parent: 34 - - type: AtmosDevice - joinedGrid: 34 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 7185 components: - type: Transform @@ -54513,6 +56674,44 @@ entities: joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 8817 + components: + - type: Transform + pos: 9.5,-31.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 2525 + - type: AtmosDevice + joinedGrid: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 8836 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 31.5,-15.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 6342 + - type: AtmosDevice + joinedGrid: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 8920 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 14.5,-34.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 2525 + - type: AtmosDevice + joinedGrid: 34 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 8936 components: - type: Transform @@ -54717,6 +56916,9 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,-36.5 parent: 34 + - type: DeviceNetwork + deviceLists: + - 2525 - type: AtmosDevice joinedGrid: 34 - type: AtmosPipeColor @@ -54768,12 +56970,28 @@ entities: joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 9620 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 17.5,-27.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 5208 + - type: AtmosDevice + joinedGrid: 34 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 9637 components: - type: Transform rot: 1.5707963267948966 rad pos: 3.5,-32.5 parent: 34 + - type: DeviceNetwork + deviceLists: + - 2525 - type: AtmosDevice joinedGrid: 34 - type: AtmosPipeColor @@ -54781,9 +56999,12 @@ entities: - uid: 9638 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 9.5,-32.5 + rot: 3.141592653589793 rad + pos: 15.5,-29.5 parent: 34 + - type: DeviceNetwork + deviceLists: + - 5208 - type: AtmosDevice joinedGrid: 34 - type: AtmosPipeColor @@ -55046,16 +57267,9 @@ entities: rot: -1.5707963267948966 rad pos: 16.5,1.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9916 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 19.5,-5.5 - parent: 34 + - type: DeviceNetwork + deviceLists: + - 3295 - type: AtmosDevice joinedGrid: 34 - type: AtmosPipeColor @@ -55070,75 +57284,6 @@ entities: joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 9936 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 18.5,-14.5 - parent: 34 - - type: AtmosDevice - joinedGrid: 34 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9943 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 18.5,-20.5 - parent: 34 - - type: AtmosDevice - joinedGrid: 34 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9957 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 28.5,-17.5 - parent: 34 - - type: AtmosDevice - joinedGrid: 34 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9958 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 26.5,-18.5 - parent: 34 - - type: AtmosDevice - joinedGrid: 34 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9968 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 27.5,-9.5 - parent: 34 - - type: AtmosDevice - joinedGrid: 34 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9980 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 21.5,1.5 - parent: 34 - - type: AtmosDevice - joinedGrid: 34 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 10004 - components: - - type: Transform - pos: 29.5,0.5 - parent: 34 - - type: AtmosDevice - joinedGrid: 34 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 10055 components: - type: Transform @@ -55313,6 +57458,82 @@ entities: joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 12141 + components: + - type: Transform + pos: 36.5,-12.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 7684 + - type: AtmosDevice + joinedGrid: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 12168 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 38.5,-13.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 7684 + - type: AtmosDevice + joinedGrid: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 12173 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 34.5,-8.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 7684 + - type: AtmosDevice + joinedGrid: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 12177 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 26.5,-11.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 7683 + - type: AtmosDevice + joinedGrid: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 12186 + components: + - type: Transform + pos: 18.5,-12.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 10291 + - type: AtmosDevice + joinedGrid: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 12187 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 16.5,-10.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 13672 + - type: AtmosDevice + joinedGrid: 34 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 12204 components: - type: Transform @@ -55353,6 +57574,45 @@ entities: joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 12396 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 21.5,-1.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 2410 + - type: AtmosDevice + joinedGrid: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 12401 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 33.5,-3.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 2410 + - type: AtmosDevice + joinedGrid: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 12402 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 16.5,-7.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 13672 + - type: AtmosDevice + joinedGrid: 34 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 12421 components: - type: Transform @@ -55363,11 +57623,28 @@ entities: joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 12546 + - uid: 12431 components: - type: Transform - pos: 33.5,-11.5 + rot: 1.5707963267948966 rad + pos: 16.5,-4.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 13672 + - type: AtmosDevice + joinedGrid: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 12477 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 39.5,-6.5 parent: 34 + - type: DeviceNetwork + deviceLists: + - 8028 - type: AtmosDevice joinedGrid: 34 - type: AtmosPipeColor @@ -55435,6 +57712,70 @@ entities: joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 13449 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 23.5,-16.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 13671 + - type: AtmosDevice + joinedGrid: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 13450 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 16.5,-17.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 13671 + - type: AtmosDevice + joinedGrid: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 13453 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 20.5,-9.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 13672 + - type: AtmosDevice + joinedGrid: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 13498 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 39.5,-18.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 6342 + - type: AtmosDevice + joinedGrid: 34 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 13499 + components: + - type: Transform + pos: 39.5,-15.5 + parent: 34 + - type: DeviceNetwork + deviceLists: + - 6342 + - type: AtmosDevice + joinedGrid: 34 + - type: AtmosPipeColor + color: '#FF1212FF' - proto: GasVolumePump entities: - uid: 1449 @@ -55570,6 +57911,16 @@ entities: - type: Transform pos: 42.5,-26.5 parent: 34 + - uid: 212 + components: + - type: Transform + pos: 20.5,-19.5 + parent: 34 + - uid: 220 + components: + - type: Transform + pos: 20.5,-17.5 + parent: 34 - uid: 233 components: - type: Transform @@ -55895,10 +58246,10 @@ entities: - type: Transform pos: -2.5,-9.5 parent: 34 - - uid: 786 + - uid: 785 components: - type: Transform - pos: 30.5,-15.5 + pos: 28.5,1.5 parent: 34 - uid: 861 components: @@ -55910,15 +58261,15 @@ entities: - type: Transform pos: -11.5,-4.5 parent: 34 - - uid: 923 + - uid: 982 components: - type: Transform - pos: 33.5,-4.5 + pos: -15.5,-3.5 parent: 34 - - uid: 982 + - uid: 988 components: - type: Transform - pos: -15.5,-3.5 + pos: 39.5,-5.5 parent: 34 - uid: 1000 components: @@ -56010,11 +58361,6 @@ entities: - type: Transform pos: -39.5,-45.5 parent: 34 - - uid: 1330 - components: - - type: Transform - pos: 41.5,-6.5 - parent: 34 - uid: 1340 components: - type: Transform @@ -56175,16 +58521,41 @@ entities: - type: Transform pos: -42.5,-32.5 parent: 34 + - uid: 1793 + components: + - type: Transform + pos: 15.5,-10.5 + parent: 34 + - uid: 1804 + components: + - type: Transform + pos: 15.5,-9.5 + parent: 34 - uid: 1821 components: - type: Transform pos: 11.5,8.5 parent: 34 + - uid: 1824 + components: + - type: Transform + pos: 18.5,-15.5 + parent: 34 + - uid: 1825 + components: + - type: Transform + pos: 15.5,-7.5 + parent: 34 - uid: 1827 components: - type: Transform pos: -29.5,4.5 parent: 34 + - uid: 1844 + components: + - type: Transform + pos: 15.5,-6.5 + parent: 34 - uid: 1871 components: - type: Transform @@ -56380,11 +58751,6 @@ entities: - type: Transform pos: -3.5,-30.5 parent: 34 - - uid: 2683 - components: - - type: Transform - pos: 16.5,19.5 - parent: 34 - uid: 2817 components: - type: Transform @@ -56410,11 +58776,6 @@ entities: - type: Transform pos: -1.5,-34.5 parent: 34 - - uid: 2962 - components: - - type: Transform - pos: 20.5,17.5 - parent: 34 - uid: 3196 components: - type: Transform @@ -56450,20 +58811,20 @@ entities: - type: Transform pos: -25.5,-43.5 parent: 34 - - uid: 3282 + - uid: 3247 components: - type: Transform - pos: 7.5,-25.5 + pos: 18.5,-6.5 parent: 34 - - uid: 3341 + - uid: 3251 components: - type: Transform - pos: 21.5,-16.5 + pos: 18.5,-3.5 parent: 34 - - uid: 3342 + - uid: 3282 components: - type: Transform - pos: 21.5,-14.5 + pos: 7.5,-25.5 parent: 34 - uid: 3386 components: @@ -56485,170 +58846,94 @@ entities: - type: Transform pos: 10.5,4.5 parent: 34 - - uid: 3477 - components: - - type: Transform - pos: 21.5,-12.5 - parent: 34 - - uid: 3497 + - uid: 3495 components: - type: Transform - pos: 15.5,-6.5 + pos: 33.5,-20.5 parent: 34 - - uid: 3500 + - uid: 3496 components: - type: Transform - pos: 15.5,-5.5 + pos: 35.5,-20.5 parent: 34 - uid: 3501 components: - type: Transform - pos: 21.5,-7.5 - parent: 34 - - uid: 3502 - components: - - type: Transform - pos: 15.5,-4.5 + rot: -1.5707963267948966 rad + pos: 33.5,-10.5 parent: 34 - - uid: 3503 + - uid: 3511 components: - type: Transform - pos: 18.5,-10.5 + pos: 22.5,-4.5 parent: 34 - uid: 3515 components: - type: Transform - pos: 21.5,-4.5 + pos: 16.5,-15.5 parent: 34 - uid: 3516 components: - type: Transform - pos: 21.5,-5.5 + pos: 15.5,-4.5 parent: 34 - uid: 3517 components: - type: Transform - pos: 21.5,-6.5 - parent: 34 - - uid: 3532 - components: - - type: Transform - pos: 28.5,-15.5 + pos: 15.5,-3.5 parent: 34 - uid: 3533 components: - type: Transform - pos: 29.5,-15.5 - parent: 34 - - uid: 3539 - components: - - type: Transform - pos: 26.5,-9.5 - parent: 34 - - uid: 3540 - components: - - type: Transform - pos: 26.5,-10.5 - parent: 34 - - uid: 3553 - components: - - type: Transform - pos: 27.5,-12.5 + pos: 37.5,-5.5 parent: 34 - uid: 3554 components: - type: Transform pos: 26.5,-35.5 parent: 34 - - uid: 3556 - components: - - type: Transform - pos: 29.5,-12.5 - parent: 34 - - uid: 3559 - components: - - type: Transform - pos: 21.5,-18.5 - parent: 34 - - uid: 3563 - components: - - type: Transform - pos: 25.5,-7.5 - parent: 34 - - uid: 3565 - components: - - type: Transform - pos: 29.5,-4.5 - parent: 34 - - uid: 3567 - components: - - type: Transform - pos: 27.5,-4.5 - parent: 34 - - uid: 3569 - components: - - type: Transform - pos: 25.5,-6.5 - parent: 34 - - uid: 3571 + - uid: 3573 components: - type: Transform - pos: 26.5,-4.5 + rot: 1.5707963267948966 rad + pos: 32.5,-12.5 parent: 34 - uid: 3574 components: - type: Transform - pos: 25.5,-5.5 - parent: 34 - - uid: 3576 - components: - - type: Transform - pos: 25.5,-1.5 - parent: 34 - - uid: 3613 - components: - - type: Transform - pos: 30.5,-12.5 - parent: 34 - - uid: 3642 - components: - - type: Transform - pos: 26.5,-1.5 + rot: 1.5707963267948966 rad + pos: 32.5,-13.5 parent: 34 - - uid: 3643 + - uid: 3584 components: - type: Transform - pos: 29.5,-1.5 + pos: 36.5,-2.5 parent: 34 - - uid: 3644 + - uid: 3607 components: - type: Transform - pos: 28.5,-1.5 + pos: 36.5,-4.5 parent: 34 - uid: 3682 components: - type: Transform pos: 10.5,-49.5 parent: 34 - - uid: 3688 - components: - - type: Transform - pos: 26.5,2.5 - parent: 34 - - uid: 3689 + - uid: 3714 components: - type: Transform - pos: 29.5,2.5 + pos: 30.5,1.5 parent: 34 - - uid: 3690 + - uid: 3756 components: - type: Transform - pos: 28.5,2.5 + rot: -1.5707963267948966 rad + pos: 35.5,-10.5 parent: 34 - - uid: 3694 + - uid: 3758 components: - type: Transform - pos: 24.5,1.5 + pos: 22.5,-9.5 parent: 34 - uid: 3765 components: @@ -56830,6 +59115,12 @@ entities: - type: Transform pos: -24.5,-43.5 parent: 34 + - uid: 4167 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 33.5,-15.5 + parent: 34 - uid: 4174 components: - type: Transform @@ -56870,20 +59161,20 @@ entities: - type: Transform pos: 7.5,4.5 parent: 34 - - uid: 4189 + - uid: 4190 components: - type: Transform - pos: 15.5,-1.5 + pos: 15.5,0.5 parent: 34 - - uid: 4190 + - uid: 4202 components: - type: Transform - pos: 15.5,0.5 + pos: 19.5,-14.5 parent: 34 - - uid: 4191 + - uid: 4253 components: - type: Transform - pos: 15.5,1.5 + pos: 19.5,-12.5 parent: 34 - uid: 4296 components: @@ -56950,15 +59241,20 @@ entities: - type: Transform pos: 20.5,-44.5 parent: 34 - - uid: 4504 + - uid: 4502 components: - type: Transform - pos: 37.5,-4.5 + pos: 15.5,-14.5 parent: 34 - - uid: 4505 + - uid: 4510 components: - type: Transform - pos: 37.5,-2.5 + pos: 15.5,-12.5 + parent: 34 + - uid: 4513 + components: + - type: Transform + pos: 18.5,-9.5 parent: 34 - uid: 4519 components: @@ -57025,11 +59321,33 @@ entities: - type: Transform pos: 51.5,0.5 parent: 34 + - uid: 4863 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 32.5,-14.5 + parent: 34 - uid: 4893 components: - type: Transform pos: -14.5,-38.5 parent: 34 + - uid: 4906 + components: + - type: Transform + pos: 24.5,-6.5 + parent: 34 + - uid: 4910 + components: + - type: Transform + pos: 26.5,-6.5 + parent: 34 + - uid: 4936 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 35.5,-15.5 + parent: 34 - uid: 4937 components: - type: Transform @@ -58265,11 +60583,6 @@ entities: - type: Transform pos: 27.5,17.5 parent: 34 - - uid: 6533 - components: - - type: Transform - pos: 20.5,18.5 - parent: 34 - uid: 6536 components: - type: Transform @@ -58280,6 +60593,16 @@ entities: - type: Transform pos: 32.5,-46.5 parent: 34 + - uid: 6568 + components: + - type: Transform + pos: 24.5,-15.5 + parent: 34 + - uid: 6678 + components: + - type: Transform + pos: 26.5,-15.5 + parent: 34 - uid: 6688 components: - type: Transform @@ -58295,6 +60618,17 @@ entities: - type: Transform pos: 51.5,-3.5 parent: 34 + - uid: 6934 + components: + - type: Transform + pos: 40.5,-17.5 + parent: 34 + - uid: 6952 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.5,17.5 + parent: 34 - uid: 7235 components: - type: Transform @@ -58365,11 +60699,6 @@ entities: - type: Transform pos: 45.5,-17.5 parent: 34 - - uid: 8913 - components: - - type: Transform - pos: 41.5,-12.5 - parent: 34 - uid: 8914 components: - type: Transform @@ -58395,10 +60724,15 @@ entities: - type: Transform pos: -44.5,-11.5 parent: 34 - - uid: 9985 + - uid: 9912 components: - type: Transform - pos: 31.5,-4.5 + pos: 39.5,-17.5 + parent: 34 + - uid: 10021 + components: + - type: Transform + pos: 38.5,-17.5 parent: 34 - uid: 10458 components: @@ -58415,11 +60749,6 @@ entities: - type: Transform pos: 40.5,-2.5 parent: 34 - - uid: 10589 - components: - - type: Transform - pos: 16.5,-12.5 - parent: 34 - uid: 10608 components: - type: Transform @@ -58488,7 +60817,8 @@ entities: - uid: 11208 components: - type: Transform - pos: 18.5,19.5 + rot: -1.5707963267948966 rad + pos: 17.5,17.5 parent: 34 - uid: 11441 components: @@ -58500,11 +60830,6 @@ entities: - type: Transform pos: -58.5,-18.5 parent: 34 - - uid: 11549 - components: - - type: Transform - pos: 41.5,-9.5 - parent: 34 - uid: 11550 components: - type: Transform @@ -58565,11 +60890,6 @@ entities: - type: Transform pos: 15.5,18.5 parent: 34 - - uid: 11804 - components: - - type: Transform - pos: 15.5,17.5 - parent: 34 - uid: 11815 components: - type: Transform @@ -58885,30 +61205,57 @@ entities: - type: Transform pos: 46.5,-15.5 parent: 34 - - uid: 13076 + - uid: 13078 + components: + - type: Transform + pos: 20.5,16.5 + parent: 34 + - uid: 13079 + components: + - type: Transform + pos: 20.5,15.5 + parent: 34 + - uid: 13080 + components: + - type: Transform + pos: 20.5,14.5 + parent: 34 + - uid: 13086 + components: + - type: Transform + pos: 17.5,20.5 + parent: 34 + - uid: 13093 components: - type: Transform pos: 19.5,19.5 parent: 34 - - uid: 13077 + - uid: 13095 components: - type: Transform - pos: 17.5,19.5 + rot: -1.5707963267948966 rad + pos: 19.5,17.5 parent: 34 - - uid: 13078 + - uid: 13098 components: - type: Transform - pos: 20.5,16.5 + rot: -1.5707963267948966 rad + pos: 16.5,17.5 parent: 34 - - uid: 13079 + - uid: 13111 components: - type: Transform - pos: 20.5,15.5 + pos: 21.5,19.5 parent: 34 - - uid: 13080 + - uid: 13136 components: - type: Transform - pos: 20.5,14.5 + pos: 22.5,18.5 + parent: 34 + - uid: 13149 + components: + - type: Transform + pos: 16.5,20.5 parent: 34 - uid: 13320 components: @@ -59185,6 +61532,11 @@ entities: - type: Transform pos: 39.5,-51.5 parent: 34 + - uid: 13556 + components: + - type: Transform + pos: 42.5,7.5 + parent: 34 - proto: GrilleBroken entities: - uid: 6299 @@ -59262,12 +61614,100 @@ entities: rot: 3.141592653589793 rad pos: -63.5,-9.5 parent: 34 +- proto: GunSafe + entities: + - uid: 4574 + components: + - type: Transform + pos: 31.5,5.5 + parent: 34 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14673 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - type: ContainerContainer + containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 4576 + - 4577 + paper_label: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + - uid: 7686 + components: + - type: MetaData + name: m-90 safe + - type: Transform + pos: 31.5,-10.5 + parent: 34 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.1462 + moles: + - 1.606311 + - 6.042789 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - type: ContainerContainer + containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 7687 + - 7688 + paper_label: !type:ContainerSlot + showEnts: False + occludes: True + ent: null +- proto: GunSafeLaserCarbine + entities: + - uid: 4920 + components: + - type: Transform + pos: 30.5,-10.5 + parent: 34 - proto: GunSafePistolMk58 entities: - - uid: 3710 + - uid: 4926 components: - type: Transform - pos: 29.5,1.5 + pos: 35.5,-6.5 + parent: 34 +- proto: GunSafeSubMachineGunDrozd + entities: + - uid: 4921 + components: + - type: Transform + pos: 29.5,-10.5 parent: 34 - proto: HandheldGPSBasic entities: @@ -59293,13 +61733,6 @@ entities: - type: Transform pos: -14.5,-15.5 parent: 34 -- proto: HeadSkeleton - entities: - - uid: 4660 - components: - - type: Transform - pos: 40.995945,-16.198792 - parent: 34 - proto: HeatExchanger entities: - uid: 677 @@ -59340,15 +61773,6 @@ entities: joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' -- proto: HighSecArmoryLocked - entities: - - uid: 3702 - components: - - type: MetaData - name: armory - level II - - type: Transform - pos: 27.5,2.5 - parent: 34 - proto: HighSecCommandLocked entities: - uid: 1073 @@ -59356,11 +61780,6 @@ entities: - type: Transform pos: -28.5,-37.5 parent: 34 - - uid: 5532 - components: - - type: Transform - pos: 36.5,-34.5 - parent: 34 - uid: 5533 components: - type: Transform @@ -59383,18 +61802,6 @@ entities: - type: Transform pos: -28.701187,-29.847109 parent: 34 -- proto: HoloprojectorSecurity - entities: - - uid: 3584 - components: - - type: Transform - pos: 24.346996,-19.636211 - parent: 34 - - uid: 3585 - components: - - type: Transform - pos: 24.388662,-19.354765 - parent: 34 - proto: HospitalCurtains entities: - uid: 6076 @@ -59454,12 +61861,6 @@ entities: - type: Transform pos: -5.5,2.5 parent: 34 - - uid: 9982 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 32.5,-9.5 - parent: 34 - proto: HydroponicsToolClippers entities: - uid: 4711 @@ -59591,11 +61992,6 @@ entities: rot: -1.5707963267948966 rad pos: 12.5,-32.5 parent: 34 - - uid: 12114 - components: - - type: Transform - pos: 29.5,-8.5 - parent: 34 - uid: 13230 components: - type: Transform @@ -59716,27 +62112,10 @@ entities: parent: 34 - proto: IntercomSecurity entities: - - uid: 12113 - components: - - type: Transform - pos: 20.5,-8.5 - parent: 34 - - uid: 12115 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 26.5,-8.5 - parent: 34 - - uid: 12116 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 34.5,-1.5 - parent: 34 - - uid: 12141 + - uid: 7023 components: - type: Transform - pos: 17.5,-15.5 + pos: 17.5,-11.5 parent: 34 - uid: 12178 components: @@ -59852,15 +62231,16 @@ entities: - type: DeviceLinkSink links: - 10413 - - uid: 12927 + - uid: 13679 components: - type: Transform rot: -1.5707963267948966 rad pos: 14.5,-15.5 parent: 34 - type: DeviceLinkSink + invokeCounter: 3 links: - - 10011 + - 13678 - proto: JetpackMini entities: - uid: 2485 @@ -59873,32 +62253,13 @@ entities: - type: Transform pos: -28.659822,-41.319386 parent: 34 -- proto: JetpackSecurityFilled - entities: - - uid: 904 - components: - - type: Transform - pos: 26.298405,1.8209641 - parent: 34 - - uid: 3593 - components: - - type: Transform - pos: 26.68382,1.6541817 - parent: 34 - - uid: 3714 - components: - - type: Transform - pos: 26.34007,1.4978237 - parent: 34 - proto: Katana entities: - - uid: 12177 + - uid: 2491 components: - - type: MetaData - desc: 'You can almost hear the shout in the distance: "SHOUBU ARI!"' - type: Transform - rot: 3.141592653589793 rad - pos: 26.516588,-0.45976734 + rot: 1.5707963267948966 rad + pos: 32.564697,-9.447044 parent: 34 - proto: KitchenDeepFryer entities: @@ -59944,10 +62305,10 @@ entities: - type: Transform pos: 41.5,6.5 parent: 34 - - uid: 10537 + - uid: 13456 components: - type: Transform - pos: 19.5,-16.5 + pos: 21.5,-16.5 parent: 34 - proto: KitchenReagentGrinder entities: @@ -59990,11 +62351,6 @@ entities: - type: Transform pos: -45.557014,-4.0842085 parent: 34 - - uid: 4886 - components: - - type: Transform - pos: 29.473913,-17.902529 - parent: 34 - proto: LampBanana entities: - uid: 11135 @@ -60002,6 +62358,20 @@ entities: - type: Transform pos: -0.45901644,-17.103552 parent: 34 +- proto: LampGold + entities: + - uid: 13500 + components: + - type: Transform + pos: 35.432034,-12.864113 + parent: 34 +- proto: LampInterrogator + entities: + - uid: 7614 + components: + - type: Transform + pos: 39.508366,-19.129358 + parent: 34 - proto: LargeBeaker entities: - uid: 1280 @@ -60057,12 +62427,12 @@ entities: - type: Transform pos: -18.5,-8.5 parent: 34 -- proto: LockerBrigmedicFilledHardsuit +- proto: LockerBrigmedicFilled entities: - - uid: 4044 + - uid: 7685 components: - type: Transform - pos: 19.5,1.5 + pos: 17.5,1.5 parent: 34 - proto: LockerCaptainFilledNoLaser entities: @@ -60113,6 +62483,11 @@ entities: - type: Transform pos: -24.5,-27.5 parent: 34 + - uid: 7611 + components: + - type: Transform + pos: 31.5,-20.5 + parent: 34 - uid: 13427 components: - type: Transform @@ -60149,25 +62524,25 @@ entities: parent: 34 - proto: LockerEvidence entities: - - uid: 3749 + - uid: 3620 components: - type: Transform - pos: 24.5,-5.5 + pos: 19.5,-9.5 parent: 34 - - uid: 3751 + - uid: 3706 components: - type: Transform - pos: 24.5,-7.5 + pos: 19.5,-6.5 parent: 34 - - uid: 3752 + - uid: 3722 components: - type: Transform - pos: 24.5,-4.5 + pos: 19.5,-3.5 parent: 34 - - uid: 10591 + - uid: 4955 components: - type: Transform - pos: 24.5,-6.5 + pos: 39.5,-7.5 parent: 34 - proto: LockerForensicMantisFilled entities: @@ -60222,12 +62597,12 @@ entities: - type: Transform pos: -17.5,-16.5 parent: 34 -- proto: LockerHeadOfSecurityFilledHardsuit +- proto: LockerHeadOfSecurityFilled entities: - - uid: 10917 + - uid: 4639 components: - type: Transform - pos: 33.5,-11.5 + pos: 25.5,3.5 parent: 34 - proto: LockerMedicalFilled entities: @@ -60327,41 +62702,55 @@ entities: parent: 34 - proto: LockerSecurityFilled entities: - - uid: 3507 + - uid: 3640 components: - type: Transform - pos: 16.5,-16.5 + pos: 23.5,-20.5 parent: 34 - - uid: 3508 + - uid: 4869 components: - type: Transform - pos: 16.5,-17.5 + pos: 24.5,-20.5 parent: 34 - - uid: 3509 + - uid: 6681 components: - type: Transform - pos: 16.5,-18.5 + pos: 25.5,-20.5 parent: 34 - - uid: 3510 + - uid: 6702 components: - type: Transform - pos: 16.5,-19.5 + pos: 22.5,-20.5 + parent: 34 +- proto: LockerWallMedicalDoctorFilled + entities: + - uid: 13677 + components: + - type: Transform + pos: 10.5,-35.5 parent: 34 - proto: LockerWallMedicalFilled entities: - - uid: 6957 + - uid: 3342 components: - type: Transform rot: -1.5707963267948966 rad - pos: 20.5,-0.5 + pos: 20.5,0.5 parent: 34 -- proto: LockerWardenFilledHardsuit +- proto: LockerWarden entities: - - uid: 4563 + - uid: 7191 components: - type: Transform pos: 29.5,-6.5 parent: 34 +- proto: LockerWardenFilled + entities: + - uid: 3394 + components: + - type: Transform + pos: 40.5,-13.5 + parent: 34 - proto: LockerWeldingSuppliesFilled entities: - uid: 8078 @@ -60440,66 +62829,44 @@ entities: - type: Transform pos: 44.5,-43.5 parent: 34 -- proto: MagazineBoxPistol - entities: - - uid: 3719 - components: - - type: Transform - pos: 30.423405,1.6646061 - parent: 34 -- proto: MagazineBoxPistolPractice - entities: - - uid: 3726 - components: - - type: Transform - pos: 25.694237,1.4144318 - parent: 34 -- proto: MagazineBoxPistolRubber +- proto: MailTeleporter entities: - - uid: 3725 + - uid: 1901 components: - type: Transform - pos: 30.662987,1.476975 + pos: -7.5,-27.5 parent: 34 -- proto: MagazineBoxRifleBig +- proto: MaintenanceFluffSpawner entities: - - uid: 11330 + - uid: 3543 components: - type: Transform - pos: 27.333197,4.0074997 + pos: 52.5,-28.5 parent: 34 -- proto: MagazineBoxRifleBigRubber - entities: - - uid: 3716 + - uid: 3550 components: - type: Transform - pos: 27.531113,3.6947823 + pos: 49.5,-43.5 parent: 34 -- proto: MagazineBoxRiflePractice - entities: - - uid: 3594 + - uid: 3561 components: - type: Transform - pos: 25.298405,1.466552 + pos: -47.5,-51.5 parent: 34 -- proto: MailTeleporter - entities: - - uid: 1901 + - uid: 4197 components: - type: Transform - pos: -7.5,-27.5 + pos: -18.5,-30.5 parent: 34 -- proto: MaintenanceFluffSpawner - entities: - - uid: 4197 + - uid: 4659 components: - type: Transform - pos: -18.5,-30.5 + pos: -6.5,-50.5 parent: 34 - - uid: 4869 + - uid: 4886 components: - type: Transform - pos: 37.5,-11.5 + pos: -47.5,7.5 parent: 34 - uid: 6126 components: @@ -60606,6 +62973,36 @@ entities: - type: Transform pos: -55.5,-17.5 parent: 34 + - uid: 13505 + components: + - type: Transform + pos: 22.5,14.5 + parent: 34 + - uid: 13506 + components: + - type: Transform + pos: 30.5,10.5 + parent: 34 + - uid: 13507 + components: + - type: Transform + pos: 50.5,-6.5 + parent: 34 + - uid: 13508 + components: + - type: Transform + pos: -13.5,6.5 + parent: 34 + - uid: 13509 + components: + - type: Transform + pos: -35.5,7.5 + parent: 34 + - uid: 13510 + components: + - type: Transform + pos: -58.5,2.5 + parent: 34 - proto: MaintenancePlantSpawner entities: - uid: 4564 @@ -60613,11 +63010,6 @@ entities: - type: Transform pos: -20.5,-37.5 parent: 34 - - uid: 5352 - components: - - type: Transform - pos: 35.5,-9.5 - parent: 34 - uid: 8930 components: - type: Transform @@ -60650,11 +63042,6 @@ entities: - type: Transform pos: -14.5,-29.5 parent: 34 - - uid: 4514 - components: - - type: Transform - pos: 37.5,-15.5 - parent: 34 - uid: 4651 components: - type: Transform @@ -60714,11 +63101,6 @@ entities: - type: Transform pos: 14.5,-44.5 parent: 34 - - uid: 4173 - components: - - type: Transform - pos: 35.5,-12.5 - parent: 34 - uid: 4762 components: - type: Transform @@ -60764,6 +63146,41 @@ entities: - type: Transform pos: -41.5,-21.5 parent: 34 + - uid: 13511 + components: + - type: Transform + pos: 54.5,-1.5 + parent: 34 + - uid: 13512 + components: + - type: Transform + pos: 62.5,-17.5 + parent: 34 + - uid: 13519 + components: + - type: Transform + pos: 43.5,-47.5 + parent: 34 + - uid: 13521 + components: + - type: Transform + pos: -56.5,10.5 + parent: 34 + - uid: 13523 + components: + - type: Transform + pos: -10.5,13.5 + parent: 34 + - uid: 13525 + components: + - type: Transform + pos: -61.5,-7.5 + parent: 34 + - uid: 13526 + components: + - type: Transform + pos: -54.5,-45.5 + parent: 34 - proto: MaterialBiomass entities: - uid: 12284 @@ -60851,15 +63268,10 @@ entities: - type: Transform pos: 7.5,-34.5 parent: 34 - - uid: 3295 - components: - - type: Transform - pos: 17.5,1.5 - parent: 34 - - uid: 6092 + - uid: 9980 components: - type: Transform - pos: 16.5,1.5 + pos: 18.5,-1.5 parent: 34 - proto: MedicalScanner entities: @@ -60885,11 +63297,6 @@ entities: parent: 34 - proto: MedkitAdvancedFilled entities: - - uid: 3599 - components: - - type: Transform - pos: 19.332401,-20.266586 - parent: 34 - uid: 4661 components: - type: Transform @@ -60902,11 +63309,6 @@ entities: - type: Transform pos: 2.6381276,-34.34066 parent: 34 - - uid: 5008 - components: - - type: Transform - pos: 18.284376,1.6808949 - parent: 34 - proto: MedkitCombatFilled entities: - uid: 3903 @@ -60914,10 +63316,10 @@ entities: - type: Transform pos: 15.521005,-32.23504 parent: 34 - - uid: 5543 + - uid: 10015 components: - type: Transform - pos: 18.737501,1.3371449 + pos: 19.42368,1.7345049 parent: 34 - uid: 13051 components: @@ -60987,6 +63389,11 @@ entities: - type: Transform pos: 7.7162523,-35.278812 parent: 34 + - uid: 8686 + components: + - type: Transform + pos: 19.61118,1.5157549 + parent: 34 - proto: MetempsychoticMachine entities: - uid: 4263 @@ -60997,6 +63404,13 @@ entities: - type: DeviceLinkSink links: - 12440 +- proto: MicrophoneInstrument + entities: + - uid: 4684 + components: + - type: Transform + pos: 41.413292,-15.544035 + parent: 34 - proto: MicrowaveMachineCircuitboard entities: - uid: 6184 @@ -61004,6 +63418,23 @@ entities: - type: Transform pos: -31.364555,-29.564827 parent: 34 +- proto: MiningWindow + entities: + - uid: 8830 + components: + - type: Transform + pos: 38.5,-17.5 + parent: 34 + - uid: 9913 + components: + - type: Transform + pos: 39.5,-17.5 + parent: 34 + - uid: 9914 + components: + - type: Transform + pos: 40.5,-17.5 + parent: 34 - proto: Mirror entities: - uid: 2215 @@ -61048,8 +63479,20 @@ entities: - type: Transform pos: 4.6722717,-20.514727 parent: 34 +- proto: MopBucketFull + entities: + - uid: 3506 + components: + - type: Transform + pos: 40.548508,-9.356406 + parent: 34 - proto: MopItem entities: + - uid: 3524 + components: + - type: Transform + pos: 40.59017,-9.408489 + parent: 34 - uid: 7411 components: - type: Transform @@ -61103,11 +63546,6 @@ entities: - type: TimedSpawner intervalSeconds: 520 chance: 0.4 - - uid: 12196 - components: - - type: Transform - pos: 32.5,-17.5 - parent: 34 - proto: Mousetrap entities: - uid: 3729 @@ -61126,13 +63564,6 @@ entities: - type: Transform pos: -14.619152,-5.5521803 parent: 34 -- proto: MousetrapArmed - entities: - - uid: 10723 - components: - - type: Transform - pos: 39.559204,-16.464417 - parent: 34 - proto: Multitool entities: - uid: 7423 @@ -61145,6 +63576,23 @@ entities: - type: Transform pos: 6.5360775,-42.030327 parent: 34 + - uid: 13101 + components: + - type: Transform + pos: 11.840524,16.326675 + parent: 34 +- proto: MysteryFigureBox + entities: + - uid: 9990 + components: + - type: Transform + pos: 48.301098,-0.22915459 + parent: 34 + - uid: 9998 + components: + - type: Transform + pos: 48.686516,-0.4166547 + parent: 34 - proto: NitrogenCanister entities: - uid: 1797 @@ -61182,6 +63630,13 @@ entities: - type: Transform pos: -12.5,-10.5 parent: 34 +- proto: NTFlag + entities: + - uid: 7621 + components: + - type: Transform + pos: 27.5,1.5 + parent: 34 - proto: NuclearBomb entities: - uid: 11678 @@ -61383,41 +63838,6 @@ entities: - type: Transform pos: -5.6864357,4.6488633 parent: 34 - - uid: 3631 - components: - - type: Transform - pos: 19.32178,-3.4320881 - parent: 34 - - uid: 3632 - components: - - type: Transform - pos: 19.44678,-3.5050554 - parent: 34 - - uid: 3633 - components: - - type: Transform - pos: 19.60303,-3.4529357 - parent: 34 - - uid: 3768 - components: - - type: Transform - pos: 29.520655,-10.540871 - parent: 34 - - uid: 3769 - components: - - type: Transform - pos: 29.62482,-10.488752 - parent: 34 - - uid: 3770 - components: - - type: Transform - pos: 27.53107,-6.433852 - parent: 34 - - uid: 3771 - components: - - type: Transform - pos: 27.62482,-6.5276675 - parent: 34 - uid: 4598 components: - type: Transform @@ -61448,26 +63868,6 @@ entities: - type: Transform pos: 41.321945,-0.2078824 parent: 34 - - uid: 4919 - components: - - type: Transform - pos: 22.311316,-12.096777 - parent: 34 - - uid: 4920 - components: - - type: Transform - pos: 22.311316,-12.206228 - parent: 34 - - uid: 4921 - components: - - type: Transform - pos: 22.311316,-12.315678 - parent: 34 - - uid: 4922 - components: - - type: Transform - pos: 22.311316,-12.425129 - parent: 34 - uid: 5800 components: - type: Transform @@ -61595,6 +63995,21 @@ entities: - type: Transform pos: 44.501106,-35.079414 parent: 34 +- proto: PaperBin20 + entities: + - uid: 9966 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 35.5,-12.5 + parent: 34 +- proto: PaperBin5 + entities: + - uid: 3717 + components: + - type: Transform + pos: 30.5,3.5 + parent: 34 - proto: PaperDoor entities: - uid: 131 @@ -61657,12 +64072,12 @@ entities: rot: -1.5707963267948966 rad pos: -9.5,-17.5 parent: 34 -- proto: PillTricordrazine +- proto: PinpointerNuclear entities: - - uid: 6568 + - uid: 3617 components: - type: Transform - pos: 19.251152,-20.558546 + pos: 37.5,-34.5 parent: 34 - proto: PlasmaCanister entities: @@ -61725,6 +64140,15 @@ entities: - type: Transform pos: -57.521152,-9.3701515 parent: 34 +- proto: PlushieHampter + entities: + - uid: 3594 + components: + - type: Transform + parent: 3564 + - type: Physics + canCollide: False + - type: InsideEntityStorage - proto: PlushieLizard entities: - uid: 11626 @@ -61732,6 +64156,22 @@ entities: - type: Transform pos: -40.514656,-16.672596 parent: 34 + - uid: 13455 + components: + - type: MetaData + desc: Knows exactly what you did. + name: Officer Hank + - type: Transform + pos: 38.4511,-19.464378 + parent: 34 + - uid: 13545 + components: + - type: MetaData + desc: Was accused of jaywalking, tresspassing, and maybe just a little murder. + name: Johnathan + - type: Transform + pos: 40.54183,-19.367329 + parent: 34 - proto: PlushieMothRandom entities: - uid: 12153 @@ -61744,6 +64184,16 @@ entities: - type: Transform pos: -58.541985,-11.340271 parent: 34 +- proto: PlushieNuke + entities: + - uid: 13553 + components: + - type: MetaData + desc: He's just Dave. The blinking and breathing is normal. + name: Dave + - type: Transform + pos: 39.500164,-15.513161 + parent: 34 - proto: PlushieRGBee entities: - uid: 11168 @@ -61816,6 +64266,14 @@ entities: parent: 34 - proto: PlushieSpaceLizard entities: + - uid: 4870 + components: + - type: MetaData + desc: The reason why. + name: Timothy + - type: Transform + pos: 42.54297,9.507223 + parent: 34 - uid: 11192 components: - type: MetaData @@ -61836,20 +64294,6 @@ entities: - type: Transform pos: -57.49212,-15.477257 parent: 34 -- proto: PortableFlasher - entities: - - uid: 5545 - components: - - type: Transform - pos: 27.5,4.5 - parent: 34 -- proto: PortableGeneratorJrPacman - entities: - - uid: 4577 - components: - - type: Transform - pos: 35.5,-18.5 - parent: 34 - proto: PortableGeneratorPacman entities: - uid: 4396 @@ -61886,15 +64330,15 @@ entities: - type: Transform pos: -37.5,-31.5 parent: 34 - - uid: 5546 + - uid: 3739 components: - type: Transform - pos: 10.5,-18.5 + pos: 23.5,3.5 parent: 34 - - uid: 8114 + - uid: 5546 components: - type: Transform - pos: 24.5,3.5 + pos: 10.5,-18.5 parent: 34 - proto: PosterBroken entities: @@ -61918,14 +64362,6 @@ entities: - type: Transform pos: -48.5,-6.5 parent: 34 -- proto: PosterContrabandDonutCorp - entities: - - uid: 11592 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 31.5,-12.5 - parent: 34 - proto: PosterContrabandEAT entities: - uid: 905 @@ -61935,6 +64371,13 @@ entities: - type: Transform pos: -13.5,-10.5 parent: 34 +- proto: PosterContrabandFunPolice + entities: + - uid: 13495 + components: + - type: Transform + pos: 28.5,-17.5 + parent: 34 - proto: PosterContrabandHaveaPuff entities: - uid: 4772 @@ -61942,6 +64385,13 @@ entities: - type: Transform pos: 35.5,4.5 parent: 34 +- proto: PosterContrabandNuclearDeviceInformational + entities: + - uid: 3701 + components: + - type: Transform + pos: 36.5,-34.5 + parent: 34 - proto: PosterContrabandPunchShit entities: - uid: 11937 @@ -61965,10 +64415,10 @@ entities: parent: 34 - proto: PosterLegit12Gauge entities: - - uid: 12213 + - uid: 1373 components: - type: Transform - pos: 30.5,2.5 + pos: 16.5,-11.5 parent: 34 - proto: PosterLegitBarDrinks entities: @@ -61990,6 +64440,20 @@ entities: - type: Transform pos: -39.5,-34.5 parent: 34 +- proto: PosterLegitDoNotQuestion + entities: + - uid: 3518 + components: + - type: Transform + pos: 18.5,-11.5 + parent: 34 +- proto: PosterLegitFuckAround + entities: + - uid: 160 + components: + - type: Transform + pos: 32.5,4.5 + parent: 34 - proto: PosterLegitHelpOthers entities: - uid: 2709 @@ -62004,11 +64468,6 @@ entities: - type: Transform pos: -28.5,0.5 parent: 34 - - uid: 11079 - components: - - type: Transform - pos: 17.5,-11.5 - parent: 34 - proto: PosterLegitMedicate entities: - uid: 1946 @@ -62016,6 +64475,11 @@ entities: - type: Transform pos: 3.5,-25.5 parent: 34 + - uid: 5543 + components: + - type: Transform + pos: 20.5,1.5 + parent: 34 - proto: PosterLegitNanotrasenLogo entities: - uid: 1991 @@ -62036,6 +64500,13 @@ entities: - type: Transform pos: -46.5,-5.5 parent: 34 +- proto: PosterLegitNTTGC + entities: + - uid: 13602 + components: + - type: Transform + pos: 32.5,-0.5 + parent: 34 - proto: PosterLegitPeriodicTable entities: - uid: 3303 @@ -62074,6 +64545,13 @@ entities: rot: 3.141592653589793 rad pos: -13.5,-35.5 parent: 34 +- proto: PosterLegitSecWatch + entities: + - uid: 6682 + components: + - type: Transform + pos: 23.5,-15.5 + parent: 34 - proto: PosterLegitShoukou entities: - uid: 11943 @@ -62091,13 +64569,6 @@ entities: - type: Transform pos: 7.5,19.5 parent: 34 -- proto: PosterLegitSpaceCops - entities: - - uid: 12215 - components: - - type: Transform - pos: 21.5,-19.5 - parent: 34 - proto: PosterLegitUeNo entities: - uid: 5861 @@ -62295,11 +64766,6 @@ entities: - type: Transform pos: -11.5,-13.5 parent: 34 - - uid: 3566 - components: - - type: Transform - pos: 26.5,-5.5 - parent: 34 - uid: 3961 components: - type: Transform @@ -62315,15 +64781,15 @@ entities: - type: Transform pos: 9.5,-36.5 parent: 34 - - uid: 8082 + - uid: 7025 components: - type: Transform - pos: -30.5,-23.5 + pos: 23.5,-9.5 parent: 34 - - uid: 8912 + - uid: 8082 components: - type: Transform - pos: 27.5,-11.5 + pos: -30.5,-23.5 parent: 34 - uid: 10293 components: @@ -62340,11 +64806,6 @@ entities: - type: Transform pos: -19.5,0.5 parent: 34 - - uid: 10491 - components: - - type: Transform - pos: 45.5,1.5 - parent: 34 - uid: 10522 components: - type: Transform @@ -62440,6 +64901,21 @@ entities: - type: Transform pos: 42.5,-37.5 parent: 34 + - uid: 13554 + components: + - type: Transform + pos: 37.5,-4.5 + parent: 34 + - uid: 13555 + components: + - type: Transform + pos: 39.5,-2.5 + parent: 34 + - uid: 13595 + components: + - type: Transform + pos: 24.5,-16.5 + parent: 34 - proto: PottedPlantRandomPlastic entities: - uid: 1767 @@ -62452,11 +64928,6 @@ entities: - type: Transform pos: -41.5,-24.5 parent: 34 - - uid: 4748 - components: - - type: Transform - pos: 29.5,-5.5 - parent: 34 - uid: 4853 components: - type: Transform @@ -62467,11 +64938,6 @@ entities: - type: Transform pos: 49.5,1.5 parent: 34 - - uid: 5495 - components: - - type: Transform - pos: 15.5,-30.5 - parent: 34 - uid: 10296 components: - type: Transform @@ -62492,16 +64958,6 @@ entities: - type: Transform pos: -37.5,-8.5 parent: 34 - - uid: 12193 - components: - - type: Transform - pos: 20.5,-14.5 - parent: 34 - - uid: 12194 - components: - - type: Transform - pos: 19.5,-10.5 - parent: 34 - proto: PowerCellRecharger entities: - uid: 1367 @@ -62514,6 +64970,12 @@ entities: - type: Transform pos: -42.5,10.5 parent: 34 + - uid: 3499 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 17.5,-20.5 + parent: 34 - uid: 7426 components: - type: Transform @@ -62529,17 +64991,12 @@ entities: - type: Transform pos: -22.5,-27.5 parent: 34 - - uid: 11331 - components: - - type: Transform - pos: 23.5,-15.5 - parent: 34 - uid: 11337 components: - type: Transform pos: 28.5,-45.5 parent: 34 - - uid: 13446 + - uid: 13676 components: - type: Transform pos: 7.5,-29.5 @@ -62744,18 +65201,6 @@ entities: rot: -1.5707963267948966 rad pos: -24.5,-15.5 parent: 34 - - uid: 1864 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 14.5,-7.5 - parent: 34 - - uid: 1865 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 19.5,-20.5 - parent: 34 - uid: 1866 components: - type: Transform @@ -62763,11 +65208,6 @@ entities: parent: 34 - type: ApcPowerReceiver powerLoad: 0 - - uid: 1867 - components: - - type: Transform - pos: 17.5,-16.5 - parent: 34 - uid: 1969 components: - type: Transform @@ -62775,18 +65215,6 @@ entities: parent: 34 - type: ApcPowerReceiver powerLoad: 0 - - uid: 1970 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 21.5,-10.5 - parent: 34 - - uid: 2031 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 27.5,-7.5 - parent: 34 - uid: 2064 components: - type: Transform @@ -62795,12 +65223,6 @@ entities: parent: 34 - type: ApcPowerReceiver powerLoad: 0 - - uid: 2087 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 25.5,-3.5 - parent: 34 - uid: 2129 components: - type: Transform @@ -63047,6 +65469,17 @@ entities: rot: 1.5707963267948966 rad pos: -3.5,6.5 parent: 34 + - uid: 3628 + components: + - type: Transform + pos: 35.5,-2.5 + parent: 34 + - uid: 3741 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 28.5,-4.5 + parent: 34 - uid: 3933 components: - type: Transform @@ -63072,19 +65505,6 @@ entities: rot: 1.5707963267948966 rad pos: 42.5,-8.5 parent: 34 - - uid: 4250 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 45.5,-11.5 - parent: 34 - - uid: 4255 - components: - - type: Transform - pos: 18.5,-12.5 - parent: 34 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 4256 components: - type: Transform @@ -63127,69 +65547,17 @@ entities: - type: Transform pos: 48.5,1.5 parent: 34 - - uid: 4910 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 34.5,-3.5 - parent: 34 - - uid: 4912 + - uid: 4873 components: - type: Transform - pos: 26.5,-13.5 + pos: 39.5,-2.5 parent: 34 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 4933 components: - type: Transform rot: 1.5707963267948966 rad pos: -1.5,-41.5 parent: 34 - - uid: 4935 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 18.5,-7.5 - parent: 34 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 4936 - components: - - type: Transform - pos: 18.5,-3.5 - parent: 34 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 4939 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 24.5,-20.5 - parent: 34 - - uid: 4942 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 30.5,0.5 - parent: 34 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 4944 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 26.5,4.5 - parent: 34 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 4946 - components: - - type: Transform - pos: 21.5,1.5 - parent: 34 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 5246 components: - type: Transform @@ -63296,6 +65664,34 @@ entities: - type: Transform pos: 6.5,-39.5 parent: 34 + - uid: 8159 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 33.5,-11.5 + parent: 34 + - uid: 8160 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 37.5,-7.5 + parent: 34 + - uid: 8175 + components: + - type: Transform + pos: 30.5,-12.5 + parent: 34 + - uid: 8176 + components: + - type: Transform + pos: 23.5,0.5 + parent: 34 + - uid: 8179 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 23.5,-11.5 + parent: 34 - uid: 8609 components: - type: Transform @@ -63304,17 +65700,51 @@ entities: parent: 34 - type: ApcPowerReceiver powerLoad: 0 - - uid: 8893 + - uid: 8683 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 39.5,-25.5 + parent: 34 + - uid: 8800 components: - type: Transform rot: -1.5707963267948966 rad - pos: 33.5,-14.5 + pos: 19.5,-16.5 parent: 34 - - uid: 8920 + - uid: 8811 components: - type: Transform rot: -1.5707963267948966 rad - pos: 45.5,1.5 + pos: 21.5,-6.5 + parent: 34 + - uid: 8814 + components: + - type: Transform + pos: 17.5,-12.5 + parent: 34 + - uid: 8816 + components: + - type: Transform + pos: 23.5,-16.5 + parent: 34 + - uid: 8819 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 27.5,-17.5 + parent: 34 + - uid: 9932 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 49.5,-4.5 + parent: 34 + - uid: 9944 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 27.5,-8.5 parent: 34 - uid: 10151 components: @@ -63328,12 +65758,6 @@ entities: rot: 1.5707963267948966 rad pos: 17.5,-30.5 parent: 34 - - uid: 10153 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 13.5,-26.5 - parent: 34 - uid: 10155 components: - type: Transform @@ -63400,6 +65824,17 @@ entities: rot: -1.5707963267948966 rad pos: 35.5,-35.5 parent: 34 + - uid: 10187 + components: + - type: Transform + pos: 44.5,1.5 + parent: 34 + - uid: 10198 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 35.5,-19.5 + parent: 34 - uid: 10420 components: - type: Transform @@ -63416,8 +65851,7 @@ entities: - uid: 11371 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 50.5,-4.5 + pos: 52.5,-38.5 parent: 34 - uid: 11444 components: @@ -63433,13 +65867,6 @@ entities: parent: 34 - type: ApcPowerReceiver powerLoad: 0 - - uid: 11632 - components: - - type: Transform - pos: 29.5,-9.5 - parent: 34 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 11634 components: - type: Transform @@ -63512,6 +65939,11 @@ entities: rot: 1.5707963267948966 rad pos: 4.5,-53.5 parent: 34 + - uid: 12381 + components: + - type: Transform + pos: 29.5,5.5 + parent: 34 - uid: 12400 components: - type: Transform @@ -63541,12 +65973,6 @@ entities: rot: 1.5707963267948966 rad pos: -9.5,10.5 parent: 34 - - uid: 12888 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 41.5,-4.5 - parent: 34 - uid: 13117 components: - type: Transform @@ -63571,12 +65997,6 @@ entities: rot: 1.5707963267948966 rad pos: 42.5,-32.5 parent: 34 - - uid: 13241 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 49.5,-36.5 - parent: 34 - uid: 13242 components: - type: Transform @@ -63588,17 +66008,6 @@ entities: rot: 3.141592653589793 rad pos: 55.5,-36.5 parent: 34 - - uid: 13244 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 49.5,-39.5 - parent: 34 - - uid: 13245 - components: - - type: Transform - pos: 53.5,-38.5 - parent: 34 - uid: 13250 components: - type: Transform @@ -63717,14 +66126,6 @@ entities: parent: 34 - type: ApcPowerReceiver powerLoad: 0 -- proto: PoweredLightColoredRed - entities: - - uid: 2063 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 33.5,-7.5 - parent: 34 - proto: PoweredlightLED entities: - uid: 2126 @@ -63766,13 +66167,6 @@ entities: parent: 34 - type: ApcPowerReceiver powerLoad: 0 - - uid: 6053 - components: - - type: Transform - pos: 35.5,-21.5 - parent: 34 - - type: ApcPowerReceiver - powerLoad: 0 - proto: PoweredLightPostSmall entities: - uid: 12784 @@ -63780,6 +66174,14 @@ entities: - type: Transform pos: 14.5,-49.5 parent: 34 +- proto: PoweredlightRed + entities: + - uid: 8813 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 29.5,-8.5 + parent: 34 - proto: PoweredlightSodium entities: - uid: 2640 @@ -63906,12 +66308,6 @@ entities: rot: -1.5707963267948966 rad pos: -53.5,-39.5 parent: 34 - - uid: 4253 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 33.5,-10.5 - parent: 34 - uid: 4254 components: - type: Transform @@ -63942,21 +66338,19 @@ entities: rot: -1.5707963267948966 rad pos: -38.5,9.5 parent: 34 - - uid: 4908 + - uid: 5411 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 30.5,-18.5 + pos: 36.5,-43.5 parent: 34 - type: ApcPowerReceiver powerLoad: 0 - - uid: 5411 + - uid: 5495 components: - type: Transform - pos: 36.5,-43.5 + rot: 1.5707963267948966 rad + pos: 25.5,4.5 parent: 34 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 5805 components: - type: Transform @@ -64011,6 +66405,12 @@ entities: parent: 34 - type: ApcPowerReceiver powerLoad: 0 + - uid: 8181 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 40.5,-12.5 + parent: 34 - uid: 8650 components: - type: Transform @@ -64018,6 +66418,27 @@ entities: parent: 34 - type: ApcPowerReceiver powerLoad: 0 + - uid: 8801 + components: + - type: Transform + pos: 16.5,-3.5 + parent: 34 + - uid: 8802 + components: + - type: Transform + pos: 16.5,-9.5 + parent: 34 + - uid: 8812 + components: + - type: Transform + pos: 16.5,-6.5 + parent: 34 + - uid: 8832 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 31.5,-20.5 + parent: 34 - uid: 9547 components: - type: Transform @@ -64029,14 +66450,6 @@ entities: rot: -1.5707963267948966 rad pos: 14.5,-45.5 parent: 34 - - uid: 10655 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 16.5,-10.5 - parent: 34 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 11275 components: - type: Transform @@ -64088,24 +66501,6 @@ entities: rot: -1.5707963267948966 rad pos: 48.5,-12.5 parent: 34 - - uid: 12922 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 39.5,-12.5 - parent: 34 - - uid: 12923 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 39.5,-9.5 - parent: 34 - - uid: 12924 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 39.5,-6.5 - parent: 34 - uid: 13252 components: - type: Transform @@ -64118,6 +66513,12 @@ entities: rot: 1.5707963267948966 rad pos: 48.5,-27.5 parent: 34 + - uid: 13474 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 41.5,-19.5 + parent: 34 - proto: PoweredSmallLightEmpty entities: - uid: 3312 @@ -64143,6 +66544,14 @@ entities: parent: 34 - type: ApcPowerReceiver powerLoad: 0 +- proto: PoweredSmallLightMaintenance + entities: + - uid: 7712 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 40.5,-9.5 + parent: 34 - proto: PoweredSmallLightMaintenanceRed entities: - uid: 2160 @@ -64261,22 +66670,11 @@ entities: rot: 3.141592653589793 rad pos: -23.5,-11.5 parent: 34 - - uid: 11449 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 32.5,-18.5 - parent: 34 - uid: 11450 components: - type: Transform pos: -16.5,-29.5 parent: 34 - - uid: 12967 - components: - - type: Transform - pos: 37.5,-6.5 - parent: 34 - uid: 12968 components: - type: Transform @@ -64384,11 +66782,6 @@ entities: - type: Transform pos: -24.5,-25.5 parent: 34 - - uid: 2410 - components: - - type: Transform - pos: 18.5,1.5 - parent: 34 - uid: 2539 components: - type: Transform @@ -64420,35 +66813,16 @@ entities: - type: Transform pos: 2.5,-34.5 parent: 34 - - uid: 3581 - components: - - type: Transform - pos: 24.5,-19.5 - parent: 34 - - uid: 3583 - components: - - type: Transform - pos: 22.5,-19.5 - parent: 34 - - uid: 3592 - components: - - type: Transform - pos: 26.5,1.5 - parent: 34 - - uid: 3715 - components: - - type: Transform - pos: 29.5,3.5 - parent: 34 - - uid: 3717 + - uid: 3478 components: - type: Transform - pos: 26.5,4.5 + rot: 3.141592653589793 rad + pos: 32.5,-9.5 parent: 34 - - uid: 3718 + - uid: 3616 components: - type: Transform - pos: 26.5,3.5 + pos: 37.5,-34.5 parent: 34 - uid: 3764 components: @@ -64460,11 +66834,6 @@ entities: - type: Transform pos: 8.5,-18.5 parent: 34 - - uid: 4170 - components: - - type: Transform - pos: 26.5,-19.5 - parent: 34 - uid: 4451 components: - type: Transform @@ -64476,23 +66845,6 @@ entities: - type: Transform pos: 37.5,6.5 parent: 34 - - uid: 4805 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 38.5,-2.5 - parent: 34 - - uid: 4859 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 38.5,-4.5 - parent: 34 - - uid: 4947 - components: - - type: Transform - pos: 17.5,-10.5 - parent: 34 - uid: 5143 components: - type: Transform @@ -64558,11 +66910,6 @@ entities: - type: Transform pos: -54.5,12.5 parent: 34 - - uid: 11329 - components: - - type: Transform - pos: 29.5,4.5 - parent: 34 - uid: 11462 components: - type: Transform @@ -64573,12 +66920,6 @@ entities: - type: Transform pos: -28.5,-41.5 parent: 34 - - uid: 11622 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 37.5,-33.5 - parent: 34 - uid: 11631 components: - type: Transform @@ -64600,11 +66941,6 @@ entities: - type: Transform pos: -56.5,-8.5 parent: 34 - - uid: 12175 - components: - - type: Transform - pos: 26.5,-0.5 - parent: 34 - uid: 13422 components: - type: Transform @@ -64769,21 +67105,6 @@ entities: rot: 1.5707963267948966 rad pos: 11.5,-16.5 parent: 34 - - uid: 4901 - components: - - type: Transform - pos: 30.5,-21.5 - parent: 34 - - uid: 4902 - components: - - type: Transform - pos: 29.5,-21.5 - parent: 34 - - uid: 4903 - components: - - type: Transform - pos: 28.5,-21.5 - parent: 34 - uid: 5804 components: - type: Transform @@ -64892,16 +67213,6 @@ entities: rot: 3.141592653589793 rad pos: 8.5,-1.5 parent: 34 - - uid: 7172 - components: - - type: Transform - pos: 35.5,-21.5 - parent: 34 - - uid: 7173 - components: - - type: Transform - pos: 36.5,-21.5 - parent: 34 - uid: 7174 components: - type: Transform @@ -65003,10 +67314,11 @@ entities: - type: Transform pos: 11.5,-9.5 parent: 34 - - uid: 4900 + - uid: 4139 components: - type: Transform - pos: 31.5,-21.5 + rot: -1.5707963267948966 rad + pos: 36.5,-21.5 parent: 34 - uid: 6205 components: @@ -65014,12 +67326,6 @@ entities: rot: 1.5707963267948966 rad pos: 11.5,-1.5 parent: 34 - - uid: 7171 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 34.5,-21.5 - parent: 34 - uid: 12005 components: - type: Transform @@ -65215,26 +67521,11 @@ entities: parent: 34 - proto: RandomItem entities: - - uid: 226 - components: - - type: Transform - pos: 39.5,-13.5 - parent: 34 - uid: 4023 components: - type: Transform pos: 47.5,-12.5 parent: 34 - - uid: 4077 - components: - - type: Transform - pos: 40.5,-10.5 - parent: 34 - - uid: 4078 - components: - - type: Transform - pos: 39.5,-7.5 - parent: 34 - uid: 4420 components: - type: Transform @@ -65366,15 +67657,15 @@ entities: rot: 1.5707963267948966 rad pos: -11.5,-41.5 parent: 34 - - uid: 4764 + - uid: 4770 components: - type: Transform - pos: 35.5,-6.5 + pos: 40.5,2.5 parent: 34 - - uid: 4770 + - uid: 4882 components: - type: Transform - pos: 40.5,2.5 + pos: 41.5,-11.5 parent: 34 - uid: 4911 components: @@ -65401,21 +67692,11 @@ entities: - type: Transform pos: -1.5,-16.5 parent: 34 - - uid: 10983 - components: - - type: Transform - pos: 18.5,-8.5 - parent: 34 - uid: 10984 components: - type: Transform pos: 24.5,6.5 parent: 34 - - uid: 10985 - components: - - type: Transform - pos: 31.5,4.5 - parent: 34 - uid: 11000 components: - type: Transform @@ -65517,6 +67798,11 @@ entities: - type: Transform pos: 4.5,-25.5 parent: 34 + - uid: 6717 + components: + - type: Transform + pos: 28.5,-11.5 + parent: 34 - uid: 7151 components: - type: Transform @@ -65567,11 +67853,6 @@ entities: - type: Transform pos: -33.5,-28.5 parent: 34 - - uid: 10973 - components: - - type: Transform - pos: 31.5,-20.5 - parent: 34 - uid: 10975 components: - type: Transform @@ -65627,10 +67908,10 @@ entities: - type: Transform pos: -51.5,-23.5 parent: 34 - - uid: 12197 + - uid: 12196 components: - type: Transform - pos: 24.5,-8.5 + pos: 24.5,1.5 parent: 34 - uid: 12330 components: @@ -65878,6 +68159,26 @@ entities: - type: Transform pos: -41.5,5.5 parent: 34 + - uid: 13559 + components: + - type: Transform + pos: 41.5,8.5 + parent: 34 + - uid: 13560 + components: + - type: Transform + pos: 44.5,9.5 + parent: 34 + - uid: 13561 + components: + - type: Transform + pos: 44.5,10.5 + parent: 34 + - uid: 13661 + components: + - type: Transform + pos: 17.5,-7.5 + parent: 34 - proto: RandomSpawner100 entities: - uid: 12243 @@ -65886,6 +68187,11 @@ entities: rot: 3.141592653589793 rad pos: -15.5,-33.5 parent: 34 + - uid: 13557 + components: + - type: Transform + pos: 42.5,10.5 + parent: 34 - proto: RandomVending entities: - uid: 3956 @@ -66101,6 +68407,16 @@ entities: - type: Transform pos: -62.5,-5.5 parent: 34 + - uid: 13150 + components: + - type: Transform + pos: 18.5,20.5 + parent: 34 + - uid: 13160 + components: + - type: Transform + pos: 20.5,19.5 + parent: 34 - uid: 13357 components: - type: Transform @@ -66277,21 +68593,6 @@ entities: - type: Transform pos: -49.5,-38.5 parent: 34 - - uid: 3691 - components: - - type: Transform - pos: 29.5,2.5 - parent: 34 - - uid: 3692 - components: - - type: Transform - pos: 28.5,2.5 - parent: 34 - - uid: 3693 - components: - - type: Transform - pos: 26.5,2.5 - parent: 34 - uid: 7819 components: - type: Transform @@ -66439,6 +68740,11 @@ entities: - type: Transform pos: 0.5,-2.5 parent: 34 + - uid: 786 + components: + - type: Transform + pos: 18.5,-15.5 + parent: 34 - uid: 805 components: - type: Transform @@ -66489,11 +68795,27 @@ entities: - type: Transform pos: -20.5,-2.5 parent: 34 + - uid: 904 + components: + - type: Transform + pos: 16.5,-15.5 + parent: 34 - uid: 916 components: - type: Transform pos: -25.5,-9.5 parent: 34 + - uid: 997 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.5,-3.5 + parent: 34 + - uid: 1002 + components: + - type: Transform + pos: 15.5,-6.5 + parent: 34 - uid: 1042 components: - type: Transform @@ -66519,6 +68841,11 @@ entities: - type: Transform pos: -26.5,-35.5 parent: 34 + - uid: 1285 + components: + - type: Transform + pos: 39.5,-5.5 + parent: 34 - uid: 1396 components: - type: Transform @@ -66569,6 +68896,11 @@ entities: - type: Transform pos: -46.5,-48.5 parent: 34 + - uid: 1494 + components: + - type: Transform + pos: 15.5,-3.5 + parent: 34 - uid: 1532 components: - type: Transform @@ -66614,10 +68946,11 @@ entities: - type: Transform pos: -44.5,-32.5 parent: 34 - - uid: 1793 + - uid: 1865 components: - type: Transform - pos: 16.5,-12.5 + rot: -1.5707963267948966 rad + pos: 33.5,-10.5 parent: 34 - uid: 1882 components: @@ -66724,11 +69057,6 @@ entities: - type: Transform pos: -27.5,-30.5 parent: 34 - - uid: 2491 - components: - - type: Transform - pos: 33.5,-4.5 - parent: 34 - uid: 2502 components: - type: Transform @@ -66794,11 +69122,6 @@ entities: - type: Transform pos: -36.5,-18.5 parent: 34 - - uid: 3343 - components: - - type: Transform - pos: 21.5,-14.5 - parent: 34 - uid: 3347 components: - type: Transform @@ -66809,110 +69132,104 @@ entities: - type: Transform pos: -30.5,-2.5 parent: 34 - - uid: 3478 - components: - - type: Transform - pos: 21.5,-12.5 - parent: 34 - - uid: 3504 - components: - - type: Transform - pos: 21.5,-7.5 - parent: 34 - - uid: 3506 + - uid: 3532 components: - type: Transform - pos: 18.5,-10.5 + rot: -1.5707963267948966 rad + pos: 35.5,-10.5 parent: 34 - - uid: 3513 + - uid: 3538 components: - type: Transform - pos: 21.5,-6.5 + pos: 35.5,-20.5 parent: 34 - - uid: 3518 + - uid: 3566 components: - type: Transform - pos: 15.5,-4.5 + pos: 36.5,-4.5 parent: 34 - - uid: 3519 + - uid: 3569 components: - type: Transform - pos: 21.5,-4.5 + pos: 15.5,-7.5 parent: 34 - - uid: 3521 + - uid: 3575 components: - type: Transform - pos: 21.5,-5.5 + rot: 1.5707963267948966 rad + pos: 32.5,-12.5 parent: 34 - - uid: 3525 + - uid: 3589 components: - type: Transform - pos: 15.5,-6.5 + pos: 19.5,-12.5 parent: 34 - - uid: 3526 + - uid: 3600 components: - type: Transform - pos: 15.5,-5.5 + pos: 15.5,-9.5 parent: 34 - - uid: 3604 + - uid: 3606 components: - type: Transform - pos: 29.5,-12.5 + pos: 19.5,-14.5 parent: 34 - - uid: 3605 + - uid: 3619 components: - type: Transform - pos: 27.5,-12.5 + pos: 15.5,-14.5 parent: 34 - - uid: 3607 + - uid: 3626 components: - type: Transform - pos: 26.5,-10.5 + pos: 22.5,-9.5 parent: 34 - - uid: 3608 + - uid: 3635 components: - type: Transform - pos: 26.5,-9.5 + pos: 15.5,-12.5 parent: 34 - uid: 3636 components: - type: Transform pos: 7.5,-25.5 parent: 34 - - uid: 3645 + - uid: 3664 components: - type: Transform - pos: 26.5,-1.5 + pos: 22.5,-4.5 parent: 34 - - uid: 3646 + - uid: 3675 components: - type: Transform - pos: 28.5,-1.5 + pos: 10.5,-49.5 parent: 34 - - uid: 3652 + - uid: 3686 components: - type: Transform - pos: 25.5,-1.5 + pos: 11.5,-49.5 parent: 34 - - uid: 3673 + - uid: 3719 components: - type: Transform - pos: 29.5,-1.5 + rot: 1.5707963267948966 rad + pos: 32.5,-13.5 parent: 34 - - uid: 3675 + - uid: 3723 components: - type: Transform - pos: 10.5,-49.5 + pos: 36.5,-2.5 parent: 34 - - uid: 3686 + - uid: 3757 components: - type: Transform - pos: 11.5,-49.5 + rot: -1.5707963267948966 rad + pos: 18.5,-9.5 parent: 34 - - uid: 3695 + - uid: 3759 components: - type: Transform - pos: 24.5,1.5 + pos: 15.5,-4.5 parent: 34 - uid: 3779 components: @@ -66924,6 +69241,11 @@ entities: - type: Transform pos: -36.5,-35.5 parent: 34 + - uid: 3856 + components: + - type: Transform + pos: 37.5,-5.5 + parent: 34 - uid: 3889 components: - type: Transform @@ -67004,11 +69326,6 @@ entities: - type: Transform pos: -11.5,-47.5 parent: 34 - - uid: 4168 - components: - - type: Transform - pos: 30.5,-12.5 - parent: 34 - uid: 4299 components: - type: Transform @@ -67079,16 +69396,27 @@ entities: - type: Transform pos: 48.5,-20.5 parent: 34 - - uid: 4502 + - uid: 4509 components: - type: Transform - pos: 37.5,-2.5 + pos: 30.5,1.5 + parent: 34 + - uid: 4512 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.5,-6.5 parent: 34 - uid: 4530 components: - type: Transform pos: -6.5,-54.5 parent: 34 + - uid: 4533 + components: + - type: Transform + pos: 15.5,-10.5 + parent: 34 - uid: 4541 components: - type: Transform @@ -67179,21 +69507,57 @@ entities: - type: Transform pos: 37.5,7.5 parent: 34 + - uid: 4764 + components: + - type: Transform + pos: 28.5,1.5 + parent: 34 - uid: 4766 components: - type: Transform - pos: 41.5,-12.5 + pos: 33.5,-20.5 parent: 34 - - uid: 4870 + - uid: 4807 components: - type: Transform - pos: 41.5,-9.5 + rot: 3.141592653589793 rad + pos: 32.5,-14.5 parent: 34 - uid: 4874 components: - type: Transform pos: -14.5,-38.5 parent: 34 + - uid: 4883 + components: + - type: Transform + pos: 20.5,-17.5 + parent: 34 + - uid: 4884 + components: + - type: Transform + pos: 20.5,-19.5 + parent: 34 + - uid: 4916 + components: + - type: Transform + pos: 26.5,-6.5 + parent: 34 + - uid: 4918 + components: + - type: Transform + pos: 24.5,-6.5 + parent: 34 + - uid: 5009 + components: + - type: Transform + pos: 33.5,-15.5 + parent: 34 + - uid: 5025 + components: + - type: Transform + pos: 35.5,-15.5 + parent: 34 - uid: 5170 components: - type: Transform @@ -67499,16 +69863,6 @@ entities: - type: Transform pos: 15.5,0.5 parent: 34 - - uid: 6342 - components: - - type: Transform - pos: 15.5,-1.5 - parent: 34 - - uid: 6343 - components: - - type: Transform - pos: 15.5,1.5 - parent: 34 - uid: 6383 components: - type: Transform @@ -67524,6 +69878,16 @@ entities: - type: Transform pos: 5.5,20.5 parent: 34 + - uid: 6679 + components: + - type: Transform + pos: 24.5,-15.5 + parent: 34 + - uid: 6680 + components: + - type: Transform + pos: 26.5,-15.5 + parent: 34 - uid: 7380 components: - type: Transform @@ -67564,11 +69928,6 @@ entities: - type: Transform pos: -56.5,-15.5 parent: 34 - - uid: 8471 - components: - - type: Transform - pos: 31.5,-4.5 - parent: 34 - uid: 8489 components: - type: Transform @@ -67609,11 +69968,6 @@ entities: - type: Transform pos: 46.5,-0.5 parent: 34 - - uid: 10015 - components: - - type: Transform - pos: 37.5,-4.5 - parent: 34 - uid: 10252 components: - type: Transform @@ -67769,11 +70123,6 @@ entities: - type: Transform pos: -24.5,-43.5 parent: 34 - - uid: 11906 - components: - - type: Transform - pos: 15.5,17.5 - parent: 34 - uid: 12076 components: - type: Transform @@ -67829,11 +70178,6 @@ entities: - type: Transform pos: 46.5,-7.5 parent: 34 - - uid: 12460 - components: - - type: Transform - pos: 41.5,-6.5 - parent: 34 - uid: 12462 components: - type: Transform @@ -67914,35 +70258,23 @@ entities: - type: Transform pos: 43.5,-17.5 parent: 34 - - uid: 13081 - components: - - type: Transform - pos: 16.5,19.5 - parent: 34 - - uid: 13082 + - uid: 13077 components: - type: Transform - pos: 17.5,19.5 + rot: -1.5707963267948966 rad + pos: 19.5,17.5 parent: 34 - uid: 13083 components: - type: Transform - pos: 18.5,19.5 - parent: 34 - - uid: 13084 - components: - - type: Transform - pos: 19.5,19.5 + rot: -1.5707963267948966 rad + pos: 18.5,17.5 parent: 34 - uid: 13085 components: - type: Transform - pos: 20.5,18.5 - parent: 34 - - uid: 13086 - components: - - type: Transform - pos: 20.5,17.5 + rot: -1.5707963267948966 rad + pos: 16.5,17.5 parent: 34 - uid: 13087 components: @@ -67959,11 +70291,22 @@ entities: - type: Transform pos: 20.5,14.5 parent: 34 + - uid: 13091 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 17.5,17.5 + parent: 34 - uid: 13215 components: - type: Transform pos: -41.5,-18.5 parent: 34 + - uid: 13520 + components: + - type: Transform + pos: 42.5,7.5 + parent: 34 - proto: RemoteSignaller entities: - uid: 12319 @@ -67999,15 +70342,15 @@ entities: parent: 34 - proto: RollerBed entities: - - uid: 13448 + - uid: 13673 components: - type: Transform - pos: 7.429779,-26.349916 + pos: 7.4602537,-26.410053 parent: 34 - - uid: 13449 + - uid: 13674 components: - type: Transform - pos: 7.445404,-27.318666 + pos: 7.4133787,-27.394428 parent: 34 - proto: RubberStampApproved entities: @@ -68016,6 +70359,11 @@ entities: - type: Transform pos: -17.69175,-19.103989 parent: 34 + - uid: 3655 + components: + - type: Transform + pos: 30.09065,3.771802 + parent: 34 - proto: RubberStampDenied entities: - uid: 1980 @@ -68023,6 +70371,11 @@ entities: - type: Transform pos: -17.681334,-19.270771 parent: 34 + - uid: 3625 + components: + - type: Transform + pos: 30.075026,3.459302 + parent: 34 - proto: SalvageCanisterSpawner entities: - uid: 133 @@ -68045,12 +70398,6 @@ entities: rot: 3.141592653589793 rad pos: 40.427826,3.6428523 parent: 34 - - uid: 11290 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 33.900448,3.428866 - parent: 34 - proto: SchoolgirlUniformSpawner entities: - uid: 11028 @@ -68129,18 +70476,17 @@ entities: parent: 34 - proto: SecBreachingHammer entities: - - uid: 6565 + - uid: 4922 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 26.47547,-0.5123596 + pos: 32.493702,-9.347706 parent: 34 - proto: SecurityTechFab entities: - - uid: 3709 + - uid: 4422 components: - type: Transform - pos: 28.5,1.5 + pos: 33.5,-6.5 parent: 34 - proto: SeedExtractor entities: @@ -68233,6 +70579,13 @@ entities: - type: Transform pos: -23.42932,-25.482 parent: 34 + - uid: 8874 + components: + - type: Transform + parent: 8871 + - type: Physics + canCollide: False + - type: InsideEntityStorage - uid: 11313 components: - type: Transform @@ -68287,6 +70640,13 @@ entities: - type: Transform pos: -24.46057,-25.461153 parent: 34 + - uid: 8872 + components: + - type: Transform + parent: 8871 + - type: Physics + canCollide: False + - type: InsideEntityStorage - uid: 11889 components: - type: Transform @@ -68333,6 +70693,13 @@ entities: parent: 34 - type: Stack count: 15 + - uid: 8873 + components: + - type: Transform + parent: 8871 + - type: Physics + canCollide: False + - type: InsideEntityStorage - proto: Shinai entities: - uid: 147 @@ -68357,6 +70724,13 @@ entities: - type: Transform pos: -0.41657126,8.561178 parent: 34 +- proto: ShotGunCabinetFilled + entities: + - uid: 3726 + components: + - type: Transform + pos: 39.5,-10.5 + parent: 34 - proto: ShuttersNormalOpen entities: - uid: 843 @@ -68391,48 +70765,70 @@ entities: - type: DeviceLinkSink links: - 246 - - uid: 3609 + - uid: 3622 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 26.5,-9.5 + pos: 32.5,-12.5 parent: 34 - type: DeviceLinkSink links: - - 2525 - - uid: 3610 + - 4633 + - uid: 3623 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 26.5,-10.5 + pos: 32.5,-13.5 parent: 34 - type: DeviceLinkSink links: - - 2525 - - uid: 3611 + - 4633 + - uid: 3658 components: - type: Transform - pos: 27.5,-12.5 + pos: 15.5,-3.5 parent: 34 - type: DeviceLinkSink links: - - 2525 - - uid: 3612 + - 3492 + - uid: 3690 components: - type: Transform - pos: 29.5,-12.5 + pos: 15.5,-4.5 parent: 34 - type: DeviceLinkSink links: - - 2525 - - uid: 4169 + - 3492 + - uid: 3711 components: - type: Transform - pos: 30.5,-12.5 + pos: 15.5,-10.5 parent: 34 - type: DeviceLinkSink links: - - 2525 + - 3523 + - uid: 4077 + components: + - type: Transform + pos: 15.5,-6.5 + parent: 34 + - type: DeviceLinkSink + links: + - 3631 + - uid: 4157 + components: + - type: Transform + pos: 15.5,-7.5 + parent: 34 + - type: DeviceLinkSink + links: + - 3631 + - uid: 4511 + components: + - type: Transform + pos: 15.5,-9.5 + parent: 34 + - type: DeviceLinkSink + links: + - 3523 - uid: 4934 components: - type: Transform @@ -68442,15 +70838,14 @@ entities: - type: DeviceLinkSink links: - 2159 - - uid: 5005 + - uid: 4958 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 15.5,1.5 + pos: 32.5,-14.5 parent: 34 - type: DeviceLinkSink links: - - 4377 + - 4633 - uid: 5006 components: - type: Transform @@ -68458,17 +70853,17 @@ entities: pos: 15.5,0.5 parent: 34 - type: DeviceLinkSink + invokeCounter: 1 links: - - 4377 - - uid: 5007 + - 9989 + - uid: 5268 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 15.5,-1.5 + pos: 35.5,-15.5 parent: 34 - type: DeviceLinkSink links: - - 4377 + - 4633 - uid: 5312 components: - type: Transform @@ -68477,6 +70872,14 @@ entities: - type: DeviceLinkSink links: - 8431 + - uid: 5352 + components: + - type: Transform + pos: 33.5,-15.5 + parent: 34 + - type: DeviceLinkSink + links: + - 4633 - uid: 5541 components: - type: Transform @@ -68594,16 +70997,28 @@ entities: - type: Transform pos: 10.5,4.5 parent: 34 + - type: DeviceLinkSink + invokeCounter: 1 + links: + - 2159 - uid: 12904 components: - type: Transform pos: 7.5,4.5 parent: 34 + - type: DeviceLinkSink + invokeCounter: 1 + links: + - 2159 - uid: 12905 components: - type: Transform pos: 8.5,4.5 parent: 34 + - type: DeviceLinkSink + invokeCounter: 1 + links: + - 2159 - uid: 12946 components: - type: Transform @@ -68655,6 +71070,24 @@ entities: - type: DeviceLinkSink links: - 10439 + - uid: 13544 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 15.5,-0.5 + parent: 34 + - type: DeviceLinkSink + invokeCounter: 1 + links: + - 9989 + - uid: 13659 + components: + - type: Transform + pos: 34.5,-15.5 + parent: 34 + - type: DeviceLinkSink + links: + - 4633 - proto: ShuttersWindowOpen entities: - uid: 1287 @@ -68737,6 +71170,19 @@ entities: - Pressed: Open - Pressed: Close - Pressed: Toggle + - uid: 12927 + components: + - type: MetaData + name: Front door + - type: Transform + rot: 1.5707963267948966 rad + pos: 16.5,-16.5 + parent: 34 + - type: DeviceLinkSource + linkedPorts: + 3582: + - Pressed: Open + - Pressed: Close - proto: SignalSwitch entities: - uid: 246 @@ -68813,36 +71259,6 @@ entities: 1287: - On: Close - Off: Open - - uid: 3750 - components: - - type: MetaData - name: cell shutter switch - - type: Transform - rot: 1.5707963267948966 rad - pos: 21.5,-2.5 - parent: 34 - - type: DeviceLinkSource - linkedPorts: - 3639: - - On: Close - - Off: Open - 3640: - - On: Close - - Off: Open - 3641: - - On: Close - - Off: Open - - uid: 7996 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 33.5,-4.5 - parent: 34 - - type: DeviceLinkSource - linkedPorts: - 8683: - - On: Close - - Off: Open - uid: 12307 components: - type: Transform @@ -68860,6 +71276,19 @@ entities: 12295: - On: Open - Off: Close + - uid: 13678 + components: + - type: MetaData + name: Janitorial service light + - type: Transform + pos: 16.5,-16.5 + parent: 34 + - type: DeviceLinkSource + linkedPorts: + 13679: + - On: On + - Off: Off + - Status: Toggle - proto: SignalSwitchDirectional entities: - uid: 1922 @@ -68894,6 +71323,18 @@ entities: - On: Toggle - Off: Toggle - Status: Toggle + 12903: + - On: Toggle + - Off: Toggle + - Status: Toggle + 12905: + - On: Toggle + - Off: Toggle + - Status: Toggle + 12904: + - On: Toggle + - Off: Toggle + - Status: Toggle - uid: 2278 components: - type: Transform @@ -68908,43 +71349,76 @@ entities: 7098: - On: Close - Off: Open - - uid: 2525 + - uid: 3492 components: - type: Transform - pos: 28.5,-8.5 + rot: -1.5707963267948966 rad + pos: 22.5,-3.5 parent: 34 - type: DeviceLinkSource linkedPorts: - 3609: + 3658: + - On: Close + - Off: Open + 3690: - On: Close - Off: Open - 3610: + - uid: 3523 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-10.5 + parent: 34 + - type: SignalSwitch + state: True + - type: DeviceLinkSource + linkedPorts: + 4511: - On: Close - Off: Open - 3611: + 3711: - On: Close - Off: Open - 3612: + lastSignals: + Status: True + - uid: 3631 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-7.5 + parent: 34 + - type: DeviceLinkSource + linkedPorts: + 4077: - On: Close - Off: Open - 4169: + 4157: - On: Close - Off: Open - - uid: 4377 + - uid: 4633 components: - type: Transform rot: -1.5707963267948966 rad - pos: 20.5,-1.5 + pos: 37.5,-13.5 parent: 34 - type: DeviceLinkSource linkedPorts: - 5007: + 3622: - On: Close - Off: Open - 5006: + 3623: + - On: Close + - Off: Open + 4958: + - On: Close + - Off: Open + 5352: + - On: Close + - Off: Open + 13659: - On: Close - Off: Open - 5005: + 5268: - On: Close - Off: Open - uid: 8431 @@ -68964,19 +71438,22 @@ entities: 5541: - On: Close - Off: Open - - uid: 10011 + - uid: 9989 components: - - type: MetaData - name: Janitorial service lights - type: Transform - rot: 3.141592653589793 rad - pos: 21.5,-11.5 + rot: -1.5707963267948966 rad + pos: 20.5,-1.5 parent: 34 - type: DeviceLinkSource linkedPorts: - 12927: - - On: On - - Off: Off + 5006: + - On: Toggle + - Off: Toggle + - Status: Toggle + 13544: + - On: Toggle + - Off: Toggle + - Status: Toggle - uid: 10413 components: - type: MetaData @@ -69074,10 +71551,11 @@ entities: parent: 34 - proto: SignArmory entities: - - uid: 3698 + - uid: 13462 components: - type: Transform - pos: 24.5,-1.5 + rot: -1.5707963267948966 rad + pos: 33.5,-5.5 parent: 34 - proto: SignAtmos entities: @@ -69141,11 +71619,29 @@ entities: parent: 34 - proto: SignConspiracyBoard entities: + - uid: 2161 + components: + - type: Transform + pos: 29.5,6.5 + parent: 34 + - uid: 6025 + components: + - type: Transform + pos: 21.5,-15.5 + parent: 34 - uid: 6137 components: - type: Transform pos: -10.5,6.5 parent: 34 +- proto: SignCourt + entities: + - uid: 13463 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 29.5,-25.5 + parent: 34 - proto: SignCryogenicsMed entities: - uid: 1313 @@ -69197,6 +71693,14 @@ entities: rot: 1.5707963267948966 rad pos: -27.50208,-24.697226 parent: 34 +- proto: SignDirectionalBrig + entities: + - uid: 13459 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 22.5,-11.5 + parent: 34 - proto: SignDirectionalChapel entities: - uid: 185 @@ -69497,13 +72001,6 @@ entities: parent: 34 - proto: SignDisposalSpace entities: - - uid: 8128 - components: - - type: MetaData - desc: Don't get any ideas. - - type: Transform - pos: 42.5,7.5 - parent: 34 - uid: 11306 components: - type: Transform @@ -69587,10 +72084,11 @@ entities: parent: 34 - proto: SignInterrogation entities: - - uid: 4885 + - uid: 10023 components: - type: Transform - pos: 27.5,-15.5 + rot: -1.5707963267948966 rad + pos: 36.5,-17.5 parent: 34 - proto: SignJanitor entities: @@ -69599,6 +72097,14 @@ entities: - type: Transform pos: 6.5,-21.5 parent: 34 +- proto: SignKiddiePlaque + entities: + - uid: 13464 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 38.5,-10.5 + parent: 34 - proto: SignLawyer entities: - uid: 11817 @@ -69629,6 +72135,13 @@ entities: rot: -1.5707963267948966 rad pos: 10.5,-39.5 parent: 34 +- proto: SignNosmoking + entities: + - uid: 4377 + components: + - type: Transform + pos: 31.5,-19.5 + parent: 34 - proto: SignPsychology entities: - uid: 13441 @@ -69638,11 +72151,35 @@ entities: parent: 34 - proto: SignRedOne entities: + - uid: 9111 + components: + - type: Transform + pos: 18.5,-9.5 + parent: 34 - uid: 11792 components: - type: Transform pos: 1.2183137,15.5 parent: 34 + - uid: 13653 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 46.5,-13.5 + parent: 34 +- proto: SignRedThree + entities: + - uid: 13470 + components: + - type: Transform + pos: 18.5,-3.5 + parent: 34 + - uid: 13660 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 46.5,-7.5 + parent: 34 - proto: SignRedTwo entities: - uid: 11827 @@ -69650,6 +72187,17 @@ entities: - type: Transform pos: -2.7816863,15.5 parent: 34 + - uid: 13655 + components: + - type: Transform + pos: 18.5,-6.5 + parent: 34 + - uid: 13656 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 46.5,-10.5 + parent: 34 - proto: SignRobo entities: - uid: 2567 @@ -69666,16 +72214,63 @@ entities: parent: 34 - proto: SignSec entities: - - uid: 10374 + - uid: 13457 components: - type: Transform pos: 15.5,-11.5 parent: 34 - - uid: 10403 + - uid: 13458 + components: + - type: Transform + pos: 36.5,-20.5 + parent: 34 + - uid: 13460 components: - type: Transform pos: 15.5,-15.5 parent: 34 + - uid: 13662 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 32.5,-21.5 + parent: 34 +- proto: SignSecureSmall + entities: + - uid: 13657 + components: + - type: Transform + pos: 15.5,-8.5 + parent: 34 + - uid: 13658 + components: + - type: Transform + pos: 15.5,-5.5 + parent: 34 +- proto: SignSecureSmallRed + entities: + - uid: 13486 + components: + - type: Transform + pos: 29.5,-5.5 + parent: 34 + - uid: 13487 + components: + - type: Transform + pos: 32.5,-5.5 + parent: 34 + - uid: 13492 + components: + - type: Transform + pos: 32.5,-15.5 + parent: 34 +- proto: SignSmoking + entities: + - uid: 6705 + components: + - type: Transform + pos: 1.5,-31.5 + parent: 34 - proto: SignSurgery entities: - uid: 5149 @@ -69717,6 +72312,12 @@ entities: rot: -1.5707963267948966 rad pos: -49.5,-4.5 parent: 34 + - uid: 3531 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 40.5,-9.5 + parent: 34 - uid: 4594 components: - type: Transform @@ -70311,6 +72912,13 @@ entities: - type: Transform pos: 40.5,-29.5 parent: 34 +- proto: SpawnMobMcGriff + entities: + - uid: 4622 + components: + - type: Transform + pos: 38.5,-11.5 + parent: 34 - proto: SpawnMobMedibot entities: - uid: 2246 @@ -70338,10 +72946,10 @@ entities: parent: 34 - proto: SpawnMobShiva entities: - - uid: 4699 + - uid: 6981 components: - type: Transform - pos: 27.5,-13.5 + pos: 27.5,-5.5 parent: 34 - proto: SpawnMobSmile entities: @@ -70405,10 +73013,10 @@ entities: parent: 34 - proto: SpawnPointBrigmedic entities: - - uid: 3983 + - uid: 7679 components: - type: Transform - pos: 19.5,-1.5 + pos: 18.5,0.5 parent: 34 - proto: SpawnPointCaptain entities: @@ -70907,11 +73515,6 @@ entities: parent: 34 - proto: SpawnPointPrisoner entities: - - uid: 4655 - components: - - type: Transform - pos: 40.5,-6.5 - parent: 34 - uid: 4663 components: - type: Transform @@ -70922,21 +73525,11 @@ entities: - type: Transform pos: 36.5,0.5 parent: 34 - - uid: 8910 - components: - - type: Transform - pos: 40.5,-12.5 - parent: 34 - uid: 12079 components: - type: Transform pos: 47.5,-13.5 parent: 34 - - uid: 12187 - components: - - type: Transform - pos: 39.5,-10.5 - parent: 34 - uid: 12189 components: - type: Transform @@ -71059,42 +73652,107 @@ entities: parent: 34 - proto: SpawnPointSecurityCadet entities: - - uid: 10504 + - uid: 13601 components: - type: Transform - pos: 25.5,-13.5 + pos: 28.5,-2.5 + parent: 34 + - uid: 13605 + components: + - type: Transform + pos: 23.5,-17.5 + parent: 34 + - uid: 13606 + components: + - type: Transform + pos: 28.5,-3.5 + parent: 34 + - uid: 13607 + components: + - type: Transform + pos: 26.5,-2.5 + parent: 34 + - uid: 13608 + components: + - type: Transform + pos: 26.5,-3.5 + parent: 34 + - uid: 13620 + components: + - type: Transform + pos: 18.5,-19.5 + parent: 34 + - uid: 13621 + components: + - type: Transform + pos: 22.5,-17.5 parent: 34 - proto: SpawnPointSecurityOfficer entities: - - uid: 10505 + - uid: 13603 components: - type: Transform - pos: 23.5,-17.5 + pos: 25.5,-2.5 parent: 34 - - uid: 10506 + - uid: 13604 components: - type: Transform - pos: 24.5,-17.5 + pos: 25.5,-3.5 parent: 34 - - uid: 10507 + - uid: 13609 components: - type: Transform - pos: 25.5,-17.5 + pos: 29.5,-2.5 parent: 34 - - uid: 10508 + - uid: 13610 components: - type: Transform - pos: 23.5,-16.5 + pos: 29.5,-3.5 parent: 34 - - uid: 10509 + - uid: 13611 components: - type: Transform - pos: 24.5,-16.5 + pos: 22.5,-19.5 parent: 34 - - uid: 10510 + - uid: 13612 components: - type: Transform - pos: 25.5,-16.5 + pos: 23.5,-19.5 + parent: 34 + - uid: 13613 + components: + - type: Transform + pos: 24.5,-19.5 + parent: 34 + - uid: 13614 + components: + - type: Transform + pos: 25.5,-19.5 + parent: 34 + - uid: 13615 + components: + - type: Transform + pos: 17.5,-18.5 + parent: 34 + - uid: 13616 + components: + - type: Transform + pos: 18.5,-18.5 + parent: 34 + - uid: 13617 + components: + - type: Transform + pos: 20.5,-4.5 + parent: 34 + - uid: 13618 + components: + - type: Transform + pos: 20.5,-7.5 + parent: 34 + - uid: 13619 + components: + - type: Transform + pos: 20.5,-10.5 parent: 34 - proto: SpawnPointServiceWorker entities: @@ -71164,11 +73822,20 @@ entities: parent: 34 - proto: SpawnPointWarden entities: - - uid: 10511 + - uid: 3577 components: - type: Transform - pos: 23.5,-14.5 + pos: 39.5,-12.5 parent: 34 +- proto: SpeedLoaderMagnum + entities: + - uid: 4576 + components: + - type: Transform + parent: 4574 + - type: Physics + canCollide: False + - type: InsideEntityStorage - proto: SpiderWeb entities: - uid: 6043 @@ -71202,6 +73869,11 @@ entities: parent: 34 - proto: StasisBed entities: + - uid: 3629 + components: + - type: Transform + pos: 19.5,-1.5 + parent: 34 - uid: 9497 components: - type: Transform @@ -71386,13 +74058,6 @@ entities: parent: 34 - type: AtmosDevice joinedGrid: 34 -- proto: Stunbaton - entities: - - uid: 3722 - components: - - type: Transform - pos: 24.607412,-19.584091 - parent: 34 - proto: SubstationBasic entities: - uid: 2236 @@ -71416,12 +74081,12 @@ entities: - type: Transform pos: 10.5,-19.5 parent: 34 - - uid: 3577 + - uid: 3734 components: - type: MetaData - name: Upper security's substation + name: North Security Substation - type: Transform - pos: 24.5,4.5 + pos: 23.5,4.5 parent: 34 - uid: 4609 components: @@ -71430,19 +74095,19 @@ entities: - type: Transform pos: -22.5,-29.5 parent: 34 - - uid: 5580 + - uid: 4878 components: - type: MetaData - name: North solar's substation + name: South Security Substation - type: Transform - pos: -23.5,3.5 + pos: 29.5,-20.5 parent: 34 - - uid: 8938 + - uid: 5580 components: - type: MetaData - name: Lower security's substation + name: North solar's substation - type: Transform - pos: 37.5,-19.5 + pos: -23.5,3.5 parent: 34 - uid: 11047 components: @@ -71503,6 +74168,13 @@ entities: - type: Transform pos: 14.5,-32.5 parent: 34 +- proto: SuitStorageCorpsman + entities: + - uid: 7681 + components: + - type: Transform + pos: 16.5,1.5 + parent: 34 - proto: SuitStorageEngi entities: - uid: 3229 @@ -71557,6 +74229,35 @@ entities: - type: Transform pos: 8.5,-53.5 parent: 34 +- proto: SuitStorageEVAPrisoner + entities: + - uid: 3513 + components: + - type: Transform + pos: 37.5,-7.5 + parent: 34 + - uid: 3661 + components: + - type: Transform + pos: 37.5,-8.5 + parent: 34 + - uid: 3720 + components: + - type: Transform + pos: 37.5,-9.5 + parent: 34 + - uid: 4679 + components: + - type: Transform + pos: 37.5,-6.5 + parent: 34 +- proto: SuitStorageHOS + entities: + - uid: 4548 + components: + - type: Transform + pos: 26.5,3.5 + parent: 34 - proto: SuitStorageParamedic entities: - uid: 3534 @@ -71571,30 +74272,32 @@ entities: parent: 34 - proto: SuitStorageSec entities: - - uid: 3587 + - uid: 6150 components: - type: Transform - pos: 28.5,-0.5 + pos: 27.5,-20.5 parent: 34 - - uid: 3597 + - uid: 6226 components: - type: Transform - pos: 23.5,-20.5 + pos: 27.5,-17.5 parent: 34 - - uid: 3707 + - uid: 8844 components: - type: Transform - pos: 25.5,-20.5 + pos: 27.5,-18.5 parent: 34 - - uid: 3711 + - uid: 8854 components: - type: Transform - pos: 29.5,-0.5 + pos: 27.5,-19.5 parent: 34 - - uid: 3712 +- proto: SuitStorageWarden + entities: + - uid: 2493 components: - type: Transform - pos: 30.5,-0.5 + pos: 39.5,-13.5 parent: 34 - proto: SurveillanceCameraCommand entities: @@ -71672,6 +74375,39 @@ entities: - SurveillanceCameraCommand nameSet: True id: Substation + - uid: 13445 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -33.5,-3.5 + parent: 34 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: MG's quarters + - uid: 13690 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -24.5,-29.5 + parent: 34 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: CE's quarters + - uid: 13706 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 26.5,5.5 + parent: 34 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: HoS's quarters - proto: SurveillanceCameraEngineering entities: - uid: 1801 @@ -71845,6 +74581,12 @@ entities: - SurveillanceCameraGeneral nameSet: True id: Bridge's front + - uid: 7066 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 31.5,-22.5 + parent: 34 - uid: 10695 components: - type: Transform @@ -71971,17 +74713,6 @@ entities: - SurveillanceCameraGeneral nameSet: True id: dock north - - uid: 10709 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 31.5,-21.5 - parent: 34 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraGeneral - nameSet: True - id: bridge - uid: 10710 components: - type: Transform @@ -72226,28 +74957,28 @@ entities: id: forensic mantis - proto: SurveillanceCameraSecurity entities: - - uid: 4559 + - uid: 4508 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 45.5,-8.5 + rot: 3.141592653589793 rad + pos: 36.5,-11.5 parent: 34 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraSecurity nameSet: True - id: Prison bedroom 3 - - uid: 4560 + id: Warden + - uid: 4559 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 45.5,-11.5 + rot: -1.5707963267948966 rad + pos: 29.5,-7.5 parent: 34 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraSecurity nameSet: True - id: Prison bedroom 4 + id: Armoury - uid: 4561 components: - type: Transform @@ -72302,92 +75033,124 @@ entities: - SurveillanceCameraSecurity nameSet: True id: Detective's office - - uid: 10716 + - uid: 10727 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 26.5,-15.5 + pos: 40.5,3.5 parent: 34 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraSecurity nameSet: True - id: south - - uid: 10717 + id: perma chow + - uid: 12883 components: - type: Transform rot: -1.5707963267948966 rad - pos: 28.5,-18.5 + pos: 47.5,-4.5 parent: 34 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraSecurity nameSet: True - id: interrogation - - uid: 10718 + id: Breakroom prison + - uid: 12887 components: - type: Transform - rot: 3.141592653589793 rad - pos: 17.5,-3.5 + pos: 41.5,-4.5 parent: 34 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraSecurity nameSet: True - id: communal cell - - uid: 10719 + id: Main hall prison + - uid: 13699 components: - type: Transform - rot: 3.141592653589793 rad - pos: 29.5,4.5 + rot: -1.5707963267948966 rad + pos: 16.5,-17.5 parent: 34 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraSecurity nameSet: True - id: armory - - uid: 10720 + id: Front + - uid: 13700 components: - type: Transform rot: 3.141592653589793 rad - pos: 24.5,-2.5 + pos: 32.5,-16.5 parent: 34 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraSecurity nameSet: True - id: north - - uid: 10727 + id: Second Entrance + - uid: 13701 components: - type: Transform - pos: 40.5,3.5 + rot: -1.5707963267948966 rad + pos: 37.5,-19.5 parent: 34 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraSecurity nameSet: True - id: perma chow - - uid: 12883 + id: Interogation + - uid: 13702 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 47.5,-4.5 + pos: 23.5,-14.5 parent: 34 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraSecurity nameSet: True - id: Breakroom prison - - uid: 12887 + id: Main hall + - uid: 13703 components: - type: Transform - pos: 41.5,-4.5 + rot: 1.5707963267948966 rad + pos: 21.5,-6.5 parent: 34 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraSecurity nameSet: True - id: Main hall prison + id: Temporary prison + - uid: 13704 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 27.5,0.5 + parent: 34 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Second inner hall + - uid: 13705 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 31.5,5.5 + parent: 34 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: HoS's Office + - uid: 13707 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 37.5,-7.5 + parent: 34 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Prison EVA - proto: SurveillanceCameraService entities: - uid: 10739 @@ -72463,6 +75226,11 @@ entities: - type: Transform pos: -9.5,-27.5 parent: 34 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSupply + nameSet: True + id: Logistic's Reception - uid: 8197 components: - type: Transform @@ -72558,11 +75326,18 @@ entities: parent: 34 - proto: SyringeInaprovaline entities: - - uid: 4194 + - uid: 12276 + components: + - type: Transform + pos: 16.439304,-1.2342451 + parent: 34 +- proto: SyringeSaline + entities: + - uid: 12215 components: - type: Transform rot: 3.141592653589793 rad - pos: 16.366955,-1.2841376 + pos: 16.61118,-1.4217451 parent: 34 - proto: Table entities: @@ -72646,15 +75421,10 @@ entities: - type: Transform pos: 10.5,-38.5 parent: 34 - - uid: 3511 - components: - - type: Transform - pos: 19.5,-20.5 - parent: 34 - - uid: 3512 + - uid: 3541 components: - type: Transform - pos: 18.5,-20.5 + pos: 16.5,-14.5 parent: 34 - uid: 3813 components: @@ -72671,6 +75441,11 @@ entities: - type: Transform pos: -8.5,-48.5 parent: 34 + - uid: 4078 + components: + - type: Transform + pos: 37.5,-33.5 + parent: 34 - uid: 4727 components: - type: Transform @@ -72691,36 +75466,6 @@ entities: - type: Transform pos: 41.5,0.5 parent: 34 - - uid: 4905 - components: - - type: Transform - pos: 29.5,-18.5 - parent: 34 - - uid: 4913 - components: - - type: Transform - pos: 22.5,-12.5 - parent: 34 - - uid: 4914 - components: - - type: Transform - pos: 22.5,-11.5 - parent: 34 - - uid: 4916 - components: - - type: Transform - pos: 23.5,-15.5 - parent: 34 - - uid: 4930 - components: - - type: Transform - pos: 20.5,-16.5 - parent: 34 - - uid: 4931 - components: - - type: Transform - pos: 19.5,-16.5 - parent: 34 - uid: 5075 components: - type: Transform @@ -72751,10 +75496,20 @@ entities: - type: Transform pos: -22.5,5.5 parent: 34 - - uid: 5955 + - uid: 6694 components: - type: Transform - pos: 29.5,-19.5 + pos: 21.5,-16.5 + parent: 34 + - uid: 6792 + components: + - type: Transform + pos: 22.5,-16.5 + parent: 34 + - uid: 6793 + components: + - type: Transform + pos: 23.5,-16.5 parent: 34 - uid: 7396 components: @@ -72896,11 +75651,6 @@ entities: - type: Transform pos: -55.5,0.5 parent: 34 - - uid: 3622 - components: - - type: Transform - pos: 18.5,-7.5 - parent: 34 - uid: 5035 components: - type: Transform @@ -72943,6 +75693,11 @@ entities: - type: Transform pos: 3.5,-3.5 parent: 34 + - uid: 994 + components: + - type: Transform + pos: 16.5,-9.5 + parent: 34 - uid: 1306 components: - type: Transform @@ -72985,20 +75740,15 @@ entities: - type: Transform pos: 10.5,-26.5 parent: 34 - - uid: 3595 - components: - - type: Transform - pos: 30.5,1.5 - parent: 34 - - uid: 3708 + - uid: 3693 components: - type: Transform - pos: 25.5,1.5 + pos: 17.5,-15.5 parent: 34 - - uid: 3740 + - uid: 3747 components: - type: Transform - pos: 28.5,4.5 + pos: 39.5,-19.5 parent: 34 - uid: 4031 components: @@ -73053,6 +75803,16 @@ entities: - type: Transform pos: 39.5,3.5 parent: 34 + - uid: 4757 + components: + - type: Transform + pos: 16.5,-3.5 + parent: 34 + - uid: 4789 + components: + - type: Transform + pos: 16.5,-6.5 + parent: 34 - uid: 5073 components: - type: Transform @@ -73063,17 +75823,15 @@ entities: - type: Transform pos: -1.5,-17.5 parent: 34 - - uid: 6340 + - uid: 7049 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 18.5,-0.5 + pos: 29.5,-7.5 parent: 34 - - uid: 8028 + - uid: 7190 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 18.5,-1.5 + pos: 29.5,-8.5 parent: 34 - uid: 8157 components: @@ -73091,6 +75849,16 @@ entities: - type: Transform pos: -42.5,-16.5 parent: 34 + - uid: 12116 + components: + - type: Transform + pos: 41.5,-16.5 + parent: 34 + - uid: 12546 + components: + - type: Transform + pos: 41.5,-15.5 + parent: 34 - uid: 12792 components: - type: Transform @@ -73114,7 +75882,7 @@ entities: rot: -1.5707963267948966 rad pos: 54.5,-38.5 parent: 34 - - uid: 13447 + - uid: 13675 components: - type: Transform pos: 7.5,-29.5 @@ -73331,12 +76099,6 @@ entities: - type: Transform pos: 6.5,-47.5 parent: 34 - - uid: 4201 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 16.5,-1.5 - parent: 34 - uid: 4269 components: - type: Transform @@ -73363,6 +76125,11 @@ entities: - type: Transform pos: -50.5,2.5 parent: 34 + - uid: 7038 + components: + - type: Transform + pos: 29.5,-17.5 + parent: 34 - uid: 7849 components: - type: Transform @@ -73396,12 +76163,6 @@ entities: - type: Transform pos: -8.5,-29.5 parent: 34 - - uid: 12848 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 32.5,-13.5 - parent: 34 - uid: 13038 components: - type: Transform @@ -73422,6 +76183,11 @@ entities: - type: Transform pos: 45.5,-35.5 parent: 34 + - uid: 13599 + components: + - type: Transform + pos: 22.5,-14.5 + parent: 34 - proto: TablePlasmaGlass entities: - uid: 2953 @@ -73518,11 +76284,6 @@ entities: - type: Transform pos: -13.5,-8.5 parent: 34 - - uid: 1282 - components: - - type: Transform - pos: 21.5,-13.5 - parent: 34 - uid: 1384 components: - type: Transform @@ -73548,15 +76309,40 @@ entities: - type: Transform pos: -20.5,-26.5 parent: 34 - - uid: 3696 + - uid: 3487 components: - type: Transform - pos: 24.5,0.5 + pos: 30.5,-5.5 parent: 34 - - uid: 3697 + - uid: 3522 components: - type: Transform - pos: 24.5,-0.5 + pos: 17.5,-20.5 + parent: 34 + - uid: 3605 + components: + - type: Transform + pos: 19.5,-20.5 + parent: 34 + - uid: 3654 + components: + - type: Transform + pos: 28.5,3.5 + parent: 34 + - uid: 3716 + components: + - type: Transform + pos: 30.5,3.5 + parent: 34 + - uid: 3718 + components: + - type: Transform + pos: 29.5,3.5 + parent: 34 + - uid: 3768 + components: + - type: Transform + pos: 16.5,-16.5 parent: 34 - uid: 3907 components: @@ -73580,11 +76366,31 @@ entities: rot: 3.141592653589793 rad pos: -10.5,-42.5 parent: 34 + - uid: 4137 + components: + - type: Transform + pos: 16.5,-17.5 + parent: 34 - uid: 4483 components: - type: Transform pos: 33.5,-42.5 parent: 34 + - uid: 4496 + components: + - type: Transform + pos: 38.5,-13.5 + parent: 34 + - uid: 4507 + components: + - type: Transform + pos: 18.5,-20.5 + parent: 34 + - uid: 4865 + components: + - type: Transform + pos: 31.5,-5.5 + parent: 34 - uid: 5422 components: - type: Transform @@ -73663,6 +76469,46 @@ entities: - type: Transform pos: 1.5,-26.5 parent: 34 + - uid: 4760 + components: + - type: Transform + pos: 35.5,-14.5 + parent: 34 + - uid: 4804 + components: + - type: Transform + pos: 35.5,-13.5 + parent: 34 + - uid: 6714 + components: + - type: Transform + pos: 19.5,1.5 + parent: 34 + - uid: 6729 + components: + - type: Transform + pos: 27.5,-11.5 + parent: 34 + - uid: 6995 + components: + - type: Transform + pos: 23.5,-11.5 + parent: 34 + - uid: 6996 + components: + - type: Transform + pos: 23.5,-10.5 + parent: 34 + - uid: 7676 + components: + - type: Transform + pos: 16.5,-1.5 + parent: 34 + - uid: 12460 + components: + - type: Transform + pos: 35.5,-12.5 + parent: 34 - uid: 12529 components: - type: Transform @@ -73744,36 +76590,11 @@ entities: - type: Transform pos: -32.5,-15.5 parent: 34 - - uid: 3627 - components: - - type: Transform - pos: 19.5,-3.5 - parent: 34 - - uid: 3635 - components: - - type: Transform - pos: 27.5,-6.5 - parent: 34 - - uid: 3757 - components: - - type: Transform - pos: 29.5,-10.5 - parent: 34 - - uid: 3758 - components: - - type: Transform - pos: 30.5,-10.5 - parent: 34 - uid: 4329 components: - type: Transform pos: 48.5,-9.5 parent: 34 - - uid: 4344 - components: - - type: Transform - pos: 39.5,-7.5 - parent: 34 - uid: 4801 components: - type: Transform @@ -73814,16 +76635,6 @@ entities: - type: Transform pos: -28.5,-23.5 parent: 34 - - uid: 8942 - components: - - type: Transform - pos: 41.5,-18.5 - parent: 34 - - uid: 11261 - components: - - type: Transform - pos: 35.5,-10.5 - parent: 34 - uid: 11750 components: - type: Transform @@ -74295,26 +77106,6 @@ entities: color: '#FF3300FF' - proto: TelecomServer entities: - - uid: 3762 - components: - - type: Transform - pos: 27.5,-10.5 - parent: 34 - - type: ContainerContainer - containers: - key_slots: !type:Container - showEnts: False - occludes: True - ents: - - 3763 - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - uid: 12050 components: - type: Transform @@ -74501,21 +77292,6 @@ entities: - type: Transform pos: -46.5,-2.5 parent: 34 - - uid: 4882 - components: - - type: Transform - pos: 28.5,-15.5 - parent: 34 - - uid: 4883 - components: - - type: Transform - pos: 29.5,-15.5 - parent: 34 - - uid: 4884 - components: - - type: Transform - pos: 30.5,-15.5 - parent: 34 - uid: 5956 components: - type: Transform @@ -74601,11 +77377,6 @@ entities: parent: 34 - proto: ToolboxElectricalFilled entities: - - uid: 1077 - components: - - type: Transform - pos: 34.524654,-6.9607882 - parent: 34 - uid: 2108 components: - type: Transform @@ -74673,19 +77444,40 @@ entities: - type: Transform pos: -15.406212,4.3849206 parent: 34 -- proto: TorsoSkeleton +- proto: ToyAi entities: - - uid: 4659 + - uid: 13307 components: - type: Transform - pos: 41.464695,-16.448792 + pos: 66.48126,-23.344564 parent: 34 -- proto: ToyAi +- proto: ToyFigurineHeadOfSecurity entities: - - uid: 13307 + - uid: 3612 components: - type: Transform - pos: 66.48126,-23.344564 + pos: 29.45367,4.57589 + parent: 34 +- proto: ToyFigurinePassenger + entities: + - uid: 13665 + components: + - type: Transform + pos: 50.5226,-3.4229083 + parent: 34 +- proto: ToyFigurineSecurity + entities: + - uid: 13546 + components: + - type: Transform + pos: 23.123682,-16.385117 + parent: 34 +- proto: ToyFigurineWarden + entities: + - uid: 12849 + components: + - type: Transform + pos: 36.454975,-13.376591 parent: 34 - proto: ToyIan entities: @@ -74746,23 +77538,12 @@ entities: - type: Transform pos: -0.5,-19.5 parent: 34 -- proto: TrainingBomb +- proto: TrashBag entities: - - uid: 7869 - components: - - type: Transform - pos: 34.5,-6.5 - parent: 34 - - uid: 8685 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 32.5,-6.5 - parent: 34 - - uid: 9577 + - uid: 13654 components: - type: Transform - pos: 34.5,-7.5 + pos: 16.45031,-6.399351 parent: 34 - proto: TwoWayLever entities: @@ -74872,6 +77653,12 @@ entities: rot: 1.5707963267948966 rad pos: 5.5,-9.5 parent: 34 + - uid: 4811 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 45.5,1.5 + parent: 34 - proto: Vaccinator entities: - uid: 2506 @@ -74978,10 +77765,15 @@ entities: - type: Transform pos: -0.5,-3.5 parent: 34 - - uid: 4673 + - uid: 4189 + components: + - type: Transform + pos: 29.5,-18.5 + parent: 34 + - uid: 4947 components: - type: Transform - pos: 45.5,-4.5 + pos: 41.5,-7.5 parent: 34 - uid: 9425 components: @@ -75012,6 +77804,11 @@ entities: - type: Transform pos: -12.5,-27.5 parent: 34 + - uid: 3611 + components: + - type: Transform + pos: 25.5,1.5 + parent: 34 - uid: 10367 components: - type: Transform @@ -75069,22 +77866,22 @@ entities: parent: 34 - proto: VendingMachineDiscount entities: - - uid: 4851 + - uid: 4843 components: - type: Transform - pos: 44.5,1.5 + pos: 41.5,-6.5 parent: 34 - proto: VendingMachineDonut entities: - - uid: 10368 + - uid: 3592 components: - type: Transform - pos: 7.5,-22.5 + pos: 26.5,1.5 parent: 34 - - uid: 12849 + - uid: 10368 components: - type: Transform - pos: 33.5,-13.5 + pos: 7.5,-22.5 parent: 34 - proto: VendingMachineEngiDrobe entities: @@ -75205,17 +78002,17 @@ entities: parent: 34 - proto: VendingMachineSec entities: - - uid: 3582 + - uid: 6053 components: - type: Transform - pos: 24.5,-20.5 + pos: 27.5,-16.5 parent: 34 - proto: VendingMachineSecDrobe entities: - - uid: 11340 + - uid: 4138 components: - type: Transform - pos: 20.5,-20.5 + pos: 21.5,-20.5 parent: 34 - proto: VendingMachineSeeds entities: @@ -75250,15 +78047,15 @@ entities: - type: Transform pos: -35.5,-34.5 parent: 34 - - uid: 5603 + - uid: 4950 components: - type: Transform - pos: -20.5,5.5 + pos: 39.5,-6.5 parent: 34 - - uid: 10023 + - uid: 5603 components: - type: Transform - pos: 39.5,-4.5 + pos: -20.5,5.5 parent: 34 - proto: VendingMachineTheater entities: @@ -75298,6 +78095,20 @@ entities: - type: Transform pos: 9.741736,-40.32208 parent: 34 +- proto: WallmountTelescreen + entities: + - uid: 3642 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 37.5,-14.5 + parent: 34 + - uid: 3698 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 29.5,3.5 + parent: 34 - proto: WallmountTelevision entities: - uid: 5418 @@ -75305,6 +78116,14 @@ entities: - type: Transform pos: 2.5,-2.5 parent: 34 +- proto: WallmountTelevisionFrame + entities: + - uid: 4932 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 28.5,-8.5 + parent: 34 - proto: WallPaper entities: - uid: 46 @@ -75394,6 +78213,11 @@ entities: parent: 34 - proto: WallReinforced entities: + - uid: 9 + components: + - type: Transform + pos: 22.5,-15.5 + parent: 34 - uid: 11 components: - type: Transform @@ -75439,11 +78263,6 @@ entities: - type: Transform pos: -17.5,5.5 parent: 34 - - uid: 73 - components: - - type: Transform - pos: 35.5,-17.5 - parent: 34 - uid: 176 components: - type: Transform @@ -75484,6 +78303,11 @@ entities: - type: Transform pos: -23.5,-33.5 parent: 34 + - uid: 226 + components: + - type: Transform + pos: 38.5,-14.5 + parent: 34 - uid: 235 components: - type: Transform @@ -75554,11 +78378,6 @@ entities: - type: Transform pos: 4.5,-30.5 parent: 34 - - uid: 331 - components: - - type: Transform - pos: 27.5,-20.5 - parent: 34 - uid: 358 components: - type: Transform @@ -76174,11 +78993,6 @@ entities: - type: Transform pos: 36.5,-26.5 parent: 34 - - uid: 785 - components: - - type: Transform - pos: 31.5,-17.5 - parent: 34 - uid: 788 components: - type: Transform @@ -76274,11 +79088,6 @@ entities: - type: Transform pos: 16.5,-21.5 parent: 34 - - uid: 988 - components: - - type: Transform - pos: 17.5,-21.5 - parent: 34 - uid: 989 components: - type: Transform @@ -76299,31 +79108,11 @@ entities: - type: Transform pos: 15.5,-19.5 parent: 34 - - uid: 993 - components: - - type: Transform - pos: 19.5,-15.5 - parent: 34 - - uid: 994 - components: - - type: Transform - pos: 16.5,-11.5 - parent: 34 - uid: 996 components: - type: Transform pos: 15.5,-8.5 parent: 34 - - uid: 997 - components: - - type: Transform - pos: 15.5,-10.5 - parent: 34 - - uid: 1002 - components: - - type: Transform - pos: 21.5,-15.5 - parent: 34 - uid: 1012 components: - type: Transform @@ -76364,10 +79153,10 @@ entities: - type: Transform pos: -27.5,-28.5 parent: 34 - - uid: 1053 + - uid: 1060 components: - type: Transform - pos: 38.5,-5.5 + pos: 33.5,-5.5 parent: 34 - uid: 1062 components: @@ -76394,6 +79183,11 @@ entities: - type: Transform pos: -28.5,-38.5 parent: 34 + - uid: 1103 + components: + - type: Transform + pos: 24.5,1.5 + parent: 34 - uid: 1117 components: - type: Transform @@ -76604,6 +79398,11 @@ entities: - type: Transform pos: -15.5,-13.5 parent: 34 + - uid: 1282 + components: + - type: Transform + pos: 15.5,-5.5 + parent: 34 - uid: 1293 components: - type: Transform @@ -76974,11 +79773,6 @@ entities: - type: Transform pos: -53.5,-17.5 parent: 34 - - uid: 1804 - components: - - type: Transform - pos: 32.5,-8.5 - parent: 34 - uid: 1812 components: - type: Transform @@ -76999,11 +79793,6 @@ entities: - type: Transform pos: -48.5,-28.5 parent: 34 - - uid: 1825 - components: - - type: Transform - pos: 17.5,-15.5 - parent: 34 - uid: 1829 components: - type: Transform @@ -77017,7 +79806,17 @@ entities: - uid: 1862 components: - type: Transform - pos: 20.5,-15.5 + pos: 41.5,-11.5 + parent: 34 + - uid: 1864 + components: + - type: Transform + pos: 41.5,-12.5 + parent: 34 + - uid: 1867 + components: + - type: Transform + pos: 36.5,-8.5 parent: 34 - uid: 1869 components: @@ -77029,6 +79828,12 @@ entities: - type: Transform pos: -6.5,-31.5 parent: 34 + - uid: 1970 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 29.5,-5.5 + parent: 34 - uid: 1995 components: - type: Transform @@ -77069,11 +79874,23 @@ entities: - type: Transform pos: -33.5,0.5 parent: 34 + - uid: 2031 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 28.5,-5.5 + parent: 34 - uid: 2032 components: - type: Transform pos: -28.5,2.5 parent: 34 + - uid: 2063 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 28.5,-7.5 + parent: 34 - uid: 2080 components: - type: Transform @@ -77167,7 +79984,8 @@ entities: - uid: 2386 components: - type: Transform - pos: 39.5,-5.5 + rot: 1.5707963267948966 rad + pos: 28.5,-8.5 parent: 34 - uid: 2404 components: @@ -77192,7 +80010,8 @@ entities: - uid: 2431 components: - type: Transform - pos: 41.5,-8.5 + rot: 1.5707963267948966 rad + pos: 28.5,-9.5 parent: 34 - uid: 2433 components: @@ -77202,7 +80021,8 @@ entities: - uid: 2434 components: - type: Transform - pos: 34.5,-4.5 + rot: 1.5707963267948966 rad + pos: 28.5,-6.5 parent: 34 - uid: 2436 components: @@ -77212,7 +80032,8 @@ entities: - uid: 2474 components: - type: Transform - pos: 31.5,-10.5 + rot: 1.5707963267948966 rad + pos: 28.5,-10.5 parent: 34 - uid: 2477 components: @@ -77339,6 +80160,11 @@ entities: - type: Transform pos: 46.5,-14.5 parent: 34 + - uid: 2635 + components: + - type: Transform + pos: 28.5,-11.5 + parent: 34 - uid: 2637 components: - type: Transform @@ -77494,6 +80320,16 @@ entities: - type: Transform pos: 48.5,-41.5 parent: 34 + - uid: 3284 + components: + - type: Transform + pos: 27.5,-6.5 + parent: 34 + - uid: 3285 + components: + - type: Transform + pos: 16.5,-11.5 + parent: 34 - uid: 3286 components: - type: Transform @@ -77519,15 +80355,25 @@ entities: - type: Transform pos: 36.5,-31.5 parent: 34 - - uid: 3338 + - uid: 3339 components: - type: Transform - pos: 16.5,-15.5 + pos: 15.5,-20.5 parent: 34 - - uid: 3339 + - uid: 3341 components: - type: Transform - pos: 15.5,-20.5 + pos: 20.5,0.5 + parent: 34 + - uid: 3380 + components: + - type: Transform + pos: 32.5,6.5 + parent: 34 + - uid: 3381 + components: + - type: Transform + pos: 32.5,5.5 parent: 34 - uid: 3383 components: @@ -77539,30 +80385,30 @@ entities: - type: Transform pos: -51.5,-37.5 parent: 34 - - uid: 3390 + - uid: 3388 components: - type: Transform - pos: 17.5,-8.5 + pos: 27.5,2.5 parent: 34 - - uid: 3393 + - uid: 3389 components: - type: Transform - pos: 15.5,-7.5 + pos: 32.5,1.5 parent: 34 - - uid: 3394 + - uid: 3390 components: - type: Transform - pos: 17.5,-11.5 + pos: 32.5,0.5 parent: 34 - - uid: 3395 + - uid: 3391 components: - type: Transform - pos: 18.5,-11.5 + pos: 32.5,-0.5 parent: 34 - - uid: 3396 + - uid: 3392 components: - type: Transform - pos: 19.5,-11.5 + pos: 27.5,3.5 parent: 34 - uid: 3409 components: @@ -77644,10 +80490,10 @@ entities: - type: Transform pos: -50.5,8.5 parent: 34 - - uid: 3476 + - uid: 3477 components: - type: Transform - pos: 21.5,-11.5 + pos: 21.5,-2.5 parent: 34 - uid: 3480 components: @@ -77674,11 +80520,6 @@ entities: - type: Transform pos: 22.5,-21.5 parent: 34 - - uid: 3487 - components: - - type: Transform - pos: 20.5,-0.5 - parent: 34 - uid: 3488 components: - type: Transform @@ -77699,60 +80540,55 @@ entities: - type: Transform pos: 18.5,-2.5 parent: 34 - - uid: 3492 - components: - - type: Transform - pos: 16.5,-2.5 - parent: 34 - uid: 3493 components: - type: Transform pos: 15.5,-2.5 parent: 34 - - uid: 3495 + - uid: 3497 components: - type: Transform - pos: 21.5,-8.5 + pos: 22.5,-3.5 parent: 34 - - uid: 3496 + - uid: 3500 components: - type: Transform - pos: 19.5,-8.5 + pos: 20.5,-11.5 parent: 34 - - uid: 3498 + - uid: 3503 components: - type: Transform - pos: 18.5,-8.5 + pos: 39.5,-9.5 parent: 34 - - uid: 3499 + - uid: 3508 components: - type: Transform - pos: 15.5,-3.5 + pos: 39.5,-8.5 parent: 34 - - uid: 3505 + - uid: 3509 components: - type: Transform - pos: 15.5,-9.5 + pos: 21.5,-11.5 parent: 34 - - uid: 3520 + - uid: 3510 components: - type: Transform - pos: 21.5,-3.5 + pos: 22.5,-11.5 parent: 34 - - uid: 3522 + - uid: 3512 components: - type: Transform - pos: 21.5,-2.5 + pos: 22.5,-2.5 parent: 34 - - uid: 3523 + - uid: 3514 components: - type: Transform - pos: 28.5,-8.5 + pos: 17.5,-11.5 parent: 34 - - uid: 3524 + - uid: 3521 components: - type: Transform - pos: 27.5,-8.5 + pos: 16.5,-2.5 parent: 34 - uid: 3527 components: @@ -77774,165 +80610,186 @@ entities: - type: Transform pos: 27.5,-21.5 parent: 34 - - uid: 3538 + - uid: 3535 components: - type: Transform - pos: 20.5,-8.5 + pos: 36.5,-7.5 parent: 34 - - uid: 3541 + - uid: 3539 components: - type: Transform - pos: 26.5,-11.5 + pos: 32.5,-20.5 parent: 34 - - uid: 3542 + - uid: 3544 components: - type: Transform - pos: 26.5,-8.5 + pos: 22.5,-6.5 parent: 34 - uid: 3546 components: - type: Transform pos: 16.5,-31.5 parent: 34 - - uid: 3547 + - uid: 3548 components: - type: Transform - pos: 30.5,-6.5 + pos: 23.5,-6.5 parent: 34 - - uid: 3548 + - uid: 3555 components: - type: Transform - pos: 30.5,-7.5 + pos: 28.5,-20.5 parent: 34 - - uid: 3550 + - uid: 3557 components: - type: Transform - pos: 29.5,-8.5 + pos: 41.5,-14.5 parent: 34 - - uid: 3551 + - uid: 3558 components: - type: Transform - pos: 30.5,-8.5 + pos: 41.5,-13.5 parent: 34 - - uid: 3552 + - uid: 3567 components: - type: Transform - pos: 26.5,-12.5 + pos: 32.5,-1.5 parent: 34 - - uid: 3555 + - uid: 3568 components: - type: Transform - pos: 28.5,-20.5 + pos: 27.5,5.5 parent: 34 - - uid: 3557 + - uid: 3570 components: - type: Transform - pos: 31.5,-12.5 + pos: 36.5,-9.5 parent: 34 - - uid: 3600 + - uid: 3572 components: - type: Transform - pos: 31.5,-8.5 + pos: 24.5,5.5 parent: 34 - - uid: 3601 + - uid: 3576 components: - type: Transform - pos: -19.5,-38.5 + pos: 37.5,-10.5 parent: 34 - - uid: 3602 + - uid: 3578 components: - type: Transform - pos: 36.5,-37.5 + pos: 36.5,-10.5 parent: 34 - - uid: 3647 + - uid: 3583 components: - type: Transform - pos: 23.5,6.5 + pos: 32.5,-11.5 parent: 34 - - uid: 3648 + - uid: 3587 components: - type: Transform - pos: 25.5,2.5 + pos: 21.5,1.5 parent: 34 - - uid: 3650 + - uid: 3588 components: - type: Transform - pos: 24.5,-1.5 + pos: 18.5,-11.5 parent: 34 - - uid: 3651 + - uid: 3590 components: - type: Transform - pos: 24.5,2.5 + pos: 18.5,-5.5 parent: 34 - - uid: 3653 + - uid: 3591 components: - type: Transform - pos: 24.5,6.5 + pos: 18.5,-8.5 parent: 34 - - uid: 3654 + - uid: 3597 components: - type: Transform - pos: 25.5,3.5 + pos: 32.5,2.5 parent: 34 - - uid: 3655 + - uid: 3599 components: - type: Transform - pos: 25.5,4.5 + pos: 16.5,-8.5 parent: 34 - - uid: 3656 + - uid: 3601 components: - type: Transform - pos: 25.5,5.5 + pos: -19.5,-38.5 parent: 34 - - uid: 3657 + - uid: 3602 components: - type: Transform - pos: 25.5,6.5 + pos: 36.5,-37.5 parent: 34 - - uid: 3658 + - uid: 3615 components: - type: Transform - pos: 31.5,2.5 + pos: 36.5,-34.5 parent: 34 - - uid: 3659 + - uid: 3618 components: - type: Transform - pos: 31.5,3.5 + pos: 19.5,-11.5 parent: 34 - - uid: 3660 + - uid: 3633 components: - type: Transform - pos: 31.5,4.5 + pos: 37.5,-11.5 parent: 34 - - uid: 3661 + - uid: 3634 components: - type: Transform - pos: 31.5,5.5 + pos: 19.5,-15.5 parent: 34 - - uid: 3662 + - uid: 3644 components: - type: Transform - pos: 31.5,6.5 + pos: 37.5,-15.5 parent: 34 - - uid: 3663 + - uid: 3647 components: - type: Transform - pos: 30.5,2.5 + pos: 23.5,6.5 parent: 34 - - uid: 3664 + - uid: 3651 components: - type: Transform - pos: 30.5,3.5 + pos: 24.5,2.5 parent: 34 - - uid: 3665 + - uid: 3653 components: - type: Transform - pos: 30.5,4.5 + pos: 24.5,6.5 parent: 34 - - uid: 3666 + - uid: 3656 components: - type: Transform - pos: 30.5,5.5 + pos: 36.5,-5.5 + parent: 34 + - uid: 3657 + components: + - type: Transform + pos: 25.5,6.5 + parent: 34 + - uid: 3659 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 32.5,-15.5 + parent: 34 + - uid: 3662 + components: + - type: Transform + pos: 31.5,6.5 + parent: 34 + - uid: 3665 + components: + - type: Transform + pos: 22.5,-10.5 parent: 34 - uid: 3667 components: @@ -77954,60 +80811,66 @@ entities: - type: Transform pos: 28.5,6.5 parent: 34 - - uid: 3671 + - uid: 3676 components: - type: Transform - pos: 28.5,5.5 + pos: 29.5,-19.5 parent: 34 - - uid: 3672 + - uid: 3678 components: - type: Transform - pos: 30.5,-1.5 + pos: 29.5,6.5 parent: 34 - - uid: 3676 + - uid: 3688 components: - type: Transform - pos: 27.5,5.5 + rot: -1.5707963267948966 rad + pos: 32.5,-10.5 parent: 34 - - uid: 3677 + - uid: 3700 components: - type: Transform - pos: 26.5,5.5 + pos: 39.5,-10.5 parent: 34 - - uid: 3678 + - uid: 3702 components: - type: Transform - pos: 29.5,6.5 + pos: 17.5,-21.5 parent: 34 - - uid: 3679 + - uid: 3704 components: - type: Transform - pos: 29.5,5.5 + pos: 31.5,-21.5 parent: 34 - - uid: 3703 + - uid: 3705 components: - type: Transform - pos: 31.5,-1.5 + pos: 37.5,-13.5 parent: 34 - - uid: 3704 + - uid: 3708 components: - type: Transform - pos: 31.5,-0.5 + pos: 23.5,1.5 parent: 34 - - uid: 3705 + - uid: 3725 components: - type: Transform - pos: 31.5,0.5 + pos: 17.5,-8.5 parent: 34 - - uid: 3706 + - uid: 3737 components: - type: Transform pos: 31.5,1.5 parent: 34 - - uid: 3735 + - uid: 3762 components: - type: Transform - pos: 23.5,2.5 + pos: 41.5,-10.5 + parent: 34 + - uid: 3767 + components: + - type: Transform + pos: 41.5,-8.5 parent: 34 - uid: 3792 components: @@ -78129,6 +80992,11 @@ entities: - type: Transform pos: 36.5,-33.5 parent: 34 + - uid: 4014 + components: + - type: Transform + pos: 40.5,-10.5 + parent: 34 - uid: 4016 components: - type: Transform @@ -78219,50 +81087,31 @@ entities: - type: Transform pos: -49.5,-30.5 parent: 34 - - uid: 4138 - components: - - type: Transform - pos: 33.5,-8.5 - parent: 34 - uid: 4140 components: - type: Transform - pos: 34.5,-5.5 + pos: 39.5,-14.5 parent: 34 - uid: 4147 components: - type: Transform pos: 19.5,-44.5 parent: 34 - - uid: 4149 - components: - - type: Transform - pos: 31.5,-18.5 - parent: 34 - uid: 4151 components: - type: Transform - pos: 31.5,-15.5 - parent: 34 - - uid: 4152 - components: - - type: Transform - pos: 31.5,-16.5 + pos: 27.5,1.5 parent: 34 - uid: 4154 components: - type: Transform - pos: 38.5,-15.5 - parent: 34 - - uid: 4155 - components: - - type: Transform - pos: 34.5,-15.5 + pos: 17.5,-5.5 parent: 34 - uid: 4158 components: - type: Transform - pos: 34.5,-12.5 + rot: 1.5707963267948966 rad + pos: 35.5,-5.5 parent: 34 - uid: 4165 components: @@ -78274,15 +81123,10 @@ entities: - type: Transform pos: 39.5,-26.5 parent: 34 - - uid: 4167 - components: - - type: Transform - pos: 30.5,-5.5 - parent: 34 - - uid: 4172 + - uid: 4170 components: - type: Transform - pos: 34.5,-18.5 + pos: 23.5,-15.5 parent: 34 - uid: 4262 components: @@ -78419,11 +81263,6 @@ entities: - type: Transform pos: 13.5,-35.5 parent: 34 - - uid: 4417 - components: - - type: Transform - pos: 35.5,-5.5 - parent: 34 - uid: 4419 components: - type: Transform @@ -78434,26 +81273,11 @@ entities: - type: Transform pos: 35.5,-1.5 parent: 34 - - uid: 4422 - components: - - type: Transform - pos: 37.5,-5.5 - parent: 34 - uid: 4423 components: - type: Transform pos: 35.5,-0.5 parent: 34 - - uid: 4424 - components: - - type: Transform - pos: 35.5,-6.5 - parent: 34 - - uid: 4425 - components: - - type: Transform - pos: 32.5,-0.5 - parent: 34 - uid: 4427 components: - type: Transform @@ -78464,11 +81288,6 @@ entities: - type: Transform pos: 36.5,-1.5 parent: 34 - - uid: 4429 - components: - - type: Transform - pos: 33.5,-12.5 - parent: 34 - uid: 4443 components: - type: Transform @@ -78569,6 +81388,11 @@ entities: - type: Transform pos: 23.5,-44.5 parent: 34 + - uid: 4497 + components: + - type: Transform + pos: 36.5,-6.5 + parent: 34 - uid: 4500 components: - type: Transform @@ -78577,12 +81401,12 @@ entities: - uid: 4501 components: - type: Transform - pos: 34.5,-0.5 + pos: 22.5,-7.5 parent: 34 - - uid: 4508 + - uid: 4504 components: - type: Transform - pos: 35.5,-7.5 + pos: 16.5,-5.5 parent: 34 - uid: 4515 components: @@ -78624,21 +81448,31 @@ entities: - type: Transform pos: 35.5,6.5 parent: 34 - - uid: 4534 + - uid: 4538 components: - type: Transform - pos: 38.5,-11.5 + pos: 24.5,4.5 parent: 34 - - uid: 4538 + - uid: 4542 components: - type: Transform - pos: 38.5,-14.5 + pos: 24.5,3.5 parent: 34 - uid: 4546 components: - type: Transform pos: 46.5,-5.5 parent: 34 + - uid: 4549 + components: + - type: Transform + pos: 25.5,2.5 + parent: 34 + - uid: 4553 + components: + - type: Transform + pos: 32.5,4.5 + parent: 34 - uid: 4566 components: - type: Transform @@ -78739,11 +81573,6 @@ entities: - type: Transform pos: 45.5,7.5 parent: 34 - - uid: 4622 - components: - - type: Transform - pos: 42.5,7.5 - parent: 34 - uid: 4623 components: - type: Transform @@ -78772,12 +81601,7 @@ entities: - uid: 4638 components: - type: Transform - pos: 34.5,-11.5 - parent: 34 - - uid: 4639 - components: - - type: Transform - pos: 34.5,-10.5 + pos: 26.5,2.5 parent: 34 - uid: 4640 components: @@ -78804,15 +81628,40 @@ entities: - type: Transform pos: 51.5,2.5 parent: 34 - - uid: 4649 + - uid: 4653 components: - type: Transform - pos: 38.5,-19.5 + pos: 49.5,-5.5 parent: 34 - - uid: 4653 + - uid: 4658 components: - type: Transform - pos: 49.5,-5.5 + pos: 27.5,-15.5 + parent: 34 + - uid: 4660 + components: + - type: Transform + pos: 37.5,-14.5 + parent: 34 + - uid: 4671 + components: + - type: Transform + pos: 40.5,-8.5 + parent: 34 + - uid: 4742 + components: + - type: Transform + pos: 40.5,-14.5 + parent: 34 + - uid: 4743 + components: + - type: Transform + pos: 36.5,-17.5 + parent: 34 + - uid: 4748 + components: + - type: Transform + pos: 38.5,-10.5 parent: 34 - uid: 4751 components: @@ -78829,70 +81678,76 @@ entities: - type: Transform pos: 46.5,-11.5 parent: 34 - - uid: 4861 + - uid: 4846 components: - type: Transform - pos: 32.5,-12.5 + pos: 32.5,3.5 parent: 34 - - uid: 4862 + - uid: 4850 components: - type: Transform - pos: 40.5,-20.5 + pos: 40.5,-7.5 parent: 34 - - uid: 4863 + - uid: 4854 components: - type: Transform - pos: 37.5,-17.5 + pos: 29.5,-11.5 parent: 34 - - uid: 4871 + - uid: 4858 components: - type: Transform - pos: 42.5,-15.5 + pos: 31.5,-11.5 parent: 34 - - uid: 4877 + - uid: 4862 components: - type: Transform - pos: 29.5,-20.5 + pos: 40.5,-20.5 parent: 34 - - uid: 4878 + - uid: 4864 components: - type: Transform - pos: 30.5,-20.5 + pos: 32.5,-5.5 parent: 34 - - uid: 4879 + - uid: 4866 components: - type: Transform - pos: 31.5,-20.5 + pos: 30.5,-11.5 parent: 34 - - uid: 4897 + - uid: 4867 components: - type: Transform - pos: 31.5,-19.5 + pos: 40.5,-6.5 parent: 34 - - uid: 4898 + - uid: 4871 components: - type: Transform - pos: 35.5,-20.5 + pos: 42.5,-15.5 parent: 34 - - uid: 4899 + - uid: 4879 components: - type: Transform - pos: 34.5,-19.5 + pos: 20.5,-15.5 parent: 34 - - uid: 4949 + - uid: 4880 components: - type: Transform - pos: 38.5,-17.5 + pos: 20.5,-16.5 parent: 34 - - uid: 4950 + - uid: 4881 components: - type: Transform - pos: 38.5,-18.5 + pos: 20.5,-20.5 parent: 34 - - uid: 4958 + - uid: 4935 components: - type: Transform - pos: 32.5,-15.5 + pos: 21.5,-15.5 + parent: 34 + - uid: 4939 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 36.5,-15.5 parent: 34 - uid: 4959 components: @@ -78989,11 +81844,6 @@ entities: - type: Transform pos: -58.5,3.5 parent: 34 - - uid: 5009 - components: - - type: Transform - pos: 34.5,-20.5 - parent: 34 - uid: 5010 components: - type: Transform @@ -79214,11 +82064,6 @@ entities: - type: Transform pos: -4.5,-55.5 parent: 34 - - uid: 5268 - components: - - type: Transform - pos: 31.5,-9.5 - parent: 34 - uid: 5271 components: - type: Transform @@ -79319,6 +82164,11 @@ entities: - type: Transform pos: 51.5,-37.5 parent: 34 + - uid: 5545 + components: + - type: Transform + pos: 28.5,-15.5 + parent: 34 - uid: 5576 components: - type: Transform @@ -79469,11 +82319,32 @@ entities: - type: Transform pos: -58.5,8.5 parent: 34 + - uid: 5910 + components: + - type: Transform + pos: 28.5,-16.5 + parent: 34 - uid: 5914 components: - type: Transform pos: -43.5,8.5 parent: 34 + - uid: 5955 + components: + - type: Transform + pos: 28.5,-17.5 + parent: 34 + - uid: 6009 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 28.5,-18.5 + parent: 34 + - uid: 6024 + components: + - type: Transform + pos: 28.5,-19.5 + parent: 34 - uid: 6106 components: - type: Transform @@ -79684,15 +82555,25 @@ entities: - type: Transform pos: 12.5,-46.5 parent: 34 + - uid: 6715 + components: + - type: Transform + pos: 34.5,-5.5 + parent: 34 - uid: 6749 components: - type: Transform pos: 15.5,-45.5 parent: 34 - - uid: 6952 + - uid: 6935 components: - type: Transform - pos: 20.5,19.5 + pos: 37.5,-17.5 + parent: 34 + - uid: 6978 + components: + - type: Transform + pos: 41.5,-17.5 parent: 34 - uid: 7030 components: @@ -79704,11 +82585,6 @@ entities: - type: Transform pos: 49.5,-12.5 parent: 34 - - uid: 7047 - components: - - type: Transform - pos: 40.5,-11.5 - parent: 34 - uid: 7048 components: - type: Transform @@ -79717,12 +82593,28 @@ entities: - uid: 7055 components: - type: Transform - pos: 40.5,-14.5 + pos: 36.5,-19.5 parent: 34 - - uid: 7074 + - uid: 7056 components: - type: Transform - pos: 39.5,-8.5 + pos: 32.5,-21.5 + parent: 34 + - uid: 7057 + components: + - type: Transform + pos: 29.5,-21.5 + parent: 34 + - uid: 7058 + components: + - type: Transform + pos: 31.5,-19.5 + parent: 34 + - uid: 7060 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 32.5,-19.5 parent: 34 - uid: 7078 components: @@ -79784,6 +82676,21 @@ entities: - type: Transform pos: 15.5,19.5 parent: 34 + - uid: 7581 + components: + - type: Transform + pos: 28.5,-21.5 + parent: 34 + - uid: 7673 + components: + - type: Transform + pos: 15.5,1.5 + parent: 34 + - uid: 7678 + components: + - type: Transform + pos: 15.5,-1.5 + parent: 34 - uid: 7703 components: - type: Transform @@ -79889,11 +82796,6 @@ entities: - type: Transform pos: -47.5,-23.5 parent: 34 - - uid: 8891 - components: - - type: Transform - pos: 34.5,-14.5 - parent: 34 - uid: 8903 components: - type: Transform @@ -79914,26 +82816,11 @@ entities: - type: Transform pos: 42.5,-17.5 parent: 34 - - uid: 8925 - components: - - type: Transform - pos: 34.5,-9.5 - parent: 34 - - uid: 8926 - components: - - type: Transform - pos: 34.5,-13.5 - parent: 34 - uid: 8928 components: - type: Transform pos: -19.5,-32.5 parent: 34 - - uid: 8933 - components: - - type: Transform - pos: 35.5,-8.5 - parent: 34 - uid: 8970 components: - type: Transform @@ -79979,11 +82866,6 @@ entities: - type: Transform pos: 49.5,-13.5 parent: 34 - - uid: 10221 - components: - - type: Transform - pos: 41.5,-11.5 - parent: 34 - uid: 10246 components: - type: Transform @@ -79994,11 +82876,6 @@ entities: - type: Transform pos: -35.5,-6.5 parent: 34 - - uid: 10345 - components: - - type: Transform - pos: 39.5,-11.5 - parent: 34 - uid: 10380 components: - type: Transform @@ -80014,11 +82891,6 @@ entities: - type: Transform pos: -53.5,-19.5 parent: 34 - - uid: 10459 - components: - - type: Transform - pos: 40.5,-8.5 - parent: 34 - uid: 10462 components: - type: Transform @@ -80539,41 +83411,6 @@ entities: - type: Transform pos: -10.5,10.5 parent: 34 - - uid: 12387 - components: - - type: Transform - pos: 38.5,-6.5 - parent: 34 - - uid: 12388 - components: - - type: Transform - pos: 38.5,-7.5 - parent: 34 - - uid: 12389 - components: - - type: Transform - pos: 38.5,-8.5 - parent: 34 - - uid: 12396 - components: - - type: Transform - pos: 38.5,-9.5 - parent: 34 - - uid: 12397 - components: - - type: Transform - pos: 38.5,-10.5 - parent: 34 - - uid: 12401 - components: - - type: Transform - pos: 38.5,-12.5 - parent: 34 - - uid: 12402 - components: - - type: Transform - pos: 38.5,-13.5 - parent: 34 - uid: 12415 components: - type: Transform @@ -80589,11 +83426,6 @@ entities: - type: Transform pos: 39.5,-20.5 parent: 34 - - uid: 12464 - components: - - type: Transform - pos: 34.5,-17.5 - parent: 34 - uid: 12523 components: - type: Transform @@ -80704,21 +83536,6 @@ entities: - type: Transform pos: 47.5,-14.5 parent: 34 - - uid: 12702 - components: - - type: Transform - pos: 41.5,-14.5 - parent: 34 - - uid: 12703 - components: - - type: Transform - pos: 39.5,-14.5 - parent: 34 - - uid: 12780 - components: - - type: Transform - pos: 34.5,-8.5 - parent: 34 - uid: 12785 components: - type: Transform @@ -80749,6 +83566,16 @@ entities: - type: Transform pos: 46.5,-17.5 parent: 34 + - uid: 13081 + components: + - type: Transform + pos: 20.5,17.5 + parent: 34 + - uid: 13084 + components: + - type: Transform + pos: 15.5,17.5 + parent: 34 - uid: 13237 components: - type: Transform @@ -82128,36 +84955,6 @@ entities: - type: Transform pos: -55.5,2.5 parent: 34 - - uid: 3483 - components: - - type: Transform - pos: 21.5,-20.5 - parent: 34 - - uid: 3531 - components: - - type: Transform - pos: 27.5,-19.5 - parent: 34 - - uid: 3535 - components: - - type: Transform - pos: 21.5,-19.5 - parent: 34 - - uid: 3545 - components: - - type: Transform - pos: 30.5,-4.5 - parent: 34 - - uid: 3562 - components: - - type: Transform - pos: 25.5,-8.5 - parent: 34 - - uid: 3570 - components: - - type: Transform - pos: 25.5,-4.5 - parent: 34 - uid: 3649 components: - type: Transform @@ -82318,11 +85115,6 @@ entities: - type: Transform pos: -6.5,-44.5 parent: 34 - - uid: 4171 - components: - - type: Transform - pos: 27.5,-15.5 - parent: 34 - uid: 4251 components: - type: Transform @@ -82483,21 +85275,6 @@ entities: - type: Transform pos: 44.5,2.5 parent: 34 - - uid: 4867 - components: - - type: Transform - pos: 32.5,-20.5 - parent: 34 - - uid: 4880 - components: - - type: Transform - pos: 27.5,-18.5 - parent: 34 - - uid: 4881 - components: - - type: Transform - pos: 27.5,-16.5 - parent: 34 - uid: 4945 components: - type: Transform @@ -82793,11 +85570,6 @@ entities: - type: Transform pos: 7.5,-38.5 parent: 34 - - uid: 10593 - components: - - type: Transform - pos: 24.5,-8.5 - parent: 34 - uid: 10622 components: - type: Transform @@ -82935,18 +85707,6 @@ entities: - type: Transform pos: -52.5,9.5 parent: 34 -- proto: WallWeaponCapacitorRecharger - entities: - - uid: 3586 - components: - - type: Transform - pos: 27.5,5.5 - parent: 34 - - uid: 4496 - components: - - type: Transform - pos: 28.5,5.5 - parent: 34 - proto: WallWood entities: - uid: 2109 @@ -83077,13 +85837,43 @@ entities: - type: Transform pos: -43.5,1.5 parent: 34 -- proto: WardrobePrisonFilled +- proto: WardrobeSecurityFilled entities: - - uid: 3392 + - uid: 6683 components: - type: Transform - pos: 16.5,-10.5 + pos: 26.5,-20.5 parent: 34 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14673 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - type: ContainerContainer + containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 6684 + - 6690 + paper_label: !type:ContainerSlot + showEnts: False + occludes: True + ent: null - proto: WarningCO2 entities: - uid: 10966 @@ -83130,77 +85920,8 @@ entities: parent: 34 - type: WarpPoint location: atmospherics - - uid: 11319 - components: - - type: Transform - pos: 22.5,-7.5 - parent: 34 - - type: WarpPoint - location: security - - type: NavMapBeacon - text: Security - - uid: 11320 - components: - - type: Transform - pos: 42.5,-2.5 - parent: 34 - - type: WarpPoint - location: perma - - uid: 11324 - components: - - type: Transform - pos: -0.5,-48.5 - parent: 34 - - type: WarpPoint - location: evac south - - type: NavMapBeacon - text: evac south - - uid: 11326 - components: - - type: Transform - pos: 9.5,14.5 - parent: 34 - - type: WarpPoint - location: evac north - - type: NavMapBeacon - text: evac north - - uid: 13006 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 2.5,-8.5 - parent: 34 - - type: NavMapBeacon - text: Bar - proto: WarpPointBeacon entities: - - uid: 13153 - components: - - type: Transform - pos: -32.5,-32.5 - parent: 34 - - type: NavMapBeacon - text: Engineering - - type: WarpPoint - location: Engineering - - uid: 13154 - components: - - type: Transform - pos: -45.5,-15.5 - parent: 34 - - type: NavMapBeacon - text: robotics - - type: WarpPoint - location: robotics - - uid: 13155 - components: - - type: Transform - pos: -30.5,-7.5 - parent: 34 - - type: NavMapBeacon - text: Epistemics - - type: WarpPoint - location: Epistemics - uid: 13156 components: - type: Transform @@ -83219,78 +85940,6 @@ entities: text: Dojo - type: WarpPoint location: Dojo - - uid: 13159 - components: - - type: Transform - pos: -18.5,-5.5 - parent: 34 - - type: NavMapBeacon - text: Botany - - type: WarpPoint - location: Botany - - uid: 13160 - components: - - type: Transform - pos: -11.5,-33.5 - parent: 34 - - type: NavMapBeacon - text: Logistics - - type: WarpPoint - location: Logistics - - uid: 13161 - components: - - type: Transform - pos: 4.5,-34.5 - parent: 34 - - type: NavMapBeacon - text: Medical - - type: WarpPoint - location: Medical - - uid: 13162 - components: - - type: Transform - pos: 17.5,16.5 - parent: 34 - - type: NavMapBeacon - text: Public cryopods - - type: WarpPoint - location: Public cryopods - - uid: 13163 - components: - - type: Transform - pos: -8.5,4.5 - parent: 34 - - type: NavMapBeacon - text: Detective's room - - type: WarpPoint - location: Detective's room - - uid: 13164 - components: - - type: Transform - pos: -18.5,-18.5 - parent: 34 - - type: NavMapBeacon - text: HoP's office - - type: WarpPoint - location: HoP's office - - uid: 13165 - components: - - type: Transform - pos: 5.5,-17.5 - parent: 34 - - type: NavMapBeacon - text: Janitor - - type: WarpPoint - location: Janitor - - uid: 13445 - components: - - type: Transform - pos: 45.5,-35.5 - parent: 34 - - type: NavMapBeacon - text: Bridge - - type: WarpPoint - location: Bridge - proto: WarpPointBombing entities: - uid: 93 @@ -83338,6 +85987,8 @@ entities: parent: 34 - type: WarpPoint location: engineering checkpoint + - type: NavMapBeacon + text: North Solars - proto: WashingMachineBroken entities: - uid: 6038 @@ -83371,15 +86022,15 @@ entities: - type: Transform pos: -41.5,-5.5 parent: 34 - - uid: 3856 + - uid: 3520 components: - type: Transform - pos: 31.5,-13.5 + pos: 18.5,-14.5 parent: 34 - - uid: 4157 + - uid: 3666 components: - type: Transform - pos: 25.5,-10.5 + pos: 27.5,-10.5 parent: 34 - uid: 10743 components: @@ -83436,95 +86087,59 @@ entities: joinedGrid: 34 - proto: WeaponCapacitorRecharger entities: - - uid: 3598 - components: - - type: Transform - pos: 18.5,-20.5 - parent: 34 - - uid: 13053 + - uid: 3395 components: - type: Transform - pos: 46.5,-31.5 + rot: 1.5707963267948966 rad + pos: 19.5,-20.5 parent: 34 -- proto: WeaponDisabler - entities: - - uid: 3713 + - uid: 6960 components: - type: Transform - pos: 22.34301,-19.588076 + pos: 23.5,-16.5 parent: 34 - - uid: 3723 + - uid: 9967 components: - type: Transform - pos: 22.634678,-19.421293 + pos: 31.5,-5.5 parent: 34 - - uid: 3724 + - uid: 13053 components: - type: Transform - pos: 22.31176,-19.264936 + pos: 46.5,-31.5 parent: 34 +- proto: WeaponDisabler + entities: - uid: 13055 components: - type: Transform pos: 47.501106,-31.454418 parent: 34 -- proto: WeaponLaserCarbine +- proto: WeaponRevolverSnub entities: - - uid: 3736 - components: - - type: Transform - pos: 26.565401,3.7038927 - parent: 34 - - uid: 3737 - components: - - type: Transform - pos: 26.513319,3.4224472 - parent: 34 -- proto: WeaponLauncherRocket - entities: - - uid: 3741 - components: - - type: Transform - pos: 29.395697,4.62251 - parent: 34 - - uid: 4499 - components: - - type: Transform - pos: 29.57278,4.3827605 - parent: 34 -- proto: WeaponRifleBB - entities: - - uid: 12483 - components: - - type: Transform - pos: 41.015553,-16.55187 - parent: 34 -- proto: WeaponRifleLecter - entities: - - uid: 3738 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 26.263319,4.548229 - parent: 34 - - uid: 3739 + - uid: 4577 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 26.669569,4.548229 - parent: 34 -- proto: WeaponShotgunKammerer + parent: 4574 + - type: Physics + canCollide: False + - type: InsideEntityStorage +- proto: WeaponRifleM90 entities: - - uid: 3733 + - uid: 7687 components: - type: Transform - pos: 29.461235,3.6309257 - parent: 34 - - uid: 3734 + parent: 7686 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 7688 components: - type: Transform - pos: 29.502901,3.3911757 - parent: 34 + parent: 7686 + - type: Physics + canCollide: False + - type: InsideEntityStorage - proto: WeaponTurretSyndicateBroken entities: - uid: 6034 @@ -83644,6 +86259,12 @@ entities: parent: 34 - proto: WindoorSecure entities: + - uid: 4529 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.5,-15.5 + parent: 34 - uid: 11328 components: - type: Transform @@ -83651,17 +86272,33 @@ entities: parent: 34 - proto: WindoorSecureArmoryLocked entities: - - uid: 3700 + - uid: 4861 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 24.5,-0.5 + pos: 31.5,-5.5 parent: 34 - - uid: 3701 + - uid: 4868 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 24.5,0.5 + pos: 30.5,-5.5 + parent: 34 + - uid: 13513 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 30.5,-10.5 + parent: 34 + - uid: 13514 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 31.5,-10.5 + parent: 34 + - uid: 13517 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 29.5,-10.5 parent: 34 - proto: WindoorSecureCargoLocked entities: @@ -83798,21 +86435,22 @@ entities: parent: 34 - proto: WindoorSecureSecurityLocked entities: - - uid: 1281 + - uid: 4537 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 21.5,-13.5 + pos: 17.5,-15.5 parent: 34 - - uid: 3560 + - uid: 4903 components: - type: Transform - pos: 25.5,-18.5 + rot: 3.141592653589793 rad + pos: 30.5,-5.5 parent: 34 - - uid: 3578 + - uid: 4905 components: - type: Transform - pos: 23.5,-18.5 + rot: 3.141592653589793 rad + pos: 31.5,-5.5 parent: 34 - proto: Window entities: @@ -84026,46 +86664,6 @@ entities: - type: Transform pos: 11.5,8.5 parent: 34 - - uid: 3544 - components: - - type: Transform - pos: 27.5,-4.5 - parent: 34 - - uid: 3558 - components: - - type: Transform - pos: 21.5,-16.5 - parent: 34 - - uid: 3564 - components: - - type: Transform - pos: 29.5,-4.5 - parent: 34 - - uid: 3568 - components: - - type: Transform - pos: 26.5,-4.5 - parent: 34 - - uid: 3572 - components: - - type: Transform - pos: 25.5,-6.5 - parent: 34 - - uid: 3573 - components: - - type: Transform - pos: 25.5,-7.5 - parent: 34 - - uid: 3575 - components: - - type: Transform - pos: 25.5,-5.5 - parent: 34 - - uid: 3614 - components: - - type: Transform - pos: 21.5,-18.5 - parent: 34 - uid: 3797 components: - type: Transform @@ -84293,21 +86891,6 @@ entities: - type: Transform pos: -16.5,6.5 parent: 34 - - uid: 1870 - components: - - type: Transform - pos: 24.5,-18.5 - parent: 34 - - uid: 3484 - components: - - type: Transform - pos: 22.5,-18.5 - parent: 34 - - uid: 3588 - components: - - type: Transform - pos: 26.5,-18.5 - parent: 34 - uid: 4205 components: - type: Transform @@ -84380,6 +86963,12 @@ entities: - type: Transform pos: 31.5,-28.5 parent: 34 + - uid: 7622 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 43.5,-18.5 + parent: 34 - uid: 8073 components: - type: Transform @@ -84446,49 +87035,52 @@ entities: - type: Transform pos: -15.5,6.5 parent: 34 - - uid: 13095 + - uid: 13099 components: - type: Transform - pos: 16.5,20.5 + rot: -1.5707963267948966 rad + pos: 21.5,16.5 parent: 34 - - uid: 13096 + - uid: 13100 components: - type: Transform - pos: 17.5,20.5 + rot: -1.5707963267948966 rad + pos: 21.5,15.5 parent: 34 - - uid: 13097 + - uid: 13102 components: - type: Transform - pos: 18.5,20.5 + rot: -1.5707963267948966 rad + pos: 21.5,14.5 parent: 34 - - uid: 13098 + - uid: 13501 components: - type: Transform - pos: 19.5,20.5 + rot: 3.141592653589793 rad + pos: 44.5,-18.5 parent: 34 - - uid: 13099 + - uid: 13502 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 21.5,16.5 + rot: 3.141592653589793 rad + pos: 45.5,-18.5 parent: 34 - - uid: 13100 + - uid: 13503 components: - type: Transform rot: -1.5707963267948966 rad - pos: 21.5,15.5 + pos: 47.5,-16.5 parent: 34 - - uid: 13101 + - uid: 13504 components: - type: Transform rot: -1.5707963267948966 rad - pos: 21.5,18.5 + pos: 47.5,-15.5 parent: 34 - - uid: 13102 + - uid: 13558 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 21.5,14.5 + pos: 42.5,8.5 parent: 34 - proto: WindowTintedDirectional entities: @@ -84522,6 +87114,13 @@ entities: rot: -1.5707963267948966 rad pos: 9.5,-42.5 parent: 34 +- proto: Wirecutter + entities: + - uid: 13568 + components: + - type: Transform + pos: 42.52252,13.337198 + parent: 34 - proto: WoodDoor entities: - uid: 2183 @@ -84596,16 +87195,4 @@ entities: - type: Transform pos: 1.6133218,-43.478226 parent: 34 -- proto: Zipties - entities: - - uid: 11712 - components: - - type: Transform - pos: -29.666363,3.6544852 - parent: 34 - - uid: 11713 - components: - - type: Transform - pos: -29.655947,3.425158 - parent: 34 ... From 371a897674ae73c533fddab439680488ae06c0ca Mon Sep 17 00:00:00 2001 From: Timemaster99 Date: Wed, 13 Mar 2024 21:44:44 -0400 Subject: [PATCH 26/94] Added antag objective and touched up yaml Fixed Clerk PDA and CJ jumpsuit error. Additionally moved notary stamp from paper.yml to rubber-stamp.yml, and fixed some indentation in the meta.json of the pda.rsi file --- .../Entities/Clothing/Uniforms/jumpsuits.yml | 2 +- .../DeltaV/Entities/Objects/Devices/pda.yml | 28 +++++++++++++++++-- .../DeltaV/Entities/Objects/Misc/paper.yml | 13 --------- .../Entities/Objects/Misc/rubber_stamp.yml | 16 +++++++++++ .../DeltaV/Objectives/stealTargetGroups.yml | 7 +++++ .../Prototypes/DeltaV/Objectives/traitor.yml | 11 ++++++++ .../DeltaV/Objects/Devices/pda.rsi/meta.json | 6 ++-- 7 files changed, 64 insertions(+), 19 deletions(-) delete mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml index d0d8dcd4c3e..3fe5ec4a9ef 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml @@ -253,7 +253,7 @@ - type: Sprite sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi - type: Clothing - sprite: DeltaV/Clothing/Uniform/Jumpsuit/cj.rsi + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi - type: entity parent: ClothingUniformBase diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml index 3a744a9f870..fab8b2ca66d 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml @@ -46,6 +46,18 @@ name: chief justice PDA description: Whosoever bears this PDA is the law. components: + - type: Sprite + sprite: DeltaV/Objects/Devices/pda.rsi + layers: + - map: [ "enum.PdaVisualLayers.Base" ] + - state: "light_overlay" + map: [ "enum.PdaVisualLayers.Flashlight" ] + shader: "unshaded" + visible: false + - state: "id_overlay" + map: [ "enum.PdaVisualLayers.IdLight" ] + shader: "unshaded" + visible: false - type: Pda id: CJIDCard state: pda-cj @@ -64,7 +76,7 @@ preinstalled: - CrewManifestCartridge - NotekeeperCartridge - - NewsReadCartridge + - NewsReaderCartridge - CrimeAssistCartridge - type: entity @@ -73,6 +85,18 @@ name: clerk PDA description: It has the stamp to prove it's been officially notarized! components: + - type: Sprite + sprite: DeltaV/Objects/Devices/pda.rsi + layers: + - map: [ "enum.PdaVisualLayers.Base" ] + - state: "light_overlay" + map: [ "enum.PdaVisualLayers.Flashlight" ] + shader: "unshaded" + visible: false + - state: "id_overlay" + map: [ "enum.PdaVisualLayers.IdLight" ] + shader: "unshaded" + visible: false - type: Pda id: ClerkIDCard state: pda-clerk @@ -91,7 +115,7 @@ preinstalled: - CrewManifestCartridge - NotekeeperCartridge - - NewsReadCartridge + - NewsReaderCartridge - CrimeAssistCartridge - type: entity diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml deleted file mode 100644 index 448ba1ba206..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml +++ /dev/null @@ -1,13 +0,0 @@ -- type: entity - name: notary stamp - parent: RubberStampBase - id: RubberStampNotary - description: An old-fashioned seal for marking important documents, made of polished bronze. - components: - - type: Stamp - stampedName: stamp-component-stamped-notary - stampedColor: "#a81f3d" - stampState: "paper_stamp-notary" - - type: Sprite - sprite: DeltaV/Objects/Misc/bureaucracy.rsi - state: stamp-notary diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml index 2494de534e4..45d82d2b6f0 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml @@ -25,3 +25,19 @@ - type: Sprite sprite: DeltaV/Objects/Misc/stamps.rsi state: stamp-lawyer + +- type: entity + name: notary stamp + parent: RubberStampBase + id: RubberStampNotary + description: An old-fashioned seal for marking important documents, made of polished bronze. + components: + - type: Stamp + stampedName: stamp-component-stamped-notary + stampedColor: "#a81f3d" + stampState: "paper_stamp-notary" + - type: Sprite + sprite: DeltaV/Objects/Misc/bureaucracy.rsi + state: stamp-notary + - type: StealTarget + stealGroup: RubberStampNotary diff --git a/Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml b/Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml index cf7d4f90d68..54c0e216049 100644 --- a/Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml +++ b/Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml @@ -18,3 +18,10 @@ sprite: sprite: DeltaV/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi state: base + +- type: stealTargetGroup + id: RubberStampNotary + name: notary stamp + sprite: + sprite: DeltaV/Objects/Misc/bureaucracy.rsi + state: stamp-notary diff --git a/Resources/Prototypes/DeltaV/Objectives/traitor.yml b/Resources/Prototypes/DeltaV/Objectives/traitor.yml index 4fa25f26987..4b72aeadcc3 100644 --- a/Resources/Prototypes/DeltaV/Objectives/traitor.yml +++ b/Resources/Prototypes/DeltaV/Objectives/traitor.yml @@ -32,3 +32,14 @@ - type: StealCondition stealGroup: WeaponEnergyGunMultiphase owner: job-name-hos + +- type: entity # Clerk steal objective. + noSpawn: true + parent: BaseTraitorStealObjective + id: ClerkNotaryStealObjective + components: + - type: NotJobRequirement + job: Clerk + - type: StealCondition + stealGroup: RubberStampNotary + owner: job-name-clerk diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json index 0ccf4276391..147237477e5 100644 --- a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json @@ -30,13 +30,13 @@ "name": "pda-martialartist" }, { - "name": "pda-corpsman" + "name": "pda-corpsman" }, { - "name": "pda-cj" + "name": "pda-cj" }, { - "name": "pda-clerk" + "name": "pda-clerk" } ] } From d8090b1d964de956f7f036c885967817f390c9da Mon Sep 17 00:00:00 2001 From: Timemaster99 Date: Wed, 13 Mar 2024 23:34:58 -0400 Subject: [PATCH 27/94] Attorney <- Lawyer, now including the PDA Forgot this last commit --- Resources/Prototypes/Entities/Objects/Devices/pda.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 64d805f2bdc..bd4724989b6 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -414,8 +414,8 @@ - type: entity parent: BasePDA id: LawyerPDA - name: lawyer PDA - description: For lawyers to poach dubious clients. + name: attorney PDA + description: For attornies to poach dubious clients. components: - type: Pda id: LawyerIDCard From da6c1921a18210d9e0796f80b1eee6ef1352b46a Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Wed, 13 Mar 2024 23:50:29 -0400 Subject: [PATCH 28/94] Fixed typo in Clerk Vest ID Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> --- .../Prototypes/DeltaV/Entities/Clothing/OuterClothing/vests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/vests.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/vests.yml index 77a2a66e415..bb58961829e 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/vests.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/vests.yml @@ -40,7 +40,7 @@ - type: entity parent: ClothingOuterBase - id: CltohingOuterClerkVest + id: ClothingOuterClerkVest name: clerk's vest description: a silken magenta vest with a pocket to put your notary stamp. components: From 702a7896ea4da83f21b49472d5e4bd14682df6a2 Mon Sep 17 00:00:00 2001 From: Timemaster99 Date: Thu, 14 Mar 2024 03:05:39 -0400 Subject: [PATCH 29/94] Added Chief Justice locker, all of its contents, and a prosecutor PDA (sprite pending) --- .../DeltaV/Catalog/Fills/Boxes/general.yml | 19 ++++++++++++++ .../DeltaV/Catalog/Fills/Boxes/pda.yml | 13 ++++++++++ .../DeltaV/Entities/Objects/Devices/pda.yml | 26 +++++++++++++++++++ 3 files changed, 58 insertions(+) diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/general.yml index 804a4727ee3..221aa6f1757 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/general.yml @@ -16,3 +16,22 @@ whitelist: components: - EncryptionKey + +- type: entity + name: justice encryption key box + parent: BoxCardboard + id: BoxEncryptionKeyJustice + description: A box of spare encryption keys. + components: + - type: StorageFill + contents: + - id: EncryptionKeyJustice + amount: 4 + - type: Sprite + layers: + - state: box + - state: encryptokey + - type: Storage + whitelist: + components: + - EncryptionKey diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml index b6140daae59..3d149fd3174 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml @@ -74,3 +74,16 @@ amount: 1 - id: MailCarrierPDA amount: 1 + +- type: entity + name: justice PDA box + parent: BoxPDA + id: BoxPDAJustice + description: A box of spare PDA microcomputers for the warden the justice department. + components: + - type: StorageFill + contents: + - id: LawyerPDA + amount: 2 + - id: ProsecutorPDA + - id: ClerkPDA \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml index fab8b2ca66d..7dbaa0d10fa 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml @@ -117,6 +117,32 @@ - NotekeeperCartridge - NewsReaderCartridge - CrimeAssistCartridge + +- type: entity + parent: BasePDA + id: ProsecutorPDA + name: prosecutor PDA + description: Sharp. Looks like it could prosecute you all on its own. + components: + - type: Pda + id: ProsecutorIDCard + state: pda-lawyer #Change this to prosecutor when sprited + penSlot: + startingItem: LuxuryPen + priority: -1 + whitelist: + tags: + - Write + - type: PdaBorderColor + borderColor: "#6f6192" + - type: Icon + state: pda-lawyer #Change this to prosecutor when sprited + - type: CartridgeLoader # DeltaV - Crime Assist + preinstalled: + - CrewManifestCartridge + - NotekeeperCartridge + - NewsReaderCartridge + - CrimeAssistCartridge - type: entity parent: SyndiPDA From 9949bc289c6eadb3e5b689176c563381668f64bb Mon Sep 17 00:00:00 2001 From: Timemaster99 Date: Thu, 14 Mar 2024 03:08:56 -0400 Subject: [PATCH 30/94] lockers 2, electric boogaloo. Committing files I forgot to commit --- .../Catalog/Fills/Lockers/chiefjustice.yml | 14 ++++++++++++++ .../Entities/Objects/Devices/door_remote.yml | 16 ++++++++++++++++ .../Storage/Closets/Lockers/lockers.yml | 12 ++++++++++++ 3 files changed, 42 insertions(+) create mode 100644 Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/chiefjustice.yml create mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Devices/door_remote.yml create mode 100644 Resources/Prototypes/DeltaV/Entities/Structures/Storage/Closets/Lockers/lockers.yml diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/chiefjustice.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/chiefjustice.yml new file mode 100644 index 00000000000..ef05c18d498 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/chiefjustice.yml @@ -0,0 +1,14 @@ +- type: entity + parent: LockerChiefJustice + id: LockerChiefJusticeFilled + name: chief justice's locker + components: + - type: StorageFill + contents: + - id: ClothingHeadsetCJ + - id: BoxPDAJustice + - id: BoxEncryptionKeyJustice + - id: CJIDCard + - id: DoorRemoteJustice + #- id: Gavel + #- id: RubberStampCJ - Uncomment when added \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/door_remote.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/door_remote.yml new file mode 100644 index 00000000000..cd83f342523 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/door_remote.yml @@ -0,0 +1,16 @@ +- type: entity + parent: DoorRemoteDefault + id: DoorRemoteJustice + name: justice door remote + components: + - type: Sprite + layers: + - state: door_remotebase + - state: door_remotelightscolour + color: "#6b2833" + - state: door_remotescreencolour + color: "#6b2833" + - type: Access + groups: + - Justice + - Lawyer \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Closets/Lockers/lockers.yml new file mode 100644 index 00000000000..fc75bda820d --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -0,0 +1,12 @@ +- type: entity + id: LockerChiefJustice + parent: LockerBaseSecure + name: chief justice's locker # DeltaV - Justice dept + components: + - type: Appearance + - type: EntityStorageVisuals + stateBaseClosed: qm # TODO: Replace this with CJ locker sprite + stateDoorOpen: qm_open + stateDoorClosed: qm_door + - type: AccessReader + access: [["ChiefJustice"]] \ No newline at end of file From b539e0fb3beeb4983449ca777266c9aa85320d0c Mon Sep 17 00:00:00 2001 From: Timemaster99 Date: Thu, 14 Mar 2024 03:46:22 -0400 Subject: [PATCH 31/94] Added CJ stamp and put it into CJ locker. Fixed notary stamp and put the sprites in the correct RSI --- .../en-US/deltav/paper/stamp-component.ftl | 1 + .../Catalog/Fills/Lockers/chiefjustice.yml | 4 ++-- .../Entities/Objects/Misc/rubber_stamp.yml | 17 +++++++++++++++-- .../Objects/Misc/bureaucracy.rsi/meta.json | 6 ------ .../DeltaV/Objects/Misc/stamps.rsi/meta.json | 3 +++ .../stamp-notary.png | Bin .../Objects/Misc/bureaucracy.rsi/meta.json | 3 +++ .../bureaucracy.rsi/paper_stamp-notary.png | Bin 8 files changed, 24 insertions(+), 10 deletions(-) rename Resources/Textures/DeltaV/Objects/Misc/{bureaucracy.rsi => stamps.rsi}/stamp-notary.png (100%) rename Resources/Textures/{DeltaV => }/Objects/Misc/bureaucracy.rsi/paper_stamp-notary.png (100%) diff --git a/Resources/Locale/en-US/deltav/paper/stamp-component.ftl b/Resources/Locale/en-US/deltav/paper/stamp-component.ftl index 58c4b9d5b4e..ce194249752 100644 --- a/Resources/Locale/en-US/deltav/paper/stamp-component.ftl +++ b/Resources/Locale/en-US/deltav/paper/stamp-component.ftl @@ -1,3 +1,4 @@ stamp-component-stamped-name-notary = NOTARY stamp-component-stamped-name-lawyer = Lawyer +stamp-component-stamped-name-chiefjustice = Chief Justice stamp-component-stamped-name-psychologist = Psychologist diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/chiefjustice.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/chiefjustice.yml index ef05c18d498..028b274f964 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/chiefjustice.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/chiefjustice.yml @@ -10,5 +10,5 @@ - id: BoxEncryptionKeyJustice - id: CJIDCard - id: DoorRemoteJustice - #- id: Gavel - #- id: RubberStampCJ - Uncomment when added \ No newline at end of file + #- id: Gavel - Uncomment when added + - id: RubberStampCJ \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml index 45d82d2b6f0..d12978164be 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml @@ -33,11 +33,24 @@ description: An old-fashioned seal for marking important documents, made of polished bronze. components: - type: Stamp - stampedName: stamp-component-stamped-notary + stampedName: stamp-component-stamped-name-notary stampedColor: "#a81f3d" stampState: "paper_stamp-notary" - type: Sprite - sprite: DeltaV/Objects/Misc/bureaucracy.rsi + sprite: DeltaV/Objects/Misc/stamps.rsi state: stamp-notary - type: StealTarget stealGroup: RubberStampNotary + +- type: entity + name: chief justice stamp + parent: RubberStampBase + id: RubberStampCJ + components: + - type: Stamp + stampedName: stamp-component-stamped-name-chiefjustice + stampedColor: "#6b2833" + stampState: "paper_stamp-notary" + - type: Sprite + sprite: DeltaV/Objects/Misc/stamps.rsi + state: stamp-notary # Change to CJ when sprited diff --git a/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/meta.json index b06b34d0705..8b9eb989a64 100644 --- a/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/meta.json @@ -9,12 +9,6 @@ "states": [ { "name": "folder-hop-ian" - }, - { - "name": "stamp-notary" - }, - { - "name": "paper_stamp-notary" } ] } diff --git a/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json index 31a3b1bee37..aa898fe7f37 100644 --- a/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json @@ -10,6 +10,9 @@ { "name": "stamp-lawyer" }, + { + "name": "stamp-notary" + }, { "name": "stamp-psychologist" } diff --git a/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/stamp-notary.png b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/stamp-notary.png similarity index 100% rename from Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/stamp-notary.png rename to Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/stamp-notary.png diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json index 5117df77356..34f69779b9c 100644 --- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json @@ -259,6 +259,9 @@ }, { "name": "paper_stamp-psychologist" + }, + { + "name": "paper_stamp-notary" } ] } diff --git a/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/paper_stamp-notary.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-notary.png similarity index 100% rename from Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/paper_stamp-notary.png rename to Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-notary.png From d9fc30aa6b2e2eb10ef12ad28afef9f87aaee1bb Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Mon, 18 Mar 2024 01:28:23 -0400 Subject: [PATCH 32/94] Attempt to resolve merge conflicts --- Resources/Locale/en-US/paper/stamp-component.ftl | 3 ++- .../DeltaV/Entities/Objects/Misc/rubber_stamp.yml | 14 -------------- .../DeltaV/Objects/Misc/stamps.rsi/meta.json | 3 --- 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/Resources/Locale/en-US/paper/stamp-component.ftl b/Resources/Locale/en-US/paper/stamp-component.ftl index e4341e7be33..c14ccc662c4 100644 --- a/Resources/Locale/en-US/paper/stamp-component.ftl +++ b/Resources/Locale/en-US/paper/stamp-component.ftl @@ -4,6 +4,7 @@ stamp-component-stamped-name-mime = Mime stamp-component-stamped-name-captain = Captain stamp-component-stamped-name-centcom = CentCom stamp-component-stamped-name-chaplain = Chaplain +stamp-component-stamped-name-lawyer = Lawyer stamp-component-stamped-name-clown = Clown stamp-component-stamped-name-cmo = Chief Medical Officer stamp-component-stamped-name-denied = DENIED @@ -15,4 +16,4 @@ stamp-component-stamped-name-rd = Mystagogue stamp-component-stamped-name-warden = Warden stamp-component-stamped-name-trader = Trader stamp-component-stamped-name-syndicate = Syndicate -stamp-component-stamped-name-ce = Chief Engineer +stamp-component-stamped-name-ce = Chief Engineer \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml index d12978164be..daff28b7965 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml @@ -11,20 +11,6 @@ - type: Sprite sprite: DeltaV/Objects/Misc/stamps.rsi state: stamp-psychologist - -- type: entity - name: lawyer's rubber stamp - parent: RubberStampBase - id: RubberStampLawyer - suffix: DO NOT MAP - components: - - type: Stamp - stampedName: stamp-component-stamped-name-lawyer - stampedColor: "#696969" - stampState: "paper_stamp-lawyer" - - type: Sprite - sprite: DeltaV/Objects/Misc/stamps.rsi - state: stamp-lawyer - type: entity name: notary stamp diff --git a/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json index aa898fe7f37..9e97fd389b1 100644 --- a/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json @@ -7,9 +7,6 @@ "y": 32 }, "states": [ - { - "name": "stamp-lawyer" - }, { "name": "stamp-notary" }, From 1187d55517828245308ddc245af01cb8539bf573 Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Mon, 18 Mar 2024 02:11:29 -0400 Subject: [PATCH 33/94] Remove conflict markers --- .../Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml | 3 --- Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json | 3 --- 2 files changed, 6 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml index b61656da23d..daff28b7965 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml @@ -11,7 +11,6 @@ - type: Sprite sprite: DeltaV/Objects/Misc/stamps.rsi state: stamp-psychologist -<<<<<<< HEAD - type: entity name: notary stamp @@ -41,5 +40,3 @@ - type: Sprite sprite: DeltaV/Objects/Misc/stamps.rsi state: stamp-notary # Change to CJ when sprited -======= ->>>>>>> origin diff --git a/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json index cc89e868256..9e97fd389b1 100644 --- a/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json @@ -8,12 +8,9 @@ }, "states": [ { -<<<<<<< HEAD "name": "stamp-notary" }, { -======= ->>>>>>> origin "name": "stamp-psychologist" } ] From b6c8c6fe9f5d9e685e2e70f48d5036b0316769a9 Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Mon, 18 Mar 2024 02:44:32 -0400 Subject: [PATCH 34/94] Added stamp sprite, implemented CJ cloak --- .../Catalog/Fills/Lockers/chiefjustice.yml | 1 + .../DeltaV/Entities/Clothing/Neck/cloaks.yml | 13 ++++++++++++- .../Entities/Objects/Misc/rubber_stamp.yml | 2 +- .../DeltaV/Objects/Misc/stamps.rsi/meta.json | 5 ++++- .../DeltaV/Objects/Misc/stamps.rsi/stamp-cj.png | Bin 0 -> 5263 bytes 5 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/stamp-cj.png diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/chiefjustice.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/chiefjustice.yml index 028b274f964..3a8c81a38a7 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/chiefjustice.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/chiefjustice.yml @@ -6,6 +6,7 @@ - type: StorageFill contents: - id: ClothingHeadsetCJ + - id: ClothingNeckCloakCJ - id: BoxPDAJustice - id: BoxEncryptionKeyJustice - id: CJIDCard diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/cloaks.yml index 5ff195cfda8..4272c84ea15 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/cloaks.yml @@ -30,4 +30,15 @@ - type: Sprite sprite: DeltaV/Clothing/Neck/Cloaks/salvage.rsi - type: Clothing - sprite: DeltaV/Clothing/Neck/Cloaks/salvage.rsi + sprite: DeltaV/Clothing/Neck/Cloaks/salvage.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCloakCJ + name: chief justice's cloak + description: A hefty cloak adorned with a modest insignia and grand fur trim. + components: + - type: Sprite + sprite: DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi + - type: StealTarget + stealGroup: HeadCloak diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml index daff28b7965..c9ecb7c5645 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml @@ -39,4 +39,4 @@ stampState: "paper_stamp-notary" - type: Sprite sprite: DeltaV/Objects/Misc/stamps.rsi - state: stamp-notary # Change to CJ when sprited + state: stamp-cj # Change to CJ when sprited diff --git a/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json index 9e97fd389b1..d3a05eaa555 100644 --- a/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json @@ -1,12 +1,15 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Stamp sprites taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93, modified by Guess-My-Name.", + "copyright": "Stamp sprites taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93, modified by Guess-My-Name. CJ stamp modified by Timemaster99.", "size": { "x": 32, "y": 32 }, "states": [ + { + "name": "stamp-cj" + }, { "name": "stamp-notary" }, diff --git a/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/stamp-cj.png b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/stamp-cj.png new file mode 100644 index 0000000000000000000000000000000000000000..3ca58c4bc60ebacb89fe05500d362a4a6ac12db8 GIT binary patch literal 5263 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 aJIy%T7g?1U4 literal 0 HcmV?d00001 From c3274ab56d9c53131f846e8548244019cd7ece36 Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Tue, 19 Mar 2024 22:39:00 -0400 Subject: [PATCH 35/94] Implemented Gavel Prototype and added to CJ locker --- Resources/Audio/DeltaV/Items/gavel.ogg | Bin 0 -> 9428 bytes .../Objects/Specific/Justice/gavel.yml | 23 ++++++++++++++++++ .../Specific/Justice/gavel.rsi/icon.png | Bin 0 -> 434 bytes .../Justice/gavel.rsi/inhand-left.png | Bin 0 -> 11051 bytes .../Justice/gavel.rsi/inhand-right.png | Bin 0 -> 11817 bytes .../Specific/Justice/gavel.rsi/meta.json | 22 +++++++++++++++++ 6 files changed, 45 insertions(+) create mode 100644 Resources/Audio/DeltaV/Items/gavel.ogg create mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavel.yml create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/meta.json diff --git a/Resources/Audio/DeltaV/Items/gavel.ogg b/Resources/Audio/DeltaV/Items/gavel.ogg new file mode 100644 index 0000000000000000000000000000000000000000..1ea5aec6e317162b2f806bb497b5eb86f47f2e90 GIT binary patch literal 9428 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 literal 0 HcmV?d00001 diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavel.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavel.yml new file mode 100644 index 00000000000..e4b352c3374 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavel.yml @@ -0,0 +1,23 @@ +- type: entity + parent: BaseItem + id: Gavel + name: gavel + description: A hardwood mallet made to keep order in the court. + components: + - type: Sprite + sprite: DeltaV\Objects\Specific\Justice\gavel.rsi + layers: + - state: icon + - type: MeleeWeapon + wideAnimationRotation: -90 + damage: + types: + Blunt: 5 + - type: Item + size: Small + sprite: DeltaV\Objects\Specific\Justice\gavel.rsi + - type: EmitSoundOnUse + sound: + path: /Audio/DeltaV/Items/gavel.ogg + - type: UseDelay + delay: 2.0 \ No newline at end of file diff --git a/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3cf56d453711e1d07d02997fa223579b8f31a149 GIT binary patch literal 434 zcmV;j0ZsmiP)J=&Ll)CgG(?|+_o$Ghwf9~^iw`8Z+=bka=iZR#Y|ryVp0Y*G z`UluOfM)F?!nOPC6*33FO;p{o1R)5>SP@dS z2cPu*-w>Qibbt!&tYpiBARxE`-E`{F_3ab?62MxxfQd%_mjswELp6>z3J_zu5Qz>D z1PbnT9ExDRP;1_5Tt-|Fsb2v>P@DSiA9@8Yh_#<#Ql)c2X#EX2AhdtSx)3aRKnH>? zkZcRVnuxZ6V2@;R5V%KwCIE2|P!fc(P`V01iVH7BQ!zoLJ!3qU10pR+XR=i(1poj507*qoM6N<$f@Zw2pa1{> literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..a41d27bcc71f367c6771ae5b670d87dc72dc4068 GIT binary patch literal 11051 zcmeHNcUV(b*bk)wMNyon#hOM%tzNh@xi^ByCJ2Z?5v+Ylmk%=v--oy@Mv_YB-!|KwD4{o%gj z2HJ8zx((g?w6{<9?vf|_9IJQKdu?=B`Plwy-TtV$1k0{79@o@|6k`pM<+-1hkG^Kx z&^u%HO{d8XLsoWnekHsW(r>Bz)Md}iPJ8&ZsWWac8&|h0Yt7e_E;)zBI$no<9Uj)icGxVzl96ehCmtBbwAua1FF8f|$9&d38NS4`c%prE^oHkU!qAJipA5%K z?@qn?XkBc^fqO5{U%S_9WPkgBtERmcjcB;B=h3t9z}dGa*RFhCKE3YR)6x5h=VK?n zxaV+pa3XI7b@m>;!slS*jdEmb_B3d8kIaQbpYpDSdlzi_>7-z1{H#q{i>-qN=WC0G zU4B`6_i?F9fu)8~rjQXzP`e;}?k5Tksm>S7xzgPUUbYZ& z?UYyhjq9m;51UleTZKoxC#R$@dS-UWb>I)fk9k-Mh@RPY_46%{CbkJN%2+Km>LfLL zx;)RdXs&$V*nni{#DJ@(&dfE=n;kX3o9Ff5HB&5xn*{ggUV8ZFr;MCU-B>>K`%&4y z1<7T77WuCW_K)b$hbr=ST{pvP)AkKZ!+-P-KU=!M+Us=5$iN+$@{JG$LelRX1Mk|H6n7gctFg`gt|?pm#Z6mlS+@a3*_hgWOdAzYulfZd6!P@ z#yT$vh{`PuQqk4+cf2Wak8hm63%^l(eY&s3gtVBFbIH%IZY?Z55?h#)Q4?L2^TK;f zf>9|F9lO-Fy@Rf#!}&7@Y(5JuKXc(x*Hhi6YbM{zP+q=Up|UBNReX9uQsN1M-x_{5 zczxOIO#ixVQ_cq`Mkue8D(Xtu3a&@8&#C&CKmD>jD*p^0=9rkWeeJ!F?nYe@^z(CR zq2Zx?#3jpYQ^YU9W^jDrdpz?utD%i@Tk(HhR;59aAMG zgM5#5?3+*^GyZ(JBF4PnRz-f2>Gqxn9Z0J^GT-8o#s0rus>xk!dTG-a`9<)-jxXn4 zkqvxhd82E6zsw0WW7f>{$?X!GJBwP zQ25$aBZ?+<_PE%lVlMKlA5(3T^Pu|DtJ~=fR*z$?7R;J4ePh-Z&7GxvCV34XK6Dw> zeuz<*%IrNqogba`XwvbWZsnu5<(tRYyl`C`VHH_bQyahKi9@#fen0p7(=n51O~IZU zvu}=03)|$_d&t>kt&T2hRW)eU-NH1@8EH3(DQfw6ZuRnQSbPPpJ?m4{o2cWrgxrl=vQ{n~A~_sK$W)Rdg`pUjCg z?>3!+rgqr7No;1^YNd8UrRSk%Jx2AaYWwpp$5q4gQU<6KM`i79?X}gKfGgT{{G#=d zMU|7+-S;x-dpmT?*s%=w`P1dS6bz2f4Q^RIQ)iOsFp&e{a&)Cp*v2 zZ~vKwX~2ZR_agn*py#?w=sN6JSzBUM!JL^@qt5$0I7B_mUv2iui04aJ)Y=oJ9MZMc zUpvUF)jH|ylegz4os5TSpKqTQ=Xr;-k?hwdi)?yFFrUhEADmpfy0CSpunf!bJ+EoteD6&XhpA~FlI-;<6 zSFf8lJLYY?^eX@M`dMinW}S{(;^wUsgjecX`89Ow>4G?4j~ne~Ta?=T66T$<>e#RW z4+e~SJkUG1)cuOG;sPq0-wPf*iZMA{TlFA7c_6VaR9g3HtNEJlKfaJm!bydl>4p#g65W_Y&tiYoN`VPNVE(yMd&*ws5akBo-* zK5o4f@7>>ac2fA^!*lX8lhd=a+GZsQpBi1Qs$6$V)TiFA|Blp}$~`^r-*dQk$;f%_ zk-+TmPyC2t&wNHM-u+eWfg^K--@>Wej(R)H8&h&fJE0=4;Qao6rydTjyLoHGLmT4> zq8jU8Ez;wX}sQ};Wj1k3zWPo))D>=V}XI?pY-Oj`Bm62})7uKO*`<*0mn@{P89 zAD2EWY-ab%bbsc2j+_3dOW00-W=rBjE0c$%UQ6%d9+m|iI(Rxyo7w$%#v$hgL9;q_ z>|Z)3{%PK9N15%CQ5>upxXQfq{A;ES$(JjZPXAFR>2GPgFEru>)9Kd5R!gJH>Id(t z{_V5M$tGDlcIB1|ct_dR-8&20!`m!IjoMAbx7$;0^zBMr(Om1IVFCR*O{v44Z?LvJ z(CYcQ@=GIMkP`*ynX?Zq)M~Sto%<(NT&p|QOql&bpS(Ti#jf+%+woD+fcZ^fhOgN_#%DFIw(m`~8f38TVU>!sw2p`x-?ZS;y zcqVALfCS$_CLx@mSdrskbNe_c0Epytv@k9*LaCL;Ifx9nQt(|rY$p;LNOa*2qF^6C zp^Hkx32|H87KYs76fvl1u({A)!}3ypSNA3eaOWTzr_-sWc6PC`v9__8tx6MShfow{ z2cvc<3IPg88?V&Sagb8mOApbA;mTl{QPFfV+~U!>Z{rx{+U zZPEhJhg}@4wnJ=TyU0kpx1Z4J++qMo6GMOcgfrM_A}}!zfiE;f;kX>aIUGk3M2^rX@)pD}jRFJ_9q~4AdMFk^ zNf?G?7=nd(2~R*Qh7*t+$9ae$DGWz2oTDVP0g7d$yh;;E1MgEr(qWvPS{Y`T&>KL9QYSx|g9x>S4djLq zzX)2V=K$mYg_2dpYTrx+f&~I}wBAgJ1c6BkA%G$*!`UTnb}SgbG9`DMm?Q6oSFXTl6Yc!N>m-wLZ}a?EyaUdQXK`r_#h5 zh8nY902kGG*LWMDFr+=9(2&5SG}EY2#vmqZ;1r-WPAdMyl2Jj9OUfWiM-^LFncoR*H^ekU3;j#h?opo}%; zvA+`;V<<64lN5v!au||`aTp>QmVm@O3fx;PM@Aq*!8h~RMvC^m=$f+p22#4LhJ{$6Ac(AXO~m4B?lI0S=Mxw&D%U%QmOoqlKay4SF` z`(roK)S$RFW=?mImJN-FRtI)9QqY?JL$l6e3@yi41|n$?$cAQ}#u-qa2nCq z-WV#4h=10*ynh~O#87=`yWSY+_RY1Wc~jy9_7VCEqGE^~>(V~@)iN&G|Iv}&4E1`$~6J<7z*}#a+*b9oP%M!MSuh;M@TUWgDoPCe+&*K zEXHDBmk0nEkUR`V;eZAh2`Qmbl&3KSZ4rkQ%WxblMu84F$;aT3;#iEA11vcRuqHqb zK_Iz=)$eXGiYHoT6b8Wwf)q0l1B1r0F_2L)4k|Lsa+sLHIILxE^FEoOMLGnIM$rhz z10AwWk@8`F$kM=jDG3Ep2uC(qSq^SN$YF96CB&2jX%UAU!f~XSHYCF)z&|9zmH|=> zjkCZ7DV%_tto%Wd!qJ?ZWq_4|4qpR)P%LvS=vZlz*XRF_BQl4fh#UtxO5oO0A$ZFdTTv<*=M#L7PJJ9O%UfaMndpV1rGG$&;LP0`eRLrn2I8T#M)IUMcBskS!5J(J&0V{fkkl+Z!V=&4y zFbZVE-i2tqdtI&V?f#*pyk1NCPb*{?EHUn!3#2ylv-{;N3(lc$XgMAQOW3@Fw!1 z94~=`G`qR((IMYpV$ZKekvQ zb9D*?Kb|bz?t8?qlSyUnPRnsK#8I?*>bf=qy?caMsIFu`>vHVu;i*N7;h$ZtI*#)6 zlX)d2^zdxmd)3C$fZi`doy{UuW!hWSn#ogA!R6_;`^J(n1(J|skEJ=cci9IVeRZ)k z|GwtHwDqH3M&y*Ao4mX}?%=lV1NZrloN&3##&eelq2fqH+a1P^6*2Lzc05^Xbu&y+ zlRPfTOSU^spvH%-D4#GWILG+Nw_(0>dW@>@*?g9AoHQ}?^8xWA>n9ougc&1FRKMyf zQ2SHQYcDwAhl{Iv^{{d%xZ|^JXL{Xe)4bsk79QJgd~dY-z_SZ%sAlthshhnZ!NPOK zea8dq8?J5)nGn=-^4OX|7Z>?XT^N^VQRiZVpnx~N=6!lNF|IokT#Ib384+>C^5rgMOD^s^~}02 z=x^P2YPnA=KXzt+zD?ecw~Z|e??Ba8Vo6+QUcL87O*-dOYehucqk*G* zjOqR98>Md?p%c4imcEGjnfN$<$KyHa&oq)J-H$xdYmxWbu)Im-jVl+NZt&H*Kjx=# z=aTlVerD0uyvuZa{6}%BUy8qW596oU)acR6Yh!AXd%t~HKFw?6d+)jzX18*7l(yWu zH~iYx7S7dYw;WzSyncV>@I!TvFCmvh^wjH3PVJj%z1oc1Q~E>@n%z>L*?q~pXL~DF zga#k!wfsn&*{;Ui#_HX=_d%Kn800Mmy+o!&VA2} ztj4$fRCivT==pI&*{y z^GjB`{e{fdovD6palIcY2~arfY{{jfd85zU80|nV+o`iS!;YDJTBm+7THjO29@){o z&yeo(ZjwTgJ)(VdfBvSY;~(9+o!BjB$ot_~;+4$vvNEaaQP*o1*Q7c26R#$I+CF*H z%&;Oap~I-nu4#h|4_G@mXARKUf5$rD(Eg`h2THxX%e1}X@v!kuUO^fAv-Y6J8iVMC zKdPBFl^%PMKKaO*@FDTH>_@CYMWw}yZ^Dn`Cox;m7lCe@edF&qjz5wmDl6L*Y#C&i zQ*!fk;Jxsi43pBKGtT9;u{dqJwEMeqU3~V1PJa^AMu{-WXiNVS zV%lH-;wvM3ug}_-k3SsHJ>ZquB8`|7{d(`Sw%yA@#_!Be*FU+%W^%IWOP_0Z!!{z( z-p5u=o2%ZO&rzCS$utQ_?_{*C+2hoaL&0tQUuM_UO)(!mbMx_`Ma$2ef9_l|a%}n7 zRnfbDw1a>8*+!P0nsVcKT8{pBGU=8mr0n$7Q8$!%L5036z2{aJ7>`q$w0z3SF>Ntf z1J4!Rp5+0}SM6)`K8C z_I#wzw5ypJ8y&8stT{c-&{^QATq%2ElccAUUkt`$XQ!)_RxYa3bYh7FE90 zA^B|djHXjI`AgU%bdsS9>5Yc#F1$X!<;FmA-^=jFM};FMTNgS9_(hcVXh!l~FD5^J z?m2suFW3M2gIwt73aUqy!}+LdJqwJkSH{xGi~98ws!#ScKeX8J>}>x#Q#Wt8XYgjw+@m7Lj7fF8q*sw$^>SL+ z)?KSAme<&EyA_{cK2=h+MaZ(jD|=eU(&4uJgso9mLfoH*a(C7)J!03l?`GH0shUe( zGUsikO;_V*WT6(Pa}TUJc=F+M)$GCBJVs<3hctHSUY?gS3UZ z`S|H0!5a!5ZR`DX^vmq<*-PiIT@++_HLdr&dn0*mLuB-2t+=iMAwY;B(&B==Qh?R+cV zZp+Y!z59+oC~K@}SgU$sP{qZDGrU! zD0gG)xD@M)p4Ugbe=u(|9o?|D`AP+@&7O9>0X^w$BzUrTf!k$`o+r93uyh=GE%MCP zbGy%0JF<3WTJ~+YyO~|RxV-Vi*azyxGi~=~En9bVlXsHe4&9Z#HAAyL;FDL}PC`W7 z^nw7boS-G$wDk0w2QhoE>wg@)x!Xlgv^G=SVtoIMy0|;&Pghjpn3U!ZPs{y-FCElY z>a$|Y&m7Mo_U>yp-X)5L+Bdi+CcEBlaJ@|mDXWnQx8CF{7w^`X-khpk{YvlS^Cs5h zr`snCTIEqyBuw9mxiHJMKJ6|l&dT0^*G_)F7Ved@tS|I)Q+@rzH zjrZc+S(-nbsdr07ln%Tt;QLz@Tu?rh&>&jWGVgKD&FYiIXFjZ*U!9ni5?b?C=*ir? zvs`^IlD2n%{zT`dV?z%7Xsa4oKkw58PF(7AarqkIAWWRg~E zt@RE~?>djmDc;LXi61iU>TlS;Ugh7`=o6geGl*N4l{myQJV|Uf!!S@&>u}o1?ydN< z!ofxT`a6$~BDJ+LEp&vbmV-+BTEEG4yXQS_x?t?o8;0h3vrJaI#%u_CZ_(fT&FQhX zgqI|`k*>cAC!{Xc7g~6k=W-t>Jzc+TQ>%eb1ie6N3Yh=31zxxR!}eB2$(x= zmJjA{iI{XXnA!P=arbE4_LhAt_<76X9%_=T6{S_zs{|$UPmgWewJ7ewyLT^Rnrd|X z@8zjR*J>}FR_B59?55eiI#h*aji?TcEKv%DhJJK5oDjdFWlET-Zv33?yr9w6j|?06 zg>y2-|5}&)F!G1eOTrU9pt|VF=1s$ke(h1BLc zyXhjzaVspb`xySwe%$N{m|M$)tlOgP8H4Lq`=p!dR^C}~*1vcPJxjxs=r+VSmKpXT z_WbTUuS%45`Eb1who%fbU8kGB)Qd?@EsQ>?G>Nq)b)Yl`yE{K?%a2S(*wldgnupVs z4*L#lsW{g1YLOjsTjlUPUP_hno}=AcZ~n}l%0x#G-DbJjJO1RYacOnuo1A(TC(JL; z-B)vQ*;6x3qx`hl{*#=tMjX6Z<-Tn|s^auL+)og&k7lFF+t`*#0s}RHdCE(VC^Z*1M8<$oPVPdu8T=c zC9gAWt2NX)4&yVsyQ@Fk_~M0{k>9@Fhg|(skwi?BJUE+argpdZk6cxocWIVj^~1gM zPc7(Gm;dSNsNCH=;ZbhlXlh2OYR(x%*(l|MPffup55JH>Y(KBPr%b)>lpIJjFQ2`o zBJiYZ?%fQ<+<#YP8o$?|P1EtJZT-K61rUW3--~=P*w-39ley5TX2Z z;Qh=uVTE&gdb~?J=tCCziqAfKY4#8L)(@XOK!b>e7vo!MeWn&g0tsbTMn>T zO7UVVD;EbVtIx$QC~>#XUu$ZA!Ce26uba)<<@S9YL$A2(Fj~5t?>KP9?3CjJy~5#B zZ~Jb;M;aQhjt$7qUvud|+=^p|`yY-qXjXdkvL>yLJ?fK*;qj$!YEBMocxC$Pp_1k9 z0{3G9$}XHD`%9FNn=`H{uV9VAVtDD%i&IS3`dmLBHt)fO!U_->8qMB6tDD|9y4yVV z8~qa16;W|fOvxRhL2Jnj2iK*ymKCbz8oU`%L2s_+>kQG3Vy;|Cd%Dc(qA)Y=r~b?+ zt5G{guO55A_Jd_Po$!mc-w9VLBf3$iXJe(~wimdadZDJKy=DAL-D~^KTW;`JH9*U- za?PCP3#%tN7;l|P!&0MNeFm<3+^a3F`oXq@{SG`s^=`Sofi2X4x_dpgg;#wt%dUUg zyJkVp!^gAFRkD~#4o7lMT+x7!s?MC5!rzItAd zkLC9tdbRN9v(VDAM%9oIm6ZbxqaQqeaAwDu*62ND)oLMAqukls&`A z#lT7;r44Xn+!%&zqQns>+pLelM5%}oxLVtGK!7Jxw!cgkA}}$DjEppn#Ed0UKNEx? z2oo4JK~V^-fWqbk%g87wIBbL*q8-DU4x^;v5SdsKY#_%Zg_3ZYDVq)E4L;Ks6yoI6 z2_GERAq5~0lPEI81Tlt9f`UxG+z}?Ti2xuS1pVobFn7?ynYhwnl5ihP$EjeNTfj|us(4R=|`J{ z1p6r_Q|{mZHyJ5c6T(AaK7nv~D1yN-(k@BGeh*sOP6KL; zz{Xhn%x`K@aNr~n0R}JyvfLB|Ky*Nvq}+)=Go~1qyH{Yie0W;07>J}DO))j&w>eWb z4~4fq^1`2}r74qLhM7k%Cfy);=lz6N~?5GwnnP zlQ6PKQc7F+0R@_}E#&#dz~ytqFaTu$3L_kYu^q-__%#iY{xnedUrXNP8<-0tBk13; zM){M$el$p99dYb`v5Zj!mnQiHgmQ#1#N*;H#HU0Yh|8b|2j>bAo{0A~(f<(37z877 zV?!|kj(f5HKd{Q@@nH;OP)LXpIK+c-65@+64#cNniiZgqieTE~**~q_c2+TW7#7I6 zMZS$&N)jAFOJ%=TZU`wQL6rf*j47LuN`eeJiIjl<A#W*m`#YtfG{}#6#2*KPDT!3)}IHx09e2XJ@ z8qn8-eQ9F~%laE@mK%Jh_5UlT{f`syoytaWoIqfV4^cQHf-pV~f*FTmARMPSLJ|ix zAJJYH{R<)N|5e%F$uh>nahOK<5JnIbgk!*^NtnVQ8s_sUl1mU=>VGFFJ5bmwDwV&@ z!Z-wjQu%Yi0;;+WTb^hl@2o!88WT(l;(d^tcx&; z6k;L@;*-FU6~#J@QfMFnipS@XD9Vr+f_8~Q zLPXIt%te6=Y2H6UAwi2UMhLKkz`;5IX#|0UJQ1K9WKo9GHKkAp&f)O66hy(Guxxi^ zl#7Fm3>s&QOJFqCHM9Aa$j~Jj0z)H6gl2#YMID~zi zmuV5GSV=x3kN^J+%QS`}LLA7D;dE%3BzY)Aa%i07i}(zJbS=Qr49(>bpti(#WJmZS z2tEuEe3IaR(8i}pQJ0hg+DjDU11;lRAjo!4ff*nH2BtX}Mxi`m7Xdja3S%HR0Ae~^ z?^`L9U;W9mG`Ofzd<2e9@<}ci!Z=(|TM2P4M8JFu;v*uOq)?iV^ZzQeg3>^7;UyHp zLQ2FS5XsP>7UzJwE`k6JHo+Cb6xdGl5zb%8>oWwyK|}-&b0Jj7Cn0d#hC?7x@F6bB zr9?2ePva59-$9Vz{tl%O2-HXfAVqEvJRE@-3`Q9WMgfo5*AVSbpR@HulfTLC?aRNo zg9h2UeGJ@fgR63r&b#uCG!E+0fAiIG{qt`gVPNpzAzhO1f8zR2TwRhtmlpqLUH^%z zOA_eP;{UAc9}`!f-@a|9gTZ$bk>I=Z^z;kz9}f2vPPVgV1+s!zZaOdL^amroL+m}n zSggKU^0yLe+x9_Vu$Roi$);CbH!U5*etsSmRp7@Kn;fhy+`&(XE0KT#^8vkHM>ZKD z{?WHbS?MJ3Px5IQ6tf~GJEm`F{q1~*K10}d(`W1Cm&e9tROCNhc|v+Q&CjH@%{=}> z{IAt#M#imC0f(^6#k_>TvLaN?)9YPUAn(#mqaF|PvzJt~E}rkJa^OYW_D9cKxbvv& z#mOe+0cQ&9_4WEzOy4~2*9)^Por`b2e#5@5W3B4D??lq865F9eAN=yT;{B?)1qU_- zrQQf=e&J{C0u`;moOgVR->-ZzvX%a1VQqbO`ntGhTi@BdKC>?G^e`=r;!|N+EyL?} z9yY7>zg$qfviIio4I2+F&{ElaaLUxn8OpMcTG<<{i)P$^7_w~z`|V=4vP)Ah?`wUp zSvn3?+mYz#a?n2M)tscmI<;*9dzIx(DPDIc^WsCsYQ^a$7!@RqeJ$CMM2C{O!{e>C z=$6j*e7QPUWw_z`INgc$y_*JG+DmUG4K1zl+-}W_Puy_TVwI(KZMc<+!E zjc=_~d>be3Tl* Date: Tue, 19 Mar 2024 22:47:55 -0400 Subject: [PATCH 36/94] Removed justice access from attorney as it will be used to secure Clerk's locker. Disabled antag for all justice besides attorney. --- Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml | 1 + .../Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml | 5 +++-- Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml index 581e81c4735..f97482cc0c7 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml @@ -17,6 +17,7 @@ icon: "JobIconClerk" requireAdminNotify: true supervisors: job-supervisors-cj + canBeAntag: false access: - Justice - Security diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml index 952bcefa452..41c457700f8 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml @@ -10,8 +10,8 @@ icon: "JobIconLawyer" supervisors: job-supervisors-cj access: - - Justice - Prosecutor + - Justice - Security - Maintenance @@ -19,9 +19,10 @@ id: ProsecutorGear equipment: jumpsuit: ClothingUniformJumpsuitProsecutorRed + neck: ClothingNeckProsecutorbadge back: ClothingBackpackFilled shoes: ClothingShoesBootsLaceup - id: LawyerPDA + id: ProsecutorPDA ears: ClothingHeadsetSecurity # TODO add copy of space law inhand: diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml index 3e3a08bd4ea..d6fe26be942 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml @@ -16,7 +16,6 @@ access: - Service - Lawyer - - Justice # Delta V - Add justice departement access - Maintenance - type: startingGear From df9c522763fdf2a130b28fdbc0ebe3a6cf8c3842 Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Tue, 19 Mar 2024 22:52:28 -0400 Subject: [PATCH 37/94] Added Clerk locker and placed Notary Stamp into it. Uncommented gavel in CJ locker --- .../Catalog/Fills/Lockers/chiefjustice.yml | 2 +- .../DeltaV/Catalog/Fills/Lockers/clerk.yml | 11 +++++++++++ .../Storage/Closets/Lockers/lockers.yml | 17 +++++++++++++++-- .../DeltaV/Roles/Jobs/Justice/clerk.yml | 1 - 4 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/clerk.yml diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/chiefjustice.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/chiefjustice.yml index 3a8c81a38a7..7706e071878 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/chiefjustice.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/chiefjustice.yml @@ -11,5 +11,5 @@ - id: BoxEncryptionKeyJustice - id: CJIDCard - id: DoorRemoteJustice - #- id: Gavel - Uncomment when added + - id: Gavel - id: RubberStampCJ \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/clerk.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/clerk.yml new file mode 100644 index 00000000000..76625016922 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/clerk.yml @@ -0,0 +1,11 @@ +- type: entity + parent: LockerClerk + id: LockerClerkFilled + name: clerk's locker + components: + - type: StorageFill + contents: + - id: ClothingOuterClerkVest + - id: BoxEncryptionKeyJustice + - id: ClerkIDCard + - id: RubberStampNotary \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Closets/Lockers/lockers.yml index fc75bda820d..c19b10f1feb 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -1,7 +1,7 @@ - type: entity id: LockerChiefJustice parent: LockerBaseSecure - name: chief justice's locker # DeltaV - Justice dept + name: chief justice's locker components: - type: Appearance - type: EntityStorageVisuals @@ -9,4 +9,17 @@ stateDoorOpen: qm_open stateDoorClosed: qm_door - type: AccessReader - access: [["ChiefJustice"]] \ No newline at end of file + access: [["ChiefJustice"]] + +- type: entity + id: LockerClerk + parent: LockerBaseSecure + name: clerk's locker + components: + - type: Appearance + - type: EntityStorageVisuals + stateBaseClosed: qm # TODO: Replace this with Clerk locker sprite + stateDoorOpen: qm_open + stateDoorClosed: qm_door + - type: AccessReader + access: [["Justice"]] \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml index f97482cc0c7..43a1f4db1c6 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml @@ -29,7 +29,6 @@ jumpsuit: ClothingUniformJumpsuitClerk back: ClothingBackpackFilled shoes: ClothingShoesBootsLaceup - pocket1: RubberStampNotary id: ClerkPDA ears: ClothingHeadsetJustice innerClothingSkirt: ClothingUniformJumpskirtClerk From a9e7ccbee016b45b8077d5aead4630e704563758 Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Tue, 19 Mar 2024 23:01:41 -0400 Subject: [PATCH 38/94] Added lawyer's stamp to lawdrobe --- .../Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml index ce786bd40f1..b7c75fcc986 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml @@ -16,6 +16,7 @@ ClothingNeckLawyerbadge: 2 ClothingOuterCoatOvercoat: 2 # DeltaV - add overcoat to LawDrobe LuxuryPen: 2 + RubberStampLawyer: 3 # DeltaV - add lawyer stamp to lawdrobe contrabandInventory: ClothingOuterRobesJudge: 1 ClothingHeadHatPwig: 1 From f4aeb981feb4536d2bf1f82ed2e8e5f31424ceaf Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Wed, 20 Mar 2024 00:04:16 -0400 Subject: [PATCH 39/94] Added Prosecutor PDA, icon, and ID sprite --- .../DeltaV/Entities/Objects/Devices/pda.yml | 16 ++++++++++++++-- .../Objects/Misc/identification_cards.yml | 2 +- .../DeltaV/Roles/Jobs/Justice/prosecutor.yml | 2 +- .../Prototypes/DeltaV/StatusEffects/job.yml | 2 +- .../Objects/Misc/identification_cards.yml | 3 +++ .../Interface/Misc/job_icons.rsi/Prosecutor.png | Bin 0 -> 5005 bytes .../Interface/Misc/job_icons.rsi/meta.json | 3 +++ .../DeltaV/Objects/Devices/pda.rsi/meta.json | 5 ++++- .../Objects/Devices/pda.rsi/pda-prosecutor.png | Bin 0 -> 6141 bytes .../Objects/Misc/id_cards.rsi/idprosecutor.png | Bin 0 -> 5180 bytes .../DeltaV/Objects/Misc/id_cards.rsi/meta.json | 3 +++ 11 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Prosecutor.png create mode 100644 Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-prosecutor.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/idprosecutor.png diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml index 7dbaa0d10fa..e9d39801860 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml @@ -124,9 +124,21 @@ name: prosecutor PDA description: Sharp. Looks like it could prosecute you all on its own. components: + - type: Sprite + sprite: DeltaV/Objects/Devices/pda.rsi + layers: + - map: [ "enum.PdaVisualLayers.Base" ] + - state: "light_overlay" + map: [ "enum.PdaVisualLayers.Flashlight" ] + shader: "unshaded" + visible: false + - state: "id_overlay" + map: [ "enum.PdaVisualLayers.IdLight" ] + shader: "unshaded" + visible: false - type: Pda id: ProsecutorIDCard - state: pda-lawyer #Change this to prosecutor when sprited + state: pda-prosecutor penSlot: startingItem: LuxuryPen priority: -1 @@ -136,7 +148,7 @@ - type: PdaBorderColor borderColor: "#6f6192" - type: Icon - state: pda-lawyer #Change this to prosecutor when sprited + state: pda-prosecutor - type: CartridgeLoader # DeltaV - Crime Assist preinstalled: - CrewManifestCartridge diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml index a4ffcf8e57d..dc4412c961a 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml @@ -35,4 +35,4 @@ layers: - state: default - sprite: DeltaV/Objects/Misc/id_cards.rsi - state: idclerk #NEED + state: idprosecutor diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml index 41c457700f8..d3317fbf114 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml @@ -7,7 +7,7 @@ - !type:OverallPlaytimeRequirement time: 36000 # 10 hrs startingGear: ProsecutorGear - icon: "JobIconLawyer" + icon: "JobIconProsecutor" supervisors: job-supervisors-cj access: - Prosecutor diff --git a/Resources/Prototypes/DeltaV/StatusEffects/job.yml b/Resources/Prototypes/DeltaV/StatusEffects/job.yml index 4287fd9a3a4..894e1586b40 100644 --- a/Resources/Prototypes/DeltaV/StatusEffects/job.yml +++ b/Resources/Prototypes/DeltaV/StatusEffects/job.yml @@ -24,4 +24,4 @@ id: JobIconProsecutor icon: sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi - state: Clerk #need prosecutor + state: Prosecutor #need prosecutor diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 4ac97d09f8a..24132923405 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -656,6 +656,9 @@ - JobIconMartialArtist # Nyanotrasen - MartialArtist, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml - JobIconGladiator # Nyanotrasen - Gladiator, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml - JobIconForensicMantis # Nyanotrasen - ForensicMantis, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml + - JobIconClerk # Delta V - Added justice dept + - JobIconChiefJustice # Delta V - Added justice dept + - JobIconProsecutor # Delta V - Added justice dept - JobIconVisitor - type: ActivatableUI key: enum.AgentIDCardUiKey.Key diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Prosecutor.png b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Prosecutor.png new file mode 100644 index 0000000000000000000000000000000000000000..997b29b2a446fecd8201e255aa482d1ef5e02c83 GIT binary patch literal 5005 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 q`3SQWiEmbH9p=>xzXSvY8C4fGEWWh_oO@ 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 Date: Wed, 20 Mar 2024 21:35:05 -0400 Subject: [PATCH 40/94] Added gavel block and made gavel tap when clicking on it --- .../DeltaV/Gavel/GavelBlockSystem.cs | 30 ++++++++++++++++++ .../DeltaV/Gavel/GavelBlockComponent.cs | 17 ++++++++++ Resources/Audio/DeltaV/Items/gavel.ogg | Bin 9428 -> 10265 bytes .../Objects/Specific/Justice/gavel.yml | 10 +++--- .../Objects/Specific/Justice/gavelblock.yml | 14 ++++++++ Resources/Prototypes/DeltaV/tags.yml | 3 ++ .../Specific/Justice/gavelblock.rsi/icon.png | Bin 0 -> 225 bytes .../Specific/Justice/gavelblock.rsi/meta.json | 14 ++++++++ 8 files changed, 82 insertions(+), 6 deletions(-) create mode 100644 Content.Server/DeltaV/Gavel/GavelBlockSystem.cs create mode 100644 Content.Shared/DeltaV/Gavel/GavelBlockComponent.cs create mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavelblock.yml create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Justice/gavelblock.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Justice/gavelblock.rsi/meta.json diff --git a/Content.Server/DeltaV/Gavel/GavelBlockSystem.cs b/Content.Server/DeltaV/Gavel/GavelBlockSystem.cs new file mode 100644 index 00000000000..621f1b79a55 --- /dev/null +++ b/Content.Server/DeltaV/Gavel/GavelBlockSystem.cs @@ -0,0 +1,30 @@ +using Content.Shared.Audio; +using Content.Shared.Interaction; +using Content.Shared.Tag; +using Content.Shared.DeltaV.Gavel; +using Robust.Shared.Audio.Systems; + +namespace Content.Server.DeltaV.EntitySystems; + +public sealed class GavelBlockSystem : EntitySystem +{ + [Dependency] private readonly SharedAudioSystem _audioSystem = default!; + [Dependency] private readonly TagSystem _tagSystem = default!; + + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(OnInteract); + } + + private void OnInteract(Entity entity, ref AfterInteractUsingEvent args) // We make this component + { + if (!args.CanReach || args.Target == null || + !_tagSystem.HasTag(args.Used, GavelBlockComponent.GavelTag)) // We make this component and tag + { + return; + } + + _audioSystem.PlayPvs(entity.Comp.GavelSound, entity); // Assuming we have gavel sound + } +} diff --git a/Content.Shared/DeltaV/Gavel/GavelBlockComponent.cs b/Content.Shared/DeltaV/Gavel/GavelBlockComponent.cs new file mode 100644 index 00000000000..b86cefe20d9 --- /dev/null +++ b/Content.Shared/DeltaV/Gavel/GavelBlockComponent.cs @@ -0,0 +1,17 @@ +using Content.Shared.Tag; +using Robust.Shared.Audio; + +namespace Content.Shared.DeltaV.Gavel; + +/// +/// A gavel block can emit a hitting sound when interacted with using a gavel. +/// +[RegisterComponent] +public sealed partial class GavelBlockComponent : Component +{ + [ValidatePrototypeId] + public const string GavelTag = "Gavel"; + + [DataField("gavelSound"), ViewVariables(VVAccess.ReadOnly)] + public SoundSpecifier GavelSound = new SoundPathSpecifier("/Audio/DeltaV/Items/gavel.ogg"); +} diff --git a/Resources/Audio/DeltaV/Items/gavel.ogg b/Resources/Audio/DeltaV/Items/gavel.ogg index 1ea5aec6e317162b2f806bb497b5eb86f47f2e90..c6061cbb3ddba6a5135466e67e01b9a204317cba 100644 GIT binary patch delta 8808 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 Zt7bj{1R3-Dnh*WrtXN;>_<9{+_+JXCQTG4< delta 7984 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 z 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 diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavel.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavel.yml index e4b352c3374..535a7156f3f 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavel.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavel.yml @@ -15,9 +15,7 @@ Blunt: 5 - type: Item size: Small - sprite: DeltaV\Objects\Specific\Justice\gavel.rsi - - type: EmitSoundOnUse - sound: - path: /Audio/DeltaV/Items/gavel.ogg - - type: UseDelay - delay: 2.0 \ No newline at end of file + - type: Tag + tags: + - Gavel + sprite: DeltaV\Objects\Specific\Justice\gavel.rsi \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavelblock.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavelblock.yml new file mode 100644 index 00000000000..1e979fe952a --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavelblock.yml @@ -0,0 +1,14 @@ +- type: entity + parent: BaseItem + id: GavelBlock + name: gavel block + description: A hardwood block that, when hit with a gavel, emits an aura of authority. + components: + - type: Sprite + sprite: DeltaV\Objects\Specific\Justice\gavelblock.rsi #Change to gavelblock + layers: + - state: icon + - type: Item + size: Small + - type: Clickable + - type: GavelBlock \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/tags.yml b/Resources/Prototypes/DeltaV/tags.yml index 6a1efcfa695..635b529c2a1 100644 --- a/Resources/Prototypes/DeltaV/tags.yml +++ b/Resources/Prototypes/DeltaV/tags.yml @@ -41,3 +41,6 @@ - type: Tag id: Skirt + +- type: Tag + id: Gavel diff --git a/Resources/Textures/DeltaV/Objects/Specific/Justice/gavelblock.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavelblock.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c1254bb8086092da5a89f6dc17cc308273e71d1e GIT binary patch literal 225 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5C^*^E z#WAE}PO@de1BSy6Ok!<}Y>W9MN)N1Hc9S)D#V|=`Lw?+^`lKtCs%KM{>|z$%cKok> z?OWN2t1kZ+e$6py@q@3w^(&sbvQ~N+$VHI75wZ0V~|XhCp@(2FADYFFtHle*<(L NgQu&X%Q~loCICE+PhJ23 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Specific/Justice/gavelblock.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavelblock.rsi/meta.json new file mode 100644 index 00000000000..5abad9b4225 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavelblock.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites sourced from https://github.com/tgstation/tgstation/pull/8495", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} From cac4e351da3fbe2cd98f1228f225d291326c67c6 Mon Sep 17 00:00:00 2001 From: "luckywill339@gmail.com" Date: Thu, 21 Mar 2024 00:54:45 -0400 Subject: [PATCH 41/94] Add component, EmitSoundOnInteractUsing onto the gavel block --- .../DeltaV/Gavel/GavelBlockSystem.cs | 30 ------------------- .../EmitSoundOnInteractUsingComponent.cs | 14 +++++++++ Content.Server/Sound/EmitSoundSystem.cs | 10 +++++++ .../DeltaV/Gavel/GavelBlockComponent.cs | 17 ----------- .../Objects/Specific/Justice/gavel.yml | 3 -- .../Objects/Specific/Justice/gavelblock.yml | 5 +++- 6 files changed, 28 insertions(+), 51 deletions(-) delete mode 100644 Content.Server/DeltaV/Gavel/GavelBlockSystem.cs create mode 100644 Content.Server/Sound/Components/EmitSoundOnInteractUsingComponent.cs delete mode 100644 Content.Shared/DeltaV/Gavel/GavelBlockComponent.cs diff --git a/Content.Server/DeltaV/Gavel/GavelBlockSystem.cs b/Content.Server/DeltaV/Gavel/GavelBlockSystem.cs deleted file mode 100644 index 621f1b79a55..00000000000 --- a/Content.Server/DeltaV/Gavel/GavelBlockSystem.cs +++ /dev/null @@ -1,30 +0,0 @@ -using Content.Shared.Audio; -using Content.Shared.Interaction; -using Content.Shared.Tag; -using Content.Shared.DeltaV.Gavel; -using Robust.Shared.Audio.Systems; - -namespace Content.Server.DeltaV.EntitySystems; - -public sealed class GavelBlockSystem : EntitySystem -{ - [Dependency] private readonly SharedAudioSystem _audioSystem = default!; - [Dependency] private readonly TagSystem _tagSystem = default!; - - public override void Initialize() - { - base.Initialize(); - SubscribeLocalEvent(OnInteract); - } - - private void OnInteract(Entity entity, ref AfterInteractUsingEvent args) // We make this component - { - if (!args.CanReach || args.Target == null || - !_tagSystem.HasTag(args.Used, GavelBlockComponent.GavelTag)) // We make this component and tag - { - return; - } - - _audioSystem.PlayPvs(entity.Comp.GavelSound, entity); // Assuming we have gavel sound - } -} diff --git a/Content.Server/Sound/Components/EmitSoundOnInteractUsingComponent.cs b/Content.Server/Sound/Components/EmitSoundOnInteractUsingComponent.cs new file mode 100644 index 00000000000..0c82cda3864 --- /dev/null +++ b/Content.Server/Sound/Components/EmitSoundOnInteractUsingComponent.cs @@ -0,0 +1,14 @@ +using Content.Shared.Sound.Components; + +namespace Content.Server.Sound.Components +{ + /// + /// Whenever this item is used upon by a specific entity prototype in the hand of a user, play a sound + /// + [RegisterComponent] + public sealed partial class EmitSoundOnInteractUsingComponent : BaseEmitSoundComponent + { + [DataField("UsedItemID")] + public string UsedItemID = ""; + } +} diff --git a/Content.Server/Sound/EmitSoundSystem.cs b/Content.Server/Sound/EmitSoundSystem.cs index 059800c3f9d..6a8fd5e169f 100644 --- a/Content.Server/Sound/EmitSoundSystem.cs +++ b/Content.Server/Sound/EmitSoundSystem.cs @@ -3,6 +3,7 @@ using Content.Shared.UserInterface; using Content.Shared.Sound; using Robust.Shared.Random; +using Content.Shared.Interaction; namespace Content.Server.Sound; @@ -40,6 +41,7 @@ public override void Initialize() SubscribeLocalEvent(HandleEmitSoundOnTrigger); SubscribeLocalEvent(HandleEmitSoundOnUIOpen); + SubscribeLocalEvent(HandleEmitSoundOnInteractUsing); } private void HandleEmitSoundOnUIOpen(EntityUid uid, EmitSoundOnUIOpenComponent component, AfterActivatableUIOpenEvent args) @@ -52,4 +54,12 @@ private void HandleEmitSoundOnTrigger(EntityUid uid, EmitSoundOnTriggerComponent TryEmitSound(uid, component, args.User, false); args.Handled = true; } + private void HandleEmitSoundOnInteractUsing(EntityUid uid, EmitSoundOnInteractUsingComponent component, InteractUsingEvent args) + { + var curUsedItemID = Prototype(args.Used)?.ID; + if (component.UsedItemID == curUsedItemID) + { + TryEmitSound(uid, component, args.User, false); + } + } } diff --git a/Content.Shared/DeltaV/Gavel/GavelBlockComponent.cs b/Content.Shared/DeltaV/Gavel/GavelBlockComponent.cs deleted file mode 100644 index b86cefe20d9..00000000000 --- a/Content.Shared/DeltaV/Gavel/GavelBlockComponent.cs +++ /dev/null @@ -1,17 +0,0 @@ -using Content.Shared.Tag; -using Robust.Shared.Audio; - -namespace Content.Shared.DeltaV.Gavel; - -/// -/// A gavel block can emit a hitting sound when interacted with using a gavel. -/// -[RegisterComponent] -public sealed partial class GavelBlockComponent : Component -{ - [ValidatePrototypeId] - public const string GavelTag = "Gavel"; - - [DataField("gavelSound"), ViewVariables(VVAccess.ReadOnly)] - public SoundSpecifier GavelSound = new SoundPathSpecifier("/Audio/DeltaV/Items/gavel.ogg"); -} diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavel.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavel.yml index 535a7156f3f..970e34b3013 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavel.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavel.yml @@ -15,7 +15,4 @@ Blunt: 5 - type: Item size: Small - - type: Tag - tags: - - Gavel sprite: DeltaV\Objects\Specific\Justice\gavel.rsi \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavelblock.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavelblock.yml index 1e979fe952a..8d65492fafd 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavelblock.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavelblock.yml @@ -11,4 +11,7 @@ - type: Item size: Small - type: Clickable - - type: GavelBlock \ No newline at end of file + - type: EmitSoundOnInteractUsing + sound: + path: /Audio/DeltaV/Items/gavel.ogg + UsedItemID: Gavel \ No newline at end of file From 402592548c666d21b2a0fbcfd7176b179b5704ac Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Thu, 21 Mar 2024 02:16:25 -0400 Subject: [PATCH 42/94] Added sprites for CJ and Clerk locker --- .../Storage/Closets/Lockers/lockers.yml | 12 +++++------ .../Structures/Storage/closet.rsi/cj.png | Bin 0 -> 5692 bytes .../Structures/Storage/closet.rsi/cj_door.png | Bin 0 -> 5840 bytes .../Structures/Storage/closet.rsi/cj_open.png | Bin 0 -> 5529 bytes .../Structures/Storage/closet.rsi/clerk.png | Bin 0 -> 5806 bytes .../Storage/closet.rsi/clerk_door.png | Bin 0 -> 5853 bytes .../Storage/closet.rsi/clerk_open.png | Bin 0 -> 5588 bytes .../Structures/Storage/closet.rsi/meta.json | 20 +++++++++++++++++- 8 files changed, 25 insertions(+), 7 deletions(-) create mode 100644 Resources/Textures/Structures/Storage/closet.rsi/cj.png create mode 100644 Resources/Textures/Structures/Storage/closet.rsi/cj_door.png create mode 100644 Resources/Textures/Structures/Storage/closet.rsi/cj_open.png create mode 100644 Resources/Textures/Structures/Storage/closet.rsi/clerk.png create mode 100644 Resources/Textures/Structures/Storage/closet.rsi/clerk_door.png create mode 100644 Resources/Textures/Structures/Storage/closet.rsi/clerk_open.png diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Closets/Lockers/lockers.yml index c19b10f1feb..53373a96719 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -5,9 +5,9 @@ components: - type: Appearance - type: EntityStorageVisuals - stateBaseClosed: qm # TODO: Replace this with CJ locker sprite - stateDoorOpen: qm_open - stateDoorClosed: qm_door + stateBaseClosed: cj + stateDoorOpen: cj_open + stateDoorClosed: cj_door - type: AccessReader access: [["ChiefJustice"]] @@ -18,8 +18,8 @@ components: - type: Appearance - type: EntityStorageVisuals - stateBaseClosed: qm # TODO: Replace this with Clerk locker sprite - stateDoorOpen: qm_open - stateDoorClosed: qm_door + stateBaseClosed: clerk + stateDoorOpen: clerk_open + stateDoorClosed: clerk_door - type: AccessReader access: [["Justice"]] \ No newline at end of file diff --git a/Resources/Textures/Structures/Storage/closet.rsi/cj.png b/Resources/Textures/Structures/Storage/closet.rsi/cj.png new file mode 100644 index 0000000000000000000000000000000000000000..c57b4b88990c1ba504317e849e4f12da95ce7e26 GIT binary patch literal 5692 zcmeHKdo)!07e9m{N+cnVX(~4|GiRR0L}I+g`!OCxH^^_d-q+i8 z!g!UuJA-uYU( zN7&4cJi8;TfLYGYA6NDSsqHS8R6cul;qOJ2m2`D49b#W*R^~wDvI@OkN54nYoUdnQ z#C7@IC|GQ&XF_siaNfkuK9o}Ew#=2L_e_}G64+RxA?TCjWnUhV2F*O3@@X)vyZU_2 zZ@Nteg|3D(UIK-mveMJsotQd(^X>ARD@v?Vh_uJsb{{ELzD7LI^CW+6(2<1+_xen4 zyUVoJYkN0uUw*q!*Wd=EY+!^Kco ztsb?EHvdZNpE?X>UVJ?^^?8P`!P((;l_^H*vXV^~)Qy62cJvmEizw_lknh;$kV|p5 zVjUFq&Z?{})QvIrtBL7~^4W~Df_9XD=qtaiLdr}k(95^#-j*pE>d}l@V7aFI$?GX% zoj*?~)#jYgt*vnjNeM`l_9xo^elbR6HUIZ=y@O(YXCQgvA3@0#Iwpio(}#?;VB_)K z7|$kPGR6RinJ&3}erlnvvato)P02*VX@Zst*9c%*T+|Y-;YU~bU!ZQyY3*&zsMqoo zUoB1AVKjxaw=Q*emI`5yTXo&lKQ%Rj+l{4-c~abMeP?Xx%;1X0{%KnmvI=KH4gOAh z(t-}@q?>nyd2Cx)Z26QG6;xGXkbmbueYR0$b|~+9^o@-Eo`cesYFSU&i+mkad*)_W zL*nyRLvu&oz6MeY5pF-ISx{aW${T1bwpy^Hr~Zz^iyNPmVjhHVr0(N~pAKQfSnN*= zzoIcM61^d8e0Y_Cs(KW$xoXYU%Q>Xx<+C`dljk3gr6v>9)NW|i&B?oKbH|YKbR^9> z__~Q`F!X7j-_UevOI3A*;1;#b`r=zF^8OF0y^PO#v-~=HckNlmkJ4;T>Tsl+ItCw8 zTh^}L^J3yqA!;F|I`_@oo?UanacyPwsp+?JFPMpUX_UQxnBRA$HSh|n=#bAku{rY+ zc=YgHb9~9TD+EANd_p~R%C!Whn$Nhl;5XqR6p)nJ&ZE{FLFH(_7*y zx(ttZ5;liK^`H3bX@0pV_Q=9JjegtB{QWFe2d%FSn48jVU5dJNNvUv7(EhgTjY}}? zE{iQ5oo=x*O38lyzRBDlCEc90VuNw%-y^&1hAg!hq`x8q^8nu`O*-g?JN*7)m-uqW z1bcjt|8_Pt?;^s*00k$&)MU_SM^Em>Aw{=kzw0 z<24zBra5Lcs|=@}KCqyQ)N#%sg;nO;+7=)T*>voI{*fu?vs;qt4vz2~mIe214&BG- zd!IASJ2AF!xpvs1!$JGf1dBq~Y-=t&wM#^LkMA0BI5T7Ugo5t7M`rLu^y4LJI!eJ* zapZ)>8L739=sxwqgp}Z=6x994(Fyj!_@0%QZ>}lRgEl59w`>UXjCq)<-Lp{l^{uPA z+VdY9?MNGmWL1(QUe**LM#s2t;l1IG4|4WIcR1yF%aiW5{881?|Q2ZcFuKGj#Jr z?=+nM!_Qfc=?2;v!vlTyAN84_$(Ej!N^_;a6B}5z=3HrU#L%3N22OzA29K+4lY8p5 zY%g`#Eni-p-f#6v`bWmRSt4T1Z@Mjnd&g3(Q;T+FHz)3<)wyRmF88*DT2sRe+bulxby8$sleI?_)HS-E&Fs+4IE}Jtu9%cnKUBket4#&VOhSf?J%z@ z&tcF!jvXeL;stt%8E_QOZK(tfSnADUFO6Z_a4`1s#@i;)5dZ-!gU|^AzEDa}u)`>D z>Bv|v#$(V56#o!r{{Wom|EskS9A#luRb3 z-r2jT?+{Pz}8nR6ThGUm`fT1Z*Q2M69C zmWq~0*syaPER@ao9)iREYA;?Q;VZ)7u<e7{=ADTw3=#0o2f z>>o5`JnlELe(+5`qX_4FM-cO`xIburiCv+LXnA?jokZ*oXn+OscOC}&Wi6BrpSdaq~NL)6=1v!N8pqN6b3=*V9*9jA(1!~4u?$yNwn`Ed?Y-iDk1*&Udf?22o#$Dk;oBTGL}Xo zaIj=5iGqxXAQrNLC~Oi5B$Fr<1r&!(cM(Yh5Ry)w0E&e1Vqv6WLQXi{!Ix==A>zPq z5??+f<01yg9^eT%qIl`IDHcxv2go2fp9E_H0R%w`l|ZF{HZp3N5$%I_-sQC=MipoFEyDfPzFa z9VF3-1Qtl3Qz&$bH5No9-|34uJZ|Fu(w1)@wC!lp-FQ-D{X~UmbWa7qv7=9;k9?kD zGojInZ9#|FqajG4IGCgG6TuptVn;#3NEqoKV+H#~&ikiguqKlr8kd5lSVzEEGMPrg zLJ);FdA_-}_PScrT9#Un?hVU4|SkYkow zgomq>;=l#GXH@=yj5Ne<3#0&`Iaz)w0l9ewh!7=XdO4$>jhmuMQxXs5pF|GRCQK&> zR!Hs3?CKb0he`EaeJ@v}?wUGqd~LABOt|K`W$Do8jnyFwG_rMc{i6!=!kipG{$6~` zqVm`o4;-^@_zuXn7fJq literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/closet.rsi/cj_door.png b/Resources/Textures/Structures/Storage/closet.rsi/cj_door.png new file mode 100644 index 0000000000000000000000000000000000000000..f406e398073313aa73094d1239530fa0c9f747c6 GIT binary patch literal 5840 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/closet.rsi/cj_open.png b/Resources/Textures/Structures/Storage/closet.rsi/cj_open.png new file mode 100644 index 0000000000000000000000000000000000000000..8ba72a5bccf8a611fd93933b9fe00fbc53cdec3e GIT binary patch literal 5529 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 EZ{JG(3;+NC literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/closet.rsi/clerk_open.png b/Resources/Textures/Structures/Storage/closet.rsi/clerk_open.png new file mode 100644 index 0000000000000000000000000000000000000000..ab865e6cbe5b83f38babec92d33e6a41c2e9694e GIT binary patch literal 5588 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 Date: Thu, 21 Mar 2024 18:40:05 -0400 Subject: [PATCH 43/94] Spell-checked and edited job descriptions slightly --- Resources/Locale/en-US/deltav/job/job-description.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/en-US/deltav/job/job-description.ftl b/Resources/Locale/en-US/deltav/job/job-description.ftl index 0d8fff83c48..f064dbf2785 100644 --- a/Resources/Locale/en-US/deltav/job/job-description.ftl +++ b/Resources/Locale/en-US/deltav/job/job-description.ftl @@ -1,4 +1,4 @@ job-description-medical-borg = Half-human, Half-machine. Follow your laws, serve the crew, and assist the medical department. job-description-chief-justice = Manage the legal department, act as a judge, and ensure everyone recieves fair and just treatment. -job-description-clerk = Organize trials, notarize documents, keep records, and act as a judge if needed. -job-description-prosecutor = Take statments from sec and prepare cases against those accused of commiting crimes. +job-description-clerk = Organize trials, notarize documents, review charges, and act as a judge if needed. +job-description-prosecutor = Take statements from security and prepare cases against those accused of commiting crimes. From cd08f4847dfcd0be6733ffe6bd07898094b10bc2 Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Tue, 26 Mar 2024 18:18:31 -0400 Subject: [PATCH 44/94] Fixing missing type entity access.yml Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> --- .../DeltaV/Entities/Structures/Doors/Airlocks/access.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml index 60bd9b9408e..8aadf6ace34 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml @@ -86,6 +86,8 @@ components: - type: AccessReader access: [["Prosecutor"]] + +- type: entity parent: AirlockSecurity id: AirlockCorpsmanLocked suffix: Corpsman, Locked From 2d0df79fe4c631885fbe492c2309bd58b5b63fed Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Tue, 26 Mar 2024 21:09:08 -0400 Subject: [PATCH 45/94] Adjusted rsi paths for gavel and gavel block to use forward slash --- .../DeltaV/Entities/Objects/Specific/Justice/gavel.yml | 4 ++-- .../DeltaV/Entities/Objects/Specific/Justice/gavelblock.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavel.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavel.yml index 970e34b3013..8c54c54ba18 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavel.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavel.yml @@ -5,7 +5,7 @@ description: A hardwood mallet made to keep order in the court. components: - type: Sprite - sprite: DeltaV\Objects\Specific\Justice\gavel.rsi + sprite: DeltaV/Objects/Specific/Justice/gavel.rsi layers: - state: icon - type: MeleeWeapon @@ -15,4 +15,4 @@ Blunt: 5 - type: Item size: Small - sprite: DeltaV\Objects\Specific\Justice\gavel.rsi \ No newline at end of file + sprite: DeltaV/Objects/Specific/Justice/gavel.rsi \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavelblock.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavelblock.yml index 8d65492fafd..e4d650e4dc9 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavelblock.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavelblock.yml @@ -5,7 +5,7 @@ description: A hardwood block that, when hit with a gavel, emits an aura of authority. components: - type: Sprite - sprite: DeltaV\Objects\Specific\Justice\gavelblock.rsi #Change to gavelblock + sprite: DeltaV/Objects/Specific/Justice/gavelblock.rsi #Change to gavelblock layers: - state: icon - type: Item From 79c656472aed7eea5273f8fe185f827500a0270a Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Tue, 26 Mar 2024 21:27:23 -0400 Subject: [PATCH 46/94] Fixed a variety of invalid rsi references, and door remote yaml issue --- .../Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml | 2 -- .../DeltaV/Entities/Objects/Devices/door_remote.yml | 4 +++- Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml | 1 + Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml index 0844ed8f3fa..182feffc620 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml @@ -60,7 +60,6 @@ state: icon - type: Clothing sprite: DeltaV/Clothing/Ears/Headsets/legal.rsi - state: equipped-EARS - type: entity parent: ClothingHeadset @@ -80,7 +79,6 @@ state: icon_alt - type: Clothing sprite: DeltaV/Clothing/Ears/Headsets/legal.rsi - state: alt-equipped-EARS - type: entity parent: ClothingHeadset diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/door_remote.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/door_remote.yml index cd83f342523..8f399867933 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/door_remote.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/door_remote.yml @@ -13,4 +13,6 @@ - type: Access groups: - Justice - - Lawyer \ No newline at end of file + - Prosecutor + - ChiefJustice + ##- Lawyer - Commenting this for debugging \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml index e9d39801860..df398be1124 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml @@ -148,6 +148,7 @@ - type: PdaBorderColor borderColor: "#6f6192" - type: Icon + sprite: DeltaV/Objects/Devices/pda.rsi state: pda-prosecutor - type: CartridgeLoader # DeltaV - Crime Assist preinstalled: diff --git a/Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml b/Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml index 54c0e216049..76744211465 100644 --- a/Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml +++ b/Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml @@ -23,5 +23,5 @@ id: RubberStampNotary name: notary stamp sprite: - sprite: DeltaV/Objects/Misc/bureaucracy.rsi + sprite: DeltaV/Objects/Misc/stamps.rsi state: stamp-notary From ff23dcfe5263d69fb3bc7a2db384b73c4a7c2805 Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Tue, 26 Mar 2024 21:39:47 -0400 Subject: [PATCH 47/94] Added Lawyer access to Justice access group, fixed door_remote.yml access --- Resources/Prototypes/DeltaV/Access/justice.yml | 1 + .../DeltaV/Entities/Objects/Devices/door_remote.yml | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Access/justice.yml b/Resources/Prototypes/DeltaV/Access/justice.yml index 5de7a6c5775..7d095479868 100644 --- a/Resources/Prototypes/DeltaV/Access/justice.yml +++ b/Resources/Prototypes/DeltaV/Access/justice.yml @@ -16,3 +16,4 @@ - Justice - Prosecutor - ChiefJustice + - Lawyer diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/door_remote.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/door_remote.yml index 8f399867933..5ae53749f40 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/door_remote.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/door_remote.yml @@ -12,7 +12,4 @@ color: "#6b2833" - type: Access groups: - - Justice - - Prosecutor - - ChiefJustice - ##- Lawyer - Commenting this for debugging \ No newline at end of file + - Justice \ No newline at end of file From 32e6213d52ef2f6733c1e75f352c96cabede8d3e Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Tue, 26 Mar 2024 23:34:39 -0400 Subject: [PATCH 48/94] Remove antagadvantage from chief justice Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> --- Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml index 11d30a5256c..4f9f7191273 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml @@ -3,7 +3,6 @@ name: job-name-chiefjustice description: job-description-chiefjustice playTimeTracker: JobChiefJustice - antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff requirements: - !type:RoleTimeRequirement role: JobClerk From 700de49e271f79abf002aae060e9bbffdc67de26 Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Wed, 27 Mar 2024 00:28:49 -0400 Subject: [PATCH 49/94] Apply suggestions from code review line at the end for readability & matching current standards... line at the end for readability & matching current standards... Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> --- .../Locale/en-US/deltav/devices/device-network.ftl | 1 + .../Locale/en-US/deltav/headset/headset-component.ftl | 1 + Resources/Locale/en-US/deltav/job/department-desc.ftl | 1 + Resources/Locale/en-US/deltav/job/department.ftl | 1 + Resources/Locale/en-US/deltav/job/job-description.ftl | 1 + Resources/Locale/en-US/deltav/job/job-names.ftl | 1 + Resources/Locale/en-US/deltav/job/job-supervisors.ftl | 1 + .../Locale/en-US/deltav/paper/stamp-component.ftl | 2 +- .../Locale/en-US/deltav/prototypes/access/accesses.ftl | 4 ++-- Resources/Locale/en-US/job/job-names.ftl | 2 +- Resources/Locale/en-US/paper/stamp-component.ftl | 2 +- Resources/Prototypes/DeltaV/Access/justice.yml | 1 + .../Prototypes/DeltaV/Catalog/Fills/Boxes/general.yml | 10 +--------- .../Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml | 2 +- .../DeltaV/Catalog/Fills/Lockers/chiefjustice.yml | 6 +++--- .../Prototypes/DeltaV/Catalog/Fills/Lockers/clerk.yml | 2 +- .../DeltaV/Entities/Clothing/Ears/headsets.yml | 2 +- .../Prototypes/DeltaV/Entities/Clothing/Head/hats.yml | 1 + .../DeltaV/Entities/Clothing/Neck/cloaks.yml | 3 ++- .../Prototypes/DeltaV/Entities/Clothing/Neck/misc.yml | 3 ++- .../DeltaV/Entities/Clothing/OuterClothing/coats.yml | 1 + .../DeltaV/Entities/Clothing/OuterClothing/vests.yml | 1 + .../DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml | 1 + .../DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml | 1 + .../DeltaV/Entities/Markers/Spawners/jobs.yml | 3 ++- .../DeltaV/Entities/Objects/Devices/door_remote.yml | 2 +- .../Prototypes/DeltaV/Entities/Objects/Devices/pda.yml | 4 ++-- .../Entities/Objects/Misc/identification_cards.yml | 2 +- .../DeltaV/Entities/Objects/Misc/rubber_stamp.yml | 1 + .../DeltaV/Entities/Objects/Specific/Justice/gavel.yml | 2 +- .../Entities/Objects/Specific/Justice/gavelblock.yml | 2 +- .../Entities/Objects/Specific/Justice/trialtimer.yml | 1 + .../Entities/Structures/Doors/Airlocks/airlocks.yml | 1 + .../Structures/Storage/Closets/Lockers/lockers.yml | 2 +- .../Entities/Structures/Wallmounts/Signs/signs.yml | 1 + .../Prototypes/DeltaV/Objectives/stealTargetGroups.yml | 1 + Resources/Prototypes/DeltaV/Objectives/traitor.yml | 1 + .../DeltaV/Roles/Jobs/Justice/chief_justice.yml | 1 + .../Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml | 1 + .../DeltaV/Roles/Jobs/Justice/prosecutor.yml | 1 + Resources/Prototypes/DeltaV/Roles/Jobs/departments.yml | 1 + .../Prototypes/DeltaV/Roles/play_time_trackers.yml | 1 + Resources/Prototypes/DeltaV/radio_channels.yml | 1 + 43 files changed, 50 insertions(+), 30 deletions(-) diff --git a/Resources/Locale/en-US/deltav/devices/device-network.ftl b/Resources/Locale/en-US/deltav/devices/device-network.ftl index a9d0c8cbffd..644d2e240a8 100644 --- a/Resources/Locale/en-US/deltav/devices/device-network.ftl +++ b/Resources/Locale/en-US/deltav/devices/device-network.ftl @@ -1 +1,2 @@ device-frequency-prototype-name-surveillance-camera-justice = Justice Cameras + diff --git a/Resources/Locale/en-US/deltav/headset/headset-component.ftl b/Resources/Locale/en-US/deltav/headset/headset-component.ftl index 42ae7c70270..9801bce3ab2 100644 --- a/Resources/Locale/en-US/deltav/headset/headset-component.ftl +++ b/Resources/Locale/en-US/deltav/headset/headset-component.ftl @@ -1,2 +1,3 @@ chat-radio-justice = Justice chat-radio-prison = Prison + diff --git a/Resources/Locale/en-US/deltav/job/department-desc.ftl b/Resources/Locale/en-US/deltav/job/department-desc.ftl index 0c71091acf4..530a1b0a5ae 100644 --- a/Resources/Locale/en-US/deltav/job/department-desc.ftl +++ b/Resources/Locale/en-US/deltav/job/department-desc.ftl @@ -1 +1,2 @@ department-Justice-description = Uphold justice on the station. + diff --git a/Resources/Locale/en-US/deltav/job/department.ftl b/Resources/Locale/en-US/deltav/job/department.ftl index 43d9ad464bc..2653e8f46cc 100644 --- a/Resources/Locale/en-US/deltav/job/department.ftl +++ b/Resources/Locale/en-US/deltav/job/department.ftl @@ -1,3 +1,4 @@ department-Epistemics = Epistemics department-Logistics = Logistics department-Justice = Justice + diff --git a/Resources/Locale/en-US/deltav/job/job-description.ftl b/Resources/Locale/en-US/deltav/job/job-description.ftl index f064dbf2785..9d2497d0571 100644 --- a/Resources/Locale/en-US/deltav/job/job-description.ftl +++ b/Resources/Locale/en-US/deltav/job/job-description.ftl @@ -2,3 +2,4 @@ job-description-medical-borg = Half-human, Half-machine. Follow your laws, serve job-description-chief-justice = Manage the legal department, act as a judge, and ensure everyone recieves fair and just treatment. job-description-clerk = Organize trials, notarize documents, review charges, and act as a judge if needed. job-description-prosecutor = Take statements from security and prepare cases against those accused of commiting crimes. + diff --git a/Resources/Locale/en-US/deltav/job/job-names.ftl b/Resources/Locale/en-US/deltav/job/job-names.ftl index 25588f91038..fcdd4321275 100644 --- a/Resources/Locale/en-US/deltav/job/job-names.ftl +++ b/Resources/Locale/en-US/deltav/job/job-names.ftl @@ -2,3 +2,4 @@ job-name-medical-borg = Medical Cyborg job-name-chiefjustice = Chief Justice job-name-clerk = Clerk job-name-prosecutor = Prosecutor + diff --git a/Resources/Locale/en-US/deltav/job/job-supervisors.ftl b/Resources/Locale/en-US/deltav/job/job-supervisors.ftl index 3cf44813098..f1c0ade32a5 100644 --- a/Resources/Locale/en-US/deltav/job/job-supervisors.ftl +++ b/Resources/Locale/en-US/deltav/job/job-supervisors.ftl @@ -1 +1,2 @@ job-supervisors-cj = the chief justice + diff --git a/Resources/Locale/en-US/deltav/paper/stamp-component.ftl b/Resources/Locale/en-US/deltav/paper/stamp-component.ftl index 9684dbccc32..7cfaadb2e9c 100644 --- a/Resources/Locale/en-US/deltav/paper/stamp-component.ftl +++ b/Resources/Locale/en-US/deltav/paper/stamp-component.ftl @@ -1,2 +1,2 @@ stamp-component-stamped-name-notary = NOTARY -stamp-component-stamped-name-chiefjustice = Chief Justice \ No newline at end of file +stamp-component-stamped-name-chiefjustice = Chief Justice diff --git a/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl b/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl index 0aa129d0d37..e7b0c3eef5d 100644 --- a/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl +++ b/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl @@ -1,6 +1,6 @@ -id-card-access-level-orders = Orders +id-card-access-level-orders = Orders id-card-access-level-mantis = Psionic Mantis -id-card-access-level-cj = Chief Justice +id-card-access-level-chief-justice = Chief Justice id-card-access-level-prosecutor = Prosecutor id-card-access-level-justice = Justice id-card-access-level-corpsman = Corpsman \ No newline at end of file diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl index fffc8e456ea..0b9f345f652 100644 --- a/Resources/Locale/en-US/job/job-names.ftl +++ b/Resources/Locale/en-US/job/job-names.ftl @@ -24,7 +24,7 @@ job-name-centcomoff = CentCom Official job-name-reporter = Reporter job-name-musician = Musician job-name-librarian = Librarian -job-name-lawyer = Attorney # DeltaV - Justice dept rename +job-name-lawyer = Attorney # DeltaV - Justice Department - Rename from Lawyer job-name-mime = Mime job-name-ce = Chief Engineer job-name-janitor = Janitor diff --git a/Resources/Locale/en-US/paper/stamp-component.ftl b/Resources/Locale/en-US/paper/stamp-component.ftl index c14ccc662c4..9e0b6d64d8d 100644 --- a/Resources/Locale/en-US/paper/stamp-component.ftl +++ b/Resources/Locale/en-US/paper/stamp-component.ftl @@ -16,4 +16,4 @@ stamp-component-stamped-name-rd = Mystagogue stamp-component-stamped-name-warden = Warden stamp-component-stamped-name-trader = Trader stamp-component-stamped-name-syndicate = Syndicate -stamp-component-stamped-name-ce = Chief Engineer \ No newline at end of file +stamp-component-stamped-name-ce = Chief Engineer \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Access/justice.yml b/Resources/Prototypes/DeltaV/Access/justice.yml index 7d095479868..0c4b3742f81 100644 --- a/Resources/Prototypes/DeltaV/Access/justice.yml +++ b/Resources/Prototypes/DeltaV/Access/justice.yml @@ -17,3 +17,4 @@ - Prosecutor - ChiefJustice - Lawyer + diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/general.yml index 221aa6f1757..65737fa8950 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/general.yml @@ -19,7 +19,7 @@ - type: entity name: justice encryption key box - parent: BoxCardboard + parent: BoxEncryptionKeyPassenger id: BoxEncryptionKeyJustice description: A box of spare encryption keys. components: @@ -27,11 +27,3 @@ contents: - id: EncryptionKeyJustice amount: 4 - - type: Sprite - layers: - - state: box - - state: encryptokey - - type: Storage - whitelist: - components: - - EncryptionKey diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml index 3d149fd3174..31111556497 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml @@ -86,4 +86,4 @@ - id: LawyerPDA amount: 2 - id: ProsecutorPDA - - id: ClerkPDA \ No newline at end of file + - id: ClerkPDA diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/chiefjustice.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/chiefjustice.yml index 7706e071878..ed28f1a7a66 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/chiefjustice.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/chiefjustice.yml @@ -5,11 +5,11 @@ components: - type: StorageFill contents: - - id: ClothingHeadsetCJ + - id: ClothingHeadsetAltJustice - id: ClothingNeckCloakCJ - id: BoxPDAJustice - id: BoxEncryptionKeyJustice - - id: CJIDCard + - id: ChiefJusticeIDCard - id: DoorRemoteJustice - id: Gavel - - id: RubberStampCJ \ No newline at end of file + - id: RubberStampChiefJustice diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/clerk.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/clerk.yml index 76625016922..78369754cdc 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/clerk.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/clerk.yml @@ -8,4 +8,4 @@ - id: ClothingOuterClerkVest - id: BoxEncryptionKeyJustice - id: ClerkIDCard - - id: RubberStampNotary \ No newline at end of file + - id: RubberStampNotary diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml index 182feffc620..a25e1ca423f 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml @@ -63,7 +63,7 @@ - type: entity parent: ClothingHeadset - id: ClothingHeadsetCJ + id: ClothingHeadsetAltJustice name: chief justice's headset description: The headset used by the chief justice. components: diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml index fc6b7067528..bdb5ad85d9a 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml @@ -203,3 +203,4 @@ sprite: DeltaV/Clothing/Head/Hats/cj_toque.rsi - type: Clothing sprite: DeltaV/Clothing/Head/Hats/cj_toque.rsi + diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/cloaks.yml index 4272c84ea15..a5a9200b569 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/cloaks.yml @@ -30,7 +30,7 @@ - type: Sprite sprite: DeltaV/Clothing/Neck/Cloaks/salvage.rsi - type: Clothing - sprite: DeltaV/Clothing/Neck/Cloaks/salvage.rsi + sprite: DeltaV/Clothing/Neck/Cloaks/salvage.rsi - type: entity parent: ClothingNeckBase @@ -42,3 +42,4 @@ sprite: DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi - type: StealTarget stealGroup: HeadCloak + diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/misc.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/misc.yml index 2b331cab8aa..7ec38bb1441 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/misc.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/misc.yml @@ -9,4 +9,5 @@ - type: Clothing sprite: DeltaV/Clothing/Neck/Misc/prosecutorbadge.rsi - type: TypingIndicatorClothing - proto: lawyer + proto: lawyer + diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml index da9e6aa0a46..e0f3e7f298f 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml @@ -136,3 +136,4 @@ sprite: DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi - type: TemperatureProtection coefficient: 0.1 + diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/vests.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/vests.yml index bb58961829e..445158f89b8 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/vests.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/vests.yml @@ -48,3 +48,4 @@ sprite: DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi - type: Clothing sprite: DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi + diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml index 71865948d3b..515c8b8c140 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml @@ -126,3 +126,4 @@ sprite: DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi + diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml index 3fe5ec4a9ef..96c75c87622 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml @@ -287,3 +287,4 @@ sprite: DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi + diff --git a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml index 60220c3ba3a..0754198a1d2 100644 --- a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml @@ -54,4 +54,5 @@ - state: green - state: lawyer #- sprite: DeltaV/Markers/jobs.rsi - # state: prosecuter + # state: prosecutor + diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/door_remote.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/door_remote.yml index 5ae53749f40..27fa0a36530 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/door_remote.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/door_remote.yml @@ -12,4 +12,4 @@ color: "#6b2833" - type: Access groups: - - Justice \ No newline at end of file + - Justice diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml index df398be1124..3165aefa19b 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml @@ -42,7 +42,7 @@ - type: entity parent: BasePDA - id: CJPDA + id: ChiefJusticePDA name: chief justice PDA description: Whosoever bears this PDA is the law. components: @@ -59,7 +59,7 @@ shader: "unshaded" visible: false - type: Pda - id: CJIDCard + id: ChiefJusticeIDCard state: pda-cj penSlot: startingItem: LuxuryPen diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml index dc4412c961a..3a2aa395cd7 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml @@ -1,6 +1,6 @@ - type: entity parent: IDCardStandard - id: CJIDCard + id: ChiefJusticeIDCard name: chief justice ID card components: - type: PresetIdCard diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml index c9ecb7c5645..f8ed531cad7 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml @@ -40,3 +40,4 @@ - type: Sprite sprite: DeltaV/Objects/Misc/stamps.rsi state: stamp-cj # Change to CJ when sprited + diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavel.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavel.yml index 8c54c54ba18..ce8a163058e 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavel.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavel.yml @@ -15,4 +15,4 @@ Blunt: 5 - type: Item size: Small - sprite: DeltaV/Objects/Specific/Justice/gavel.rsi \ No newline at end of file + sprite: DeltaV/Objects/Specific/Justice/gavel.rsi diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavelblock.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavelblock.yml index e4d650e4dc9..fc0abe35e40 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavelblock.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavelblock.yml @@ -14,4 +14,4 @@ - type: EmitSoundOnInteractUsing sound: path: /Audio/DeltaV/Items/gavel.ogg - UsedItemID: Gavel \ No newline at end of file + UsedItemID: Gavel diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/trialtimer.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/trialtimer.yml index d5a4bbadde3..fe2e3c3d274 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/trialtimer.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/trialtimer.yml @@ -20,3 +20,4 @@ - type: Construction graph: Timer node: screen + diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/airlocks.yml index 79837d7413a..93a8cec851a 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/airlocks.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/airlocks.yml @@ -19,3 +19,4 @@ sprite: DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi - type: PaintableAirlock department: Justice + diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Closets/Lockers/lockers.yml index 53373a96719..b49002ab22b 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -22,4 +22,4 @@ stateDoorOpen: clerk_open stateDoorClosed: clerk_door - type: AccessReader - access: [["Justice"]] \ No newline at end of file + access: [["Justice"]] diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml index 26b1916eee6..024d40d1539 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml @@ -37,3 +37,4 @@ - type: Sprite sprite: DeltaV/Structures/Wallmounts/signs.rsi state: direction_court + diff --git a/Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml b/Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml index 76744211465..246c4b868ae 100644 --- a/Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml +++ b/Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml @@ -25,3 +25,4 @@ sprite: sprite: DeltaV/Objects/Misc/stamps.rsi state: stamp-notary + diff --git a/Resources/Prototypes/DeltaV/Objectives/traitor.yml b/Resources/Prototypes/DeltaV/Objectives/traitor.yml index 4b72aeadcc3..87a37141493 100644 --- a/Resources/Prototypes/DeltaV/Objectives/traitor.yml +++ b/Resources/Prototypes/DeltaV/Objectives/traitor.yml @@ -43,3 +43,4 @@ - type: StealCondition stealGroup: RubberStampNotary owner: job-name-clerk + diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml index 4f9f7191273..67d9066d312 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml @@ -55,3 +55,4 @@ innerClothingSkirt: ClothingUniformJumpskirtChiefJustice satchel: ClothingBackpackSatchelFilled # TODO- make Justice departmebt bags duffelbag: ClothingBackpackDuffelFilled # E. + diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml index 43a1f4db1c6..cd419cd69b1 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml @@ -34,3 +34,4 @@ innerClothingSkirt: ClothingUniformJumpskirtClerk satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled + diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml index d3317fbf114..a0a8581d777 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml @@ -30,3 +30,4 @@ innerClothingSkirt: ClothingUniformJumpskirtProsecutorRed satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled + diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/departments.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/departments.yml index 411df996706..d15d2a697ab 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/departments.yml @@ -7,3 +7,4 @@ - Clerk - Prosecutor - Lawyer + diff --git a/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml b/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml index d2716f8073e..4d48a09a57c 100644 --- a/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml @@ -12,3 +12,4 @@ - type: playTimeTracker id: JobProsecutor + diff --git a/Resources/Prototypes/DeltaV/radio_channels.yml b/Resources/Prototypes/DeltaV/radio_channels.yml index 43f3b51c20e..9c0c18fff2e 100644 --- a/Resources/Prototypes/DeltaV/radio_channels.yml +++ b/Resources/Prototypes/DeltaV/radio_channels.yml @@ -11,3 +11,4 @@ keycode: 'p' frequency: 1601 color: "#FFA500" + From a07f94195ada600a1f3ca091a553048656d4d502 Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Wed, 27 Mar 2024 00:34:54 -0400 Subject: [PATCH 50/94] Hopefully remove shoukou.yml from the changed files Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> From d1a87091f2b40a467b41edf0d4f66f1e5364a499 Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Wed, 27 Mar 2024 00:44:29 -0400 Subject: [PATCH 51/94] Once again attempt to remove shoukou.yml from changed files --- Resources/Prototypes/Maps/shoukou.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Maps/shoukou.yml b/Resources/Prototypes/Maps/shoukou.yml index d57881295eb..04fba269629 100644 --- a/Resources/Prototypes/Maps/shoukou.yml +++ b/Resources/Prototypes/Maps/shoukou.yml @@ -66,3 +66,4 @@ SalvageSpecialist: [ 2, 4 ] MailCarrier: [ 1, 2 ] CargoTechnician: [ 2, 3 ] + \ No newline at end of file From f1768eff592d1989ce8edc3e3dcf9a53051d7d97 Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Wed, 27 Mar 2024 00:48:12 -0400 Subject: [PATCH 52/94] Attempt once more to remove shoukou.yml from changed files --- Resources/Prototypes/Maps/shoukou.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Maps/shoukou.yml b/Resources/Prototypes/Maps/shoukou.yml index 04fba269629..d7242ce908b 100644 --- a/Resources/Prototypes/Maps/shoukou.yml +++ b/Resources/Prototypes/Maps/shoukou.yml @@ -12,7 +12,7 @@ mapNameTemplate: '{0} Shōkō "Little Port" {1}' nameGenerator: !type:NanotrasenNameGenerator - prefixCreator: 'DV' + prefixCreator: '14' - type: StationEmergencyShuttle emergencyShuttlePath: /Maps/Shuttles/DeltaV/NTES_Delta.yml - type: StationJobs @@ -66,4 +66,4 @@ SalvageSpecialist: [ 2, 4 ] MailCarrier: [ 1, 2 ] CargoTechnician: [ 2, 3 ] - \ No newline at end of file + From 629b10ae1a404c7527bc7fd686d48a3198e5df47 Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Wed, 27 Mar 2024 17:21:38 -0400 Subject: [PATCH 53/94] Fixed justice pda box description Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> --- Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml index 31111556497..b8aff63ece5 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml @@ -79,7 +79,7 @@ name: justice PDA box parent: BoxPDA id: BoxPDAJustice - description: A box of spare PDA microcomputers for the warden the justice department. + description: A box of spare PDA microcomputers for the justice department. components: - type: StorageFill contents: From bafe122771e2f27335e36a1c4fd4069aa78f8974 Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Wed, 27 Mar 2024 17:22:42 -0400 Subject: [PATCH 54/94] Please go home, shoukou. We don't want you here --- Resources/Prototypes/Maps/shoukou.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Maps/shoukou.yml b/Resources/Prototypes/Maps/shoukou.yml index d7242ce908b..5b4664eb161 100644 --- a/Resources/Prototypes/Maps/shoukou.yml +++ b/Resources/Prototypes/Maps/shoukou.yml @@ -12,7 +12,7 @@ mapNameTemplate: '{0} Shōkō "Little Port" {1}' nameGenerator: !type:NanotrasenNameGenerator - prefixCreator: '14' + prefixCreator: 'DV' - type: StationEmergencyShuttle emergencyShuttlePath: /Maps/Shuttles/DeltaV/NTES_Delta.yml - type: StationJobs From 436457678d49bfe69106c2dcf197dba6fa1de826 Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Wed, 27 Mar 2024 17:33:59 -0400 Subject: [PATCH 55/94] Fixing prototype references pt1 Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> --- .../Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml index 67d9066d312..ac0ecc48505 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml @@ -48,8 +48,8 @@ shoes: ClothingShoesLeather head: ClothingHeadHatCJToque outerClothing: ClothingOuterChiefJustice - id: CJPDA - ears: ClothingHeadsetCJ + id: ChiefJusticePDA + ears: ClothingHeadsetAltJustice gloves: ClothingHandsGlovesColorWhite # Todo - pocket1: Gavel innerClothingSkirt: ClothingUniformJumpskirtChiefJustice From 83037d8e08d26f901361143135d4caca20e7a391 Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Wed, 27 Mar 2024 22:26:15 -0400 Subject: [PATCH 56/94] Renamed headsets/legal.rsi to headsets/justice.rsi --- .../DeltaV/Entities/Clothing/Ears/headsets.yml | 8 ++++---- .../alt-equipped-EARS.png | Bin .../{legal.rsi => justice.rsi}/equipped-EARS.png | Bin .../Headsets/{legal.rsi => justice.rsi}/icon.png | Bin .../{legal.rsi => justice.rsi}/icon_alt.png | Bin .../Headsets/{legal.rsi => justice.rsi}/meta.json | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) rename Resources/Textures/DeltaV/Clothing/Ears/Headsets/{legal.rsi => justice.rsi}/alt-equipped-EARS.png (100%) rename Resources/Textures/DeltaV/Clothing/Ears/Headsets/{legal.rsi => justice.rsi}/equipped-EARS.png (100%) rename Resources/Textures/DeltaV/Clothing/Ears/Headsets/{legal.rsi => justice.rsi}/icon.png (100%) rename Resources/Textures/DeltaV/Clothing/Ears/Headsets/{legal.rsi => justice.rsi}/icon_alt.png (100%) rename Resources/Textures/DeltaV/Clothing/Ears/Headsets/{legal.rsi => justice.rsi}/meta.json (90%) diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml index a25e1ca423f..9c021880afe 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml @@ -56,10 +56,10 @@ - EncryptionKeySecurity - EncryptionKeyCommon - type: Sprite - sprite: DeltaV/Clothing/Ears/Headsets/legal.rsi + sprite: DeltaV/Clothing/Ears/Headsets/justice.rsi state: icon - type: Clothing - sprite: DeltaV/Clothing/Ears/Headsets/legal.rsi + sprite: DeltaV/Clothing/Ears/Headsets/justice.rsi - type: entity parent: ClothingHeadset @@ -75,10 +75,10 @@ - EncryptionKeyCommon - EncryptionKeyCommand - type: Sprite - sprite: DeltaV/Clothing/Ears/Headsets/legal.rsi + sprite: DeltaV/Clothing/Ears/Headsets/justice.rsi state: icon_alt - type: Clothing - sprite: DeltaV/Clothing/Ears/Headsets/legal.rsi + sprite: DeltaV/Clothing/Ears/Headsets/justice.rsi - type: entity parent: ClothingHeadset diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/legal.rsi/alt-equipped-EARS.png b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/justice.rsi/alt-equipped-EARS.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Ears/Headsets/legal.rsi/alt-equipped-EARS.png rename to Resources/Textures/DeltaV/Clothing/Ears/Headsets/justice.rsi/alt-equipped-EARS.png diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/legal.rsi/equipped-EARS.png b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/justice.rsi/equipped-EARS.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Ears/Headsets/legal.rsi/equipped-EARS.png rename to Resources/Textures/DeltaV/Clothing/Ears/Headsets/justice.rsi/equipped-EARS.png diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/legal.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/justice.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Ears/Headsets/legal.rsi/icon.png rename to Resources/Textures/DeltaV/Clothing/Ears/Headsets/justice.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/legal.rsi/icon_alt.png b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/justice.rsi/icon_alt.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Ears/Headsets/legal.rsi/icon_alt.png rename to Resources/Textures/DeltaV/Clothing/Ears/Headsets/justice.rsi/icon_alt.png diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/legal.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/justice.rsi/meta.json similarity index 90% rename from Resources/Textures/DeltaV/Clothing/Ears/Headsets/legal.rsi/meta.json rename to Resources/Textures/DeltaV/Clothing/Ears/Headsets/justice.rsi/meta.json index b1dea02c5af..116c0e53e70 100644 --- a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/legal.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/justice.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 | Modified by leonardo-dabpeis", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 | Modified by leonardo_dabepis (Discord)", "size": { "x": 32, "y": 32 From 6eaaa2eafa6f488b70b96d4fccd4f19c9251e5c3 Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Wed, 27 Mar 2024 22:30:02 -0400 Subject: [PATCH 57/94] Added hyphen to chief justice localizations --- Resources/Locale/en-US/deltav/job/job-names.ftl | 2 +- .../Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Locale/en-US/deltav/job/job-names.ftl b/Resources/Locale/en-US/deltav/job/job-names.ftl index fcdd4321275..7acf405a015 100644 --- a/Resources/Locale/en-US/deltav/job/job-names.ftl +++ b/Resources/Locale/en-US/deltav/job/job-names.ftl @@ -1,5 +1,5 @@ job-name-medical-borg = Medical Cyborg -job-name-chiefjustice = Chief Justice +job-name-chief-justice = Chief Justice job-name-clerk = Clerk job-name-prosecutor = Prosecutor diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml index ac0ecc48505..f5619ef92fb 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml @@ -1,7 +1,7 @@ - type: job id: ChiefJustice - name: job-name-chiefjustice - description: job-description-chiefjustice + name: job-name-chief-justice + description: job-description-chief-justice playTimeTracker: JobChiefJustice requirements: - !type:RoleTimeRequirement From 8e949d730080693ad291bad2b167c708b2f51d1a Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Wed, 27 Mar 2024 22:32:09 -0400 Subject: [PATCH 58/94] Ordered justice accesses alphabetically --- Resources/Prototypes/DeltaV/Access/justice.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Access/justice.yml b/Resources/Prototypes/DeltaV/Access/justice.yml index 0c4b3742f81..33a2844ed20 100644 --- a/Resources/Prototypes/DeltaV/Access/justice.yml +++ b/Resources/Prototypes/DeltaV/Access/justice.yml @@ -2,13 +2,13 @@ id: ChiefJustice name: id-card-access-level-cj -- type: accessLevel - id: Prosecutor - name: id-card-access-level-prosecutor - - type: accessLevel id: Justice name: id-card-access-level-justice + +- type: accessLevel + id: Prosecutor + name: id-card-access-level-prosecutor - type: accessGroup id: Justice From 76a5eeb4af2ddfbed0230b5929db8b14b5c8aa3a Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Wed, 27 Mar 2024 22:35:12 -0400 Subject: [PATCH 59/94] Added prison key to justice headset --- Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml index 9c021880afe..f5a823dbd6a 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml @@ -53,6 +53,7 @@ containers: key_slots: - EncryptionKeyJustice + - EncryptionKeyPrison - EncryptionKeySecurity - EncryptionKeyCommon - type: Sprite @@ -71,6 +72,7 @@ containers: key_slots: - EncryptionKeyJustice + - EncryptionKeyPrison - EncryptionKeySecurity - EncryptionKeyCommon - EncryptionKeyCommand From fa8c79fd404f3a981be404dec9e18c51a7232748 Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Wed, 27 Mar 2024 22:48:43 -0400 Subject: [PATCH 60/94] Various yaml fixes from review --- .../Entities/Clothing/Uniforms/jumpskirts.yml | 2 +- .../DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml | 2 +- .../Entities/Objects/Devices/encryption_keys.yml | 2 +- .../DeltaV/Entities/Objects/Devices/pda.yml | 4 ++-- .../Entities/Objects/Specific/Justice/gavel.yml | 2 +- .../Objects/Specific/Justice/trialtimer.yml | 2 +- .../DeltaV/Roles/Jobs/Justice/prosecutor.yml | 4 ++-- Resources/Prototypes/DeltaV/tags.yml | 6 +++--- .../{law_label.png => justice_label.png} | Bin .../Objects/Devices/encryption_keys.rsi/meta.json | 2 +- .../DeltaV/Objects/Devices/pda.rsi/meta.json | 2 +- .../pda.rsi/{pda-cj.png => pda-chiefjustice.png} | Bin 12 files changed, 14 insertions(+), 14 deletions(-) rename Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/{law_label.png => justice_label.png} (100%) rename Resources/Textures/DeltaV/Objects/Devices/pda.rsi/{pda-cj.png => pda-chiefjustice.png} (100%) diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml index 515c8b8c140..9e80bc4ff2f 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml @@ -118,7 +118,7 @@ - type: entity parent: ClothingUniformBase - id: ClothingUniformJumpskirtProsecutorRed + id: ClothingUniformJumpskirtProsecutor name: prosecutor's dress skirt description: A red suit and skirt with a fancy cravat. Perfect for a prosecutor. components: diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml index 96c75c87622..aa7f1e913ec 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml @@ -279,7 +279,7 @@ - type: entity parent: ClothingUniformBase - id: ClothingUniformJumpsuitProsecutorRed + id: ClothingUniformJumpsuitProsecutor name: prosecutor's suit description: A red suit with a fancy cravat. Perfect for a prosecutor. components: diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/encryption_keys.yml index 6de2a719aa0..67b723e4310 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/encryption_keys.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/encryption_keys.yml @@ -12,7 +12,7 @@ layers: - state: crypt_gray - sprite: DeltaV/Objects/Devices/encryption_keys.rsi - state: law_label + state: justice_label - type: entity parent: EncryptionKey diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml index 3165aefa19b..58d07f30a71 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml @@ -60,7 +60,7 @@ visible: false - type: Pda id: ChiefJusticeIDCard - state: pda-cj + state: pda-chiefjustice penSlot: startingItem: LuxuryPen priority: -1 @@ -71,7 +71,7 @@ borderColor: "#470823" - type: Icon sprite: DeltaV/Objects/Devices/pda.rsi - state: pda-cj + state: pda-chiefjustice - type: CartridgeLoader preinstalled: - CrewManifestCartridge diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavel.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavel.yml index ce8a163058e..a304132eb27 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavel.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavel.yml @@ -12,7 +12,7 @@ wideAnimationRotation: -90 damage: types: - Blunt: 5 + Blunt: 2 - type: Item size: Small sprite: DeltaV/Objects/Specific/Justice/gavel.rsi diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/trialtimer.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/trialtimer.yml index fe2e3c3d274..42b6cdecc58 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/trialtimer.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/trialtimer.yml @@ -2,7 +2,7 @@ id: TrialTimer parent: SignalTimer name: trial timer - description: A fancy timer with a screen, designed for use in court rooms. + description: A fancy timer with a screen, designed to keep trials within their time limit. components: - type: SignalTimer canEditLabel: true diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml index a0a8581d777..67d97c6a792 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml @@ -18,7 +18,7 @@ - type: startingGear # Need prosecuter stuff id: ProsecutorGear equipment: - jumpsuit: ClothingUniformJumpsuitProsecutorRed + jumpsuit: ClothingUniformJumpsuitProsecutor neck: ClothingNeckProsecutorbadge back: ClothingBackpackFilled shoes: ClothingShoesBootsLaceup @@ -27,7 +27,7 @@ # TODO add copy of space law inhand: - BriefcaseBrownFilled - innerClothingSkirt: ClothingUniformJumpskirtProsecutorRed + innerClothingSkirt: ClothingUniformJumpskirtProsecutor satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled diff --git a/Resources/Prototypes/DeltaV/tags.yml b/Resources/Prototypes/DeltaV/tags.yml index 635b529c2a1..56077f85146 100644 --- a/Resources/Prototypes/DeltaV/tags.yml +++ b/Resources/Prototypes/DeltaV/tags.yml @@ -15,6 +15,9 @@ - type: Tag id: ForensicBeltEquip +- type: Tag + id: Gavel + - type: Tag id: HandLabeler @@ -41,6 +44,3 @@ - type: Tag id: Skirt - -- type: Tag - id: Gavel diff --git a/Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/law_label.png b/Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/justice_label.png similarity index 100% rename from Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/law_label.png rename to Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/justice_label.png diff --git a/Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/meta.json index 906e85e3f6e..ec0fd9d2241 100644 --- a/Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/meta.json @@ -7,7 +7,7 @@ "y": 32 }, "states": [ - {"name": "law_label"}, + {"name": "justice_label"}, {"name": "prisoner_label"}, {"name": "crypt_orange"} ] diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json index fe8ec37405e..014cbe612fd 100644 --- a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json @@ -33,7 +33,7 @@ "name": "pda-corpsman" }, { - "name": "pda-cj" + "name": "pda-chiefjustice" }, { "name": "pda-clerk" diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-cj.png b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-chiefjustice.png similarity index 100% rename from Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-cj.png rename to Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-chiefjustice.png From 30bd9ad62a7c96e64d54ffd1dc5aeadd674e56d1 Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Wed, 27 Mar 2024 22:50:27 -0400 Subject: [PATCH 61/94] Apply suggestions from code review Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> --- .../DeltaV/Entities/Objects/Specific/Justice/trialtimer.yml | 1 + .../DeltaV/Entities/Structures/Doors/Airlocks/airlocks.yml | 1 + .../DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml | 1 + Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml | 1 + Resources/Prototypes/DeltaV/Objectives/traitor.yml | 1 + Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml | 1 + Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml | 1 + Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml | 1 + Resources/Prototypes/DeltaV/Roles/Jobs/departments.yml | 1 + Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml | 1 + Resources/Prototypes/DeltaV/radio_channels.yml | 1 + 11 files changed, 11 insertions(+) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/trialtimer.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/trialtimer.yml index 42b6cdecc58..3e847b3a843 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/trialtimer.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/trialtimer.yml @@ -21,3 +21,4 @@ graph: Timer node: screen + diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/airlocks.yml index 93a8cec851a..b032cc14a1a 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/airlocks.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/airlocks.yml @@ -20,3 +20,4 @@ - type: PaintableAirlock department: Justice + diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml index 024d40d1539..3b5329e230c 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml @@ -38,3 +38,4 @@ sprite: DeltaV/Structures/Wallmounts/signs.rsi state: direction_court + diff --git a/Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml b/Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml index 246c4b868ae..b3113308735 100644 --- a/Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml +++ b/Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml @@ -26,3 +26,4 @@ sprite: DeltaV/Objects/Misc/stamps.rsi state: stamp-notary + diff --git a/Resources/Prototypes/DeltaV/Objectives/traitor.yml b/Resources/Prototypes/DeltaV/Objectives/traitor.yml index 87a37141493..d27ec220fa4 100644 --- a/Resources/Prototypes/DeltaV/Objectives/traitor.yml +++ b/Resources/Prototypes/DeltaV/Objectives/traitor.yml @@ -44,3 +44,4 @@ stealGroup: RubberStampNotary owner: job-name-clerk + diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml index f5619ef92fb..85c34e3ba0a 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml @@ -56,3 +56,4 @@ satchel: ClothingBackpackSatchelFilled # TODO- make Justice departmebt bags duffelbag: ClothingBackpackDuffelFilled # E. + diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml index cd419cd69b1..a8049067b6b 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml @@ -35,3 +35,4 @@ satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled + diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml index 67d97c6a792..075834cf858 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml @@ -31,3 +31,4 @@ satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled + diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/departments.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/departments.yml index d15d2a697ab..c4d5fbfe20d 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/departments.yml @@ -8,3 +8,4 @@ - Prosecutor - Lawyer + diff --git a/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml b/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml index 4d48a09a57c..6498876c9cf 100644 --- a/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml @@ -13,3 +13,4 @@ - type: playTimeTracker id: JobProsecutor + diff --git a/Resources/Prototypes/DeltaV/radio_channels.yml b/Resources/Prototypes/DeltaV/radio_channels.yml index 9c0c18fff2e..53490d90fac 100644 --- a/Resources/Prototypes/DeltaV/radio_channels.yml +++ b/Resources/Prototypes/DeltaV/radio_channels.yml @@ -12,3 +12,4 @@ frequency: 1601 color: "#FFA500" + From f43f6bc286a1b2def0f5b91d1ee2beb857caaf03 Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Wed, 27 Mar 2024 23:16:05 -0400 Subject: [PATCH 62/94] Localized changes to pdas and jobs --- Resources/Locale/en-US/deltav/job/job-names.ftl | 2 +- Resources/Locale/en-US/deltav/misc/pda.ftl | 4 ++++ Resources/Locale/en-US/job/job-names.ftl | 2 +- Resources/Prototypes/Entities/Objects/Devices/pda.yml | 6 +++--- 4 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 Resources/Locale/en-US/deltav/misc/pda.ftl diff --git a/Resources/Locale/en-US/deltav/job/job-names.ftl b/Resources/Locale/en-US/deltav/job/job-names.ftl index 7acf405a015..5eee3f2fb0c 100644 --- a/Resources/Locale/en-US/deltav/job/job-names.ftl +++ b/Resources/Locale/en-US/deltav/job/job-names.ftl @@ -2,4 +2,4 @@ job-name-medical-borg = Medical Cyborg job-name-chief-justice = Chief Justice job-name-clerk = Clerk job-name-prosecutor = Prosecutor - +job-name-lawyer = Attorney diff --git a/Resources/Locale/en-US/deltav/misc/pda.ftl b/Resources/Locale/en-US/deltav/misc/pda.ftl new file mode 100644 index 00000000000..3e88040f600 --- /dev/null +++ b/Resources/Locale/en-US/deltav/misc/pda.ftl @@ -0,0 +1,4 @@ +ent-HoSPDA = head of security pda + .desc = Smells like donuts and gunpowder residue. +ent-LawyerPDA = attorney pda + .desc = For attornies to poach dubious clients. \ No newline at end of file diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl index 0b9f345f652..f58e560010f 100644 --- a/Resources/Locale/en-US/job/job-names.ftl +++ b/Resources/Locale/en-US/job/job-names.ftl @@ -24,7 +24,7 @@ job-name-centcomoff = CentCom Official job-name-reporter = Reporter job-name-musician = Musician job-name-librarian = Librarian -job-name-lawyer = Attorney # DeltaV - Justice Department - Rename from Lawyer +job-name-lawyer = Lawyer job-name-mime = Mime job-name-ce = Chief Engineer job-name-janitor = Janitor diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index bd4724989b6..706cbd5dbbf 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -414,8 +414,8 @@ - type: entity parent: BasePDA id: LawyerPDA - name: attorney PDA - description: For attornies to poach dubious clients. + name: lawyer PDA + description: For lawyers to poach dubious clients. components: - type: Pda id: LawyerIDCard @@ -633,7 +633,7 @@ parent: BasePDA id: HoSPDA name: head of security PDA - description: Smells like donuts and gunpowder residue. + description: Whosoever bears this PDA is the law. components: - type: Pda id: HoSIDCard From 370c210ec1d935221f0d323f63d5146e6321c6c8 Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Thu, 28 Mar 2024 06:10:23 -0400 Subject: [PATCH 63/94] Removed indents in locale --- Resources/Locale/en-US/deltav/misc/pda.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/en-US/deltav/misc/pda.ftl b/Resources/Locale/en-US/deltav/misc/pda.ftl index 3e88040f600..d2ce93db8d8 100644 --- a/Resources/Locale/en-US/deltav/misc/pda.ftl +++ b/Resources/Locale/en-US/deltav/misc/pda.ftl @@ -1,4 +1,4 @@ ent-HoSPDA = head of security pda - .desc = Smells like donuts and gunpowder residue. + .desc = Smells like donuts and gunpowder residue. ent-LawyerPDA = attorney pda - .desc = For attornies to poach dubious clients. \ No newline at end of file + .desc = For attornies to poach dubious clients. \ No newline at end of file From 85df660a9648bd937f7ecde80d6139afcf5f7989 Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Thu, 28 Mar 2024 19:46:24 -0400 Subject: [PATCH 64/94] Fixed reference to chief justice stamp --- .../Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml index f8ed531cad7..8c5b945d5be 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml @@ -31,7 +31,7 @@ - type: entity name: chief justice stamp parent: RubberStampBase - id: RubberStampCJ + id: RubberStampChiefJustice components: - type: Stamp stampedName: stamp-component-stamped-name-chiefjustice From 4e7e0bda0a8f9544c336c40c5266b0c42338a5c8 Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Thu, 28 Mar 2024 19:58:52 -0400 Subject: [PATCH 65/94] Apply suggestions from code review Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> --- Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl b/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl index e7b0c3eef5d..993cab5923f 100644 --- a/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl +++ b/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl @@ -3,4 +3,4 @@ id-card-access-level-mantis = Psionic Mantis id-card-access-level-chief-justice = Chief Justice id-card-access-level-prosecutor = Prosecutor id-card-access-level-justice = Justice -id-card-access-level-corpsman = Corpsman \ No newline at end of file +id-card-access-level-corpsman = Corpsman From 250720a4bf9ee920cbe82aff1616c1973272c3d8 Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Thu, 28 Mar 2024 20:02:54 -0400 Subject: [PATCH 66/94] Renamed Lawyer to Attorney in locale, added deltav marker --- Resources/Locale/en-US/job/job-names.ftl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl index f58e560010f..682b10ce3fc 100644 --- a/Resources/Locale/en-US/job/job-names.ftl +++ b/Resources/Locale/en-US/job/job-names.ftl @@ -24,7 +24,8 @@ job-name-centcomoff = CentCom Official job-name-reporter = Reporter job-name-musician = Musician job-name-librarian = Librarian -job-name-lawyer = Lawyer +# DeltaV - Renamed Lawyer to Attorney +job-name-lawyer = Attorney job-name-mime = Mime job-name-ce = Chief Engineer job-name-janitor = Janitor From c35e9aa0c5cc220c6dfa9a1681ada7090222d40f Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Thu, 28 Mar 2024 22:38:34 -0400 Subject: [PATCH 67/94] Lawyer to Attorney, Warrant Document in Clerk and CJ locker --- .../Locale/en-US/deltav/job/job-names.ftl | 1 - .../Catalog/Fills/Lockers/chiefjustice.yml | 2 + .../DeltaV/Catalog/Fills/Lockers/clerk.yml | 2 + .../DeltaV/Entities/Objects/Misc/paper.yml | 25 ++++ .../Interface/Paper/paper_heading_warrant.svg | 127 ++++++++++++++++++ .../paper_heading_warrant.svg.200dpi.png | Bin 0 -> 10022 bytes .../paper_heading_warrant.svg.200dpi.png.yml | 2 + 7 files changed, 158 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml create mode 100644 Resources/Textures/DeltaV/Interface/Paper/paper_heading_warrant.svg create mode 100644 Resources/Textures/DeltaV/Interface/Paper/paper_heading_warrant.svg.200dpi.png create mode 100644 Resources/Textures/DeltaV/Interface/Paper/paper_heading_warrant.svg.200dpi.png.yml diff --git a/Resources/Locale/en-US/deltav/job/job-names.ftl b/Resources/Locale/en-US/deltav/job/job-names.ftl index 5eee3f2fb0c..58a7255ab64 100644 --- a/Resources/Locale/en-US/deltav/job/job-names.ftl +++ b/Resources/Locale/en-US/deltav/job/job-names.ftl @@ -2,4 +2,3 @@ job-name-medical-borg = Medical Cyborg job-name-chief-justice = Chief Justice job-name-clerk = Clerk job-name-prosecutor = Prosecutor -job-name-lawyer = Attorney diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/chiefjustice.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/chiefjustice.yml index ed28f1a7a66..28560627e59 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/chiefjustice.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/chiefjustice.yml @@ -7,6 +7,8 @@ contents: - id: ClothingHeadsetAltJustice - id: ClothingNeckCloakCJ + - id: PaperStationWarrant + amount: 10 - id: BoxPDAJustice - id: BoxEncryptionKeyJustice - id: ChiefJusticeIDCard diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/clerk.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/clerk.yml index 78369754cdc..d54c1c1b231 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/clerk.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/clerk.yml @@ -6,6 +6,8 @@ - type: StorageFill contents: - id: ClothingOuterClerkVest + - id: PaperStationWarrant + amount: 10 - id: BoxEncryptionKeyJustice - id: ClerkIDCard - id: RubberStampNotary diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml new file mode 100644 index 00000000000..53f4d188d40 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml @@ -0,0 +1,25 @@ +- type: entity + name: station warrant + parent: Paper + id: PaperStationWarrant + description: 'A paper warrant issued by the justice department.' + components: + - type: Sprite + sprite: Objects/Misc/bureaucracy.rsi + layers: + - state: paper + color: "#e0bc99" + - state: paper_words + map: ["enum.PaperVisualLayers.Writing"] + color: "#e0bc99" + visible: false + - state: paper_stamp-generic + map: ["enum.PaperVisualLayers.Stamp"] + visible: false + - type: PaperVisuals + headerImagePath: "/Textures/DeltaV/Interface/Paper/paper_heading_warrant.svg.200dpi.png" + headerMargin: 0.0, 0.0, 10.0, 16.0 + backgroundImagePath: "/Textures/Interface/Paper/paper_background_default.svg.96dpi.png" + backgroundModulate: "#e0bc99" + backgroundPatchMargin: 16.0, 16.0, 16.0, 16.0 + contentMargin: 32.0, 16.0, 32.0, 0.0 diff --git a/Resources/Textures/DeltaV/Interface/Paper/paper_heading_warrant.svg b/Resources/Textures/DeltaV/Interface/Paper/paper_heading_warrant.svg new file mode 100644 index 00000000000..74e0876fb9a --- /dev/null +++ b/Resources/Textures/DeltaV/Interface/Paper/paper_heading_warrant.svg @@ -0,0 +1,127 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/Resources/Textures/DeltaV/Interface/Paper/paper_heading_warrant.svg.200dpi.png b/Resources/Textures/DeltaV/Interface/Paper/paper_heading_warrant.svg.200dpi.png new file mode 100644 index 0000000000000000000000000000000000000000..d13d8cf76b7f251b4c1064e87cea2230f43df73b GIT binary patch literal 10022 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 Date: Thu, 28 Mar 2024 22:41:43 -0400 Subject: [PATCH 68/94] Apply suggestions from code review Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> --- Resources/Locale/en-US/deltav/misc/pda.ftl | 2 +- Resources/Locale/en-US/deltav/paper/stamp-component.ftl | 1 + Resources/Locale/en-US/paper/stamp-component.ftl | 2 +- Resources/Prototypes/DeltaV/Access/misc.yml | 1 + Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/general.yml | 1 + Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml | 1 + .../Prototypes/DeltaV/Catalog/Fills/Lockers/chiefjustice.yml | 1 + Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/clerk.yml | 1 + Resources/Prototypes/DeltaV/Device/devicenet_frequencies.yml | 1 + .../DeltaV/Entities/Objects/Specific/Justice/gavel.yml | 1 + .../DeltaV/Entities/Objects/Specific/Justice/gavelblock.yml | 1 + .../DeltaV/Entities/Structures/Doors/Airlocks/airlocks.yml | 1 - .../DeltaV/Entities/Structures/Doors/Windoors/windoor.yml | 1 + 13 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Resources/Locale/en-US/deltav/misc/pda.ftl b/Resources/Locale/en-US/deltav/misc/pda.ftl index d2ce93db8d8..a64a4e34231 100644 --- a/Resources/Locale/en-US/deltav/misc/pda.ftl +++ b/Resources/Locale/en-US/deltav/misc/pda.ftl @@ -1,4 +1,4 @@ ent-HoSPDA = head of security pda .desc = Smells like donuts and gunpowder residue. ent-LawyerPDA = attorney pda - .desc = For attornies to poach dubious clients. \ No newline at end of file + .desc = For attornies to poach dubious clients. diff --git a/Resources/Locale/en-US/deltav/paper/stamp-component.ftl b/Resources/Locale/en-US/deltav/paper/stamp-component.ftl index 7cfaadb2e9c..efb392c4bf8 100644 --- a/Resources/Locale/en-US/deltav/paper/stamp-component.ftl +++ b/Resources/Locale/en-US/deltav/paper/stamp-component.ftl @@ -1,2 +1,3 @@ stamp-component-stamped-name-notary = NOTARY stamp-component-stamped-name-chiefjustice = Chief Justice + diff --git a/Resources/Locale/en-US/paper/stamp-component.ftl b/Resources/Locale/en-US/paper/stamp-component.ftl index 9e0b6d64d8d..a00c4a62a70 100644 --- a/Resources/Locale/en-US/paper/stamp-component.ftl +++ b/Resources/Locale/en-US/paper/stamp-component.ftl @@ -16,4 +16,4 @@ stamp-component-stamped-name-rd = Mystagogue stamp-component-stamped-name-warden = Warden stamp-component-stamped-name-trader = Trader stamp-component-stamped-name-syndicate = Syndicate -stamp-component-stamped-name-ce = Chief Engineer \ No newline at end of file +stamp-component-stamped-name-ce = Chief Engineer diff --git a/Resources/Prototypes/DeltaV/Access/misc.yml b/Resources/Prototypes/DeltaV/Access/misc.yml index 08ea3a865e0..ad42935662b 100644 --- a/Resources/Prototypes/DeltaV/Access/misc.yml +++ b/Resources/Prototypes/DeltaV/Access/misc.yml @@ -49,3 +49,4 @@ - Zookeeper - Justice - Prosecutor + diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/general.yml index 65737fa8950..e35b95cbca9 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/general.yml @@ -27,3 +27,4 @@ contents: - id: EncryptionKeyJustice amount: 4 + diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml index b8aff63ece5..f99090ad9c0 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml @@ -87,3 +87,4 @@ amount: 2 - id: ProsecutorPDA - id: ClerkPDA + diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/chiefjustice.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/chiefjustice.yml index 28560627e59..b9787552a7d 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/chiefjustice.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/chiefjustice.yml @@ -15,3 +15,4 @@ - id: DoorRemoteJustice - id: Gavel - id: RubberStampChiefJustice + diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/clerk.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/clerk.yml index d54c1c1b231..fa4706c9605 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/clerk.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/clerk.yml @@ -11,3 +11,4 @@ - id: BoxEncryptionKeyJustice - id: ClerkIDCard - id: RubberStampNotary + diff --git a/Resources/Prototypes/DeltaV/Device/devicenet_frequencies.yml b/Resources/Prototypes/DeltaV/Device/devicenet_frequencies.yml index b2e49bc85b4..34f213077c7 100644 --- a/Resources/Prototypes/DeltaV/Device/devicenet_frequencies.yml +++ b/Resources/Prototypes/DeltaV/Device/devicenet_frequencies.yml @@ -2,3 +2,4 @@ id: SurveillanceCameraJustice name: device-frequency-prototype-name-surveillance-camera-justice frequency: 1420 + diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavel.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavel.yml index a304132eb27..1a91b05aac6 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavel.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavel.yml @@ -16,3 +16,4 @@ - type: Item size: Small sprite: DeltaV/Objects/Specific/Justice/gavel.rsi + diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavelblock.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavelblock.yml index fc0abe35e40..722a4fd1e39 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavelblock.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavelblock.yml @@ -15,3 +15,4 @@ sound: path: /Audio/DeltaV/Items/gavel.ogg UsedItemID: Gavel + diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/airlocks.yml index b032cc14a1a..93a8cec851a 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/airlocks.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/airlocks.yml @@ -20,4 +20,3 @@ - type: PaintableAirlock department: Justice - diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml index 82ff8868d29..c15296c9ca5 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml @@ -45,3 +45,4 @@ components: - type: AccessReader access: [["Prosecutor"]] + From 9b50f5010e24316350bc5eed26cd6dc96bf9effb Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Fri, 29 Mar 2024 17:35:29 -0400 Subject: [PATCH 69/94] Replaced legal with justice in job-description.ftl Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> --- Resources/Locale/en-US/deltav/job/job-description.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/deltav/job/job-description.ftl b/Resources/Locale/en-US/deltav/job/job-description.ftl index 9d2497d0571..3a20904bdb4 100644 --- a/Resources/Locale/en-US/deltav/job/job-description.ftl +++ b/Resources/Locale/en-US/deltav/job/job-description.ftl @@ -1,5 +1,5 @@ job-description-medical-borg = Half-human, Half-machine. Follow your laws, serve the crew, and assist the medical department. -job-description-chief-justice = Manage the legal department, act as a judge, and ensure everyone recieves fair and just treatment. +job-description-chief-justice = Manage the justice department, act as a judge, and ensure everyone recieves fair and just treatment. job-description-clerk = Organize trials, notarize documents, review charges, and act as a judge if needed. job-description-prosecutor = Take statements from security and prepare cases against those accused of commiting crimes. From 01dde625dad53130bfb7fb2f43eeab77a96dc57b Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Tue, 2 Apr 2024 19:42:56 -0400 Subject: [PATCH 70/94] Moved job-name-lawyer to DeltaV locale --- Resources/Locale/en-US/deltav/job/job-names.ftl | 1 + Resources/Locale/en-US/job/job-names.ftl | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/en-US/deltav/job/job-names.ftl b/Resources/Locale/en-US/deltav/job/job-names.ftl index 58a7255ab64..5eee3f2fb0c 100644 --- a/Resources/Locale/en-US/deltav/job/job-names.ftl +++ b/Resources/Locale/en-US/deltav/job/job-names.ftl @@ -2,3 +2,4 @@ job-name-medical-borg = Medical Cyborg job-name-chief-justice = Chief Justice job-name-clerk = Clerk job-name-prosecutor = Prosecutor +job-name-lawyer = Attorney diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl index 682b10ce3fc..134b4e64ae2 100644 --- a/Resources/Locale/en-US/job/job-names.ftl +++ b/Resources/Locale/en-US/job/job-names.ftl @@ -24,8 +24,8 @@ job-name-centcomoff = CentCom Official job-name-reporter = Reporter job-name-musician = Musician job-name-librarian = Librarian -# DeltaV - Renamed Lawyer to Attorney -job-name-lawyer = Attorney +# DeltaV - Changed Lawyer to Attorney +# job-name-lawyer = Lawyer job-name-mime = Mime job-name-ce = Chief Engineer job-name-janitor = Janitor From ac36b2a2cbc1cf1b109230b9fce80199a87bd7ec Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Tue, 2 Apr 2024 19:46:11 -0400 Subject: [PATCH 71/94] Remove added space in accesses.ftl Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> --- Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl b/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl index 993cab5923f..2c5a3c871c0 100644 --- a/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl +++ b/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl @@ -1,4 +1,4 @@ -id-card-access-level-orders = Orders +id-card-access-level-orders = Orders id-card-access-level-mantis = Psionic Mantis id-card-access-level-chief-justice = Chief Justice id-card-access-level-prosecutor = Prosecutor From acc150efe065c3851647de06533a45aa0478f215 Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Tue, 2 Apr 2024 19:51:20 -0400 Subject: [PATCH 72/94] Removed unneeded deletion of unneeded spaces in headsets.yml Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> --- .../Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml index f5a823dbd6a..b32cab7b21a 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml @@ -26,7 +26,7 @@ sprite: DeltaV/Clothing/Ears/Headsets/service.rsi - type: Clothing sprite: DeltaV/Clothing/Ears/Headsets/service.rsi - + - type: entity parent: ClothingHeadsetAltSyndicate id: ClothingHeadsetAltSyndicateListening @@ -114,4 +114,4 @@ sprite: Clothing/Ears/Headsets/security.rsi - type: Clothing sprite: Clothing/Ears/Headsets/security.rsi - \ No newline at end of file + From 8842f3472ac63c6e69f95ca4741762d8bddf4bab Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Tue, 2 Apr 2024 19:54:59 -0400 Subject: [PATCH 73/94] Changed Lawyer ID name to Attorney ID --- .../Prototypes/Entities/Objects/Misc/identification_cards.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 24132923405..412cb5bd2d8 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -355,7 +355,7 @@ - type: entity parent: IDCardStandard id: LawyerIDCard - name: lawyer ID card + name: attorney ID card # DeltaV - Changed Lawyer to Attorney components: - type: Sprite layers: From d21606bbfe1a36898ae51c38630d9da795b4219b Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Tue, 2 Apr 2024 20:14:44 -0400 Subject: [PATCH 74/94] Updated copyrights in all of the meta.json files affected --- .../Clothing/Head/Hats/cj_toque.rsi/meta.json | 2 +- .../Neck/Cloaks/cjcloak.rsi/meta.json | 2 +- .../Neck/Misc/prosecutorbadge.rsi/meta.json | 2 +- .../Neck/mantles/cjmantle.rsi/meta.json | 2 +- .../OuterClothing/Coats/cjrobe.rsi/meta.json | 2 +- .../Vests/clerkvest.rsi/meta.json | 2 +- .../Uniforms/Jumpskirt/cj.rsi/meta.json | 2 +- .../Uniforms/Jumpskirt/clerk.rsi/meta.json | 2 +- .../Jumpskirt/prosecutorred.rsi/meta.json | 2 +- .../Uniforms/Jumpsuit/cj.rsi/meta.json | 2 +- .../Uniforms/Jumpsuit/clerk.rsi/meta.json | 2 +- .../Jumpsuit/prosecutorred.rsi/meta.json | 2 +- .../Interface/Misc/job_icons.rsi/meta.json | 2 +- .../Devices/encryption_keys.rsi/meta.json | 2 +- .../DeltaV/Objects/Devices/pda.rsi/meta.json | 2 +- .../Objects/Misc/bureaucracy.rsi/meta.json | 24 +++++++++---------- .../Objects/Misc/id_cards.rsi/meta.json | 2 +- .../DeltaV/Objects/Misc/stamps.rsi/meta.json | 2 +- .../Specific/Justice/gavel.rsi/meta.json | 2 +- .../Specific/Justice/trialtimer.rsi/meta.json | 2 +- .../Airlocks/Glass/justice.rsi/meta.json | 2 +- .../Airlocks/Standard/justice.rsi/meta.json | 2 +- .../Structures/Wallmounts/signs.rsi/meta.json | 2 +- .../Structures/Storage/closet.rsi/meta.json | 2 +- 24 files changed, 35 insertions(+), 35 deletions(-) diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/cj_toque.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Head/Hats/cj_toque.rsi/meta.json index 45eac98c5d9..9d421b646b5 100644 --- a/Resources/Textures/DeltaV/Clothing/Head/Hats/cj_toque.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/Head/Hats/cj_toque.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC0-1.0", - "copyright": "Spritework by leonardo-dabepis", + "copyright": "Spritework by leonardo_dabepis (Discord)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi/meta.json index 85edfaef171..a0670a97c96 100644 --- a/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC0-1.0", - "copyright": "Spritework by leonardo-dabepis", + "copyright": "Spritework by leonardo_dabepis (Discord)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Misc/prosecutorbadge.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Neck/Misc/prosecutorbadge.rsi/meta.json index d1eafae3de6..7f12698657f 100644 --- a/Resources/Textures/DeltaV/Clothing/Neck/Misc/prosecutorbadge.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/Neck/Misc/prosecutorbadge.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "sprites by leonardo-dabepis", + "copyright": "sprites by leonardo_dabepis (Discord)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/DeltaV/Clothing/Neck/mantles/cjmantle.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Neck/mantles/cjmantle.rsi/meta.json index 433b4edf5a9..a04b75dd785 100644 --- a/Resources/Textures/DeltaV/Clothing/Neck/mantles/cjmantle.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/Neck/mantles/cjmantle.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC0-1.0", - "copyright": "Spritework by leonardo-dabepis", + "copyright": "sprites by leonardo_dabepis (Discord)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi/meta.json index 5e5c71fbc73..11ac46694ce 100644 --- a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC0-1.0", - "copyright": "Spritework by leonardo-dabepis", + "copyright": "sprites by leonardo_dabepis (Discord)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/meta.json index 5e5c71fbc73..11ac46694ce 100644 --- a/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC0-1.0", - "copyright": "Spritework by leonardo-dabepis", + "copyright": "sprites by leonardo_dabepis (Discord)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi/meta.json index c950d8f6858..faf5084407b 100644 --- a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC0-1.0", - "copyright": "Spritework by leonardo-dabepis", + "copyright": "sprites by leonardo_dabepis (Discord)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi/meta.json index c950d8f6858..faf5084407b 100644 --- a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC0-1.0", - "copyright": "Spritework by leonardo-dabepis", + "copyright": "sprites by leonardo_dabepis (Discord)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/meta.json index 3b15d15f4bf..322f9da00e0 100644 --- a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Heavily modified by leonardo-dabepis, original sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693", + "copyright": "Heavily modified by leonardo_dabepis (Discord), original sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi/meta.json index c950d8f6858..faf5084407b 100644 --- a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC0-1.0", - "copyright": "Spritework by leonardo-dabepis", + "copyright": "sprites by leonardo_dabepis (Discord)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi/meta.json index c950d8f6858..faf5084407b 100644 --- a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC0-1.0", - "copyright": "Spritework by leonardo-dabepis", + "copyright": "sprites by leonardo_dabepis (Discord)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/meta.json index 3b15d15f4bf..322f9da00e0 100644 --- a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Heavily modified by leonardo-dabepis, original sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693", + "copyright": "Heavily modified by leonardo_dabepis (Discord), original sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json index 1db795c19f9..09d18e3ab7c 100644 --- a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | nyanoPrisonGuard, nyanoMartialArtist, nyanoGladiator made by Floofers | ChiefJustice, Clerk by leonardo-dabepis", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | nyanoPrisonGuard, nyanoMartialArtist, nyanoGladiator made by Floofers | ChiefJustice, Clerk by leonardo_dabepis (Discord)", "size": { "x": 8, "y": 8 diff --git a/Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/meta.json index ec0fd9d2241..eb55c2b4e71 100644 --- a/Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC0-1.0", - "copyright": "law_label by leonardo_dabepis | prisoner_label, crypt_orange Created by DangerRevolution for Space Station 14.", + "copyright": "justice_label by leonardo_dabepis (Discord) | prisoner_label, crypt_orange Created by DangerRevolution for Space Station 14.", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json index 014cbe612fd..176af077199 100644 --- a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d | pda-corpsman from yogstation at https://github.com/yogstation13/Yogstation/commit/a75671b22476ed8e117229f38501b9b63f8d6bc1 | pda-martialartist by Floofers | pda-cj and pda-clerk by leonardo-dabepis | pda-prosecutor by Timemaster99", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d | pda-corpsman from yogstation at https://github.com/yogstation13/Yogstation/commit/a75671b22476ed8e117229f38501b9b63f8d6bc1 | pda-martialartist by Floofers | pda-chiefjustice and pda-clerk by leonardo_dabepis (Discord) | pda-prosecutor by Timemaster99 (Discord)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/meta.json index 8b9eb989a64..5e2c34d5304 100644 --- a/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi/meta.json @@ -1,14 +1,14 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432 | modified by Floofers. Stamp icon taken from tgstation at https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93 | modified by leonardo-dabepis", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "folder-hop-ian" - } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432 | modified by Floofers. Stamp icon taken from tgstation at https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93, modified by leonardo_dabepis (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "folder-hop-ian" + } + ] } diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json index 039e17c00f2..cd479792df3 100644 --- a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | nyanoprisonguard, nyanogladiator, nyanomartialartist made by Floofers, idchiefjustice idclerk and idlawyer made by leonardo-dabepis", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | nyanoprisonguard, nyanogladiator, nyanomartialartist made by Floofers, idchiefjustice idclerk and idlawyer made by leonardo_dabepis (Discord), idprosecutor made by Timemaster99 (Discord)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json index d3a05eaa555..04f59797615 100644 --- a/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Stamp sprites taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93, modified by Guess-My-Name. CJ stamp modified by Timemaster99.", + "copyright": "Stamp sprites taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93, modified by Guess-My-Name. CJ stamp modified by Timemaster99 (Discord)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/meta.json index 6f2813719aa..39ff0ed9d9b 100644 --- a/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprites sourced from https://github.com/tgstation/tgstation/pull/8495. In-hand sprites edited by Timemaster99.", + "copyright": "Sprites sourced from https://github.com/tgstation/tgstation/pull/8495. In-hand sprites edited by Timemaster99 (Discord)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/DeltaV/Objects/Specific/Justice/trialtimer.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Specific/Justice/trialtimer.rsi/meta.json index 9d4d77e383f..8081065c329 100644 --- a/Resources/Textures/DeltaV/Objects/Specific/Justice/trialtimer.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Specific/Justice/trialtimer.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Original screen timer sprite by brainfood1183 (Github) for Space Station 14, modified by Leonardo-DaBepis", + "copyright": "Original screen timer sprite by brainfood1183 (Github) for Space Station 14, modified by Leonardo_dabepis (Discord)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/meta.json b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/meta.json index a43a79f966b..e4c020ff61d 100644 --- a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/meta.json +++ b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and recolored by leonardo-dabepis", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and recolored by leonardo_dabepis (Discord)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/meta.json b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/meta.json index a43a79f966b..e4c020ff61d 100644 --- a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/meta.json +++ b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and recolored by leonardo-dabepis", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and recolored by leonardo_dabepis (Discord)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/meta.json b/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/meta.json index 4b152e9a8dc..ab3feb6715c 100644 --- a/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/meta.json +++ b/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "directional sprites taken from https://github.com/space-wizards/space-station-14/commit/c1556214de46d66fe4057500e269b17438dc96ca | direction_mail modified by Hyenh, direction_logi modified by Floofers | direction_court, direction_justice by leonardo-dabepis", + "copyright": "directional sprites taken from https://github.com/space-wizards/space-station-14/commit/c1556214de46d66fe4057500e269b17438dc96ca | direction_mail modified by Hyenh, direction_logi modified by Floofers | direction_court, direction_justice by leonardo_dabepis (Discord)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/Structures/Storage/closet.rsi/meta.json index 1c1ec03df42..bfd8ffc5c5c 100644 --- a/Resources/Textures/Structures/Storage/closet.rsi/meta.json +++ b/Resources/Textures/Structures/Storage/closet.rsi/meta.json @@ -4,7 +4,7 @@ "x": 32, "y": 32 }, - "copyright": "Taken from tgstation, brigmedic locker is a resprited CMO locker by PuroSlavKing (Github). CJ and Clerk lockers edited by Timemaster99.", + "copyright": "Taken from tgstation, brigmedic locker is a resprited CMO locker by PuroSlavKing (Github). CJ and Clerk lockers edited by Timemaster99 (Discord)", "license": "CC-BY-SA-3.0", "states": [ { From 2f1b1e75d4d71e3d6e2fa3d962acd51194a7d64f Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Tue, 2 Apr 2024 21:29:18 -0400 Subject: [PATCH 75/94] Added formal and white variants of CJ jumpsuit to locker --- .../Catalog/Fills/Lockers/chiefjustice.yml | 2 ++ .../Entities/Clothing/Uniforms/jumpsuits.yml | 22 +++++++++++++++ .../cj_white.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 9718 bytes .../Uniforms/Jumpsuit/cj_white.rsi/icon.png | Bin 0 -> 537 bytes .../Jumpsuit/cj_white.rsi/inhand-left.png | Bin 0 -> 7793 bytes .../Jumpsuit/cj_white.rsi/inhand-right.png | Bin 0 -> 7879 bytes .../Uniforms/Jumpsuit/cj_white.rsi/meta.json | 26 ++++++++++++++++++ .../cjformal.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 9423 bytes .../Uniforms/Jumpsuit/cjformal.rsi/icon.png | Bin 0 -> 5678 bytes .../Jumpsuit/cjformal.rsi/inhand-left.png | Bin 0 -> 7183 bytes .../Jumpsuit/cjformal.rsi/inhand-right.png | Bin 0 -> 7415 bytes .../Uniforms/Jumpsuit/cjformal.rsi/meta.json | 26 ++++++++++++++++++ 12 files changed, 76 insertions(+) create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi/meta.json diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/chiefjustice.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/chiefjustice.yml index b9787552a7d..9194c05ac01 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/chiefjustice.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/chiefjustice.yml @@ -7,6 +7,8 @@ contents: - id: ClothingHeadsetAltJustice - id: ClothingNeckCloakCJ + - id: ClothingUniformJumpsuitChiefJusticeFormal + - id: ClothingUniformJumpsuitChiefJusticeWhite - id: PaperStationWarrant amount: 10 - id: BoxPDAJustice diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml index aa7f1e913ec..b831c379478 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml @@ -255,6 +255,28 @@ - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitChiefJusticeFormal + name: chief justice's formal jumpsuit + description: A fancy double-breasted suit with golden accoutrements. Sharp and authoritative. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitChiefJusticeWhite + name: chief justice's white jumpsuit + description: A modest, white office shirt with hard-earned rank epaulets. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi + - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitClerk diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..e735c5a2b210cf4161536be78d8831f10bfb2868 GIT binary patch literal 9718 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 KTJ?4N@c#m0(W=A% literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..bf6ed67bc86a2668c33a6b1a00998ceb9793daa0 GIT binary patch literal 537 zcmV+!0_OdRP)MLMTa)5ZdG*2|^K(2#Q2RT8ZKyyzckxT@JzBX_o}|U4Hj_@7?eF zd4G+mR0;+uBMewNfDWJo{7-=M*fp7RI;1?8$%2=688io27z&emsR3Ld1Q8(ys{vk$ z)8!yBk8_az*i;3g7-0VGhzOA!%xuKr;juzZmw6AI#S%0JdkF5sKH%LAax=W67(x*M zXC5K#*;DYizT42$WHQk>Ww(HB(h9cy9JFzKu}m8Enj#2U05r$qg<_eSEiF2!8LC>X zO6I7GWJbyhMNkAG3qY6mE8<~eLXekBH`FGq)EL#>kK-+)Cb{zR0Adk?Sd3tCJo()- zw))bL&v#&Og}Nc|KTse=X8?;?co$Tjn?!D`+Uuz58nW5373db*A_Ub8fC-lyA=Xy5 zq`X)4{1h|Oe#}(^B;zMgyGy{8_affJuU9N8Va~Z)weqz+Q&{`rO(x@8ycUWrCQ7H75!7O6jL{bZwyMtq;Be zRnVCaBhgEJT+^>{Y#mc5_pKbKyX!tj`qaLXh=a?fbt>tBYuy#lhwQ%6mFWQoeIZzG z^EpI_L}2C0)#ZNCyX%Hto|QG1u97<2Je;nuG?u0sQ_{Z9y&KLi^5yfDqMu{<>9fDA zyfpscea_DJv&YKUz{cd|fzyHwuEVqKcl}d8eH+whyj|2&pj8wZ!)M^dEk0<(gBese8!@$(E`4;#H$Ddp3=Ezv4xa z|7S@j!l|~W&vxk<)$H32S=Tgb85=5Pj~_Vz(Yy#xN!h<&JfY8Ae`%1YB-R$=l{Aui ztXi38*EU7Wn^w^gnLTHoH%>*?xNvoy6@LeEcEr|7adMt(B@oE^2;oOG?S!$I$;xP6 zOkek~%=H%q_1vmjd{0j(2pmD9iO!>m=B?$U$+k28vDRiU@0FQF^7m#I+)s9W__(C! zlXJnncw5@z$8UN+-Z}0ETkdf6s9Hu?GvNzE!|i=T5uD*SWDR2!@fA@9E6u2dLq)Bs zYvM{dW$B@oR(9@R&?SQ*9Yz|T3$uIOm$mo`eBK)zOk+&a9;D6bOlyCUN`s}3Np%KG z-y50aLFc_$l|>D|XYoJZRll_hRDa>AK$|w=NwTqmJR{;=7su%sj$_p4RDZo)oUfOZ zM@RhU8)o)192#2U=5_n(PF-hm_d9@>>sqE)hn6Hd-@rQ}L$6csj139BJUsJRRcF6V z{?x|-qxGeg@7S0rgLL~9KDK!IR70b~jFVc;{Hv;Ou@dY-x3;7%>^IVSTI(p?e0|`6 z@8!V)gBM*D^BCEuQ%)^Cl!QX|Rl}Y`UgbUw6#=)qBV=1M4M(R2uJOGb9eAwBv(h3f z6JHcYgQU2$YfAn_?D85IBtT=UPfV~5a<2-UJzf_vjX zb}BcUzp~FxoAfo7KE;UCJd8znf}983y=CtBUUsE7yGWOO%meEMJihrry~ND&-ioc=WTmT^H189 z%dN zUWhGMba7s7N3J`lD<9bFcqy2ftZb?1y1P3u7^9AQMeLd`>YOnEe<y(|O2p6q(F5c|czWX>yMDCKUa|>APV4Q?6kE{0y&K+u2x6Ah&*WhY@ za7~<_$TvT+Ufz&Ru;7)NJLu{o ze3W9XfhfEz(SCdtJRpCgo7#RO;f+|Y7Lz8YC6iEMMSXH9av_tH6$^>B@yQiz@G{%J zSHsg)dYkkGe)t<>F-hUvzz2t|(a}aQaA}e|76oq6_f_}qzD!SiaS#%zDM~iSExaf>d#WdJal722 zp~cOiXx)X^QCYXx*>^I7v~7qV7p>6+OM| zP=xehMe{d1UF*&-6iccJeJrkbxeKS2#6R5aV=5V^V7xu-wH05h*ep(h!xhczbAWpv z1xZIv960poh{v;uJjEyEUN|S$@8vNI_J~r8)r<$VpA#t@I@U#oV#8qPCoZq{7C#L> zT;;wv^-#}Z#NghS;rRINhFq#I`vXKi$1Q5psb}E>cN%i9+66y*Ya(fvGCUgdTd#!N zp!uE>tM{)4I*%(+)f`u;7oV{~=9TelTq0g``yM&eeo6l@Fr?UY)ZZ={rjhZRT&g%J zn8t%L^Ea@#GKe_X)>Fo`*XfJqlM^LkIyr?3ocork7q0OsTv;gKoREenif}GCT7E5Pa@5eJ4&UOEx4~kP zh0#qD6xws9nDU_)oq-U`$-JlhZ>8kIY_5-291G<%Eh6PuMuzAQhIwU+QUlc>#TDC& z@Xtc%QHstJ6|r^?O`}XC#6E4y_#n?~B2pZ*JEJ`@lV@M8Srcu?*S7m)CA`_lm7+d$$`Dch%b_V-VebSrQ#xm)Y@*_OeZi9S+K$@jYBjjThs5A`wN<{m zGBsQQThpFf?Cvh?Gu63ZC3djs`W{Wz)p6Oxg{#N)2ouG4C8hWjcdJu@JLSmCjJ3Ff zPEwQK*;l`g9SeG&G$|i;P=p&^GkB|O9o*F4xL2dm;BjZE7?kFS8*#SA2X9}*D@Zs9 zQug!@x1sDCPp1yr&&?U%3-8hqfIw0hS3V*W_>iQbpK+bbpd zuhGw?Jgjsr4bp7;-GRMmt6Ki*dkKC_uM0A`_94h;L8+$iOX2Fc&$r2s>x;GDKZIwE z3F2Gs6^g`>zxB_3RJdb=nm#u~GQXS*9E*?#ZN4{A<@F7aX1`WxJxEnf)3y^gI?D8_ z3f0l5Sjj8S4@xZ|*Nr2`Vr+tEoyG$74%zIi_8wIi&;Ps)w|27l+EniIc$ef*m+y>7 z60!y9U=Y@%LeRt8b*6ejq8;!D7xN6tH0QB5D@25DAmFx>O*KjbE~O?!E~epDd%*8FV>nL5wTq$K{B26VietUX9K0(9(o-MiRq&2px2(uXd0h}T|2)dK zODDI_O>?lQ;Nz2b-XhGcvG~D4%dW(5$v`PXSO?N2urnPdgY2QS+UM&qBNdh2W!v)% zurj&n$ung|{Fr+<+;cg1+cUN8(;fL}tQ4_sac`Z~h_%CMYbU3C_u%W|w!)Sw;Y+fn zN?VM&Pmz~-IHS+p3{lUR))$Q@FnvBD^ahhn%=xPGa@!tUm%UV-SOR;<8>TLqpI4~Q zb^i-u?%rz6IaUn@9$b32Yw`T_xw03oKG$zl<-Jye89AW)zM(H>^CGzrWLHW54^eoY z_N=&>%qCn!oIW`FRby_GO;_}jv*Gu8Vxr!(?xtPhH(cvb+n$_tQye^FT=_v^{;c49 zFjcY5QNjOK*RAU6#baRKBE9J95%a+V{2}$Ydtf0^MeFf`_WO2u;R7!|#0ZLuGa_;z zzrU^WS-eta6>ex*(61C_-c03u*TKr!8iaQM=Nz2B*3h2UEm~E4$3rtZ{PmX|C*M~u zfqJYg&zHLwRPk3UW~MrqW;i>m*nIiUlfr9*PvTg}&=%B^CP!9>o{+q%Su|Ka{<=r) zuCm1RwU0ZalU}+9>_;fc^lS- z7tQoQpeR< zfwz%1cqXS8kv;U@#B-0`SM-Y1N5wKlu3$)5S^1i44F4edvhYLLnSm>xt3Hp+NDLWI zG(XaKe}RD2Og*WuRBoxT5~{oc58HXNskua0h3E9w{e!zL485cTs@C&e_gDFMQ7`1D z_=TSClfEru%--mqns{xxm-$`8*f!<%e8m<1qvMgEf}*z8YNcCw_ooST=caDG=rq*i zwrYra@DA3IjfXNgLrO13e!72uiX%beY1>UXX1Ve<=ikx1en)n!GLC+iXe%0P$tt*3 zbR7Id&zQv{F20pyA!Yx4oAQz~n3@r22ehp|G@xy@#-GHJJlvHDWDg=m+0We*Xlp?r z%_DxE1d=O-1twCQXml;e=O;A~FpaDQIfcf<@t(RAXPSNhgJK?FWI+mWC1J>rBZs*) z{jdOlJB396`?^Fcxm zbAvS*WGdDSckCwwFw%lJvsj*37|hq#SJ_uZ*@NK(Ltro%7#s;hBB6i=l<7}r5&WQZ zrpyM!4-6cINn+4ESu_ticmtC_^zdeBK_I|9_z(ZwJ@NQI;pxnuEC77K{0N>fgfblF z?hgCag2~eJ0YH8_^dBvl7C`q8Govs)ycr~lo)3l2lKB;aO#0K_)0^S884j5QqqtGr z0aYfjD&lWT9yh?7{Asa4ffLQ$bJGeS`)`^o8uc%-{^r}p%w{;hIs%ygiTgM0KVsih z2DI>aEY5@Ez2Tk#P7AWJK9=l3qLHziuS60-okFD`p#&nF2t}dM7$}BBLO~HkB0?3Z zhCxzP3BN!Y(3va(okZDy0>G7N01lamCXrE8btpkig#<-WRFP1kikb>kl|oWOkO)W; zQVsbFgfW8#R3*XfSFbjp$N&_Ij6tcA;3`lmg@k~j)Tm@AK?SV>MPe`rIF*W^!c~5F zLndL5c`)1wKssse1Sbm2lkT*+#s=Y7Z4(162vQmTm&C-4z@h>Mz#gE{$sWGUzosl` z?i6ztVS`VE8Ul%ct0C1@Q7AQ4^&ehuB3e-xOrRDwP!Vutl^-)3iNONl0MrsTDir|u zBTlR?gF;|=Ff2Sg+_WGY5a12VKd14)h9VPK1RQ}y0YKqM6c!HLNDCwayK$qS8^d4p zJ;*ew|No`Ev3#1Ckk+W{4Cf%?kPz*#W21$e?Ra6N- zGx#Su(}T+LB`_%3P5_SpS3rSoas`(EnJR_9d*ka&*~kMx8Nd_IXh=$2yo zK0vb5Q~xv*1mfY}c(!!(2Ym&EJ6HyIy&WGpIkpIiiH#Vm1C8@@1Dv*nU(fWr8pEvw z@$Iw6y^yOMIxVC1XwDr6OT)N2u`Ey% zwWnQ?%a$E}4#D#Z9us!Oao>UY=ZD<14&t)GmCek!+;QAvL7`}>ZQnqDGyrj)KD zJOPqq)RJp5`f+b+YxmFtrN*IVuPgC;c1ZLxUx3qS}wI4n; qFFABhdh4sl?6}IEg@H!0EeDP4?_v>|7h{1OgADYHaCth8!T$qmnggW( literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..deb205205ab91d09acd1729baa444204c3560f69 GIT binary patch literal 7879 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 kbrf4712OWQUrly!^`%irUedqm2=0U1cD(f|Me literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..4e73693046fa1d1ad954add9430787349fb847e1 GIT binary patch literal 7183 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..567d302dc529f82b62c390a392703de835c62b06 GIT binary patch literal 7415 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 Date: Tue, 9 Apr 2024 15:54:25 -0400 Subject: [PATCH 76/94] Updated to use upstream's EmitSoundOnInteractUsing --- .../DeltaV/Entities/Objects/Specific/Justice/gavel.yml | 4 +++- .../DeltaV/Entities/Objects/Specific/Justice/gavelblock.yml | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavel.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavel.yml index 1a91b05aac6..52f5286e34a 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavel.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavel.yml @@ -16,4 +16,6 @@ - type: Item size: Small sprite: DeltaV/Objects/Specific/Justice/gavel.rsi - + - type: Tag + tags: + - Gavel diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavelblock.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavelblock.yml index 722a4fd1e39..0c745bf992b 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavelblock.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavelblock.yml @@ -14,5 +14,6 @@ - type: EmitSoundOnInteractUsing sound: path: /Audio/DeltaV/Items/gavel.ogg - UsedItemID: Gavel - + whitelist: + tags: + - Gavel From f453d4e84041ce8734caa8c13ac212e7d3c0401a Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Tue, 9 Apr 2024 16:00:22 -0400 Subject: [PATCH 77/94] Removing old component stuff --- Content.Server/Sound/EmitSoundSystem.cs | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Content.Server/Sound/EmitSoundSystem.cs b/Content.Server/Sound/EmitSoundSystem.cs index 6a8fd5e169f..059800c3f9d 100644 --- a/Content.Server/Sound/EmitSoundSystem.cs +++ b/Content.Server/Sound/EmitSoundSystem.cs @@ -3,7 +3,6 @@ using Content.Shared.UserInterface; using Content.Shared.Sound; using Robust.Shared.Random; -using Content.Shared.Interaction; namespace Content.Server.Sound; @@ -41,7 +40,6 @@ public override void Initialize() SubscribeLocalEvent(HandleEmitSoundOnTrigger); SubscribeLocalEvent(HandleEmitSoundOnUIOpen); - SubscribeLocalEvent(HandleEmitSoundOnInteractUsing); } private void HandleEmitSoundOnUIOpen(EntityUid uid, EmitSoundOnUIOpenComponent component, AfterActivatableUIOpenEvent args) @@ -54,12 +52,4 @@ private void HandleEmitSoundOnTrigger(EntityUid uid, EmitSoundOnTriggerComponent TryEmitSound(uid, component, args.User, false); args.Handled = true; } - private void HandleEmitSoundOnInteractUsing(EntityUid uid, EmitSoundOnInteractUsingComponent component, InteractUsingEvent args) - { - var curUsedItemID = Prototype(args.Used)?.ID; - if (component.UsedItemID == curUsedItemID) - { - TryEmitSound(uid, component, args.User, false); - } - } } From f7302be972760a1bfb3581695664f467c09be781 Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Tue, 9 Apr 2024 16:04:22 -0400 Subject: [PATCH 78/94] Gave Prosecutor Filled Lawyer Backpack --- Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml index 075834cf858..33c0b567762 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml @@ -20,7 +20,7 @@ equipment: jumpsuit: ClothingUniformJumpsuitProsecutor neck: ClothingNeckProsecutorbadge - back: ClothingBackpackFilled + back: ClothingBackpackLawyerFilled shoes: ClothingShoesBootsLaceup id: ProsecutorPDA ears: ClothingHeadsetSecurity From 80c4bcb6423cf6b2772c100b6a618b326ca54f62 Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Tue, 9 Apr 2024 16:10:05 -0400 Subject: [PATCH 79/94] Deleted old component Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> --- .../EmitSoundOnInteractUsingComponent.cs | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 Content.Server/Sound/Components/EmitSoundOnInteractUsingComponent.cs diff --git a/Content.Server/Sound/Components/EmitSoundOnInteractUsingComponent.cs b/Content.Server/Sound/Components/EmitSoundOnInteractUsingComponent.cs deleted file mode 100644 index 0c82cda3864..00000000000 --- a/Content.Server/Sound/Components/EmitSoundOnInteractUsingComponent.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Content.Shared.Sound.Components; - -namespace Content.Server.Sound.Components -{ - /// - /// Whenever this item is used upon by a specific entity prototype in the hand of a user, play a sound - /// - [RegisterComponent] - public sealed partial class EmitSoundOnInteractUsingComponent : BaseEmitSoundComponent - { - [DataField("UsedItemID")] - public string UsedItemID = ""; - } -} From 7546e161b769bcee058121553c32a40479905b51 Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Fri, 24 May 2024 21:27:51 -0400 Subject: [PATCH 80/94] Removed old comments --- .../Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml | 2 +- .../DeltaV/Entities/Objects/Specific/Justice/gavelblock.yml | 2 +- .../Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml | 2 +- Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml index 8c5b945d5be..4719f8a597a 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml @@ -39,5 +39,5 @@ stampState: "paper_stamp-notary" - type: Sprite sprite: DeltaV/Objects/Misc/stamps.rsi - state: stamp-cj # Change to CJ when sprited + state: stamp-cj diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavelblock.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavelblock.yml index 0c745bf992b..a74ae7a9ff7 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavelblock.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavelblock.yml @@ -5,7 +5,7 @@ description: A hardwood block that, when hit with a gavel, emits an aura of authority. components: - type: Sprite - sprite: DeltaV/Objects/Specific/Justice/gavelblock.rsi #Change to gavelblock + sprite: DeltaV/Objects/Specific/Justice/gavelblock.rsi layers: - state: icon - type: Item diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml index 85c34e3ba0a..7c751d2fdb7 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml @@ -54,6 +54,6 @@ # Todo - pocket1: Gavel innerClothingSkirt: ClothingUniformJumpskirtChiefJustice satchel: ClothingBackpackSatchelFilled # TODO- make Justice departmebt bags - duffelbag: ClothingBackpackDuffelFilled # E. + duffelbag: ClothingBackpackDuffelFilled diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml index 33c0b567762..551992dec2a 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml @@ -15,7 +15,7 @@ - Security - Maintenance -- type: startingGear # Need prosecuter stuff +- type: startingGear id: ProsecutorGear equipment: jumpsuit: ClothingUniformJumpsuitProsecutor From f0b33f3cd4c5e603d027e959387106bec6c1497d Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Fri, 24 May 2024 21:55:09 -0400 Subject: [PATCH 81/94] Updated doors to electronics system, fixed courier spawner that I botched --- .../DeltaV/Entities/Markers/Spawners/jobs.yml | 1 + .../Devices/Electronics/door_access.yml | 24 ++++++++++ .../Structures/Doors/Airlocks/access.yml | 45 +++++++++++-------- .../Structures/Doors/Windoors/windoor.yml | 9 ++++ 4 files changed, 61 insertions(+), 18 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml index 16ba3ccd8c8..de75e344151 100644 --- a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml @@ -55,6 +55,7 @@ #- sprite: DeltaV/Markers/jobs.rsi # state: prosecutor +- type: entity id: SpawnPointCourier parent: SpawnPointJobBase name: courier diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/Electronics/door_access.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/Electronics/door_access.yml index 1fea754ce67..c2e41d068ef 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/Electronics/door_access.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/Electronics/door_access.yml @@ -93,3 +93,27 @@ components: - type: AccessReader access: [["Mail"]] + + - type: entity + parent: DoorElectronics + id: DoorElectronicsChiefJustice + suffix: ChiefJustice, Locked + components: + - type: AccessReader + access: [["ChiefJustice"]] + + - type: entity + parent: DoorElectronics + id: DoorElectronicsJustice + suffix: Justice, Locked + components: + - type: AccessReader + access: [["Justice"]] + + - type: entity + parent: DoorElectronics + id: DoorElectronicsProsecutor + suffix: Prosecutor, Locked + components: + - type: AccessReader + access: [["Prosecutor"]] diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml index 1b52c4e85a1..197a7a3de19 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml @@ -22,48 +22,54 @@ id: AirlockChiefJusticeLocked suffix: Chief Justice, Locked components: - - type: AccessReader - access: [["ChiefJustice"]] + - type: ContainerFill + containers: + board: [ DoorElectronicsChiefJustice ] - type: entity parent: AirlockCommandGlass id: AirlockChiefJusticeGlassLocked suffix: ChiefJustice, Locked components: - - type: AccessReader - access: [["ChiefJustice"]] + - type: ContainerFill + containers: + board: [ DoorElectronicsChiefJustice ] - type: entity parent: AirlockJustice id: AirlockJusticeLocked suffix: Justice, Locked components: - - type: AccessReader - access: [["Justice"]] + - type: ContainerFill + containers: + board: [ DoorElectronicsJustice ] - type: entity parent: AirlockJusticeGlass id: AirlockJusticeGlassLocked suffix: Justice, Locked components: - - type: AccessReader - access: [["Justice"]] + - type: ContainerFill + containers: + board: [ DoorElectronicsJustice ] - type: entity parent: AirlockJustice id: AirlockProsecutorLocked suffix: Prosecutor, Locked components: - - type: AccessReader - access: [["Prosecutor"]] + - type: ContainerFill + containers: + board: [ DoorElectronicsProsecutor ] - type: entity parent: AirlockJusticeGlass id: AirlockProsecutorGlassLocked suffix: Prosecutor, Locked components: - - type: AccessReader - access: [["Prosecutor"]] + - type: ContainerFill + containers: + board: [ DoorElectronicsProsecutor ] # Maintenance - type: entity @@ -71,24 +77,27 @@ id: AirlockMaintChiefJusticeLocked suffix: ChiefJustice, Locked components: - - type: AccessReader - access: [["ChiefJustice"]] + - type: ContainerFill + containers: + board: [ DoorElectronicsChiefJustice ] - type: entity parent: AirlockMaint id: AirlockMaintJusticeLocked suffix: Justice, Locked components: - - type: AccessReader - access: [["Justice"]] + - type: ContainerFill + containers: + board: [ DoorElectronicsJustice ] - type: entity parent: AirlockMaint id: AirlockMaintProsecutorLocked suffix: Prosecutor, Locked components: - - type: AccessReader - access: [["Prosecutor"]] + - type: ContainerFill + containers: + board: [ DoorElectronicsProsecutor ] - type: entity parent: AirlockSecurity diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml index eefff72b6f7..1b13c686674 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml @@ -34,6 +34,9 @@ components: - type: AccessReader access: [["ChiefJustice"]] + - type: ContainerFill + containers: + board: [ DoorElectronicsChiefJustice ] - type: entity parent: WindoorSecure @@ -42,6 +45,9 @@ components: - type: AccessReader access: [["Justice"]] + - type: ContainerFill + containers: + board: [ DoorElectronicsJustice ] - type: entity parent: WindoorSecure @@ -50,3 +56,6 @@ components: - type: AccessReader access: [["Prosecutor"]] + - type: ContainerFill + containers: + board: [ DoorElectronicsProsecutor ] From 8105f397461ca3f2300b76e39a5efbf02150a3e1 Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Sat, 25 May 2024 18:37:45 -0400 Subject: [PATCH 82/94] Fixed door_access indentation Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> --- .../Entities/Objects/Devices/Electronics/door_access.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/Electronics/door_access.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/Electronics/door_access.yml index c2e41d068ef..46edc0a20fd 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/Electronics/door_access.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/Electronics/door_access.yml @@ -94,7 +94,7 @@ - type: AccessReader access: [["Mail"]] - - type: entity +- type: entity parent: DoorElectronics id: DoorElectronicsChiefJustice suffix: ChiefJustice, Locked @@ -102,7 +102,7 @@ - type: AccessReader access: [["ChiefJustice"]] - - type: entity +- type: entity parent: DoorElectronics id: DoorElectronicsJustice suffix: Justice, Locked @@ -110,7 +110,7 @@ - type: AccessReader access: [["Justice"]] - - type: entity +- type: entity parent: DoorElectronics id: DoorElectronicsProsecutor suffix: Prosecutor, Locked From 0934d7365d127677664e83e7058a7d84eec71411 Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Tue, 28 May 2024 20:18:59 -0400 Subject: [PATCH 83/94] Adding a little bit of loadouts --- .../Loadouts/Jobs/Justice/chiefjustice.yml | 0 .../DeltaV/Loadouts/loadout_groups.yml | 44 +++++++++++++++++++ .../DeltaV/Loadouts/role_loadouts.yml | 13 ++++++ 3 files changed, 57 insertions(+) create mode 100644 Resources/Prototypes/DeltaV/Loadouts/Jobs/Justice/chiefjustice.yml diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Justice/chiefjustice.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Justice/chiefjustice.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml index 0411e0ec372..f679c51b079 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml @@ -63,3 +63,47 @@ - BrigMedicBackpack - BrigMedicSatchel - BrigMedicDuffel + +# Justice +## Chief Justice +- type: loadoutGroup + id: ChiefJusticeHead + name: loadout-group-courier-head + minLimit: 0 + loadouts: + - CourierHead + - MailCarrierHead + +- type: loadoutGroup + id: ChiefJusticeJumpsuit + name: loadout-group-courier-jumpsuit + loadouts: + - CourierJumpsuit + - CourierJumpskirt + - MailCarrierJumpsuit + - MailCarrierJumpskirt + +- type: loadoutGroup + id: ChiefJusticeNeck + name: loadout-group-courier-jumpsuit + loadouts: + - CourierJumpsuit + - CourierJumpskirt + - MailCarrierJumpsuit + - MailCarrierJumpskirt + +- type: loadoutGroup + id: ChiefJusticeClothing + name: loadout-group-courier-outerclothing + minLimit: 0 + loadouts: + - CargoTechnicianWintercoat + - MailCarrierWintercoat + +- type: loadoutGroup + id: ChiefJusticeShoes + name: loadout-group-courier-shoes + loadouts: + - BlackShoes + - CargoWinterBoots + - RollerSkates diff --git a/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml b/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml index 4ef61a5bdfb..bcb3bafc3e9 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml @@ -21,3 +21,16 @@ - SecurityOuterClothing - MedicalGloves - Trinkets + +# Justice +- type: roleLoadout + id: JobChiefJustice + groups: + - ChiefJusticeHead + - ChiefJusticeJumpsuit + - ChiefJusticeNeck + - ChiefJusticeOuterClothing + - CommonBackpack + - ChiefJusticeShoes + - Trinkets + From 5ad3c560d174fe88990cddb5bed4db76fb848065 Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Tue, 28 May 2024 22:47:20 -0400 Subject: [PATCH 84/94] Add loadouts for justice --- .../deltav/preferences/loadout-groups.ftl | 15 +++ .../Objects/Misc/identification_cards.yml | 1 + .../Loadouts/Jobs/Justice/chiefjustice.yml | 85 ++++++++++++++++ .../DeltaV/Loadouts/Jobs/Justice/clerk.yml | 83 ++++++++++++++++ .../Loadouts/Jobs/Justice/prosecutor.yml | 28 ++++++ .../DeltaV/Loadouts/loadout_groups.yml | 96 +++++++++++++++---- .../DeltaV/Loadouts/role_loadouts.yml | 19 +++- .../Roles/Jobs/Justice/chief_justice.yml | 18 ++-- .../DeltaV/Roles/Jobs/Justice/clerk.yml | 12 +-- .../DeltaV/Roles/Jobs/Justice/prosecutor.yml | 12 +-- 10 files changed, 326 insertions(+), 43 deletions(-) create mode 100644 Resources/Prototypes/DeltaV/Loadouts/Jobs/Justice/clerk.yml create mode 100644 Resources/Prototypes/DeltaV/Loadouts/Jobs/Justice/prosecutor.yml diff --git a/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl b/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl index b6f51638ee4..1637c30b236 100644 --- a/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl @@ -27,6 +27,21 @@ loadout-group-brig-medic-back = Brigmedic backpack loadout-group-prison-guard-head = Prison Guard head loadout-group-prison-guard-jumpsuit = Prison Guard jumpsuit +# Justice +loadout-group-chiefjustice-head = Chief Justice head +loadout-group-chiefjustice-jumpsuit = Chief Justice jumpsuit +loadout-group-chiefjustice-neck = Chief Justice neck +loadout-group-chiefjustice-outerclothing = Chief Justice outer clothing +loadout-group-chiefjustice-shoes = Chief Justice shoes + +loadout-group-clerk-jumpsuit = Clerk jumpsuit +loadout-group-clerk-neck = Clerk neck +loadout-group-clerk-outerclothing = Clerk outer clothing +loadout-group-clerk-shoes = Clerk shoes + +loadout-group-prosecutor-jumpsuit = Prosecutor jumpsuit +loadout-group-prosecutor-neck = Prosecutor neck + # Wildcards loadout-group-prisoner-jumpsuit = Prisoner jumpsuit diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml index 79cbfa0fc34..9131a7b7877 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml @@ -37,6 +37,7 @@ - sprite: DeltaV/Objects/Misc/id_cards.rsi state: idprosecutor +- type: entity id: CourierIDCard name: courier ID card components: diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Justice/chiefjustice.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Justice/chiefjustice.yml index e69de29bb2d..3ebcb2a5d17 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Justice/chiefjustice.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Justice/chiefjustice.yml @@ -0,0 +1,85 @@ +# Head +- type: loadout + id: CJToque + equipment: CJToque + +- type: startingGear + id: CJToque + equipment: + head: ClothingHeadHatCJToque + +# Jumpsuit +- type: loadout + id: ChiefJusticeJumpsuit + equipment: ChiefJusticeJumpsuit + +- type: startingGear + id: ChiefJusticeJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitChiefJustice + +- type: loadout + id: ChiefJusticeJumpskirt + equipment: ChiefJusticeJumpskirt + +- type: startingGear + id: ChiefJusticeJumpskirt + equipment: + jumpsuit: ClothingUniformJumpskirtChiefJustice + +- type: loadout + id: ChiefJusticeFormalJumpsuit + equipment: ChiefJusticeFormalJumpsuit + +- type: startingGear + id: ChiefJusticeFormalJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitChiefJusticeFormal + +- type: loadout + id: ChiefJusticeWhiteJumpsuit + equipment: ChiefJusticeWhiteJumpsuit + +- type: startingGear + id: ChiefJusticeWhiteJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitChiefJusticeWhite + +# Neck +- type: loadout + id: ChiefJusticeCloak + equipment: ChiefJusticeCloak + +- type: startingGear + id: ChiefJusticeCloak + equipment: + neck: ClothingNeckCloakCJ + +# Outer Clothing +- type: loadout + id: ChiefJusticeRobe + equipment: ChiefJusticeRobe + +- type: startingGear + id: ChiefJusticeRobe + equipment: + outerClothing: ClothingOuterChiefJustice + +# Shoes +- type: loadout + id: LeatherShoes + equipment: LeatherShoes + +- type: startingGear + id: LeatherShoes + equipment: + shoes: ClothingShoesLeather + +- type: loadout + id: LaceupShoes + equipment: LaceupShoes + +- type: startingGear + id: LaceupShoes + equipment: + shoes: ClothingShoesBootsLaceup diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Justice/clerk.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Justice/clerk.yml new file mode 100644 index 00000000000..0d4bc067a80 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Justice/clerk.yml @@ -0,0 +1,83 @@ +# Jumpsuit +- type: loadout + id: ClerkJumpsuit + equipment: ClerkJumpsuit + +- type: startingGear + id: ClerkJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitClerk + +- type: loadout + id: ClerkJumpskirt + equipment: ClerkJumpskirt + +- type: startingGear + id: ClerkJumpskirt + equipment: + jumpsuit: ClothingUniformJumpskirtClerk + +# Neck +- type: loadout + id: BlackTie + equipment: BlackTie + +- type: startingGear + id: BlackTie + equipment: + neck: ClothingNeckTieBlack + +- type: loadout + id: BlueTie + equipment: BlueTie + +- type: startingGear + id: BlueTie + equipment: + neck: ClothingNeckTieBlue + +- type: loadout + id: BrownTie + equipment: BrownTie + +- type: startingGear + id: BrownTie + equipment: + neck: ClothingNeckTieBrown + +- type: loadout + id: GreenTie + equipment: GreenTie + +- type: startingGear + id: GreenTie + equipment: + neck: ClothingNeckTieGreen + +- type: loadout + id: RedTie + equipment: RedTie + +- type: startingGear + id: RedTie + equipment: + neck: ClothingNeckTieRed + +- type: loadout + id: WhiteTie + equipment: WhiteTie + +- type: startingGear + id: WhiteTie + equipment: + neck: ClothingNeckTieWhite + +# Outer Clothing +- type: loadout + id: ClerkVest + equipment: ClerkVest + +- type: startingGear + id: ClerkVest + equipment: + outerClothing: ClothingOuterClerkVest diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Justice/prosecutor.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Justice/prosecutor.yml new file mode 100644 index 00000000000..ab506996670 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Justice/prosecutor.yml @@ -0,0 +1,28 @@ +# Jumpsuit +- type: loadout + id: ProsecutorJumpsuit + equipment: ProsecutorJumpsuit + +- type: startingGear + id: ProsecutorJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitProsecutor + +- type: loadout + id: ProsecutorJumpskirt + equipment: ProsecutorJumpskirt + +- type: startingGear + id: ProsecutorJumpskirt + equipment: + jumpsuit: ClothingUniformJumpskirtProsecutor + +# Neck +- type: loadout + id: ProsecutorNeck + equipment: ProsecutorNeck + +- type: startingGear + id: ProsecutorNeck + equipment: + neck: ClothingNeckProsecutorbadge diff --git a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml index f679c51b079..775e743e3d1 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml @@ -68,42 +68,96 @@ ## Chief Justice - type: loadoutGroup id: ChiefJusticeHead - name: loadout-group-courier-head + name: loadout-group-chiefjustice-head minLimit: 0 loadouts: - - CourierHead - - MailCarrierHead + - CJToque - type: loadoutGroup id: ChiefJusticeJumpsuit - name: loadout-group-courier-jumpsuit + name: loadout-group-chiefjustice-jumpsuit loadouts: - - CourierJumpsuit - - CourierJumpskirt - - MailCarrierJumpsuit - - MailCarrierJumpskirt + - ChiefJusticeJumpsuit + - ChiefJusticeJumpskirt + - ChiefJusticeFormalJumpsuit + - ChiefJusticeWhiteJumpsuit - type: loadoutGroup id: ChiefJusticeNeck - name: loadout-group-courier-jumpsuit + name: loadout-group-chiefjustice-neck + minLimit: 0 loadouts: - - CourierJumpsuit - - CourierJumpskirt - - MailCarrierJumpsuit - - MailCarrierJumpskirt + - ChiefJusticeCloak - type: loadoutGroup - id: ChiefJusticeClothing - name: loadout-group-courier-outerclothing + id: ChiefJusticeOuterClothing + name: loadout-group-chiefjustice-outerclothing minLimit: 0 loadouts: - - CargoTechnicianWintercoat - - MailCarrierWintercoat + - ChiefJusticeRobe - type: loadoutGroup id: ChiefJusticeShoes - name: loadout-group-courier-shoes + name: loadout-group-chiefjustice-shoes loadouts: - - BlackShoes - - CargoWinterBoots - - RollerSkates + - LeatherShoes + - LaceupShoes + +## Clerk +- type: loadoutGroup + id: ClerkJumpsuit + name: loadout-group-clerk-jumpsuit + loadouts: + - ClerkJumpsuit + - ClerkJumpskirt + +- type: loadoutGroup + id: ClerkNeck + name: loadout-group-clerk-neck + minLimit: 0 + loadouts: + - BlackTie + - BlueTie + - BrownTie + - GreenTie + - RedTie + - WhiteTie + +- type: loadoutGroup + id: ClerkOuterClothing + name: loadout-group-clerk-outerclothing + minLimit: 0 + loadouts: + - ClerkVest + +- type: loadoutGroup + id: ClerkShoes + name: loadout-group-clerk-shoes + loadouts: + - LaceupShoes + - LeatherShoes + +## Prosecutor +- type: loadoutGroup + id: ProsecutorJumpsuit + name: loadout-group-prosecutor-jumpsuit + loadouts: + - ProsecutorJumpsuit + - ProsecutorJumpskirt + - LawyerJumpsuit + - LawyerJumpskirt + - LawyerJumpsuitBlue + - LawyerJumpskirtBlue + - LawyerJumpsuitPurple + - LawyerJumpskirtPurple + - LawyerJumpsuitRed + - LawyerJumpskirtRed + - LawyerJumpsuitGood + - LawyerJumpskirtGood + +- type: loadoutGroup + id: ProsecutorNeck + name: loadout-group-prosecutor-jumpsuit + minLimit: 0 + loadouts: + - ProsecutorNeck diff --git a/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml b/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml index bcb3bafc3e9..fa170034833 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml @@ -33,4 +33,21 @@ - CommonBackpack - ChiefJusticeShoes - Trinkets - + +- type: roleLoadout + id: JobClerk + groups: + - ClerkJumpsuit + - ClerkNeck + - ClerkOuterClothing + - CommonBackpack + - ClerkShoes + - Trinkets + +- type: roleLoadout + id: JobProsecutor + groups: + - ProsecutorJumpsuit + - ProsecutorNeck + - LawyerBackpack + - Trinkets diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml index 7c751d2fdb7..2715e63e391 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml @@ -43,17 +43,17 @@ - type: startingGear id: CJGear equipment: - jumpsuit: ClothingUniformJumpsuitChiefJustice - back: ClothingBackpackFilled # TODO- make Justice department bags - shoes: ClothingShoesLeather - head: ClothingHeadHatCJToque - outerClothing: ClothingOuterChiefJustice + #jumpsuit: ClothingUniformJumpsuitChiefJustice + #back: ClothingBackpackFilled # TODO- make Justice department bags + #shoes: ClothingShoesLeather + #head: ClothingHeadHatCJToque + #outerClothing: ClothingOuterChiefJustice id: ChiefJusticePDA ears: ClothingHeadsetAltJustice - gloves: ClothingHandsGlovesColorWhite + #gloves: ClothingHandsGlovesColorWhite # Todo - pocket1: Gavel - innerClothingSkirt: ClothingUniformJumpskirtChiefJustice - satchel: ClothingBackpackSatchelFilled # TODO- make Justice departmebt bags - duffelbag: ClothingBackpackDuffelFilled + #innerClothingSkirt: ClothingUniformJumpskirtChiefJustice + #satchel: ClothingBackpackSatchelFilled # TODO- make Justice departmebt bags + #duffelbag: ClothingBackpackDuffelFilled diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml index a8049067b6b..9374b5868ed 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml @@ -26,13 +26,13 @@ - type: startingGear id: ClerkGear equipment: - jumpsuit: ClothingUniformJumpsuitClerk - back: ClothingBackpackFilled - shoes: ClothingShoesBootsLaceup + #jumpsuit: ClothingUniformJumpsuitClerk + #back: ClothingBackpackFilled + #shoes: ClothingShoesBootsLaceup id: ClerkPDA ears: ClothingHeadsetJustice - innerClothingSkirt: ClothingUniformJumpskirtClerk - satchel: ClothingBackpackSatchelFilled - duffelbag: ClothingBackpackDuffelFilled + #innerClothingSkirt: ClothingUniformJumpskirtClerk + #satchel: ClothingBackpackSatchelFilled + #duffelbag: ClothingBackpackDuffelFilled diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml index 551992dec2a..1051e349214 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml @@ -18,17 +18,17 @@ - type: startingGear id: ProsecutorGear equipment: - jumpsuit: ClothingUniformJumpsuitProsecutor - neck: ClothingNeckProsecutorbadge - back: ClothingBackpackLawyerFilled + #jumpsuit: ClothingUniformJumpsuitProsecutor + #neck: ClothingNeckProsecutorbadge + #back: ClothingBackpackLawyerFilled shoes: ClothingShoesBootsLaceup id: ProsecutorPDA ears: ClothingHeadsetSecurity # TODO add copy of space law inhand: - BriefcaseBrownFilled - innerClothingSkirt: ClothingUniformJumpskirtProsecutor - satchel: ClothingBackpackSatchelFilled - duffelbag: ClothingBackpackDuffelFilled + #innerClothingSkirt: ClothingUniformJumpskirtProsecutor + #satchel: ClothingBackpackSatchelFilled + #duffelbag: ClothingBackpackDuffelFilled From e491c224fb85a73426831261d6bc31a8dc8286df Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Tue, 28 May 2024 22:54:05 -0400 Subject: [PATCH 85/94] Removed accessreader from windoors --- .../DeltaV/Entities/Structures/Doors/Windoors/windoor.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml index 1b13c686674..40689d2e54d 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml @@ -21,8 +21,6 @@ id: WindoorSecureParamedicLocked suffix: Paramedic, Locked components: - - type: AccessReader - access: [["Paramedic"]] - type: ContainerFill containers: board: [ DoorElectronicsParamedic ] @@ -32,8 +30,6 @@ id: WindoorSecureChiefJusticeLocked suffix: ChiefJustice, Locked components: - - type: AccessReader - access: [["ChiefJustice"]] - type: ContainerFill containers: board: [ DoorElectronicsChiefJustice ] @@ -43,8 +39,6 @@ id: WindoorSecureJusticeLocked suffix: Justice, Locked components: - - type: AccessReader - access: [["Justice"]] - type: ContainerFill containers: board: [ DoorElectronicsJustice ] @@ -54,8 +48,6 @@ id: WindoorSecureProsecutorLocked suffix: Prosecutor, Locked components: - - type: AccessReader - access: [["Prosecutor"]] - type: ContainerFill containers: board: [ DoorElectronicsProsecutor ] From e9496ff9c703da88e1c273654ec2acf7be6764b7 Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Tue, 28 May 2024 22:57:47 -0400 Subject: [PATCH 86/94] Added job spawner icons --- .../DeltaV/Entities/Markers/Spawners/jobs.yml | 12 ++++++------ .../DeltaV/Markers/jobs.rsi/chiefjustice.png | Bin 0 -> 1439 bytes .../Textures/DeltaV/Markers/jobs.rsi/clerk.png | Bin 0 -> 1031 bytes .../Textures/DeltaV/Markers/jobs.rsi/meta.json | 9 +++++++++ .../DeltaV/Markers/jobs.rsi/prosecutor.png | Bin 0 -> 836 bytes 5 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 Resources/Textures/DeltaV/Markers/jobs.rsi/chiefjustice.png create mode 100644 Resources/Textures/DeltaV/Markers/jobs.rsi/clerk.png create mode 100644 Resources/Textures/DeltaV/Markers/jobs.rsi/prosecutor.png diff --git a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml index de75e344151..bdf86f31966 100644 --- a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml @@ -24,8 +24,8 @@ layers: - state: green - state: lawyer - #- sprite: DeltaV/Markers/jobs.rsi - # state: chiefjustice + - sprite: DeltaV/Markers/jobs.rsi + state: chiefjustice - type: entity id: SpawnPointClerk @@ -38,8 +38,8 @@ layers: - state: green - state: lawyer - #- sprite: DeltaV/Markers/jobs.rsi - # state: clerk + - sprite: DeltaV/Markers/jobs.rsi + state: clerk - type: entity id: SpawnPointProsecutor @@ -52,8 +52,8 @@ layers: - state: green - state: lawyer - #- sprite: DeltaV/Markers/jobs.rsi - # state: prosecutor + - sprite: DeltaV/Markers/jobs.rsi + state: prosecutor - type: entity id: SpawnPointCourier diff --git a/Resources/Textures/DeltaV/Markers/jobs.rsi/chiefjustice.png b/Resources/Textures/DeltaV/Markers/jobs.rsi/chiefjustice.png new file mode 100644 index 0000000000000000000000000000000000000000..b69ced20cf5d952dc79731b22ecfc38e8e9bd2af GIT binary patch literal 1439 zcmV;Q1z`G#P)c1K#3Zhewzyy0$1kDtMijzJPL(8t@QI-$?wiw zzx0GN0`P>r%U@H6;!|QSi?CTOHY1jz#>F+m0V-D5+&DJ!v#HpooKmS7rZ;vU%dHOM z@rW{mDru={(bRZZ18gXILEX6P4P5&CB0;z?Lhaf3;U>EO0hdRwW*sl93A(tR0Yk93 zXbJs(Y9)wZb`V(ul*jY&_@0+>sr4ea8@!A+?%sr3N3USO7W#hyIy*bn*6oK;9`}l@ z2drZ#SA5zviSIhyg4){JtdcVA%;MGS*5Oq91^m)>E&-vHfW=>J-h!saI&}B+WCdXg zpnh2;E1~wQPf$}+gHqp0thD)!#e6d!z~I;X^K08qK-vDeVtq|p}oN^L`RbqhWpmk*Z* z`!XiDs6#=)av?6qWvneI6cB6^Hs0}PTVC9X^$Foq2gXsoM;jj>A6Zmm(LpZ(*lc!0 zXQBe)d0(*zS~<0Z{w5)|9}1x9U;$Y8xt&pb+aTfH@0?=JzXm8NUZsYkVb}?Pr6N<4 z;(C=c7ak7-ByDHS7!IGyLCcm&ynQB)oFyI_R0V*?<-zb@e=L~jyaO!WcJe5SXrT=a z1%%Sp`bM}ME)g`{dRy(N+9eA>uGZO(cHy#Og&#p$pv_JDFnnizh&cc(zIl2zUh3G2 zXF@wLvHE)vj00`kwnK=dLwx;CTr0UERaOeDu9JneN`*A^;XL20MQIaAH_LngHkbofP{>Kkb<5?N|^%7pZXOz}x%^LdSa0 zuJ*zq0QlQC`%U0Gg#a2XRq*azhfv$E=$oE2K3E*DUs?n}&%Qz_LZ3aD9v|H^H$?WC zD!^5!c9a=MGcAx6BCa(!2g0a8N%2!uexGpcwFgioYkNIUV!KKJ{7RYy;5i(NO^=rW zKMHB0g_L$6wZ_5&pr!`;Z=Sn7Thc1ePt-hYSHj_ctGpLLmYOV{&qm zS`e|g-EK7}Cx-w$NcAxbVG4jn>{6cSS1fkVsJIRw(HNW4sr`?r!_Df~0yqBvU*H9O5D^7Uv}vo2293$4ag%mEXX3 zSKhvf*@mzLVDY8PqGIA!Y&`&t0Je9v6HsZ7c>9_lI;_KC8-Q(Q zfJc3I;r00OB|VHS9WA)i(~r4XmmDwwmchb0r0+G95v9gqYtGJ1b%NpfAT;&(0{c} zY|Ta8fRW7-z|pE2mH_hb$xzL=?zt)IopYd+go6kM8aUrX5^{O=Uu*%N6?|7H9ZuCR zE0$%*VPG+yD7tu+xzI?HXc#G~fFW%TBKlWR37iWb-2uejy--T;D3+_|c`X6TCk}mK z0RGJosnCM*quI#;43Ica7kl^I(VUJ3Gk|aAED`^_p2MiFqh8Zcr+EcT_Ip}5Pzi1I z-O=C@K%gw17LE?8koh$#nXCID?Z0i*-G(t=??I-t7UU}vV>0S2h0`(Kgne-i;@ z|CHtc$GbAAqyrQCtP-#Cx$PuuYHIo|?t-po#2m?FQVE4ZqFcJGfh=PcqAXpE3uq7zegMuEsdgwusAd*9h z9u$ff#fxIR73&9r&}u=`U>h+d(k5wIsT%V}-m*qbX7*qaoXak=v-AJGH}7NDf@L0- zW!A^P3(&p>W%l0NPv#9V&=SOe#!t0u`EG&#-{|^1ON>ch`IpmcCwyFRy&AbFet2FwfGDUcL*PE4r2V) zI~_pwIHUkboUEG2=h54_LEN`r>=Rln127it2;VzKhE-s5;N`V^5!6BmO8k95umD{-qzs3L@0}f{k4lMu- z(A<&MdxcDgtP8+(-{=9dbfoDUt_6ZPnHooUVTJIF?t#j;f^2`Nn}+=5LmwOzgcNKf z#zlvV6N%HHAT++C7mq*O)CDlUS6vYaf-0k#3dsAK0w7TeL`pkKOFDlueSjd800t@z zsoPK$jkQ6g`Wd~d1W;WW{{#GW4{#dt88U$JOlhuO>Y0jxKp>$13C+*Xi#@X0ti|K; zhTF O0000 Date: Tue, 28 May 2024 23:25:42 -0400 Subject: [PATCH 87/94] Fixed spawner sprite layering --- .../Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml index bdf86f31966..61f2497ad83 100644 --- a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml @@ -22,10 +22,9 @@ job_id: ChiefJustice - type: Sprite layers: - - state: green - - state: lawyer - - sprite: DeltaV/Markers/jobs.rsi - state: chiefjustice + - state: green + - sprite: DeltaV/Markers/jobs.rsi + state: chiefjustice - type: entity id: SpawnPointClerk @@ -37,7 +36,6 @@ - type: Sprite layers: - state: green - - state: lawyer - sprite: DeltaV/Markers/jobs.rsi state: clerk @@ -51,7 +49,6 @@ - type: Sprite layers: - state: green - - state: lawyer - sprite: DeltaV/Markers/jobs.rsi state: prosecutor From 503e4a87ef3166aed799493a7f4745d3d4bbb105 Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Wed, 29 May 2024 00:41:08 -0400 Subject: [PATCH 88/94] Added missing parent in ID cards --- .../DeltaV/Entities/Objects/Misc/identification_cards.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml index 9131a7b7877..1d1f1bad178 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml @@ -38,6 +38,7 @@ state: idprosecutor - type: entity + parent: IDCardStandard id: CourierIDCard name: courier ID card components: From 6a31d034cfef81aac1a757c88df1a7cb5d0ac67d Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Sat, 1 Jun 2024 18:24:26 -0400 Subject: [PATCH 89/94] Removed redundant laceup shoes loadout Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> --- .../DeltaV/Loadouts/Jobs/Justice/chiefjustice.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Justice/chiefjustice.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Justice/chiefjustice.yml index 3ebcb2a5d17..db7c2e6ddbc 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Justice/chiefjustice.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Justice/chiefjustice.yml @@ -74,12 +74,3 @@ id: LeatherShoes equipment: shoes: ClothingShoesLeather - -- type: loadout - id: LaceupShoes - equipment: LaceupShoes - -- type: startingGear - id: LaceupShoes - equipment: - shoes: ClothingShoesBootsLaceup From e2a5a41cf4e21f5e689ea20c88f7b261c37e5318 Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Wed, 5 Jun 2024 17:36:06 -0400 Subject: [PATCH 90/94] Added lawyer windoor, fixed spawner names, fixed locker names --- .../DeltaV/Catalog/Fills/Lockers/chiefjustice.yml | 5 +++-- .../Prototypes/DeltaV/Catalog/Fills/Lockers/clerk.yml | 2 +- .../Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml | 2 +- .../Entities/Structures/Doors/Windoors/windoor.yml | 9 +++++++++ 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/chiefjustice.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/chiefjustice.yml index 9194c05ac01..0f7eb99d45d 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/chiefjustice.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/chiefjustice.yml @@ -1,7 +1,7 @@ - type: entity parent: LockerChiefJustice id: LockerChiefJusticeFilled - name: chief justice's locker + suffix: Filled components: - type: StorageFill contents: @@ -17,4 +17,5 @@ - id: DoorRemoteJustice - id: Gavel - id: RubberStampChiefJustice - + - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! + prob: 0.3 diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/clerk.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/clerk.yml index fa4706c9605..9e48c28c706 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/clerk.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/clerk.yml @@ -1,7 +1,7 @@ - type: entity parent: LockerClerk id: LockerClerkFilled - name: clerk's locker + suffix: Filled components: - type: StorageFill contents: diff --git a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml index 61f2497ad83..512be9814ae 100644 --- a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml @@ -16,7 +16,7 @@ - type: entity id: SpawnPointChiefJustice parent: SpawnPointJobBase - name: chief justice + name: chiefjustice components: - type: SpawnPoint job_id: ChiefJustice diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml index 40689d2e54d..52d3b40192e 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml @@ -51,3 +51,12 @@ - type: ContainerFill containers: board: [ DoorElectronicsProsecutor ] + +- type: entity + parent: WindoorSecure + id: WindoorSecureLawyerLocked + suffix: Lawyer, Locked + components: + - type: ContainerFill + containers: + board: [ DoorElectronicsLawyer ] From 375098decb567c2d77dcd6054a7a33eddef9069b Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Wed, 5 Jun 2024 17:44:21 -0400 Subject: [PATCH 91/94] Added station beacons --- .../deltav/navmap-beacons/station-beacons.ftl | 4 +++ .../Objects/Devices/station_beacon.yml | 26 +++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/Resources/Locale/en-US/deltav/navmap-beacons/station-beacons.ftl b/Resources/Locale/en-US/deltav/navmap-beacons/station-beacons.ftl index 7b2d06a04e7..8d2571920ff 100644 --- a/Resources/Locale/en-US/deltav/navmap-beacons/station-beacons.ftl +++ b/Resources/Locale/en-US/deltav/navmap-beacons/station-beacons.ftl @@ -30,3 +30,7 @@ station-beacon-boxing-ring = Boxing station-beacon-park = Park station-beacon-corpsman = Corpsman + +station-beacon-justice = Justice +station-beacon-chiefjustice = Chief Justice +station-beacon-prosecutor = Prosecutor diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml index 2e38df5a82c..fc44704d57d 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml @@ -134,3 +134,29 @@ components: - type: NavMapBeacon defaultText: station-beacon-corpsman + +#Justice +- type: entity + parent: DefaultStationBeacon + id: DefaultStationBeaconJustice + suffix: Justice + components: + - type: NavMapBeacon + defaultText: station-beacon-justice + color: "#6b2833" + +- type: entity + parent: DefaultStationBeaconJustice + id: DefaultStationBeaconChiefJustice + suffix: Chief Justice + components: + - type: NavMapBeacon + defaultText: station-beacon-chiefjustice + +- type: entity + parent: DefaultStationBeaconJustice + id: DefaultStationBeaconProsecutor + suffix: Prosecutor + components: + - type: NavMapBeacon + defaultText: station-beacon-prosecutor From fba69331d5247c855a0a7b03440ebda205d87a5e Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:07:03 -0400 Subject: [PATCH 92/94] Softened justice dept palette Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> --- Resources/Prototypes/Palettes/departmental.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Palettes/departmental.yml b/Resources/Prototypes/Palettes/departmental.yml index 35f3ce83960..ab8ac25a4ad 100644 --- a/Resources/Prototypes/Palettes/departmental.yml +++ b/Resources/Prototypes/Palettes/departmental.yml @@ -10,7 +10,7 @@ bar: "#79150096" epistemics: "#D381C996" # DeltaV - Epistemics Department replacing Science logistics: "#A4610696" # DeltaV - Logistics Department replacing Cargo - justice: "#6b2833" #DeltaV - Added Justice Department + justice: "#6b2833DD" #DeltaV - Added Justice Department janitor: "#8c347f96" chemistry: "#fa750096" virology: "#43990996" From 5913cc83b00d4f0fef44994a48fefd1a260b8c8d Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Thu, 6 Jun 2024 21:28:45 -0400 Subject: [PATCH 93/94] Added justice key to telecomms --- Resources/Prototypes/Entities/Structures/Machines/telecomms.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml b/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml index 5bdefb8bfc5..a5bfbe30fc9 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml @@ -80,6 +80,7 @@ - EncryptionKeySecurity - EncryptionKeyService - EncryptionKeyCommand + - EncryptionKeyJustice - type: entity parent: TelecomServer @@ -140,6 +141,7 @@ containers: key_slots: - EncryptionKeySecurity + - EncryptionKeyJustice - type: entity parent: TelecomServer From b54a39ad27eb66622b9320de744bf4a825305490 Mon Sep 17 00:00:00 2001 From: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Date: Thu, 6 Jun 2024 21:31:02 -0400 Subject: [PATCH 94/94] Added deltaV comments to telecomms --- .../Prototypes/Entities/Structures/Machines/telecomms.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml b/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml index a5bfbe30fc9..13fdb7e80d4 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml @@ -80,7 +80,7 @@ - EncryptionKeySecurity - EncryptionKeyService - EncryptionKeyCommand - - EncryptionKeyJustice + - EncryptionKeyJustice #DeltaV - Justice dept - type: entity parent: TelecomServer @@ -141,7 +141,7 @@ containers: key_slots: - EncryptionKeySecurity - - EncryptionKeyJustice + - EncryptionKeyJustice #DeltaV - Justice dept - type: entity parent: TelecomServer