From ac7cd64a12eff261c027a26b46ac5f8fe48caf52 Mon Sep 17 00:00:00 2001 From: Noctis Date: Wed, 15 May 2024 19:10:13 +0100 Subject: [PATCH 01/17] file move --- .../en-US/deltav/job/job-description.ftl | 2 +- .../Locale/en-US/deltav/job/job-names.ftl | 2 +- .../en-US/deltav/job/job-supervisors.ftl | 1 + .../en-US/deltav/paper/stamp-component.ftl | 1 + .../Fills/Backpacks/StarterGear/backpack.yml | 11 +++ .../Fills/Backpacks/StarterGear/duffelbag.yml | 11 +++ .../Fills/Backpacks/StarterGear/satchel.yml | 11 +++ .../Entities/Clothing/Ears/headset_alt.yml | 14 +++ .../Entities/Clothing/Uniforms/jumpskirts.yml | 11 +++ .../Entities/Clothing/Uniforms/jumpsuits.yml | 13 ++- .../DeltaV/Entities/Markers/Spawners/jobs.yml | 12 +-- .../DeltaV/Entities/Objects/Devices/pda.yml | 21 +++-- .../Objects/Misc/identification_cards.yml | 12 +-- .../Entities/Objects/Misc/rubber_stamp.yml | 14 +++ .../Roles/Jobs/Command/admin_assistant.yml | 84 ++++++++++++++++++ .../DeltaV/Roles/play_time_trackers.yml | 2 +- .../Prototypes/DeltaV/StatusEffects/job.yml | 7 ++ .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 20878 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 1462 bytes .../Jumpskirt/admin_assistant.rsi/icon.png | Bin 0 -> 486 bytes .../admin_assistant.rsi/inhand-left.png | Bin 0 -> 432 bytes .../admin_assistant.rsi/inhand-right.png | Bin 0 -> 438 bytes .../Jumpskirt/admin_assistant.rsi/meta.json | 30 +++++++ .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 20878 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 1461 bytes .../Jumpsuit/admin_assistant.rsi/icon.png | Bin 0 -> 486 bytes .../admin_assistant.rsi/inhand-left.png | Bin 0 -> 432 bytes .../admin_assistant.rsi/inhand-right.png | Bin 0 -> 438 bytes .../Jumpsuit/admin_assistant.rsi/meta.json | 30 +++++++ .../Misc/job_icons.rsi/AdminAssistant.png | Bin 0 -> 213 bytes .../Interface/Misc/job_icons.rsi/meta.json | 5 +- .../DeltaV/Objects/Devices/pda.rsi/meta.json | 5 +- .../Devices/pda.rsi/pda-admin-assistant.png | Bin 0 -> 611 bytes .../DeltaV/Objects/Misc/idadminassistant.png | Bin 0 -> 301 bytes .../Textures/DeltaV/Objects/Misc/meta.json | 36 ++++++++ .../Markers/jobs.rsi/adminassistant.png | Bin 0 -> 1003 bytes Resources/Textures/Markers/jobs.rsi/meta.json | 5 +- .../Objects/Misc/bureaucracy.rsi/meta.json | 4 +- .../paper_stamp-admin-assistant.png | Bin 0 -> 227 bytes 39 files changed, 316 insertions(+), 28 deletions(-) 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/Clothing/Ears/headset_alt.yml create mode 100644 Resources/Prototypes/DeltaV/Roles/Jobs/Command/admin_assistant.yml create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/AdminAssistant.png create mode 100644 Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-admin-assistant.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/idadminassistant.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/meta.json create mode 100644 Resources/Textures/Markers/jobs.rsi/adminassistant.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-admin-assistant.png diff --git a/Resources/Locale/en-US/deltav/job/job-description.ftl b/Resources/Locale/en-US/deltav/job/job-description.ftl index e04acbefecf..1193f02ca40 100644 --- a/Resources/Locale/en-US/deltav/job/job-description.ftl +++ b/Resources/Locale/en-US/deltav/job/job-description.ftl @@ -1,2 +1,2 @@ job-description-medical-borg = Half-human, Half-machine. Follow your laws, serve the crew, and assist the medical department. -job-description-courier = Deliver mail and other packages from and to logistics. Avoid dogs. +job-description-admin-assistant = Assist command in their day-to-day activities, grab the captain a coffee, answer faxes in the bridge. \ No newline at end of file diff --git a/Resources/Locale/en-US/deltav/job/job-names.ftl b/Resources/Locale/en-US/deltav/job/job-names.ftl index 0b707a82fa2..097e1905e67 100644 --- a/Resources/Locale/en-US/deltav/job/job-names.ftl +++ b/Resources/Locale/en-US/deltav/job/job-names.ftl @@ -1,2 +1,2 @@ job-name-medical-borg = Medical Cyborg -job-name-courier = Courier +job-name-admin-assistant = Administrative Assistant \ No newline at end of file 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..ccb280daa8a --- /dev/null +++ b/Resources/Locale/en-US/deltav/job/job-supervisors.ftl @@ -0,0 +1 @@ +job-supervisors-command = all command officials \ No newline at end of file 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..7cc779b46dd --- /dev/null +++ b/Resources/Locale/en-US/deltav/paper/stamp-component.ftl @@ -0,0 +1 @@ +stamp-component-stamped-name-admin-assistant = Administrative Assistant \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml index 93538d6f725..f2befde6135 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -32,3 +32,14 @@ contents: - id: BoxSurvivalMedical - id: RubberStampPsychologist + +- type: entity + noSpawn: true + parent: ClothingBackpackCaptain + id: ClothingBackpackAdminAssistantFilled + components: + - type: StorageFill + contents: + - id: BoxSurvival + - id: Flash + - id: RubberStampAdminAssistant diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index fbd4d7d934d..deb2f8318b6 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -19,3 +19,14 @@ contents: - id: BoxSurvivalMedical - id: RubberStampPsychologist + +- type: entity + noSpawn: true + parent: ClothingBackpackDuffelCaptain + id: ClothingBackpackDuffelAdminAssistantFilled + components: + - type: StorageFill + contents: + - id: BoxSurvival + - id: Flash + - id: RubberStampAdminAssistant diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml index ced9275d7f5..3b5c6c47926 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -19,3 +19,14 @@ contents: - id: BoxSurvivalMedical - id: RubberStampPsychologist + +- type: entity + noSpawn: true + parent: ClothingBackpackSatchelCaptain + id: ClothingBackpackSatchelAdminAssistantFilled + components: + - type: StorageFill + contents: + - id: BoxSurvival + - id: Flash + - id: RubberStampAdminAssistant diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headset_alt.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headset_alt.yml new file mode 100644 index 00000000000..e1cb83c1970 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headset_alt.yml @@ -0,0 +1,14 @@ +- type: entity + parent: ClothingHeadsetAlt + id: ClothingHeadsetAltAdminAssistant + name: administrative assistant over-ear headset + components: + - type: ContainerFill + containers: + key_slots: + - EncryptionKeyCommand + - EncryptionKeyCommon + - type: Sprite + sprite: Clothing/Ears/Headsets/command.rsi + - type: Clothing + sprite: Clothing/Ears/Headsets/command.rsi \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml index 4c027637645..0b09df5aadd 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml @@ -93,3 +93,14 @@ sprite: DeltaV/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpskirtAdminAssistant + name: administrative assistant's jumpskirt + description: A suit worn by the Administrative Assistant. Smells of burnt coffee. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml index f3fdeabd107..e4f93873f3e 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml @@ -253,4 +253,15 @@ - type: Sprite sprite: DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi \ No newline at end of file + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitAdminAssistant + name: administrative assistant's jumpsuit + description: A suit worn by the Administrative Assistant. Smells of burnt coffee. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi diff --git a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml index a25bae98b17..3853e8c8efb 100644 --- a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml @@ -1,3 +1,4 @@ + - type: entity id: SpawnPointMedicalBorg parent: SpawnPointJobBase @@ -14,14 +15,13 @@ state: medical_e - type: entity - id: SpawnPointCourier + id: SpawnPointAdminAssistant parent: SpawnPointJobBase - name: courier + name: administrative assistant components: - type: SpawnPoint - job_id: Courier + job_id: AdministrativeAssistant - type: Sprite layers: - - state: green - - sprite: DeltaV/Markers/jobs.rsi - state: courier + - state: green + - state: adminassistant diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml index 5ed9c7eed62..beab4db4e35 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml @@ -55,9 +55,9 @@ - type: entity parent: BasePDA - id: CourierPDA - name: courier PDA - description: Smells like unopened letters. + id: AdminAssistantPDA + name: administrative assistant PDA + description: Theres pen scribbles all over the edges, and a few sticky notes stuck on it. components: - type: Sprite sprite: DeltaV/Objects/Devices/pda.rsi @@ -72,11 +72,16 @@ shader: "unshaded" visible: false - type: Pda - id: CourierIDCard - state: pda-mailcarrier + id: AdminAssistantIDCard + state: pda-admin-assistant + penSlot: + startingItem: PenCap + priority: -1 + whitelist: + tags: + - Write - type: PdaBorderColor - borderColor: "#e39751" - accentVColor: "#050c4d" + borderColor: "#aa9100" - type: Icon sprite: DeltaV/Objects/Devices/pda.rsi - state: pda-mailcarrier + state: pda-admin-assistant diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml index 33c6f52983e..c49a9845fb6 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml @@ -1,12 +1,14 @@ - type: entity parent: IDCardStandard - id: CourierIDCard - name: courier ID card + id: AdminAssistantIDCard + name: administrative assistant ID card components: - type: Sprite layers: - - state: default + - state: silver - sprite: DeltaV/Objects/Misc/id_cards.rsi - state: nyanomailcarrier + state: idadminassistant + - type: Item + heldPrefix: silver - type: PresetIdCard - job: Courier + job: AdministrativeAssistant diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml index 6c03128209c..81c76b2e8bb 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml @@ -11,3 +11,17 @@ - type: Sprite sprite: DeltaV/Objects/Misc/stamps.rsi state: stamp-psychologist + +- type: entity + name: administrative assistant rubber stamp + parent: RubberStampBase + id: RubberStampAdminAssistant + suffix: DO NOT MAP + components: + - type: Stamp + stampedName: stamp-component-stamped-name-admin-assistant + stampedColor: "#4191f2" + stampState: "paper_stamp-admin-assistant" + - type: Sprite + sprite: DeltaV/Objects/Misc/stamps.rsi + state: stamp-admin-assistant diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Command/admin_assistant.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Command/admin_assistant.yml new file mode 100644 index 00000000000..90046752648 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Command/admin_assistant.yml @@ -0,0 +1,84 @@ +- type: job + id: AdministrativeAssistant + name: job-name-admin-assistant + description: job-name-admin-assistant + playTimeTracker: JobAdminAssistant + requirements: + - !type:DepartmentTimeRequirement + department: Logistics + time: 18000 # 5 hours + - !type:DepartmentTimeRequirement + department: Engineering + time: 18000 # 5 hours + - !type:DepartmentTimeRequirement + department: Medical + time: 18000 # 5 hours + - !type:DepartmentTimeRequirement + department: Security + time: 18000 # 5 hours + - !type:DepartmentTimeRequirement + department: Epistemics + time: 18000 # 5 hours + - !type:DepartmentTimeRequirement + department: Command + time: 108000 # 30 hours + - !type:OverallPlaytimeRequirement + time: 108000 # 30 hours + - !type:WhitelistRequirement + setPreference: true + requireAdminNotify: true + weight: 20 + startingGear: AdminAssistantGear + icon: "JobIconAdminAssitant" + supervisors: job-supervisors-command + canBeAntag: false + access: + - Command + - Bar + - Service + - Maintenance + - Janitor + - Theatre + - Kitchen + - Chapel + - Hydroponics + - External + - Cryogenics + - Chemistry + - Engineering + - Research + - Detective + - Salvage + - Security + - Brig + - Lawyer + - Cargo + - Atmospherics + - Medical + - Boxer + - Clown + - Library + - Mime + - Musician + - Reporter + - Zookeeper + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant ] + - !type:AddComponentSpecial + components: + - type: CommandStaff + +- type: startingGear + id: AdminAssistantGear + equipment: + jumpsuit: ClothingUniformJumpsuitAdminAssistant + back: ClothingBackpackAdminAssistantFilled + shoes: ClothingShoesBootsLaceup + belt: BoxFolderClipboard + id: AdminAssistantPDA + ears: ClothingHeadsetAltAdminAssistant + inhand: + - BriefcaseBrownFilled + satchel: ClothingBackpackSatchelAdminAssistantFilled + duffelbag: ClothingBackpackDuffelAdminAssistantFilled \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml b/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml index 4ab6f3eed45..b6935e2c254 100644 --- a/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml @@ -5,4 +5,4 @@ id: JobMedicalBorg - type: playTimeTracker - id: JobCourier + id: JobAdminAssistant \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/StatusEffects/job.yml b/Resources/Prototypes/DeltaV/StatusEffects/job.yml index 949ac6a99e3..09b0ea94601 100644 --- a/Resources/Prototypes/DeltaV/StatusEffects/job.yml +++ b/Resources/Prototypes/DeltaV/StatusEffects/job.yml @@ -4,3 +4,10 @@ icon: sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi state: MedicalBorg + +- type: statusIcon + parent: JobIcon + id: JobIconAdminAssitant + icon: + sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi + state: AdminAssistant diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000000000000000000000000000000000..59791ed5fad789d6fbf80d06a23fb7b2c056e6b5 GIT binary patch literal 20878 zcmeI43s_WD9>6cAu0ooXwn%0pX^W4`+~?efFrt7#I*JAxxMkcY%sR}BGlL9RE@`Ef zK&y#bnq`@3S(Ik2A!2@Mt!|mFnfB6Ld}UIpxr&cH^Ek|aL*3A}ZNJO+F@HGs|NozJ ze*bg+=W)MpW@nALqg!-bG=d=AGBeV~1DWFc?a~>1uCh-40*J28j664j#N6onjY6JW z9E%{MyIHeyJ-L?AyyPfK6l8~}BzlXSKpR1lhIyTWG)eIoM5VxLPmXVVdt8B!fC#Xu*TPzf_J28K(-X@;SgAqE1&X(L7&Nem@Op2B#FFa&?% z&C%emB$ur6VN9c@(E{J71EK};-`=DH)cx2Py$)oxGv z6o4RzG@_+DyVR)|$183}u}f0Yr+}{97OD4c&v+#i9SyF4dPGMatJ;Pi-;*{WC|+wD zX1*r@Gyj+hggOa8<5OLV;BmOJ9S)m0FkG`>EDWis{^4mzxZ7%%9VPC8NygSDp@9?f zrlbiT#Y|veEaDi75!pD+lQfSrgE5@PurMb9%~n1v4%w=fLLVfGQ7FM>6TlSA4*Eb*$tRU~-K)*_)mF*@x9NyboNm}c|vu9Wr?6l!n+O6-hCoGO&MvEHtjh{EPl7E> z$JZAhTSk&tNup&`WmFoKNs2~A3ILW^kbQ8HQaDC{RYY)eSydTUUveyMnXCNC@h)X@ z%hFJC^lx*Vg3GP=7V+eGxQaLLivsyBnDzXd0bY=N8zi&jTN)KGmRgjCn$>KX6i~2U z9!_ltE;Dbtj*>#f{$opPz?EOCZ6|Jr>M0Ri%J2fP=xAB>172I2wRRtQmRyxUxP>WK z76ww{Op3sAC_#g{&6p?*WhI$LO(2)hlu5)HnSo&ri(>08`Z^N^80>Js?gaPkaC}>L zY65ieYv2#HO)3=Z1&VAo!sft&*4_DEju^|Z7)h!GDiR!pG8hGxX&Gz?SOt?9QdA{Q zRbl_y5iv3w!+2lNa6M?A=6vU{Pf=VyC*y&s=2$7&Wxqxz)u?{X(Hk7a=<4-L=kwJY)wmIX%O2T}!uILwB@2_4u{q6Mmif1N82{evz;DUw~B~+!s z%oHUF9BEAyBXTq)fGZXl)}On_(PySVm%@*$oKv-((%ZKXM!fC(Kgg+p?9=k34p0A= zpX}i^MqryZ(zm(v-AID$_7ewr5NU9$&WFtxc(tN+A#7#dB8vvS%fSoVHg8w7T{Q-p z8s;ogU5+cgUBeF?y&omB;QL19^BA?+XDY~-VE+CFDnc4=6{y!yJ@i% z`)^Vh0s}ur-1iwY4S(F)H1Eev!ymUc4O!;ctsXNGtgTgXn3eC%NZ{K3F7P%`F`HS+v1SuPUAmuX<1 zH+_>(og zPbJOq@D<;DQ-tKNS+l0H)39N~u0t|b?Ao%SuFj04P;s>3lW0R+#XAkIkG5|g-7s_5 zrOv0eUe{~AH_1MfpvyZ^l!f9Bja$}-~x>yZm<3K#F0ysvt{ zlJ`pC(X#K?H8oyq=v#I3>ZM~=^y|{0`CLakzaLv>7%btJD%*+u=>@_RU@D4b>R}f;qzUFlT8;I?iii? z)Xekrv-dQfXo#+M&_Fed#{wX$gbxzf@{5M)&U8$e$^K7Qjze|l_L!j{*bnAowr zy1M$s^ApDPe9k^-{?4yAu1R=QynpPV`6C9+UsZG8y{C9p-1*p1YgS3ZO^^Mxe`evN zN#u#8ix(T_y$|SiM$Vn9A2YC1)y0d`=JxMuv0O3=iHV7izc2TgofeDaF6wL`tGkzmqj5>O-+r;A4--y zux7^oiglYC2Rny;!{iP4V&A@K%PwbWsg=c8w#)Dy&a$#&2|Zuk6EnO=){vVf9cLIO zbr-emhqE_6`{^O)Yq@KmfAftPr2gnpYsHE0zyJQu4WGLvPZsVhNViil_rJIE@x1b? zDF0~tY>IU~TFIZjJ*Ke(9De2LT^}C7T>R)@>h;^+-jtQ_&}U!o>A!X@m?}eu=COS` z_nj6~`|l6FD@LU4HNCpeob2^xAkQpWa$w#oiR)@>ZAJgcZ&+EgEMegfXJ5RhXL>)T z!}F^KWp?4B%V!z-bd)!t8jKHlg zEvb5LlM9+8QmTtK#J6c$jO^<|v!^|B~;1AE#-E%+Lw`^jjt9#18hDm*P%y9hk zm}O?x=LnKp{HE>5#FU(zKDXXFH12#3`sI%0-`3Y7m6esp9+<^-N;z}#;)SM^C1-l@ zJpak2O%E<#jvc%dckol8d-*l{5f<@_6EB`;kknlHbGpZM^&n*;ndxKFUKx=;{XYb( BxkLZ} literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..ff304f00fd325f955637f40e7d26e0b18fdce658 GIT binary patch literal 1462 zcmV;n1xfmeP)HLssVqLC4vZx zwr3A6L`aSvgw4Tt@X$m40A+<-0y&i2al9RyB*XG- zHjDqp>%HuD1TQ23WWkfp%4m%g5iBhlHhi`g}=uOqc{^26NYv5sNl*`c zLL&P36lhI6b|INek}S(j$&MYeEF1EhB|(=_LtCMn5Yh1PF#LW$d_Er*78Y=Pe2hw^ zf^xZx>+5U4WX#Mbm&iLX@AUZQTC`^(5>(|Ng_`i|5bYiN?4Otmc38FGTtVI4!_wa2voo*6hj& zcJXr=AR5$a6YS)F^h2QQJb*p_d7h`AB3v$)srE8?4RBh3)94%Ev;e2k zH^6BDPNOFS;_*1eVzEzVdKinvC?1dZq(^uv9FNDTTq?o+^eF(q=ksA_XUFyBcRx_! zm!E7~6VQWk?e6YUrBVR^+}7*xkB(w*Z%@;}GZp4q8DiJbXp~-WY&0!NN25_nBod@3 z3Qex8li5nleUHhNby5_C5{U#wqtPZUuQxVWnWo>8<#7hD*NeA@hX8=n(^JG^F+?H} zgu`KMZ*N0YRgrK#K~+_3Z*LT!Uawaup72Z2QmKT|(NSbF z84L{#VQOmXPMD(L*FV#u;e;Vc5>{Wm!pzJJ0AOfn2$@UcNr0JF2RxVgCja5ofKFX*&k!b<2lSl7R~xj{Oe#>vTv z@DS+fF&GMk005~}3XMiXD}SgSz|d$kkV>VRGzmlGDUe7c+Om8;pQp>qOCq8NdkPQ{ zU0z;NKA&&n(`z(q9}#sQ0xSrd54?HvrmfD>(vr4cV0B@kslL@9BCLKhj`{g{ZBN40 z)m2lSMx!D0Dvx^z1Ofp%Iy!1ApPrt^$jAsJNkT4{;|-}IbXxkJy7z|SD9ss?D<>lqJ`)1%;9S#PAq+gZ>pzX+D zJ2n6`EmK>)M9%gIh-f%FJ2Tbrzu6xEi0={LY8$Tsts;zISHoMutHCk@zWw^E)*_>& zC)+kgbU;@Pzy1CPSCIY-5vK(>jlKa+3ve33{|38&B_+F)p{08d9(@n^7rZE9p@b+( QzW@LL07*qoM6N<$g4#c@P)5Ew)%ZxkT@9=^p|~UYhsIOI~@5i119kJk@&*Py^He zH2{EDlSPa%06-K){iPw+n-0^d@72fh=_=^)}*zj z-f&#@FYPu_uzrM6N^s7>IfqiJ>`N){3cy2I;5g1Bp93(=g86*T08kJFm3gHU@;nFU zyqud(r-jW}5ZG)s#@Ap4&}y}CI-PE= zYcv|z@Ap;!R)0bO@I0@4`B|31b=`8D=eg~6<`Dp{-+}M@NYk{k*5>ra0RO3{*8?>` c4NwDo1MX!yx5$cKQ2+n{07*qoM6N<$f@_G?UjP6A literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..15c30a0491469a4dc719bc4bd8471213c33ecce5 GIT binary patch literal 432 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0}1^9%xW@Tl~oH?_wu<-x?{|62nxPSltj~_plELn2&=utH_wcg%dCMG5+ zDJgSv^V-^4V`F0{CnuoR`R^om11X`BAirRsMpVG?X#aj8pe$#BM`SSr1K(i~W;~w1 zA_XY;)YHW=B*Oje)YE*;20Sbak8Rl#_36L;?HLl96TdfH^`2mJIO;WD{7SaD=ie9F@3%Sfx_wI4KD~47MhuL+bA*DG6*}A0f_<(C_8##Gshw-w zdCbb1u}S@6_ooQ%oH8aMOa1ww?-%$u3O>KQZe!EE74ux!`PI1_ulPY zCQK7F9X{MFuasguA@U(Q*fE@Sis*&CJ2)IUS_E1gcFa9sw%wm$)@{uVXWt4Pcy{fl z(1x9*``9uv=QC{C;?EFuOLK$nTag>n%I-DhW-dQaRPE>$zr%v1DL}sM0?@+@p00i_ I>zopr0Q`uwBLDyZ literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..53512e6969e83d3e779142d0c1aac269221eb24c GIT binary patch literal 438 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0}1^9%xW@Tl~oH?_wu<-x?|M&0TKXBl{j~_plELn2&=utH_wcg%dCMG5+ zDJgSv^V-^4V`F0{Cnum*m58V#KuV}2$S)YE5fv~z+P_~2D9c&k5n0T@z;_sg8IR|$ zNC67I_H=O!iEw{A^(J4l0T0VUvn?^YKmX6qozrZgAiBGD;Usqrwk?u^aoY;*lbD1B z)C?F4B^@Q!p1HOqk@tJ$v2yc?3p4Xgip)3}<{svAVS1r4XLF(nLj#8`2anzDV2kw0 z5BNSX?Dt|RHCy|I_g>|`{}awK?-f=3{r#pz`^EWOg))aOr|IMOcsD(9bgd@|HxUB?~bVPDv~v$b{|VD0MCo3druBFPwq^%-p3Afd~% zy6z&_i@nuimv!2__nCZ)s&TzP$5$J6OPgg&ebxsLQ E0M|vYr2qf` literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi/meta.json new file mode 100644 index 00000000000..29605f8216a --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/admin_assistant.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14, tie changed by noctyrnal (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000000000000000000000000000000000..59791ed5fad789d6fbf80d06a23fb7b2c056e6b5 GIT binary patch literal 20878 zcmeI43s_WD9>6cAu0ooXwn%0pX^W4`+~?efFrt7#I*JAxxMkcY%sR}BGlL9RE@`Ef zK&y#bnq`@3S(Ik2A!2@Mt!|mFnfB6Ld}UIpxr&cH^Ek|aL*3A}ZNJO+F@HGs|NozJ ze*bg+=W)MpW@nALqg!-bG=d=AGBeV~1DWFc?a~>1uCh-40*J28j664j#N6onjY6JW z9E%{MyIHeyJ-L?AyyPfK6l8~}BzlXSKpR1lhIyTWG)eIoM5VxLPmXVVdt8B!fC#Xu*TPzf_J28K(-X@;SgAqE1&X(L7&Nem@Op2B#FFa&?% z&C%emB$ur6VN9c@(E{J71EK};-`=DH)cx2Py$)oxGv z6o4RzG@_+DyVR)|$183}u}f0Yr+}{97OD4c&v+#i9SyF4dPGMatJ;Pi-;*{WC|+wD zX1*r@Gyj+hggOa8<5OLV;BmOJ9S)m0FkG`>EDWis{^4mzxZ7%%9VPC8NygSDp@9?f zrlbiT#Y|veEaDi75!pD+lQfSrgE5@PurMb9%~n1v4%w=fLLVfGQ7FM>6TlSA4*Eb*$tRU~-K)*_)mF*@x9NyboNm}c|vu9Wr?6l!n+O6-hCoGO&MvEHtjh{EPl7E> z$JZAhTSk&tNup&`WmFoKNs2~A3ILW^kbQ8HQaDC{RYY)eSydTUUveyMnXCNC@h)X@ z%hFJC^lx*Vg3GP=7V+eGxQaLLivsyBnDzXd0bY=N8zi&jTN)KGmRgjCn$>KX6i~2U z9!_ltE;Dbtj*>#f{$opPz?EOCZ6|Jr>M0Ri%J2fP=xAB>172I2wRRtQmRyxUxP>WK z76ww{Op3sAC_#g{&6p?*WhI$LO(2)hlu5)HnSo&ri(>08`Z^N^80>Js?gaPkaC}>L zY65ieYv2#HO)3=Z1&VAo!sft&*4_DEju^|Z7)h!GDiR!pG8hGxX&Gz?SOt?9QdA{Q zRbl_y5iv3w!+2lNa6M?A=6vU{Pf=VyC*y&s=2$7&Wxqxz)u?{X(Hk7a=<4-L=kwJY)wmIX%O2T}!uILwB@2_4u{q6Mmif1N82{evz;DUw~B~+!s z%oHUF9BEAyBXTq)fGZXl)}On_(PySVm%@*$oKv-((%ZKXM!fC(Kgg+p?9=k34p0A= zpX}i^MqryZ(zm(v-AID$_7ewr5NU9$&WFtxc(tN+A#7#dB8vvS%fSoVHg8w7T{Q-p z8s;ogU5+cgUBeF?y&omB;QL19^BA?+XDY~-VE+CFDnc4=6{y!yJ@i% z`)^Vh0s}ur-1iwY4S(F)H1Eev!ymUc4O!;ctsXNGtgTgXn3eC%NZ{K3F7P%`F`HS+v1SuPUAmuX<1 zH+_>(og zPbJOq@D<;DQ-tKNS+l0H)39N~u0t|b?Ao%SuFj04P;s>3lW0R+#XAkIkG5|g-7s_5 zrOv0eUe{~AH_1MfpvyZ^l!f9Bja$}-~x>yZm<3K#F0ysvt{ zlJ`pC(X#K?H8oyq=v#I3>ZM~=^y|{0`CLakzaLv>7%btJD%*+u=>@_RU@D4b>R}f;qzUFlT8;I?iii? z)Xekrv-dQfXo#+M&_Fed#{wX$gbxzf@{5M)&U8$e$^K7Qjze|l_L!j{*bnAowr zy1M$s^ApDPe9k^-{?4yAu1R=QynpPV`6C9+UsZG8y{C9p-1*p1YgS3ZO^^Mxe`evN zN#u#8ix(T_y$|SiM$Vn9A2YC1)y0d`=JxMuv0O3=iHV7izc2TgofeDaF6wL`tGkzmqj5>O-+r;A4--y zux7^oiglYC2Rny;!{iP4V&A@K%PwbWsg=c8w#)Dy&a$#&2|Zuk6EnO=){vVf9cLIO zbr-emhqE_6`{^O)Yq@KmfAftPr2gnpYsHE0zyJQu4WGLvPZsVhNViil_rJIE@x1b? zDF0~tY>IU~TFIZjJ*Ke(9De2LT^}C7T>R)@>h;^+-jtQ_&}U!o>A!X@m?}eu=COS` z_nj6~`|l6FD@LU4HNCpeob2^xAkQpWa$w#oiR)@>ZAJgcZ&+EgEMegfXJ5RhXL>)T z!}F^KWp?4B%V!z-bd)!t8jKHlg zEvb5LlM9+8QmTtK#J6c$jO^<|v!^|B~;1AE#-E%+Lw`^jjt9#18hDm*P%y9hk zm}O?x=LnKp{HE>5#FU(zKDXXFH12#3`sI%0-`3Y7m6esp9+<^-N;z}#;)SM^C1-l@ zJpak2O%E<#jvc%dckol8d-*l{5f<@_6EB`;kknlHbGpZM^&n*;ndxKFUKx=;{XYb( BxkLZ} literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..5b3a50b9744a4e3fca5f2e7b8f4bbd9e26fe1ff1 GIT binary patch literal 1461 zcmZ{kdpy$%6u^IDk>PqRkGw}(nr+BC`^dEzOA%&EhP;+A$|Jc#h-gY!5PkY2e&;`^B4bbm3_Jawgktt%+a zKs&*!t7vc)C#7eLf?Roxi93p>iVLN!tzYDSOIp!<5w)s_K$szxOdYtn5WQ!i_?|7Z z&U;5*bzR2y`wrhbj_Y#Gl`?9N3mP{UHwfgwv@$o3bUyX16(_+_;mv=NHF**Wt`(-i ziWxaMAb=y0WJqV1mysZjRO)K);Gq9K5~f*jN!Y=>^)B|_qJ`WPES`;7S`G1AQwhpyn6R{4(epM;`%LQzm` zV@*5qhVOl*fP0{Rg!1Ci)Mq1NxyacCJ88g?2;#~l(k#L1Ip=G}Qs({4!B=EB^akES zqrd}=!G!jrDtL#=qo9yH?JOYvi>euo-7>C@^$z<}`0We$TCY=t8|A!FBG*vu^!OX6&zqXO@6QW&R zUF|-MEPfJ+;)D)1v?gU%2+HYrU?AE$qhQc-eRK1Ue{X& z{#amOK+~u*W$jq3T_(mj1gUe-NKM8}40$|dW8L{o6suRE=+E3__7sPVtPrlGKYs8@ zkgY~lX*~g;g16F03E<^|!MV9pK13#I)XG60v8`XWLQ8|K^SH4_VqOZUU8oz@1$6&E z2M20qR~!rKwnola@4^<(uA~z(Snm|(RvdS&o=@N21_5SfW;e`nH$y^9fxgW|a`(`X zwS^7=pgqmrw)86TAP@)uzzlGwo`br$xP*}N*g^Roe)asgI8~qFI(UgWE&!oTiKdiA zmj?};ZbHh`7>tmm%?l%P%Vlj=#gvz;j?ctm^wW=@THcjx@t`K#Bj!^*tFsZ{m$ z_IA7Qe%LoDioyoTZlX6^a*54$0yr}>CjO1k=$M#d{(H7)&iCTPo_$NzRYgM$^Vbwl zYly9PkB%}%$M&(z!V(kJj4_!UfxwVPB82&I?2izYmWBNN{Wh#s&p3D79!ivz-FY4-s7Ggb6DN2yMYpGJTYHp7)+L` z$6Jild6t-q4(E(>B-1AjyE#Zt>KxQihvbnA)WCAkpDt6fvZ_0~x~z(5OH1+enwtAm zM|_SO1A7z>oh<}fZkaSyT6y~(J*p)xxtWld==UvtV)$(s99mafYYL!-sL9DNfGL#+ zsHv$zIthykN{mjNyZR-`;S!_0l ymcJlAk&`q%HMQR1$yh>f8O>akOI2>w|1QtK^t;u+v)`8eVE~8q^=NSqyZA37hN_1E literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..f085ca55dbd896e93d5def896101bf5734f87c62 GIT binary patch literal 486 zcmV@P)5Ew)%ZxkT@9=^p|~UYhsIOI~@5i119kJk@&*Py^He zH2{EDlSPa%06-K){iPw+n-0^d@72fh=_=^)}*zj z-f&#@FYPu_uzrM6N^s7>IfqiJ>`N){3cy2I;5g1Bp93(=g86*T08kJFm3gHU@;nFU zyqud(r-jW}5ZG)s#@Ap4&}y}CI-PE= zYcv|z@Ap;!R)0bO@I0@4`B|31b=`8D=eg~6<`Dp{-+}M@NYk{k*5>ra0RO3{*8?>` c4NwDo1MX!yx5$cKQ2+n{07*qoM6N<$f@_G?UjP6A literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..15c30a0491469a4dc719bc4bd8471213c33ecce5 GIT binary patch literal 432 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0}1^9%xW@Tl~oH?_wu<-x?{|62nxPSltj~_plELn2&=utH_wcg%dCMG5+ zDJgSv^V-^4V`F0{CnuoR`R^om11X`BAirRsMpVG?X#aj8pe$#BM`SSr1K(i~W;~w1 zA_XY;)YHW=B*Oje)YE*;20Sbak8Rl#_36L;?HLl96TdfH^`2mJIO;WD{7SaD=ie9F@3%Sfx_wI4KD~47MhuL+bA*DG6*}A0f_<(C_8##Gshw-w zdCbb1u}S@6_ooQ%oH8aMOa1ww?-%$u3O>KQZe!EE74ux!`PI1_ulPY zCQK7F9X{MFuasguA@U(Q*fE@Sis*&CJ2)IUS_E1gcFa9sw%wm$)@{uVXWt4Pcy{fl z(1x9*``9uv=QC{C;?EFuOLK$nTag>n%I-DhW-dQaRPE>$zr%v1DL}sM0?@+@p00i_ I>zopr0Q`uwBLDyZ literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..53512e6969e83d3e779142d0c1aac269221eb24c GIT binary patch literal 438 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0}1^9%xW@Tl~oH?_wu<-x?|M&0TKXBl{j~_plELn2&=utH_wcg%dCMG5+ zDJgSv^V-^4V`F0{Cnum*m58V#KuV}2$S)YE5fv~z+P_~2D9c&k5n0T@z;_sg8IR|$ zNC67I_H=O!iEw{A^(J4l0T0VUvn?^YKmX6qozrZgAiBGD;Usqrwk?u^aoY;*lbD1B z)C?F4B^@Q!p1HOqk@tJ$v2yc?3p4Xgip)3}<{svAVS1r4XLF(nLj#8`2anzDV2kw0 z5BNSX?Dt|RHCy|I_g>|`{}awK?-f=3{r#pz`^EWOg))aOr|IMOcsD(9bgd@|HxUB?~bVPDv~v$b{|VD0MCo3druBFPwq^%-p3Afd~% zy6z&_i@nuimv!2__nCZ)s&TzP$5$J6OPgg&ebxsLQ E0M|vYr2qf` literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi/meta.json new file mode 100644 index 00000000000..29605f8216a --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/admin_assistant.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14, tie changed by noctyrnal (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/AdminAssistant.png b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/AdminAssistant.png new file mode 100644 index 0000000000000000000000000000000000000000..1f45dff992aba445b65ad06a96b59ca5d2ef5dcc GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqoCO|{#S9F3${@^GvDCf{DA?}l z;us<^HTlo~|MrU`0zU805C3jZkh$AH;c|SQTuRcDu+6{qAIvz{z%%bmM^XY12ykbm zB|N%Rc2Mi&fddCVynQ9dwhX8#Vd|8V5yuWJecNR4@MMn$+svNS0?#>W2UH{_BqVlh ziIs=|5(X+0?jHE@|9`!kTs 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 3f3c6b04e25..397fcc3548a 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, AdminAssistant made by noctyrnal (github)", "size": { "x": 8, "y": 8 @@ -27,6 +27,9 @@ }, { "name": "MedicalBorg" + }, + { + "name": "AdminAssistant" } ] } diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json index 24d83ed6a04..48cd83fdf2d 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-admin-assistant by noctrynal (github)", "size": { "x": 32, "y": 32 @@ -31,6 +31,9 @@ }, { "name": "pda-corpsman" + }, + { + "name": "pda-admin-assistant" } ] } diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-admin-assistant.png b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-admin-assistant.png new file mode 100644 index 0000000000000000000000000000000000000000..21dc1f9e31453d10e21294c991b3ac167f186d80 GIT binary patch literal 611 zcmV-p0-XJcP)jlovK5r>59aJj_O-34#~0FRRx2n?dC8k2zlfB{Ga<8Q@SRn;o` zYppV&4p>F26>r2GJ5V&^Lh*Vx4XIH8BN_%U+xxctgH3#Vejk9N-!MH1y`852ZXd+H zKzPf1ZH)i`5ZU#k>p9?s&3}jtfY;lB5{lb2-z|~Mf&jXnW9j80+RyJ-G`W9_)#Wu3 zNm$9gBRc-5q)kl7%>e-TtbQzA`|g;Jmr0+HNtgW`ABd)_9{`~HW|!kU`f#E70PELd zz%u~O{$zo22dp{3dVZ7Rd6?Q50U(jzV}MtU16X$XX)F7_0V8;J6ovs^Ag}ONe50+c zG%ouro7$KKAU_jfe@GF^TN7Ze5VXzB56>L7IL~uFea$jg2$~%@h%^VlGP!>YFx%eM z+gWP=uT;7mR9pp0D9(e?_>~-$Oz0c%dOKKMUUSr;yb2<_{-Tm=4uBGhlSsn*o;NnX z|HrIj{L1UvxrG3p%)@pVwDx;8fADtodom~0HDLf%)riRudkVfJqoV6)*5{=U8$3z*~hU9IGrEBE6(r|EIW#FoVGU$AWBa z(d`-==kG9K;4Vrzeer1KD~6nDr&Dwm-zZun%h1g6!4E71k9fs8zQ(D|UhWS`)z4*}Q$iB}kyLTO literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Misc/meta.json b/Resources/Textures/DeltaV/Objects/Misc/meta.json new file mode 100644 index 00000000000..99308dea2da --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Misc/meta.json @@ -0,0 +1,36 @@ +{ + "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, idadminassistant by noctrynal (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "idchaplain" + }, + { + "name": "nyanogladiator" + }, + { + "name": "nyanoprisonguard" + }, + { + "name": "nyanoprisoner" + }, + { + "name": "nyanomailcarrier" + }, + { + "name": "nyanomartialartist" + }, + { + "name": "nyanomantis" + } + , + { + "name": "idadminassistant" + } + ] +} diff --git a/Resources/Textures/Markers/jobs.rsi/adminassistant.png b/Resources/Textures/Markers/jobs.rsi/adminassistant.png new file mode 100644 index 0000000000000000000000000000000000000000..cf335a8a10dd46055b705fe54f48c574b17516f9 GIT binary patch literal 1003 zcmVPjyib1b{azA|F@~d*V@DeOUjT@8zaTu z7I_p31-7SD-7z&a)pa3pQH!wg@jW{=nDyzeK6r-7hxc%Q{BpG2i1OrGx#T`I0MB(# zsj`WQiO4$;TtuZ(L8H-trfFz4o48#rp|@W|Jn2tO zI|*#XTDimk;N|P59^2N&IzF32o*FPs6SZ26b9_!u-U#f7q22{|hryi6Zv|M{9z-IM za3LIkprEZ1`dzTKvF>+{#bDbuD5Y&r!(RhbVC{{uw+F)>Zkr?YLltv-x|{v^w0a_&N1-$5*vz~+zdoOtFe+ui+zbh^h~TUWn^ zK8m4sAe+gto}ONhPSDt~&egn7DC-_bi72E&-002ov zPDHLkV1lB>`HuKT4Ole<%t&wOna&oo9r%neNPC zIl1PW;wJh1TNZBnSH)LU@50dcW4r0j)OiUFN}LgMll7+^*#Bzhcd%&(vKg!yn~ymh TeOxsG=s*TfS3j3^P6 Date: Wed, 15 May 2024 19:41:36 +0100 Subject: [PATCH 02/17] stamp and id --- .../{ => id_cards.rsi}/idadminassistant.png | Bin .../Objects/Misc/id_cards.rsi/meta.json | 6 ++- .../Textures/DeltaV/Objects/Misc/meta.json | 36 ------------------ .../DeltaV/Objects/Misc/stamps.rsi/meta.json | 5 ++- .../Misc/stamps.rsi/stamp-admin-assistant.png | Bin 0 -> 340 bytes 5 files changed, 9 insertions(+), 38 deletions(-) rename Resources/Textures/DeltaV/Objects/Misc/{ => id_cards.rsi}/idadminassistant.png (100%) delete mode 100644 Resources/Textures/DeltaV/Objects/Misc/meta.json create mode 100644 Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/stamp-admin-assistant.png diff --git a/Resources/Textures/DeltaV/Objects/Misc/idadminassistant.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/idadminassistant.png similarity index 100% rename from Resources/Textures/DeltaV/Objects/Misc/idadminassistant.png rename to Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/idadminassistant.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..99308dea2da 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, idadminassistant by noctrynal (github)", "size": { "x": 32, "y": 32 @@ -28,5 +28,9 @@ { "name": "nyanomantis" } + , + { + "name": "idadminassistant" + } ] } diff --git a/Resources/Textures/DeltaV/Objects/Misc/meta.json b/Resources/Textures/DeltaV/Objects/Misc/meta.json deleted file mode 100644 index 99308dea2da..00000000000 --- a/Resources/Textures/DeltaV/Objects/Misc/meta.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "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, idadminassistant by noctrynal (github)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "idchaplain" - }, - { - "name": "nyanogladiator" - }, - { - "name": "nyanoprisonguard" - }, - { - "name": "nyanoprisoner" - }, - { - "name": "nyanomailcarrier" - }, - { - "name": "nyanomartialartist" - }, - { - "name": "nyanomantis" - } - , - { - "name": "idadminassistant" - } - ] -} diff --git a/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json index 01ac69bef68..5e061e1c3c9 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.", + "copyright": "Stamp sprites taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93, modified by Guess-My-Name, stamp-admin-assistant by noctyrnal (github)", "size": { "x": 32, "y": 32 @@ -9,6 +9,9 @@ "states": [ { "name": "stamp-psychologist" + }, + { + "name": "stamp-admin-assistant" } ] } diff --git a/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/stamp-admin-assistant.png b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/stamp-admin-assistant.png new file mode 100644 index 0000000000000000000000000000000000000000..1dc32cfafea1c60f77ad4660e37df04cbaf2b097 GIT binary patch literal 340 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DX&fq{|D z)5S3)qV?@H!>q#wBF8@d*S@=_MCgdO)o-Dhm!vDS756$!9%94_&D`cLvqI0SQmb^2}K?N81?63AA3?7?-rDP+I`$7xR-Ii j?BaAs78eH=mjmKGeIFP~TE%jK!NlO{>gTe~DWM4f2zZVN literal 0 HcmV?d00001 From 73cd660934ba2d052a34fa4d4af5e6b903c7421a Mon Sep 17 00:00:00 2001 From: Noctis Date: Wed, 15 May 2024 20:47:45 +0100 Subject: [PATCH 03/17] trying to figure out loadout yml --- .../deltav/preferences/loadout-groups.ftl | 6 +++ .../Loadouts/Jobs/Command/admin_assistant.yml | 47 +++++++++++++++++++ .../DeltaV/Loadouts/loadout_groups.yml | 32 +++++++++++++ .../DeltaV/Loadouts/role_loadouts.yml | 12 +++++ .../Roles/Jobs/Command/admin_assistant.yml | 15 ++---- .../Prototypes/Roles/Jobs/departments.yml | 1 + 6 files changed, 101 insertions(+), 12 deletions(-) create mode 100644 Resources/Prototypes/DeltaV/Loadouts/Jobs/Command/admin_assistant.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..e9f06f0eb15 100644 --- a/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl @@ -36,3 +36,9 @@ loadout-group-martial-artist-shoes = Martial Artist shoes loadout-group-gladiator-jumpsuit = Gladiator jumpsuit loadout-group-gladiator-outerclothing = Gladiator outer clothing + +# Command +loadout-group-admin-assistant-head = Administrative Assistant head +loadout-group-admin-assistant-jumpsuit = Administrative Assistant jumpsuit +loadout-group-admin-assistant-outerclothing = Administrative Assistant backpack +loadout-group-admin-assistant-back = Administrative Assistant backpack \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Command/admin_assistant.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Command/admin_assistant.yml new file mode 100644 index 00000000000..c159d880f8f --- /dev/null +++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Command/admin_assistant.yml @@ -0,0 +1,47 @@ +# Jumpsuit +- type: loadout + id: AdminAssistantJumpsuit + equipment: AdminAssistantJumpsuit + +- type: startingGear + id: AdminAssistantJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitAdminAssistant + +- type: loadout + id: AdminAssistantJumpskirt + equipment: AdminAssistantJumpskirt + +- type: startingGear + id: AdminAssistantJumpskirt + equipment: + jumpsuit: ClothingUniformJumpskirtAdminAssistant + +# Back + +- type: loadout + id: AdminAssistantBackpack + equipment: AdminAssistantBackpack + +- type: startingGear + id: AdminAssistantBackpack + equipment: + back: ClothingBackpackAdminAssistantFilled + +- type: loadout + id: AdminAssistantSatchel + equipment: AdminAssistantSatchel + +- type: startingGear + id: AdminAssistantSatchel + equipment: + back: ClothingBackpackSatchelAdminAssistantFilled + +- type: loadout + id: AdminAssistantDuffel + equipment: AdminAssistantDuffel + +- type: startingGear + id: AdminAssistantDuffel + equipment: + back: ClothingBackpackDuffelAdminAssistantFilled \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml index 0411e0ec372..255581c4025 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml @@ -63,3 +63,35 @@ - BrigMedicBackpack - BrigMedicSatchel - BrigMedicDuffel + +# Command +## Admin Assistant + +- type: loadoutGroup + id: AdminAssistantHead + name: loadout-group-admin-assistant-head + minLimit: 0 + loadouts: + - FoodPoppy + +- type: loadoutGroup + id: AdminAssistantJumpsuit + name: loadout-group-admin-assistant-jumpsuit + loadouts: + - AdminAssistantJumpsuit + - AdminAssistantJumpskirt + +- type: loadoutGroup + id: AdminAssistantOuterClothing + name: loadout-group-admin-assistant-outerclothing + minLimit: 0 + loadouts: + - CaptainWintercoat + +- type: loadoutGroup + id: AdminAssistantBack + name: loadout-group-admin-assistant-back + loadouts: + - AdminAssistantBackpack + - AdminAssistantSatchel + - AdminAssistantDuffel \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml b/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml index 4ef61a5bdfb..a0baf8cccb9 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml @@ -21,3 +21,15 @@ - SecurityOuterClothing - MedicalGloves - Trinkets + +# Command +- type: roleLoadout + id: JobAdminAssistant + groups: + - AdminAssistantHead + - AdminAssistantJumpsuit + - AdminAssistantBack + - AdminAssistantOuterClothing + - AdminAssistantGloves + - Glasses + - Trinkets diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Command/admin_assistant.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Command/admin_assistant.yml index 90046752648..9cf357ceb93 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Command/admin_assistant.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Command/admin_assistant.yml @@ -25,11 +25,11 @@ - !type:OverallPlaytimeRequirement time: 108000 # 30 hours - !type:WhitelistRequirement - setPreference: true - requireAdminNotify: true weight: 20 startingGear: AdminAssistantGear icon: "JobIconAdminAssitant" + requireAdminNotify: true + joinNotifyCrew: true supervisors: job-supervisors-command canBeAntag: false access: @@ -65,20 +65,11 @@ special: - !type:AddImplantSpecial implants: [ MindShieldImplant ] - - !type:AddComponentSpecial - components: - - type: CommandStaff - type: startingGear id: AdminAssistantGear equipment: - jumpsuit: ClothingUniformJumpsuitAdminAssistant - back: ClothingBackpackAdminAssistantFilled shoes: ClothingShoesBootsLaceup belt: BoxFolderClipboard id: AdminAssistantPDA - ears: ClothingHeadsetAltAdminAssistant - inhand: - - BriefcaseBrownFilled - satchel: ClothingBackpackSatchelAdminAssistantFilled - duffelbag: ClothingBackpackDuffelAdminAssistantFilled \ No newline at end of file + ears: ClothingHeadsetAltAdminAssistant \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index d280c67a35d..8a2a1228336 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -50,6 +50,7 @@ - HeadOfSecurity - ResearchDirector - Quartermaster + - AdministrativeAssistant # Delta V - AdminAssistant, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Command/admin_assistant.yml primary: false weight: 100 From a60726a6f0941060145c9ea98136025f6d3f0f6f Mon Sep 17 00:00:00 2001 From: Noctis Date: Wed, 15 May 2024 22:58:41 +0100 Subject: [PATCH 04/17] fixes loadout and a few borked ftls --- .../Locale/en-US/deltav/preferences/loadout-groups.ftl | 2 +- Resources/Locale/en-US/job/job-names.ftl | 1 + .../Catalog/Fills/Backpacks/StarterGear/backpack.yml | 2 ++ .../Catalog/Fills/Backpacks/StarterGear/duffelbag.yml | 2 ++ .../DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml | 2 ++ Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml | 7 ------- Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml | 2 +- .../DeltaV/Roles/Jobs/Command/admin_assistant.yml | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl b/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl index e9f06f0eb15..33631457e51 100644 --- a/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl @@ -40,5 +40,5 @@ loadout-group-gladiator-outerclothing = Gladiator outer clothing # Command loadout-group-admin-assistant-head = Administrative Assistant head loadout-group-admin-assistant-jumpsuit = Administrative Assistant jumpsuit -loadout-group-admin-assistant-outerclothing = Administrative Assistant backpack +loadout-group-admin-assistant-outerclothing = Administrative Assistant outer clothing loadout-group-admin-assistant-back = Administrative Assistant backpack \ 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 58c653db3e6..0cab928d7e6 100644 --- a/Resources/Locale/en-US/job/job-names.ftl +++ b/Resources/Locale/en-US/job/job-names.ftl @@ -49,6 +49,7 @@ job-name-visitor = Visitor # Role timers - Make these alphabetical or I cut you JobAtmosphericTechnician = Atmospheric Technician +JobAdministrativeAssistant = Administrative Assistant JobBartender = Bartender JobBorg = Borg JobBotanist = Botanist diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml index f2befde6135..f9c0c19f0ed 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -37,6 +37,8 @@ noSpawn: true parent: ClothingBackpackCaptain id: ClothingBackpackAdminAssistantFilled + name: administrative assistant's backpack + description: Its a backpack build for carrying paper. components: - type: StorageFill contents: diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index deb2f8318b6..34f2d8996a4 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -24,6 +24,8 @@ noSpawn: true parent: ClothingBackpackDuffelCaptain id: ClothingBackpackDuffelAdminAssistantFilled + name: administrative assistant's duffel bag + description: Its a duffel bag build for carrying paper. components: - type: StorageFill contents: diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml index 3b5c6c47926..408a0758b1e 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -24,6 +24,8 @@ noSpawn: true parent: ClothingBackpackSatchelCaptain id: ClothingBackpackSatchelAdminAssistantFilled + name: administrative assistant's satchel + description: Its a satchel build for carrying paper. components: - type: StorageFill contents: diff --git a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml index 255581c4025..0da85a66f68 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml @@ -67,13 +67,6 @@ # Command ## Admin Assistant -- type: loadoutGroup - id: AdminAssistantHead - name: loadout-group-admin-assistant-head - minLimit: 0 - loadouts: - - FoodPoppy - - type: loadoutGroup id: AdminAssistantJumpsuit name: loadout-group-admin-assistant-jumpsuit diff --git a/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml b/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml index a0baf8cccb9..234619dd58e 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml @@ -24,7 +24,7 @@ # Command - type: roleLoadout - id: JobAdminAssistant + id: JobAdministrativeAssistant groups: - AdminAssistantHead - AdminAssistantJumpsuit diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Command/admin_assistant.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Command/admin_assistant.yml index 9cf357ceb93..c2aafbaf7f8 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Command/admin_assistant.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Command/admin_assistant.yml @@ -1,7 +1,7 @@ - type: job id: AdministrativeAssistant name: job-name-admin-assistant - description: job-name-admin-assistant + description: job-description-admin-assistant playTimeTracker: JobAdminAssistant requirements: - !type:DepartmentTimeRequirement From f6ce8cd05d9be29f24e241cf0161aa60b3e77d15 Mon Sep 17 00:00:00 2001 From: Noctis Date: Wed, 15 May 2024 23:15:57 +0100 Subject: [PATCH 05/17] Accidentally deleted courier spawn oops! --- .../DeltaV/Entities/Markers/Spawners/jobs.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml index 3853e8c8efb..4b58fd96dee 100644 --- a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml @@ -14,6 +14,20 @@ - sprite: Mobs/Silicon/chassis.rsi state: medical_e +- type: entity + id: SpawnPointCourier + parent: SpawnPointJobBase + name: courier + components: + - type: SpawnPoint + job_id: Courier + - type: Sprite + layers: + - state: green + - sprite: DeltaV/Markers/jobs.rsi + state: courier + + - type: entity id: SpawnPointAdminAssistant parent: SpawnPointJobBase From 95c83c4e91e456ded9851a7a1c87b17cfb8d02c4 Mon Sep 17 00:00:00 2001 From: Noctis Date: Wed, 15 May 2024 23:40:12 +0100 Subject: [PATCH 06/17] Adds spawner to every map + updates prototypes --- Resources/Maps/arena.yml | 41 +- Resources/Maps/asterisk.yml | 31 +- Resources/Maps/edge.yml | 41 +- Resources/Maps/hammurabi.yml | 66 +- Resources/Maps/hive.yml | 1155 +++++++++-------- Resources/Maps/lighthouse.yml | 37 +- Resources/Maps/pebble.yml | 41 +- Resources/Maps/shoukou.yml | 966 +------------- Resources/Maps/submarine.yml | 31 +- Resources/Maps/tortuga.yml | 83 +- .../DeltaV/Entities/Markers/Spawners/jobs.yml | 1 - Resources/Prototypes/Maps/arena.yml | 1 + Resources/Prototypes/Maps/asterisk.yml | 1 + Resources/Prototypes/Maps/edge.yml | 1 + Resources/Prototypes/Maps/hammurabi.yml | 1 + Resources/Prototypes/Maps/hive.yml | 1 + Resources/Prototypes/Maps/lighthouse.yml | 1 + Resources/Prototypes/Maps/pebble.yml | 1 + Resources/Prototypes/Maps/shoukou.yml | 1 + Resources/Prototypes/Maps/submarine.yml | 1 + Resources/Prototypes/Maps/tortuga.yml | 1 + 21 files changed, 830 insertions(+), 1673 deletions(-) diff --git a/Resources/Maps/arena.yml b/Resources/Maps/arena.yml index 8309564315f..2eb65dfe62c 100644 --- a/Resources/Maps/arena.yml +++ b/Resources/Maps/arena.yml @@ -150785,6 +150785,13 @@ entities: - type: Transform pos: 31.5,-61.5 parent: 6747 +- proto: SpawnPointAdminAssistant + entities: + - uid: 27793 + components: + - type: Transform + pos: -25.5,-48.5 + parent: 6747 - proto: SpawnPointAtmos entities: - uid: 17076 @@ -150961,6 +150968,23 @@ entities: - type: Transform pos: 38.5,-12.5 parent: 6747 +- proto: SpawnPointCourier + entities: + - uid: 27031 + components: + - type: Transform + pos: 13.5,28.5 + parent: 6747 + - uid: 27032 + components: + - type: Transform + pos: 10.5,26.5 + parent: 6747 + - uid: 27033 + components: + - type: Transform + pos: 17.5,24.5 + parent: 6747 - proto: SpawnPointDetective entities: - uid: 25557 @@ -151141,23 +151165,6 @@ entities: - type: Transform pos: -31.5,17.5 parent: 6747 -- proto: SpawnPointMailCarrier - entities: - - uid: 27031 - components: - - type: Transform - pos: 13.5,28.5 - parent: 6747 - - uid: 27032 - components: - - type: Transform - pos: 10.5,26.5 - parent: 6747 - - uid: 27033 - components: - - type: Transform - pos: 17.5,24.5 - parent: 6747 - proto: SpawnPointMedicalDoctor entities: - uid: 367 diff --git a/Resources/Maps/asterisk.yml b/Resources/Maps/asterisk.yml index 5d3432c90ce..663e7f36aaf 100644 --- a/Resources/Maps/asterisk.yml +++ b/Resources/Maps/asterisk.yml @@ -59354,6 +59354,13 @@ entities: - type: Transform pos: -35.5,-21.5 parent: 2 +- proto: SpawnPointAdminAssistant + entities: + - uid: 11521 + components: + - type: Transform + pos: 49.5,-5.5 + parent: 2 - proto: SpawnPointAtmos entities: - uid: 10897 @@ -59515,6 +59522,18 @@ entities: - type: Transform pos: 0.5,-28.5 parent: 2 +- proto: SpawnPointCourier + entities: + - uid: 9983 + components: + - type: Transform + pos: 0.5,17.5 + parent: 2 + - uid: 9985 + components: + - type: Transform + pos: 1.5,18.5 + parent: 2 - proto: SpawnPointDetective entities: - uid: 9988 @@ -59646,18 +59665,6 @@ entities: - type: Transform pos: -12.5,14.5 parent: 2 -- proto: SpawnPointMailCarrier - entities: - - uid: 9983 - components: - - type: Transform - pos: 0.5,17.5 - parent: 2 - - uid: 9985 - components: - - type: Transform - pos: 1.5,18.5 - parent: 2 - proto: SpawnPointMedicalDoctor entities: - uid: 10000 diff --git a/Resources/Maps/edge.yml b/Resources/Maps/edge.yml index 8ed6d8d03b5..fa8c52c61d4 100644 --- a/Resources/Maps/edge.yml +++ b/Resources/Maps/edge.yml @@ -90844,6 +90844,13 @@ entities: - type: Transform pos: 7.5,-7.5 parent: 2 +- proto: SpawnPointAdminAssistant + entities: + - uid: 17484 + components: + - type: Transform + pos: -12.5,43.5 + parent: 2 - proto: SpawnPointAtmos entities: - uid: 13933 @@ -91040,6 +91047,23 @@ entities: - type: Transform pos: -33.5,9.5 parent: 2 +- proto: SpawnPointCourier + entities: + - uid: 13998 + components: + - type: Transform + pos: 15.5,-26.5 + parent: 2 + - uid: 13999 + components: + - type: Transform + pos: 15.5,-28.5 + parent: 2 + - uid: 14000 + components: + - type: Transform + pos: 16.5,-27.5 + parent: 2 - proto: SpawnPointDetective entities: - uid: 13967 @@ -91211,23 +91235,6 @@ entities: - type: Transform pos: -20.5,20.5 parent: 2 -- proto: SpawnPointMailCarrier - entities: - - uid: 13998 - components: - - type: Transform - pos: 15.5,-26.5 - parent: 2 - - uid: 13999 - components: - - type: Transform - pos: 15.5,-28.5 - parent: 2 - - uid: 14000 - components: - - type: Transform - pos: 16.5,-27.5 - parent: 2 - proto: SpawnPointMedicalDoctor entities: - uid: 14001 diff --git a/Resources/Maps/hammurabi.yml b/Resources/Maps/hammurabi.yml index 070d289a8f0..497911770e3 100644 --- a/Resources/Maps/hammurabi.yml +++ b/Resources/Maps/hammurabi.yml @@ -15419,7 +15419,7 @@ entities: -27,-13: 0: 57344 4: 48 - 6: 136 + 5: 136 -26,-12: 0: 4095 -26,-11: @@ -15428,8 +15428,8 @@ entities: 0: 61168 -26,-13: 0: 61440 - 6: 17 - 7: 204 + 5: 17 + 6: 204 -25,-13: 0: 62702 -40,-1: @@ -15991,7 +15991,7 @@ entities: -28,-17: 0: 65391 -28,-15: - 5: 7 + 7: 7 4: 1792 -28,-14: 4: 7 @@ -16924,9 +16924,9 @@ entities: temperature: 293.15 moles: - 0 + - 6666.982 - 0 - 0 - - 6666.982 - 0 - 0 - 0 @@ -16938,7 +16938,6 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 0 - 6666.982 - 0 - 0 @@ -16950,13 +16949,14 @@ entities: - 0 - 0 - 0 + - 0 - volume: 2500 temperature: 293.15 moles: - - 6666.982 - 0 - 0 - 0 + - 6666.982 - 0 - 0 - 0 @@ -205901,7 +205901,6 @@ entities: pos: 42.5,-1.5 parent: 1 missingComponents: - - Construction - Damageable - uid: 15226 components: @@ -239015,6 +239014,13 @@ entities: - type: Transform pos: -20.5,-32.5 parent: 1 +- proto: SpawnPointAdminAssistant + entities: + - uid: 42984 + components: + - type: Transform + pos: -101.5,5.5 + parent: 1 - proto: SpawnPointAtmos entities: - uid: 3237 @@ -239254,6 +239260,28 @@ entities: - type: Transform pos: -68.5,2.5 parent: 1 +- proto: SpawnPointCourier + entities: + - uid: 17152 + components: + - type: Transform + pos: -38.5,40.5 + parent: 1 + - uid: 17153 + components: + - type: Transform + pos: -14.5,31.5 + parent: 1 + - uid: 17154 + components: + - type: Transform + pos: -17.5,31.5 + parent: 1 + - uid: 17155 + components: + - type: Transform + pos: -16.5,33.5 + parent: 1 - proto: SpawnPointDetective entities: - uid: 29453 @@ -239559,28 +239587,6 @@ entities: - type: Transform pos: -64.5,3.5 parent: 1 -- proto: SpawnPointMailCarrier - entities: - - uid: 17152 - components: - - type: Transform - pos: -38.5,40.5 - parent: 1 - - uid: 17153 - components: - - type: Transform - pos: -14.5,31.5 - parent: 1 - - uid: 17154 - components: - - type: Transform - pos: -17.5,31.5 - parent: 1 - - uid: 17155 - components: - - type: Transform - pos: -16.5,33.5 - parent: 1 - proto: SpawnPointMedicalDoctor entities: - uid: 1741 diff --git a/Resources/Maps/hive.yml b/Resources/Maps/hive.yml index 6142830be2b..ac13c9a73f2 100644 --- a/Resources/Maps/hive.yml +++ b/Resources/Maps/hive.yml @@ -8685,7 +8685,7 @@ entities: 0: 65039 0,4: 0: 33279 - 2: 12288 + 1: 12288 0,-1: 0: 61166 1,0: @@ -8782,17 +8782,17 @@ entities: 0: 39743 -8,-9: 0: 65280 - 1: 4 + 2: 4 -9,-8: 0: 65416 -8,-7: 0: 4369 - 1: 52428 + 2: 52428 -9,-7: 0: 48056 -8,-6: 0: 4593 - 1: 49152 + 2: 49152 -9,-6: 0: 63931 -8,-5: @@ -8804,13 +8804,13 @@ entities: -7,-8: 0: 21839 -7,-7: - 1: 65521 + 2: 65521 0: 4 -7,-6: - 1: 65535 + 2: 65535 -7,-5: 0: 61681 - 1: 14 + 2: 14 -7,-9: 0: 65535 -7,-4: @@ -8818,49 +8818,49 @@ entities: -6,-8: 0: 65535 -6,-7: - 1: 65520 + 2: 65520 -6,-6: - 1: 16383 + 2: 16383 -6,-5: - 1: 1 + 2: 1 0: 47290 -6,-9: 0: 65297 - 1: 4 + 2: 4 -6,-4: 0: 65225 -5,-8: 0: 13119 - 1: 34816 + 2: 34816 -5,-7: - 1: 30712 + 2: 30712 -5,-6: - 1: 7 + 2: 7 0: 60928 -5,-5: 0: 4479 - 2: 49152 + 1: 49152 -5,-9: 0: 65416 -5,-4: 0: 4881 - 2: 52428 + 1: 52428 -4,-8: 0: 15 - 1: 65280 + 2: 65280 -4,-6: 0: 65294 -4,-5: 0: 34947 - 2: 13056 + 1: 13056 -4,-4: - 2: 4403 + 1: 4403 0: 49288 -4,-3: - 2: 1 + 1: 1 0: 32524 -5,-3: - 2: 12 + 1: 12 0: 64272 -4,-2: 0: 63255 @@ -8984,7 +8984,7 @@ entities: 0: 63351 -8,-1: 0: 21572 - 1: 17 + 2: 17 -9,0: 0: 65501 -8,1: @@ -8993,15 +8993,15 @@ entities: 0: 56831 -8,2: 0: 17477 - 1: 4352 + 2: 4352 -9,2: 0: 284 - 1: 52224 + 2: 52224 -8,3: - 1: 23 + 2: 23 0: 31744 -9,3: - 1: 255 + 2: 255 0: 53504 -8,4: 0: 57460 @@ -9046,19 +9046,19 @@ entities: -4,3: 0: 65287 -9,-4: - 1: 65248 + 2: 65248 -8,-3: 0: 17873 - 1: 4096 + 2: 4096 -9,-3: - 1: 65535 + 2: 65535 -8,-2: - 1: 30583 + 2: 30583 -9,-2: - 1: 52462 + 2: 52462 0: 785 -9,-1: - 1: 204 + 2: 204 0: 49425 -7,-3: 0: 30591 @@ -9088,10 +9088,10 @@ entities: 0: 61160 -1,4: 0: 4607 - 2: 49152 + 1: 49152 -9,4: 0: 196 - 1: 61713 + 2: 61713 -8,5: 0: 65534 -8,6: @@ -9104,48 +9104,48 @@ entities: 0: 56558 -8,8: 0: 141 - 1: 57856 + 2: 57856 -7,5: 0: 511 - 1: 49152 + 2: 49152 -7,7: 0: 12289 - 1: 35054 + 2: 35054 -7,6: - 1: 61166 + 2: 61166 -7,8: 0: 55 - 1: 63624 + 2: 63624 -6,5: 0: 3827 -6,6: - 1: 30481 + 2: 30481 0: 102 -6,7: - 1: 65527 + 2: 65527 -6,8: - 1: 65535 + 2: 65535 -5,5: 0: 15344 -5,6: 0: 49151 -5,7: - 1: 65328 + 2: 65328 0: 8 -5,8: - 1: 8191 + 2: 8191 -4,5: 0: 52700 -4,6: 0: 65311 -4,7: 0: 79 - 1: 28928 + 2: 28928 0,5: - 2: 51 + 1: 51 0: 63628 -1,5: - 2: 204 + 1: 204 0: 61457 0,6: 0: 62702 @@ -9153,12 +9153,12 @@ entities: 0: 62347 0,7: 0: 3087 - 1: 13056 + 2: 13056 -1,7: 0: 13103 - 1: 34816 + 2: 34816 0,8: - 1: 4095 + 2: 4095 1,5: 0: 61183 1,6: @@ -9166,7 +9166,7 @@ entities: 1,7: 0: 53007 1,8: - 1: 273 + 2: 273 0: 3276 2,5: 0: 56575 @@ -9196,21 +9196,21 @@ entities: 0: 58976 -3,-8: 0: 3299 - 1: 4096 + 2: 4096 -3,-7: - 1: 52479 + 2: 52479 0: 4096 -3,-6: 0: 65281 - 1: 12 + 2: 12 -3,-9: 0: 40160 -2,-8: 0: 20465 -2,-7: - 1: 65393 + 2: 65393 -2,-6: - 1: 15 + 2: 15 0: 65280 -2,-9: 0: 56784 @@ -9218,18 +9218,18 @@ entities: 0: 49136 -1,-7: 0: 3 - 1: 65408 + 2: 65408 -1,-6: - 1: 15 + 2: 15 0: 65280 -1,-9: 0: 48058 0,-8: 0: 4080 0,-7: - 1: 16382 + 2: 16382 0,-6: - 1: 3 + 2: 3 0: 65292 0,-9: 0: 61199 @@ -9264,7 +9264,7 @@ entities: 4,-6: 0: 65295 -4,8: - 1: 4095 + 2: 4095 -3,5: 0: 54551 -3,6: @@ -9272,7 +9272,7 @@ entities: -3,7: 0: 33727 -3,8: - 1: 4095 + 2: 4095 -2,5: 0: 55807 -2,6: @@ -9280,10 +9280,10 @@ entities: -2,7: 0: 28783 -2,8: - 1: 247 + 2: 247 0: 10240 -1,8: - 1: 248 + 2: 248 0: 16640 -12,0: 0: 32767 @@ -9305,7 +9305,7 @@ entities: 0: 15291 -12,4: 0: 7 - 1: 61064 + 2: 61064 -11,0: 0: 65535 -11,1: @@ -9317,7 +9317,7 @@ entities: -11,-1: 0: 64796 -11,4: - 1: 65535 + 2: 65535 -10,0: 0: 61438 -10,1: @@ -9327,30 +9327,30 @@ entities: -10,3: 0: 35591 -10,4: - 1: 65535 + 2: 65535 -10,-1: 0: 36591 4,8: 0: 819 - 1: 2184 + 2: 2184 5,5: 0: 49617 5,6: 0: 64433 5,7: 0: 783 - 1: 52224 + 2: 52224 5,8: - 1: 4095 + 2: 4095 6,5: 0: 48120 6,6: 0: 16305 6,7: 0: 79 - 1: 28928 + 2: 28928 6,8: - 1: 255 + 2: 255 0: 10240 7,5: 0: 47931 @@ -9358,9 +9358,9 @@ entities: 0: 33720 7,7: 0: 959 - 1: 32768 + 2: 32768 7,8: - 1: 255 + 2: 255 0: 16640 8,4: 0: 65485 @@ -9370,9 +9370,9 @@ entities: 0: 63803 8,7: 0: 15 - 1: 65024 + 2: 65024 8,8: - 1: 255 + 2: 255 0: 3840 9,4: 0: 65535 @@ -9385,7 +9385,7 @@ entities: 9,3: 0: 65359 9,8: - 1: 30719 + 2: 30719 10,4: 0: 65535 10,5: @@ -9394,20 +9394,20 @@ entities: 0: 65520 10,7: 0: 271 - 1: 60928 + 2: 60928 10,3: 0: 65294 10,8: - 1: 51 + 2: 51 0: 63616 11,4: 0: 53213 11,6: 0: 4371 - 1: 52360 + 2: 52360 11,7: 0: 1 - 1: 4044 + 2: 4044 11,3: 0: 53709 11,5: @@ -9418,9 +9418,9 @@ entities: 0: 30583 12,5: 0: 7 - 1: 15872 + 2: 15872 12,6: - 1: 3 + 2: 3 0: 61320 12,7: 0: 18190 @@ -9429,20 +9429,20 @@ entities: 12,8: 0: 65535 13,4: - 1: 29491 + 2: 29491 0: 136 13,5: - 1: 1911 + 2: 1911 13,6: 0: 48059 13,7: 0: 65419 13,3: - 1: 13107 + 2: 13107 0: 32844 13,8: 0: 13107 - 1: 34944 + 2: 34944 14,4: 0: 48059 14,5: @@ -9451,7 +9451,7 @@ entities: 0: 65535 14,7: 0: 287 - 1: 1024 + 2: 1024 14,3: 0: 16360 15,4: @@ -9462,7 +9462,7 @@ entities: 0: 48059 15,7: 0: 139 - 1: 512 + 2: 512 15,3: 0: 7163 16,4: @@ -9511,20 +9511,20 @@ entities: 0: 55807 13,2: 0: 49629 - 1: 12288 + 2: 12288 13,-1: 0: 56592 - 1: 15 + 2: 15 14,0: 0: 65435 14,1: 0: 47359 14,2: 0: 35003 - 1: 12288 + 2: 12288 14,-1: 0: 48012 - 1: 1 + 2: 1 15,0: 0: 65485 15,1: @@ -9567,24 +9567,24 @@ entities: 0: 65535 11,-5: 0: 61440 - 1: 238 + 2: 238 12,-4: 0: 4096 - 1: 35942 + 2: 35942 12,-3: 0: 28531 12,-2: 0: 26215 12,-5: - 1: 26227 + 2: 26227 0: 12 13,-4: 0: 15 - 1: 30464 + 2: 30464 13,-3: - 1: 26215 + 2: 26215 13,-2: - 1: 65399 + 2: 65399 13,-5: 0: 15245 14,-4: @@ -9618,33 +9618,33 @@ entities: 7,-8: 0: 49136 8,-7: - 1: 65534 + 2: 65534 7,-7: - 1: 65408 + 2: 65408 0: 3 8,-6: - 1: 15 + 2: 15 0: 65280 7,-6: - 1: 15 + 2: 15 0: 65280 9,-8: 0: 1775 9,-7: - 1: 8191 + 2: 8191 9,-6: - 1: 1 + 2: 1 0: 65422 9,-9: 0: 64733 10,-8: 0: 61439 10,-7: - 1: 18224 + 2: 18224 0: 8 10,-6: 0: 61699 - 1: 204 + 2: 204 10,-9: 0: 4369 11,-8: @@ -9652,7 +9652,7 @@ entities: 11,-7: 0: 61247 11,-6: - 1: 58992 + 2: 58992 0: 128 12,-8: 0: 65535 @@ -9660,24 +9660,24 @@ entities: 0: 65295 12,-6: 0: 51258 - 1: 12288 + 2: 12288 4,-9: 0: 48027 5,-8: 0: 4080 5,-7: - 1: 53247 + 2: 53247 5,-6: 0: 65283 - 1: 12 + 2: 12 5,-9: 0: 47931 6,-8: 0: 20466 6,-7: - 1: 65393 + 2: 65393 6,-6: - 1: 15 + 2: 15 0: 65280 6,-9: 0: 30471 @@ -9708,64 +9708,64 @@ entities: 18,4: 0: 14327 19,0: - 1: 15 + 2: 15 0: 65280 19,1: 0: 12543 - 1: 32768 + 2: 32768 19,2: 0: 65283 - 1: 8 + 2: 8 19,3: 0: 30479 19,-1: - 1: 61440 + 2: 61440 0: 191 19,4: 0: 1919 20,0: - 1: 15 + 2: 15 0: 65280 20,1: 0: 255 - 1: 61440 + 2: 61440 20,2: - 1: 1 + 2: 1 0: 56576 20,3: 0: 65309 20,-1: - 1: 61440 + 2: 61440 0: 187 20,4: 0: 64511 21,0: - 1: 15 + 2: 15 0: 65280 21,1: 0: 255 - 1: 61440 + 2: 61440 21,2: 0: 4352 - 1: 34952 + 2: 34952 21,3: 0: 54721 21,-1: - 1: 63488 + 2: 63488 0: 55 21,4: 0: 56541 22,0: - 1: 3 + 2: 3 0: 65416 22,1: 0: 52479 - 1: 4096 + 2: 4096 22,2: - 1: 12561 + 2: 12561 0: 2252 22,-1: - 1: 13107 + 2: 13107 0: 34952 22,3: 0: 41640 @@ -9837,7 +9837,7 @@ entities: 0: 45311 0,-13: 0: 65282 - 1: 8 + 2: 8 -1,-12: 0: 57583 0,-11: @@ -9856,7 +9856,7 @@ entities: 0: 56575 1,-13: 0: 65280 - 1: 7 + 2: 7 2,-12: 0: 55551 2,-11: @@ -9865,7 +9865,7 @@ entities: 0: 8191 2,-13: 0: 65281 - 1: 12 + 2: 12 3,-12: 0: 45567 3,-11: @@ -9874,7 +9874,7 @@ entities: 0: 36863 3,-13: 0: 65280 - 1: 15 + 2: 15 4,-12: 0: 63743 4,-11: @@ -9885,7 +9885,7 @@ entities: 0: 47359 8,-13: 0: 28672 - 1: 200 + 2: 200 7,-12: 0: 53631 8,-11: @@ -9904,15 +9904,15 @@ entities: 0: 56829 10,-12: 0: 4352 - 1: 35023 + 2: 35023 10,-11: 0: 12561 - 1: 35016 + 2: 35016 10,-10: 0: 13107 - 1: 34952 + 2: 34952 10,-13: - 1: 43694 + 2: 43694 4,12: 0: 3838 5,9: @@ -10011,7 +10011,7 @@ entities: 0: 61951 13,-7: 0: 13070 - 1: 2048 + 2: 2048 13,-6: 0: 56559 13,-8: @@ -10020,7 +10020,7 @@ entities: 0: 65523 14,-7: 0: 34831 - 1: 768 + 2: 768 14,-6: 0: 47935 14,-9: @@ -10041,7 +10041,7 @@ entities: 0: 4380 16,-9: 0: 4352 - 1: 19456 + 2: 19456 17,-8: 0: 4401 17,-7: @@ -10063,26 +10063,26 @@ entities: 20,-5: 0: 4092 8,-14: - 1: 36608 + 2: 36608 7,-14: - 1: 3584 + 2: 3584 9,-14: - 1: 3840 + 2: 3840 9,-13: - 1: 272 + 2: 272 10,-14: - 1: 28416 + 2: 28416 11,-14: - 1: 4352 + 2: 4352 11,-13: - 1: 17 + 2: 17 4,-14: 0: 43520 4,-13: 0: 65450 5,-13: 0: 65280 - 1: 14 + 2: 14 5,-12: 0: 64767 6,-13: @@ -10093,7 +10093,7 @@ entities: 0: 65535 7,-13: 0: 30464 - 1: 8 + 2: 8 0,-14: 0: 8192 -1,-13: @@ -10101,18 +10101,18 @@ entities: 2,-14: 0: 4096 -4,-14: - 1: 61440 + 2: 61440 -5,-14: - 1: 61440 + 2: 61440 -3,-14: - 1: 28672 + 2: 28672 -3,-13: - 1: 498 + 2: 498 0: 49152 -3,-12: 0: 14206 -2,-13: - 1: 18 + 2: 18 0: 56320 -2,-12: 0: 65295 @@ -10136,26 +10136,26 @@ entities: 0: 63351 -9,-9: 0: 32768 - 1: 17 + 2: 17 -8,-10: - 1: 17484 + 2: 17484 -8,-12: - 1: 34952 + 2: 34952 -8,-13: - 1: 34956 + 2: 34956 -8,-11: - 1: 34952 + 2: 34952 -7,-10: 0: 65280 -6,-10: 0: 4352 - 1: 17478 + 2: 17478 -6,-12: - 1: 8738 + 2: 8738 -6,-13: - 1: 8743 + 2: 8743 -6,-11: - 1: 8738 + 2: 8738 5,-11: 0: 52511 5,-10: @@ -10186,19 +10186,19 @@ entities: 0: 7631 23,-2: 0: 49425 - 1: 68 + 2: 68 24,-4: - 1: 497 + 2: 497 24,-3: 0: 65280 - 1: 2 + 2: 2 24,-2: 0: 14335 24,-1: 0: 15288 24,4: 0: 4575 - 1: 16384 + 2: 16384 25,0: 0: 46011 25,1: @@ -10219,7 +10219,7 @@ entities: 0: 2512 26,4: 0: 3 - 1: 76 + 2: 76 26,-1: 0: 12151 27,0: @@ -10228,13 +10228,13 @@ entities: 0: 61439 27,3: 0: 272 - 1: 50240 + 2: 50240 27,-1: 0: 15251 27,2: 0: 28398 27,4: - 1: 8823 + 2: 8823 28,0: 0: 65527 28,1: @@ -10242,38 +10242,38 @@ entities: 28,2: 0: 1911 28,3: - 1: 61440 + 2: 61440 20,-8: 0: 19692 21,-6: 0: 47359 21,-8: - 1: 3822 + 2: 3822 0: 24576 21,-7: 0: 36590 22,-8: - 1: 819 + 2: 819 22,-7: 0: 273 - 1: 49152 + 2: 49152 22,-6: - 1: 3720 + 2: 3720 22,-9: - 1: 8738 + 2: 8738 23,-7: - 1: 61440 + 2: 61440 23,-6: - 1: 3976 + 2: 3976 24,-7: - 1: 61440 + 2: 61440 24,-6: - 1: 3976 + 2: 3976 8,12: 0: 6015 9,9: 0: 65280 - 1: 6 + 2: 6 9,10: 0: 48015 9,11: @@ -10284,12 +10284,12 @@ entities: 0: 4095 10,10: 0: 12288 - 1: 34 + 2: 34 10,11: 0: 13107 10,12: 0: 273 - 1: 16384 + 2: 16384 11,9: 0: 34944 11,10: @@ -10308,15 +10308,15 @@ entities: 0: 8 9,13: 0: 819 - 1: 32768 + 2: 32768 9,14: - 1: 12 + 2: 12 10,13: - 1: 61998 + 2: 61998 11,13: - 1: 64719 + 2: 64719 12,13: - 1: 61455 + 2: 61455 -4,9: 0: 52701 -5,9: @@ -10353,27 +10353,27 @@ entities: 0: 30576 -9,9: 0: 35071 - 1: 12288 + 2: 12288 -8,10: 0: 207 -9,10: 0: 8 - 1: 48 + 2: 48 -8,11: - 1: 28672 + 2: 28672 -9,11: - 1: 61696 + 2: 61696 -8,12: - 1: 35946 + 2: 35946 -7,9: - 1: 255 + 2: 255 0: 33536 -7,10: 0: 14591 -7,11: 0: 61439 -6,9: - 1: 119 + 2: 119 0: 28672 -6,10: 0: 14335 @@ -10384,13 +10384,13 @@ entities: -5,12: 0: 52364 -7,12: - 1: 12560 + 2: 12560 -7,13: - 1: 2246 + 2: 2246 -6,13: - 1: 3840 + 2: 3840 -5,13: - 1: 25360 + 2: 25360 0: 140 -4,13: 0: 4095 @@ -10439,33 +10439,33 @@ entities: 13,10: 0: 119 14,8: - 1: 16 + 2: 16 0: 57344 14,9: 0: 65534 14,10: 0: 61183 14,11: - 1: 32768 + 2: 32768 14,12: - 1: 4972 + 2: 4972 15,11: - 1: 8030 + 2: 8030 15,10: - 1: 32768 + 2: 32768 16,10: - 1: 5100 + 2: 5100 16,11: - 1: 3968 + 2: 3968 -12,-4: 0: 255 - 1: 57344 + 2: 57344 -12,-5: 0: 65520 -13,-4: 0: 62327 -12,-3: - 1: 35054 + 2: 35054 0: 28672 -13,-3: 0: 63487 @@ -10477,18 +10477,18 @@ entities: 0: 48051 -11,-4: 0: 255 - 1: 61440 + 2: 61440 -11,-3: - 1: 65535 + 2: 65535 -11,-2: 0: 65520 -11,-5: 0: 65520 -10,-4: - 1: 61440 + 2: 61440 0: 238 -10,-3: - 1: 65535 + 2: 65535 -10,-2: 0: 30576 -10,-5: @@ -10496,7 +10496,7 @@ entities: -16,-4: 0: 61030 -17,-4: - 1: 2296 + 2: 2296 -16,-3: 0: 61166 -16,-2: @@ -10536,30 +10536,30 @@ entities: -13,-5: 0: 63346 -20,-4: - 1: 4096 + 2: 4096 -20,-3: - 1: 61299 + 2: 61299 -21,-4: - 1: 61440 + 2: 61440 -21,-3: - 1: 4528 + 2: 4528 -20,-1: 0: 65329 - 1: 8 + 2: 8 -21,-1: 0: 31 - 1: 4576 + 2: 4576 -20,0: 0: 43955 - 1: 4096 + 2: 4096 -20,-2: - 1: 34956 + 2: 34956 -19,-3: - 1: 4096 + 2: 4096 -19,-2: - 1: 4369 + 2: 4369 -19,-1: - 1: 1 + 2: 1 0: 48896 -19,0: 0: 65522 @@ -10568,45 +10568,45 @@ entities: -18,0: 0: 64434 -18,-4: - 1: 17604 + 2: 17604 -18,-5: - 1: 17476 + 2: 17476 -18,-3: - 1: 12 + 2: 12 -17,-3: - 1: 1 + 2: 1 -17,0: 0: 64441 -21,0: 0: 9 - 1: 37142 + 2: 37142 -20,1: - 1: 16 + 2: 16 0: 15274 -21,1: - 1: 4496 + 2: 4496 0: 9 -20,2: 0: 15291 -21,2: 0: 4105 - 1: 57622 + 2: 57622 -20,3: 0: 1 - 1: 34952 + 2: 34952 -21,3: 0: 255 - 1: 4864 + 2: 4864 -19,1: 0: 4095 -19,2: 0: 187 -19,3: - 1: 4369 + 2: 4369 -20,4: - 1: 32748 + 2: 32748 -19,4: - 1: 17 + 2: 17 -18,1: 0: 3007 -18,2: @@ -10640,15 +10640,15 @@ entities: -13,4: 0: 65407 -16,-8: - 1: 39 + 2: 39 0: 34816 -17,-8: - 1: 15 + 2: 15 -16,-7: - 1: 4384 + 2: 4384 0: 51336 -16,-6: - 1: 4369 + 2: 4369 0: 52236 -15,-8: 0: 65520 @@ -10669,7 +10669,7 @@ entities: -13,-6: 0: 32631 -13,-9: - 1: 51200 + 2: 51200 0: 8 -12,-8: 0: 64988 @@ -10678,7 +10678,7 @@ entities: -12,-6: 0: 65295 -12,-9: - 1: 4352 + 2: 4352 0: 52431 -11,-8: 0: 65523 @@ -10697,26 +10697,26 @@ entities: -10,-9: 0: 30579 -16,6: - 1: 15 + 2: 15 0: 32768 -17,6: - 1: 15 + 2: 15 -16,7: 0: 52367 - 1: 4352 + 2: 4352 -17,7: 0: 26120 - 1: 7 + 2: 7 -16,8: - 1: 17153 + 2: 17153 0: 140 -15,6: - 1: 17 + 2: 17 0: 64716 -15,7: 0: 65535 -15,5: - 1: 4096 + 2: 4096 3: 2048 -15,8: 0: 65535 @@ -10745,7 +10745,7 @@ entities: 0: 65280 -12,5: 0: 65280 - 1: 14 + 2: 14 -12,6: 0: 65535 -12,7: @@ -10757,7 +10757,7 @@ entities: 3: 4 0: 65280 -11,5: - 1: 3 + 2: 3 0: 65292 -11,6: 0: 65535 @@ -10769,7 +10769,7 @@ entities: 0: 65484 -10,5: 0: 65283 - 1: 12 + 2: 12 -10,6: 0: 65535 -10,7: @@ -10777,47 +10777,47 @@ entities: -10,8: 0: 30591 -9,5: - 1: 1 + 2: 1 0: 17732 -17,8: - 1: 3840 + 2: 3840 0: 6 -16,9: - 1: 29696 + 2: 29696 -16,10: - 1: 36079 + 2: 36079 -17,9: - 1: 61440 + 2: 61440 -15,9: 0: 4095 -15,10: - 1: 4097 + 2: 4097 -15,11: - 1: 35939 + 2: 35939 -14,9: 0: 3569 -14,11: - 1: 12834 + 2: 12834 -14,10: - 1: 8743 + 2: 8743 -14,12: - 1: 8866 + 2: 8866 0: 2056 -13,9: 0: 3568 -13,10: - 1: 132 + 2: 132 0: 8 -12,9: 0: 4080 -12,10: 0: 19655 - 1: 9008 + 2: 9008 -12,11: 0: 17476 -12,12: 0: 17733 - 1: 176 + 2: 176 -11,9: 0: 4080 -11,10: @@ -10826,19 +10826,19 @@ entities: 0: 6128 -10,10: 0: 819 - 1: 34952 + 2: 34952 -10,11: - 1: 34956 + 2: 34956 -10,12: - 1: 35000 + 2: 35000 0: 771 -9,12: - 1: 1 + 2: 1 -12,-12: - 1: 48 + 2: 48 0: 52416 -13,-12: - 1: 20208 + 2: 20208 -12,-11: 0: 30576 -13,-11: @@ -10849,77 +10849,77 @@ entities: 0: 35071 -11,-12: 0: 13104 - 1: 52428 + 2: 52428 -11,-11: 0: 48051 - 1: 8 + 2: 8 -11,-10: 0: 48059 -11,-13: - 1: 52224 + 2: 52224 0: 238 -10,-12: 0: 48048 - 1: 17472 + 2: 17472 -10,-11: 0: 65467 - 1: 68 + 2: 68 -10,-10: 0: 191 - 1: 47872 + 2: 47872 -9,-12: 0: 4368 -9,-11: 0: 13105 -9,-10: 0: 51 - 1: 4352 + 2: 4352 -13,12: 0: 3855 - 1: 240 + 2: 240 -12,13: 0: 17733 - 1: 176 + 2: 176 -13,13: 0: 3855 - 1: 240 + 2: 240 -12,14: 0: 17733 - 1: 176 + 2: 176 -13,14: 0: 3855 - 1: 240 + 2: 240 -12,15: 0: 325 - 1: 17584 + 2: 17584 -13,15: 0: 3855 - 1: 240 + 2: 240 -12,16: - 1: 61444 + 2: 61444 -11,12: - 1: 240 + 2: 240 0: 3855 -11,13: - 1: 240 + 2: 240 0: 3855 -11,14: - 1: 240 + 2: 240 0: 3855 -11,15: - 1: 240 + 2: 240 0: 3855 -10,13: 0: 771 - 1: 35000 + 2: 35000 -10,14: 0: 771 - 1: 35000 + 2: 35000 -10,15: 0: 771 - 1: 35000 + 2: 35000 -10,16: - 1: 64648 + 2: 64648 -11,-14: 0: 57344 -10,-14: @@ -10936,66 +10936,66 @@ entities: 0: 12526 21,8: 0: 19 - 1: 29696 + 2: 29696 22,6: 0: 13311 22,7: 0: 3 - 1: 36352 + 2: 36352 22,5: 0: 3816 23,7: - 1: 36608 + 2: 36608 22,8: - 1: 234 + 2: 234 23,5: 0: 1646 23,6: - 1: 10 + 2: 10 24,5: 0: 1 - 1: 62208 + 2: 62208 24,6: - 1: 3 + 2: 3 24,7: - 1: 36608 + 2: 36608 23,8: - 1: 248 + 2: 248 25,5: - 1: 61440 + 2: 61440 25,7: - 1: 36608 + 2: 36608 24,8: - 1: 248 + 2: 248 26,5: - 1: 61440 + 2: 61440 26,6: 0: 30706 26,7: 0: 7 - 1: 36608 + 2: 36608 25,8: - 1: 248 + 2: 248 27,5: - 1: 63266 + 2: 63266 27,6: 0: 30576 27,7: 0: 7 - 1: 36608 + 2: 36608 26,8: - 1: 248 + 2: 248 28,5: - 1: 61440 + 2: 61440 28,6: - 1: 117 + 2: 117 0: 12288 28,7: - 1: 36672 + 2: 36672 27,8: - 1: 248 + 2: 248 25,-4: - 1: 240 + 2: 240 25,-2: 0: 2303 25,-1: @@ -11003,542 +11003,542 @@ entities: 25,-3: 0: 11776 26,-4: - 1: 240 + 2: 240 26,-3: - 1: 3856 + 2: 3856 26,-2: 0: 3959 27,-4: - 1: 240 + 2: 240 27,-3: - 1: 63232 + 2: 63232 27,-2: - 1: 32769 + 2: 32769 0: 13056 28,-4: - 1: 240 + 2: 240 28,-3: - 1: 61440 + 2: 61440 28,-1: 0: 16368 29,-4: - 1: 240 + 2: 240 28,-2: - 1: 8 + 2: 8 29,-3: - 1: 61440 + 2: 61440 29,-2: - 1: 4379 + 2: 4379 29,-1: - 1: 36767 + 2: 36767 30,-4: - 1: 240 + 2: 240 30,-3: - 1: 61440 + 2: 61440 30,-2: - 1: 275 + 2: 275 29,0: 0: 34958 31,-4: - 1: 240 + 2: 240 31,-3: - 1: 61440 + 2: 61440 31,-1: - 1: 512 + 2: 512 31,0: - 2: 35020 + 1: 35020 0: 28944 32,-4: - 1: 20222 + 2: 20222 32,-3: - 1: 63044 + 2: 63044 29,3: - 1: 61440 + 2: 61440 29,1: 0: 59528 30,3: - 1: 61712 + 2: 61712 30,0: 0: 61152 30,1: 0: 3822 31,1: 0: 279 - 2: 52360 + 1: 52360 31,3: - 1: 61440 + 2: 61440 31,2: - 1: 32 + 2: 32 32,0: - 2: 30583 + 1: 30583 32,1: - 2: 30583 + 1: 30583 32,3: - 1: 62528 + 2: 62528 29,5: - 1: 61440 + 2: 61440 29,7: - 1: 36608 + 2: 36608 28,8: - 1: 248 + 2: 248 30,5: - 1: 61440 + 2: 61440 30,7: - 1: 36608 + 2: 36608 29,8: - 1: 248 + 2: 248 31,5: - 1: 61440 + 2: 61440 31,7: - 1: 36608 + 2: 36608 30,8: - 1: 248 + 2: 248 32,5: - 1: 63044 + 2: 63044 32,7: - 1: 1860 + 2: 1860 31,8: - 1: 248 + 2: 248 32,6: - 1: 50246 + 2: 50246 32,4: - 1: 17476 + 2: 17476 33,5: - 1: 4369 + 2: 4369 33,6: - 1: 4369 + 2: 4369 33,4: - 1: 4369 + 2: 4369 33,3: - 1: 4352 + 2: 4352 33,7: - 1: 1 + 2: 1 33,0: - 1: 3 + 2: 3 33,1: - 1: 12288 + 2: 12288 32,2: - 1: 128 + 2: 128 33,2: - 1: 18432 + 2: 18432 32,-2: - 1: 1094 + 2: 1094 32,-5: - 1: 17484 + 2: 17484 33,-4: - 1: 9011 + 2: 9011 33,-3: - 1: 12834 + 2: 12834 32,-1: - 1: 2048 + 2: 2048 33,-5: - 1: 8739 + 2: 8739 33,-2: - 1: 2 + 2: 2 33,-1: - 1: 132 + 2: 132 32,-7: - 1: 61440 + 2: 61440 31,-7: - 1: 61440 + 2: 61440 32,-6: - 1: 18176 + 2: 18176 31,-6: - 1: 3976 + 2: 3976 33,-7: - 1: 12288 + 2: 12288 33,-6: - 1: 8706 + 2: 8706 25,-7: - 1: 65252 + 2: 65252 25,-6: - 1: 3976 + 2: 3976 25,-8: - 1: 50244 + 2: 50244 25,-9: - 1: 50244 + 2: 50244 26,-8: - 1: 4369 + 2: 4369 26,-7: - 1: 61713 + 2: 61713 26,-6: - 1: 3976 + 2: 3976 26,-9: - 1: 4369 + 2: 4369 27,-7: - 1: 61440 + 2: 61440 27,-6: - 1: 3976 + 2: 3976 28,-7: - 1: 61440 + 2: 61440 28,-6: - 1: 3976 + 2: 3976 29,-7: - 1: 61440 + 2: 61440 29,-6: - 1: 3976 + 2: 3976 30,-7: - 1: 61440 + 2: 61440 30,-6: - 1: 3976 + 2: 3976 -20,5: - 1: 19 + 2: 19 -21,4: - 1: 45329 + 2: 45329 -21,5: - 1: 240 + 2: 240 -19,5: - 1: 19456 + 2: 19456 -19,6: - 1: 17484 + 2: 17484 -19,7: - 1: 19660 + 2: 19660 -19,8: - 1: 19660 + 2: 19660 -18,6: - 1: 15 + 2: 15 -18,7: - 1: 36092 + 2: 36092 -18,8: - 1: 3324 + 2: 3324 -19,9: - 1: 52292 + 2: 52292 -19,10: - 1: 3148 + 2: 3148 -18,9: - 1: 61440 + 2: 61440 20,9: 0: 4099 - 1: 26112 + 2: 26112 19,9: 0: 255 - 1: 61440 + 2: 61440 20,10: - 1: 17478 + 2: 17478 20,11: - 1: 1996 + 2: 1996 19,11: - 1: 3840 + 2: 3840 21,11: - 1: 1 + 2: 1 21,10: - 1: 16034 + 2: 16034 21,9: - 1: 8738 + 2: 8738 22,10: - 1: 19 + 2: 19 22,9: - 1: 8192 + 2: 8192 16,9: - 1: 35012 + 2: 35012 17,9: - 1: 41728 + 2: 41728 0: 142 17,10: - 1: 4371 + 2: 4371 17,11: - 1: 3889 + 2: 3889 18,9: 0: 255 - 1: 61440 + 2: 61440 18,11: - 1: 3840 + 2: 3840 -14,-12: - 1: 128 + 2: 128 -14,-11: 0: 2048 -14,-10: 0: 8 -14,13: - 1: 8866 + 2: 8866 0: 2056 -14,14: - 1: 8866 + 2: 8866 0: 2056 -14,15: - 1: 8866 + 2: 8866 0: 2056 -14,16: - 1: 58914 + 2: 58914 -13,16: - 1: 61440 + 2: 61440 -12,17: - 1: 240 + 2: 240 -13,17: - 1: 240 + 2: 240 -11,16: - 1: 61440 + 2: 61440 -11,17: - 1: 240 + 2: 240 -10,17: - 1: 242 + 2: 242 17,-9: - 1: 3840 + 2: 3840 18,-9: - 1: 3840 + 2: 3840 19,-9: - 1: 3954 + 2: 3954 19,-12: - 1: 8738 + 2: 8738 19,-13: - 1: 8738 + 2: 8738 19,-11: - 1: 8738 + 2: 8738 19,-10: - 1: 8738 + 2: 8738 20,-9: - 1: 3840 + 2: 3840 32,8: - 1: 240 + 2: 240 33,8: - 1: 17 + 2: 17 13,13: - 1: 4975 + 2: 4975 13,12: - 1: 32768 + 2: 32768 -14,17: - 1: 232 + 2: 232 -8,-14: - 1: 49152 + 2: 49152 -7,-14: - 1: 61440 + 2: 61440 -7,-13: - 1: 1 + 2: 1 -6,-14: - 1: 61440 + 2: 61440 20,-12: 0: 49344 - 1: 3072 + 2: 3072 20,-11: 0: 49344 - 1: 3072 + 2: 3072 20,-10: 0: 49344 - 1: 3072 + 2: 3072 21,-12: 0: 61680 - 1: 3840 + 2: 3840 21,-11: 0: 61680 - 1: 3840 + 2: 3840 21,-10: 0: 61680 - 1: 3840 + 2: 3840 21,-9: - 1: 256 + 2: 256 22,-12: - 1: 12066 + 2: 12066 0: 32896 22,-11: - 1: 12066 + 2: 12066 0: 32896 22,-10: - 1: 12066 + 2: 12066 0: 32896 22,-13: - 1: 12066 + 2: 12066 0: 32896 23,-12: 0: 61680 - 1: 3840 + 2: 3840 23,-11: 0: 61680 - 1: 3840 + 2: 3840 23,-10: 0: 61680 - 1: 3840 + 2: 3840 24,-12: 0: 4112 - 1: 256 + 2: 256 24,-11: 0: 4112 - 1: 256 + 2: 256 24,-10: 0: 4112 - 1: 256 + 2: 256 19,-15: - 1: 62960 + 2: 62960 19,-14: - 1: 8743 + 2: 8743 20,-15: - 1: 62704 + 2: 62704 -24,0: 0: 22355 - 1: 8236 + 2: 8236 -24,-1: 0: 4415 - 1: 192 + 2: 192 -25,0: 0: 61166 - 1: 1 + 2: 1 -24,1: 0: 22353 - 1: 8238 + 2: 8238 -25,1: 0: 61166 - 1: 1 + 2: 1 -24,2: 0: 12563 - 1: 49164 + 2: 49164 -25,2: 0: 61166 - 1: 1 + 2: 1 -24,3: 0: 255 - 1: 2048 + 2: 2048 -25,3: 0: 140 -23,0: 0: 32769 - 1: 4382 + 2: 4382 -23,1: 0: 137 - 1: 4374 + 2: 4374 -23,2: 0: 24065 - 1: 41246 + 2: 41246 -23,3: 0: 255 - 1: 4864 + 2: 4864 -23,-1: - 1: 4512 + 2: 4512 0: 3679 -23,4: - 1: 12561 + 2: 12561 -22,0: 0: 12289 - 1: 286 + 2: 286 -22,1: 0: 51 - 1: 4364 + 2: 4364 -22,2: 0: 19969 - 1: 45342 + 2: 45342 -22,3: 0: 255 - 1: 2048 + 2: 2048 -22,-1: - 1: 4528 + 2: 4528 0: 3663 -24,-4: - 1: 61440 + 2: 61440 -25,-4: - 1: 49152 + 2: 49152 -24,-2: 0: 61440 - 1: 2048 + 2: 2048 -25,-2: 0: 32768 - 1: 1 + 2: 1 -25,-1: 0: 61164 -23,-4: - 1: 61440 + 2: 61440 -24,-3: - 1: 128 + 2: 128 -23,-3: - 1: 4400 + 2: 4400 -23,-2: - 1: 785 + 2: 785 0: 61440 -22,-4: - 1: 61440 + 2: 61440 -22,-2: 0: 61440 - 1: 2048 + 2: 2048 -22,-3: - 1: 128 + 2: 128 -21,-2: - 1: 785 + 2: 785 0: 61440 -26,-3: - 1: 51200 + 2: 51200 -26,-2: - 1: 17476 + 2: 17476 -26,-1: - 1: 17476 + 2: 17476 -26,0: - 1: 17476 + 2: 17476 -25,-3: - 1: 14326 + 2: 14326 -26,1: - 1: 17476 + 2: 17476 -26,2: - 1: 17476 + 2: 17476 -26,3: - 1: 17476 + 2: 17476 -26,4: - 1: 2244 + 2: 2244 -24,5: - 1: 240 + 2: 240 -25,5: - 1: 198 + 2: 198 -24,4: - 1: 32768 + 2: 32768 -23,5: - 1: 240 + 2: 240 -22,5: - 1: 240 + 2: 240 -22,4: - 1: 32768 + 2: 32768 -25,4: - 1: 63281 + 2: 63281 20,-13: 0: 49344 - 1: 3072 + 2: 3072 21,-15: - 1: 62704 + 2: 62704 21,-13: 0: 61680 - 1: 3840 + 2: 3840 22,-15: - 1: 62704 + 2: 62704 22,-14: - 1: 8192 + 2: 8192 23,-15: - 1: 62704 + 2: 62704 23,-13: 0: 61680 - 1: 3840 + 2: 3840 24,-15: - 1: 62704 + 2: 62704 24,-13: 0: 4112 - 1: 256 + 2: 256 25,-12: - 1: 50244 + 2: 50244 25,-13: - 1: 50244 + 2: 50244 25,-11: - 1: 50244 + 2: 50244 25,-10: - 1: 50244 + 2: 50244 26,-12: - 1: 4369 + 2: 4369 26,-11: - 1: 4369 + 2: 4369 26,-10: - 1: 4369 + 2: 4369 26,-13: - 1: 4369 + 2: 4369 25,-15: - 1: 62576 + 2: 62576 25,-14: - 1: 50244 + 2: 50244 26,-15: - 1: 4368 + 2: 4368 26,-14: - 1: 4369 + 2: 4369 -18,-8: - 1: 17484 + 2: 17484 -18,-9: - 1: 17600 + 2: 17600 -18,-7: - 1: 17476 + 2: 17476 -18,-6: - 1: 17476 + 2: 17476 -17,-9: - 1: 16 + 2: 16 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -11556,10 +11556,10 @@ entities: - 0 - 0 - volume: 2500 - immutable: True + temperature: 235 moles: - - 0 - - 0 + - 21.824879 + - 82.10312 - 0 - 0 - 0 @@ -11571,10 +11571,10 @@ entities: - 0 - 0 - volume: 2500 - temperature: 235 + immutable: True moles: - - 21.824879 - - 82.10312 + - 0 + - 0 - 0 - 0 - 0 @@ -144888,6 +144888,13 @@ entities: - type: Transform pos: 11.5,44.5 parent: 1 +- proto: SpawnPointAdminAssistant + entities: + - uid: 26875 + components: + - type: Transform + pos: 113.5,9.5 + parent: 1 - proto: SpawnPointAtmos entities: - uid: 6404 @@ -145124,6 +145131,23 @@ entities: - type: Transform pos: 6.5,-48.5 parent: 1 +- proto: SpawnPointCourier + entities: + - uid: 7387 + components: + - type: Transform + pos: -16.5,0.5 + parent: 1 + - uid: 12037 + components: + - type: Transform + pos: -17.5,-5.5 + parent: 1 + - uid: 23896 + components: + - type: Transform + pos: -1.5,-48.5 + parent: 1 - proto: SpawnPointDetective entities: - uid: 2540 @@ -145362,23 +145386,6 @@ entities: - type: Transform pos: -53.5,-24.5 parent: 1 -- proto: SpawnPointMailCarrier - entities: - - uid: 7387 - components: - - type: Transform - pos: -16.5,0.5 - parent: 1 - - uid: 12037 - components: - - type: Transform - pos: -17.5,-5.5 - parent: 1 - - uid: 23896 - components: - - type: Transform - pos: -1.5,-48.5 - parent: 1 - proto: SpawnPointMedicalDoctor entities: - uid: 7380 diff --git a/Resources/Maps/lighthouse.yml b/Resources/Maps/lighthouse.yml index e3d968b4b28..612f19e12d4 100644 --- a/Resources/Maps/lighthouse.yml +++ b/Resources/Maps/lighthouse.yml @@ -10160,6 +10160,12 @@ entities: - type: Transform pos: 1.5,1.5 parent: 100 + - type: Door + secondsUntilStateChange: -19.194061 + state: Opening + - type: DeviceLinkSource + lastSignals: + DoorStatus: True - uid: 86 components: - type: MetaData @@ -109394,6 +109400,13 @@ entities: - type: Transform pos: 7.5,47.5 parent: 100 +- proto: SpawnPointAdminAssistant + entities: + - uid: 20873 + components: + - type: Transform + pos: -11.5,74.5 + parent: 100 - proto: SpawnPointAtmos entities: - uid: 16151 @@ -109642,6 +109655,18 @@ entities: - type: Transform pos: 10.5,9.5 parent: 100 +- proto: SpawnPointCourier + entities: + - uid: 16733 + components: + - type: Transform + pos: -28.5,-2.5 + parent: 100 + - uid: 16734 + components: + - type: Transform + pos: -28.5,-3.5 + parent: 100 - proto: SpawnPointDetective entities: - uid: 16789 @@ -109835,18 +109860,6 @@ entities: - type: Transform pos: 18.5,-9.5 parent: 100 -- proto: SpawnPointMailCarrier - entities: - - uid: 16733 - components: - - type: Transform - pos: -28.5,-2.5 - parent: 100 - - uid: 16734 - components: - - type: Transform - pos: -28.5,-3.5 - parent: 100 - proto: SpawnPointMedicalBorg entities: - uid: 11576 diff --git a/Resources/Maps/pebble.yml b/Resources/Maps/pebble.yml index a4127408e6b..be8afddcf17 100644 --- a/Resources/Maps/pebble.yml +++ b/Resources/Maps/pebble.yml @@ -58796,6 +58796,13 @@ entities: - type: Transform pos: 24.5,-19.5 parent: 2 +- proto: SpawnPointAdminAssistant + entities: + - uid: 10228 + components: + - type: Transform + pos: -0.5,-28.5 + parent: 2 - proto: SpawnPointAtmos entities: - uid: 8868 @@ -59012,6 +59019,23 @@ entities: - type: Transform pos: 1.5,-12.5 parent: 2 +- proto: SpawnPointCourier + entities: + - uid: 8928 + components: + - type: Transform + pos: 11.5,5.5 + parent: 2 + - uid: 8929 + components: + - type: Transform + pos: 12.5,5.5 + parent: 2 + - uid: 8930 + components: + - type: Transform + pos: 7.5,5.5 + parent: 2 - proto: SpawnPointDetective entities: - uid: 8907 @@ -59186,23 +59210,6 @@ entities: - type: Transform pos: -29.5,-4.5 parent: 2 -- proto: SpawnPointMailCarrier - entities: - - uid: 8928 - components: - - type: Transform - pos: 11.5,5.5 - parent: 2 - - uid: 8929 - components: - - type: Transform - pos: 12.5,5.5 - parent: 2 - - uid: 8930 - components: - - type: Transform - pos: 7.5,5.5 - parent: 2 - proto: SpawnPointMedicalDoctor entities: - uid: 3617 diff --git a/Resources/Maps/shoukou.yml b/Resources/Maps/shoukou.yml index aae6d1c316e..e991ed978ac 100644 --- a/Resources/Maps/shoukou.yml +++ b/Resources/Maps/shoukou.yml @@ -3373,12 +3373,13 @@ entities: - type: MetaData - type: Transform - type: Map + mapPaused: True - type: PhysicsMap + - type: GridTree + - type: MovedGrids - type: Broadphase - type: OccluderTree - type: LoadedMap - - type: GridTree - - type: MovedGrids - proto: ActionToggleLight entities: - uid: 3642 @@ -3407,8 +3408,6 @@ entities: - 10576 - 12889 - 12358 - - type: AtmosDevice - joinedGrid: 34 - uid: 738 components: - type: Transform @@ -3427,8 +3426,6 @@ entities: - 841 - 10322 - 1914 - - type: AtmosDevice - joinedGrid: 34 - uid: 2349 components: - type: Transform @@ -3447,8 +3444,6 @@ entities: - 10312 - 8195 - 11404 - - type: AtmosDevice - joinedGrid: 34 - uid: 2350 components: - type: Transform @@ -3468,8 +3463,6 @@ entities: - 10301 - 10302 - 5925 - - type: AtmosDevice - joinedGrid: 34 - uid: 2410 components: - type: Transform @@ -3493,8 +3486,6 @@ entities: - 3507 - 12396 - 6957 - - type: AtmosDevice - joinedGrid: 34 - uid: 2525 components: - type: Transform @@ -3516,8 +3507,6 @@ entities: - 8817 - 8920 - 8685 - - type: AtmosDevice - joinedGrid: 34 - uid: 3295 components: - type: Transform @@ -3529,8 +3518,6 @@ entities: - 9904 - 6933 - 13664 - - type: AtmosDevice - joinedGrid: 34 - uid: 3874 components: - type: Transform @@ -3542,8 +3529,6 @@ entities: - 10712 - 9595 - 9599 - - type: AtmosDevice - joinedGrid: 34 - uid: 5208 components: - type: Transform @@ -3560,8 +3545,6 @@ entities: - 5250 - 9620 - 4449 - - type: AtmosDevice - joinedGrid: 34 - uid: 5244 components: - type: Transform @@ -3578,8 +3561,6 @@ entities: - 1302 - 1856 - 5269 - - type: AtmosDevice - joinedGrid: 34 - uid: 5426 components: - type: Transform @@ -3591,8 +3572,6 @@ entities: - 7843 - 12487 - 9598 - - type: AtmosDevice - joinedGrid: 34 - uid: 5573 components: - type: Transform @@ -3607,8 +3586,6 @@ entities: - 7164 - 7185 - 11095 - - type: AtmosDevice - joinedGrid: 34 - uid: 5585 components: - type: Transform @@ -3625,8 +3602,6 @@ entities: - 11117 - 11115 - 11116 - - type: AtmosDevice - joinedGrid: 34 - uid: 6342 components: - type: Transform @@ -3648,8 +3623,6 @@ entities: - 8911 - 8836 - 12534 - - type: AtmosDevice - joinedGrid: 34 - uid: 7099 components: - type: Transform @@ -3661,8 +3634,6 @@ entities: - 7094 - 9777 - 5925 - - type: AtmosDevice - joinedGrid: 34 - uid: 7410 components: - type: Transform @@ -3675,8 +3646,6 @@ entities: - 11112 - 2601 - 12072 - - type: AtmosDevice - joinedGrid: 34 - uid: 7683 components: - type: Transform @@ -3693,8 +3662,6 @@ entities: - 13468 - 3771 - 7612 - - type: AtmosDevice - joinedGrid: 34 - uid: 7684 components: - type: Transform @@ -3712,8 +3679,6 @@ entities: - 12141 - 12168 - 4849 - - type: AtmosDevice - joinedGrid: 34 - uid: 8028 components: - type: Transform @@ -3727,8 +3692,6 @@ entities: - 12476 - 4750 - 1870 - - type: AtmosDevice - joinedGrid: 34 - uid: 9601 components: - type: Transform @@ -3749,8 +3712,6 @@ entities: - 2986 - 2965 - 12368 - - type: AtmosDevice - joinedGrid: 34 - uid: 10291 components: - type: Transform @@ -3767,8 +3728,6 @@ entities: - 13452 - 3771 - 3553 - - type: AtmosDevice - joinedGrid: 34 - uid: 10323 components: - type: Transform @@ -3796,8 +3755,6 @@ entities: - 8643 - 5915 - 6113 - - type: AtmosDevice - joinedGrid: 34 - uid: 10395 components: - type: Transform @@ -3809,8 +3766,6 @@ entities: - 9013 - 10579 - 10580 - - type: AtmosDevice - joinedGrid: 34 - uid: 10464 components: - type: Transform @@ -3829,8 +3784,6 @@ entities: - 10582 - 10542 - 10576 - - type: AtmosDevice - joinedGrid: 34 - uid: 10544 components: - type: Transform @@ -3852,8 +3805,6 @@ entities: - 617 - 9469 - 11905 - - type: AtmosDevice - joinedGrid: 34 - uid: 10547 components: - type: Transform @@ -3867,8 +3818,6 @@ entities: - 2309 - 10317 - 2450 - - type: AtmosDevice - joinedGrid: 34 - uid: 10548 components: - type: Transform @@ -3889,8 +3838,6 @@ entities: - 12219 - 2451 - 4700 - - type: AtmosDevice - joinedGrid: 34 - uid: 10559 components: - type: Transform @@ -3910,8 +3857,6 @@ entities: - 10552 - 10553 - 11517 - - type: AtmosDevice - joinedGrid: 34 - uid: 10567 components: - type: Transform @@ -3927,8 +3872,6 @@ entities: - 10564 - 10565 - 10566 - - type: AtmosDevice - joinedGrid: 34 - uid: 10568 components: - type: Transform @@ -3943,8 +3886,6 @@ entities: - 9308 - 9765 - 11274 - - type: AtmosDevice - joinedGrid: 34 - uid: 10569 components: - type: Transform @@ -3959,8 +3900,6 @@ entities: - 9182 - 10564 - 10563 - - type: AtmosDevice - joinedGrid: 34 - uid: 10570 components: - type: Transform @@ -3985,8 +3924,6 @@ entities: - 8700 - 7981 - 7973 - - type: AtmosDevice - joinedGrid: 34 - uid: 10571 components: - type: Transform @@ -4006,8 +3943,6 @@ entities: - 9704 - 8722 - 998 - - type: AtmosDevice - joinedGrid: 34 - uid: 10574 components: - type: Transform @@ -4037,8 +3972,6 @@ entities: - 737 - 10322 - 2714 - - type: AtmosDevice - joinedGrid: 34 - uid: 10581 components: - type: Transform @@ -4059,8 +3992,6 @@ entities: - 9659 - 6402 - 5137 - - type: AtmosDevice - joinedGrid: 34 - uid: 10584 components: - type: Transform @@ -4077,8 +4008,6 @@ entities: - 10326 - 10860 - 10859 - - type: AtmosDevice - joinedGrid: 34 - uid: 10597 components: - type: Transform @@ -4100,8 +4029,6 @@ entities: - 8724 - 6140 - 10426 - - type: AtmosDevice - joinedGrid: 34 - uid: 10602 components: - type: Transform @@ -4120,8 +4047,6 @@ entities: - 9621 - 9622 - 11103 - - type: AtmosDevice - joinedGrid: 34 - uid: 10611 components: - type: Transform @@ -4137,8 +4062,6 @@ entities: - 12843 - 12844 - 10612 - - type: AtmosDevice - joinedGrid: 34 - uid: 10614 components: - type: Transform @@ -4149,8 +4072,6 @@ entities: devices: - 10612 - 10615 - - type: AtmosDevice - joinedGrid: 34 - uid: 11512 components: - type: Transform @@ -4162,8 +4083,6 @@ entities: - 10560 - 10390 - 8424 - - type: AtmosDevice - joinedGrid: 34 - uid: 11539 components: - type: Transform @@ -4175,8 +4094,6 @@ entities: - 1818 - 12977 - 11813 - - type: AtmosDevice - joinedGrid: 34 - uid: 11816 components: - type: Transform @@ -4189,8 +4106,6 @@ entities: - 11894 - 11830 - 10600 - - type: AtmosDevice - joinedGrid: 34 - uid: 11994 components: - type: Transform @@ -4202,8 +4117,6 @@ entities: - 11985 - 11983 - 11984 - - type: AtmosDevice - joinedGrid: 34 - uid: 12258 components: - type: Transform @@ -4216,8 +4129,6 @@ entities: - 4957 - 12360 - 12855 - - type: AtmosDevice - joinedGrid: 34 - uid: 12426 components: - type: Transform @@ -4230,8 +4141,6 @@ entities: - 12421 - 2936 - 12427 - - type: AtmosDevice - joinedGrid: 34 - uid: 12717 components: - type: Transform @@ -4246,8 +4155,6 @@ entities: - 12889 - 10576 - 8503 - - type: AtmosDevice - joinedGrid: 34 - uid: 13430 components: - type: Transform @@ -4266,8 +4173,6 @@ entities: - 11947 - 9614 - 9613 - - type: AtmosDevice - joinedGrid: 34 - uid: 13432 components: - type: Transform @@ -4281,8 +4186,6 @@ entities: - 11356 - 11948 - 11947 - - type: AtmosDevice - joinedGrid: 34 - uid: 13433 components: - type: Transform @@ -4296,8 +4199,6 @@ entities: - 9621 - 9619 - 13434 - - type: AtmosDevice - joinedGrid: 34 - uid: 13443 components: - type: Transform @@ -4315,8 +4216,6 @@ entities: - 11517 - 11250 - 11005 - - type: AtmosDevice - joinedGrid: 34 - uid: 13671 components: - type: Transform @@ -4332,8 +4231,6 @@ entities: - 13448 - 13449 - 7612 - - type: AtmosDevice - joinedGrid: 34 - uid: 13672 components: - type: Transform @@ -4352,8 +4249,6 @@ entities: - 13454 - 13469 - 13468 - - type: AtmosDevice - joinedGrid: 34 - uid: 13836 components: - type: Transform @@ -4363,8 +4258,6 @@ entities: - type: DeviceList devices: - 13837 - - type: AtmosDevice - joinedGrid: 34 - proto: AirCanister entities: - uid: 1799 @@ -4372,29 +4265,21 @@ entities: - type: Transform pos: -40.5,-29.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - uid: 2356 components: - type: Transform pos: -51.5,-14.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - uid: 3269 components: - type: Transform pos: -34.5,-50.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - uid: 6874 components: - type: Transform pos: -1.5,-42.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - proto: Airlock entities: - uid: 2219 @@ -7109,8 +6994,6 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,-27.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - proto: Beaker entities: - uid: 897 @@ -31857,8 +31740,6 @@ entities: - type: Transform pos: 0.5,-39.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - proto: CryoxadoneBeakerSmall entities: - uid: 12604 @@ -36430,8 +36311,6 @@ entities: - 4750 - 1078 - 3703 - - type: AtmosDevice - joinedGrid: 34 - uid: 8199 components: - type: Transform @@ -36455,8 +36334,6 @@ entities: - 10322 - 998 - 2714 - - type: AtmosDevice - joinedGrid: 34 - uid: 8271 components: - type: Transform @@ -36469,8 +36346,6 @@ entities: - 10319 - 1954 - 10576 - - type: AtmosDevice - joinedGrid: 34 - uid: 8272 components: - type: Transform @@ -36482,8 +36357,6 @@ entities: - 10551 - 10557 - 10556 - - type: AtmosDevice - joinedGrid: 34 - uid: 8273 components: - type: Transform @@ -36499,8 +36372,6 @@ entities: - 10552 - 10551 - 10549 - - type: AtmosDevice - joinedGrid: 34 - uid: 8274 components: - type: Transform @@ -36512,8 +36383,6 @@ entities: - 617 - 10563 - 10565 - - type: AtmosDevice - joinedGrid: 34 - uid: 8275 components: - type: Transform @@ -36525,8 +36394,6 @@ entities: - 10564 - 10565 - 10566 - - type: AtmosDevice - joinedGrid: 34 - uid: 8276 components: - type: Transform @@ -36544,8 +36411,6 @@ entities: - 11252 - 11253 - 5925 - - type: AtmosDevice - joinedGrid: 34 - uid: 8278 components: - type: Transform @@ -36563,8 +36428,6 @@ entities: - 11983 - 11984 - 8724 - - type: AtmosDevice - joinedGrid: 34 - uid: 8279 components: - type: Transform @@ -36583,8 +36446,6 @@ entities: - 10302 - 10308 - 10309 - - type: AtmosDevice - joinedGrid: 34 - uid: 10858 components: - type: Transform @@ -36596,8 +36457,6 @@ entities: - 10325 - 10860 - 10859 - - type: AtmosDevice - joinedGrid: 34 - uid: 10865 components: - type: Transform @@ -36608,8 +36467,6 @@ entities: devices: - 10615 - 10612 - - type: AtmosDevice - joinedGrid: 34 - uid: 10866 components: - type: Transform @@ -36620,8 +36477,6 @@ entities: devices: - 10598 - 10600 - - type: AtmosDevice - joinedGrid: 34 - uid: 11680 components: - type: Transform @@ -36631,8 +36486,6 @@ entities: devices: - 10339 - 10326 - - type: AtmosDevice - joinedGrid: 34 - uid: 11683 components: - type: Transform @@ -36643,8 +36496,6 @@ entities: devices: - 10600 - 11903 - - type: AtmosDevice - joinedGrid: 34 - uid: 11738 components: - type: Transform @@ -36656,8 +36507,6 @@ entities: - 10715 - 10578 - 10712 - - type: AtmosDevice - joinedGrid: 34 - proto: FireAxeCabinetFilled entities: - uid: 1840 @@ -38206,7 +38055,7 @@ entities: - type: Transform pos: 38.57096,-13.383774 parent: 34 -- proto: FoodChili +- proto: FoodChiliPepper entities: - uid: 1 components: @@ -38429,8 +38278,6 @@ entities: parent: 34 - type: GasFilter transferRate: 50 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#444444FF' - uid: 2983 @@ -38443,8 +38290,6 @@ entities: parent: 34 - type: GasFilter transferRate: 100 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 3244 @@ -38457,8 +38302,6 @@ entities: parent: 34 - type: GasFilter transferRate: 100 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - proto: GasMinerCarbonDioxide @@ -38468,8 +38311,6 @@ entities: - type: Transform pos: -51.5,-38.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - proto: GasMinerNitrogen entities: - uid: 1458 @@ -38477,8 +38318,6 @@ entities: - type: Transform pos: -37.5,-39.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - proto: GasMixer entities: - uid: 2406 @@ -38491,8 +38330,6 @@ entities: inletTwoConcentration: 0.78 inletOneConcentration: 0.22 targetPressure: 4500 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0000FFFF' - proto: GasMixerFlipped @@ -38507,8 +38344,6 @@ entities: inletTwoConcentration: 0.97 inletOneConcentration: 0.03 targetPressure: 4500 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#947507FF' - proto: GasOutletInjector @@ -38519,40 +38354,30 @@ entities: rot: -1.5707963267948966 rad pos: -38.5,-41.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - uid: 1254 components: - type: Transform rot: -1.5707963267948966 rad pos: -38.5,-39.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - uid: 1268 components: - type: Transform rot: -1.5707963267948966 rad pos: -38.5,-45.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - uid: 1442 components: - type: Transform rot: -1.5707963267948966 rad pos: -38.5,-43.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - uid: 1525 components: - type: Transform rot: 3.141592653589793 rad pos: -57.5,-39.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#947507FF' - uid: 1536 @@ -38561,8 +38386,6 @@ entities: rot: 3.141592653589793 rad pos: -49.5,-47.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - proto: GasPassiveGate entities: - uid: 8366 @@ -38570,8 +38393,6 @@ entities: - type: Transform pos: -38.5,-33.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - proto: GasPassiveVent @@ -38582,36 +38403,26 @@ entities: rot: 1.5707963267948966 rad pos: -12.5,-4.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - uid: 971 components: - type: Transform pos: -36.5,-43.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - uid: 1052 components: - type: Transform pos: -27.5,-4.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - uid: 1255 components: - type: Transform pos: -36.5,-39.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - uid: 1256 components: - type: Transform pos: -36.5,-41.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#00FFFFFF' - uid: 1406 @@ -38619,32 +38430,24 @@ entities: - type: Transform pos: -36.5,-45.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - uid: 1453 components: - type: Transform rot: 3.141592653589793 rad pos: -42.5,-51.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - uid: 1531 components: - type: Transform rot: 3.141592653589793 rad pos: -50.5,-47.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - uid: 1649 components: - type: Transform rot: 1.5707963267948966 rad pos: -50.5,-38.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - proto: GasPipeBend entities: - uid: 104 @@ -54776,32 +54579,24 @@ entities: - type: Transform pos: -57.5,-31.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - uid: 1564 components: - type: Transform rot: 1.5707963267948966 rad pos: -56.5,-26.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - uid: 1580 components: - type: Transform rot: -1.5707963267948966 rad pos: -56.5,-33.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - uid: 1779 components: - type: Transform rot: -1.5707963267948966 rad pos: -37.5,-32.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#F84000FF' - uid: 1780 @@ -54810,8 +54605,6 @@ entities: rot: -1.5707963267948966 rad pos: -37.5,-31.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#F84000FF' - uid: 3326 @@ -54820,32 +54613,24 @@ entities: rot: 1.5707963267948966 rad pos: -31.5,-6.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - uid: 3415 components: - type: Transform rot: 3.141592653589793 rad pos: -1.5,-42.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - uid: 3787 components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,-27.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - uid: 3811 components: - type: Transform rot: 1.5707963267948966 rad pos: 10.5,-18.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 4539 @@ -54854,8 +54639,6 @@ entities: rot: -1.5707963267948966 rad pos: 23.5,3.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - proto: GasPressurePump @@ -54866,8 +54649,6 @@ entities: rot: -1.5707963267948966 rad pos: -39.5,-35.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 125 @@ -54876,8 +54657,6 @@ entities: rot: 1.5707963267948966 rad pos: -39.5,-37.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 222 @@ -54888,8 +54667,6 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#03FCD3FF' - uid: 1154 @@ -54899,8 +54676,6 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 - - type: AtmosDevice - joinedGrid: 34 - uid: 1424 components: - type: Transform @@ -54909,8 +54684,6 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 - - type: AtmosDevice - joinedGrid: 34 - uid: 1425 components: - type: MetaData @@ -54921,8 +54694,6 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 - - type: AtmosDevice - joinedGrid: 34 - uid: 1427 components: - type: MetaData @@ -54933,8 +54704,6 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF00FFFF' - uid: 1428 @@ -54944,8 +54713,6 @@ entities: - type: Transform pos: -29.5,-4.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 1535 @@ -54956,8 +54723,6 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 - - type: AtmosDevice - joinedGrid: 34 - uid: 1537 components: - type: Transform @@ -54965,8 +54730,6 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 - - type: AtmosDevice - joinedGrid: 34 - uid: 1620 components: - type: Transform @@ -54975,8 +54738,6 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF0000FF' - uid: 1621 @@ -54986,8 +54747,6 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF0000FF' - uid: 1627 @@ -54997,8 +54756,6 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#947507FF' - uid: 1636 @@ -55009,8 +54766,6 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#444444FF' - uid: 1796 @@ -55021,8 +54776,6 @@ entities: rot: -1.5707963267948966 rad pos: -30.5,-5.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - uid: 1861 components: - type: Transform @@ -55031,8 +54784,6 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF0000FF' - uid: 2020 @@ -55043,8 +54794,6 @@ entities: rot: 1.5707963267948966 rad pos: -30.5,-6.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - uid: 2124 components: - type: MetaData @@ -55052,8 +54801,6 @@ entities: - type: Transform pos: -29.5,-7.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#F84000FF' - uid: 2426 @@ -55064,8 +54811,6 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#00FFFFFF' - uid: 2427 @@ -55076,8 +54821,6 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 225 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF0000FF' - uid: 2456 @@ -55088,8 +54831,6 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#444444FF' - uid: 3290 @@ -55100,8 +54841,6 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#444444FF' - uid: 6377 @@ -55112,8 +54851,6 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#03FCD3FF' - uid: 7765 @@ -55124,8 +54861,6 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF0000FF' - uid: 7847 @@ -55134,16 +54869,12 @@ entities: rot: 3.141592653589793 rad pos: -1.5,-41.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - uid: 8754 components: - type: Transform rot: 3.141592653589793 rad pos: -43.5,-43.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - uid: 10558 components: - type: Transform @@ -55151,8 +54882,6 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 - - type: AtmosDevice - joinedGrid: 34 - uid: 11030 components: - type: Transform @@ -55160,8 +54889,6 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#03FCD3FF' - uid: 11446 @@ -55171,8 +54898,6 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 - - type: AtmosDevice - joinedGrid: 34 - uid: 11453 components: - type: Transform @@ -55180,8 +54905,6 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#03FCD3FF' - uid: 11461 @@ -55191,8 +54914,6 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#03FCD3FF' - uid: 11463 @@ -55202,8 +54923,6 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#03FCD3FF' - uid: 11540 @@ -55213,8 +54932,6 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#03FCD3FF' - proto: GasRecycler @@ -55224,8 +54941,6 @@ entities: - type: Transform pos: -45.5,-35.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#444444FF' - proto: GasThermoMachineFreezer @@ -55235,15 +54950,11 @@ entities: - type: Transform pos: -50.5,-40.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - uid: 4105 components: - type: Transform pos: -1.5,-39.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - proto: GasThermoMachineFreezerEnabled entities: - uid: 824 @@ -55253,8 +54964,6 @@ entities: parent: 34 - type: GasThermoMachine targetTemperature: 150 - - type: AtmosDevice - joinedGrid: 34 - uid: 12611 components: - type: Transform @@ -55263,8 +54972,6 @@ entities: parent: 34 - type: GasThermoMachine targetTemperature: 295.15 - - type: AtmosDevice - joinedGrid: 34 - proto: GasThermoMachineHeater entities: - uid: 919 @@ -55272,8 +54979,6 @@ entities: - type: Transform pos: -49.5,-40.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - proto: GasThermoMachineHeaterEnabled entities: - uid: 13817 @@ -55284,8 +54989,6 @@ entities: parent: 34 - type: GasThermoMachine targetTemperature: 290.15 - - type: AtmosDevice - joinedGrid: 34 - proto: GasVentPump entities: - uid: 771 @@ -55293,8 +54996,6 @@ entities: - type: Transform pos: -14.5,-10.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 803 @@ -55303,8 +55004,6 @@ entities: rot: 1.5707963267948966 rad pos: -16.5,-8.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 2965 @@ -55316,8 +55015,6 @@ entities: - type: DeviceNetwork deviceLists: - 9601 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 2986 @@ -55329,8 +55026,6 @@ entities: - type: DeviceNetwork deviceLists: - 9601 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 3724 @@ -55339,8 +55034,6 @@ entities: rot: 1.5707963267948966 rad pos: 40.5,-34.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 3864 @@ -55352,8 +55045,6 @@ entities: - type: DeviceNetwork deviceLists: - 5244 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 3897 @@ -55365,8 +55056,6 @@ entities: - type: DeviceNetwork deviceLists: - 5244 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 4155 @@ -55378,8 +55067,6 @@ entities: - type: DeviceNetwork deviceLists: - 2410 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 4391 @@ -55391,8 +55078,6 @@ entities: - type: DeviceNetwork deviceLists: - 5585 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 4449 @@ -55404,8 +55089,6 @@ entities: - type: DeviceNetwork deviceLists: - 5208 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 4672 @@ -55417,8 +55100,6 @@ entities: - type: DeviceNetwork deviceLists: - 2410 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 4677 @@ -55430,8 +55111,6 @@ entities: - type: DeviceNetwork deviceLists: - 9601 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 4769 @@ -55439,8 +55118,6 @@ entities: - type: Transform pos: -17.5,-32.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 4783 @@ -55449,8 +55126,6 @@ entities: rot: 3.141592653589793 rad pos: -18.5,-38.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 4849 @@ -55461,8 +55136,6 @@ entities: - type: DeviceNetwork deviceLists: - 7684 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 5137 @@ -55471,8 +55144,6 @@ entities: rot: 3.141592653589793 rad pos: 0.5,-48.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 6000 @@ -55484,8 +55155,6 @@ entities: - type: DeviceNetwork deviceLists: - 5585 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 6015 @@ -55497,8 +55166,6 @@ entities: - type: DeviceNetwork deviceLists: - 10602 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 6020 @@ -55510,8 +55177,6 @@ entities: - type: DeviceNetwork deviceLists: - 12258 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 6957 @@ -55523,8 +55188,6 @@ entities: - type: DeviceNetwork deviceLists: - 2410 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 7094 @@ -55532,8 +55195,6 @@ entities: - type: Transform pos: -38.5,4.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 7164 @@ -55545,8 +55206,6 @@ entities: - type: DeviceNetwork deviceLists: - 5573 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 7665 @@ -55558,8 +55217,6 @@ entities: - type: DeviceNetwork deviceLists: - 13430 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 7677 @@ -55570,8 +55227,6 @@ entities: - type: DeviceNetwork deviceLists: - 2410 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 7772 @@ -55583,8 +55238,6 @@ entities: - type: DeviceNetwork deviceLists: - 11539 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 7843 @@ -55593,8 +55246,6 @@ entities: rot: 1.5707963267948966 rad pos: 1.5,-39.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8360 @@ -55603,8 +55254,6 @@ entities: rot: -1.5707963267948966 rad pos: -29.5,-37.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8362 @@ -55616,8 +55265,6 @@ entities: - type: DeviceNetwork deviceLists: - 13443 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8363 @@ -55626,8 +55273,6 @@ entities: rot: -1.5707963267948966 rad pos: -24.5,-26.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8364 @@ -55635,8 +55280,6 @@ entities: - type: Transform pos: -38.5,-29.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8404 @@ -55645,8 +55288,6 @@ entities: rot: 1.5707963267948966 rad pos: -45.5,-29.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8409 @@ -55655,8 +55296,6 @@ entities: rot: 3.141592653589793 rad pos: -44.5,-33.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8440 @@ -55665,8 +55304,6 @@ entities: rot: 1.5707963267948966 rad pos: -26.5,-23.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8458 @@ -55674,8 +55311,6 @@ entities: - type: Transform pos: -16.5,-19.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8463 @@ -55684,8 +55319,6 @@ entities: rot: 1.5707963267948966 rad pos: -13.5,-25.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8579 @@ -55694,8 +55327,6 @@ entities: rot: 3.141592653589793 rad pos: 39.5,1.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8610 @@ -55704,8 +55335,6 @@ entities: rot: -1.5707963267948966 rad pos: -9.5,-7.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8626 @@ -55714,8 +55343,6 @@ entities: rot: -1.5707963267948966 rad pos: -3.5,-19.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8634 @@ -55724,8 +55351,6 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,-9.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8642 @@ -55734,8 +55359,6 @@ entities: rot: 1.5707963267948966 rad pos: 1.5,-4.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8643 @@ -55744,8 +55367,6 @@ entities: rot: 3.141592653589793 rad pos: 8.5,-5.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8661 @@ -55753,8 +55374,6 @@ entities: - type: Transform pos: 9.5,-7.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8663 @@ -55763,8 +55382,6 @@ entities: rot: 1.5707963267948966 rad pos: -5.5,-5.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8684 @@ -55773,8 +55390,6 @@ entities: rot: -1.5707963267948966 rad pos: -6.5,2.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8685 @@ -55786,8 +55401,6 @@ entities: - type: DeviceNetwork deviceLists: - 2525 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8697 @@ -55795,8 +55408,6 @@ entities: - type: Transform pos: -14.5,3.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8698 @@ -55804,15 +55415,11 @@ entities: - type: Transform pos: -24.5,2.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - uid: 8699 components: - type: Transform pos: -29.5,1.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8700 @@ -55820,8 +55427,6 @@ entities: - type: Transform pos: -18.5,0.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8701 @@ -55830,8 +55435,6 @@ entities: rot: 3.141592653589793 rad pos: -23.5,-3.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8722 @@ -55839,8 +55442,6 @@ entities: - type: Transform pos: -0.5,0.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8741 @@ -55849,8 +55450,6 @@ entities: rot: -1.5707963267948966 rad pos: 10.5,1.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8751 @@ -55858,8 +55457,6 @@ entities: - type: Transform pos: 9.5,10.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8776 @@ -55870,8 +55467,6 @@ entities: - type: DeviceNetwork deviceLists: - 3295 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8779 @@ -55880,8 +55475,6 @@ entities: rot: -1.5707963267948966 rad pos: 17.5,3.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8780 @@ -55889,8 +55482,6 @@ entities: - type: Transform pos: 17.5,9.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8796 @@ -55899,8 +55490,6 @@ entities: rot: 1.5707963267948966 rad pos: 12.5,11.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8804 @@ -55909,8 +55498,6 @@ entities: rot: 3.141592653589793 rad pos: -0.5,-15.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8805 @@ -55919,8 +55506,6 @@ entities: rot: 1.5707963267948966 rad pos: 11.5,-10.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8968 @@ -55929,8 +55514,6 @@ entities: rot: 3.141592653589793 rad pos: -5.5,-47.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8977 @@ -55939,8 +55522,6 @@ entities: rot: 1.5707963267948966 rad pos: -8.5,-41.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8980 @@ -55949,8 +55530,6 @@ entities: rot: 3.141592653589793 rad pos: 5.5,-45.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8994 @@ -55959,8 +55538,6 @@ entities: rot: -1.5707963267948966 rad pos: 0.5,-33.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9013 @@ -55968,8 +55545,6 @@ entities: - type: Transform pos: -0.5,-26.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9023 @@ -55978,8 +55553,6 @@ entities: rot: 3.141592653589793 rad pos: 7.5,-40.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9044 @@ -55987,8 +55560,6 @@ entities: - type: Transform pos: 3.5,-22.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9057 @@ -55996,8 +55567,6 @@ entities: - type: Transform pos: 0.5,-19.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9061 @@ -56005,8 +55574,6 @@ entities: - type: Transform pos: 5.5,-20.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9116 @@ -56015,8 +55582,6 @@ entities: rot: 1.5707963267948966 rad pos: 31.5,-22.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9182 @@ -56025,8 +55590,6 @@ entities: rot: -1.5707963267948966 rad pos: -24.5,-18.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9191 @@ -56035,8 +55598,6 @@ entities: rot: 1.5707963267948966 rad pos: -31.5,-14.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9201 @@ -56044,8 +55605,6 @@ entities: - type: Transform pos: -33.5,-19.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9234 @@ -56054,8 +55613,6 @@ entities: rot: 3.141592653589793 rad pos: -34.5,-3.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9255 @@ -56064,8 +55621,6 @@ entities: rot: -1.5707963267948966 rad pos: -46.5,2.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9256 @@ -56074,8 +55629,6 @@ entities: rot: 1.5707963267948966 rad pos: -48.5,2.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9257 @@ -56084,8 +55637,6 @@ entities: rot: 1.5707963267948966 rad pos: -49.5,-4.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9258 @@ -56094,8 +55645,6 @@ entities: rot: -1.5707963267948966 rad pos: -47.5,-4.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9265 @@ -56104,8 +55653,6 @@ entities: rot: 3.141592653589793 rad pos: -43.5,-5.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9266 @@ -56114,8 +55661,6 @@ entities: rot: 1.5707963267948966 rad pos: -54.5,-1.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9294 @@ -56124,8 +55669,6 @@ entities: rot: 1.5707963267948966 rad pos: -49.5,-6.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9295 @@ -56134,8 +55677,6 @@ entities: rot: -1.5707963267948966 rad pos: -47.5,-6.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9297 @@ -56144,8 +55685,6 @@ entities: rot: 1.5707963267948966 rad pos: -39.5,-7.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9307 @@ -56154,8 +55693,6 @@ entities: rot: 3.141592653589793 rad pos: -29.5,-11.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9308 @@ -56164,8 +55701,6 @@ entities: rot: 1.5707963267948966 rad pos: -33.5,-10.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9346 @@ -56174,8 +55709,6 @@ entities: rot: 3.141592653589793 rad pos: 30.5,-44.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9469 @@ -56184,8 +55717,6 @@ entities: rot: -1.5707963267948966 rad pos: -16.5,-23.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9470 @@ -56194,8 +55725,6 @@ entities: rot: -1.5707963267948966 rad pos: -10.5,-32.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9594 @@ -56207,8 +55736,6 @@ entities: - type: DeviceNetwork deviceLists: - 2525 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9595 @@ -56220,8 +55747,6 @@ entities: - type: DeviceNetwork deviceLists: - 3874 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9609 @@ -56232,8 +55757,6 @@ entities: - type: DeviceNetwork deviceLists: - 2525 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9614 @@ -56245,8 +55768,6 @@ entities: - type: DeviceNetwork deviceLists: - 13430 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9782 @@ -56255,8 +55776,6 @@ entities: rot: 3.141592653589793 rad pos: -40.5,2.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9783 @@ -56264,8 +55783,6 @@ entities: - type: Transform pos: -40.5,7.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 10027 @@ -56273,8 +55790,6 @@ entities: - type: Transform pos: 22.5,-22.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 10390 @@ -56283,8 +55798,6 @@ entities: rot: 1.5707963267948966 rad pos: -51.5,-26.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 10426 @@ -56293,8 +55806,6 @@ entities: rot: 1.5707963267948966 rad pos: 8.5,6.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 10467 @@ -56303,8 +55814,6 @@ entities: rot: -1.5707963267948966 rad pos: -3.5,-36.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 10560 @@ -56313,8 +55822,6 @@ entities: rot: 3.141592653589793 rad pos: -45.5,-27.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11005 @@ -56325,8 +55832,6 @@ entities: - type: DeviceNetwork deviceLists: - 13443 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11112 @@ -56335,8 +55840,6 @@ entities: rot: 1.5707963267948966 rad pos: -34.5,-42.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11404 @@ -56348,8 +55851,6 @@ entities: - type: DeviceNetwork deviceLists: - 2349 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11519 @@ -56358,8 +55859,6 @@ entities: rot: 1.5707963267948966 rad pos: -39.5,-23.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11534 @@ -56371,8 +55870,6 @@ entities: - type: DeviceNetwork deviceLists: - 13432 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11894 @@ -56381,8 +55878,6 @@ entities: rot: 3.141592653589793 rad pos: 1.5,13.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11906 @@ -56391,8 +55886,6 @@ entities: rot: -1.5707963267948966 rad pos: 16.5,16.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11985 @@ -56400,8 +55893,6 @@ entities: - type: Transform pos: -2.5,3.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12072 @@ -56410,8 +55901,6 @@ entities: rot: 1.5707963267948966 rad pos: -36.5,-49.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12205 @@ -56420,8 +55909,6 @@ entities: rot: 1.5707963267948966 rad pos: -56.5,-8.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12212 @@ -56430,8 +55917,6 @@ entities: rot: 3.141592653589793 rad pos: -49.5,-13.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12220 @@ -56440,8 +55925,6 @@ entities: rot: -1.5707963267948966 rad pos: -24.5,-30.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12368 @@ -56453,8 +55936,6 @@ entities: - type: DeviceNetwork deviceLists: - 9601 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12457 @@ -56466,8 +55947,6 @@ entities: - type: DeviceNetwork deviceLists: - 7684 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12464 @@ -56479,8 +55958,6 @@ entities: - type: DeviceNetwork deviceLists: - 7684 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12475 @@ -56492,8 +55969,6 @@ entities: - type: DeviceNetwork deviceLists: - 8028 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12476 @@ -56505,8 +55980,6 @@ entities: - type: DeviceNetwork deviceLists: - 8028 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12480 @@ -56518,8 +55991,6 @@ entities: - type: DeviceNetwork deviceLists: - 13672 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12483 @@ -56531,8 +56002,6 @@ entities: - type: DeviceNetwork deviceLists: - 13672 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12485 @@ -56544,8 +56013,6 @@ entities: - type: DeviceNetwork deviceLists: - 13672 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12490 @@ -56557,8 +56024,6 @@ entities: - type: DeviceNetwork deviceLists: - 7683 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12534 @@ -56570,8 +56035,6 @@ entities: - type: DeviceNetwork deviceLists: - 6342 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12668 @@ -56580,8 +56043,6 @@ entities: rot: 1.5707963267948966 rad pos: -12.5,-5.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12843 @@ -56593,8 +56054,6 @@ entities: deviceLists: - 10611 - 9601 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12860 @@ -56603,8 +56062,6 @@ entities: rot: 1.5707963267948966 rad pos: -7.5,11.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12942 @@ -56613,8 +56070,6 @@ entities: rot: -1.5707963267948966 rad pos: 43.5,3.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12966 @@ -56623,8 +56078,6 @@ entities: rot: 3.141592653589793 rad pos: -12.5,-40.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 13104 @@ -56633,8 +56086,6 @@ entities: rot: 1.5707963267948966 rad pos: 13.5,16.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 13126 @@ -56643,8 +56094,6 @@ entities: rot: 3.141592653589793 rad pos: 44.5,-15.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 13190 @@ -56653,8 +56102,6 @@ entities: rot: 3.141592653589793 rad pos: 26.5,-38.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 13214 @@ -56666,8 +56113,6 @@ entities: - type: DeviceNetwork deviceLists: - 13432 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 13241 @@ -56679,8 +56124,6 @@ entities: - type: DeviceNetwork deviceLists: - 5208 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 13245 @@ -56692,8 +56135,6 @@ entities: - type: DeviceNetwork deviceLists: - 2525 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 13448 @@ -56704,8 +56145,6 @@ entities: - type: DeviceNetwork deviceLists: - 13671 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 13451 @@ -56717,8 +56156,6 @@ entities: - type: DeviceNetwork deviceLists: - 13671 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 13452 @@ -56730,8 +56167,6 @@ entities: - type: DeviceNetwork deviceLists: - 10291 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 13454 @@ -56743,8 +56178,6 @@ entities: - type: DeviceNetwork deviceLists: - 13672 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 13496 @@ -56756,8 +56189,6 @@ entities: - type: DeviceNetwork deviceLists: - 6342 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 13497 @@ -56768,8 +56199,6 @@ entities: - type: DeviceNetwork deviceLists: - 6342 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - proto: GasVentScrubber @@ -56780,8 +56209,6 @@ entities: rot: 3.141592653589793 rad pos: -13.5,-4.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 1101 @@ -56793,8 +56220,6 @@ entities: - type: DeviceNetwork deviceLists: - 9601 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 1411 @@ -56806,8 +56231,6 @@ entities: - type: DeviceNetwork deviceLists: - 5244 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 1818 @@ -56819,8 +56242,6 @@ entities: - type: DeviceNetwork deviceLists: - 11539 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 1914 @@ -56828,8 +56249,6 @@ entities: - type: Transform pos: -17.5,-6.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 1974 @@ -56837,8 +56256,6 @@ entities: - type: Transform pos: -19.5,-19.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 2451 @@ -56846,8 +56263,6 @@ entities: - type: Transform pos: -33.5,-35.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 2601 @@ -56856,8 +56271,6 @@ entities: rot: 1.5707963267948966 rad pos: -34.5,-46.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 2936 @@ -56866,8 +56279,6 @@ entities: rot: -1.5707963267948966 rad pos: 9.5,-42.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 3881 @@ -56879,8 +56290,6 @@ entities: - type: DeviceNetwork deviceLists: - 5244 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 4079 @@ -56892,8 +56301,6 @@ entities: - type: DeviceNetwork deviceLists: - 2410 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 4159 @@ -56905,8 +56312,6 @@ entities: - type: DeviceNetwork deviceLists: - 2410 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 4472 @@ -56918,8 +56323,6 @@ entities: - type: DeviceNetwork deviceLists: - 5585 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 4957 @@ -56931,8 +56334,6 @@ entities: - type: DeviceNetwork deviceLists: - 12258 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 5850 @@ -56941,8 +56342,6 @@ entities: rot: -1.5707963267948966 rad pos: -40.5,1.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 5851 @@ -56951,8 +56350,6 @@ entities: rot: -1.5707963267948966 rad pos: -40.5,8.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 5915 @@ -56961,8 +56358,6 @@ entities: rot: 1.5707963267948966 rad pos: 4.5,-5.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 5997 @@ -56974,8 +56369,6 @@ entities: - type: DeviceNetwork deviceLists: - 5585 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 6096 @@ -56987,8 +56380,6 @@ entities: - type: DeviceNetwork deviceLists: - 8028 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 6113 @@ -56997,8 +56388,6 @@ entities: rot: -1.5707963267948966 rad pos: 9.5,-5.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 6554 @@ -57007,8 +56396,6 @@ entities: rot: 3.141592653589793 rad pos: 27.5,-38.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 6873 @@ -57017,8 +56404,6 @@ entities: rot: 1.5707963267948966 rad pos: 1.5,-40.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 7185 @@ -57030,8 +56415,6 @@ entities: - type: DeviceNetwork deviceLists: - 5573 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 7667 @@ -57043,8 +56426,6 @@ entities: - type: DeviceNetwork deviceLists: - 13430 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 7973 @@ -57052,8 +56433,6 @@ entities: - type: Transform pos: -16.5,0.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 7981 @@ -57062,8 +56441,6 @@ entities: rot: 3.141592653589793 rad pos: -26.5,-1.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 7987 @@ -57071,8 +56448,6 @@ entities: - type: Transform pos: -30.5,1.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 7988 @@ -57080,8 +56455,6 @@ entities: - type: Transform pos: -23.5,2.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 7989 @@ -57089,8 +56462,6 @@ entities: - type: Transform pos: -17.5,3.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 8195 @@ -57102,8 +56473,6 @@ entities: - type: DeviceNetwork deviceLists: - 2349 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 8424 @@ -57112,8 +56481,6 @@ entities: rot: 1.5707963267948966 rad pos: -51.5,-25.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 8817 @@ -57124,8 +56491,6 @@ entities: - type: DeviceNetwork deviceLists: - 2525 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 8836 @@ -57137,8 +56502,6 @@ entities: - type: DeviceNetwork deviceLists: - 6342 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 8920 @@ -57150,8 +56513,6 @@ entities: - type: DeviceNetwork deviceLists: - 2525 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 8936 @@ -57160,8 +56521,6 @@ entities: rot: 1.5707963267948966 rad pos: 37.5,1.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 8993 @@ -57170,8 +56529,6 @@ entities: rot: -1.5707963267948966 rad pos: -0.5,-32.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9010 @@ -57180,8 +56537,6 @@ entities: rot: -1.5707963267948966 rad pos: 0.5,-28.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9372 @@ -57190,8 +56545,6 @@ entities: rot: 3.141592653589793 rad pos: -43.5,-33.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9373 @@ -57200,8 +56553,6 @@ entities: rot: 1.5707963267948966 rad pos: -44.5,-31.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9374 @@ -57210,8 +56561,6 @@ entities: rot: 3.141592653589793 rad pos: -40.5,-31.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9414 @@ -57222,8 +56571,6 @@ entities: - type: DeviceNetwork deviceLists: - 13443 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9445 @@ -57232,8 +56579,6 @@ entities: rot: 1.5707963267948966 rad pos: -29.5,-18.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9456 @@ -57242,8 +56587,6 @@ entities: rot: 3.141592653589793 rad pos: -23.5,-26.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9460 @@ -57251,8 +56594,6 @@ entities: - type: Transform pos: -22.5,-18.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9496 @@ -57261,8 +56602,6 @@ entities: rot: -1.5707963267948966 rad pos: -8.5,-25.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9510 @@ -57271,8 +56610,6 @@ entities: rot: 1.5707963267948966 rad pos: -16.5,-10.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9522 @@ -57280,8 +56617,6 @@ entities: - type: Transform pos: -9.5,-8.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9534 @@ -57290,8 +56625,6 @@ entities: rot: 1.5707963267948966 rad pos: -5.5,-6.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9545 @@ -57300,8 +56633,6 @@ entities: rot: 3.141592653589793 rad pos: 0.5,-9.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9546 @@ -57310,8 +56641,6 @@ entities: rot: -1.5707963267948966 rad pos: 8.5,-7.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9562 @@ -57320,8 +56649,6 @@ entities: rot: -1.5707963267948966 rad pos: 0.5,-18.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9571 @@ -57330,8 +56657,6 @@ entities: rot: -1.5707963267948966 rad pos: -3.5,-20.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9590 @@ -57339,8 +56664,6 @@ entities: - type: Transform pos: 4.5,-22.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9593 @@ -57348,8 +56671,6 @@ entities: - type: Transform pos: 6.5,-20.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9598 @@ -57361,8 +56682,6 @@ entities: - type: DeviceNetwork deviceLists: - 2525 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9599 @@ -57374,8 +56693,6 @@ entities: - type: DeviceNetwork deviceLists: - 3874 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9610 @@ -57383,8 +56700,6 @@ entities: - type: Transform pos: 5.5,-35.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9613 @@ -57395,8 +56710,6 @@ entities: - type: DeviceNetwork deviceLists: - 13430 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9615 @@ -57408,8 +56721,6 @@ entities: - type: DeviceNetwork deviceLists: - 10602 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9620 @@ -57421,8 +56732,6 @@ entities: - type: DeviceNetwork deviceLists: - 5208 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9637 @@ -57434,8 +56743,6 @@ entities: - type: DeviceNetwork deviceLists: - 2525 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9638 @@ -57447,8 +56754,6 @@ entities: - type: DeviceNetwork deviceLists: - 5208 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9659 @@ -57457,8 +56762,6 @@ entities: rot: 3.141592653589793 rad pos: -7.5,-47.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9660 @@ -57467,8 +56770,6 @@ entities: rot: 1.5707963267948966 rad pos: -8.5,-43.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9686 @@ -57477,8 +56778,6 @@ entities: rot: 3.141592653589793 rad pos: 0.5,-46.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9687 @@ -57487,8 +56786,6 @@ entities: rot: -1.5707963267948966 rad pos: 6.5,-45.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#F84000FF' - uid: 9704 @@ -57496,8 +56793,6 @@ entities: - type: Transform pos: 3.5,0.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9706 @@ -57506,8 +56801,6 @@ entities: rot: 1.5707963267948966 rad pos: -11.5,4.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9707 @@ -57516,8 +56809,6 @@ entities: rot: -1.5707963267948966 rad pos: -6.5,3.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9764 @@ -57526,8 +56817,6 @@ entities: rot: 3.141592653589793 rad pos: -30.5,-11.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#F84000FF' - uid: 9765 @@ -57536,8 +56825,6 @@ entities: rot: 1.5707963267948966 rad pos: -33.5,-9.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#F84000FF' - uid: 9766 @@ -57546,8 +56833,6 @@ entities: rot: -1.5707963267948966 rad pos: -35.5,-4.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9777 @@ -57555,8 +56840,6 @@ entities: - type: Transform pos: -36.5,2.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9799 @@ -57565,8 +56848,6 @@ entities: rot: 1.5707963267948966 rad pos: -39.5,-3.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9800 @@ -57575,8 +56856,6 @@ entities: rot: 3.141592653589793 rad pos: -41.5,-3.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9805 @@ -57585,8 +56864,6 @@ entities: rot: 1.5707963267948966 rad pos: -54.5,-0.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9822 @@ -57594,8 +56871,6 @@ entities: - type: Transform pos: -44.5,2.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9823 @@ -57603,8 +56878,6 @@ entities: - type: Transform pos: -48.5,1.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9824 @@ -57613,8 +56886,6 @@ entities: rot: 3.141592653589793 rad pos: -46.5,-4.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9825 @@ -57623,8 +56894,6 @@ entities: rot: 3.141592653589793 rad pos: -49.5,-3.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9844 @@ -57632,8 +56901,6 @@ entities: - type: Transform pos: -46.5,-6.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9845 @@ -57641,8 +56908,6 @@ entities: - type: Transform pos: -51.5,-6.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9875 @@ -57651,8 +56916,6 @@ entities: rot: 1.5707963267948966 rad pos: 11.5,1.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9886 @@ -57661,8 +56924,6 @@ entities: rot: 3.141592653589793 rad pos: 10.5,7.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9887 @@ -57670,8 +56931,6 @@ entities: - type: Transform pos: 10.5,11.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9892 @@ -57679,8 +56938,6 @@ entities: - type: Transform pos: 17.5,6.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9894 @@ -57689,8 +56946,6 @@ entities: rot: -1.5707963267948966 rad pos: 16.5,9.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9902 @@ -57699,8 +56954,6 @@ entities: rot: 1.5707963267948966 rad pos: 12.5,10.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9904 @@ -57712,8 +56965,6 @@ entities: - type: DeviceNetwork deviceLists: - 3295 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9925 @@ -57722,8 +56973,6 @@ entities: rot: 1.5707963267948966 rad pos: 11.5,-12.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 10055 @@ -57731,8 +56980,6 @@ entities: - type: Transform pos: 11.5,-21.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 10094 @@ -57741,8 +56988,6 @@ entities: rot: 1.5707963267948966 rad pos: 25.5,-40.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 10098 @@ -57751,8 +56996,6 @@ entities: rot: 3.141592653589793 rad pos: 29.5,-44.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 10218 @@ -57760,8 +57003,6 @@ entities: - type: Transform pos: 28.5,-22.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 10466 @@ -57770,8 +57011,6 @@ entities: rot: -1.5707963267948966 rad pos: -3.5,-35.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 10672 @@ -57780,8 +57019,6 @@ entities: rot: 1.5707963267948966 rad pos: -39.5,-20.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11250 @@ -57792,8 +57029,6 @@ entities: - type: DeviceNetwork deviceLists: - 13443 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11274 @@ -57802,8 +57037,6 @@ entities: rot: -1.5707963267948966 rad pos: -34.5,-17.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11355 @@ -57815,8 +57048,6 @@ entities: - type: DeviceNetwork deviceLists: - 13432 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11356 @@ -57828,8 +57059,6 @@ entities: - type: DeviceNetwork deviceLists: - 13432 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11527 @@ -57838,8 +57067,6 @@ entities: rot: 3.141592653589793 rad pos: -44.5,-27.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11575 @@ -57848,8 +57075,6 @@ entities: rot: 1.5707963267948966 rad pos: -15.5,-34.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11830 @@ -57857,8 +57082,6 @@ entities: - type: Transform pos: 9.5,14.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11902 @@ -57867,8 +57090,6 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,13.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11905 @@ -57877,8 +57098,6 @@ entities: rot: 1.5707963267948966 rad pos: -19.5,-23.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11986 @@ -57886,8 +57105,6 @@ entities: - type: Transform pos: -1.5,3.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12015 @@ -57896,8 +57113,6 @@ entities: rot: 3.141592653589793 rad pos: -8.5,-1.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12141 @@ -57908,8 +57123,6 @@ entities: - type: DeviceNetwork deviceLists: - 7684 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12168 @@ -57921,8 +57134,6 @@ entities: - type: DeviceNetwork deviceLists: - 7684 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12173 @@ -57934,8 +57145,6 @@ entities: - type: DeviceNetwork deviceLists: - 7684 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12177 @@ -57947,8 +57156,6 @@ entities: - type: DeviceNetwork deviceLists: - 7683 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12186 @@ -57959,8 +57166,6 @@ entities: - type: DeviceNetwork deviceLists: - 10291 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12187 @@ -57972,8 +57177,6 @@ entities: - type: DeviceNetwork deviceLists: - 13672 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12204 @@ -57982,8 +57185,6 @@ entities: rot: 1.5707963267948966 rad pos: -56.5,-11.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12219 @@ -57992,8 +57193,6 @@ entities: rot: -1.5707963267948966 rad pos: -25.5,-29.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12226 @@ -58002,8 +57201,6 @@ entities: rot: 3.141592653589793 rad pos: -29.5,-31.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12358 @@ -58012,8 +57209,6 @@ entities: rot: 1.5707963267948966 rad pos: -16.5,-38.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12396 @@ -58025,8 +57220,6 @@ entities: - type: DeviceNetwork deviceLists: - 2410 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12401 @@ -58038,8 +57231,6 @@ entities: - type: DeviceNetwork deviceLists: - 2410 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12402 @@ -58051,8 +57242,6 @@ entities: - type: DeviceNetwork deviceLists: - 13672 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12421 @@ -58061,8 +57250,6 @@ entities: rot: -1.5707963267948966 rad pos: 7.5,-41.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12431 @@ -58074,8 +57261,6 @@ entities: - type: DeviceNetwork deviceLists: - 13672 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12477 @@ -58087,8 +57272,6 @@ entities: - type: DeviceNetwork deviceLists: - 8028 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12844 @@ -58100,8 +57283,6 @@ entities: deviceLists: - 10611 - 9601 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12879 @@ -58110,8 +57291,6 @@ entities: rot: 3.141592653589793 rad pos: -5.5,8.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12889 @@ -58120,8 +57299,6 @@ entities: rot: 3.141592653589793 rad pos: -13.5,-40.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12931 @@ -58130,8 +57307,6 @@ entities: rot: -1.5707963267948966 rad pos: -9.5,-34.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 13106 @@ -58140,8 +57315,6 @@ entities: rot: -1.5707963267948966 rad pos: 16.5,15.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 13127 @@ -58150,8 +57323,6 @@ entities: rot: 3.141592653589793 rad pos: 43.5,-15.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 13449 @@ -58163,8 +57334,6 @@ entities: - type: DeviceNetwork deviceLists: - 13671 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 13450 @@ -58176,8 +57345,6 @@ entities: - type: DeviceNetwork deviceLists: - 13671 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 13453 @@ -58189,8 +57356,6 @@ entities: - type: DeviceNetwork deviceLists: - 13672 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 13498 @@ -58202,8 +57367,6 @@ entities: - type: DeviceNetwork deviceLists: - 6342 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 13499 @@ -58214,8 +57377,6 @@ entities: - type: DeviceNetwork deviceLists: - 6342 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - proto: GasVolumePump @@ -58227,8 +57388,6 @@ entities: parent: 34 - type: GasVolumePump transferRate: 40 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#03FCD3FF' - uid: 944 @@ -58238,8 +57397,6 @@ entities: parent: 34 - type: GasVolumePump transferRate: 100 - - type: AtmosDevice - joinedGrid: 34 - uid: 961 components: - type: Transform @@ -58247,16 +57404,12 @@ entities: parent: 34 - type: GasVolumePump transferRate: 100 - - type: AtmosDevice - joinedGrid: 34 - uid: 1565 components: - type: Transform rot: -1.5707963267948966 rad pos: -56.5,-24.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#03FCD3FF' - uid: 1637 @@ -58267,8 +57420,6 @@ entities: parent: 34 - type: GasVolumePump transferRate: 15 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#444444FF' - uid: 11487 @@ -58278,8 +57429,6 @@ entities: parent: 34 - type: GasVolumePump transferRate: 40 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#03FCD3FF' - uid: 11531 @@ -58289,8 +57438,6 @@ entities: parent: 34 - type: GasVolumePump transferRate: 40 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#03FCD3FF' - uid: 11546 @@ -58300,8 +57447,6 @@ entities: parent: 34 - type: GasVolumePump transferRate: 40 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#03FCD3FF' - uid: 11580 @@ -58311,8 +57456,6 @@ entities: parent: 34 - type: GasVolumePump transferRate: 40 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#03FCD3FF' - uid: 13795 @@ -58323,8 +57466,6 @@ entities: parent: 34 - type: GasVolumePump transferRate: 50 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#444444FF' - uid: 13796 @@ -58335,8 +57476,6 @@ entities: parent: 34 - type: GasVolumePump transferRate: 1 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#444444FF' - uid: 13830 @@ -58344,8 +57483,6 @@ entities: - type: Transform pos: -45.5,-49.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - proto: Gauze entities: - uid: 1371 @@ -62427,8 +61564,6 @@ entities: rot: 3.141592653589793 rad pos: -56.5,-37.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#444444FF' - uid: 1522 @@ -62437,8 +61572,6 @@ entities: rot: 1.5707963267948966 rad pos: -56.5,-41.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF0000FF' - uid: 1541 @@ -62446,8 +61579,6 @@ entities: - type: Transform pos: -59.5,-37.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF0000FF' - uid: 1612 @@ -62456,8 +61587,6 @@ entities: rot: 3.141592653589793 rad pos: -55.5,-37.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF0000FF' - uid: 1615 @@ -62466,8 +61595,6 @@ entities: rot: 3.141592653589793 rad pos: -55.5,-39.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF0000FF' - uid: 1626 @@ -62476,8 +61603,6 @@ entities: rot: 3.141592653589793 rad pos: -56.5,-39.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#444444FF' - uid: 1638 @@ -62485,8 +61610,6 @@ entities: - type: Transform pos: -58.5,-39.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#444444FF' - uid: 1639 @@ -62494,8 +61617,6 @@ entities: - type: Transform pos: -59.5,-39.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF0000FF' - uid: 3329 @@ -62503,22 +61624,16 @@ entities: - type: Transform pos: -45.5,-53.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - uid: 3330 components: - type: Transform pos: -44.5,-53.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - uid: 3378 components: - type: Transform pos: -58.5,-37.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#444444FF' - uid: 3789 @@ -62527,8 +61642,6 @@ entities: rot: 1.5707963267948966 rad pos: -58.5,-41.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - type: AtmosPipeColor color: '#FF0000FF' - uid: 11687 @@ -62536,36 +61649,26 @@ entities: - type: Transform pos: -62.5,-21.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - uid: 11705 components: - type: Transform pos: -61.5,-21.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - uid: 11769 components: - type: Transform pos: -60.5,-21.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - uid: 11829 components: - type: Transform pos: -59.5,-21.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - uid: 11834 components: - type: Transform pos: -58.5,-21.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - proto: HighSecCommandLocked entities: - uid: 1073 @@ -64477,22 +63580,16 @@ entities: - type: Transform pos: -38.5,-29.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - uid: 7818 components: - type: Transform pos: -52.5,-33.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - uid: 12979 components: - type: Transform pos: -55.5,-16.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - proto: NitrousOxideTankFilled entities: - uid: 8957 @@ -64583,43 +63680,31 @@ entities: - type: Transform pos: -37.5,-29.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - uid: 10358 components: - type: Transform pos: 29.5,8.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - uid: 10359 components: - type: Transform pos: -23.5,-4.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - uid: 10618 components: - type: Transform pos: -30.5,-42.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - uid: 12324 components: - type: Transform pos: -52.5,-31.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - uid: 12980 components: - type: Transform pos: -50.5,-20.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - proto: PaintingBlunt entities: - uid: 2407 @@ -64979,15 +64064,11 @@ entities: - type: Transform pos: -52.5,-32.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - uid: 13794 components: - type: Transform pos: -57.5,-31.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - proto: PlasmaReinforcedWindowDirectional entities: - uid: 13338 @@ -73898,6 +72979,13 @@ entities: - type: Transform pos: -28.5,-34.5 parent: 34 +- proto: SpawnPointAdminAssistant + entities: + - uid: 13847 + components: + - type: Transform + pos: 46.5,-34.5 + parent: 34 - proto: SpawnPointAtmos entities: - uid: 10425 @@ -74049,6 +73137,18 @@ entities: - type: Transform pos: -1.5,-19.5 parent: 34 +- proto: SpawnPointCourier + entities: + - uid: 857 + components: + - type: Transform + pos: -7.5,-26.5 + parent: 34 + - uid: 1284 + components: + - type: Transform + pos: -8.5,-26.5 + parent: 34 - proto: SpawnPointDetective entities: - uid: 4415 @@ -74155,18 +73255,6 @@ entities: - type: Transform pos: -7.5,-17.5 parent: 34 -- proto: SpawnPointMailCarrier - entities: - - uid: 857 - components: - - type: Transform - pos: -7.5,-26.5 - parent: 34 - - uid: 1284 - components: - - type: Transform - pos: -8.5,-26.5 - parent: 34 - proto: SpawnPointMartialArtist entities: - uid: 11940 @@ -74968,15 +74056,11 @@ entities: - type: Transform pos: -47.5,-40.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - uid: 1648 components: - type: Transform pos: -48.5,-40.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - proto: SubstationBasic entities: - uid: 2236 @@ -77994,8 +77078,6 @@ entities: - type: Transform pos: -55.5,-29.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - proto: TegCirculator entities: - uid: 6159 @@ -87140,8 +86222,6 @@ entities: - type: Transform pos: -52.5,-30.5 parent: 34 - - type: AtmosDevice - joinedGrid: 34 - proto: WeaponCapacitorRecharger entities: - uid: 3395 diff --git a/Resources/Maps/submarine.yml b/Resources/Maps/submarine.yml index 3f70bc93d27..5bdfe281ee0 100644 --- a/Resources/Maps/submarine.yml +++ b/Resources/Maps/submarine.yml @@ -217303,6 +217303,13 @@ entities: - type: Transform pos: 15.5,-35.5 parent: 2 +- proto: SpawnPointAdminAssistant + entities: + - uid: 40565 + components: + - type: Transform + pos: 13.5,42.5 + parent: 2 - proto: SpawnPointAtmos entities: - uid: 39400 @@ -217479,6 +217486,18 @@ entities: - type: Transform pos: -75.5,1.5 parent: 2 +- proto: SpawnPointCourier + entities: + - uid: 983 + components: + - type: Transform + pos: -9.5,-23.5 + parent: 2 + - uid: 9974 + components: + - type: Transform + pos: -8.5,-23.5 + parent: 2 - proto: SpawnPointDetective entities: - uid: 34033 @@ -217703,18 +217722,6 @@ entities: - type: Transform pos: 75.5,-8.5 parent: 2 -- proto: SpawnPointMailCarrier - entities: - - uid: 983 - components: - - type: Transform - pos: -9.5,-23.5 - parent: 2 - - uid: 9974 - components: - - type: Transform - pos: -8.5,-23.5 - parent: 2 - proto: SpawnPointMartialArtist entities: - uid: 13394 diff --git a/Resources/Maps/tortuga.yml b/Resources/Maps/tortuga.yml index a0c83a9f1fc..4e121cf1359 100644 --- a/Resources/Maps/tortuga.yml +++ b/Resources/Maps/tortuga.yml @@ -10958,8 +10958,8 @@ entities: 0: 65535 7,16: 0: 255 - 4: 32768 - 6: 8192 + 3: 32768 + 4: 8192 8,12: 0: 30583 8,13: @@ -11426,8 +11426,8 @@ entities: 0: 4359 8,16: 0: 255 - 3: 8192 - 5: 32768 + 5: 8192 + 6: 32768 9,12: 0: 14327 9,13: @@ -11440,7 +11440,7 @@ entities: 0: 30583 9,16: 0: 255 - 5: 40960 + 6: 40960 10,12: 0: 2032 10,13: @@ -11453,7 +11453,7 @@ entities: 0: 65535 10,16: 0: 255 - 5: 40960 + 6: 40960 11,12: 0: 30583 11,13: @@ -11985,11 +11985,11 @@ entities: 23,13: 0: 4369 8,17: - 3: 34 - 5: 136 + 5: 34 + 6: 136 7,17: - 4: 136 - 6: 34 + 3: 136 + 4: 34 8,18: 1: 61471 7,18: @@ -12003,7 +12003,7 @@ entities: 9,19: 1: 29936 9,17: - 5: 170 + 6: 170 9,20: 1: 62579 10,18: @@ -12011,7 +12011,7 @@ entities: 10,19: 1: 17532 10,17: - 5: 170 + 6: 170 10,20: 1: 29764 11,18: @@ -12703,10 +12703,10 @@ entities: - volume: 2500 temperature: 293.15 moles: + - 6666.982 - 0 - 0 - 0 - - 6666.982 - 0 - 0 - 0 @@ -12718,8 +12718,8 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 6666.982 - 0 + - 6666.982 - 0 - 0 - 0 @@ -12736,7 +12736,7 @@ entities: - 0 - 0 - 0 - - 0 + - 6666.982 - 0 - 0 - 0 @@ -12749,7 +12749,7 @@ entities: temperature: 293.15 moles: - 0 - - 6666.982 + - 0 - 0 - 0 - 0 @@ -168972,6 +168972,13 @@ entities: - type: Transform pos: -11.5,75.5 parent: 33 +- proto: SpawnPointAdminAssistant + entities: + - uid: 30941 + components: + - type: Transform + pos: -62.5,23.5 + parent: 33 - proto: SpawnPointAtmos entities: - uid: 29733 @@ -169155,6 +169162,28 @@ entities: - type: Transform pos: -14.5,18.5 parent: 33 +- proto: SpawnPointCourier + entities: + - uid: 3585 + components: + - type: Transform + pos: 7.5,-20.5 + parent: 33 + - uid: 13075 + components: + - type: Transform + pos: 6.5,-20.5 + parent: 33 + - uid: 13580 + components: + - type: Transform + pos: 23.5,-27.5 + parent: 33 + - uid: 13581 + components: + - type: Transform + pos: 21.5,-27.5 + parent: 33 - proto: SpawnPointDetective entities: - uid: 28854 @@ -169399,28 +169428,6 @@ entities: - type: Transform pos: 44.5,14.5 parent: 33 -- proto: SpawnPointMailCarrier - entities: - - uid: 3585 - components: - - type: Transform - pos: 7.5,-20.5 - parent: 33 - - uid: 13075 - components: - - type: Transform - pos: 6.5,-20.5 - parent: 33 - - uid: 13580 - components: - - type: Transform - pos: 23.5,-27.5 - parent: 33 - - uid: 13581 - components: - - type: Transform - pos: 21.5,-27.5 - parent: 33 - proto: SpawnPointMedicalDoctor entities: - uid: 5974 diff --git a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml index 4b58fd96dee..a3bf8321ab8 100644 --- a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml @@ -27,7 +27,6 @@ - sprite: DeltaV/Markers/jobs.rsi state: courier - - type: entity id: SpawnPointAdminAssistant parent: SpawnPointJobBase diff --git a/Resources/Prototypes/Maps/arena.yml b/Resources/Prototypes/Maps/arena.yml index fb5f6596443..11f428a691c 100644 --- a/Resources/Prototypes/Maps/arena.yml +++ b/Resources/Prototypes/Maps/arena.yml @@ -24,6 +24,7 @@ Librarian: [ 1, 1 ] #command Captain: [ 1, 1 ] + AdministrativeAssistant: [ 1, 1 ] #engineering AtmosphericTechnician: [ 1, 2 ] ChiefEngineer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/asterisk.yml b/Resources/Prototypes/Maps/asterisk.yml index 4f758d3f5b8..28592d9dba5 100644 --- a/Resources/Prototypes/Maps/asterisk.yml +++ b/Resources/Prototypes/Maps/asterisk.yml @@ -21,6 +21,7 @@ availableJobs: #service Captain: [ 1, 1 ] + AdministrativeAssistant: [ 1, 1 ] HeadOfPersonnel: [ 1, 1 ] Bartender: [ 1, 2 ] Botanist: [ 2, 3 ] diff --git a/Resources/Prototypes/Maps/edge.yml b/Resources/Prototypes/Maps/edge.yml index 7cc1d5a3d08..03851a5acf5 100644 --- a/Resources/Prototypes/Maps/edge.yml +++ b/Resources/Prototypes/Maps/edge.yml @@ -21,6 +21,7 @@ availableJobs: #service Captain: [ 1, 1 ] + AdministrativeAssistant: [ 1, 1 ] HeadOfPersonnel: [ 1, 1 ] Bartender: [ 1, 2 ] Botanist: [ 2, 3 ] diff --git a/Resources/Prototypes/Maps/hammurabi.yml b/Resources/Prototypes/Maps/hammurabi.yml index 5727071b3b3..fb2cc9a38d3 100644 --- a/Resources/Prototypes/Maps/hammurabi.yml +++ b/Resources/Prototypes/Maps/hammurabi.yml @@ -23,6 +23,7 @@ Librarian: [ 1, 1 ] #command Captain: [ 1, 1 ] + AdministrativeAssistant: [ 1, 1 ] #engineering AtmosphericTechnician: [ 2, 3 ] ChiefEngineer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/hive.yml b/Resources/Prototypes/Maps/hive.yml index 88708f64705..700ac8ab129 100644 --- a/Resources/Prototypes/Maps/hive.yml +++ b/Resources/Prototypes/Maps/hive.yml @@ -24,6 +24,7 @@ Librarian: [ 1, 1 ] #command Captain: [ 1, 1 ] + AdministrativeAssistant: [ 1, 1 ] #engineering AtmosphericTechnician: [ 1, 2 ] ChiefEngineer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/lighthouse.yml b/Resources/Prototypes/Maps/lighthouse.yml index cffedb84375..3e3811535d4 100644 --- a/Resources/Prototypes/Maps/lighthouse.yml +++ b/Resources/Prototypes/Maps/lighthouse.yml @@ -20,6 +20,7 @@ - Passenger availableJobs: Captain: [ 1, 1 ] + AdministrativeAssistant: [ 1, 1 ] #service HeadOfPersonnel: [ 1, 1 ] Bartender: [ 2, 4 ] diff --git a/Resources/Prototypes/Maps/pebble.yml b/Resources/Prototypes/Maps/pebble.yml index c282f6e24ba..c16ba73966e 100644 --- a/Resources/Prototypes/Maps/pebble.yml +++ b/Resources/Prototypes/Maps/pebble.yml @@ -19,6 +19,7 @@ availableJobs: #service Captain: [ 1, 1 ] + AdministrativeAssistant: [ 1, 1 ] HeadOfPersonnel: [ 1, 1 ] Bartender: [ 1, 2 ] Botanist: [ 2, 2 ] diff --git a/Resources/Prototypes/Maps/shoukou.yml b/Resources/Prototypes/Maps/shoukou.yml index d3216cff75a..fab6854966a 100644 --- a/Resources/Prototypes/Maps/shoukou.yml +++ b/Resources/Prototypes/Maps/shoukou.yml @@ -33,6 +33,7 @@ Musician: [ 1, 1] Mime: [ 1, 1 ] Captain: [ 1, 1 ] + AdministrativeAssistant: [ 1, 1 ] HeadOfPersonnel: [ 1, 1 ] #Engineering ChiefEngineer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/submarine.yml b/Resources/Prototypes/Maps/submarine.yml index 1d4fc2217e1..8acc99230fa 100644 --- a/Resources/Prototypes/Maps/submarine.yml +++ b/Resources/Prototypes/Maps/submarine.yml @@ -23,6 +23,7 @@ Librarian: [ 1, 1 ] #command Captain: [ 1, 1 ] + AdministrativeAssistant: [ 1, 1 ] #engineering AtmosphericTechnician: [ 2, 4 ] ChiefEngineer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/tortuga.yml b/Resources/Prototypes/Maps/tortuga.yml index 0b6f69247fd..e236ff4c4cb 100644 --- a/Resources/Prototypes/Maps/tortuga.yml +++ b/Resources/Prototypes/Maps/tortuga.yml @@ -23,6 +23,7 @@ Librarian: [ 1, 1 ] #command Captain: [ 1, 1 ] + AdministrativeAssistant: [ 1, 1 ] #engineering AtmosphericTechnician: [ 2, 3 ] ChiefEngineer: [ 1, 1 ] From 14da00bb0d69d81de40c6f418a80f753352a9603 Mon Sep 17 00:00:00 2001 From: Noctis Date: Wed, 15 May 2024 23:53:34 +0100 Subject: [PATCH 07/17] Reverts Spawns + Fixes mail courier somewhat noctis makes yet another oopsie, I'll revert / fix whatevers needed after review --- .../Locale/en-US/deltav/job/job-names.ftl | 1 + Resources/Maps/arena.yml | 41 +- Resources/Maps/asterisk.yml | 7 - Resources/Maps/edge.yml | 41 +- Resources/Maps/hammurabi.yml | 66 +- Resources/Maps/hive.yml | 1155 ++++++++--------- Resources/Maps/lighthouse.yml | 37 +- Resources/Maps/pebble.yml | 41 +- Resources/Maps/shoukou.yml | 966 +++++++++++++- Resources/Maps/submarine.yml | 31 +- Resources/Maps/tortuga.yml | 83 +- Resources/Prototypes/Maps/arena.yml | 1 - Resources/Prototypes/Maps/asterisk.yml | 1 - Resources/Prototypes/Maps/edge.yml | 1 - Resources/Prototypes/Maps/hammurabi.yml | 1 - Resources/Prototypes/Maps/hive.yml | 1 - Resources/Prototypes/Maps/lighthouse.yml | 1 - Resources/Prototypes/Maps/pebble.yml | 1 - Resources/Prototypes/Maps/shoukou.yml | 1 - Resources/Prototypes/Maps/submarine.yml | 1 - Resources/Prototypes/Maps/tortuga.yml | 1 - 21 files changed, 1661 insertions(+), 818 deletions(-) diff --git a/Resources/Locale/en-US/deltav/job/job-names.ftl b/Resources/Locale/en-US/deltav/job/job-names.ftl index 097e1905e67..ef9dee633a3 100644 --- a/Resources/Locale/en-US/deltav/job/job-names.ftl +++ b/Resources/Locale/en-US/deltav/job/job-names.ftl @@ -1,2 +1,3 @@ job-name-medical-borg = Medical Cyborg +job-name-courier = Courier job-name-admin-assistant = Administrative Assistant \ No newline at end of file diff --git a/Resources/Maps/arena.yml b/Resources/Maps/arena.yml index 2eb65dfe62c..8309564315f 100644 --- a/Resources/Maps/arena.yml +++ b/Resources/Maps/arena.yml @@ -150785,13 +150785,6 @@ entities: - type: Transform pos: 31.5,-61.5 parent: 6747 -- proto: SpawnPointAdminAssistant - entities: - - uid: 27793 - components: - - type: Transform - pos: -25.5,-48.5 - parent: 6747 - proto: SpawnPointAtmos entities: - uid: 17076 @@ -150968,23 +150961,6 @@ entities: - type: Transform pos: 38.5,-12.5 parent: 6747 -- proto: SpawnPointCourier - entities: - - uid: 27031 - components: - - type: Transform - pos: 13.5,28.5 - parent: 6747 - - uid: 27032 - components: - - type: Transform - pos: 10.5,26.5 - parent: 6747 - - uid: 27033 - components: - - type: Transform - pos: 17.5,24.5 - parent: 6747 - proto: SpawnPointDetective entities: - uid: 25557 @@ -151165,6 +151141,23 @@ entities: - type: Transform pos: -31.5,17.5 parent: 6747 +- proto: SpawnPointMailCarrier + entities: + - uid: 27031 + components: + - type: Transform + pos: 13.5,28.5 + parent: 6747 + - uid: 27032 + components: + - type: Transform + pos: 10.5,26.5 + parent: 6747 + - uid: 27033 + components: + - type: Transform + pos: 17.5,24.5 + parent: 6747 - proto: SpawnPointMedicalDoctor entities: - uid: 367 diff --git a/Resources/Maps/asterisk.yml b/Resources/Maps/asterisk.yml index 39068d3e367..ab5ef7cf721 100644 --- a/Resources/Maps/asterisk.yml +++ b/Resources/Maps/asterisk.yml @@ -59356,13 +59356,6 @@ entities: - type: Transform pos: -35.5,-21.5 parent: 2 -- proto: SpawnPointAdminAssistant - entities: - - uid: 11521 - components: - - type: Transform - pos: 49.5,-5.5 - parent: 2 - proto: SpawnPointAtmos entities: - uid: 10897 diff --git a/Resources/Maps/edge.yml b/Resources/Maps/edge.yml index fa8c52c61d4..8ed6d8d03b5 100644 --- a/Resources/Maps/edge.yml +++ b/Resources/Maps/edge.yml @@ -90844,13 +90844,6 @@ entities: - type: Transform pos: 7.5,-7.5 parent: 2 -- proto: SpawnPointAdminAssistant - entities: - - uid: 17484 - components: - - type: Transform - pos: -12.5,43.5 - parent: 2 - proto: SpawnPointAtmos entities: - uid: 13933 @@ -91047,23 +91040,6 @@ entities: - type: Transform pos: -33.5,9.5 parent: 2 -- proto: SpawnPointCourier - entities: - - uid: 13998 - components: - - type: Transform - pos: 15.5,-26.5 - parent: 2 - - uid: 13999 - components: - - type: Transform - pos: 15.5,-28.5 - parent: 2 - - uid: 14000 - components: - - type: Transform - pos: 16.5,-27.5 - parent: 2 - proto: SpawnPointDetective entities: - uid: 13967 @@ -91235,6 +91211,23 @@ entities: - type: Transform pos: -20.5,20.5 parent: 2 +- proto: SpawnPointMailCarrier + entities: + - uid: 13998 + components: + - type: Transform + pos: 15.5,-26.5 + parent: 2 + - uid: 13999 + components: + - type: Transform + pos: 15.5,-28.5 + parent: 2 + - uid: 14000 + components: + - type: Transform + pos: 16.5,-27.5 + parent: 2 - proto: SpawnPointMedicalDoctor entities: - uid: 14001 diff --git a/Resources/Maps/hammurabi.yml b/Resources/Maps/hammurabi.yml index 497911770e3..070d289a8f0 100644 --- a/Resources/Maps/hammurabi.yml +++ b/Resources/Maps/hammurabi.yml @@ -15419,7 +15419,7 @@ entities: -27,-13: 0: 57344 4: 48 - 5: 136 + 6: 136 -26,-12: 0: 4095 -26,-11: @@ -15428,8 +15428,8 @@ entities: 0: 61168 -26,-13: 0: 61440 - 5: 17 - 6: 204 + 6: 17 + 7: 204 -25,-13: 0: 62702 -40,-1: @@ -15991,7 +15991,7 @@ entities: -28,-17: 0: 65391 -28,-15: - 7: 7 + 5: 7 4: 1792 -28,-14: 4: 7 @@ -16924,9 +16924,9 @@ entities: temperature: 293.15 moles: - 0 - - 6666.982 - 0 - 0 + - 6666.982 - 0 - 0 - 0 @@ -16938,8 +16938,8 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 6666.982 - 0 + - 6666.982 - 0 - 0 - 0 @@ -16953,10 +16953,10 @@ entities: - volume: 2500 temperature: 293.15 moles: + - 6666.982 - 0 - 0 - 0 - - 6666.982 - 0 - 0 - 0 @@ -205901,6 +205901,7 @@ entities: pos: 42.5,-1.5 parent: 1 missingComponents: + - Construction - Damageable - uid: 15226 components: @@ -239014,13 +239015,6 @@ entities: - type: Transform pos: -20.5,-32.5 parent: 1 -- proto: SpawnPointAdminAssistant - entities: - - uid: 42984 - components: - - type: Transform - pos: -101.5,5.5 - parent: 1 - proto: SpawnPointAtmos entities: - uid: 3237 @@ -239260,28 +239254,6 @@ entities: - type: Transform pos: -68.5,2.5 parent: 1 -- proto: SpawnPointCourier - entities: - - uid: 17152 - components: - - type: Transform - pos: -38.5,40.5 - parent: 1 - - uid: 17153 - components: - - type: Transform - pos: -14.5,31.5 - parent: 1 - - uid: 17154 - components: - - type: Transform - pos: -17.5,31.5 - parent: 1 - - uid: 17155 - components: - - type: Transform - pos: -16.5,33.5 - parent: 1 - proto: SpawnPointDetective entities: - uid: 29453 @@ -239587,6 +239559,28 @@ entities: - type: Transform pos: -64.5,3.5 parent: 1 +- proto: SpawnPointMailCarrier + entities: + - uid: 17152 + components: + - type: Transform + pos: -38.5,40.5 + parent: 1 + - uid: 17153 + components: + - type: Transform + pos: -14.5,31.5 + parent: 1 + - uid: 17154 + components: + - type: Transform + pos: -17.5,31.5 + parent: 1 + - uid: 17155 + components: + - type: Transform + pos: -16.5,33.5 + parent: 1 - proto: SpawnPointMedicalDoctor entities: - uid: 1741 diff --git a/Resources/Maps/hive.yml b/Resources/Maps/hive.yml index ac13c9a73f2..6142830be2b 100644 --- a/Resources/Maps/hive.yml +++ b/Resources/Maps/hive.yml @@ -8685,7 +8685,7 @@ entities: 0: 65039 0,4: 0: 33279 - 1: 12288 + 2: 12288 0,-1: 0: 61166 1,0: @@ -8782,17 +8782,17 @@ entities: 0: 39743 -8,-9: 0: 65280 - 2: 4 + 1: 4 -9,-8: 0: 65416 -8,-7: 0: 4369 - 2: 52428 + 1: 52428 -9,-7: 0: 48056 -8,-6: 0: 4593 - 2: 49152 + 1: 49152 -9,-6: 0: 63931 -8,-5: @@ -8804,13 +8804,13 @@ entities: -7,-8: 0: 21839 -7,-7: - 2: 65521 + 1: 65521 0: 4 -7,-6: - 2: 65535 + 1: 65535 -7,-5: 0: 61681 - 2: 14 + 1: 14 -7,-9: 0: 65535 -7,-4: @@ -8818,49 +8818,49 @@ entities: -6,-8: 0: 65535 -6,-7: - 2: 65520 + 1: 65520 -6,-6: - 2: 16383 + 1: 16383 -6,-5: - 2: 1 + 1: 1 0: 47290 -6,-9: 0: 65297 - 2: 4 + 1: 4 -6,-4: 0: 65225 -5,-8: 0: 13119 - 2: 34816 + 1: 34816 -5,-7: - 2: 30712 + 1: 30712 -5,-6: - 2: 7 + 1: 7 0: 60928 -5,-5: 0: 4479 - 1: 49152 + 2: 49152 -5,-9: 0: 65416 -5,-4: 0: 4881 - 1: 52428 + 2: 52428 -4,-8: 0: 15 - 2: 65280 + 1: 65280 -4,-6: 0: 65294 -4,-5: 0: 34947 - 1: 13056 + 2: 13056 -4,-4: - 1: 4403 + 2: 4403 0: 49288 -4,-3: - 1: 1 + 2: 1 0: 32524 -5,-3: - 1: 12 + 2: 12 0: 64272 -4,-2: 0: 63255 @@ -8984,7 +8984,7 @@ entities: 0: 63351 -8,-1: 0: 21572 - 2: 17 + 1: 17 -9,0: 0: 65501 -8,1: @@ -8993,15 +8993,15 @@ entities: 0: 56831 -8,2: 0: 17477 - 2: 4352 + 1: 4352 -9,2: 0: 284 - 2: 52224 + 1: 52224 -8,3: - 2: 23 + 1: 23 0: 31744 -9,3: - 2: 255 + 1: 255 0: 53504 -8,4: 0: 57460 @@ -9046,19 +9046,19 @@ entities: -4,3: 0: 65287 -9,-4: - 2: 65248 + 1: 65248 -8,-3: 0: 17873 - 2: 4096 + 1: 4096 -9,-3: - 2: 65535 + 1: 65535 -8,-2: - 2: 30583 + 1: 30583 -9,-2: - 2: 52462 + 1: 52462 0: 785 -9,-1: - 2: 204 + 1: 204 0: 49425 -7,-3: 0: 30591 @@ -9088,10 +9088,10 @@ entities: 0: 61160 -1,4: 0: 4607 - 1: 49152 + 2: 49152 -9,4: 0: 196 - 2: 61713 + 1: 61713 -8,5: 0: 65534 -8,6: @@ -9104,48 +9104,48 @@ entities: 0: 56558 -8,8: 0: 141 - 2: 57856 + 1: 57856 -7,5: 0: 511 - 2: 49152 + 1: 49152 -7,7: 0: 12289 - 2: 35054 + 1: 35054 -7,6: - 2: 61166 + 1: 61166 -7,8: 0: 55 - 2: 63624 + 1: 63624 -6,5: 0: 3827 -6,6: - 2: 30481 + 1: 30481 0: 102 -6,7: - 2: 65527 + 1: 65527 -6,8: - 2: 65535 + 1: 65535 -5,5: 0: 15344 -5,6: 0: 49151 -5,7: - 2: 65328 + 1: 65328 0: 8 -5,8: - 2: 8191 + 1: 8191 -4,5: 0: 52700 -4,6: 0: 65311 -4,7: 0: 79 - 2: 28928 + 1: 28928 0,5: - 1: 51 + 2: 51 0: 63628 -1,5: - 1: 204 + 2: 204 0: 61457 0,6: 0: 62702 @@ -9153,12 +9153,12 @@ entities: 0: 62347 0,7: 0: 3087 - 2: 13056 + 1: 13056 -1,7: 0: 13103 - 2: 34816 + 1: 34816 0,8: - 2: 4095 + 1: 4095 1,5: 0: 61183 1,6: @@ -9166,7 +9166,7 @@ entities: 1,7: 0: 53007 1,8: - 2: 273 + 1: 273 0: 3276 2,5: 0: 56575 @@ -9196,21 +9196,21 @@ entities: 0: 58976 -3,-8: 0: 3299 - 2: 4096 + 1: 4096 -3,-7: - 2: 52479 + 1: 52479 0: 4096 -3,-6: 0: 65281 - 2: 12 + 1: 12 -3,-9: 0: 40160 -2,-8: 0: 20465 -2,-7: - 2: 65393 + 1: 65393 -2,-6: - 2: 15 + 1: 15 0: 65280 -2,-9: 0: 56784 @@ -9218,18 +9218,18 @@ entities: 0: 49136 -1,-7: 0: 3 - 2: 65408 + 1: 65408 -1,-6: - 2: 15 + 1: 15 0: 65280 -1,-9: 0: 48058 0,-8: 0: 4080 0,-7: - 2: 16382 + 1: 16382 0,-6: - 2: 3 + 1: 3 0: 65292 0,-9: 0: 61199 @@ -9264,7 +9264,7 @@ entities: 4,-6: 0: 65295 -4,8: - 2: 4095 + 1: 4095 -3,5: 0: 54551 -3,6: @@ -9272,7 +9272,7 @@ entities: -3,7: 0: 33727 -3,8: - 2: 4095 + 1: 4095 -2,5: 0: 55807 -2,6: @@ -9280,10 +9280,10 @@ entities: -2,7: 0: 28783 -2,8: - 2: 247 + 1: 247 0: 10240 -1,8: - 2: 248 + 1: 248 0: 16640 -12,0: 0: 32767 @@ -9305,7 +9305,7 @@ entities: 0: 15291 -12,4: 0: 7 - 2: 61064 + 1: 61064 -11,0: 0: 65535 -11,1: @@ -9317,7 +9317,7 @@ entities: -11,-1: 0: 64796 -11,4: - 2: 65535 + 1: 65535 -10,0: 0: 61438 -10,1: @@ -9327,30 +9327,30 @@ entities: -10,3: 0: 35591 -10,4: - 2: 65535 + 1: 65535 -10,-1: 0: 36591 4,8: 0: 819 - 2: 2184 + 1: 2184 5,5: 0: 49617 5,6: 0: 64433 5,7: 0: 783 - 2: 52224 + 1: 52224 5,8: - 2: 4095 + 1: 4095 6,5: 0: 48120 6,6: 0: 16305 6,7: 0: 79 - 2: 28928 + 1: 28928 6,8: - 2: 255 + 1: 255 0: 10240 7,5: 0: 47931 @@ -9358,9 +9358,9 @@ entities: 0: 33720 7,7: 0: 959 - 2: 32768 + 1: 32768 7,8: - 2: 255 + 1: 255 0: 16640 8,4: 0: 65485 @@ -9370,9 +9370,9 @@ entities: 0: 63803 8,7: 0: 15 - 2: 65024 + 1: 65024 8,8: - 2: 255 + 1: 255 0: 3840 9,4: 0: 65535 @@ -9385,7 +9385,7 @@ entities: 9,3: 0: 65359 9,8: - 2: 30719 + 1: 30719 10,4: 0: 65535 10,5: @@ -9394,20 +9394,20 @@ entities: 0: 65520 10,7: 0: 271 - 2: 60928 + 1: 60928 10,3: 0: 65294 10,8: - 2: 51 + 1: 51 0: 63616 11,4: 0: 53213 11,6: 0: 4371 - 2: 52360 + 1: 52360 11,7: 0: 1 - 2: 4044 + 1: 4044 11,3: 0: 53709 11,5: @@ -9418,9 +9418,9 @@ entities: 0: 30583 12,5: 0: 7 - 2: 15872 + 1: 15872 12,6: - 2: 3 + 1: 3 0: 61320 12,7: 0: 18190 @@ -9429,20 +9429,20 @@ entities: 12,8: 0: 65535 13,4: - 2: 29491 + 1: 29491 0: 136 13,5: - 2: 1911 + 1: 1911 13,6: 0: 48059 13,7: 0: 65419 13,3: - 2: 13107 + 1: 13107 0: 32844 13,8: 0: 13107 - 2: 34944 + 1: 34944 14,4: 0: 48059 14,5: @@ -9451,7 +9451,7 @@ entities: 0: 65535 14,7: 0: 287 - 2: 1024 + 1: 1024 14,3: 0: 16360 15,4: @@ -9462,7 +9462,7 @@ entities: 0: 48059 15,7: 0: 139 - 2: 512 + 1: 512 15,3: 0: 7163 16,4: @@ -9511,20 +9511,20 @@ entities: 0: 55807 13,2: 0: 49629 - 2: 12288 + 1: 12288 13,-1: 0: 56592 - 2: 15 + 1: 15 14,0: 0: 65435 14,1: 0: 47359 14,2: 0: 35003 - 2: 12288 + 1: 12288 14,-1: 0: 48012 - 2: 1 + 1: 1 15,0: 0: 65485 15,1: @@ -9567,24 +9567,24 @@ entities: 0: 65535 11,-5: 0: 61440 - 2: 238 + 1: 238 12,-4: 0: 4096 - 2: 35942 + 1: 35942 12,-3: 0: 28531 12,-2: 0: 26215 12,-5: - 2: 26227 + 1: 26227 0: 12 13,-4: 0: 15 - 2: 30464 + 1: 30464 13,-3: - 2: 26215 + 1: 26215 13,-2: - 2: 65399 + 1: 65399 13,-5: 0: 15245 14,-4: @@ -9618,33 +9618,33 @@ entities: 7,-8: 0: 49136 8,-7: - 2: 65534 + 1: 65534 7,-7: - 2: 65408 + 1: 65408 0: 3 8,-6: - 2: 15 + 1: 15 0: 65280 7,-6: - 2: 15 + 1: 15 0: 65280 9,-8: 0: 1775 9,-7: - 2: 8191 + 1: 8191 9,-6: - 2: 1 + 1: 1 0: 65422 9,-9: 0: 64733 10,-8: 0: 61439 10,-7: - 2: 18224 + 1: 18224 0: 8 10,-6: 0: 61699 - 2: 204 + 1: 204 10,-9: 0: 4369 11,-8: @@ -9652,7 +9652,7 @@ entities: 11,-7: 0: 61247 11,-6: - 2: 58992 + 1: 58992 0: 128 12,-8: 0: 65535 @@ -9660,24 +9660,24 @@ entities: 0: 65295 12,-6: 0: 51258 - 2: 12288 + 1: 12288 4,-9: 0: 48027 5,-8: 0: 4080 5,-7: - 2: 53247 + 1: 53247 5,-6: 0: 65283 - 2: 12 + 1: 12 5,-9: 0: 47931 6,-8: 0: 20466 6,-7: - 2: 65393 + 1: 65393 6,-6: - 2: 15 + 1: 15 0: 65280 6,-9: 0: 30471 @@ -9708,64 +9708,64 @@ entities: 18,4: 0: 14327 19,0: - 2: 15 + 1: 15 0: 65280 19,1: 0: 12543 - 2: 32768 + 1: 32768 19,2: 0: 65283 - 2: 8 + 1: 8 19,3: 0: 30479 19,-1: - 2: 61440 + 1: 61440 0: 191 19,4: 0: 1919 20,0: - 2: 15 + 1: 15 0: 65280 20,1: 0: 255 - 2: 61440 + 1: 61440 20,2: - 2: 1 + 1: 1 0: 56576 20,3: 0: 65309 20,-1: - 2: 61440 + 1: 61440 0: 187 20,4: 0: 64511 21,0: - 2: 15 + 1: 15 0: 65280 21,1: 0: 255 - 2: 61440 + 1: 61440 21,2: 0: 4352 - 2: 34952 + 1: 34952 21,3: 0: 54721 21,-1: - 2: 63488 + 1: 63488 0: 55 21,4: 0: 56541 22,0: - 2: 3 + 1: 3 0: 65416 22,1: 0: 52479 - 2: 4096 + 1: 4096 22,2: - 2: 12561 + 1: 12561 0: 2252 22,-1: - 2: 13107 + 1: 13107 0: 34952 22,3: 0: 41640 @@ -9837,7 +9837,7 @@ entities: 0: 45311 0,-13: 0: 65282 - 2: 8 + 1: 8 -1,-12: 0: 57583 0,-11: @@ -9856,7 +9856,7 @@ entities: 0: 56575 1,-13: 0: 65280 - 2: 7 + 1: 7 2,-12: 0: 55551 2,-11: @@ -9865,7 +9865,7 @@ entities: 0: 8191 2,-13: 0: 65281 - 2: 12 + 1: 12 3,-12: 0: 45567 3,-11: @@ -9874,7 +9874,7 @@ entities: 0: 36863 3,-13: 0: 65280 - 2: 15 + 1: 15 4,-12: 0: 63743 4,-11: @@ -9885,7 +9885,7 @@ entities: 0: 47359 8,-13: 0: 28672 - 2: 200 + 1: 200 7,-12: 0: 53631 8,-11: @@ -9904,15 +9904,15 @@ entities: 0: 56829 10,-12: 0: 4352 - 2: 35023 + 1: 35023 10,-11: 0: 12561 - 2: 35016 + 1: 35016 10,-10: 0: 13107 - 2: 34952 + 1: 34952 10,-13: - 2: 43694 + 1: 43694 4,12: 0: 3838 5,9: @@ -10011,7 +10011,7 @@ entities: 0: 61951 13,-7: 0: 13070 - 2: 2048 + 1: 2048 13,-6: 0: 56559 13,-8: @@ -10020,7 +10020,7 @@ entities: 0: 65523 14,-7: 0: 34831 - 2: 768 + 1: 768 14,-6: 0: 47935 14,-9: @@ -10041,7 +10041,7 @@ entities: 0: 4380 16,-9: 0: 4352 - 2: 19456 + 1: 19456 17,-8: 0: 4401 17,-7: @@ -10063,26 +10063,26 @@ entities: 20,-5: 0: 4092 8,-14: - 2: 36608 + 1: 36608 7,-14: - 2: 3584 + 1: 3584 9,-14: - 2: 3840 + 1: 3840 9,-13: - 2: 272 + 1: 272 10,-14: - 2: 28416 + 1: 28416 11,-14: - 2: 4352 + 1: 4352 11,-13: - 2: 17 + 1: 17 4,-14: 0: 43520 4,-13: 0: 65450 5,-13: 0: 65280 - 2: 14 + 1: 14 5,-12: 0: 64767 6,-13: @@ -10093,7 +10093,7 @@ entities: 0: 65535 7,-13: 0: 30464 - 2: 8 + 1: 8 0,-14: 0: 8192 -1,-13: @@ -10101,18 +10101,18 @@ entities: 2,-14: 0: 4096 -4,-14: - 2: 61440 + 1: 61440 -5,-14: - 2: 61440 + 1: 61440 -3,-14: - 2: 28672 + 1: 28672 -3,-13: - 2: 498 + 1: 498 0: 49152 -3,-12: 0: 14206 -2,-13: - 2: 18 + 1: 18 0: 56320 -2,-12: 0: 65295 @@ -10136,26 +10136,26 @@ entities: 0: 63351 -9,-9: 0: 32768 - 2: 17 + 1: 17 -8,-10: - 2: 17484 + 1: 17484 -8,-12: - 2: 34952 + 1: 34952 -8,-13: - 2: 34956 + 1: 34956 -8,-11: - 2: 34952 + 1: 34952 -7,-10: 0: 65280 -6,-10: 0: 4352 - 2: 17478 + 1: 17478 -6,-12: - 2: 8738 + 1: 8738 -6,-13: - 2: 8743 + 1: 8743 -6,-11: - 2: 8738 + 1: 8738 5,-11: 0: 52511 5,-10: @@ -10186,19 +10186,19 @@ entities: 0: 7631 23,-2: 0: 49425 - 2: 68 + 1: 68 24,-4: - 2: 497 + 1: 497 24,-3: 0: 65280 - 2: 2 + 1: 2 24,-2: 0: 14335 24,-1: 0: 15288 24,4: 0: 4575 - 2: 16384 + 1: 16384 25,0: 0: 46011 25,1: @@ -10219,7 +10219,7 @@ entities: 0: 2512 26,4: 0: 3 - 2: 76 + 1: 76 26,-1: 0: 12151 27,0: @@ -10228,13 +10228,13 @@ entities: 0: 61439 27,3: 0: 272 - 2: 50240 + 1: 50240 27,-1: 0: 15251 27,2: 0: 28398 27,4: - 2: 8823 + 1: 8823 28,0: 0: 65527 28,1: @@ -10242,38 +10242,38 @@ entities: 28,2: 0: 1911 28,3: - 2: 61440 + 1: 61440 20,-8: 0: 19692 21,-6: 0: 47359 21,-8: - 2: 3822 + 1: 3822 0: 24576 21,-7: 0: 36590 22,-8: - 2: 819 + 1: 819 22,-7: 0: 273 - 2: 49152 + 1: 49152 22,-6: - 2: 3720 + 1: 3720 22,-9: - 2: 8738 + 1: 8738 23,-7: - 2: 61440 + 1: 61440 23,-6: - 2: 3976 + 1: 3976 24,-7: - 2: 61440 + 1: 61440 24,-6: - 2: 3976 + 1: 3976 8,12: 0: 6015 9,9: 0: 65280 - 2: 6 + 1: 6 9,10: 0: 48015 9,11: @@ -10284,12 +10284,12 @@ entities: 0: 4095 10,10: 0: 12288 - 2: 34 + 1: 34 10,11: 0: 13107 10,12: 0: 273 - 2: 16384 + 1: 16384 11,9: 0: 34944 11,10: @@ -10308,15 +10308,15 @@ entities: 0: 8 9,13: 0: 819 - 2: 32768 + 1: 32768 9,14: - 2: 12 + 1: 12 10,13: - 2: 61998 + 1: 61998 11,13: - 2: 64719 + 1: 64719 12,13: - 2: 61455 + 1: 61455 -4,9: 0: 52701 -5,9: @@ -10353,27 +10353,27 @@ entities: 0: 30576 -9,9: 0: 35071 - 2: 12288 + 1: 12288 -8,10: 0: 207 -9,10: 0: 8 - 2: 48 + 1: 48 -8,11: - 2: 28672 + 1: 28672 -9,11: - 2: 61696 + 1: 61696 -8,12: - 2: 35946 + 1: 35946 -7,9: - 2: 255 + 1: 255 0: 33536 -7,10: 0: 14591 -7,11: 0: 61439 -6,9: - 2: 119 + 1: 119 0: 28672 -6,10: 0: 14335 @@ -10384,13 +10384,13 @@ entities: -5,12: 0: 52364 -7,12: - 2: 12560 + 1: 12560 -7,13: - 2: 2246 + 1: 2246 -6,13: - 2: 3840 + 1: 3840 -5,13: - 2: 25360 + 1: 25360 0: 140 -4,13: 0: 4095 @@ -10439,33 +10439,33 @@ entities: 13,10: 0: 119 14,8: - 2: 16 + 1: 16 0: 57344 14,9: 0: 65534 14,10: 0: 61183 14,11: - 2: 32768 + 1: 32768 14,12: - 2: 4972 + 1: 4972 15,11: - 2: 8030 + 1: 8030 15,10: - 2: 32768 + 1: 32768 16,10: - 2: 5100 + 1: 5100 16,11: - 2: 3968 + 1: 3968 -12,-4: 0: 255 - 2: 57344 + 1: 57344 -12,-5: 0: 65520 -13,-4: 0: 62327 -12,-3: - 2: 35054 + 1: 35054 0: 28672 -13,-3: 0: 63487 @@ -10477,18 +10477,18 @@ entities: 0: 48051 -11,-4: 0: 255 - 2: 61440 + 1: 61440 -11,-3: - 2: 65535 + 1: 65535 -11,-2: 0: 65520 -11,-5: 0: 65520 -10,-4: - 2: 61440 + 1: 61440 0: 238 -10,-3: - 2: 65535 + 1: 65535 -10,-2: 0: 30576 -10,-5: @@ -10496,7 +10496,7 @@ entities: -16,-4: 0: 61030 -17,-4: - 2: 2296 + 1: 2296 -16,-3: 0: 61166 -16,-2: @@ -10536,30 +10536,30 @@ entities: -13,-5: 0: 63346 -20,-4: - 2: 4096 + 1: 4096 -20,-3: - 2: 61299 + 1: 61299 -21,-4: - 2: 61440 + 1: 61440 -21,-3: - 2: 4528 + 1: 4528 -20,-1: 0: 65329 - 2: 8 + 1: 8 -21,-1: 0: 31 - 2: 4576 + 1: 4576 -20,0: 0: 43955 - 2: 4096 + 1: 4096 -20,-2: - 2: 34956 + 1: 34956 -19,-3: - 2: 4096 + 1: 4096 -19,-2: - 2: 4369 + 1: 4369 -19,-1: - 2: 1 + 1: 1 0: 48896 -19,0: 0: 65522 @@ -10568,45 +10568,45 @@ entities: -18,0: 0: 64434 -18,-4: - 2: 17604 + 1: 17604 -18,-5: - 2: 17476 + 1: 17476 -18,-3: - 2: 12 + 1: 12 -17,-3: - 2: 1 + 1: 1 -17,0: 0: 64441 -21,0: 0: 9 - 2: 37142 + 1: 37142 -20,1: - 2: 16 + 1: 16 0: 15274 -21,1: - 2: 4496 + 1: 4496 0: 9 -20,2: 0: 15291 -21,2: 0: 4105 - 2: 57622 + 1: 57622 -20,3: 0: 1 - 2: 34952 + 1: 34952 -21,3: 0: 255 - 2: 4864 + 1: 4864 -19,1: 0: 4095 -19,2: 0: 187 -19,3: - 2: 4369 + 1: 4369 -20,4: - 2: 32748 + 1: 32748 -19,4: - 2: 17 + 1: 17 -18,1: 0: 3007 -18,2: @@ -10640,15 +10640,15 @@ entities: -13,4: 0: 65407 -16,-8: - 2: 39 + 1: 39 0: 34816 -17,-8: - 2: 15 + 1: 15 -16,-7: - 2: 4384 + 1: 4384 0: 51336 -16,-6: - 2: 4369 + 1: 4369 0: 52236 -15,-8: 0: 65520 @@ -10669,7 +10669,7 @@ entities: -13,-6: 0: 32631 -13,-9: - 2: 51200 + 1: 51200 0: 8 -12,-8: 0: 64988 @@ -10678,7 +10678,7 @@ entities: -12,-6: 0: 65295 -12,-9: - 2: 4352 + 1: 4352 0: 52431 -11,-8: 0: 65523 @@ -10697,26 +10697,26 @@ entities: -10,-9: 0: 30579 -16,6: - 2: 15 + 1: 15 0: 32768 -17,6: - 2: 15 + 1: 15 -16,7: 0: 52367 - 2: 4352 + 1: 4352 -17,7: 0: 26120 - 2: 7 + 1: 7 -16,8: - 2: 17153 + 1: 17153 0: 140 -15,6: - 2: 17 + 1: 17 0: 64716 -15,7: 0: 65535 -15,5: - 2: 4096 + 1: 4096 3: 2048 -15,8: 0: 65535 @@ -10745,7 +10745,7 @@ entities: 0: 65280 -12,5: 0: 65280 - 2: 14 + 1: 14 -12,6: 0: 65535 -12,7: @@ -10757,7 +10757,7 @@ entities: 3: 4 0: 65280 -11,5: - 2: 3 + 1: 3 0: 65292 -11,6: 0: 65535 @@ -10769,7 +10769,7 @@ entities: 0: 65484 -10,5: 0: 65283 - 2: 12 + 1: 12 -10,6: 0: 65535 -10,7: @@ -10777,47 +10777,47 @@ entities: -10,8: 0: 30591 -9,5: - 2: 1 + 1: 1 0: 17732 -17,8: - 2: 3840 + 1: 3840 0: 6 -16,9: - 2: 29696 + 1: 29696 -16,10: - 2: 36079 + 1: 36079 -17,9: - 2: 61440 + 1: 61440 -15,9: 0: 4095 -15,10: - 2: 4097 + 1: 4097 -15,11: - 2: 35939 + 1: 35939 -14,9: 0: 3569 -14,11: - 2: 12834 + 1: 12834 -14,10: - 2: 8743 + 1: 8743 -14,12: - 2: 8866 + 1: 8866 0: 2056 -13,9: 0: 3568 -13,10: - 2: 132 + 1: 132 0: 8 -12,9: 0: 4080 -12,10: 0: 19655 - 2: 9008 + 1: 9008 -12,11: 0: 17476 -12,12: 0: 17733 - 2: 176 + 1: 176 -11,9: 0: 4080 -11,10: @@ -10826,19 +10826,19 @@ entities: 0: 6128 -10,10: 0: 819 - 2: 34952 + 1: 34952 -10,11: - 2: 34956 + 1: 34956 -10,12: - 2: 35000 + 1: 35000 0: 771 -9,12: - 2: 1 + 1: 1 -12,-12: - 2: 48 + 1: 48 0: 52416 -13,-12: - 2: 20208 + 1: 20208 -12,-11: 0: 30576 -13,-11: @@ -10849,77 +10849,77 @@ entities: 0: 35071 -11,-12: 0: 13104 - 2: 52428 + 1: 52428 -11,-11: 0: 48051 - 2: 8 + 1: 8 -11,-10: 0: 48059 -11,-13: - 2: 52224 + 1: 52224 0: 238 -10,-12: 0: 48048 - 2: 17472 + 1: 17472 -10,-11: 0: 65467 - 2: 68 + 1: 68 -10,-10: 0: 191 - 2: 47872 + 1: 47872 -9,-12: 0: 4368 -9,-11: 0: 13105 -9,-10: 0: 51 - 2: 4352 + 1: 4352 -13,12: 0: 3855 - 2: 240 + 1: 240 -12,13: 0: 17733 - 2: 176 + 1: 176 -13,13: 0: 3855 - 2: 240 + 1: 240 -12,14: 0: 17733 - 2: 176 + 1: 176 -13,14: 0: 3855 - 2: 240 + 1: 240 -12,15: 0: 325 - 2: 17584 + 1: 17584 -13,15: 0: 3855 - 2: 240 + 1: 240 -12,16: - 2: 61444 + 1: 61444 -11,12: - 2: 240 + 1: 240 0: 3855 -11,13: - 2: 240 + 1: 240 0: 3855 -11,14: - 2: 240 + 1: 240 0: 3855 -11,15: - 2: 240 + 1: 240 0: 3855 -10,13: 0: 771 - 2: 35000 + 1: 35000 -10,14: 0: 771 - 2: 35000 + 1: 35000 -10,15: 0: 771 - 2: 35000 + 1: 35000 -10,16: - 2: 64648 + 1: 64648 -11,-14: 0: 57344 -10,-14: @@ -10936,66 +10936,66 @@ entities: 0: 12526 21,8: 0: 19 - 2: 29696 + 1: 29696 22,6: 0: 13311 22,7: 0: 3 - 2: 36352 + 1: 36352 22,5: 0: 3816 23,7: - 2: 36608 + 1: 36608 22,8: - 2: 234 + 1: 234 23,5: 0: 1646 23,6: - 2: 10 + 1: 10 24,5: 0: 1 - 2: 62208 + 1: 62208 24,6: - 2: 3 + 1: 3 24,7: - 2: 36608 + 1: 36608 23,8: - 2: 248 + 1: 248 25,5: - 2: 61440 + 1: 61440 25,7: - 2: 36608 + 1: 36608 24,8: - 2: 248 + 1: 248 26,5: - 2: 61440 + 1: 61440 26,6: 0: 30706 26,7: 0: 7 - 2: 36608 + 1: 36608 25,8: - 2: 248 + 1: 248 27,5: - 2: 63266 + 1: 63266 27,6: 0: 30576 27,7: 0: 7 - 2: 36608 + 1: 36608 26,8: - 2: 248 + 1: 248 28,5: - 2: 61440 + 1: 61440 28,6: - 2: 117 + 1: 117 0: 12288 28,7: - 2: 36672 + 1: 36672 27,8: - 2: 248 + 1: 248 25,-4: - 2: 240 + 1: 240 25,-2: 0: 2303 25,-1: @@ -11003,542 +11003,542 @@ entities: 25,-3: 0: 11776 26,-4: - 2: 240 + 1: 240 26,-3: - 2: 3856 + 1: 3856 26,-2: 0: 3959 27,-4: - 2: 240 + 1: 240 27,-3: - 2: 63232 + 1: 63232 27,-2: - 2: 32769 + 1: 32769 0: 13056 28,-4: - 2: 240 + 1: 240 28,-3: - 2: 61440 + 1: 61440 28,-1: 0: 16368 29,-4: - 2: 240 + 1: 240 28,-2: - 2: 8 + 1: 8 29,-3: - 2: 61440 + 1: 61440 29,-2: - 2: 4379 + 1: 4379 29,-1: - 2: 36767 + 1: 36767 30,-4: - 2: 240 + 1: 240 30,-3: - 2: 61440 + 1: 61440 30,-2: - 2: 275 + 1: 275 29,0: 0: 34958 31,-4: - 2: 240 + 1: 240 31,-3: - 2: 61440 + 1: 61440 31,-1: - 2: 512 + 1: 512 31,0: - 1: 35020 + 2: 35020 0: 28944 32,-4: - 2: 20222 + 1: 20222 32,-3: - 2: 63044 + 1: 63044 29,3: - 2: 61440 + 1: 61440 29,1: 0: 59528 30,3: - 2: 61712 + 1: 61712 30,0: 0: 61152 30,1: 0: 3822 31,1: 0: 279 - 1: 52360 + 2: 52360 31,3: - 2: 61440 + 1: 61440 31,2: - 2: 32 + 1: 32 32,0: - 1: 30583 + 2: 30583 32,1: - 1: 30583 + 2: 30583 32,3: - 2: 62528 + 1: 62528 29,5: - 2: 61440 + 1: 61440 29,7: - 2: 36608 + 1: 36608 28,8: - 2: 248 + 1: 248 30,5: - 2: 61440 + 1: 61440 30,7: - 2: 36608 + 1: 36608 29,8: - 2: 248 + 1: 248 31,5: - 2: 61440 + 1: 61440 31,7: - 2: 36608 + 1: 36608 30,8: - 2: 248 + 1: 248 32,5: - 2: 63044 + 1: 63044 32,7: - 2: 1860 + 1: 1860 31,8: - 2: 248 + 1: 248 32,6: - 2: 50246 + 1: 50246 32,4: - 2: 17476 + 1: 17476 33,5: - 2: 4369 + 1: 4369 33,6: - 2: 4369 + 1: 4369 33,4: - 2: 4369 + 1: 4369 33,3: - 2: 4352 + 1: 4352 33,7: - 2: 1 + 1: 1 33,0: - 2: 3 + 1: 3 33,1: - 2: 12288 + 1: 12288 32,2: - 2: 128 + 1: 128 33,2: - 2: 18432 + 1: 18432 32,-2: - 2: 1094 + 1: 1094 32,-5: - 2: 17484 + 1: 17484 33,-4: - 2: 9011 + 1: 9011 33,-3: - 2: 12834 + 1: 12834 32,-1: - 2: 2048 + 1: 2048 33,-5: - 2: 8739 + 1: 8739 33,-2: - 2: 2 + 1: 2 33,-1: - 2: 132 + 1: 132 32,-7: - 2: 61440 + 1: 61440 31,-7: - 2: 61440 + 1: 61440 32,-6: - 2: 18176 + 1: 18176 31,-6: - 2: 3976 + 1: 3976 33,-7: - 2: 12288 + 1: 12288 33,-6: - 2: 8706 + 1: 8706 25,-7: - 2: 65252 + 1: 65252 25,-6: - 2: 3976 + 1: 3976 25,-8: - 2: 50244 + 1: 50244 25,-9: - 2: 50244 + 1: 50244 26,-8: - 2: 4369 + 1: 4369 26,-7: - 2: 61713 + 1: 61713 26,-6: - 2: 3976 + 1: 3976 26,-9: - 2: 4369 + 1: 4369 27,-7: - 2: 61440 + 1: 61440 27,-6: - 2: 3976 + 1: 3976 28,-7: - 2: 61440 + 1: 61440 28,-6: - 2: 3976 + 1: 3976 29,-7: - 2: 61440 + 1: 61440 29,-6: - 2: 3976 + 1: 3976 30,-7: - 2: 61440 + 1: 61440 30,-6: - 2: 3976 + 1: 3976 -20,5: - 2: 19 + 1: 19 -21,4: - 2: 45329 + 1: 45329 -21,5: - 2: 240 + 1: 240 -19,5: - 2: 19456 + 1: 19456 -19,6: - 2: 17484 + 1: 17484 -19,7: - 2: 19660 + 1: 19660 -19,8: - 2: 19660 + 1: 19660 -18,6: - 2: 15 + 1: 15 -18,7: - 2: 36092 + 1: 36092 -18,8: - 2: 3324 + 1: 3324 -19,9: - 2: 52292 + 1: 52292 -19,10: - 2: 3148 + 1: 3148 -18,9: - 2: 61440 + 1: 61440 20,9: 0: 4099 - 2: 26112 + 1: 26112 19,9: 0: 255 - 2: 61440 + 1: 61440 20,10: - 2: 17478 + 1: 17478 20,11: - 2: 1996 + 1: 1996 19,11: - 2: 3840 + 1: 3840 21,11: - 2: 1 + 1: 1 21,10: - 2: 16034 + 1: 16034 21,9: - 2: 8738 + 1: 8738 22,10: - 2: 19 + 1: 19 22,9: - 2: 8192 + 1: 8192 16,9: - 2: 35012 + 1: 35012 17,9: - 2: 41728 + 1: 41728 0: 142 17,10: - 2: 4371 + 1: 4371 17,11: - 2: 3889 + 1: 3889 18,9: 0: 255 - 2: 61440 + 1: 61440 18,11: - 2: 3840 + 1: 3840 -14,-12: - 2: 128 + 1: 128 -14,-11: 0: 2048 -14,-10: 0: 8 -14,13: - 2: 8866 + 1: 8866 0: 2056 -14,14: - 2: 8866 + 1: 8866 0: 2056 -14,15: - 2: 8866 + 1: 8866 0: 2056 -14,16: - 2: 58914 + 1: 58914 -13,16: - 2: 61440 + 1: 61440 -12,17: - 2: 240 + 1: 240 -13,17: - 2: 240 + 1: 240 -11,16: - 2: 61440 + 1: 61440 -11,17: - 2: 240 + 1: 240 -10,17: - 2: 242 + 1: 242 17,-9: - 2: 3840 + 1: 3840 18,-9: - 2: 3840 + 1: 3840 19,-9: - 2: 3954 + 1: 3954 19,-12: - 2: 8738 + 1: 8738 19,-13: - 2: 8738 + 1: 8738 19,-11: - 2: 8738 + 1: 8738 19,-10: - 2: 8738 + 1: 8738 20,-9: - 2: 3840 + 1: 3840 32,8: - 2: 240 + 1: 240 33,8: - 2: 17 + 1: 17 13,13: - 2: 4975 + 1: 4975 13,12: - 2: 32768 + 1: 32768 -14,17: - 2: 232 + 1: 232 -8,-14: - 2: 49152 + 1: 49152 -7,-14: - 2: 61440 + 1: 61440 -7,-13: - 2: 1 + 1: 1 -6,-14: - 2: 61440 + 1: 61440 20,-12: 0: 49344 - 2: 3072 + 1: 3072 20,-11: 0: 49344 - 2: 3072 + 1: 3072 20,-10: 0: 49344 - 2: 3072 + 1: 3072 21,-12: 0: 61680 - 2: 3840 + 1: 3840 21,-11: 0: 61680 - 2: 3840 + 1: 3840 21,-10: 0: 61680 - 2: 3840 + 1: 3840 21,-9: - 2: 256 + 1: 256 22,-12: - 2: 12066 + 1: 12066 0: 32896 22,-11: - 2: 12066 + 1: 12066 0: 32896 22,-10: - 2: 12066 + 1: 12066 0: 32896 22,-13: - 2: 12066 + 1: 12066 0: 32896 23,-12: 0: 61680 - 2: 3840 + 1: 3840 23,-11: 0: 61680 - 2: 3840 + 1: 3840 23,-10: 0: 61680 - 2: 3840 + 1: 3840 24,-12: 0: 4112 - 2: 256 + 1: 256 24,-11: 0: 4112 - 2: 256 + 1: 256 24,-10: 0: 4112 - 2: 256 + 1: 256 19,-15: - 2: 62960 + 1: 62960 19,-14: - 2: 8743 + 1: 8743 20,-15: - 2: 62704 + 1: 62704 -24,0: 0: 22355 - 2: 8236 + 1: 8236 -24,-1: 0: 4415 - 2: 192 + 1: 192 -25,0: 0: 61166 - 2: 1 + 1: 1 -24,1: 0: 22353 - 2: 8238 + 1: 8238 -25,1: 0: 61166 - 2: 1 + 1: 1 -24,2: 0: 12563 - 2: 49164 + 1: 49164 -25,2: 0: 61166 - 2: 1 + 1: 1 -24,3: 0: 255 - 2: 2048 + 1: 2048 -25,3: 0: 140 -23,0: 0: 32769 - 2: 4382 + 1: 4382 -23,1: 0: 137 - 2: 4374 + 1: 4374 -23,2: 0: 24065 - 2: 41246 + 1: 41246 -23,3: 0: 255 - 2: 4864 + 1: 4864 -23,-1: - 2: 4512 + 1: 4512 0: 3679 -23,4: - 2: 12561 + 1: 12561 -22,0: 0: 12289 - 2: 286 + 1: 286 -22,1: 0: 51 - 2: 4364 + 1: 4364 -22,2: 0: 19969 - 2: 45342 + 1: 45342 -22,3: 0: 255 - 2: 2048 + 1: 2048 -22,-1: - 2: 4528 + 1: 4528 0: 3663 -24,-4: - 2: 61440 + 1: 61440 -25,-4: - 2: 49152 + 1: 49152 -24,-2: 0: 61440 - 2: 2048 + 1: 2048 -25,-2: 0: 32768 - 2: 1 + 1: 1 -25,-1: 0: 61164 -23,-4: - 2: 61440 + 1: 61440 -24,-3: - 2: 128 + 1: 128 -23,-3: - 2: 4400 + 1: 4400 -23,-2: - 2: 785 + 1: 785 0: 61440 -22,-4: - 2: 61440 + 1: 61440 -22,-2: 0: 61440 - 2: 2048 + 1: 2048 -22,-3: - 2: 128 + 1: 128 -21,-2: - 2: 785 + 1: 785 0: 61440 -26,-3: - 2: 51200 + 1: 51200 -26,-2: - 2: 17476 + 1: 17476 -26,-1: - 2: 17476 + 1: 17476 -26,0: - 2: 17476 + 1: 17476 -25,-3: - 2: 14326 + 1: 14326 -26,1: - 2: 17476 + 1: 17476 -26,2: - 2: 17476 + 1: 17476 -26,3: - 2: 17476 + 1: 17476 -26,4: - 2: 2244 + 1: 2244 -24,5: - 2: 240 + 1: 240 -25,5: - 2: 198 + 1: 198 -24,4: - 2: 32768 + 1: 32768 -23,5: - 2: 240 + 1: 240 -22,5: - 2: 240 + 1: 240 -22,4: - 2: 32768 + 1: 32768 -25,4: - 2: 63281 + 1: 63281 20,-13: 0: 49344 - 2: 3072 + 1: 3072 21,-15: - 2: 62704 + 1: 62704 21,-13: 0: 61680 - 2: 3840 + 1: 3840 22,-15: - 2: 62704 + 1: 62704 22,-14: - 2: 8192 + 1: 8192 23,-15: - 2: 62704 + 1: 62704 23,-13: 0: 61680 - 2: 3840 + 1: 3840 24,-15: - 2: 62704 + 1: 62704 24,-13: 0: 4112 - 2: 256 + 1: 256 25,-12: - 2: 50244 + 1: 50244 25,-13: - 2: 50244 + 1: 50244 25,-11: - 2: 50244 + 1: 50244 25,-10: - 2: 50244 + 1: 50244 26,-12: - 2: 4369 + 1: 4369 26,-11: - 2: 4369 + 1: 4369 26,-10: - 2: 4369 + 1: 4369 26,-13: - 2: 4369 + 1: 4369 25,-15: - 2: 62576 + 1: 62576 25,-14: - 2: 50244 + 1: 50244 26,-15: - 2: 4368 + 1: 4368 26,-14: - 2: 4369 + 1: 4369 -18,-8: - 2: 17484 + 1: 17484 -18,-9: - 2: 17600 + 1: 17600 -18,-7: - 2: 17476 + 1: 17476 -18,-6: - 2: 17476 + 1: 17476 -17,-9: - 2: 16 + 1: 16 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -11556,10 +11556,8 @@ entities: - 0 - 0 - volume: 2500 - temperature: 235 + immutable: True moles: - - 21.824879 - - 82.10312 - 0 - 0 - 0 @@ -11570,11 +11568,13 @@ entities: - 0 - 0 - 0 - - volume: 2500 - immutable: True - moles: - 0 - 0 + - volume: 2500 + temperature: 235 + moles: + - 21.824879 + - 82.10312 - 0 - 0 - 0 @@ -144888,13 +144888,6 @@ entities: - type: Transform pos: 11.5,44.5 parent: 1 -- proto: SpawnPointAdminAssistant - entities: - - uid: 26875 - components: - - type: Transform - pos: 113.5,9.5 - parent: 1 - proto: SpawnPointAtmos entities: - uid: 6404 @@ -145131,23 +145124,6 @@ entities: - type: Transform pos: 6.5,-48.5 parent: 1 -- proto: SpawnPointCourier - entities: - - uid: 7387 - components: - - type: Transform - pos: -16.5,0.5 - parent: 1 - - uid: 12037 - components: - - type: Transform - pos: -17.5,-5.5 - parent: 1 - - uid: 23896 - components: - - type: Transform - pos: -1.5,-48.5 - parent: 1 - proto: SpawnPointDetective entities: - uid: 2540 @@ -145386,6 +145362,23 @@ entities: - type: Transform pos: -53.5,-24.5 parent: 1 +- proto: SpawnPointMailCarrier + entities: + - uid: 7387 + components: + - type: Transform + pos: -16.5,0.5 + parent: 1 + - uid: 12037 + components: + - type: Transform + pos: -17.5,-5.5 + parent: 1 + - uid: 23896 + components: + - type: Transform + pos: -1.5,-48.5 + parent: 1 - proto: SpawnPointMedicalDoctor entities: - uid: 7380 diff --git a/Resources/Maps/lighthouse.yml b/Resources/Maps/lighthouse.yml index 612f19e12d4..e3d968b4b28 100644 --- a/Resources/Maps/lighthouse.yml +++ b/Resources/Maps/lighthouse.yml @@ -10160,12 +10160,6 @@ entities: - type: Transform pos: 1.5,1.5 parent: 100 - - type: Door - secondsUntilStateChange: -19.194061 - state: Opening - - type: DeviceLinkSource - lastSignals: - DoorStatus: True - uid: 86 components: - type: MetaData @@ -109400,13 +109394,6 @@ entities: - type: Transform pos: 7.5,47.5 parent: 100 -- proto: SpawnPointAdminAssistant - entities: - - uid: 20873 - components: - - type: Transform - pos: -11.5,74.5 - parent: 100 - proto: SpawnPointAtmos entities: - uid: 16151 @@ -109655,18 +109642,6 @@ entities: - type: Transform pos: 10.5,9.5 parent: 100 -- proto: SpawnPointCourier - entities: - - uid: 16733 - components: - - type: Transform - pos: -28.5,-2.5 - parent: 100 - - uid: 16734 - components: - - type: Transform - pos: -28.5,-3.5 - parent: 100 - proto: SpawnPointDetective entities: - uid: 16789 @@ -109860,6 +109835,18 @@ entities: - type: Transform pos: 18.5,-9.5 parent: 100 +- proto: SpawnPointMailCarrier + entities: + - uid: 16733 + components: + - type: Transform + pos: -28.5,-2.5 + parent: 100 + - uid: 16734 + components: + - type: Transform + pos: -28.5,-3.5 + parent: 100 - proto: SpawnPointMedicalBorg entities: - uid: 11576 diff --git a/Resources/Maps/pebble.yml b/Resources/Maps/pebble.yml index be8afddcf17..a4127408e6b 100644 --- a/Resources/Maps/pebble.yml +++ b/Resources/Maps/pebble.yml @@ -58796,13 +58796,6 @@ entities: - type: Transform pos: 24.5,-19.5 parent: 2 -- proto: SpawnPointAdminAssistant - entities: - - uid: 10228 - components: - - type: Transform - pos: -0.5,-28.5 - parent: 2 - proto: SpawnPointAtmos entities: - uid: 8868 @@ -59019,23 +59012,6 @@ entities: - type: Transform pos: 1.5,-12.5 parent: 2 -- proto: SpawnPointCourier - entities: - - uid: 8928 - components: - - type: Transform - pos: 11.5,5.5 - parent: 2 - - uid: 8929 - components: - - type: Transform - pos: 12.5,5.5 - parent: 2 - - uid: 8930 - components: - - type: Transform - pos: 7.5,5.5 - parent: 2 - proto: SpawnPointDetective entities: - uid: 8907 @@ -59210,6 +59186,23 @@ entities: - type: Transform pos: -29.5,-4.5 parent: 2 +- proto: SpawnPointMailCarrier + entities: + - uid: 8928 + components: + - type: Transform + pos: 11.5,5.5 + parent: 2 + - uid: 8929 + components: + - type: Transform + pos: 12.5,5.5 + parent: 2 + - uid: 8930 + components: + - type: Transform + pos: 7.5,5.5 + parent: 2 - proto: SpawnPointMedicalDoctor entities: - uid: 3617 diff --git a/Resources/Maps/shoukou.yml b/Resources/Maps/shoukou.yml index e991ed978ac..aae6d1c316e 100644 --- a/Resources/Maps/shoukou.yml +++ b/Resources/Maps/shoukou.yml @@ -3373,13 +3373,12 @@ entities: - type: MetaData - type: Transform - type: Map - mapPaused: True - type: PhysicsMap - - type: GridTree - - type: MovedGrids - type: Broadphase - type: OccluderTree - type: LoadedMap + - type: GridTree + - type: MovedGrids - proto: ActionToggleLight entities: - uid: 3642 @@ -3408,6 +3407,8 @@ entities: - 10576 - 12889 - 12358 + - type: AtmosDevice + joinedGrid: 34 - uid: 738 components: - type: Transform @@ -3426,6 +3427,8 @@ entities: - 841 - 10322 - 1914 + - type: AtmosDevice + joinedGrid: 34 - uid: 2349 components: - type: Transform @@ -3444,6 +3447,8 @@ entities: - 10312 - 8195 - 11404 + - type: AtmosDevice + joinedGrid: 34 - uid: 2350 components: - type: Transform @@ -3463,6 +3468,8 @@ entities: - 10301 - 10302 - 5925 + - type: AtmosDevice + joinedGrid: 34 - uid: 2410 components: - type: Transform @@ -3486,6 +3493,8 @@ entities: - 3507 - 12396 - 6957 + - type: AtmosDevice + joinedGrid: 34 - uid: 2525 components: - type: Transform @@ -3507,6 +3516,8 @@ entities: - 8817 - 8920 - 8685 + - type: AtmosDevice + joinedGrid: 34 - uid: 3295 components: - type: Transform @@ -3518,6 +3529,8 @@ entities: - 9904 - 6933 - 13664 + - type: AtmosDevice + joinedGrid: 34 - uid: 3874 components: - type: Transform @@ -3529,6 +3542,8 @@ entities: - 10712 - 9595 - 9599 + - type: AtmosDevice + joinedGrid: 34 - uid: 5208 components: - type: Transform @@ -3545,6 +3560,8 @@ entities: - 5250 - 9620 - 4449 + - type: AtmosDevice + joinedGrid: 34 - uid: 5244 components: - type: Transform @@ -3561,6 +3578,8 @@ entities: - 1302 - 1856 - 5269 + - type: AtmosDevice + joinedGrid: 34 - uid: 5426 components: - type: Transform @@ -3572,6 +3591,8 @@ entities: - 7843 - 12487 - 9598 + - type: AtmosDevice + joinedGrid: 34 - uid: 5573 components: - type: Transform @@ -3586,6 +3607,8 @@ entities: - 7164 - 7185 - 11095 + - type: AtmosDevice + joinedGrid: 34 - uid: 5585 components: - type: Transform @@ -3602,6 +3625,8 @@ entities: - 11117 - 11115 - 11116 + - type: AtmosDevice + joinedGrid: 34 - uid: 6342 components: - type: Transform @@ -3623,6 +3648,8 @@ entities: - 8911 - 8836 - 12534 + - type: AtmosDevice + joinedGrid: 34 - uid: 7099 components: - type: Transform @@ -3634,6 +3661,8 @@ entities: - 7094 - 9777 - 5925 + - type: AtmosDevice + joinedGrid: 34 - uid: 7410 components: - type: Transform @@ -3646,6 +3675,8 @@ entities: - 11112 - 2601 - 12072 + - type: AtmosDevice + joinedGrid: 34 - uid: 7683 components: - type: Transform @@ -3662,6 +3693,8 @@ entities: - 13468 - 3771 - 7612 + - type: AtmosDevice + joinedGrid: 34 - uid: 7684 components: - type: Transform @@ -3679,6 +3712,8 @@ entities: - 12141 - 12168 - 4849 + - type: AtmosDevice + joinedGrid: 34 - uid: 8028 components: - type: Transform @@ -3692,6 +3727,8 @@ entities: - 12476 - 4750 - 1870 + - type: AtmosDevice + joinedGrid: 34 - uid: 9601 components: - type: Transform @@ -3712,6 +3749,8 @@ entities: - 2986 - 2965 - 12368 + - type: AtmosDevice + joinedGrid: 34 - uid: 10291 components: - type: Transform @@ -3728,6 +3767,8 @@ entities: - 13452 - 3771 - 3553 + - type: AtmosDevice + joinedGrid: 34 - uid: 10323 components: - type: Transform @@ -3755,6 +3796,8 @@ entities: - 8643 - 5915 - 6113 + - type: AtmosDevice + joinedGrid: 34 - uid: 10395 components: - type: Transform @@ -3766,6 +3809,8 @@ entities: - 9013 - 10579 - 10580 + - type: AtmosDevice + joinedGrid: 34 - uid: 10464 components: - type: Transform @@ -3784,6 +3829,8 @@ entities: - 10582 - 10542 - 10576 + - type: AtmosDevice + joinedGrid: 34 - uid: 10544 components: - type: Transform @@ -3805,6 +3852,8 @@ entities: - 617 - 9469 - 11905 + - type: AtmosDevice + joinedGrid: 34 - uid: 10547 components: - type: Transform @@ -3818,6 +3867,8 @@ entities: - 2309 - 10317 - 2450 + - type: AtmosDevice + joinedGrid: 34 - uid: 10548 components: - type: Transform @@ -3838,6 +3889,8 @@ entities: - 12219 - 2451 - 4700 + - type: AtmosDevice + joinedGrid: 34 - uid: 10559 components: - type: Transform @@ -3857,6 +3910,8 @@ entities: - 10552 - 10553 - 11517 + - type: AtmosDevice + joinedGrid: 34 - uid: 10567 components: - type: Transform @@ -3872,6 +3927,8 @@ entities: - 10564 - 10565 - 10566 + - type: AtmosDevice + joinedGrid: 34 - uid: 10568 components: - type: Transform @@ -3886,6 +3943,8 @@ entities: - 9308 - 9765 - 11274 + - type: AtmosDevice + joinedGrid: 34 - uid: 10569 components: - type: Transform @@ -3900,6 +3959,8 @@ entities: - 9182 - 10564 - 10563 + - type: AtmosDevice + joinedGrid: 34 - uid: 10570 components: - type: Transform @@ -3924,6 +3985,8 @@ entities: - 8700 - 7981 - 7973 + - type: AtmosDevice + joinedGrid: 34 - uid: 10571 components: - type: Transform @@ -3943,6 +4006,8 @@ entities: - 9704 - 8722 - 998 + - type: AtmosDevice + joinedGrid: 34 - uid: 10574 components: - type: Transform @@ -3972,6 +4037,8 @@ entities: - 737 - 10322 - 2714 + - type: AtmosDevice + joinedGrid: 34 - uid: 10581 components: - type: Transform @@ -3992,6 +4059,8 @@ entities: - 9659 - 6402 - 5137 + - type: AtmosDevice + joinedGrid: 34 - uid: 10584 components: - type: Transform @@ -4008,6 +4077,8 @@ entities: - 10326 - 10860 - 10859 + - type: AtmosDevice + joinedGrid: 34 - uid: 10597 components: - type: Transform @@ -4029,6 +4100,8 @@ entities: - 8724 - 6140 - 10426 + - type: AtmosDevice + joinedGrid: 34 - uid: 10602 components: - type: Transform @@ -4047,6 +4120,8 @@ entities: - 9621 - 9622 - 11103 + - type: AtmosDevice + joinedGrid: 34 - uid: 10611 components: - type: Transform @@ -4062,6 +4137,8 @@ entities: - 12843 - 12844 - 10612 + - type: AtmosDevice + joinedGrid: 34 - uid: 10614 components: - type: Transform @@ -4072,6 +4149,8 @@ entities: devices: - 10612 - 10615 + - type: AtmosDevice + joinedGrid: 34 - uid: 11512 components: - type: Transform @@ -4083,6 +4162,8 @@ entities: - 10560 - 10390 - 8424 + - type: AtmosDevice + joinedGrid: 34 - uid: 11539 components: - type: Transform @@ -4094,6 +4175,8 @@ entities: - 1818 - 12977 - 11813 + - type: AtmosDevice + joinedGrid: 34 - uid: 11816 components: - type: Transform @@ -4106,6 +4189,8 @@ entities: - 11894 - 11830 - 10600 + - type: AtmosDevice + joinedGrid: 34 - uid: 11994 components: - type: Transform @@ -4117,6 +4202,8 @@ entities: - 11985 - 11983 - 11984 + - type: AtmosDevice + joinedGrid: 34 - uid: 12258 components: - type: Transform @@ -4129,6 +4216,8 @@ entities: - 4957 - 12360 - 12855 + - type: AtmosDevice + joinedGrid: 34 - uid: 12426 components: - type: Transform @@ -4141,6 +4230,8 @@ entities: - 12421 - 2936 - 12427 + - type: AtmosDevice + joinedGrid: 34 - uid: 12717 components: - type: Transform @@ -4155,6 +4246,8 @@ entities: - 12889 - 10576 - 8503 + - type: AtmosDevice + joinedGrid: 34 - uid: 13430 components: - type: Transform @@ -4173,6 +4266,8 @@ entities: - 11947 - 9614 - 9613 + - type: AtmosDevice + joinedGrid: 34 - uid: 13432 components: - type: Transform @@ -4186,6 +4281,8 @@ entities: - 11356 - 11948 - 11947 + - type: AtmosDevice + joinedGrid: 34 - uid: 13433 components: - type: Transform @@ -4199,6 +4296,8 @@ entities: - 9621 - 9619 - 13434 + - type: AtmosDevice + joinedGrid: 34 - uid: 13443 components: - type: Transform @@ -4216,6 +4315,8 @@ entities: - 11517 - 11250 - 11005 + - type: AtmosDevice + joinedGrid: 34 - uid: 13671 components: - type: Transform @@ -4231,6 +4332,8 @@ entities: - 13448 - 13449 - 7612 + - type: AtmosDevice + joinedGrid: 34 - uid: 13672 components: - type: Transform @@ -4249,6 +4352,8 @@ entities: - 13454 - 13469 - 13468 + - type: AtmosDevice + joinedGrid: 34 - uid: 13836 components: - type: Transform @@ -4258,6 +4363,8 @@ entities: - type: DeviceList devices: - 13837 + - type: AtmosDevice + joinedGrid: 34 - proto: AirCanister entities: - uid: 1799 @@ -4265,21 +4372,29 @@ entities: - type: Transform pos: -40.5,-29.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - uid: 2356 components: - type: Transform pos: -51.5,-14.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - uid: 3269 components: - type: Transform pos: -34.5,-50.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - uid: 6874 components: - type: Transform pos: -1.5,-42.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - proto: Airlock entities: - uid: 2219 @@ -6994,6 +7109,8 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,-27.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - proto: Beaker entities: - uid: 897 @@ -31740,6 +31857,8 @@ entities: - type: Transform pos: 0.5,-39.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - proto: CryoxadoneBeakerSmall entities: - uid: 12604 @@ -36311,6 +36430,8 @@ entities: - 4750 - 1078 - 3703 + - type: AtmosDevice + joinedGrid: 34 - uid: 8199 components: - type: Transform @@ -36334,6 +36455,8 @@ entities: - 10322 - 998 - 2714 + - type: AtmosDevice + joinedGrid: 34 - uid: 8271 components: - type: Transform @@ -36346,6 +36469,8 @@ entities: - 10319 - 1954 - 10576 + - type: AtmosDevice + joinedGrid: 34 - uid: 8272 components: - type: Transform @@ -36357,6 +36482,8 @@ entities: - 10551 - 10557 - 10556 + - type: AtmosDevice + joinedGrid: 34 - uid: 8273 components: - type: Transform @@ -36372,6 +36499,8 @@ entities: - 10552 - 10551 - 10549 + - type: AtmosDevice + joinedGrid: 34 - uid: 8274 components: - type: Transform @@ -36383,6 +36512,8 @@ entities: - 617 - 10563 - 10565 + - type: AtmosDevice + joinedGrid: 34 - uid: 8275 components: - type: Transform @@ -36394,6 +36525,8 @@ entities: - 10564 - 10565 - 10566 + - type: AtmosDevice + joinedGrid: 34 - uid: 8276 components: - type: Transform @@ -36411,6 +36544,8 @@ entities: - 11252 - 11253 - 5925 + - type: AtmosDevice + joinedGrid: 34 - uid: 8278 components: - type: Transform @@ -36428,6 +36563,8 @@ entities: - 11983 - 11984 - 8724 + - type: AtmosDevice + joinedGrid: 34 - uid: 8279 components: - type: Transform @@ -36446,6 +36583,8 @@ entities: - 10302 - 10308 - 10309 + - type: AtmosDevice + joinedGrid: 34 - uid: 10858 components: - type: Transform @@ -36457,6 +36596,8 @@ entities: - 10325 - 10860 - 10859 + - type: AtmosDevice + joinedGrid: 34 - uid: 10865 components: - type: Transform @@ -36467,6 +36608,8 @@ entities: devices: - 10615 - 10612 + - type: AtmosDevice + joinedGrid: 34 - uid: 10866 components: - type: Transform @@ -36477,6 +36620,8 @@ entities: devices: - 10598 - 10600 + - type: AtmosDevice + joinedGrid: 34 - uid: 11680 components: - type: Transform @@ -36486,6 +36631,8 @@ entities: devices: - 10339 - 10326 + - type: AtmosDevice + joinedGrid: 34 - uid: 11683 components: - type: Transform @@ -36496,6 +36643,8 @@ entities: devices: - 10600 - 11903 + - type: AtmosDevice + joinedGrid: 34 - uid: 11738 components: - type: Transform @@ -36507,6 +36656,8 @@ entities: - 10715 - 10578 - 10712 + - type: AtmosDevice + joinedGrid: 34 - proto: FireAxeCabinetFilled entities: - uid: 1840 @@ -38055,7 +38206,7 @@ entities: - type: Transform pos: 38.57096,-13.383774 parent: 34 -- proto: FoodChiliPepper +- proto: FoodChili entities: - uid: 1 components: @@ -38278,6 +38429,8 @@ entities: parent: 34 - type: GasFilter transferRate: 50 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#444444FF' - uid: 2983 @@ -38290,6 +38443,8 @@ entities: parent: 34 - type: GasFilter transferRate: 100 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 3244 @@ -38302,6 +38457,8 @@ entities: parent: 34 - type: GasFilter transferRate: 100 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - proto: GasMinerCarbonDioxide @@ -38311,6 +38468,8 @@ entities: - type: Transform pos: -51.5,-38.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - proto: GasMinerNitrogen entities: - uid: 1458 @@ -38318,6 +38477,8 @@ entities: - type: Transform pos: -37.5,-39.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - proto: GasMixer entities: - uid: 2406 @@ -38330,6 +38491,8 @@ entities: inletTwoConcentration: 0.78 inletOneConcentration: 0.22 targetPressure: 4500 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0000FFFF' - proto: GasMixerFlipped @@ -38344,6 +38507,8 @@ entities: inletTwoConcentration: 0.97 inletOneConcentration: 0.03 targetPressure: 4500 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#947507FF' - proto: GasOutletInjector @@ -38354,30 +38519,40 @@ entities: rot: -1.5707963267948966 rad pos: -38.5,-41.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - uid: 1254 components: - type: Transform rot: -1.5707963267948966 rad pos: -38.5,-39.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - uid: 1268 components: - type: Transform rot: -1.5707963267948966 rad pos: -38.5,-45.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - uid: 1442 components: - type: Transform rot: -1.5707963267948966 rad pos: -38.5,-43.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - uid: 1525 components: - type: Transform rot: 3.141592653589793 rad pos: -57.5,-39.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#947507FF' - uid: 1536 @@ -38386,6 +38561,8 @@ entities: rot: 3.141592653589793 rad pos: -49.5,-47.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - proto: GasPassiveGate entities: - uid: 8366 @@ -38393,6 +38570,8 @@ entities: - type: Transform pos: -38.5,-33.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - proto: GasPassiveVent @@ -38403,26 +38582,36 @@ entities: rot: 1.5707963267948966 rad pos: -12.5,-4.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - uid: 971 components: - type: Transform pos: -36.5,-43.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - uid: 1052 components: - type: Transform pos: -27.5,-4.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - uid: 1255 components: - type: Transform pos: -36.5,-39.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - uid: 1256 components: - type: Transform pos: -36.5,-41.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#00FFFFFF' - uid: 1406 @@ -38430,24 +38619,32 @@ entities: - type: Transform pos: -36.5,-45.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - uid: 1453 components: - type: Transform rot: 3.141592653589793 rad pos: -42.5,-51.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - uid: 1531 components: - type: Transform rot: 3.141592653589793 rad pos: -50.5,-47.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - uid: 1649 components: - type: Transform rot: 1.5707963267948966 rad pos: -50.5,-38.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - proto: GasPipeBend entities: - uid: 104 @@ -54579,24 +54776,32 @@ entities: - type: Transform pos: -57.5,-31.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - uid: 1564 components: - type: Transform rot: 1.5707963267948966 rad pos: -56.5,-26.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - uid: 1580 components: - type: Transform rot: -1.5707963267948966 rad pos: -56.5,-33.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - uid: 1779 components: - type: Transform rot: -1.5707963267948966 rad pos: -37.5,-32.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#F84000FF' - uid: 1780 @@ -54605,6 +54810,8 @@ entities: rot: -1.5707963267948966 rad pos: -37.5,-31.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#F84000FF' - uid: 3326 @@ -54613,24 +54820,32 @@ entities: rot: 1.5707963267948966 rad pos: -31.5,-6.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - uid: 3415 components: - type: Transform rot: 3.141592653589793 rad pos: -1.5,-42.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - uid: 3787 components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,-27.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - uid: 3811 components: - type: Transform rot: 1.5707963267948966 rad pos: 10.5,-18.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 4539 @@ -54639,6 +54854,8 @@ entities: rot: -1.5707963267948966 rad pos: 23.5,3.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - proto: GasPressurePump @@ -54649,6 +54866,8 @@ entities: rot: -1.5707963267948966 rad pos: -39.5,-35.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 125 @@ -54657,6 +54876,8 @@ entities: rot: 1.5707963267948966 rad pos: -39.5,-37.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 222 @@ -54667,6 +54888,8 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#03FCD3FF' - uid: 1154 @@ -54676,6 +54899,8 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 + - type: AtmosDevice + joinedGrid: 34 - uid: 1424 components: - type: Transform @@ -54684,6 +54909,8 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 + - type: AtmosDevice + joinedGrid: 34 - uid: 1425 components: - type: MetaData @@ -54694,6 +54921,8 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 + - type: AtmosDevice + joinedGrid: 34 - uid: 1427 components: - type: MetaData @@ -54704,6 +54933,8 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF00FFFF' - uid: 1428 @@ -54713,6 +54944,8 @@ entities: - type: Transform pos: -29.5,-4.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 1535 @@ -54723,6 +54956,8 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 + - type: AtmosDevice + joinedGrid: 34 - uid: 1537 components: - type: Transform @@ -54730,6 +54965,8 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 + - type: AtmosDevice + joinedGrid: 34 - uid: 1620 components: - type: Transform @@ -54738,6 +54975,8 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF0000FF' - uid: 1621 @@ -54747,6 +54986,8 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF0000FF' - uid: 1627 @@ -54756,6 +54997,8 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#947507FF' - uid: 1636 @@ -54766,6 +55009,8 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#444444FF' - uid: 1796 @@ -54776,6 +55021,8 @@ entities: rot: -1.5707963267948966 rad pos: -30.5,-5.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - uid: 1861 components: - type: Transform @@ -54784,6 +55031,8 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF0000FF' - uid: 2020 @@ -54794,6 +55043,8 @@ entities: rot: 1.5707963267948966 rad pos: -30.5,-6.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - uid: 2124 components: - type: MetaData @@ -54801,6 +55052,8 @@ entities: - type: Transform pos: -29.5,-7.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#F84000FF' - uid: 2426 @@ -54811,6 +55064,8 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#00FFFFFF' - uid: 2427 @@ -54821,6 +55076,8 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 225 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF0000FF' - uid: 2456 @@ -54831,6 +55088,8 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#444444FF' - uid: 3290 @@ -54841,6 +55100,8 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#444444FF' - uid: 6377 @@ -54851,6 +55112,8 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#03FCD3FF' - uid: 7765 @@ -54861,6 +55124,8 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF0000FF' - uid: 7847 @@ -54869,12 +55134,16 @@ entities: rot: 3.141592653589793 rad pos: -1.5,-41.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - uid: 8754 components: - type: Transform rot: 3.141592653589793 rad pos: -43.5,-43.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - uid: 10558 components: - type: Transform @@ -54882,6 +55151,8 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 + - type: AtmosDevice + joinedGrid: 34 - uid: 11030 components: - type: Transform @@ -54889,6 +55160,8 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#03FCD3FF' - uid: 11446 @@ -54898,6 +55171,8 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 + - type: AtmosDevice + joinedGrid: 34 - uid: 11453 components: - type: Transform @@ -54905,6 +55180,8 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#03FCD3FF' - uid: 11461 @@ -54914,6 +55191,8 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#03FCD3FF' - uid: 11463 @@ -54923,6 +55202,8 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#03FCD3FF' - uid: 11540 @@ -54932,6 +55213,8 @@ entities: parent: 34 - type: GasPressurePump targetPressure: 4500 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#03FCD3FF' - proto: GasRecycler @@ -54941,6 +55224,8 @@ entities: - type: Transform pos: -45.5,-35.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#444444FF' - proto: GasThermoMachineFreezer @@ -54950,11 +55235,15 @@ entities: - type: Transform pos: -50.5,-40.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - uid: 4105 components: - type: Transform pos: -1.5,-39.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - proto: GasThermoMachineFreezerEnabled entities: - uid: 824 @@ -54964,6 +55253,8 @@ entities: parent: 34 - type: GasThermoMachine targetTemperature: 150 + - type: AtmosDevice + joinedGrid: 34 - uid: 12611 components: - type: Transform @@ -54972,6 +55263,8 @@ entities: parent: 34 - type: GasThermoMachine targetTemperature: 295.15 + - type: AtmosDevice + joinedGrid: 34 - proto: GasThermoMachineHeater entities: - uid: 919 @@ -54979,6 +55272,8 @@ entities: - type: Transform pos: -49.5,-40.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - proto: GasThermoMachineHeaterEnabled entities: - uid: 13817 @@ -54989,6 +55284,8 @@ entities: parent: 34 - type: GasThermoMachine targetTemperature: 290.15 + - type: AtmosDevice + joinedGrid: 34 - proto: GasVentPump entities: - uid: 771 @@ -54996,6 +55293,8 @@ entities: - type: Transform pos: -14.5,-10.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 803 @@ -55004,6 +55303,8 @@ entities: rot: 1.5707963267948966 rad pos: -16.5,-8.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 2965 @@ -55015,6 +55316,8 @@ entities: - type: DeviceNetwork deviceLists: - 9601 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 2986 @@ -55026,6 +55329,8 @@ entities: - type: DeviceNetwork deviceLists: - 9601 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 3724 @@ -55034,6 +55339,8 @@ entities: rot: 1.5707963267948966 rad pos: 40.5,-34.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 3864 @@ -55045,6 +55352,8 @@ entities: - type: DeviceNetwork deviceLists: - 5244 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 3897 @@ -55056,6 +55365,8 @@ entities: - type: DeviceNetwork deviceLists: - 5244 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 4155 @@ -55067,6 +55378,8 @@ entities: - type: DeviceNetwork deviceLists: - 2410 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 4391 @@ -55078,6 +55391,8 @@ entities: - type: DeviceNetwork deviceLists: - 5585 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 4449 @@ -55089,6 +55404,8 @@ entities: - type: DeviceNetwork deviceLists: - 5208 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 4672 @@ -55100,6 +55417,8 @@ entities: - type: DeviceNetwork deviceLists: - 2410 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 4677 @@ -55111,6 +55430,8 @@ entities: - type: DeviceNetwork deviceLists: - 9601 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 4769 @@ -55118,6 +55439,8 @@ entities: - type: Transform pos: -17.5,-32.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 4783 @@ -55126,6 +55449,8 @@ entities: rot: 3.141592653589793 rad pos: -18.5,-38.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 4849 @@ -55136,6 +55461,8 @@ entities: - type: DeviceNetwork deviceLists: - 7684 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 5137 @@ -55144,6 +55471,8 @@ entities: rot: 3.141592653589793 rad pos: 0.5,-48.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 6000 @@ -55155,6 +55484,8 @@ entities: - type: DeviceNetwork deviceLists: - 5585 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 6015 @@ -55166,6 +55497,8 @@ entities: - type: DeviceNetwork deviceLists: - 10602 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 6020 @@ -55177,6 +55510,8 @@ entities: - type: DeviceNetwork deviceLists: - 12258 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 6957 @@ -55188,6 +55523,8 @@ entities: - type: DeviceNetwork deviceLists: - 2410 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 7094 @@ -55195,6 +55532,8 @@ entities: - type: Transform pos: -38.5,4.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 7164 @@ -55206,6 +55545,8 @@ entities: - type: DeviceNetwork deviceLists: - 5573 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 7665 @@ -55217,6 +55558,8 @@ entities: - type: DeviceNetwork deviceLists: - 13430 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 7677 @@ -55227,6 +55570,8 @@ entities: - type: DeviceNetwork deviceLists: - 2410 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 7772 @@ -55238,6 +55583,8 @@ entities: - type: DeviceNetwork deviceLists: - 11539 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 7843 @@ -55246,6 +55593,8 @@ entities: rot: 1.5707963267948966 rad pos: 1.5,-39.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8360 @@ -55254,6 +55603,8 @@ entities: rot: -1.5707963267948966 rad pos: -29.5,-37.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8362 @@ -55265,6 +55616,8 @@ entities: - type: DeviceNetwork deviceLists: - 13443 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8363 @@ -55273,6 +55626,8 @@ entities: rot: -1.5707963267948966 rad pos: -24.5,-26.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8364 @@ -55280,6 +55635,8 @@ entities: - type: Transform pos: -38.5,-29.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8404 @@ -55288,6 +55645,8 @@ entities: rot: 1.5707963267948966 rad pos: -45.5,-29.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8409 @@ -55296,6 +55655,8 @@ entities: rot: 3.141592653589793 rad pos: -44.5,-33.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8440 @@ -55304,6 +55665,8 @@ entities: rot: 1.5707963267948966 rad pos: -26.5,-23.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8458 @@ -55311,6 +55674,8 @@ entities: - type: Transform pos: -16.5,-19.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8463 @@ -55319,6 +55684,8 @@ entities: rot: 1.5707963267948966 rad pos: -13.5,-25.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8579 @@ -55327,6 +55694,8 @@ entities: rot: 3.141592653589793 rad pos: 39.5,1.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8610 @@ -55335,6 +55704,8 @@ entities: rot: -1.5707963267948966 rad pos: -9.5,-7.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8626 @@ -55343,6 +55714,8 @@ entities: rot: -1.5707963267948966 rad pos: -3.5,-19.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8634 @@ -55351,6 +55724,8 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,-9.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8642 @@ -55359,6 +55734,8 @@ entities: rot: 1.5707963267948966 rad pos: 1.5,-4.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8643 @@ -55367,6 +55744,8 @@ entities: rot: 3.141592653589793 rad pos: 8.5,-5.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8661 @@ -55374,6 +55753,8 @@ entities: - type: Transform pos: 9.5,-7.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8663 @@ -55382,6 +55763,8 @@ entities: rot: 1.5707963267948966 rad pos: -5.5,-5.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8684 @@ -55390,6 +55773,8 @@ entities: rot: -1.5707963267948966 rad pos: -6.5,2.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8685 @@ -55401,6 +55786,8 @@ entities: - type: DeviceNetwork deviceLists: - 2525 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8697 @@ -55408,6 +55795,8 @@ entities: - type: Transform pos: -14.5,3.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8698 @@ -55415,11 +55804,15 @@ entities: - type: Transform pos: -24.5,2.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - uid: 8699 components: - type: Transform pos: -29.5,1.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8700 @@ -55427,6 +55820,8 @@ entities: - type: Transform pos: -18.5,0.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8701 @@ -55435,6 +55830,8 @@ entities: rot: 3.141592653589793 rad pos: -23.5,-3.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8722 @@ -55442,6 +55839,8 @@ entities: - type: Transform pos: -0.5,0.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8741 @@ -55450,6 +55849,8 @@ entities: rot: -1.5707963267948966 rad pos: 10.5,1.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8751 @@ -55457,6 +55858,8 @@ entities: - type: Transform pos: 9.5,10.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8776 @@ -55467,6 +55870,8 @@ entities: - type: DeviceNetwork deviceLists: - 3295 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8779 @@ -55475,6 +55880,8 @@ entities: rot: -1.5707963267948966 rad pos: 17.5,3.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8780 @@ -55482,6 +55889,8 @@ entities: - type: Transform pos: 17.5,9.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8796 @@ -55490,6 +55899,8 @@ entities: rot: 1.5707963267948966 rad pos: 12.5,11.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8804 @@ -55498,6 +55909,8 @@ entities: rot: 3.141592653589793 rad pos: -0.5,-15.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8805 @@ -55506,6 +55919,8 @@ entities: rot: 1.5707963267948966 rad pos: 11.5,-10.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8968 @@ -55514,6 +55929,8 @@ entities: rot: 3.141592653589793 rad pos: -5.5,-47.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8977 @@ -55522,6 +55939,8 @@ entities: rot: 1.5707963267948966 rad pos: -8.5,-41.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8980 @@ -55530,6 +55949,8 @@ entities: rot: 3.141592653589793 rad pos: 5.5,-45.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 8994 @@ -55538,6 +55959,8 @@ entities: rot: -1.5707963267948966 rad pos: 0.5,-33.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9013 @@ -55545,6 +55968,8 @@ entities: - type: Transform pos: -0.5,-26.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9023 @@ -55553,6 +55978,8 @@ entities: rot: 3.141592653589793 rad pos: 7.5,-40.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9044 @@ -55560,6 +55987,8 @@ entities: - type: Transform pos: 3.5,-22.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9057 @@ -55567,6 +55996,8 @@ entities: - type: Transform pos: 0.5,-19.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9061 @@ -55574,6 +56005,8 @@ entities: - type: Transform pos: 5.5,-20.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9116 @@ -55582,6 +56015,8 @@ entities: rot: 1.5707963267948966 rad pos: 31.5,-22.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9182 @@ -55590,6 +56025,8 @@ entities: rot: -1.5707963267948966 rad pos: -24.5,-18.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9191 @@ -55598,6 +56035,8 @@ entities: rot: 1.5707963267948966 rad pos: -31.5,-14.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9201 @@ -55605,6 +56044,8 @@ entities: - type: Transform pos: -33.5,-19.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9234 @@ -55613,6 +56054,8 @@ entities: rot: 3.141592653589793 rad pos: -34.5,-3.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9255 @@ -55621,6 +56064,8 @@ entities: rot: -1.5707963267948966 rad pos: -46.5,2.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9256 @@ -55629,6 +56074,8 @@ entities: rot: 1.5707963267948966 rad pos: -48.5,2.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9257 @@ -55637,6 +56084,8 @@ entities: rot: 1.5707963267948966 rad pos: -49.5,-4.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9258 @@ -55645,6 +56094,8 @@ entities: rot: -1.5707963267948966 rad pos: -47.5,-4.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9265 @@ -55653,6 +56104,8 @@ entities: rot: 3.141592653589793 rad pos: -43.5,-5.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9266 @@ -55661,6 +56114,8 @@ entities: rot: 1.5707963267948966 rad pos: -54.5,-1.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9294 @@ -55669,6 +56124,8 @@ entities: rot: 1.5707963267948966 rad pos: -49.5,-6.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9295 @@ -55677,6 +56134,8 @@ entities: rot: -1.5707963267948966 rad pos: -47.5,-6.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9297 @@ -55685,6 +56144,8 @@ entities: rot: 1.5707963267948966 rad pos: -39.5,-7.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9307 @@ -55693,6 +56154,8 @@ entities: rot: 3.141592653589793 rad pos: -29.5,-11.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9308 @@ -55701,6 +56164,8 @@ entities: rot: 1.5707963267948966 rad pos: -33.5,-10.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9346 @@ -55709,6 +56174,8 @@ entities: rot: 3.141592653589793 rad pos: 30.5,-44.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9469 @@ -55717,6 +56184,8 @@ entities: rot: -1.5707963267948966 rad pos: -16.5,-23.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9470 @@ -55725,6 +56194,8 @@ entities: rot: -1.5707963267948966 rad pos: -10.5,-32.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9594 @@ -55736,6 +56207,8 @@ entities: - type: DeviceNetwork deviceLists: - 2525 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9595 @@ -55747,6 +56220,8 @@ entities: - type: DeviceNetwork deviceLists: - 3874 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9609 @@ -55757,6 +56232,8 @@ entities: - type: DeviceNetwork deviceLists: - 2525 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9614 @@ -55768,6 +56245,8 @@ entities: - type: DeviceNetwork deviceLists: - 13430 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9782 @@ -55776,6 +56255,8 @@ entities: rot: 3.141592653589793 rad pos: -40.5,2.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 9783 @@ -55783,6 +56264,8 @@ entities: - type: Transform pos: -40.5,7.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 10027 @@ -55790,6 +56273,8 @@ entities: - type: Transform pos: 22.5,-22.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 10390 @@ -55798,6 +56283,8 @@ entities: rot: 1.5707963267948966 rad pos: -51.5,-26.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 10426 @@ -55806,6 +56293,8 @@ entities: rot: 1.5707963267948966 rad pos: 8.5,6.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 10467 @@ -55814,6 +56303,8 @@ entities: rot: -1.5707963267948966 rad pos: -3.5,-36.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 10560 @@ -55822,6 +56313,8 @@ entities: rot: 3.141592653589793 rad pos: -45.5,-27.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11005 @@ -55832,6 +56325,8 @@ entities: - type: DeviceNetwork deviceLists: - 13443 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11112 @@ -55840,6 +56335,8 @@ entities: rot: 1.5707963267948966 rad pos: -34.5,-42.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11404 @@ -55851,6 +56348,8 @@ entities: - type: DeviceNetwork deviceLists: - 2349 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11519 @@ -55859,6 +56358,8 @@ entities: rot: 1.5707963267948966 rad pos: -39.5,-23.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11534 @@ -55870,6 +56371,8 @@ entities: - type: DeviceNetwork deviceLists: - 13432 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11894 @@ -55878,6 +56381,8 @@ entities: rot: 3.141592653589793 rad pos: 1.5,13.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11906 @@ -55886,6 +56391,8 @@ entities: rot: -1.5707963267948966 rad pos: 16.5,16.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 11985 @@ -55893,6 +56400,8 @@ entities: - type: Transform pos: -2.5,3.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12072 @@ -55901,6 +56410,8 @@ entities: rot: 1.5707963267948966 rad pos: -36.5,-49.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12205 @@ -55909,6 +56420,8 @@ entities: rot: 1.5707963267948966 rad pos: -56.5,-8.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12212 @@ -55917,6 +56430,8 @@ entities: rot: 3.141592653589793 rad pos: -49.5,-13.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12220 @@ -55925,6 +56440,8 @@ entities: rot: -1.5707963267948966 rad pos: -24.5,-30.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12368 @@ -55936,6 +56453,8 @@ entities: - type: DeviceNetwork deviceLists: - 9601 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12457 @@ -55947,6 +56466,8 @@ entities: - type: DeviceNetwork deviceLists: - 7684 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12464 @@ -55958,6 +56479,8 @@ entities: - type: DeviceNetwork deviceLists: - 7684 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12475 @@ -55969,6 +56492,8 @@ entities: - type: DeviceNetwork deviceLists: - 8028 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12476 @@ -55980,6 +56505,8 @@ entities: - type: DeviceNetwork deviceLists: - 8028 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12480 @@ -55991,6 +56518,8 @@ entities: - type: DeviceNetwork deviceLists: - 13672 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12483 @@ -56002,6 +56531,8 @@ entities: - type: DeviceNetwork deviceLists: - 13672 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12485 @@ -56013,6 +56544,8 @@ entities: - type: DeviceNetwork deviceLists: - 13672 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12490 @@ -56024,6 +56557,8 @@ entities: - type: DeviceNetwork deviceLists: - 7683 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12534 @@ -56035,6 +56570,8 @@ entities: - type: DeviceNetwork deviceLists: - 6342 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12668 @@ -56043,6 +56580,8 @@ entities: rot: 1.5707963267948966 rad pos: -12.5,-5.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12843 @@ -56054,6 +56593,8 @@ entities: deviceLists: - 10611 - 9601 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12860 @@ -56062,6 +56603,8 @@ entities: rot: 1.5707963267948966 rad pos: -7.5,11.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12942 @@ -56070,6 +56613,8 @@ entities: rot: -1.5707963267948966 rad pos: 43.5,3.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 12966 @@ -56078,6 +56623,8 @@ entities: rot: 3.141592653589793 rad pos: -12.5,-40.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 13104 @@ -56086,6 +56633,8 @@ entities: rot: 1.5707963267948966 rad pos: 13.5,16.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 13126 @@ -56094,6 +56643,8 @@ entities: rot: 3.141592653589793 rad pos: 44.5,-15.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 13190 @@ -56102,6 +56653,8 @@ entities: rot: 3.141592653589793 rad pos: 26.5,-38.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 13214 @@ -56113,6 +56666,8 @@ entities: - type: DeviceNetwork deviceLists: - 13432 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 13241 @@ -56124,6 +56679,8 @@ entities: - type: DeviceNetwork deviceLists: - 5208 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 13245 @@ -56135,6 +56692,8 @@ entities: - type: DeviceNetwork deviceLists: - 2525 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 13448 @@ -56145,6 +56704,8 @@ entities: - type: DeviceNetwork deviceLists: - 13671 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 13451 @@ -56156,6 +56717,8 @@ entities: - type: DeviceNetwork deviceLists: - 13671 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 13452 @@ -56167,6 +56730,8 @@ entities: - type: DeviceNetwork deviceLists: - 10291 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 13454 @@ -56178,6 +56743,8 @@ entities: - type: DeviceNetwork deviceLists: - 13672 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 13496 @@ -56189,6 +56756,8 @@ entities: - type: DeviceNetwork deviceLists: - 6342 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - uid: 13497 @@ -56199,6 +56768,8 @@ entities: - type: DeviceNetwork deviceLists: - 6342 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#0335FCFF' - proto: GasVentScrubber @@ -56209,6 +56780,8 @@ entities: rot: 3.141592653589793 rad pos: -13.5,-4.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 1101 @@ -56220,6 +56793,8 @@ entities: - type: DeviceNetwork deviceLists: - 9601 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 1411 @@ -56231,6 +56806,8 @@ entities: - type: DeviceNetwork deviceLists: - 5244 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 1818 @@ -56242,6 +56819,8 @@ entities: - type: DeviceNetwork deviceLists: - 11539 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 1914 @@ -56249,6 +56828,8 @@ entities: - type: Transform pos: -17.5,-6.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 1974 @@ -56256,6 +56837,8 @@ entities: - type: Transform pos: -19.5,-19.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 2451 @@ -56263,6 +56846,8 @@ entities: - type: Transform pos: -33.5,-35.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 2601 @@ -56271,6 +56856,8 @@ entities: rot: 1.5707963267948966 rad pos: -34.5,-46.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 2936 @@ -56279,6 +56866,8 @@ entities: rot: -1.5707963267948966 rad pos: 9.5,-42.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 3881 @@ -56290,6 +56879,8 @@ entities: - type: DeviceNetwork deviceLists: - 5244 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 4079 @@ -56301,6 +56892,8 @@ entities: - type: DeviceNetwork deviceLists: - 2410 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 4159 @@ -56312,6 +56905,8 @@ entities: - type: DeviceNetwork deviceLists: - 2410 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 4472 @@ -56323,6 +56918,8 @@ entities: - type: DeviceNetwork deviceLists: - 5585 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 4957 @@ -56334,6 +56931,8 @@ entities: - type: DeviceNetwork deviceLists: - 12258 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 5850 @@ -56342,6 +56941,8 @@ entities: rot: -1.5707963267948966 rad pos: -40.5,1.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 5851 @@ -56350,6 +56951,8 @@ entities: rot: -1.5707963267948966 rad pos: -40.5,8.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 5915 @@ -56358,6 +56961,8 @@ entities: rot: 1.5707963267948966 rad pos: 4.5,-5.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 5997 @@ -56369,6 +56974,8 @@ entities: - type: DeviceNetwork deviceLists: - 5585 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 6096 @@ -56380,6 +56987,8 @@ entities: - type: DeviceNetwork deviceLists: - 8028 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 6113 @@ -56388,6 +56997,8 @@ entities: rot: -1.5707963267948966 rad pos: 9.5,-5.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 6554 @@ -56396,6 +57007,8 @@ entities: rot: 3.141592653589793 rad pos: 27.5,-38.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 6873 @@ -56404,6 +57017,8 @@ entities: rot: 1.5707963267948966 rad pos: 1.5,-40.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 7185 @@ -56415,6 +57030,8 @@ entities: - type: DeviceNetwork deviceLists: - 5573 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 7667 @@ -56426,6 +57043,8 @@ entities: - type: DeviceNetwork deviceLists: - 13430 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 7973 @@ -56433,6 +57052,8 @@ entities: - type: Transform pos: -16.5,0.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 7981 @@ -56441,6 +57062,8 @@ entities: rot: 3.141592653589793 rad pos: -26.5,-1.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 7987 @@ -56448,6 +57071,8 @@ entities: - type: Transform pos: -30.5,1.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 7988 @@ -56455,6 +57080,8 @@ entities: - type: Transform pos: -23.5,2.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 7989 @@ -56462,6 +57089,8 @@ entities: - type: Transform pos: -17.5,3.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 8195 @@ -56473,6 +57102,8 @@ entities: - type: DeviceNetwork deviceLists: - 2349 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 8424 @@ -56481,6 +57112,8 @@ entities: rot: 1.5707963267948966 rad pos: -51.5,-25.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 8817 @@ -56491,6 +57124,8 @@ entities: - type: DeviceNetwork deviceLists: - 2525 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 8836 @@ -56502,6 +57137,8 @@ entities: - type: DeviceNetwork deviceLists: - 6342 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 8920 @@ -56513,6 +57150,8 @@ entities: - type: DeviceNetwork deviceLists: - 2525 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 8936 @@ -56521,6 +57160,8 @@ entities: rot: 1.5707963267948966 rad pos: 37.5,1.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 8993 @@ -56529,6 +57170,8 @@ entities: rot: -1.5707963267948966 rad pos: -0.5,-32.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9010 @@ -56537,6 +57180,8 @@ entities: rot: -1.5707963267948966 rad pos: 0.5,-28.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9372 @@ -56545,6 +57190,8 @@ entities: rot: 3.141592653589793 rad pos: -43.5,-33.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9373 @@ -56553,6 +57200,8 @@ entities: rot: 1.5707963267948966 rad pos: -44.5,-31.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9374 @@ -56561,6 +57210,8 @@ entities: rot: 3.141592653589793 rad pos: -40.5,-31.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9414 @@ -56571,6 +57222,8 @@ entities: - type: DeviceNetwork deviceLists: - 13443 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9445 @@ -56579,6 +57232,8 @@ entities: rot: 1.5707963267948966 rad pos: -29.5,-18.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9456 @@ -56587,6 +57242,8 @@ entities: rot: 3.141592653589793 rad pos: -23.5,-26.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9460 @@ -56594,6 +57251,8 @@ entities: - type: Transform pos: -22.5,-18.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9496 @@ -56602,6 +57261,8 @@ entities: rot: -1.5707963267948966 rad pos: -8.5,-25.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9510 @@ -56610,6 +57271,8 @@ entities: rot: 1.5707963267948966 rad pos: -16.5,-10.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9522 @@ -56617,6 +57280,8 @@ entities: - type: Transform pos: -9.5,-8.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9534 @@ -56625,6 +57290,8 @@ entities: rot: 1.5707963267948966 rad pos: -5.5,-6.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9545 @@ -56633,6 +57300,8 @@ entities: rot: 3.141592653589793 rad pos: 0.5,-9.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9546 @@ -56641,6 +57310,8 @@ entities: rot: -1.5707963267948966 rad pos: 8.5,-7.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9562 @@ -56649,6 +57320,8 @@ entities: rot: -1.5707963267948966 rad pos: 0.5,-18.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9571 @@ -56657,6 +57330,8 @@ entities: rot: -1.5707963267948966 rad pos: -3.5,-20.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9590 @@ -56664,6 +57339,8 @@ entities: - type: Transform pos: 4.5,-22.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9593 @@ -56671,6 +57348,8 @@ entities: - type: Transform pos: 6.5,-20.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9598 @@ -56682,6 +57361,8 @@ entities: - type: DeviceNetwork deviceLists: - 2525 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9599 @@ -56693,6 +57374,8 @@ entities: - type: DeviceNetwork deviceLists: - 3874 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9610 @@ -56700,6 +57383,8 @@ entities: - type: Transform pos: 5.5,-35.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9613 @@ -56710,6 +57395,8 @@ entities: - type: DeviceNetwork deviceLists: - 13430 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9615 @@ -56721,6 +57408,8 @@ entities: - type: DeviceNetwork deviceLists: - 10602 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9620 @@ -56732,6 +57421,8 @@ entities: - type: DeviceNetwork deviceLists: - 5208 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9637 @@ -56743,6 +57434,8 @@ entities: - type: DeviceNetwork deviceLists: - 2525 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9638 @@ -56754,6 +57447,8 @@ entities: - type: DeviceNetwork deviceLists: - 5208 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9659 @@ -56762,6 +57457,8 @@ entities: rot: 3.141592653589793 rad pos: -7.5,-47.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9660 @@ -56770,6 +57467,8 @@ entities: rot: 1.5707963267948966 rad pos: -8.5,-43.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9686 @@ -56778,6 +57477,8 @@ entities: rot: 3.141592653589793 rad pos: 0.5,-46.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9687 @@ -56786,6 +57487,8 @@ entities: rot: -1.5707963267948966 rad pos: 6.5,-45.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#F84000FF' - uid: 9704 @@ -56793,6 +57496,8 @@ entities: - type: Transform pos: 3.5,0.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9706 @@ -56801,6 +57506,8 @@ entities: rot: 1.5707963267948966 rad pos: -11.5,4.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9707 @@ -56809,6 +57516,8 @@ entities: rot: -1.5707963267948966 rad pos: -6.5,3.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9764 @@ -56817,6 +57526,8 @@ entities: rot: 3.141592653589793 rad pos: -30.5,-11.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#F84000FF' - uid: 9765 @@ -56825,6 +57536,8 @@ entities: rot: 1.5707963267948966 rad pos: -33.5,-9.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#F84000FF' - uid: 9766 @@ -56833,6 +57546,8 @@ entities: rot: -1.5707963267948966 rad pos: -35.5,-4.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9777 @@ -56840,6 +57555,8 @@ entities: - type: Transform pos: -36.5,2.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9799 @@ -56848,6 +57565,8 @@ entities: rot: 1.5707963267948966 rad pos: -39.5,-3.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9800 @@ -56856,6 +57575,8 @@ entities: rot: 3.141592653589793 rad pos: -41.5,-3.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9805 @@ -56864,6 +57585,8 @@ entities: rot: 1.5707963267948966 rad pos: -54.5,-0.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9822 @@ -56871,6 +57594,8 @@ entities: - type: Transform pos: -44.5,2.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9823 @@ -56878,6 +57603,8 @@ entities: - type: Transform pos: -48.5,1.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9824 @@ -56886,6 +57613,8 @@ entities: rot: 3.141592653589793 rad pos: -46.5,-4.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9825 @@ -56894,6 +57623,8 @@ entities: rot: 3.141592653589793 rad pos: -49.5,-3.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9844 @@ -56901,6 +57632,8 @@ entities: - type: Transform pos: -46.5,-6.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9845 @@ -56908,6 +57641,8 @@ entities: - type: Transform pos: -51.5,-6.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9875 @@ -56916,6 +57651,8 @@ entities: rot: 1.5707963267948966 rad pos: 11.5,1.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9886 @@ -56924,6 +57661,8 @@ entities: rot: 3.141592653589793 rad pos: 10.5,7.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9887 @@ -56931,6 +57670,8 @@ entities: - type: Transform pos: 10.5,11.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9892 @@ -56938,6 +57679,8 @@ entities: - type: Transform pos: 17.5,6.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9894 @@ -56946,6 +57689,8 @@ entities: rot: -1.5707963267948966 rad pos: 16.5,9.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9902 @@ -56954,6 +57699,8 @@ entities: rot: 1.5707963267948966 rad pos: 12.5,10.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9904 @@ -56965,6 +57712,8 @@ entities: - type: DeviceNetwork deviceLists: - 3295 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 9925 @@ -56973,6 +57722,8 @@ entities: rot: 1.5707963267948966 rad pos: 11.5,-12.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 10055 @@ -56980,6 +57731,8 @@ entities: - type: Transform pos: 11.5,-21.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 10094 @@ -56988,6 +57741,8 @@ entities: rot: 1.5707963267948966 rad pos: 25.5,-40.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 10098 @@ -56996,6 +57751,8 @@ entities: rot: 3.141592653589793 rad pos: 29.5,-44.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 10218 @@ -57003,6 +57760,8 @@ entities: - type: Transform pos: 28.5,-22.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 10466 @@ -57011,6 +57770,8 @@ entities: rot: -1.5707963267948966 rad pos: -3.5,-35.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 10672 @@ -57019,6 +57780,8 @@ entities: rot: 1.5707963267948966 rad pos: -39.5,-20.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11250 @@ -57029,6 +57792,8 @@ entities: - type: DeviceNetwork deviceLists: - 13443 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11274 @@ -57037,6 +57802,8 @@ entities: rot: -1.5707963267948966 rad pos: -34.5,-17.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11355 @@ -57048,6 +57815,8 @@ entities: - type: DeviceNetwork deviceLists: - 13432 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11356 @@ -57059,6 +57828,8 @@ entities: - type: DeviceNetwork deviceLists: - 13432 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11527 @@ -57067,6 +57838,8 @@ entities: rot: 3.141592653589793 rad pos: -44.5,-27.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11575 @@ -57075,6 +57848,8 @@ entities: rot: 1.5707963267948966 rad pos: -15.5,-34.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11830 @@ -57082,6 +57857,8 @@ entities: - type: Transform pos: 9.5,14.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11902 @@ -57090,6 +57867,8 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,13.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11905 @@ -57098,6 +57877,8 @@ entities: rot: 1.5707963267948966 rad pos: -19.5,-23.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 11986 @@ -57105,6 +57886,8 @@ entities: - type: Transform pos: -1.5,3.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12015 @@ -57113,6 +57896,8 @@ entities: rot: 3.141592653589793 rad pos: -8.5,-1.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12141 @@ -57123,6 +57908,8 @@ entities: - type: DeviceNetwork deviceLists: - 7684 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12168 @@ -57134,6 +57921,8 @@ entities: - type: DeviceNetwork deviceLists: - 7684 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12173 @@ -57145,6 +57934,8 @@ entities: - type: DeviceNetwork deviceLists: - 7684 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12177 @@ -57156,6 +57947,8 @@ entities: - type: DeviceNetwork deviceLists: - 7683 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12186 @@ -57166,6 +57959,8 @@ entities: - type: DeviceNetwork deviceLists: - 10291 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12187 @@ -57177,6 +57972,8 @@ entities: - type: DeviceNetwork deviceLists: - 13672 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12204 @@ -57185,6 +57982,8 @@ entities: rot: 1.5707963267948966 rad pos: -56.5,-11.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12219 @@ -57193,6 +57992,8 @@ entities: rot: -1.5707963267948966 rad pos: -25.5,-29.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12226 @@ -57201,6 +58002,8 @@ entities: rot: 3.141592653589793 rad pos: -29.5,-31.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12358 @@ -57209,6 +58012,8 @@ entities: rot: 1.5707963267948966 rad pos: -16.5,-38.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12396 @@ -57220,6 +58025,8 @@ entities: - type: DeviceNetwork deviceLists: - 2410 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12401 @@ -57231,6 +58038,8 @@ entities: - type: DeviceNetwork deviceLists: - 2410 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12402 @@ -57242,6 +58051,8 @@ entities: - type: DeviceNetwork deviceLists: - 13672 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12421 @@ -57250,6 +58061,8 @@ entities: rot: -1.5707963267948966 rad pos: 7.5,-41.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12431 @@ -57261,6 +58074,8 @@ entities: - type: DeviceNetwork deviceLists: - 13672 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12477 @@ -57272,6 +58087,8 @@ entities: - type: DeviceNetwork deviceLists: - 8028 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12844 @@ -57283,6 +58100,8 @@ entities: deviceLists: - 10611 - 9601 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12879 @@ -57291,6 +58110,8 @@ entities: rot: 3.141592653589793 rad pos: -5.5,8.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12889 @@ -57299,6 +58120,8 @@ entities: rot: 3.141592653589793 rad pos: -13.5,-40.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 12931 @@ -57307,6 +58130,8 @@ entities: rot: -1.5707963267948966 rad pos: -9.5,-34.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 13106 @@ -57315,6 +58140,8 @@ entities: rot: -1.5707963267948966 rad pos: 16.5,15.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 13127 @@ -57323,6 +58150,8 @@ entities: rot: 3.141592653589793 rad pos: 43.5,-15.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 13449 @@ -57334,6 +58163,8 @@ entities: - type: DeviceNetwork deviceLists: - 13671 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 13450 @@ -57345,6 +58176,8 @@ entities: - type: DeviceNetwork deviceLists: - 13671 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 13453 @@ -57356,6 +58189,8 @@ entities: - type: DeviceNetwork deviceLists: - 13672 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 13498 @@ -57367,6 +58202,8 @@ entities: - type: DeviceNetwork deviceLists: - 6342 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - uid: 13499 @@ -57377,6 +58214,8 @@ entities: - type: DeviceNetwork deviceLists: - 6342 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF1212FF' - proto: GasVolumePump @@ -57388,6 +58227,8 @@ entities: parent: 34 - type: GasVolumePump transferRate: 40 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#03FCD3FF' - uid: 944 @@ -57397,6 +58238,8 @@ entities: parent: 34 - type: GasVolumePump transferRate: 100 + - type: AtmosDevice + joinedGrid: 34 - uid: 961 components: - type: Transform @@ -57404,12 +58247,16 @@ entities: parent: 34 - type: GasVolumePump transferRate: 100 + - type: AtmosDevice + joinedGrid: 34 - uid: 1565 components: - type: Transform rot: -1.5707963267948966 rad pos: -56.5,-24.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#03FCD3FF' - uid: 1637 @@ -57420,6 +58267,8 @@ entities: parent: 34 - type: GasVolumePump transferRate: 15 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#444444FF' - uid: 11487 @@ -57429,6 +58278,8 @@ entities: parent: 34 - type: GasVolumePump transferRate: 40 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#03FCD3FF' - uid: 11531 @@ -57438,6 +58289,8 @@ entities: parent: 34 - type: GasVolumePump transferRate: 40 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#03FCD3FF' - uid: 11546 @@ -57447,6 +58300,8 @@ entities: parent: 34 - type: GasVolumePump transferRate: 40 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#03FCD3FF' - uid: 11580 @@ -57456,6 +58311,8 @@ entities: parent: 34 - type: GasVolumePump transferRate: 40 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#03FCD3FF' - uid: 13795 @@ -57466,6 +58323,8 @@ entities: parent: 34 - type: GasVolumePump transferRate: 50 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#444444FF' - uid: 13796 @@ -57476,6 +58335,8 @@ entities: parent: 34 - type: GasVolumePump transferRate: 1 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#444444FF' - uid: 13830 @@ -57483,6 +58344,8 @@ entities: - type: Transform pos: -45.5,-49.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - proto: Gauze entities: - uid: 1371 @@ -61564,6 +62427,8 @@ entities: rot: 3.141592653589793 rad pos: -56.5,-37.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#444444FF' - uid: 1522 @@ -61572,6 +62437,8 @@ entities: rot: 1.5707963267948966 rad pos: -56.5,-41.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF0000FF' - uid: 1541 @@ -61579,6 +62446,8 @@ entities: - type: Transform pos: -59.5,-37.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF0000FF' - uid: 1612 @@ -61587,6 +62456,8 @@ entities: rot: 3.141592653589793 rad pos: -55.5,-37.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF0000FF' - uid: 1615 @@ -61595,6 +62466,8 @@ entities: rot: 3.141592653589793 rad pos: -55.5,-39.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF0000FF' - uid: 1626 @@ -61603,6 +62476,8 @@ entities: rot: 3.141592653589793 rad pos: -56.5,-39.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#444444FF' - uid: 1638 @@ -61610,6 +62485,8 @@ entities: - type: Transform pos: -58.5,-39.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#444444FF' - uid: 1639 @@ -61617,6 +62494,8 @@ entities: - type: Transform pos: -59.5,-39.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF0000FF' - uid: 3329 @@ -61624,16 +62503,22 @@ entities: - type: Transform pos: -45.5,-53.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - uid: 3330 components: - type: Transform pos: -44.5,-53.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - uid: 3378 components: - type: Transform pos: -58.5,-37.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#444444FF' - uid: 3789 @@ -61642,6 +62527,8 @@ entities: rot: 1.5707963267948966 rad pos: -58.5,-41.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - type: AtmosPipeColor color: '#FF0000FF' - uid: 11687 @@ -61649,26 +62536,36 @@ entities: - type: Transform pos: -62.5,-21.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - uid: 11705 components: - type: Transform pos: -61.5,-21.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - uid: 11769 components: - type: Transform pos: -60.5,-21.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - uid: 11829 components: - type: Transform pos: -59.5,-21.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - uid: 11834 components: - type: Transform pos: -58.5,-21.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - proto: HighSecCommandLocked entities: - uid: 1073 @@ -63580,16 +64477,22 @@ entities: - type: Transform pos: -38.5,-29.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - uid: 7818 components: - type: Transform pos: -52.5,-33.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - uid: 12979 components: - type: Transform pos: -55.5,-16.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - proto: NitrousOxideTankFilled entities: - uid: 8957 @@ -63680,31 +64583,43 @@ entities: - type: Transform pos: -37.5,-29.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - uid: 10358 components: - type: Transform pos: 29.5,8.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - uid: 10359 components: - type: Transform pos: -23.5,-4.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - uid: 10618 components: - type: Transform pos: -30.5,-42.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - uid: 12324 components: - type: Transform pos: -52.5,-31.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - uid: 12980 components: - type: Transform pos: -50.5,-20.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - proto: PaintingBlunt entities: - uid: 2407 @@ -64064,11 +64979,15 @@ entities: - type: Transform pos: -52.5,-32.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - uid: 13794 components: - type: Transform pos: -57.5,-31.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - proto: PlasmaReinforcedWindowDirectional entities: - uid: 13338 @@ -72979,13 +73898,6 @@ entities: - type: Transform pos: -28.5,-34.5 parent: 34 -- proto: SpawnPointAdminAssistant - entities: - - uid: 13847 - components: - - type: Transform - pos: 46.5,-34.5 - parent: 34 - proto: SpawnPointAtmos entities: - uid: 10425 @@ -73137,18 +74049,6 @@ entities: - type: Transform pos: -1.5,-19.5 parent: 34 -- proto: SpawnPointCourier - entities: - - uid: 857 - components: - - type: Transform - pos: -7.5,-26.5 - parent: 34 - - uid: 1284 - components: - - type: Transform - pos: -8.5,-26.5 - parent: 34 - proto: SpawnPointDetective entities: - uid: 4415 @@ -73255,6 +74155,18 @@ entities: - type: Transform pos: -7.5,-17.5 parent: 34 +- proto: SpawnPointMailCarrier + entities: + - uid: 857 + components: + - type: Transform + pos: -7.5,-26.5 + parent: 34 + - uid: 1284 + components: + - type: Transform + pos: -8.5,-26.5 + parent: 34 - proto: SpawnPointMartialArtist entities: - uid: 11940 @@ -74056,11 +74968,15 @@ entities: - type: Transform pos: -47.5,-40.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - uid: 1648 components: - type: Transform pos: -48.5,-40.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - proto: SubstationBasic entities: - uid: 2236 @@ -77078,6 +77994,8 @@ entities: - type: Transform pos: -55.5,-29.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - proto: TegCirculator entities: - uid: 6159 @@ -86222,6 +87140,8 @@ entities: - type: Transform pos: -52.5,-30.5 parent: 34 + - type: AtmosDevice + joinedGrid: 34 - proto: WeaponCapacitorRecharger entities: - uid: 3395 diff --git a/Resources/Maps/submarine.yml b/Resources/Maps/submarine.yml index 5bdfe281ee0..3f70bc93d27 100644 --- a/Resources/Maps/submarine.yml +++ b/Resources/Maps/submarine.yml @@ -217303,13 +217303,6 @@ entities: - type: Transform pos: 15.5,-35.5 parent: 2 -- proto: SpawnPointAdminAssistant - entities: - - uid: 40565 - components: - - type: Transform - pos: 13.5,42.5 - parent: 2 - proto: SpawnPointAtmos entities: - uid: 39400 @@ -217486,18 +217479,6 @@ entities: - type: Transform pos: -75.5,1.5 parent: 2 -- proto: SpawnPointCourier - entities: - - uid: 983 - components: - - type: Transform - pos: -9.5,-23.5 - parent: 2 - - uid: 9974 - components: - - type: Transform - pos: -8.5,-23.5 - parent: 2 - proto: SpawnPointDetective entities: - uid: 34033 @@ -217722,6 +217703,18 @@ entities: - type: Transform pos: 75.5,-8.5 parent: 2 +- proto: SpawnPointMailCarrier + entities: + - uid: 983 + components: + - type: Transform + pos: -9.5,-23.5 + parent: 2 + - uid: 9974 + components: + - type: Transform + pos: -8.5,-23.5 + parent: 2 - proto: SpawnPointMartialArtist entities: - uid: 13394 diff --git a/Resources/Maps/tortuga.yml b/Resources/Maps/tortuga.yml index 4e121cf1359..a0c83a9f1fc 100644 --- a/Resources/Maps/tortuga.yml +++ b/Resources/Maps/tortuga.yml @@ -10958,8 +10958,8 @@ entities: 0: 65535 7,16: 0: 255 - 3: 32768 - 4: 8192 + 4: 32768 + 6: 8192 8,12: 0: 30583 8,13: @@ -11426,8 +11426,8 @@ entities: 0: 4359 8,16: 0: 255 - 5: 8192 - 6: 32768 + 3: 8192 + 5: 32768 9,12: 0: 14327 9,13: @@ -11440,7 +11440,7 @@ entities: 0: 30583 9,16: 0: 255 - 6: 40960 + 5: 40960 10,12: 0: 2032 10,13: @@ -11453,7 +11453,7 @@ entities: 0: 65535 10,16: 0: 255 - 6: 40960 + 5: 40960 11,12: 0: 30583 11,13: @@ -11985,11 +11985,11 @@ entities: 23,13: 0: 4369 8,17: - 5: 34 - 6: 136 + 3: 34 + 5: 136 7,17: - 3: 136 - 4: 34 + 4: 136 + 6: 34 8,18: 1: 61471 7,18: @@ -12003,7 +12003,7 @@ entities: 9,19: 1: 29936 9,17: - 6: 170 + 5: 170 9,20: 1: 62579 10,18: @@ -12011,7 +12011,7 @@ entities: 10,19: 1: 17532 10,17: - 6: 170 + 5: 170 10,20: 1: 29764 11,18: @@ -12703,10 +12703,10 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 6666.982 - 0 - 0 - 0 + - 6666.982 - 0 - 0 - 0 @@ -12718,7 +12718,6 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 0 - 6666.982 - 0 - 0 @@ -12730,13 +12729,14 @@ entities: - 0 - 0 - 0 + - 0 - volume: 2500 temperature: 293.15 moles: - 0 - 0 - 0 - - 6666.982 + - 0 - 0 - 0 - 0 @@ -12749,7 +12749,7 @@ entities: temperature: 293.15 moles: - 0 - - 0 + - 6666.982 - 0 - 0 - 0 @@ -168972,13 +168972,6 @@ entities: - type: Transform pos: -11.5,75.5 parent: 33 -- proto: SpawnPointAdminAssistant - entities: - - uid: 30941 - components: - - type: Transform - pos: -62.5,23.5 - parent: 33 - proto: SpawnPointAtmos entities: - uid: 29733 @@ -169162,28 +169155,6 @@ entities: - type: Transform pos: -14.5,18.5 parent: 33 -- proto: SpawnPointCourier - entities: - - uid: 3585 - components: - - type: Transform - pos: 7.5,-20.5 - parent: 33 - - uid: 13075 - components: - - type: Transform - pos: 6.5,-20.5 - parent: 33 - - uid: 13580 - components: - - type: Transform - pos: 23.5,-27.5 - parent: 33 - - uid: 13581 - components: - - type: Transform - pos: 21.5,-27.5 - parent: 33 - proto: SpawnPointDetective entities: - uid: 28854 @@ -169428,6 +169399,28 @@ entities: - type: Transform pos: 44.5,14.5 parent: 33 +- proto: SpawnPointMailCarrier + entities: + - uid: 3585 + components: + - type: Transform + pos: 7.5,-20.5 + parent: 33 + - uid: 13075 + components: + - type: Transform + pos: 6.5,-20.5 + parent: 33 + - uid: 13580 + components: + - type: Transform + pos: 23.5,-27.5 + parent: 33 + - uid: 13581 + components: + - type: Transform + pos: 21.5,-27.5 + parent: 33 - proto: SpawnPointMedicalDoctor entities: - uid: 5974 diff --git a/Resources/Prototypes/Maps/arena.yml b/Resources/Prototypes/Maps/arena.yml index 11f428a691c..fb5f6596443 100644 --- a/Resources/Prototypes/Maps/arena.yml +++ b/Resources/Prototypes/Maps/arena.yml @@ -24,7 +24,6 @@ Librarian: [ 1, 1 ] #command Captain: [ 1, 1 ] - AdministrativeAssistant: [ 1, 1 ] #engineering AtmosphericTechnician: [ 1, 2 ] ChiefEngineer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/asterisk.yml b/Resources/Prototypes/Maps/asterisk.yml index 28592d9dba5..4f758d3f5b8 100644 --- a/Resources/Prototypes/Maps/asterisk.yml +++ b/Resources/Prototypes/Maps/asterisk.yml @@ -21,7 +21,6 @@ availableJobs: #service Captain: [ 1, 1 ] - AdministrativeAssistant: [ 1, 1 ] HeadOfPersonnel: [ 1, 1 ] Bartender: [ 1, 2 ] Botanist: [ 2, 3 ] diff --git a/Resources/Prototypes/Maps/edge.yml b/Resources/Prototypes/Maps/edge.yml index 03851a5acf5..7cc1d5a3d08 100644 --- a/Resources/Prototypes/Maps/edge.yml +++ b/Resources/Prototypes/Maps/edge.yml @@ -21,7 +21,6 @@ availableJobs: #service Captain: [ 1, 1 ] - AdministrativeAssistant: [ 1, 1 ] HeadOfPersonnel: [ 1, 1 ] Bartender: [ 1, 2 ] Botanist: [ 2, 3 ] diff --git a/Resources/Prototypes/Maps/hammurabi.yml b/Resources/Prototypes/Maps/hammurabi.yml index fb2cc9a38d3..5727071b3b3 100644 --- a/Resources/Prototypes/Maps/hammurabi.yml +++ b/Resources/Prototypes/Maps/hammurabi.yml @@ -23,7 +23,6 @@ Librarian: [ 1, 1 ] #command Captain: [ 1, 1 ] - AdministrativeAssistant: [ 1, 1 ] #engineering AtmosphericTechnician: [ 2, 3 ] ChiefEngineer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/hive.yml b/Resources/Prototypes/Maps/hive.yml index 700ac8ab129..88708f64705 100644 --- a/Resources/Prototypes/Maps/hive.yml +++ b/Resources/Prototypes/Maps/hive.yml @@ -24,7 +24,6 @@ Librarian: [ 1, 1 ] #command Captain: [ 1, 1 ] - AdministrativeAssistant: [ 1, 1 ] #engineering AtmosphericTechnician: [ 1, 2 ] ChiefEngineer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/lighthouse.yml b/Resources/Prototypes/Maps/lighthouse.yml index 3e3811535d4..cffedb84375 100644 --- a/Resources/Prototypes/Maps/lighthouse.yml +++ b/Resources/Prototypes/Maps/lighthouse.yml @@ -20,7 +20,6 @@ - Passenger availableJobs: Captain: [ 1, 1 ] - AdministrativeAssistant: [ 1, 1 ] #service HeadOfPersonnel: [ 1, 1 ] Bartender: [ 2, 4 ] diff --git a/Resources/Prototypes/Maps/pebble.yml b/Resources/Prototypes/Maps/pebble.yml index c16ba73966e..c282f6e24ba 100644 --- a/Resources/Prototypes/Maps/pebble.yml +++ b/Resources/Prototypes/Maps/pebble.yml @@ -19,7 +19,6 @@ availableJobs: #service Captain: [ 1, 1 ] - AdministrativeAssistant: [ 1, 1 ] HeadOfPersonnel: [ 1, 1 ] Bartender: [ 1, 2 ] Botanist: [ 2, 2 ] diff --git a/Resources/Prototypes/Maps/shoukou.yml b/Resources/Prototypes/Maps/shoukou.yml index fab6854966a..d3216cff75a 100644 --- a/Resources/Prototypes/Maps/shoukou.yml +++ b/Resources/Prototypes/Maps/shoukou.yml @@ -33,7 +33,6 @@ Musician: [ 1, 1] Mime: [ 1, 1 ] Captain: [ 1, 1 ] - AdministrativeAssistant: [ 1, 1 ] HeadOfPersonnel: [ 1, 1 ] #Engineering ChiefEngineer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/submarine.yml b/Resources/Prototypes/Maps/submarine.yml index 8acc99230fa..1d4fc2217e1 100644 --- a/Resources/Prototypes/Maps/submarine.yml +++ b/Resources/Prototypes/Maps/submarine.yml @@ -23,7 +23,6 @@ Librarian: [ 1, 1 ] #command Captain: [ 1, 1 ] - AdministrativeAssistant: [ 1, 1 ] #engineering AtmosphericTechnician: [ 2, 4 ] ChiefEngineer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/tortuga.yml b/Resources/Prototypes/Maps/tortuga.yml index e236ff4c4cb..0b6f69247fd 100644 --- a/Resources/Prototypes/Maps/tortuga.yml +++ b/Resources/Prototypes/Maps/tortuga.yml @@ -23,7 +23,6 @@ Librarian: [ 1, 1 ] #command Captain: [ 1, 1 ] - AdministrativeAssistant: [ 1, 1 ] #engineering AtmosphericTechnician: [ 2, 3 ] ChiefEngineer: [ 1, 1 ] From c1e0641bf874684963e5d28ddff653e7d03f946a Mon Sep 17 00:00:00 2001 From: Noctis Date: Tue, 28 May 2024 17:03:02 +0100 Subject: [PATCH 08/17] Review changes Also fixes the missing courier localisation because I was dumb --- .../Fills/Backpacks/StarterGear/backpack.yml | 1 - .../DeltaV/Entities/Objects/Devices/pda.yml | 28 +++++++++++ .../Objects/Misc/identification_cards.yml | 13 +++++ .../Roles/Jobs/Command/admin_assistant.yml | 47 +------------------ .../DeltaV/Roles/play_time_trackers.yml | 3 ++ .../Prototypes/Roles/Jobs/departments.yml | 2 +- 6 files changed, 47 insertions(+), 47 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml index f9c0c19f0ed..5350b86383e 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -43,5 +43,4 @@ - type: StorageFill contents: - id: BoxSurvival - - id: Flash - id: RubberStampAdminAssistant diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml index 586bb36e00e..b6e46c5d390 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml @@ -54,6 +54,34 @@ tags: - Write +- type: entity + parent: BasePDA + id: CourierPDA + name: courier PDA + description: Smells like unopened letters. + 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: CourierIDCard + state: pda-mailcarrier + - type: PdaBorderColor + borderColor: "#e39751" + accentVColor: "#050c4d" + - type: Icon + sprite: DeltaV/Objects/Devices/pda.rsi + state: pda-mailcarrier + - type: entity parent: BasePDA id: AdminAssistantPDA diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml index c49a9845fb6..53e5f71d4ce 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml @@ -1,3 +1,16 @@ +- type: entity + parent: IDCardStandard + id: CourierIDCard + name: courier ID card + components: + - type: Sprite + layers: + - state: default + - sprite: DeltaV/Objects/Misc/id_cards.rsi + state: nyanomailcarrier + - type: PresetIdCard + job: Courier + - type: entity parent: IDCardStandard id: AdminAssistantIDCard diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Command/admin_assistant.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Command/admin_assistant.yml index c2aafbaf7f8..d10876df10f 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Command/admin_assistant.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Command/admin_assistant.yml @@ -4,64 +4,21 @@ description: job-description-admin-assistant playTimeTracker: JobAdminAssistant requirements: - - !type:DepartmentTimeRequirement - department: Logistics - time: 18000 # 5 hours - - !type:DepartmentTimeRequirement - department: Engineering - time: 18000 # 5 hours - - !type:DepartmentTimeRequirement - department: Medical - time: 18000 # 5 hours - - !type:DepartmentTimeRequirement - department: Security - time: 18000 # 5 hours - - !type:DepartmentTimeRequirement - department: Epistemics - time: 18000 # 5 hours - !type:DepartmentTimeRequirement department: Command - time: 108000 # 30 hours + time: 21600 # 6 hours - !type:OverallPlaytimeRequirement - time: 108000 # 30 hours + time: 36000 # 10 hours - !type:WhitelistRequirement weight: 20 startingGear: AdminAssistantGear icon: "JobIconAdminAssitant" - requireAdminNotify: true joinNotifyCrew: true supervisors: job-supervisors-command canBeAntag: false access: - Command - - Bar - - Service - Maintenance - - Janitor - - Theatre - - Kitchen - - Chapel - - Hydroponics - - External - - Cryogenics - - Chemistry - - Engineering - - Research - - Detective - - Salvage - - Security - - Brig - - Lawyer - - Cargo - - Atmospherics - - Medical - - Boxer - - Clown - - Library - - Mime - - Musician - - Reporter - - Zookeeper special: - !type:AddImplantSpecial implants: [ MindShieldImplant ] diff --git a/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml b/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml index b6935e2c254..782163f83cd 100644 --- a/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml @@ -4,5 +4,8 @@ - type: playTimeTracker id: JobMedicalBorg +- type: playTimeTracker + id: JobCourier + - type: playTimeTracker id: JobAdminAssistant \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 8a2a1228336..4de5e7d6865 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -50,7 +50,6 @@ - HeadOfSecurity - ResearchDirector - Quartermaster - - AdministrativeAssistant # Delta V - AdminAssistant, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Command/admin_assistant.yml primary: false weight: 100 @@ -116,4 +115,5 @@ - Gladiator # Nyanotrasen - Gladiator, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml - Prisoner # Nyanotrasen - Prisoner, see Resrouces/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml - Brigmedic # DeltaV - Corpsman, see Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml + - AdministrativeAssistant # Delta V - AdminAssistant, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Command/admin_assistant.yml primary: false From f0bbbbbdbac083c07acc1de994cd85c38076a48b Mon Sep 17 00:00:00 2001 From: Noctis Date: Tue, 28 May 2024 20:46:26 +0100 Subject: [PATCH 09/17] revert engine change how the fuck did i do it in the first place? --- RobustToolbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RobustToolbox b/RobustToolbox index 4500669f658..ec794ce4e46 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 4500669f6582898a2a0f06b56c9256e87339a5f2 +Subproject commit ec794ce4e4693069d3b3ebf7a88ead5ff2f860e0 From 8e5e55cf93b8a295d91a3d15a3f94df8f343570f Mon Sep 17 00:00:00 2001 From: Noctis Date: Tue, 28 May 2024 21:02:40 +0100 Subject: [PATCH 10/17] Missing courier description --- Resources/Locale/en-US/deltav/job/job-description.ftl | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Locale/en-US/deltav/job/job-description.ftl b/Resources/Locale/en-US/deltav/job/job-description.ftl index 1193f02ca40..f47bbc2be4b 100644 --- a/Resources/Locale/en-US/deltav/job/job-description.ftl +++ b/Resources/Locale/en-US/deltav/job/job-description.ftl @@ -1,2 +1,3 @@ job-description-medical-borg = Half-human, Half-machine. Follow your laws, serve the crew, and assist the medical department. +job-description-courier = Deliver mail and other packages from and to logistics. Avoid dogs. job-description-admin-assistant = Assist command in their day-to-day activities, grab the captain a coffee, answer faxes in the bridge. \ No newline at end of file From fee128732cb2c4e871564cf31195511aba2f2cf7 Mon Sep 17 00:00:00 2001 From: Noctis Date: Tue, 28 May 2024 21:05:33 +0100 Subject: [PATCH 11/17] missing paper_stamp-signature --- Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json index ed6982e6862..3894db589f7 100644 --- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json @@ -260,6 +260,9 @@ { "name": "paper_stamp-psychologist" }, + { + "name": "paper_stamp-signature" + }, { "name": "paper_stamp-admin-assistant" } From c4c022117d6cf4eea547dfd685bbac7a105f2a81 Mon Sep 17 00:00:00 2001 From: Noctis Date: Mon, 3 Jun 2024 15:13:48 +0100 Subject: [PATCH 12/17] Review changes II Remove flashes, change pen, remove whitelist --- .../DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml | 1 - .../DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml | 1 - Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml | 2 +- .../Prototypes/DeltaV/Roles/Jobs/Command/admin_assistant.yml | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index 34f2d8996a4..f053e87e95a 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -30,5 +30,4 @@ - type: StorageFill contents: - id: BoxSurvival - - id: Flash - id: RubberStampAdminAssistant diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml index 408a0758b1e..ca84b285cb5 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -30,5 +30,4 @@ - type: StorageFill contents: - id: BoxSurvival - - id: Flash - id: RubberStampAdminAssistant diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml index b6e46c5d390..d4885df6648 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml @@ -104,7 +104,7 @@ id: AdminAssistantIDCard state: pda-admin-assistant penSlot: - startingItem: PenCap + startingItem: LuxuryPen priority: -1 whitelist: tags: diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Command/admin_assistant.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Command/admin_assistant.yml index d10876df10f..54a718f0dad 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Command/admin_assistant.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Command/admin_assistant.yml @@ -9,7 +9,6 @@ time: 21600 # 6 hours - !type:OverallPlaytimeRequirement time: 36000 # 10 hours - - !type:WhitelistRequirement weight: 20 startingGear: AdminAssistantGear icon: "JobIconAdminAssitant" From 3ab16b817c05dba89d3d33469353332ea1748b46 Mon Sep 17 00:00:00 2001 From: Noctis Date: Mon, 3 Jun 2024 15:16:50 +0100 Subject: [PATCH 13/17] Resolves loadout group conflict --- .../DeltaV/Loadouts/loadout_groups.yml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml index 0da85a66f68..33618b86f46 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml @@ -87,4 +87,19 @@ loadouts: - AdminAssistantBackpack - AdminAssistantSatchel - - AdminAssistantDuffel \ No newline at end of file + - AdminAssistantDuffel + +- type: loadoutGroup + id: Scarfs + name: loadout-group-scarfs + minLimit: 0 + loadouts: + - ScarfRed + - ScarfBlue + - ScarfLightBlue + - ScarfGreen + - ScarfPurple + - ScarfBrown + - ScarfOrange + - ScarfBlack + - ScarfZebra \ No newline at end of file From dcf8abd27adcec9c33ce9a35203243b0eb3f90b9 Mon Sep 17 00:00:00 2001 From: Noctis Date: Mon, 3 Jun 2024 15:26:19 +0100 Subject: [PATCH 14/17] removes outdated bureaucracy.rsi content --- .../Objects/Misc/bureaucracy.rsi/meta.json | 32 ------------------- 1 file changed, 32 deletions(-) diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json index 3894db589f7..3db1ddae2c3 100644 --- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json @@ -159,38 +159,6 @@ { "name": "paper_dotmatrix_words" }, - { - "name": "pen" - }, - { - "name": "pen_cap" - }, - { - "name": "pen_centcom" - }, - { - "name": "pen_hop" - }, - { - "name": "overpriced_pen" - }, - { - "name": "luxury_pen" - }, - { - "name": "pen_blue" - }, - { - "name": "pen_red" - }, - { - "name": "pen-inhand-left", - "directions": 4 - }, - { - "name": "pen-inhand-right", - "directions": 4 - }, { "name": "scrap" }, From 34acb71a04718ce40f3a2439e2fa32093e202419 Mon Sep 17 00:00:00 2001 From: Noctis Date: Mon, 3 Jun 2024 15:31:14 +0100 Subject: [PATCH 15/17] Removes outdated parts of role_loadouts I accidentally left in 2 empty groups --- Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml b/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml index bff697404a9..fd2c6b8fab1 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml @@ -28,10 +28,8 @@ - type: roleLoadout id: JobAdministrativeAssistant groups: - - AdminAssistantHead - AdminAssistantJumpsuit - AdminAssistantBack - AdminAssistantOuterClothing - - AdminAssistantGloves - Glasses - Trinkets From 42bf0ad02b755763ba060725dd109b2bdc94e6c0 Mon Sep 17 00:00:00 2001 From: Noctis Date: Mon, 3 Jun 2024 16:19:05 +0100 Subject: [PATCH 16/17] Review Changes III Added empty lines to ends of files, moved some ftl stuff to delta v files, added nospawn to marker and rubber stamp. --- Resources/Locale/en-US/deltav/job/job-description.ftl | 2 +- Resources/Locale/en-US/deltav/job/job-names.ftl | 5 ++++- Resources/Locale/en-US/deltav/job/job-supervisors.ftl | 2 +- Resources/Locale/en-US/deltav/paper/stamp-component.ftl | 2 +- Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl | 2 +- Resources/Locale/en-US/job/job-names.ftl | 1 - .../DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml | 1 + .../Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml | 2 +- .../Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml | 1 + .../DeltaV/Loadouts/Jobs/Command/admin_assistant.yml | 3 ++- 10 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Resources/Locale/en-US/deltav/job/job-description.ftl b/Resources/Locale/en-US/deltav/job/job-description.ftl index f47bbc2be4b..dd5f6ad28d9 100644 --- a/Resources/Locale/en-US/deltav/job/job-description.ftl +++ b/Resources/Locale/en-US/deltav/job/job-description.ftl @@ -1,3 +1,3 @@ job-description-medical-borg = Half-human, Half-machine. Follow your laws, serve the crew, and assist the medical department. job-description-courier = Deliver mail and other packages from and to logistics. Avoid dogs. -job-description-admin-assistant = Assist command in their day-to-day activities, grab the captain a coffee, answer faxes in the bridge. \ No newline at end of file +job-description-admin-assistant = Assist command in their day-to-day activities, grab the captain a coffee, answer faxes in the bridge. diff --git a/Resources/Locale/en-US/deltav/job/job-names.ftl b/Resources/Locale/en-US/deltav/job/job-names.ftl index ef9dee633a3..c8a214c3b2d 100644 --- a/Resources/Locale/en-US/deltav/job/job-names.ftl +++ b/Resources/Locale/en-US/deltav/job/job-names.ftl @@ -1,3 +1,6 @@ job-name-medical-borg = Medical Cyborg job-name-courier = Courier -job-name-admin-assistant = Administrative Assistant \ No newline at end of file +job-name-admin-assistant = Administrative Assistant + +# Role Timers +JobAdministrativeAssistant = Administrative Assistant diff --git a/Resources/Locale/en-US/deltav/job/job-supervisors.ftl b/Resources/Locale/en-US/deltav/job/job-supervisors.ftl index ccb280daa8a..6340c8ba2c3 100644 --- a/Resources/Locale/en-US/deltav/job/job-supervisors.ftl +++ b/Resources/Locale/en-US/deltav/job/job-supervisors.ftl @@ -1 +1 @@ -job-supervisors-command = all command officials \ No newline at end of file +job-supervisors-command = all command staff diff --git a/Resources/Locale/en-US/deltav/paper/stamp-component.ftl b/Resources/Locale/en-US/deltav/paper/stamp-component.ftl index 7cc779b46dd..a430918a2e0 100644 --- a/Resources/Locale/en-US/deltav/paper/stamp-component.ftl +++ b/Resources/Locale/en-US/deltav/paper/stamp-component.ftl @@ -1 +1 @@ -stamp-component-stamped-name-admin-assistant = Administrative Assistant \ No newline at end of file +stamp-component-stamped-name-admin-assistant = Administrative Assistant diff --git a/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl b/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl index eac1dc29064..16c17856298 100644 --- a/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl @@ -89,4 +89,4 @@ loadout-group-gladiator-outerclothing = Gladiator outer clothing loadout-group-admin-assistant-head = Administrative Assistant head loadout-group-admin-assistant-jumpsuit = Administrative Assistant jumpsuit loadout-group-admin-assistant-outerclothing = Administrative Assistant outer clothing -loadout-group-admin-assistant-back = Administrative Assistant backpack \ No newline at end of file +loadout-group-admin-assistant-back = Administrative Assistant backpack diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl index 0cab928d7e6..58c653db3e6 100644 --- a/Resources/Locale/en-US/job/job-names.ftl +++ b/Resources/Locale/en-US/job/job-names.ftl @@ -49,7 +49,6 @@ job-name-visitor = Visitor # Role timers - Make these alphabetical or I cut you JobAtmosphericTechnician = Atmospheric Technician -JobAdministrativeAssistant = Administrative Assistant JobBartender = Bartender JobBorg = Borg JobBotanist = Botanist diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml index 5350b86383e..43a8a9fe955 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -44,3 +44,4 @@ contents: - id: BoxSurvival - id: RubberStampAdminAssistant + \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml index a3bf8321ab8..833de427f8e 100644 --- a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml @@ -1,4 +1,3 @@ - - type: entity id: SpawnPointMedicalBorg parent: SpawnPointJobBase @@ -31,6 +30,7 @@ id: SpawnPointAdminAssistant parent: SpawnPointJobBase name: administrative assistant + noSpawn: true components: - type: SpawnPoint job_id: AdministrativeAssistant diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml index 81c76b2e8bb..eed1ba036ec 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml @@ -16,6 +16,7 @@ name: administrative assistant rubber stamp parent: RubberStampBase id: RubberStampAdminAssistant + noSpawn: true suffix: DO NOT MAP components: - type: Stamp diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Command/admin_assistant.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Command/admin_assistant.yml index c159d880f8f..b24e7c093a9 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Command/admin_assistant.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Command/admin_assistant.yml @@ -44,4 +44,5 @@ - type: startingGear id: AdminAssistantDuffel equipment: - back: ClothingBackpackDuffelAdminAssistantFilled \ No newline at end of file + back: ClothingBackpackDuffelAdminAssistantFilled + \ No newline at end of file From 84682314f5f3fc3bb3c746bb056de3bba464072a Mon Sep 17 00:00:00 2001 From: Noctis Date: Tue, 4 Jun 2024 14:37:50 +0100 Subject: [PATCH 17/17] Reverts nospawns, changes bags --- .../DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml | 2 +- .../DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml | 2 +- .../DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml | 2 +- Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml | 1 - .../Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml | 1 - 5 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml index 43a8a9fe955..6d4454e2f06 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -35,7 +35,7 @@ - type: entity noSpawn: true - parent: ClothingBackpackCaptain + parent: ClothingBackpack id: ClothingBackpackAdminAssistantFilled name: administrative assistant's backpack description: Its a backpack build for carrying paper. diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index f053e87e95a..10117f8fe6b 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -22,7 +22,7 @@ - type: entity noSpawn: true - parent: ClothingBackpackDuffelCaptain + parent: ClothingBackpackDuffel id: ClothingBackpackDuffelAdminAssistantFilled name: administrative assistant's duffel bag description: Its a duffel bag build for carrying paper. diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml index ca84b285cb5..87272fa9761 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -22,7 +22,7 @@ - type: entity noSpawn: true - parent: ClothingBackpackSatchelCaptain + parent: ClothingBackpackSatchel id: ClothingBackpackSatchelAdminAssistantFilled name: administrative assistant's satchel description: Its a satchel build for carrying paper. diff --git a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml index 833de427f8e..dbbb8240ed3 100644 --- a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml @@ -30,7 +30,6 @@ id: SpawnPointAdminAssistant parent: SpawnPointJobBase name: administrative assistant - noSpawn: true components: - type: SpawnPoint job_id: AdministrativeAssistant diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml index eed1ba036ec..81c76b2e8bb 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml @@ -16,7 +16,6 @@ name: administrative assistant rubber stamp parent: RubberStampBase id: RubberStampAdminAssistant - noSpawn: true suffix: DO NOT MAP components: - type: Stamp