From 3f85f977a370298779ff648fe666372ed6174fa4 Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Mon, 13 Jul 2026 10:36:42 +0200 Subject: [PATCH 01/55] groundwork, merging of related access levels and perms, defininf tsf accesses on their own and not security --- .../_Mono/Access/{pirate.yml => pdv.yml} | 4 ++ Resources/Prototypes/_Mono/Access/tsf.yml | 15 ++++++ Resources/Prototypes/_Mono/Access/tsfmc.yml | 13 ----- .../_Mono/Access/{security.yml => ussp.yml} | 0 Resources/Prototypes/_NF/Access/pirate.yml | 3 -- Resources/Prototypes/_NF/Access/security.yml | 49 +------------------ 6 files changed, 20 insertions(+), 64 deletions(-) rename Resources/Prototypes/_Mono/Access/{pirate.yml => pdv.yml} (69%) create mode 100644 Resources/Prototypes/_Mono/Access/tsf.yml delete mode 100644 Resources/Prototypes/_Mono/Access/tsfmc.yml rename Resources/Prototypes/_Mono/Access/{security.yml => ussp.yml} (100%) delete mode 100644 Resources/Prototypes/_NF/Access/pirate.yml diff --git a/Resources/Prototypes/_Mono/Access/pirate.yml b/Resources/Prototypes/_Mono/Access/pdv.yml similarity index 69% rename from Resources/Prototypes/_Mono/Access/pirate.yml rename to Resources/Prototypes/_Mono/Access/pdv.yml index 22338794670..4f9d7fb63be 100644 --- a/Resources/Prototypes/_Mono/Access/pirate.yml +++ b/Resources/Prototypes/_Mono/Access/pdv.yml @@ -5,3 +5,7 @@ - type: accessLevel id: PDVCommand name: id-card-access-level-pdv-command + +- type: accessLevel + id: Pirate + name: id-card-access-level-pirate diff --git a/Resources/Prototypes/_Mono/Access/tsf.yml b/Resources/Prototypes/_Mono/Access/tsf.yml new file mode 100644 index 00000000000..b586393492f --- /dev/null +++ b/Resources/Prototypes/_Mono/Access/tsf.yml @@ -0,0 +1,15 @@ +- type: accessLevel + id: TsfmcEngineering + name: id-card-access-level-tsf-engineer + +- type: accessLevel + id: TsfFtl + name: id-card-access-level-tsfftl + +- type: accessLevel + id: TsfOfficer + name: id-card-access-level-tsfofficer + +- type: accessLevel + id: TsfCommander + name: id-card-access-level-tsfcommander \ No newline at end of file diff --git a/Resources/Prototypes/_Mono/Access/tsfmc.yml b/Resources/Prototypes/_Mono/Access/tsfmc.yml deleted file mode 100644 index eabe4add88e..00000000000 --- a/Resources/Prototypes/_Mono/Access/tsfmc.yml +++ /dev/null @@ -1,13 +0,0 @@ -- type: accessLevel - id: TsfmcEngineering - name: id-card-access-level-tsf-engineer - -- type: accessGroup - id: TsfGeneralNoBrig - tags: - - Maintenance - - External - - Command - - Security - - Mercenary # Frontier - - Captain # Frontier diff --git a/Resources/Prototypes/_Mono/Access/security.yml b/Resources/Prototypes/_Mono/Access/ussp.yml similarity index 100% rename from Resources/Prototypes/_Mono/Access/security.yml rename to Resources/Prototypes/_Mono/Access/ussp.yml diff --git a/Resources/Prototypes/_NF/Access/pirate.yml b/Resources/Prototypes/_NF/Access/pirate.yml deleted file mode 100644 index 3a491187ee7..00000000000 --- a/Resources/Prototypes/_NF/Access/pirate.yml +++ /dev/null @@ -1,3 +0,0 @@ -- type: accessLevel - id: Pirate - name: id-card-access-level-pirate diff --git a/Resources/Prototypes/_NF/Access/security.yml b/Resources/Prototypes/_NF/Access/security.yml index f1d0a443d50..0221e0cba10 100644 --- a/Resources/Prototypes/_NF/Access/security.yml +++ b/Resources/Prototypes/_NF/Access/security.yml @@ -1,50 +1,3 @@ - type: accessLevel id: Mercenary - name: id-card-access-level-mercenary - -- type: accessLevel - id: Sergeant - name: id-card-access-level-sergeant - -- type: accessLevel - id: Bailiff - name: id-card-access-level-bailiff - -- type: accessGroup - id: CadetNfsdAccess - tags: - - Maintenance - - External - - Security - - Brig - -- type: accessGroup - id: GeneralNfsdAccess - tags: - - Maintenance - - External - - Command - - Brig - - Security - - Mercenary # Frontier - - Captain # Frontier - -- type: accessGroup - id: GeneralNfsdBrigAccess - tags: - - Maintenance - - External - - Brig - -- type: accessGroup - id: GeneralNfsdBrigmedicAccess - tags: - - Maintenance - - External - - Command - - Brig - - Security - - Mercenary # Frontier - - Captain # Frontier - - Chemistry - - Medical \ No newline at end of file + name: id-card-access-level-mercenary \ No newline at end of file From 7790b02c15824b04f958c3cecabae08aa5bc3e3e Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Mon, 13 Jul 2026 10:41:36 +0200 Subject: [PATCH 02/55] more groundwork and accesses levels defined and corrected --- Resources/Prototypes/_Mono/Access/pdv.yml | 6 +++--- Resources/Prototypes/_Mono/Access/tsf.yml | 8 ++++---- .../Structures/Machines/Computers/rogue_comm_computer.yml | 2 +- .../Structures/Machines/Computers/tsf_comm_computer.yml | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Resources/Prototypes/_Mono/Access/pdv.yml b/Resources/Prototypes/_Mono/Access/pdv.yml index 4f9d7fb63be..b4f7b5aec88 100644 --- a/Resources/Prototypes/_Mono/Access/pdv.yml +++ b/Resources/Prototypes/_Mono/Access/pdv.yml @@ -3,9 +3,9 @@ name: id-card-access-level-pdv-vizier - type: accessLevel - id: PDVCommand + id: PdvCommand name: id-card-access-level-pdv-command - type: accessLevel - id: Pirate - name: id-card-access-level-pirate + id: PdvGeneral + name: id-card-access-level-pdv-pdvgeneral diff --git a/Resources/Prototypes/_Mono/Access/tsf.yml b/Resources/Prototypes/_Mono/Access/tsf.yml index b586393492f..2e1963625a5 100644 --- a/Resources/Prototypes/_Mono/Access/tsf.yml +++ b/Resources/Prototypes/_Mono/Access/tsf.yml @@ -4,12 +4,12 @@ - type: accessLevel id: TsfFtl - name: id-card-access-level-tsfftl - + name: id-card-access-level-tsf-ftl + - type: accessLevel id: TsfOfficer - name: id-card-access-level-tsfofficer + name: id-card-access-level-tsf-officer - type: accessLevel id: TsfCommander - name: id-card-access-level-tsfcommander \ No newline at end of file + name: id-card-access-level-tsf-commander diff --git a/Resources/Prototypes/_Mono/Entities/Structures/Machines/Computers/rogue_comm_computer.yml b/Resources/Prototypes/_Mono/Entities/Structures/Machines/Computers/rogue_comm_computer.yml index 285d8d6e792..a96df48c618 100644 --- a/Resources/Prototypes/_Mono/Entities/Structures/Machines/Computers/rogue_comm_computer.yml +++ b/Resources/Prototypes/_Mono/Entities/Structures/Machines/Computers/rogue_comm_computer.yml @@ -18,7 +18,7 @@ - map: [ "enum.WiresVisualLayers.MaintenancePanel" ] state: generic_panel_open - type: AccessReader - access: [[ "Pirate" ]] + access: [[ "PdvCommand" ]] - type: CommunicationsConsole title: comms-console-announcement-title-rogue color: "#D2B48C" diff --git a/Resources/Prototypes/_Mono/Entities/Structures/Machines/Computers/tsf_comm_computer.yml b/Resources/Prototypes/_Mono/Entities/Structures/Machines/Computers/tsf_comm_computer.yml index 56060225386..dfe53cba69b 100644 --- a/Resources/Prototypes/_Mono/Entities/Structures/Machines/Computers/tsf_comm_computer.yml +++ b/Resources/Prototypes/_Mono/Entities/Structures/Machines/Computers/tsf_comm_computer.yml @@ -17,9 +17,9 @@ - map: [ "enum.WiresVisualLayers.MaintenancePanel" ] state: generic_panel_open - type: AccessReader - access: [["HeadOfPersonnel"], ["HeadOfSecurity"]] + access: [["TsfFtl"]] - type: CommunicationsConsole - title: comms-console-announcement-title-station + title: comms-console-announcement-title-tsf canShuttle: false global: true #SR WILL NOT BE IGNORED - type: DeviceNetwork From ebb5dcfd22c33cb5fe88bf6395c273945e62ec07 Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Mon, 13 Jul 2026 10:53:48 +0200 Subject: [PATCH 03/55] localization completed --- .../Locale/en-US/_Mono/prototypes/access/accesses.ftl | 9 +++++++-- .../Locale/en-US/_NF/prototypes/access/accesses.ftl | 5 +---- Resources/Prototypes/_Mono/Access/pdv.yml | 2 +- Resources/Prototypes/_Mono/Access/tsf.yml | 4 ++++ 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Resources/Locale/en-US/_Mono/prototypes/access/accesses.ftl b/Resources/Locale/en-US/_Mono/prototypes/access/accesses.ftl index a84004c98f9..e24ad0890aa 100644 --- a/Resources/Locale/en-US/_Mono/prototypes/access/accesses.ftl +++ b/Resources/Locale/en-US/_Mono/prototypes/access/accesses.ftl @@ -5,10 +5,15 @@ id-card-access-level-ussp-debug = MAKE A ISSUE ON THE GITHUB IF YOU SEE THIS id-card-access-level-voucher = IGNORE, VOUCHER SHITCODE +id-card-access-level-pdv = PDV id-card-access-level-pdv-vizier = PDV Grand Vizier id-card-access-level-pdv-command = PDV Command -id-card-access-level-tsf-engineer = TSF Engineering - id-card-access-level-vg = Viper Group id-card-access-level-vg-high = Viper Group Command + +id-card-access-level-tsf = TSF +id-card-access-level-tsf-ftl = TSFMC Fireteam Leader +id-card-access-level-tsf-officer = TSF Command +id-card-access-level-tsf-commander = TSF Commanding Officer +id-card-access-level-tsf-engineer = TSF Engineering diff --git a/Resources/Locale/en-US/_NF/prototypes/access/accesses.ftl b/Resources/Locale/en-US/_NF/prototypes/access/accesses.ftl index f1379cb586a..82f05ee72c2 100644 --- a/Resources/Locale/en-US/_NF/prototypes/access/accesses.ftl +++ b/Resources/Locale/en-US/_NF/prototypes/access/accesses.ftl @@ -1,8 +1,5 @@ -id-card-access-level-frontier = TSF id-card-access-level-pilot = Pilot id-card-access-level-mail = Mail id-card-access-level-mercenary = Mercenary id-card-access-level-stc = Station Traffic Controller -id-card-access-level-sergeant = TSFMC Fireteam Leader -id-card-access-level-bailiff = TSFMC Command -id-card-access-level-pirate = PDV + diff --git a/Resources/Prototypes/_Mono/Access/pdv.yml b/Resources/Prototypes/_Mono/Access/pdv.yml index b4f7b5aec88..a2726807f2c 100644 --- a/Resources/Prototypes/_Mono/Access/pdv.yml +++ b/Resources/Prototypes/_Mono/Access/pdv.yml @@ -8,4 +8,4 @@ - type: accessLevel id: PdvGeneral - name: id-card-access-level-pdv-pdvgeneral + name: id-card-access-level-pdv diff --git a/Resources/Prototypes/_Mono/Access/tsf.yml b/Resources/Prototypes/_Mono/Access/tsf.yml index 2e1963625a5..e239c86a67c 100644 --- a/Resources/Prototypes/_Mono/Access/tsf.yml +++ b/Resources/Prototypes/_Mono/Access/tsf.yml @@ -13,3 +13,7 @@ - type: accessLevel id: TsfCommander name: id-card-access-level-tsf-commander + +- type: accessLevel + id: TsfGeneral + name: id-card-access-level-tsf From 5d9de0f151279f7277cfce9ff4b06d641e923dfa Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Mon, 13 Jul 2026 11:00:03 +0200 Subject: [PATCH 04/55] the great migration and file renaming of the faction jobs --- .../pirate_first_mate.yml => _Mono/Roles/Jobs/PDV/asvaran.yml} | 0 .../pirate_captain.yml => _Mono/Roles/Jobs/PDV/grandvizier.yml} | 0 .../Roles/Jobs/Pirates => _Mono/Roles/Jobs/PDV}/pdv_denasvar.yml | 0 .../Jobs/Pirates => _Mono/Roles/Jobs/PDV}/pdv_infiltrator.yml | 0 .../Jobs/Pirates/pirate.yml => _Mono/Roles/Jobs/PDV/rahkshan.yml} | 0 Resources/Prototypes/_Mono/Roles/Jobs/{TSFMC => TSF}/borg.yml | 0 Resources/Prototypes/_Mono/Roles/Jobs/{TSFMC => TSF}/engineer.yml | 0 Resources/Prototypes/_Mono/Roles/Jobs/{TSFMC => TSF}/marsoc.yml | 0 .../{_NF/Roles/Jobs/Nfsd => _Mono/Roles/Jobs/TSF}/nfdetective.yml | 0 .../Roles/Jobs/Nfsd => _Mono/Roles/Jobs/TSF}/public_affairs.yml | 0 .../Nfsd/sheriff.yml => _Mono/Roles/Jobs/TSF/tsfcommander.yml} | 0 .../Nfsd/brigmedic.yml => _Mono/Roles/Jobs/TSF/tsfcorpsman.yml} | 0 .../Nfsd/senior_officer.yml => _Mono/Roles/Jobs/TSF/tsfftl.yml} | 0 .../Jobs/Nfsd/deputy.yml => _Mono/Roles/Jobs/TSF/tsfmarine.yml} | 0 .../Jobs/Nfsd/bailiff.yml => _Mono/Roles/Jobs/TSF/tsfofficer.yml} | 0 .../Jobs/Nfsd/cadet.yml => _Mono/Roles/Jobs/TSF/tsfrecruit.yml} | 0 16 files changed, 0 insertions(+), 0 deletions(-) rename Resources/Prototypes/{_NF/Roles/Jobs/Pirates/pirate_first_mate.yml => _Mono/Roles/Jobs/PDV/asvaran.yml} (100%) rename Resources/Prototypes/{_NF/Roles/Jobs/Pirates/pirate_captain.yml => _Mono/Roles/Jobs/PDV/grandvizier.yml} (100%) rename Resources/Prototypes/{_NF/Roles/Jobs/Pirates => _Mono/Roles/Jobs/PDV}/pdv_denasvar.yml (100%) rename Resources/Prototypes/{_NF/Roles/Jobs/Pirates => _Mono/Roles/Jobs/PDV}/pdv_infiltrator.yml (100%) rename Resources/Prototypes/{_NF/Roles/Jobs/Pirates/pirate.yml => _Mono/Roles/Jobs/PDV/rahkshan.yml} (100%) rename Resources/Prototypes/_Mono/Roles/Jobs/{TSFMC => TSF}/borg.yml (100%) rename Resources/Prototypes/_Mono/Roles/Jobs/{TSFMC => TSF}/engineer.yml (100%) rename Resources/Prototypes/_Mono/Roles/Jobs/{TSFMC => TSF}/marsoc.yml (100%) rename Resources/Prototypes/{_NF/Roles/Jobs/Nfsd => _Mono/Roles/Jobs/TSF}/nfdetective.yml (100%) rename Resources/Prototypes/{_NF/Roles/Jobs/Nfsd => _Mono/Roles/Jobs/TSF}/public_affairs.yml (100%) rename Resources/Prototypes/{_NF/Roles/Jobs/Nfsd/sheriff.yml => _Mono/Roles/Jobs/TSF/tsfcommander.yml} (100%) rename Resources/Prototypes/{_NF/Roles/Jobs/Nfsd/brigmedic.yml => _Mono/Roles/Jobs/TSF/tsfcorpsman.yml} (100%) rename Resources/Prototypes/{_NF/Roles/Jobs/Nfsd/senior_officer.yml => _Mono/Roles/Jobs/TSF/tsfftl.yml} (100%) rename Resources/Prototypes/{_NF/Roles/Jobs/Nfsd/deputy.yml => _Mono/Roles/Jobs/TSF/tsfmarine.yml} (100%) rename Resources/Prototypes/{_NF/Roles/Jobs/Nfsd/bailiff.yml => _Mono/Roles/Jobs/TSF/tsfofficer.yml} (100%) rename Resources/Prototypes/{_NF/Roles/Jobs/Nfsd/cadet.yml => _Mono/Roles/Jobs/TSF/tsfrecruit.yml} (100%) diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_first_mate.yml b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/asvaran.yml similarity index 100% rename from Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_first_mate.yml rename to Resources/Prototypes/_Mono/Roles/Jobs/PDV/asvaran.yml diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_captain.yml b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/grandvizier.yml similarity index 100% rename from Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_captain.yml rename to Resources/Prototypes/_Mono/Roles/Jobs/PDV/grandvizier.yml diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pdv_denasvar.yml b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/pdv_denasvar.yml similarity index 100% rename from Resources/Prototypes/_NF/Roles/Jobs/Pirates/pdv_denasvar.yml rename to Resources/Prototypes/_Mono/Roles/Jobs/PDV/pdv_denasvar.yml diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pdv_infiltrator.yml b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/pdv_infiltrator.yml similarity index 100% rename from Resources/Prototypes/_NF/Roles/Jobs/Pirates/pdv_infiltrator.yml rename to Resources/Prototypes/_Mono/Roles/Jobs/PDV/pdv_infiltrator.yml diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate.yml b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/rahkshan.yml similarity index 100% rename from Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate.yml rename to Resources/Prototypes/_Mono/Roles/Jobs/PDV/rahkshan.yml diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSFMC/borg.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/borg.yml similarity index 100% rename from Resources/Prototypes/_Mono/Roles/Jobs/TSFMC/borg.yml rename to Resources/Prototypes/_Mono/Roles/Jobs/TSF/borg.yml diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSFMC/engineer.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/engineer.yml similarity index 100% rename from Resources/Prototypes/_Mono/Roles/Jobs/TSFMC/engineer.yml rename to Resources/Prototypes/_Mono/Roles/Jobs/TSF/engineer.yml diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSFMC/marsoc.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/marsoc.yml similarity index 100% rename from Resources/Prototypes/_Mono/Roles/Jobs/TSFMC/marsoc.yml rename to Resources/Prototypes/_Mono/Roles/Jobs/TSF/marsoc.yml diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/nfdetective.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/nfdetective.yml similarity index 100% rename from Resources/Prototypes/_NF/Roles/Jobs/Nfsd/nfdetective.yml rename to Resources/Prototypes/_Mono/Roles/Jobs/TSF/nfdetective.yml diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/public_affairs.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/public_affairs.yml similarity index 100% rename from Resources/Prototypes/_NF/Roles/Jobs/Nfsd/public_affairs.yml rename to Resources/Prototypes/_Mono/Roles/Jobs/TSF/public_affairs.yml diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/sheriff.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/tsfcommander.yml similarity index 100% rename from Resources/Prototypes/_NF/Roles/Jobs/Nfsd/sheriff.yml rename to Resources/Prototypes/_Mono/Roles/Jobs/TSF/tsfcommander.yml diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/brigmedic.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/tsfcorpsman.yml similarity index 100% rename from Resources/Prototypes/_NF/Roles/Jobs/Nfsd/brigmedic.yml rename to Resources/Prototypes/_Mono/Roles/Jobs/TSF/tsfcorpsman.yml diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/senior_officer.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/tsfftl.yml similarity index 100% rename from Resources/Prototypes/_NF/Roles/Jobs/Nfsd/senior_officer.yml rename to Resources/Prototypes/_Mono/Roles/Jobs/TSF/tsfftl.yml diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/deputy.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/tsfmarine.yml similarity index 100% rename from Resources/Prototypes/_NF/Roles/Jobs/Nfsd/deputy.yml rename to Resources/Prototypes/_Mono/Roles/Jobs/TSF/tsfmarine.yml diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/bailiff.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/tsfofficer.yml similarity index 100% rename from Resources/Prototypes/_NF/Roles/Jobs/Nfsd/bailiff.yml rename to Resources/Prototypes/_Mono/Roles/Jobs/TSF/tsfofficer.yml diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/cadet.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/tsfrecruit.yml similarity index 100% rename from Resources/Prototypes/_NF/Roles/Jobs/Nfsd/cadet.yml rename to Resources/Prototypes/_Mono/Roles/Jobs/TSF/tsfrecruit.yml From 76b7e4ec377b10ae5aaa361357b560e0de06ec46 Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Mon, 13 Jul 2026 11:16:48 +0200 Subject: [PATCH 05/55] more file name changes and moving because fuck nf detective and pal --- .../Roles/Jobs/TSF/{tsfcommander.yml => commandingofficer.yml} | 0 .../_Mono/Roles/Jobs/TSF/{tsfcorpsman.yml => corpsman.yml} | 0 .../Prototypes/_Mono/Roles/Jobs/TSF/{tsfmarine.yml => marine.yml} | 0 .../_Mono/Roles/Jobs/TSF/{tsfofficer.yml => officer.yml} | 0 .../_Mono/Roles/Jobs/TSF/{tsfrecruit.yml => recruit.yml} | 0 .../_Mono/Roles/Jobs/TSF/{tsfftl.yml => teamleader.yml} | 0 .../Roles/Jobs/TSF => _NF/Roles/Jobs/Frontier}/nfdetective.yml | 0 .../Roles/Jobs/TSF => _NF/Roles/Jobs/Frontier}/public_affairs.yml | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename Resources/Prototypes/_Mono/Roles/Jobs/TSF/{tsfcommander.yml => commandingofficer.yml} (100%) rename Resources/Prototypes/_Mono/Roles/Jobs/TSF/{tsfcorpsman.yml => corpsman.yml} (100%) rename Resources/Prototypes/_Mono/Roles/Jobs/TSF/{tsfmarine.yml => marine.yml} (100%) rename Resources/Prototypes/_Mono/Roles/Jobs/TSF/{tsfofficer.yml => officer.yml} (100%) rename Resources/Prototypes/_Mono/Roles/Jobs/TSF/{tsfrecruit.yml => recruit.yml} (100%) rename Resources/Prototypes/_Mono/Roles/Jobs/TSF/{tsfftl.yml => teamleader.yml} (100%) rename Resources/Prototypes/{_Mono/Roles/Jobs/TSF => _NF/Roles/Jobs/Frontier}/nfdetective.yml (100%) rename Resources/Prototypes/{_Mono/Roles/Jobs/TSF => _NF/Roles/Jobs/Frontier}/public_affairs.yml (100%) diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/tsfcommander.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/commandingofficer.yml similarity index 100% rename from Resources/Prototypes/_Mono/Roles/Jobs/TSF/tsfcommander.yml rename to Resources/Prototypes/_Mono/Roles/Jobs/TSF/commandingofficer.yml diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/tsfcorpsman.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/corpsman.yml similarity index 100% rename from Resources/Prototypes/_Mono/Roles/Jobs/TSF/tsfcorpsman.yml rename to Resources/Prototypes/_Mono/Roles/Jobs/TSF/corpsman.yml diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/tsfmarine.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/marine.yml similarity index 100% rename from Resources/Prototypes/_Mono/Roles/Jobs/TSF/tsfmarine.yml rename to Resources/Prototypes/_Mono/Roles/Jobs/TSF/marine.yml diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/tsfofficer.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/officer.yml similarity index 100% rename from Resources/Prototypes/_Mono/Roles/Jobs/TSF/tsfofficer.yml rename to Resources/Prototypes/_Mono/Roles/Jobs/TSF/officer.yml diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/tsfrecruit.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/recruit.yml similarity index 100% rename from Resources/Prototypes/_Mono/Roles/Jobs/TSF/tsfrecruit.yml rename to Resources/Prototypes/_Mono/Roles/Jobs/TSF/recruit.yml diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/tsfftl.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/teamleader.yml similarity index 100% rename from Resources/Prototypes/_Mono/Roles/Jobs/TSF/tsfftl.yml rename to Resources/Prototypes/_Mono/Roles/Jobs/TSF/teamleader.yml diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/nfdetective.yml b/Resources/Prototypes/_NF/Roles/Jobs/Frontier/nfdetective.yml similarity index 100% rename from Resources/Prototypes/_Mono/Roles/Jobs/TSF/nfdetective.yml rename to Resources/Prototypes/_NF/Roles/Jobs/Frontier/nfdetective.yml diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/public_affairs.yml b/Resources/Prototypes/_NF/Roles/Jobs/Frontier/public_affairs.yml similarity index 100% rename from Resources/Prototypes/_Mono/Roles/Jobs/TSF/public_affairs.yml rename to Resources/Prototypes/_NF/Roles/Jobs/Frontier/public_affairs.yml From 6cb8645bcf76748b883c62411812e1661cea8cc3 Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Mon, 13 Jul 2026 11:57:38 +0200 Subject: [PATCH 06/55] localization name changes, + renaming of files --- .../Locale/en-US/_Mono/job/job-names.ftl | 21 +++++++++++++++++++ .../en-US/_Mono/job/job-supervisors.ftl | 11 ++++++++++ Resources/Locale/en-US/_NF/job/job-names.ftl | 16 -------------- .../Locale/en-US/_NF/job/job-supervisors.ftl | 12 ----------- .../_Mono/Roles/Jobs/PDV/asvaran.yml | 2 +- .../PDV/{pdv_denasvar.yml => denasvar.yml} | 0 .../_Mono/Roles/Jobs/PDV/grandvizier.yml | 2 +- .../_Mono/Roles/Jobs/PDV/rahkshan.yml | 2 +- .../PDV/{pdv_infiltrator.yml => spasaka.yml} | 0 .../Roles/Jobs/TSF/commandingofficer.yml | 2 +- .../_Mono/Roles/Jobs/TSF/corpsman.yml | 2 +- .../_Mono/Roles/Jobs/TSF/marine.yml | 2 +- .../_Mono/Roles/Jobs/TSF/officer.yml | 2 +- .../_Mono/Roles/Jobs/TSF/recruit.yml | 2 +- .../_Mono/Roles/Jobs/TSF/teamleader.yml | 2 +- Resources/Prototypes/_NF/StatusIcon/job.yml | 18 ++++++++-------- 16 files changed, 50 insertions(+), 46 deletions(-) delete mode 100644 Resources/Locale/en-US/_NF/job/job-supervisors.ftl rename Resources/Prototypes/_Mono/Roles/Jobs/PDV/{pdv_denasvar.yml => denasvar.yml} (100%) rename Resources/Prototypes/_Mono/Roles/Jobs/PDV/{pdv_infiltrator.yml => spasaka.yml} (100%) diff --git a/Resources/Locale/en-US/_Mono/job/job-names.ftl b/Resources/Locale/en-US/_Mono/job/job-names.ftl index eca50a20873..7c4c9d94d23 100644 --- a/Resources/Locale/en-US/_Mono/job/job-names.ftl +++ b/Resources/Locale/en-US/_Mono/job/job-names.ftl @@ -8,15 +8,36 @@ job-supervisors-ussp-sergeant = the Serzhants # MARK: MD job-name-md-medic = Emergency Responder +job-name-doc = Director of Care # MARK: TSF job-name-tsf-engineer = TSFMC Engineer job-name-tsf-borg = TSFMC Cyborg +job-name-tsf-marine = TSFMC Marine +job-name-tsf-officer = TSF Officer +job-name-tsf-corpsman = TSFMC Corpsman +job-name-tsf-recruit = TSFMC Recruit +job-name-tsf-commandingofficer = TSF Commanding Officer +job-name-tsf-marsoc = TSFMC MARSOC Operative +job-name-tsf-teamleader = TSFMC Fireteam Leader # MARK: PDV job-name-pdv-borg = PDV Cyborg +job-name-pdv-infiltrator = PDV Spasaka +job-name-pdv-vizier = PDV Grand Vizier +job-name-pdv-asvaran = PDV Asvaran +job-name-pdv-rahkshan = PDV Rahkshan +job-name-pdv-denasvar = PDV Denasvar +job-name-pdv-tarkhan = PDV Tarkhan # MARK: Viper Group job-name-vg-infanteer = VG Infanteer job-name-vg-lieutenant = VG Lieutenant job-name-vg-commander = VG Commander + +# MARK: Colossus Central +job-name-security-guard = Judge +job-name-stc = Station Traffic Controller +job-name-sr = Overseer + + diff --git a/Resources/Locale/en-US/_Mono/job/job-supervisors.ftl b/Resources/Locale/en-US/_Mono/job/job-supervisors.ftl index d7e3ce97c0c..ff80b9a658e 100644 --- a/Resources/Locale/en-US/_Mono/job/job-supervisors.ftl +++ b/Resources/Locale/en-US/_Mono/job/job-supervisors.ftl @@ -2,3 +2,14 @@ job-supervisors-doc = Director of Care job-supervisors-vg-infanteer = the lieutenant job-supervisors-vg-lieutenant = the commander job-supervisors-vg-commander = Sidewinder-01 +job-supervisors-sr = the Overseer +job-supervisors-tsf-commandingofficer = the Commanding Officer +job-supervisors-tsf-officer = the Officers +job-supervisors-tsf-teamleader = the Fireteam Leaders +job-supervisors-tsf-recruit = all higher ranking TSFMC personnel +job-supervisors-tsf = Fireteam Leaders, and all higher ranking officers +job-supervisors-pdv = the PDV Denasvar and higher ranked personnel +job-supervisors-pdv-denasvar = the Asvaran and Grand Vizier +job-supervisors-pdv-asvaran = the Grand Vizier +job-supervisors-nobody = nobody +job-supervisors-ws = Winter Solstice diff --git a/Resources/Locale/en-US/_NF/job/job-names.ftl b/Resources/Locale/en-US/_NF/job/job-names.ftl index 6bdab07cf6b..075d9d44cdc 100644 --- a/Resources/Locale/en-US/_NF/job/job-names.ftl +++ b/Resources/Locale/en-US/_NF/job/job-names.ftl @@ -1,26 +1,10 @@ # Frontier -job-name-bailiff = TSFMC Captain -job-name-brigmedic = TSFMC Corpsman -job-name-cadet-nf = TSFMC Private job-name-contractor = Spacer -job-name-deputy = TSFMC Marine job-name-nf-detective = Detective job-name-ertmailcarrier = ERT Mail Carrier job-name-mercenary = Mercenary job-name-pilot = Pilot -job-name-pdv-infiltrator = PDV Spasaka -job-name-pirate = PDV Rahkshan -job-name-pirate-captain = PDV Grand Vizier -job-name-pirate-first-mate = PDV Asvaran -job-name-pdv-denasvar = PDV Denasvar -job-name-pdv-tarkhan = PDV Tarkhan -job-name-tsf-marsoc = TSFMC MARSOC Operative -job-name-security-guard = Judge -job-name-sheriff = TSFMC Colonel -job-name-stc = Station Traffic Controller -job-name-sr = Overseer job-name-pal = Public Affairs Liaison -job-name-doc = Director of Care # Job titles job-title-ert-mail-carrier = ERT Mail Carrier diff --git a/Resources/Locale/en-US/_NF/job/job-supervisors.ftl b/Resources/Locale/en-US/_NF/job/job-supervisors.ftl deleted file mode 100644 index ec3d189702e..00000000000 --- a/Resources/Locale/en-US/_NF/job/job-supervisors.ftl +++ /dev/null @@ -1,12 +0,0 @@ -job-supervisors-sr = the Overseer -job-supervisors-sheriff = the Colonel -job-supervisors-bailiff = the Captain -job-supervisors-sergeant = the Fireteam Leaders -job-supervisors-cadet = all higher ranking TSFMC personnel -job-supervisors-prisoner = all TSFMC personnel -job-supervisors-nfsd = Fireteam Leaders, and the Colonel -job-supervisors-pirate = the PDV Denasvar and above -job-supervisors-pdv-denasvar = the PDV Asvaran and Grand Vizier -job-supervisors-pirate-first-mate = the PDV Grand Vizier -job-supervisors-nobody = nobody -job-supervisors-ws = Winter Solstice diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/asvaran.yml b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/asvaran.yml index a3977b289dc..a8327ca291c 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/asvaran.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/asvaran.yml @@ -1,6 +1,6 @@ - type: job id: PirateFirstMate - name: job-name-pirate-first-mate + name: job-name-pdv-asvaran description: job-description-pirate-first-mate playTimeTracker: JobPirateFirstMate requirements: diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/pdv_denasvar.yml b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/denasvar.yml similarity index 100% rename from Resources/Prototypes/_Mono/Roles/Jobs/PDV/pdv_denasvar.yml rename to Resources/Prototypes/_Mono/Roles/Jobs/PDV/denasvar.yml diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/grandvizier.yml b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/grandvizier.yml index 2f8151ae372..52589dea436 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/grandvizier.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/grandvizier.yml @@ -1,6 +1,6 @@ - type: job id: PirateCaptain - name: job-name-pirate-captain + name: job-name-pdv-vizier description: job-description-pirate-captain playTimeTracker: JobPirateCaptain requirements: diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/rahkshan.yml b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/rahkshan.yml index d3b80c05625..a8453615a3f 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/rahkshan.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/rahkshan.yml @@ -1,6 +1,6 @@ - type: job id: Pirate - name: job-name-pirate + name: job-name-pdv-rahkshan description: job-description-pirate playTimeTracker: JobPirate requirements: diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/pdv_infiltrator.yml b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/spasaka.yml similarity index 100% rename from Resources/Prototypes/_Mono/Roles/Jobs/PDV/pdv_infiltrator.yml rename to Resources/Prototypes/_Mono/Roles/Jobs/PDV/spasaka.yml diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/commandingofficer.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/commandingofficer.yml index a6f02da3b8a..c1a716559ab 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/commandingofficer.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/commandingofficer.yml @@ -1,6 +1,6 @@ - type: job id: Sheriff - name: job-name-sheriff + name: job-name-tsf-commandingofficer description: job-description-sheriff playTimeTracker: JobHeadOfSecurity requirements: diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/corpsman.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/corpsman.yml index 503e291908c..5a8a76ec3a6 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/corpsman.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/corpsman.yml @@ -1,6 +1,6 @@ - type: job id: Brigmedic - name: job-name-brigmedic + name: job-name-tsf-corpsman description: job-description-brigmedic-nf playTimeTracker: JobBrigmedic requirements: diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/marine.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/marine.yml index 3194394d6a9..6f4897ebbff 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/marine.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/marine.yml @@ -1,6 +1,6 @@ - type: job id: Deputy - name: job-name-deputy + name: job-name-tsf-marine description: job-description-deputy playTimeTracker: JobSecurityOfficer requirements: diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/officer.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/officer.yml index 4c1d84a7a5e..fa477176bba 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/officer.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/officer.yml @@ -1,6 +1,6 @@ - type: job id: Bailiff - name: job-name-bailiff + name: job-name-tsf-officer description: job-description-bailiff playTimeTracker: JobWarden requirements: # mono - lowers all of these tbh diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/recruit.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/recruit.yml index 344942a8397..48595321730 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/recruit.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/recruit.yml @@ -1,6 +1,6 @@ - type: job id: Cadet - name: job-name-cadet-nf + name: job-name-tsf-recruit description: job-description-cadet-nf playTimeTracker: JobSecurityCadet requirements: diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/teamleader.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/teamleader.yml index c884ce9b60a..bc13959b089 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/teamleader.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/teamleader.yml @@ -1,6 +1,6 @@ - type: job id: SeniorOfficer - name: job-name-senior-officer + name: job-name-tsf-teamleader description: job-description-senior-officer playTimeTracker: JobSeniorOfficer requirements: diff --git a/Resources/Prototypes/_NF/StatusIcon/job.yml b/Resources/Prototypes/_NF/StatusIcon/job.yml index f3a3f6d693d..b2303f9ea70 100644 --- a/Resources/Prototypes/_NF/StatusIcon/job.yml +++ b/Resources/Prototypes/_NF/StatusIcon/job.yml @@ -39,7 +39,7 @@ icon: sprite: /Textures/_Mono/Interface/Misc/job_icons.rsi state: PDVRakhshan - jobName: job-name-pirate + jobName: job-name-pdv-rahkshan - type: jobIcon parent: JobIcon @@ -55,7 +55,7 @@ icon: sprite: /Textures/_Mono/Interface/Misc/job_icons.rsi state: PDVVizier - jobName: job-name-pirate-captain + jobName: job-name-pdv-vizier - type: jobIcon parent: JobIcon @@ -63,7 +63,7 @@ icon: sprite: /Textures/_Mono/Interface/Misc/job_icons.rsi state: PDVAsvaran - jobName: job-name-pirate-first-mate + jobName: job-name-pdv-asvaran - type: jobIcon parent: JobIcon @@ -112,7 +112,7 @@ icon: sprite: /Textures/_NF/Interface/Misc/job_icons.rsi state: nfsdcadet - jobName: job-name-cadet-nf + jobName: job-name-tsf-recruit - type: jobIcon parent: JobIcon @@ -120,7 +120,7 @@ icon: sprite: /Textures/_NF/Interface/Misc/job_icons.rsi state: nfsddeputy - jobName: job-name-deputy + jobName: job-name-tsf-marine - type: jobIcon parent: JobIcon @@ -144,7 +144,7 @@ icon: sprite: /Textures/_NF/Interface/Misc/job_icons.rsi state: nfsdbrigmed - jobName: job-name-brigmedic + jobName: job-name-tsf-corpsman - type: jobIcon parent: JobIcon @@ -152,7 +152,7 @@ icon: sprite: /Textures/_NF/Interface/Misc/job_icons.rsi state: nfsdsergeant - jobName: job-name-senior-officer + jobName: job-name-tsf-teamleader - type: jobIcon parent: JobIcon @@ -160,7 +160,7 @@ icon: sprite: /Textures/_NF/Interface/Misc/job_icons.rsi state: nfsdbailiff - jobName: job-name-bailiff + jobName: job-name-tsf-officer - type: jobIcon parent: JobIcon @@ -168,7 +168,7 @@ icon: sprite: /Textures/_NF/Interface/Misc/job_icons.rsi state: nfsdsheriff - jobName: job-name-sheriff + jobName: job-name-tsf-commandingofficer # allowSelection: false # Frontier: no impersonating command staff, literally 1984 - Mono Revert # Medical positions From 87645e5756076b0d9ab1ff3b29ef14498d8f2c82 Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Mon, 13 Jul 2026 11:58:32 +0200 Subject: [PATCH 07/55] me and my capitalization --- Resources/Locale/en-US/_NF/job/job-names.ftl | 1 - Resources/Prototypes/_Mono/Roles/Jobs/PDV/denasvar.yml | 4 ++-- Resources/Prototypes/_Mono/Roles/Jobs/PDV/spasaka.yml | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Resources/Locale/en-US/_NF/job/job-names.ftl b/Resources/Locale/en-US/_NF/job/job-names.ftl index 075d9d44cdc..4a24c93ddd4 100644 --- a/Resources/Locale/en-US/_NF/job/job-names.ftl +++ b/Resources/Locale/en-US/_NF/job/job-names.ftl @@ -25,7 +25,6 @@ JobSTC = Station Traffic Controller job-name-senior-engineer = Senior Engineer job-name-senior-researcher = Senior Researcher job-name-senior-physician = Senior Physician -job-name-senior-officer = TSFMC Fireteam Leader JobSeniorEngineer = Senior Engineer JobSeniorOfficer = TSFMC Fireteam Leader diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/denasvar.yml b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/denasvar.yml index ac7ffc6d086..56ebc40f78c 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/denasvar.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/denasvar.yml @@ -35,8 +35,8 @@ assignedCompany: PDV setPreference: true access: - - Pirate - - PDVCommand + - PdvGeneral + - PdvCommand - Mercenary accessGroups: - GeneralAccess diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/spasaka.yml b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/spasaka.yml index 98e035e4f8f..db90bb997a4 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/spasaka.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/spasaka.yml @@ -24,7 +24,7 @@ assignedCompany: PDV setPreference: true access: - - Pirate + - PdvGeneral - Mercenary accessGroups: - GeneralAccess From 580ca71b80f4c76a5db1d94488d1b3a16f7d2994 Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Mon, 13 Jul 2026 12:07:50 +0200 Subject: [PATCH 08/55] one billion deprecated job ids --- Resources/Locale/en-US/_NF/job/job-names.ftl | 6 +++--- Resources/Prototypes/_Mono/Entities/Mobs/Player/silicon.yml | 2 +- .../PDV/{role_loadouts_rogue.yml => role_loadouts_pdv.yml} | 6 +++--- Resources/Prototypes/_Mono/Roles/Jobs/PDV/asvaran.yml | 2 +- Resources/Prototypes/_Mono/Roles/Jobs/PDV/denasvar.yml | 2 +- Resources/Prototypes/_Mono/Roles/Jobs/PDV/grandvizier.yml | 4 ++-- Resources/Prototypes/_Mono/Roles/Jobs/PDV/rahkshan.yml | 4 ++-- Resources/Prototypes/_Mono/Roles/Jobs/PDV/spasaka.yml | 4 ++-- Resources/Prototypes/_NF/Roles/Jobs/Frontier/sr.yml | 2 +- Resources/Prototypes/_NF/Roles/play_time_trackers.yml | 6 +++--- 10 files changed, 19 insertions(+), 19 deletions(-) rename Resources/Prototypes/_Mono/Loadouts/PDV/{role_loadouts_rogue.yml => role_loadouts_pdv.yml} (97%) diff --git a/Resources/Locale/en-US/_NF/job/job-names.ftl b/Resources/Locale/en-US/_NF/job/job-names.ftl index 4a24c93ddd4..3e6e41e596f 100644 --- a/Resources/Locale/en-US/_NF/job/job-names.ftl +++ b/Resources/Locale/en-US/_NF/job/job-names.ftl @@ -15,9 +15,9 @@ JobMercenary = Mercenary JobPilot = Pilot JobPDVInfiltrator = PDV Spasaka JobPirate = PDV Rakhshan -JobPirateCaptain = PDV Grand Vizier -JobPirateFirstMate = PDV Asvaran -JobPirateBoatswain = PDV Denasvar +JobPdvGrandVizier = PDV Grand Vizier +JobPdvAsvaran = PDV Asvaran +JobPdvDenasvar = PDV Denasvar JobSecurityGuard = Judge JobSTC = Station Traffic Controller diff --git a/Resources/Prototypes/_Mono/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/_Mono/Entities/Mobs/Player/silicon.yml index 5717f24c259..580aed18ae3 100644 --- a/Resources/Prototypes/_Mono/Entities/Mobs/Player/silicon.yml +++ b/Resources/Prototypes/_Mono/Entities/Mobs/Player/silicon.yml @@ -610,7 +610,7 @@ - !type:OverallPlaytimeRequirement time: 180000 # 50 hrs - !type:RoleTimeRequirement - role: JobPirateFirstMate + role: JobPdvAsvaran time: 54000 # 15 hours - type: GhostTakeoverAvailable - type: RandomMetadata diff --git a/Resources/Prototypes/_Mono/Loadouts/PDV/role_loadouts_rogue.yml b/Resources/Prototypes/_Mono/Loadouts/PDV/role_loadouts_pdv.yml similarity index 97% rename from Resources/Prototypes/_Mono/Loadouts/PDV/role_loadouts_rogue.yml rename to Resources/Prototypes/_Mono/Loadouts/PDV/role_loadouts_pdv.yml index 15f42b5f902..e3b9dc7d931 100644 --- a/Resources/Prototypes/_Mono/Loadouts/PDV/role_loadouts_rogue.yml +++ b/Resources/Prototypes/_Mono/Loadouts/PDV/role_loadouts_pdv.yml @@ -1,5 +1,5 @@ - type: roleLoadout - id: JobPirate + id: JobPdvRahkshan groups: - PDVHead - PDVNeck @@ -25,7 +25,7 @@ canCustomizeName: true - type: roleLoadout - id: JobPirateFirstMate + id: JobPdvAsvaran groups: - PDVHead - PDVNeck @@ -51,7 +51,7 @@ canCustomizeName: true - type: roleLoadout - id: JobPirateCaptain + id: JobPdvGrandVizier groups: - PDVCommanderHead - PDVJumpsuit diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/asvaran.yml b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/asvaran.yml index a8327ca291c..a6dc9db4e2e 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/asvaran.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/asvaran.yml @@ -2,7 +2,7 @@ id: PirateFirstMate name: job-name-pdv-asvaran description: job-description-pirate-first-mate - playTimeTracker: JobPirateFirstMate + playTimeTracker: JobPdvAsvaran requirements: - !type:OverallPlaytimeRequirement time: 180000 # 50 hours # mono diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/denasvar.yml b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/denasvar.yml index 56ebc40f78c..91f7486d64f 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/denasvar.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/denasvar.yml @@ -22,7 +22,7 @@ - !type:OverallPlaytimeRequirement time: 72000 # 20 hours # mono - !type:RoleTimeRequirement - role: JobPirate + role: JobPdvRahkshan time: 36000 # 10 hours startingGear: PDVDenasvarGear alwaysUseSpawner: true diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/grandvizier.yml b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/grandvizier.yml index 52589dea436..fa36347f167 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/grandvizier.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/grandvizier.yml @@ -2,12 +2,12 @@ id: PirateCaptain name: job-name-pdv-vizier description: job-description-pirate-captain - playTimeTracker: JobPirateCaptain + playTimeTracker: JobPdvGrandVizier requirements: - !type:OverallPlaytimeRequirement # mono start time: 144000 # 40 hours - !type:RoleTimeRequirement - role: JobPirateFirstMate + role: JobPdvAsvaran time: 18000 # 5 hours - mono whitelisted: true startingGear: PirateCaptainNFGear diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/rahkshan.yml b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/rahkshan.yml index a8453615a3f..b9318a9189c 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/rahkshan.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/rahkshan.yml @@ -2,7 +2,7 @@ id: Pirate name: job-name-pdv-rahkshan description: job-description-pirate - playTimeTracker: JobPirate + playTimeTracker: JobPdvRahkshan requirements: - !type:OverallPlaytimeRequirement time: 36000 # 10 hrs - mono @@ -11,7 +11,7 @@ hideConsoleVisibility: true canBeAntag: true icon: "JobIconPirate" - supervisors: job-supervisors-pirate + supervisors: job-supervisors-pdv weight: 20 displayWeight: 20 assignedCompany: PDV diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/spasaka.yml b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/spasaka.yml index db90bb997a4..25fc9967c21 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/spasaka.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/spasaka.yml @@ -7,7 +7,7 @@ - !type:OverallPlaytimeRequirement # mono start time: 108000 # 65 hours - !type:RoleTimeRequirement - role: JobPirate + role: JobPdvRahkshan time: 3600 # 1 hour - !type:DepartmentTimeRequirement department: Security @@ -18,7 +18,7 @@ hideConsoleVisibility: true canBeAntag: true icon: "JobIconPDVInfiltrator" - supervisors: job-supervisors-pirate + supervisors: job-supervisors-pdv-denasvar weight: 20 displayWeight: 20 assignedCompany: PDV diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Frontier/sr.yml b/Resources/Prototypes/_NF/Roles/Jobs/Frontier/sr.yml index a728f784d0e..24355ed79fa 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Frontier/sr.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Frontier/sr.yml @@ -11,7 +11,7 @@ time: 18000 # 5 hrs as security guard - mono # Factions are required here because Overseer needs to actually understand how both factions work. - !type:RoleTimeRequirement - role: JobPirate + role: JobPdvRahkshan time: 36000 # 10 hours - !type:DepartmentTimeRequirement department: Security diff --git a/Resources/Prototypes/_NF/Roles/play_time_trackers.yml b/Resources/Prototypes/_NF/Roles/play_time_trackers.yml index 56b11fa6ee1..16e61d05d7c 100644 --- a/Resources/Prototypes/_NF/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/_NF/Roles/play_time_trackers.yml @@ -32,13 +32,13 @@ id: JobStc - type: playTimeTracker - id: JobPirateCaptain + id: JobPdvGrandVizier - type: playTimeTracker - id: JobPirateFirstMate + id: JobPdvAsvaran - type: playTimeTracker - id: JobPirate + id: JobPdvRahkshan - type: playTimeTracker id: JobPDVInfiltrator From 05c02e3c37172ddcdb74def5bde0f41b8a9a7805 Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Mon, 13 Jul 2026 13:59:07 +0200 Subject: [PATCH 09/55] department localization transferred as we use all of them --- Resources/Locale/en-US/_Mono/job/department-desc.ftl | 5 +++++ Resources/Locale/en-US/_Mono/job/department.ftl | 4 ++++ Resources/Locale/en-US/_NF/job/department-desc.ftl | 6 ------ Resources/Locale/en-US/_NF/job/department.ftl | 5 ----- 4 files changed, 9 insertions(+), 11 deletions(-) delete mode 100644 Resources/Locale/en-US/_NF/job/department-desc.ftl delete mode 100644 Resources/Locale/en-US/_NF/job/department.ftl diff --git a/Resources/Locale/en-US/_Mono/job/department-desc.ftl b/Resources/Locale/en-US/_Mono/job/department-desc.ftl index 71b7b2895c9..f15a7d6e1ac 100644 --- a/Resources/Locale/en-US/_Mono/job/department-desc.ftl +++ b/Resources/Locale/en-US/_Mono/job/department-desc.ftl @@ -1,3 +1,8 @@ department-PMC-description = Combat focused contractors, who have less restrictions on gear they can carry. department-Medical-description = Emergency medical responders, deployed across space for rapid aid and rescue. department-Viper-description = Elite contractors belonging to a company of syndicate origins. +department-Pdv-description = Keep the claim the Sultan has places centuries ago on this sector, vanquish all enemies of the Dynasty. +department-NFCivilian-description = Team up with a crew and go out on adventures! +department-NFCommand-description = Manage the sector, keep things running efficiently. +department-NFCentralCommand-description = Get the sector and your forces under control, keep command on its toes. +department-Tsf-description = Expand the influence of Sol across the sector, crush any enemy resistance. Sol Invictus. diff --git a/Resources/Locale/en-US/_Mono/job/department.ftl b/Resources/Locale/en-US/_Mono/job/department.ftl index c534010dbb3..1d579f90fd5 100644 --- a/Resources/Locale/en-US/_Mono/job/department.ftl +++ b/Resources/Locale/en-US/_Mono/job/department.ftl @@ -4,3 +4,7 @@ department-UnionOfSovietSocialistPlanets = Union of Soviet Socialist Planets department-UnionOfSovietSocialistPlanets-description = Serve the glorious Union in space against TSFMC and PDV forces. department-Medical = Medical Dispatch department-Viper = Viper Group +department-Pdv = Phaethon Dynasty Imperial Vanguard +department-Command = Central Command +department-Frontier = Colossus Frontier Colonization +department-Security = TSF Marine Corps Detachment diff --git a/Resources/Locale/en-US/_NF/job/department-desc.ftl b/Resources/Locale/en-US/_NF/job/department-desc.ftl deleted file mode 100644 index 586d53b55cf..00000000000 --- a/Resources/Locale/en-US/_NF/job/department-desc.ftl +++ /dev/null @@ -1,6 +0,0 @@ -department-NF-description = Do your part to expand the TSF's influence in the sector. -department-NFAntag-description = Undermine the Trans-Solar Federation's efforts in the sector and generally be a nuisance to society. -department-NFCivilian-description = Team up with a crew and go out on adventures! -department-NFCommand-description = Manage the sector, keep things running efficiently. -department-NFCentralCommand-description = Get the sector under control, keep command on its toes. -department-NFSecurity-description = Keep the peace around the sector. diff --git a/Resources/Locale/en-US/_NF/job/department.ftl b/Resources/Locale/en-US/_NF/job/department.ftl deleted file mode 100644 index 83ff0076635..00000000000 --- a/Resources/Locale/en-US/_NF/job/department.ftl +++ /dev/null @@ -1,5 +0,0 @@ -# Below: Department name - should match department.ID, may collide with upstream definitions -department-Antag = Phaethon Dynasty Imperial Vanguard -department-Command = Central Command -department-Frontier = Colossus Frontier Colonization -department-Security = TSF Marine Corps Detachment From 179d61e360126f5acdb7b7a8534307ff8c931a85 Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Mon, 13 Jul 2026 14:06:47 +0200 Subject: [PATCH 10/55] uuuuuuuuuuuuuuuuh i went oo fart --- Resources/Maps/_Mono/POI/pdvhelios.yml | 2 +- Resources/Maps/_Mono/POI/pdvhelios_hw.yml | 2 +- .../Maps/_Mono/Supercapitals/jupiter.yml | 2 +- .../Maps/_Mono/Supercapitals/jupiter_hw.yml | 2 +- Resources/Maps/_Mono/Test/dev_map.yml | 2 +- .../Prototypes/Roles/Jobs/departments.yml | 3 +- .../_Mono/Catalogs/pdv_uplink_catalog.yml | 6 +- .../_Mono/Entities/Mobs/Player/silicon.yml | 2 +- .../Devices/Misc/identification_cards.yml | 6 +- .../_Mono/Entities/Objects/Devices/pda.yml | 135 +++++++++++++++++- .../_Mono/Loadouts/PDV/role_loadouts_pdv.yml | 6 +- .../Supercapitals/jupiter.yml | 2 +- .../Supercapitals/jupiter_hw.yml | 2 +- .../_Mono/PointsOfInterest/pdvhelios.yml | 8 +- .../_Mono/Roles/Jobs/PDV/asvaran.yml | 10 +- .../_Mono/Roles/Jobs/PDV/grandvizier.yml | 18 +-- .../Roles/Jobs/TSF/commandingofficer.yml | 2 +- .../_Mono/Roles/Jobs/TSF/corpsman.yml | 2 +- .../_Mono/Roles/Jobs/TSF/officer.yml | 2 +- .../_Mono/Roles/Jobs/departments.yml | 32 +++++ .../_NF/Catalog/Fills/Lockers/heads.yml | 2 +- .../VendingMachines/Inventories/cart.yml | 2 +- .../_NF/Entities/Markers/Spawners/jobs.yml | 8 +- .../Devices/Misc/identification_cards.yml | 26 ++-- .../_NF/Entities/Objects/Devices/pda.yml | 123 ---------------- .../_NF/Entities/Objects/Specific/pirate.yml | 2 +- .../_NF/Entities/Objects/Storage/pouches.yml | 2 +- .../_NF/Loadouts/Jobs/Brigmedic/pda.yml | 5 +- .../_NF/Loadouts/brigmedic_loadout_groups.yml | 6 +- Resources/Prototypes/_NF/Maps/debug.yml | 4 +- .../Prototypes/_NF/Roles/Jobs/departments.yml | 18 +-- .../_NF/Roles/play_time_trackers.yml | 4 +- Resources/Prototypes/_NF/StatusIcon/job.yml | 51 +++---- .../_Mono/Shuttles/BlackMarket/kortik.yml | 4 +- .../_Mono/Shuttles/BlackMarket/kortik_t2.yml | 4 +- .../_Mono/Shuttles/BlackMarket/scorpion.yml | 4 +- 36 files changed, 269 insertions(+), 242 deletions(-) diff --git a/Resources/Maps/_Mono/POI/pdvhelios.yml b/Resources/Maps/_Mono/POI/pdvhelios.yml index 737f2bae8d7..b7e3d7b1ffe 100644 --- a/Resources/Maps/_Mono/POI/pdvhelios.yml +++ b/Resources/Maps/_Mono/POI/pdvhelios.yml @@ -45198,7 +45198,7 @@ entities: - type: Transform pos: -5.5,59.5 parent: 1 -- proto: SpawnPointPirateFirstMate +- proto: SpawnPointPDVAsvaran entities: - uid: 7844 components: diff --git a/Resources/Maps/_Mono/POI/pdvhelios_hw.yml b/Resources/Maps/_Mono/POI/pdvhelios_hw.yml index 81c2c415ab0..2efeb414c38 100644 --- a/Resources/Maps/_Mono/POI/pdvhelios_hw.yml +++ b/Resources/Maps/_Mono/POI/pdvhelios_hw.yml @@ -45186,7 +45186,7 @@ entities: - type: Transform pos: -5.5,59.5 parent: 1 -- proto: SpawnPointPirateFirstMate +- proto: SpawnPointPDVAsvaran entities: - uid: 7844 components: diff --git a/Resources/Maps/_Mono/Supercapitals/jupiter.yml b/Resources/Maps/_Mono/Supercapitals/jupiter.yml index c62c7f4ae44..fafe01bee68 100644 --- a/Resources/Maps/_Mono/Supercapitals/jupiter.yml +++ b/Resources/Maps/_Mono/Supercapitals/jupiter.yml @@ -31240,7 +31240,7 @@ entities: - type: Transform pos: -13.5,21.5 parent: 1 -- proto: SpawnPointPirateFirstMate +- proto: SpawnPointPDVAsvaran entities: - uid: 4465 components: diff --git a/Resources/Maps/_Mono/Supercapitals/jupiter_hw.yml b/Resources/Maps/_Mono/Supercapitals/jupiter_hw.yml index f8c7b3e35ca..86d463d649e 100644 --- a/Resources/Maps/_Mono/Supercapitals/jupiter_hw.yml +++ b/Resources/Maps/_Mono/Supercapitals/jupiter_hw.yml @@ -40352,7 +40352,7 @@ entities: - type: Transform pos: -4.5,47.5 parent: 1 -- proto: SpawnPointPirateFirstMate +- proto: SpawnPointPDVAsvaran entities: - uid: 7484 components: diff --git a/Resources/Maps/_Mono/Test/dev_map.yml b/Resources/Maps/_Mono/Test/dev_map.yml index f932c894978..c3f3b7a0dff 100644 --- a/Resources/Maps/_Mono/Test/dev_map.yml +++ b/Resources/Maps/_Mono/Test/dev_map.yml @@ -7901,7 +7901,7 @@ entities: - type: Transform pos: -4.5,2.5 parent: 2 -- proto: SpawnPointPirateFirstMate +- proto: SpawnPointPDVAsvaran entities: - uid: 1144 components: diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 5ccbc3a3a51..3c517fdc0ba 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -77,9 +77,10 @@ # - ERTEngineer # Frontier # - DeathSquad # Frontier - StationRepresentative # Frontier - - Sheriff # Frontier + - TsfCommander # Mono - StationTrafficController # Frontier - DirectorOfCare # Mono + - PDVGrandVizier #Mono primary: false weight: 100 diff --git a/Resources/Prototypes/_Mono/Catalogs/pdv_uplink_catalog.yml b/Resources/Prototypes/_Mono/Catalogs/pdv_uplink_catalog.yml index 27b1cb29e2b..24f9b411132 100644 --- a/Resources/Prototypes/_Mono/Catalogs/pdv_uplink_catalog.yml +++ b/Resources/Prototypes/_Mono/Catalogs/pdv_uplink_catalog.yml @@ -252,7 +252,7 @@ - PirateUplink - !type:BuyerJobCondition whitelist: - - PirateCaptain + - PDVGrandVizier - type: listing id: UplinkPirateSyndicateMagboots @@ -1021,8 +1021,8 @@ - !type:BuyerJobCondition whitelist: - PDVDenasvar - - PirateFirstMate - - PirateCaptain + - PDVAsvaran + - PDVGrandVizier #MARK: Equipment diff --git a/Resources/Prototypes/_Mono/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/_Mono/Entities/Mobs/Player/silicon.yml index 580aed18ae3..ef8549dfe00 100644 --- a/Resources/Prototypes/_Mono/Entities/Mobs/Player/silicon.yml +++ b/Resources/Prototypes/_Mono/Entities/Mobs/Player/silicon.yml @@ -610,7 +610,7 @@ - !type:OverallPlaytimeRequirement time: 180000 # 50 hrs - !type:RoleTimeRequirement - role: JobPdvAsvaran + role: JobPDVAsvaran time: 54000 # 15 hours - type: GhostTakeoverAvailable - type: RandomMetadata diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Devices/Misc/identification_cards.yml b/Resources/Prototypes/_Mono/Entities/Objects/Devices/Misc/identification_cards.yml index 9a398e11a0c..e5efe8e3079 100644 --- a/Resources/Prototypes/_Mono/Entities/Objects/Devices/Misc/identification_cards.yml +++ b/Resources/Prototypes/_Mono/Entities/Objects/Devices/Misc/identification_cards.yml @@ -129,7 +129,7 @@ name: PDV asvaran ID card components: - type: PresetIdCard - job: PirateFirstMate + job: PDVAsvaran - type: Sprite sprite: _Mono/Objects/Misc/id_cards.rsi layers: @@ -142,7 +142,7 @@ name: PDV grand vizier ID card components: - type: PresetIdCard - job: PirateCaptain + job: PDVGrandVizier - type: Sprite sprite: _Mono/Objects/Misc/id_cards.rsi layers: @@ -155,7 +155,7 @@ name: PDV tarkhan ID card components: - type: PresetIdCard - job: PirateCaptain + job: PDVGrandVizier - type: Sprite sprite: _Mono/Objects/Misc/id_cards.rsi layers: diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_Mono/Entities/Objects/Devices/pda.yml index 0a44812d435..450a1a553ca 100644 --- a/Resources/Prototypes/_Mono/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/_Mono/Entities/Objects/Devices/pda.yml @@ -111,10 +111,10 @@ attachedToSuit: true # Mono - type: entity - parent: SheriffPDA + parent: TSFCommanderPDA id: MarsocPDA name: TSFMC MARSOC operative PDA - description: A standard TSFMC personal computer. + description: A modified TSFMC personal computer for high profile missions. components: - type: Pda id: TsfMarsocIDCard @@ -135,6 +135,131 @@ isEnabled: true attachedToSuit: true # Mono +- type: entity + parent: BaseSecurityPDA + id: TSFCommanderPDA + name: TSF Commanding Officer + description: A standard TSF portable PDA made specifically for the high ranking officers of the TSF. + components: + - type: Pda + id: TSFCommanderIDCard + penSlot: + startingItem: PenCentcom + priority: -1 + whitelist: + tags: + - Write + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-hos + - type: PdaBorderColor + borderColor: "#48484b" + - type: Icon + state: pda-hos + - type: CartridgeLoader # Extended with the ledger + preinstalled: + - CrewManifestCartridge + - NotekeeperCartridge + - NewsReaderCartridge + - BountyContractsCartridge + - AstroNavCartridge + - WantedListCartridge + - LedgerCartridge + +- type: entity + parent: BaseSecurityPDA + id: TSFRecruitPDA + name: TSF recruit PDA + description: A standard TSFMC personal computer. This one is slightly older and less fancy that the regular the marines have. + components: + - type: Pda + id: TsfRecruitIDCard + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-interncadet + - type: PdaBorderColor + borderColor: "#48484b" + - type: Icon + state: pda-interncadet + +- type: entity + parent: BaseSecurityPDA + id: TSFMarinePDA + name: TSF marine PDA + description: A standard TSFMC personal computer. + components: + - type: Pda + id: TsfMarineIDCard + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-security + - type: PdaBorderColor + borderColor: "#48484b" + - type: Icon + state: pda-security + +- type: entity + parent: BaseSecurityPDA + id: TSFCorpsmanPDA + name: TSF corpsman PDA + description: A standard TSFMC personal computer. + components: + - type: Pda + id: TsfCorpsmanIDCard + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-brigmedic + - type: PdaBorderColor + borderColor: "#48484b" + - type: Icon + state: pda-brigmedic + +- type: entity + parent: BaseSecurityPDA + id: TSFTeamleaderPDA + name: TSF fireteam leader PDA + description: A standard TSFMC personal computer. + components: + - type: Pda + id: TsfTeamleaderIDCard + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-seniorofficer + - type: PdaBorderColor + borderColor: "#48484b" + - type: Icon + state: pda-seniorofficer + +- type: entity + parent: BaseSecurityPDA + id: TSFOfficerPDA + name: TSF officer PDA + description: A standard TSF personnal computer issued to trained officers. + components: + - type: Pda + id: TsfOfficerIDCard + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-warden + - type: PdaBorderColor + borderColor: "#48484b" + - type: Icon + state: pda-warden + + +#PDV - type: entity parent: BasePDA id: BasePDVPDA @@ -192,6 +317,12 @@ components: - type: Pda id: PDVGrandVizierIDCard + penSlot: + startingItem: CyberPen + priority: -1 + whitelist: + tags: + - Write - type: Appearance appearanceDataInit: enum.PdaVisuals.PdaType: diff --git a/Resources/Prototypes/_Mono/Loadouts/PDV/role_loadouts_pdv.yml b/Resources/Prototypes/_Mono/Loadouts/PDV/role_loadouts_pdv.yml index e3b9dc7d931..9691b823897 100644 --- a/Resources/Prototypes/_Mono/Loadouts/PDV/role_loadouts_pdv.yml +++ b/Resources/Prototypes/_Mono/Loadouts/PDV/role_loadouts_pdv.yml @@ -25,7 +25,7 @@ canCustomizeName: true - type: roleLoadout - id: JobPdvAsvaran + id: JobPDVAsvaran groups: - PDVHead - PDVNeck @@ -51,7 +51,7 @@ canCustomizeName: true - type: roleLoadout - id: JobPdvGrandVizier + id: JobPDVGrandVizier groups: - PDVCommanderHead - PDVJumpsuit @@ -66,7 +66,7 @@ - GrandVizierPDA - NFSpeciesSpecific - ContractorWallet - - PirateCaptainTrinkets + - PDVGrandVizierTrinkets - PDVBelt - ContractorEncryptionKey - RogueFirearm diff --git a/Resources/Prototypes/_Mono/PointsOfInterest/Supercapitals/jupiter.yml b/Resources/Prototypes/_Mono/PointsOfInterest/Supercapitals/jupiter.yml index 9fd5b3ac5ed..c13369c02ec 100644 --- a/Resources/Prototypes/_Mono/PointsOfInterest/Supercapitals/jupiter.yml +++ b/Resources/Prototypes/_Mono/PointsOfInterest/Supercapitals/jupiter.yml @@ -41,7 +41,7 @@ lobbySortOrder: 2 - type: StationJobs availableJobs: - PirateFirstMate: [ 1, 1 ] # Mono + PDVAsvaran: [ 1, 1 ] # Mono PDVDenasvar: [ 2, 2 ] Pirate: [ 8, 8 ] # Mono tags: diff --git a/Resources/Prototypes/_Mono/PointsOfInterest/Supercapitals/jupiter_hw.yml b/Resources/Prototypes/_Mono/PointsOfInterest/Supercapitals/jupiter_hw.yml index 5aa61ef7c66..9ef7ab2d1dd 100644 --- a/Resources/Prototypes/_Mono/PointsOfInterest/Supercapitals/jupiter_hw.yml +++ b/Resources/Prototypes/_Mono/PointsOfInterest/Supercapitals/jupiter_hw.yml @@ -37,7 +37,7 @@ lobbySortOrder: 2 - type: StationJobs availableJobs: - PirateFirstMate: [ 1, 1 ] # Mono + PDVAsvaran: [ 1, 1 ] # Mono PDVDenasvar: [ 2, 2 ] Pirate: [ 8, 8 ] # Mono tags: diff --git a/Resources/Prototypes/_Mono/PointsOfInterest/pdvhelios.yml b/Resources/Prototypes/_Mono/PointsOfInterest/pdvhelios.yml index da4c3993eb2..3305c95b97a 100644 --- a/Resources/Prototypes/_Mono/PointsOfInterest/pdvhelios.yml +++ b/Resources/Prototypes/_Mono/PointsOfInterest/pdvhelios.yml @@ -39,8 +39,8 @@ stationDescription: 'frontier-lobby-pirate-description' - type: StationJobs availableJobs: - PirateCaptain: [ 1, 1 ] - PirateFirstMate: [ 1, 1 ] + PDVGrandVizier: [ 1, 1 ] + PDVAsvaran: [ 1, 1 ] PDVDenasvar: [ 3, 3 ] PDVInfiltrator: [ 2, 2 ] Pirate: [ -1, -1 ] @@ -87,9 +87,9 @@ stationDescription: 'frontier-lobby-pirate-description' - type: StationJobs availableJobs: - PirateCaptain: [ 1, 1 ] + PDVGrandVizier: [ 1, 1 ] PDVTarkhan: [ 3, 3 ] - PirateFirstMate: [ 3, 3 ] + PDVAsvaran: [ 3, 3 ] PDVDenasvar: [ 6, 6 ] PDVInfiltrator: [ 2, 2 ] Pirate: [ -1, -1 ] diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/asvaran.yml b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/asvaran.yml index a6dc9db4e2e..d02af6b4272 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/asvaran.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/asvaran.yml @@ -1,8 +1,8 @@ - type: job - id: PirateFirstMate + id: PDVAsvaran name: job-name-pdv-asvaran description: job-description-pirate-first-mate - playTimeTracker: JobPdvAsvaran + playTimeTracker: JobPDVAsvaran requirements: - !type:OverallPlaytimeRequirement time: 180000 # 50 hours # mono @@ -10,11 +10,11 @@ role: JobPDVDenasvar time: 28800 # 8 hours #whitelisted: true # mono - comment out - startingGear: PirateFirstMateNFGear + startingGear: PDVAsvaranNFGear alwaysUseSpawner: true hideConsoleVisibility: true canBeAntag: true - icon: "JobIconPirateFirstMate" + icon: "JobIconPDVAsvaran" supervisors: job-supervisors-captain weight: 40 displayWeight: 40 @@ -46,7 +46,7 @@ prototype: FrontierBirthdayGift - type: startingGear - id: PirateFirstMateNFGear + id: PDVAsvaranNFGear equipment: ears: ClothingHeadsetAltVanguardCommand #belt: ClothingBeltUtility diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/grandvizier.yml b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/grandvizier.yml index fa36347f167..42b5f5ee0ef 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/grandvizier.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/grandvizier.yml @@ -1,29 +1,29 @@ - type: job - id: PirateCaptain + id: PDVGrandVizier name: job-name-pdv-vizier description: job-description-pirate-captain - playTimeTracker: JobPdvGrandVizier + playTimeTracker: JobPDVGrandVizier requirements: - !type:OverallPlaytimeRequirement # mono start time: 144000 # 40 hours - !type:RoleTimeRequirement - role: JobPdvAsvaran + role: JobPDVAsvaran time: 18000 # 5 hours - mono whitelisted: true - startingGear: PirateCaptainNFGear + startingGear: PDVGrandVizierGear alwaysUseSpawner: true hideConsoleVisibility: true canBeAntag: true - icon: "JobIconPirateCaptain" + icon: "JobIconPDVGrandVizier" supervisors: job-supervisors-nobody weight: 50 displayWeight: 50 assignedCompany: PDV setPreference: true access: - - Pirate + - PdvGeneral - GrandVizier - - PDVCommand + - PdvCommand - Mercenary accessGroups: - GeneralAccess @@ -47,11 +47,11 @@ prototype: FrontierBirthdayGift - type: startingGear - id: PirateCaptainNFGear + id: PDVGrandVizierGear equipment: ears: ClothingHeadsetAltVanguardCommand #belt: ClothingBeltUtility # mono - pocket1: BasePirateUplinkRadioPirateCaptain + pocket1: BasePirateUplinkRadioPDVGrandVizier pocket2: EnergySword storage: back: diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/commandingofficer.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/commandingofficer.yml index c1a716559ab..27eacb8d56a 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/commandingofficer.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/commandingofficer.yml @@ -15,7 +15,7 @@ whitelisted: true startingGear: SheriffGear alwaysUseSpawner: true - icon: JobIconSheriff + icon: JobIconTSFCommander requireAdminNotify: true supervisors: job-supervisors-centcom weight: 180 diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/corpsman.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/corpsman.yml index 5a8a76ec3a6..5b35ac43031 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/corpsman.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/corpsman.yml @@ -14,7 +14,7 @@ - !type:OverallPlaytimeRequirement time: 108000 # 30 hours - mono startingGear: BrigmedicGear - icon: JobIconBrigmedicNF + icon: JobIconTSFCorpsman supervisors: job-supervisors-bailiff weight: 125 displayWeight: 35 diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/officer.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/officer.yml index fa477176bba..5463dffc5e8 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/officer.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/officer.yml @@ -13,7 +13,7 @@ role: JobSeniorOfficer time: 10800 # 3 hours startingGear: BailiffGear - icon: JobIconBailiff + icon: JobIconTSFOfficer supervisors: job-supervisors-sheriff weight: 150 displayWeight: 60 diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/departments.yml b/Resources/Prototypes/_Mono/Roles/Jobs/departments.yml index 68e93a3fb1d..00ecbfa094d 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/departments.yml @@ -33,3 +33,35 @@ - VGCommander primary: false editorHidden: false + +- type: department + id: Pdv + name: department-Pdv + description: department-Pdv-description + color: "#DE3A3A" + weight: 115 # Mono + roles: + - PDVGrandVizier + - PDVAsvaran + - PDVDenasvar + - PDVRakhshan + - PDVInfiltrator + - PDVBorg + - PDVTarkhan + +- type: department + id: Tsf + name: department-Tsf + description: department-Tsf-description # Mono + color: "#326DA8" # Mono + weight: 120 # Mono + roles: + - TsfRecruit + - TsfCorpsman + - TsfMarine + - TsfOfficer + - TsfCommander + - TsfTeamleader + - TsfEngineer + - TsfMarsoc + - TsfBorg diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/heads.yml index 490334fa769..d01b23d7958 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/heads.yml @@ -59,7 +59,7 @@ components: - type: StorageFill contents: - - id: ShriffIDCard + - id: TsfCommanderIDCard - id: BoxHandcuff # Frontier - id: CommsComputerCircuitboard # Frontier - id: MedalCaseNfsd # Frontier diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cart.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cart.yml index 425f02df3f2..5ca156df2d2 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cart.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cart.yml @@ -35,7 +35,7 @@ startingInventory: CadetPDA: 10 DeputyPDA: 10 - BrigmedicNFPDA: 10 + TSFCorpsmanPDA: 10 NFDetectivePDA: 10 SergeantPDA: 10 BailiffPDA: 10 diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/jobs.yml index 14477255554..cbdc43aa8ad 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/jobs.yml @@ -58,23 +58,23 @@ state: banner-red - type: entity - id: SpawnPointPirateFirstMate + id: SpawnPointPDVAsvaran parent: SpawnPointJobBase name: pirate first mate components: - type: SpawnPoint - job_id: PirateFirstMate + job_id: PDVAsvaran - type: Sprite sprite: Structures/Decoration/banner.rsi state: banner-red - type: entity - id: SpawnPointPirateCaptain + id: SpawnPointPDVGrandVizier parent: SpawnPointJobBase name: pirate captain components: - type: SpawnPoint - job_id: PirateCaptain + job_id: PDVGrandVizier - type: Sprite sprite: Structures/Decoration/banner.rsi state: banner-red diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml index 47ed900b0be..48bfed29947 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml @@ -78,8 +78,8 @@ - type: entity parent: IDCardStandard - id: CadetIDCard - name: TSFMC private ID card + id: TsfRecruitIDCard + name: TSFMC recruit ID card components: - type: PresetIdCard job: Cadet @@ -94,8 +94,8 @@ heldPrefix: nfsd - type: entity - parent: CadetIDCard - id: DeputyIDCard + parent: TsfRecruitIDCard + id: TsfMarineIDCard name: TSFMC marine ID card components: - type: PresetIdCard @@ -107,8 +107,8 @@ - state: idnfsddeputy - type: entity - parent: CadetIDCard - id: BrigmedicNFIDCard + parent: TsfRecruitIDCard + id: TSFCorpsmanIDCard name: TSFMC corpsman ID card components: - type: PresetIdCard @@ -120,7 +120,7 @@ - state: idnfsdbrigmed - type: entity - parent: CadetIDCard + parent: TsfRecruitIDCard id: SergeantIDCard name: TSFMC fireteam leader ID card components: @@ -133,8 +133,8 @@ - state: idnfsdsergeant - type: entity - parent: CadetIDCard - id: BailiffIDCard + parent: TsfRecruitIDCard + id: TsfOfficerIDCard name: TSFMC captain ID card components: - type: PresetIdCard @@ -146,8 +146,8 @@ - state: idnfsdbailiff - type: entity - parent: CadetIDCard - id: ShriffIDCard + parent: TsfRecruitIDCard + id: TsfCommanderIDCard name: TSFMC colonel ID card components: - type: PresetIdCard @@ -161,7 +161,7 @@ heldPrefix: silver - type: entity - parent: CadetIDCard + parent: TsfRecruitIDCard id: NFDetectiveIDCard name: TSFMC detective ID card components: @@ -279,7 +279,7 @@ name: Clarpy - type: entity - parent: DeputyIDCard + parent: TsfMarineIDCard id: CappyIDCard name: cappy ID card components: diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml index 396061a26bc..b6385409f81 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml @@ -115,129 +115,6 @@ tags: - Write -- type: entity - parent: BaseSecurityPDA - id: SheriffPDA - name: TSFMC colonel PDA - description: A standard TSFMC personal computer. - components: - - type: Pda - id: ShriffIDCard - penSlot: - startingItem: PenCentcom - priority: -1 - whitelist: - tags: - - Write - - type: Appearance - appearanceDataInit: - enum.PdaVisuals.PdaType: - !type:String - pda-hos - - type: PdaBorderColor - borderColor: "#48484b" - - type: Icon - state: pda-hos - - type: CartridgeLoader # Extended with the ledger - preinstalled: - - CrewManifestCartridge - - NotekeeperCartridge - - NewsReaderCartridge - - BountyContractsCartridge - - AstroNavCartridge - - WantedListCartridge - - LedgerCartridge - -- type: entity - parent: BaseSecurityPDA - id: CadetPDA - name: TSF private PDA - description: A standard TSFMC personal computer. - components: - - type: Pda - id: CadetIDCard - - type: Appearance - appearanceDataInit: - enum.PdaVisuals.PdaType: - !type:String - pda-interncadet - - type: PdaBorderColor - borderColor: "#48484b" - - type: Icon - state: pda-interncadet - -- type: entity - parent: BaseSecurityPDA - id: DeputyPDA - name: TSF marine PDA - description: A standard TSFMC personal computer. - components: - - type: Pda - id: DeputyIDCard - - type: Appearance - appearanceDataInit: - enum.PdaVisuals.PdaType: - !type:String - pda-security - - type: PdaBorderColor - borderColor: "#48484b" - - type: Icon - state: pda-security - -- type: entity - parent: BaseSecurityPDA - id: BrigmedicNFPDA - name: TSF corpsman PDA - description: A standard TSFMC personal computer. - components: - - type: Pda - id: BrigmedicNFIDCard - - type: Appearance - appearanceDataInit: - enum.PdaVisuals.PdaType: - !type:String - pda-corpsman - - type: PdaBorderColor - borderColor: "#48484b" - - type: Icon - state: pda-corpsman - -- type: entity - parent: BaseSecurityPDA - id: SergeantPDA - name: TSF fireteam leader PDA - description: A standard TSFMC personal computer. - components: - - type: Pda - id: SergeantIDCard - - type: Appearance - appearanceDataInit: - enum.PdaVisuals.PdaType: - !type:String - pda-seniorofficer - - type: PdaBorderColor - borderColor: "#48484b" - - type: Icon - state: pda-seniorofficer - -- type: entity - parent: BaseSecurityPDA - id: BailiffPDA - name: TSF captain PDA - description: A standard TSFMC personal computer. - components: - - type: Pda - id: BailiffIDCard - - type: Appearance - appearanceDataInit: - enum.PdaVisuals.PdaType: - !type:String - pda-warden - - type: PdaBorderColor - borderColor: "#48484b" - - type: Icon - state: pda-warden - - type: entity parent: BaseSecurityPDA id: NFDetectivePDA diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/pirate.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/pirate.yml index d9f15a1dd8d..022e19b5f26 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Specific/pirate.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/pirate.yml @@ -97,7 +97,7 @@ - type: entity parent: BasePirateUplink - id: BasePirateUplinkRadioPirateCaptain + id: BasePirateUplinkRadioPdvGrandVizier suffix: Commander 125 components: - type: Store diff --git a/Resources/Prototypes/_NF/Entities/Objects/Storage/pouches.yml b/Resources/Prototypes/_NF/Entities/Objects/Storage/pouches.yml index 8f5c0f9aa2f..cec6162d8d8 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Storage/pouches.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Storage/pouches.yml @@ -1121,7 +1121,7 @@ color: "#5c3714" - type: entity - id: NFPouchPirateCaptain + id: NFPouchPDVGrandVizier parent: NFPouchUtility name: pirate captain's pouch components: diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Brigmedic/pda.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Brigmedic/pda.yml index a77fae0157c..fc3feeae979 100644 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Brigmedic/pda.yml +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Brigmedic/pda.yml @@ -1,5 +1,4 @@ - type: loadout - id: BrigmedicBrigmedicPDA + id: TSFCorpsmanPDA equipment: - id: BrigmedicNFPDA - \ No newline at end of file + id: TSFCorpsmanPDA diff --git a/Resources/Prototypes/_NF/Loadouts/brigmedic_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/brigmedic_loadout_groups.yml index 0b2c8767012..fb51452f20f 100644 --- a/Resources/Prototypes/_NF/Loadouts/brigmedic_loadout_groups.yml +++ b/Resources/Prototypes/_NF/Loadouts/brigmedic_loadout_groups.yml @@ -45,10 +45,10 @@ name: loadout-group-contractor-id hidden: true # No point in showing this, it gets auto-selected. loadouts: - - BrigmedicBrigmedicPDA + - TSFCorpsmanPDA fallbacks: - - BrigmedicBrigmedicPDA - + - TSFCorpsmanPDA + - type: loadoutGroup id: BrigmedicGlasses name: loadout-group-contractor-glasses diff --git a/Resources/Prototypes/_NF/Maps/debug.yml b/Resources/Prototypes/_NF/Maps/debug.yml index 21733673198..78a66227308 100644 --- a/Resources/Prototypes/_NF/Maps/debug.yml +++ b/Resources/Prototypes/_NF/Maps/debug.yml @@ -49,8 +49,8 @@ Deputy: [ -1, -1] # Cadet: [ -1, -1] Mono # PublicAffairsLiaison: [ -1, -1] Mono - PirateCaptain: [ -1, -1] - PirateFirstMate: [ -1, -1] + PDVGrandVizier: [ -1, -1] + PDVAsvaran: [ -1, -1] PDVDenasvar: [ -1, -1] #Mono Pirate: [ -1, -1] PDVInfiltrator: [ -1, -1] # Mono] diff --git a/Resources/Prototypes/_NF/Roles/Jobs/departments.yml b/Resources/Prototypes/_NF/Roles/Jobs/departments.yml index 65224e5c86b..aba405acdd5 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/departments.yml @@ -22,20 +22,4 @@ - CCServiceWorker # nyano - NFJanitor - MailCarrier # nyano - - SecurityGuard - -- type: department - id: Antag - name: department-Antag - description: department-NFAntag-description - color: "#DE3A3A" - weight: 115 # Mono - roles: - - PirateCaptain - - PirateFirstMate - - PDVDenasvar # Mono - - Pirate - - PDVInfiltrator # Mono - - PdvBorg # Mono - - PDVTarkhan - - Prisoner #nyano + - SecurityGuard \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Roles/play_time_trackers.yml b/Resources/Prototypes/_NF/Roles/play_time_trackers.yml index 16e61d05d7c..acb5bdd1817 100644 --- a/Resources/Prototypes/_NF/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/_NF/Roles/play_time_trackers.yml @@ -32,10 +32,10 @@ id: JobStc - type: playTimeTracker - id: JobPdvGrandVizier + id: JobPDVGrandVizier - type: playTimeTracker - id: JobPdvAsvaran + id: JobPDVAsvaran - type: playTimeTracker id: JobPdvRahkshan diff --git a/Resources/Prototypes/_NF/StatusIcon/job.yml b/Resources/Prototypes/_NF/StatusIcon/job.yml index b2303f9ea70..1ad8604bc21 100644 --- a/Resources/Prototypes/_NF/StatusIcon/job.yml +++ b/Resources/Prototypes/_NF/StatusIcon/job.yml @@ -35,7 +35,7 @@ - type: jobIcon parent: JobIcon - id: JobIconPirate + id: JobIconPDVRakhshan #Mono icon: sprite: /Textures/_Mono/Interface/Misc/job_icons.rsi state: PDVRakhshan @@ -43,7 +43,7 @@ - type: jobIcon parent: JobIcon - id: JobIconPDVDenasvar + id: JobIconPDVDenasvar #Mono icon: sprite: /Textures/_Mono/Interface/Misc/job_icons.rsi state: PDVDenasvar @@ -51,7 +51,7 @@ - type: jobIcon parent: JobIcon - id: JobIconPirateCaptain + id: JobIconPDVGrandVizier #Mono icon: sprite: /Textures/_Mono/Interface/Misc/job_icons.rsi state: PDVVizier @@ -59,7 +59,7 @@ - type: jobIcon parent: JobIcon - id: JobIconPirateFirstMate + id: JobIconPDVAsvaran #Mono icon: sprite: /Textures/_Mono/Interface/Misc/job_icons.rsi state: PDVAsvaran @@ -67,7 +67,7 @@ - type: jobIcon parent: JobIcon - id: JobIconPDVInfiltrator + id: JobIconPDVInfiltrator #Mono icon: sprite: /Textures/_Mono/Interface/Misc/job_icons.rsi state: PDVInfiltrator @@ -108,42 +108,45 @@ - type: jobIcon parent: JobIcon - id: JobIconCadetNF + id: JobIconPublicAffairsLiaison icon: sprite: /Textures/_NF/Interface/Misc/job_icons.rsi - state: nfsdcadet - jobName: job-name-tsf-recruit + state: publicaffairsliaison + jobName: job-name-pal - type: jobIcon parent: JobIcon - id: JobIconDeputy + id: JobIconNFDetective icon: sprite: /Textures/_NF/Interface/Misc/job_icons.rsi - state: nfsddeputy - jobName: job-name-tsf-marine + state: nfsddetective + jobName: job-name-detective-nf + +# TSF Positions Mono - type: jobIcon parent: JobIcon - id: JobIconPublicAffairsLiaison + id: JobIconTSFRecruit #Mono icon: sprite: /Textures/_NF/Interface/Misc/job_icons.rsi - state: publicaffairsliaison - jobName: job-name-pal + state: tsfrecruit + jobName: job-name-tsf-recruit - type: jobIcon parent: JobIcon - id: JobIconNFDetective + id: JobIconTSFMarine #Mono icon: sprite: /Textures/_NF/Interface/Misc/job_icons.rsi - state: nfsddetective - jobName: job-name-detective-nf + state: tsfmarine + jobName: job-name-tsf-marine + - type: jobIcon parent: JobIcon - id: JobIconBrigmedicNF + id: JobIconTSFCorpsman #Mono icon: sprite: /Textures/_NF/Interface/Misc/job_icons.rsi - state: nfsdbrigmed + state: tsfcorpsman jobName: job-name-tsf-corpsman - type: jobIcon @@ -151,23 +154,23 @@ id: JobIconSergeant icon: sprite: /Textures/_NF/Interface/Misc/job_icons.rsi - state: nfsdsergeant + state: tsfteamleader jobName: job-name-tsf-teamleader - type: jobIcon parent: JobIcon - id: JobIconBailiff + id: JobIconTSFOfficer #mono icon: sprite: /Textures/_NF/Interface/Misc/job_icons.rsi - state: nfsdbailiff + state: tsfofficer jobName: job-name-tsf-officer - type: jobIcon parent: JobIcon - id: JobIconSheriff + id: JobIconTSFCommander #Mono icon: sprite: /Textures/_NF/Interface/Misc/job_icons.rsi - state: nfsdsheriff + state: tsfcommander jobName: job-name-tsf-commandingofficer # allowSelection: false # Frontier: no impersonating command staff, literally 1984 - Mono Revert diff --git a/Resources/SharedMaps/_Mono/Shuttles/BlackMarket/kortik.yml b/Resources/SharedMaps/_Mono/Shuttles/BlackMarket/kortik.yml index ef40f427c29..f1f2092f350 100644 --- a/Resources/SharedMaps/_Mono/Shuttles/BlackMarket/kortik.yml +++ b/Resources/SharedMaps/_Mono/Shuttles/BlackMarket/kortik.yml @@ -7667,14 +7667,14 @@ entities: - type: Transform pos: 0.5,-9.5 parent: 1 -- proto: SpawnPointPirateCaptain +- proto: SpawnPointPDVGrandVizier entities: - uid: 1106 components: - type: Transform pos: 0.5,-9.5 parent: 1 -- proto: SpawnPointPirateFirstMate +- proto: SpawnPointPDVAsvaran entities: - uid: 1107 components: diff --git a/Resources/SharedMaps/_Mono/Shuttles/BlackMarket/kortik_t2.yml b/Resources/SharedMaps/_Mono/Shuttles/BlackMarket/kortik_t2.yml index a614a79ee1a..360bf6898b6 100644 --- a/Resources/SharedMaps/_Mono/Shuttles/BlackMarket/kortik_t2.yml +++ b/Resources/SharedMaps/_Mono/Shuttles/BlackMarket/kortik_t2.yml @@ -7667,14 +7667,14 @@ entities: - type: Transform pos: 0.5,-9.5 parent: 1 -- proto: SpawnPointPirateCaptain +- proto: SpawnPointPDVGrandVizier entities: - uid: 1106 components: - type: Transform pos: 0.5,-9.5 parent: 1 -- proto: SpawnPointPirateFirstMate +- proto: SpawnPointPDVAsvaran entities: - uid: 1107 components: diff --git a/Resources/SharedMaps/_Mono/Shuttles/BlackMarket/scorpion.yml b/Resources/SharedMaps/_Mono/Shuttles/BlackMarket/scorpion.yml index 9622b14801d..fe36853195b 100644 --- a/Resources/SharedMaps/_Mono/Shuttles/BlackMarket/scorpion.yml +++ b/Resources/SharedMaps/_Mono/Shuttles/BlackMarket/scorpion.yml @@ -4116,14 +4116,14 @@ entities: - type: Transform pos: 0.5,13.5 parent: 1 -- proto: SpawnPointPirateCaptain +- proto: SpawnPointPDVGrandVizier entities: - uid: 579 components: - type: Transform pos: 0.5,13.5 parent: 1 -- proto: SpawnPointPirateFirstMate +- proto: SpawnPointPDVAsvaran entities: - uid: 580 components: From 5f7cfb8f516ab070d1428a63e4942790927a70e1 Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Mon, 13 Jul 2026 14:07:09 +0200 Subject: [PATCH 11/55] tsf icons moved to the correct folder with metadata adjusted --- .../Misc/job_icons.rsi/TSFCommander.png} | Bin .../Misc/job_icons.rsi/TSFCorpsman.png} | Bin .../Misc/job_icons.rsi/TSFMarine.png} | Bin .../Misc/job_icons.rsi/TSFOfficer.png} | Bin .../Misc/job_icons.rsi/TSFRecruit.png} | Bin .../Misc/job_icons.rsi/TSFTeamleader.png} | Bin .../Interface/Misc/job_icons.rsi/meta.json | 18 ++++++++++++++++++ 7 files changed, 18 insertions(+) rename Resources/Textures/{_NF/Interface/Misc/job_icons.rsi/nfsdsheriff.png => _Mono/Interface/Misc/job_icons.rsi/TSFCommander.png} (100%) rename Resources/Textures/{_NF/Interface/Misc/job_icons.rsi/nfsdbrigmed.png => _Mono/Interface/Misc/job_icons.rsi/TSFCorpsman.png} (100%) rename Resources/Textures/{_NF/Interface/Misc/job_icons.rsi/nfsddeputy.png => _Mono/Interface/Misc/job_icons.rsi/TSFMarine.png} (100%) rename Resources/Textures/{_NF/Interface/Misc/job_icons.rsi/nfsdbailiff.png => _Mono/Interface/Misc/job_icons.rsi/TSFOfficer.png} (100%) rename Resources/Textures/{_NF/Interface/Misc/job_icons.rsi/nfsdcadet.png => _Mono/Interface/Misc/job_icons.rsi/TSFRecruit.png} (100%) rename Resources/Textures/{_NF/Interface/Misc/job_icons.rsi/nfsdsergeant.png => _Mono/Interface/Misc/job_icons.rsi/TSFTeamleader.png} (100%) diff --git a/Resources/Textures/_NF/Interface/Misc/job_icons.rsi/nfsdsheriff.png b/Resources/Textures/_Mono/Interface/Misc/job_icons.rsi/TSFCommander.png similarity index 100% rename from Resources/Textures/_NF/Interface/Misc/job_icons.rsi/nfsdsheriff.png rename to Resources/Textures/_Mono/Interface/Misc/job_icons.rsi/TSFCommander.png diff --git a/Resources/Textures/_NF/Interface/Misc/job_icons.rsi/nfsdbrigmed.png b/Resources/Textures/_Mono/Interface/Misc/job_icons.rsi/TSFCorpsman.png similarity index 100% rename from Resources/Textures/_NF/Interface/Misc/job_icons.rsi/nfsdbrigmed.png rename to Resources/Textures/_Mono/Interface/Misc/job_icons.rsi/TSFCorpsman.png diff --git a/Resources/Textures/_NF/Interface/Misc/job_icons.rsi/nfsddeputy.png b/Resources/Textures/_Mono/Interface/Misc/job_icons.rsi/TSFMarine.png similarity index 100% rename from Resources/Textures/_NF/Interface/Misc/job_icons.rsi/nfsddeputy.png rename to Resources/Textures/_Mono/Interface/Misc/job_icons.rsi/TSFMarine.png diff --git a/Resources/Textures/_NF/Interface/Misc/job_icons.rsi/nfsdbailiff.png b/Resources/Textures/_Mono/Interface/Misc/job_icons.rsi/TSFOfficer.png similarity index 100% rename from Resources/Textures/_NF/Interface/Misc/job_icons.rsi/nfsdbailiff.png rename to Resources/Textures/_Mono/Interface/Misc/job_icons.rsi/TSFOfficer.png diff --git a/Resources/Textures/_NF/Interface/Misc/job_icons.rsi/nfsdcadet.png b/Resources/Textures/_Mono/Interface/Misc/job_icons.rsi/TSFRecruit.png similarity index 100% rename from Resources/Textures/_NF/Interface/Misc/job_icons.rsi/nfsdcadet.png rename to Resources/Textures/_Mono/Interface/Misc/job_icons.rsi/TSFRecruit.png diff --git a/Resources/Textures/_NF/Interface/Misc/job_icons.rsi/nfsdsergeant.png b/Resources/Textures/_Mono/Interface/Misc/job_icons.rsi/TSFTeamleader.png similarity index 100% rename from Resources/Textures/_NF/Interface/Misc/job_icons.rsi/nfsdsergeant.png rename to Resources/Textures/_Mono/Interface/Misc/job_icons.rsi/TSFTeamleader.png diff --git a/Resources/Textures/_Mono/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/_Mono/Interface/Misc/job_icons.rsi/meta.json index 54c62acae7d..9b278e4ce50 100644 --- a/Resources/Textures/_Mono/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/_Mono/Interface/Misc/job_icons.rsi/meta.json @@ -14,6 +14,24 @@ { "name": "TSFMarsoc" }, + { + "name": "TSFCommander" + }, + { + "name": "TSFOfficer" + }, + { + "name": "TSFMarine" + }, + { + "name": "TSFTeamleader" + }, + { + "name": "TSFCorpsman" + }, + { + "name": "TSFRecruit" + }, { "name": "PDVDenasvar" }, From 08aa0709790c84a600a3ccfc0d877ea055cd5f8e Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Mon, 13 Jul 2026 14:09:18 +0200 Subject: [PATCH 12/55] hha metadata fail --- .../_NF/Interface/Misc/job_icons.rsi/meta.json | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/Resources/Textures/_NF/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/_NF/Interface/Misc/job_icons.rsi/meta.json index 3c5664bfa47..a6e10b7faaa 100644 --- a/Resources/Textures/_NF/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/_NF/Interface/Misc/job_icons.rsi/meta.json @@ -17,27 +17,9 @@ { "name": "mercenary" }, - { - "name": "nfsdbailiff" - }, - { - "name": "nfsdbrigmed" - }, - { - "name": "nfsdcadet" - }, - { - "name": "nfsddeputy" - }, { "name": "nfsddetective" }, - { - "name": "nfsdsergeant" - }, - { - "name": "nfsdsheriff" - }, { "name": "nfmsdoc" }, From 00ed984895df31b2d56b0439b284fb528ed51373 Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Mon, 13 Jul 2026 14:20:20 +0200 Subject: [PATCH 13/55] me when i can't keep my capitalization conistent --- Resources/Prototypes/_Mono/Access/pdv.yml | 4 ++-- .../Prototypes/_Mono/Entities/Objects/Devices/door_access.yml | 2 +- .../_Mono/Entities/Structures/Doors/Airlocks/access_heavy.yml | 2 +- .../_Mono/Entities/Structures/Doors/Airlocks/hatch.yml | 2 +- .../Structures/Machines/Computers/rogue_comm_computer.yml | 2 +- Resources/Prototypes/_Mono/Roles/Jobs/PDV/denasvar.yml | 4 ++-- Resources/Prototypes/_Mono/Roles/Jobs/PDV/grandvizier.yml | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Resources/Prototypes/_Mono/Access/pdv.yml b/Resources/Prototypes/_Mono/Access/pdv.yml index a2726807f2c..ace2d7b7bbb 100644 --- a/Resources/Prototypes/_Mono/Access/pdv.yml +++ b/Resources/Prototypes/_Mono/Access/pdv.yml @@ -3,9 +3,9 @@ name: id-card-access-level-pdv-vizier - type: accessLevel - id: PdvCommand + id: PDVCommand name: id-card-access-level-pdv-command - type: accessLevel - id: PdvGeneral + id: PDVGeneral name: id-card-access-level-pdv diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Devices/door_access.yml b/Resources/Prototypes/_Mono/Entities/Objects/Devices/door_access.yml index e4e858d17bc..14d2c7f1e3c 100644 --- a/Resources/Prototypes/_Mono/Entities/Objects/Devices/door_access.yml +++ b/Resources/Prototypes/_Mono/Entities/Objects/Devices/door_access.yml @@ -40,7 +40,7 @@ - type: entity parent: DoorElectronics - id: DoorElectronicsPdvCommand + id: DoorElectronicsPDVCommand suffix: PDV Command, Locked components: - type: AccessReader diff --git a/Resources/Prototypes/_Mono/Entities/Structures/Doors/Airlocks/access_heavy.yml b/Resources/Prototypes/_Mono/Entities/Structures/Doors/Airlocks/access_heavy.yml index 9b4228407a7..a2863b8cff5 100644 --- a/Resources/Prototypes/_Mono/Entities/Structures/Doors/Airlocks/access_heavy.yml +++ b/Resources/Prototypes/_Mono/Entities/Structures/Doors/Airlocks/access_heavy.yml @@ -61,7 +61,7 @@ components: - type: ContainerFill containers: - board: [ DoorElectronicsPdvCommand ] + board: [ DoorElectronicsPDVCommand ] - type: entity parent: AirlockHeavyPDV diff --git a/Resources/Prototypes/_Mono/Entities/Structures/Doors/Airlocks/hatch.yml b/Resources/Prototypes/_Mono/Entities/Structures/Doors/Airlocks/hatch.yml index ae7f15501e8..b6e9a801a54 100644 --- a/Resources/Prototypes/_Mono/Entities/Structures/Doors/Airlocks/hatch.yml +++ b/Resources/Prototypes/_Mono/Entities/Structures/Doors/Airlocks/hatch.yml @@ -41,7 +41,7 @@ components: - type: ContainerFill containers: - board: [ DoorElectronicsPdvCommand ] + board: [ DoorElectronicsPDVCommand ] - type: entity parent: AirlockHatchSyndicate diff --git a/Resources/Prototypes/_Mono/Entities/Structures/Machines/Computers/rogue_comm_computer.yml b/Resources/Prototypes/_Mono/Entities/Structures/Machines/Computers/rogue_comm_computer.yml index a96df48c618..27e79802422 100644 --- a/Resources/Prototypes/_Mono/Entities/Structures/Machines/Computers/rogue_comm_computer.yml +++ b/Resources/Prototypes/_Mono/Entities/Structures/Machines/Computers/rogue_comm_computer.yml @@ -18,7 +18,7 @@ - map: [ "enum.WiresVisualLayers.MaintenancePanel" ] state: generic_panel_open - type: AccessReader - access: [[ "PdvCommand" ]] + access: [[ "PDVCommand" ]] - type: CommunicationsConsole title: comms-console-announcement-title-rogue color: "#D2B48C" diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/denasvar.yml b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/denasvar.yml index 91f7486d64f..74e5c2de4b3 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/denasvar.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/denasvar.yml @@ -35,8 +35,8 @@ assignedCompany: PDV setPreference: true access: - - PdvGeneral - - PdvCommand + - PDVGeneral + - PDVCommand - Mercenary accessGroups: - GeneralAccess diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/grandvizier.yml b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/grandvizier.yml index 42b5f5ee0ef..cd9615d1336 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/grandvizier.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/grandvizier.yml @@ -21,9 +21,9 @@ assignedCompany: PDV setPreference: true access: - - PdvGeneral + - PDVGeneral - GrandVizier - - PdvCommand + - PDVCommand - Mercenary accessGroups: - GeneralAccess From f78e1c9ce065d6518e66251ab47b84b39ff80d53 Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Mon, 13 Jul 2026 14:42:58 +0200 Subject: [PATCH 14/55] accesses and shipyard modifs as i changed job ids --- .../_Mono/Entities/Objects/Devices/pda.yml | 2 +- .../Entities/Structures/Machines/uplinks.yml | 4 +- .../Supercapitals/jupiter.yml | 2 +- .../Supercapitals/jupiter_hw.yml | 2 +- .../_Mono/PointsOfInterest/pdvhelios.yml | 4 +- .../_Mono/Roles/Jobs/TSF/teamleader.yml | 2 - .../_Mono/Shipyard/BlackMarket/bastion.yml | 2 +- .../_Mono/Shipyard/BlackMarket/carrion.yml | 2 +- .../_Mono/Shipyard/BlackMarket/eris.yml | 2 +- .../_Mono/Shipyard/BlackMarket/europa.yml | 2 +- .../_Mono/Shipyard/BlackMarket/fenrir.yml | 2 +- .../_Mono/Shipyard/BlackMarket/ganymede.yml | 2 +- .../_Mono/Shipyard/BlackMarket/garm.yml | 2 +- .../_Mono/Shipyard/BlackMarket/hazel.yml | 2 +- .../_Mono/Shipyard/BlackMarket/kalisto.yml | 2 +- .../_Mono/Shipyard/BlackMarket/kortik.yml | 2 +- .../_Mono/Shipyard/BlackMarket/kortik_t2.yml | 2 +- .../_Mono/Shipyard/BlackMarket/metis.yml | 2 +- .../_Mono/Shipyard/BlackMarket/motleyanne.yml | 2 +- .../_Mono/Shipyard/BlackMarket/neptune.yml | 2 +- .../_Mono/Shipyard/BlackMarket/saintie.yml | 2 +- .../_Mono/Shipyard/BlackMarket/scorpion.yml | 2 +- .../_Mono/Shipyard/BlackMarket/tethys.yml | 2 +- .../_Mono/Shipyard/BlackMarket/vulture.yml | 2 +- .../_Mono/Shipyard/Capitals/saturn.yml | 2 +- .../Devices/Misc/identification_cards.yml | 84 ------------------- .../Objects/Tools/access_configurator.yml | 2 +- Resources/Prototypes/_NF/Maps/debug.yml | 2 +- 28 files changed, 28 insertions(+), 114 deletions(-) diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_Mono/Entities/Objects/Devices/pda.yml index 450a1a553ca..220526f5e78 100644 --- a/Resources/Prototypes/_Mono/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/_Mono/Entities/Objects/Devices/pda.yml @@ -142,7 +142,7 @@ description: A standard TSF portable PDA made specifically for the high ranking officers of the TSF. components: - type: Pda - id: TSFCommanderIDCard + id: TsfCommanderIDCard penSlot: startingItem: PenCentcom priority: -1 diff --git a/Resources/Prototypes/_Mono/Entities/Structures/Machines/uplinks.yml b/Resources/Prototypes/_Mono/Entities/Structures/Machines/uplinks.yml index ea5a7557d02..26f55d7ebbd 100644 --- a/Resources/Prototypes/_Mono/Entities/Structures/Machines/uplinks.yml +++ b/Resources/Prototypes/_Mono/Entities/Structures/Machines/uplinks.yml @@ -43,7 +43,7 @@ balance: FederationMilitaryCredit: 25 - type: AccessReader - access: [["Security"]] + access: [["TsfGeneral"]] - type: CompanyAccessReader requiredCompanies: - TSF @@ -89,7 +89,7 @@ balance: Doubloon: 25 - type: AccessReader - access: [["Pirate"]] + access: [["PDVGeneral"]] - type: CompanyAccessReader requiredCompanies: - PDV diff --git a/Resources/Prototypes/_Mono/PointsOfInterest/Supercapitals/jupiter.yml b/Resources/Prototypes/_Mono/PointsOfInterest/Supercapitals/jupiter.yml index c13369c02ec..ea95ac2a223 100644 --- a/Resources/Prototypes/_Mono/PointsOfInterest/Supercapitals/jupiter.yml +++ b/Resources/Prototypes/_Mono/PointsOfInterest/Supercapitals/jupiter.yml @@ -43,7 +43,7 @@ availableJobs: PDVAsvaran: [ 1, 1 ] # Mono PDVDenasvar: [ 2, 2 ] - Pirate: [ 8, 8 ] # Mono + PDVRakhshan: [ 8, 8 ] # Mono tags: - PDVCommand - type: StationDeadDropReporting diff --git a/Resources/Prototypes/_Mono/PointsOfInterest/Supercapitals/jupiter_hw.yml b/Resources/Prototypes/_Mono/PointsOfInterest/Supercapitals/jupiter_hw.yml index 9ef7ab2d1dd..5a1f82d4507 100644 --- a/Resources/Prototypes/_Mono/PointsOfInterest/Supercapitals/jupiter_hw.yml +++ b/Resources/Prototypes/_Mono/PointsOfInterest/Supercapitals/jupiter_hw.yml @@ -39,7 +39,7 @@ availableJobs: PDVAsvaran: [ 1, 1 ] # Mono PDVDenasvar: [ 2, 2 ] - Pirate: [ 8, 8 ] # Mono + PDVRakhshan: [ 8, 8 ] # Mono tags: - PDVCommand - type: StationDeadDropReporting diff --git a/Resources/Prototypes/_Mono/PointsOfInterest/pdvhelios.yml b/Resources/Prototypes/_Mono/PointsOfInterest/pdvhelios.yml index 3305c95b97a..580e853b777 100644 --- a/Resources/Prototypes/_Mono/PointsOfInterest/pdvhelios.yml +++ b/Resources/Prototypes/_Mono/PointsOfInterest/pdvhelios.yml @@ -43,7 +43,7 @@ PDVAsvaran: [ 1, 1 ] PDVDenasvar: [ 3, 3 ] PDVInfiltrator: [ 2, 2 ] - Pirate: [ -1, -1 ] + PDVRakhshan: [ -1, -1 ] PdvBorg: [ 2, 2 ] tags: - GrandVizier @@ -92,7 +92,7 @@ PDVAsvaran: [ 3, 3 ] PDVDenasvar: [ 6, 6 ] PDVInfiltrator: [ 2, 2 ] - Pirate: [ -1, -1 ] + PDVRakhshan: [ -1, -1 ] PdvBorg: [ 2, 2 ] tags: - CentralCommand diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/teamleader.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/teamleader.yml index bc13959b089..21263a3873f 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/teamleader.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/teamleader.yml @@ -23,8 +23,6 @@ - Medical - Chemistry - TsfmcEngineering - accessGroups: - - GeneralNfsdAccess special: - !type:AddComponentSpecial components: diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/bastion.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/bastion.yml index b24f7157058..01c3ce1d504 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/bastion.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/bastion.yml @@ -33,5 +33,5 @@ prefixCreator: '14' - type: StationJobs availableJobs: - Pirate: [ 0, 0 ] + PDVRakhshan: [ 0, 0 ] PdvBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/carrion.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/carrion.yml index 88faa97248f..4672dd94833 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/carrion.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/carrion.yml @@ -33,5 +33,5 @@ prefixCreator: '14' - type: StationJobs availableJobs: - Pirate: [ 0, 0 ] + PDVRakhshan: [ 0, 0 ] PdvBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/eris.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/eris.yml index ab54c830253..0d7cd140e73 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/eris.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/eris.yml @@ -37,5 +37,5 @@ prefixCreator: '14' - type: StationJobs availableJobs: - Pirate: [ 0, 0 ] + PDVRakhshan: [ 0, 0 ] PdvBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/europa.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/europa.yml index 26c0024c769..79c405fcd61 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/europa.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/europa.yml @@ -40,5 +40,5 @@ prefixCreator: '14' - type: StationJobs availableJobs: - Pirate: [ 0, 0 ] + PDVRakhshan: [ 0, 0 ] PdvBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/fenrir.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/fenrir.yml index de2ecbaf165..5c2e8d60d2c 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/fenrir.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/fenrir.yml @@ -34,5 +34,5 @@ prefixCreator: '14' - type: StationJobs availableJobs: - Pirate: [ 0, 0 ] + PDVRakhshan: [ 0, 0 ] PdvBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/ganymede.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/ganymede.yml index 533054eb60b..d3a6b521a6c 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/ganymede.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/ganymede.yml @@ -40,5 +40,5 @@ prefixCreator: '14' - type: StationJobs availableJobs: - Pirate: [ 0, 0 ] + PDVRakhshan: [ 0, 0 ] PdvBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/garm.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/garm.yml index 1fdde031ed6..5484e2c5921 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/garm.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/garm.yml @@ -36,5 +36,5 @@ prefixCreator: '14' - type: StationJobs availableJobs: - Pirate: [ 0, 0 ] + PDVRakhshan: [ 0, 0 ] PdvBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/hazel.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/hazel.yml index a682de6399b..b70312ba5a7 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/hazel.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/hazel.yml @@ -33,5 +33,5 @@ prefixCreator: '14' - type: StationJobs availableJobs: - Pirate: [ 0, 0 ] + PDVRakhshan: [ 0, 0 ] PdvBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/kalisto.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/kalisto.yml index 82520dd23a6..6ed950f22f3 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/kalisto.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/kalisto.yml @@ -37,5 +37,5 @@ prefixCreator: '14' - type: StationJobs availableJobs: - Pirate: [ 0, 0 ] + PDVRakhshan: [ 0, 0 ] PdvBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/kortik.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/kortik.yml index 8e9dd67f85f..c53118f867c 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/kortik.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/kortik.yml @@ -38,5 +38,5 @@ prefixCreator: '14' - type: StationJobs availableJobs: - Pirate: [ 0, 0 ] + PDVRakhshan: [ 0, 0 ] PdvBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/kortik_t2.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/kortik_t2.yml index e9fb744be28..a5a38409347 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/kortik_t2.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/kortik_t2.yml @@ -38,5 +38,5 @@ prefixCreator: '14' - type: StationJobs availableJobs: - Pirate: [ 0, 0 ] + PDVRakhshan: [ 0, 0 ] PdvBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/metis.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/metis.yml index 59998831994..bb21128cf3c 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/metis.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/metis.yml @@ -36,5 +36,5 @@ prefixCreator: '14' - type: StationJobs availableJobs: - Pirate: [ 0, 0 ] + PDVRakhshan: [ 0, 0 ] PdvBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/motleyanne.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/motleyanne.yml index e3b2f9a2860..42d0b00ebe3 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/motleyanne.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/motleyanne.yml @@ -36,5 +36,5 @@ prefixCreator: '14' - type: StationJobs availableJobs: - Pirate: [ 0, 0 ] + PDVRakhshan: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/neptune.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/neptune.yml index 9ee60cdfc94..1e6f7fa7f08 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/neptune.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/neptune.yml @@ -35,5 +35,5 @@ prefixCreator: '14' - type: StationJobs availableJobs: - Pirate: [ 0, 0 ] + PDVRakhshan: [ 0, 0 ] PdvBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/saintie.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/saintie.yml index b99d7f2a338..ec3a4a713ea 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/saintie.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/saintie.yml @@ -36,5 +36,5 @@ prefixCreator: '14' - type: StationJobs availableJobs: - Pirate: [ 0, 0 ] + PDVRakhshan: [ 0, 0 ] PdvBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/scorpion.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/scorpion.yml index fa02a103ca1..42d91cf35df 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/scorpion.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/scorpion.yml @@ -35,5 +35,5 @@ prefixCreator: '14' - type: StationJobs availableJobs: - Pirate: [ 0, 0 ] + PDVRakhshan: [ 0, 0 ] PdvBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/tethys.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/tethys.yml index ec2fc7fb6b9..2332c5d84f6 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/tethys.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/tethys.yml @@ -32,5 +32,5 @@ prefixCreator: '14' - type: StationJobs availableJobs: - Pirate: [ 0, 0 ] + PDVRakhshan: [ 0, 0 ] PdvBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/vulture.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/vulture.yml index 22f7de99b00..418b1edea75 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/vulture.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/vulture.yml @@ -39,5 +39,5 @@ prefixCreator: '14' - type: StationJobs availableJobs: - Pirate: [ 0, 0 ] + PDVRakhshan: [ 0, 0 ] PdvBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/Capitals/saturn.yml b/Resources/Prototypes/_Mono/Shipyard/Capitals/saturn.yml index 2837c0125da..1294bdee523 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Capitals/saturn.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Capitals/saturn.yml @@ -51,4 +51,4 @@ prefixCreator: '14' - type: StationJobs availableJobs: - Pirate: [ 0, 0 ] + PDVRakhshan: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml index 48bfed29947..b0fad3d3c1e 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml @@ -76,90 +76,6 @@ - state: nfsd - state: idpublicaffairsliaison -- type: entity - parent: IDCardStandard - id: TsfRecruitIDCard - name: TSFMC recruit ID card - components: - - type: PresetIdCard - job: Cadet - - type: Sprite - sprite: _NF/Objects/Misc/id_cards.rsi - layers: - - state: nfsd - - state: idnfsdcadet - - type: Clothing - sprite: _NF/Objects/Misc/id_cards.rsi - - type: Item - heldPrefix: nfsd - -- type: entity - parent: TsfRecruitIDCard - id: TsfMarineIDCard - name: TSFMC marine ID card - components: - - type: PresetIdCard - job: Deputy - - type: Sprite - sprite: _NF/Objects/Misc/id_cards.rsi - layers: - - state: nfsd - - state: idnfsddeputy - -- type: entity - parent: TsfRecruitIDCard - id: TSFCorpsmanIDCard - name: TSFMC corpsman ID card - components: - - type: PresetIdCard - job: Brigmedic - - type: Sprite - sprite: _NF/Objects/Misc/id_cards.rsi - layers: - - state: nfsd - - state: idnfsdbrigmed - -- type: entity - parent: TsfRecruitIDCard - id: SergeantIDCard - name: TSFMC fireteam leader ID card - components: - - type: PresetIdCard - job: SeniorOfficer - - type: Sprite - sprite: _NF/Objects/Misc/id_cards.rsi - layers: - - state: nfsd - - state: idnfsdsergeant - -- type: entity - parent: TsfRecruitIDCard - id: TsfOfficerIDCard - name: TSFMC captain ID card - components: - - type: PresetIdCard - job: Bailiff - - type: Sprite - sprite: _NF/Objects/Misc/id_cards.rsi - layers: - - state: nfsd - - state: idnfsdbailiff - -- type: entity - parent: TsfRecruitIDCard - id: TsfCommanderIDCard - name: TSFMC colonel ID card - components: - - type: PresetIdCard - job: Sheriff - - type: Sprite - sprite: _NF/Objects/Misc/id_cards.rsi - layers: - - state: silver - - state: idnfsdsheriff - - type: Item - heldPrefix: silver - - type: entity parent: TsfRecruitIDCard id: NFDetectiveIDCard diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/access_configurator.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/access_configurator.yml index f24ccb750ee..8eb3cf802c5 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Tools/access_configurator.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/access_configurator.yml @@ -13,7 +13,7 @@ accessLevels: - Maintenance - External - - Pirate # Frontier + - PDVGeneral # Mono privilegedIdSlot: name: id-card-console-privileged-id ejectSound: /Audio/Machines/id_swipe.ogg diff --git a/Resources/Prototypes/_NF/Maps/debug.yml b/Resources/Prototypes/_NF/Maps/debug.yml index 78a66227308..3fcc74c1059 100644 --- a/Resources/Prototypes/_NF/Maps/debug.yml +++ b/Resources/Prototypes/_NF/Maps/debug.yml @@ -52,7 +52,7 @@ PDVGrandVizier: [ -1, -1] PDVAsvaran: [ -1, -1] PDVDenasvar: [ -1, -1] #Mono - Pirate: [ -1, -1] + PDVRakhshan: [ -1, -1] PDVInfiltrator: [ -1, -1] # Mono] TsfBorg: [ -1, -1 ] PdvBorg: [ -1, -1 ] From c652992110daf34dd8a6f07c09c60d5487ebf70e Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Mon, 13 Jul 2026 15:28:59 +0200 Subject: [PATCH 15/55] tsf names, descs, job ids and allat have been changed --- .../en-US/_Mono/job/job-description.ftl | 13 +++ .../Locale/en-US/_Mono/job/job-names.ftl | 2 +- .../en-US/_Mono/job/job-supervisors.ftl | 8 +- .../Locale/en-US/_NF/job/job-description.ftl | 13 --- .../Devices/Misc/identification_cards.yml | 86 ++++++++++++++++++- .../Roles/Jobs/TSF/commandingofficer.yml | 16 ++-- .../_Mono/Roles/Jobs/TSF/corpsman.yml | 12 +-- .../_Mono/Roles/Jobs/TSF/engineer.yml | 11 ++- .../_Mono/Roles/Jobs/TSF/marine.yml | 6 +- .../_Mono/Roles/Jobs/TSF/marsoc.yml | 6 +- .../_Mono/Roles/Jobs/TSF/officer.yml | 14 ++- .../_Mono/Roles/Jobs/TSF/recruit.yml | 12 +-- .../_Mono/Roles/Jobs/TSF/teamleader.yml | 15 ++-- 13 files changed, 148 insertions(+), 66 deletions(-) diff --git a/Resources/Locale/en-US/_Mono/job/job-description.ftl b/Resources/Locale/en-US/_Mono/job/job-description.ftl index 4ca3bc39552..53a73684605 100644 --- a/Resources/Locale/en-US/_Mono/job/job-description.ftl +++ b/Resources/Locale/en-US/_Mono/job/job-description.ftl @@ -9,9 +9,22 @@ job-description-md-medic = Traverse the space to provide life-saving care aboard # MARK: TSF job-description-tsf-engineer = Maintain the integrity of the flagship, get laughed at for not being a real soldier. job-description-tsf-borg = Half-human, Half-machine. Follow your laws, serve the TSF, and beg engineers for upgrades. +job-description-tsf-marine = Hunt down Imperials and enemies of the TSF, follow orders from your superiors. Enforce the Will of Sol. +job-description-tsf-officer = Command your assigned force if you have one, follow orders from the Commanding Officers, lead in case they are not present. Crush any resistance you may encounter. +job-description-tsf-corpsman = Fight in the rear of the force, for the lives of your comrades! You are the first and last hope of your squad, allegedly. Hippocrates blesses you. +job-description-tsf-marsoc = An elite member of the TSF's MARSOC. Rarely deployed to Colossus, if they're here, they have a good reason to. +job-description-tsf-teamleader = Lead your squad, be the bridge between Command and the marines that are under your orders, follow officer orders and advice. +job-description-tsf-commandingofficer = Manage your assigned TSF force, be it navy or marine. Drive the Dynasty's forces out of the Colossus sector, by any means if necessary, this deployment is of importance to establish a beachhead in the Colossus sector. +job-description-tsf-recruit = Hunt down Phaeton imperials and protect the FOB. Listen to your supervisors and feel free to ask them for any help. # MARK: PDV job-description-pdv-borg = Half-human, Half-machine. Follow your laws, serve the PDV, and beg dynasty troops for upgrades. +job-description-pdv-infiltrator = You are an infiltration expert of the Imperial Vanguard, deceive and cause chaos from behind the frontline. You answer to the Denasvar and above. +job-description-pdv-rahkshan = You are a member of an imperial battalion against the TSF expansion into the Colossus sector. +job-description-pdv-asvaran = Handle special orders from the Grand Vizier and watch over those under you. +job-description-pdv-grandvizier = You are the leader of an imperial battalion against the Federation scum that which tries to lay claim on the holy space of the Sultan. +job-description-pdv-denasvar = You are a more experienced member of the Vanguard. Lead your peers to victory. +job-description-pdv-tarkhan = An elite member of the PDV. Rarely deployed to Colossus. # MARK: Viper Group job-description-vg-infanteer = Follow the orders from above. Complete contracts. Get paid. diff --git a/Resources/Locale/en-US/_Mono/job/job-names.ftl b/Resources/Locale/en-US/_Mono/job/job-names.ftl index 7c4c9d94d23..f87766d3c62 100644 --- a/Resources/Locale/en-US/_Mono/job/job-names.ftl +++ b/Resources/Locale/en-US/_Mono/job/job-names.ftl @@ -15,7 +15,7 @@ job-name-tsf-engineer = TSFMC Engineer job-name-tsf-borg = TSFMC Cyborg job-name-tsf-marine = TSFMC Marine job-name-tsf-officer = TSF Officer -job-name-tsf-corpsman = TSFMC Corpsman +job-name-tsf-corpsman = TSF Corpsman job-name-tsf-recruit = TSFMC Recruit job-name-tsf-commandingofficer = TSF Commanding Officer job-name-tsf-marsoc = TSFMC MARSOC Operative diff --git a/Resources/Locale/en-US/_Mono/job/job-supervisors.ftl b/Resources/Locale/en-US/_Mono/job/job-supervisors.ftl index ff80b9a658e..46b135a49c3 100644 --- a/Resources/Locale/en-US/_Mono/job/job-supervisors.ftl +++ b/Resources/Locale/en-US/_Mono/job/job-supervisors.ftl @@ -3,10 +3,10 @@ job-supervisors-vg-infanteer = the lieutenant job-supervisors-vg-lieutenant = the commander job-supervisors-vg-commander = Sidewinder-01 job-supervisors-sr = the Overseer -job-supervisors-tsf-commandingofficer = the Commanding Officer -job-supervisors-tsf-officer = the Officers -job-supervisors-tsf-teamleader = the Fireteam Leaders -job-supervisors-tsf-recruit = all higher ranking TSFMC personnel +job-supervisors-tsf-commandingofficer = TSF High Command +job-supervisors-tsf-officer = the Commanding Officer +job-supervisors-tsf-teamleader = the Officers and Commander +job-supervisors-tsf-recruit = all TSFMC and TSFN personnel job-supervisors-tsf = Fireteam Leaders, and all higher ranking officers job-supervisors-pdv = the PDV Denasvar and higher ranked personnel job-supervisors-pdv-denasvar = the Asvaran and Grand Vizier diff --git a/Resources/Locale/en-US/_NF/job/job-description.ftl b/Resources/Locale/en-US/_NF/job/job-description.ftl index d9e37249a74..cd3bd3ea5c2 100644 --- a/Resources/Locale/en-US/_NF/job/job-description.ftl +++ b/Resources/Locale/en-US/_NF/job/job-description.ftl @@ -1,23 +1,10 @@ -job-description-bailiff = Ensure order at the FOB, watch over your Lieutenant(s), and make sure that all PD imperials are executed for their crimes against the TSF. -job-description-brigmedic-nf = Fight in the rear of the Colonel's service, for the lives of your comrades! You are the first and last hope of your squad. Hippocrates bless you. -job-description-cadet-nf = Hunt down PD imperials and protect the FOB. Listen to your supervisors and feel free to ask them for any help. job-description-contractor = Fulfill your own goals out in Colossus space. -job-description-deputy = Hunt down PD Imperials and enemies of the TSF, enforce the Colonel's law, and bring order to chaos in the sector. job-description-nf-detective = Investigate crime scenes using forensic tools, ensure that the guilty party is found, and have a couple smokes. job-description-ertmailcarrier = Nothing stops the mail. job-description-doc = Provide guidance and direction for shift medics and work to safeguard the health of TSF colonial personnel. job-description-mercenary = Execute the bidding of anyone- for the right price. Enjoy being unbound from the confines of the law. job-description-pilot = Pilot spaceships from point A to B, outmaneuver enemies, dodge asteroids and other ships. -job-description-pdv-infiltrator = You are an infiltration expert of the Imperial Vanguard, deceive and cause chaos from behind the frontline. You answer to the Denasvar and above. -job-description-pirate = You are a member of an imperial battalion against the TSF expansion into the Colossus sector. -job-description-pirate-captain = You are the leader of an imperial battalion against the TSF expansion into the Colossus sector. -job-description-pirate-first-mate = Handle special orders from the Grand Vizier and watch over those under you. -job-description-pdv-denasvar = You are a more experienced member of the Vanguard. Lead your peers to victory. -job-description-pdv-tarkhan = An elite member of the PDV. Rarely deployed to Colossus. -job-description-tsf-marsoc = An elite member of the TSF's MARSOC. Rarely deployed to Colossus. job-description-public-affairs-liaison = Interface with the public, hand out and fill out forms and assist the TSFMC chain of command with administrative tasks. job-description-security-guard = "I am the law." Carry out the Overseer's bidding, bring order to chaos, and put down threats to the safety and security of the Sector. -job-description-senior-officer = Teach new privates the basics of combat, and lead your TSFMC squads to victory against the Dynasty. -job-description-sheriff = Manage your TSFMC detachment and keep them efficient, quell dissent, and keep the sector safe. job-description-stc = Expertly de-conflict the space around the station and help the Colonial Outpost issue fines for overdocked ships. job-description-sr = Spend all your station funds on military vessels. Control your security guards and attempt to serve justice in this sector. diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Devices/Misc/identification_cards.yml b/Resources/Prototypes/_Mono/Entities/Objects/Devices/Misc/identification_cards.yml index e5efe8e3079..b39d0331b6b 100644 --- a/Resources/Prototypes/_Mono/Entities/Objects/Devices/Misc/identification_cards.yml +++ b/Resources/Prototypes/_Mono/Entities/Objects/Devices/Misc/identification_cards.yml @@ -57,7 +57,91 @@ - type: Item heldPrefix: medic -# MARK: TSF Engi +# MARK: TSF + +- type: entity + parent: IDCardStandard + id: TsfRecruitIDCard + name: TSFMC recruit ID card + components: + - type: PresetIdCard + job: Cadet + - type: Sprite + sprite: _NF/Objects/Misc/id_cards.rsi + layers: + - state: nfsd + - state: idnfsdcadet + - type: Clothing + sprite: _NF/Objects/Misc/id_cards.rsi + - type: Item + heldPrefix: nfsd + +- type: entity + parent: TsfRecruitIDCard + id: TsfMarineIDCard + name: TSFMC marine ID card + components: + - type: PresetIdCard + job: Deputy + - type: Sprite + sprite: _NF/Objects/Misc/id_cards.rsi + layers: + - state: nfsd + - state: idnfsddeputy + +- type: entity + parent: TsfRecruitIDCard + id: TsfCorpsmanIDCard + name: TSFMC corpsman ID card + components: + - type: PresetIdCard + job: Brigmedic + - type: Sprite + sprite: _NF/Objects/Misc/id_cards.rsi + layers: + - state: nfsd + - state: idnfsdbrigmed + +- type: entity + parent: TsfRecruitIDCard + id: TsfTeamleaderIDCard + name: TSFMC fireteam leader ID card + components: + - type: PresetIdCard + job: SeniorOfficer + - type: Sprite + sprite: _NF/Objects/Misc/id_cards.rsi + layers: + - state: nfsd + - state: idnfsdsergeant + +- type: entity + parent: TsfRecruitIDCard + id: TsfOfficerIDCard + name: TSFMC captain ID card + components: + - type: PresetIdCard + job: Bailiff + - type: Sprite + sprite: _NF/Objects/Misc/id_cards.rsi + layers: + - state: nfsd + - state: idnfsdbailiff + +- type: entity + parent: TsfRecruitIDCard + id: TsfCommanderIDCard + name: TSFMC colonel ID card + components: + - type: PresetIdCard + job: Sheriff + - type: Sprite + sprite: _NF/Objects/Misc/id_cards.rsi + layers: + - state: silver + - state: idnfsdsheriff + - type: Item + heldPrefix: silver - type: entity parent: IDCardStandard diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/commandingofficer.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/commandingofficer.yml index 27eacb8d56a..1cd7e44f172 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/commandingofficer.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/commandingofficer.yml @@ -1,13 +1,13 @@ - type: job - id: Sheriff + id: TsfCommander name: job-name-tsf-commandingofficer - description: job-description-sheriff + description: job-description-tsf-commandingofficer playTimeTracker: JobHeadOfSecurity requirements: - !type:OverallPlaytimeRequirement time: 144000 # 40 hours - mono - !type:DepartmentTimeRequirement - department: Security + department: Tsf time: 90000 # 25 hours - mono - !type:RoleTimeRequirement role: JobWarden @@ -22,14 +22,12 @@ displayWeight: 70 assignedCompany: TSF canBeAntag: false - accessGroups: - - AllAccessMono #Mono Start access: - TsfmcEngineering - - HeadOfSecurity - - Bailiff - - Sergeant - - Frontier #Mono End + - TsfCommander + - TsfOfficer + - TsfFtl + - TsfGeneral #Mono End special: - !type:AddComponentSpecial components: diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/corpsman.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/corpsman.yml index 5b35ac43031..9d07853b90c 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/corpsman.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/corpsman.yml @@ -1,13 +1,13 @@ - type: job - id: Brigmedic + id: TsfCorpsman name: job-name-tsf-corpsman - description: job-description-brigmedic-nf + description: job-description-tsf-corpsman playTimeTracker: JobBrigmedic requirements: - !type:OverallPlaytimeRequirement time: 72000 # 20 hours - mono - !type:DepartmentTimeRequirement - department: Security + department: Tsf time: 7200 # 2 hours - mono alternateRequirementSets: longerPlaytimeLessSec: @@ -15,13 +15,15 @@ time: 108000 # 30 hours - mono startingGear: BrigmedicGear icon: JobIconTSFCorpsman - supervisors: job-supervisors-bailiff + supervisors: job-supervisors-tsf weight: 125 displayWeight: 35 assignedCompany: TSF canBeAntag: false accessGroups: - - GeneralNfsdBrigmedicAccess + - TsfGeneral + - Medical + - Chemistry special: - !type:AddComponentSpecial components: diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/engineer.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/engineer.yml index 5e655022353..dc0fe61d6ef 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/engineer.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/engineer.yml @@ -5,18 +5,21 @@ playTimeTracker: JobTsfEngineer requirements: - !type:OverallPlaytimeRequirement - time: 21600 # 6 hours # mono + time: 54000 # 15 hours # mono #fuck this engineers aren't supposed to be the newbuddies + - !type:DepartmentTimeRequirement + department: Tsf + time: 7200 # 2 hours - mono startingGear: TsfEngiGear icon: JobIconTSFEngi - supervisors: job-supervisors-sergeant + supervisors: job-supervisors-tsf-teamleader weight: 130 displayWeight: 20 assignedCompany: TSF canBeAntag: false access: - TsfmcEngineering - accessGroups: - - TsfGeneralNoBrig + - TsfGeneral + - TsfFtl special: - !type:AddComponentSpecial components: diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/marine.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/marine.yml index 6f4897ebbff..670cf96e750 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/marine.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/marine.yml @@ -1,7 +1,7 @@ - type: job - id: Deputy + id: TsfMarine name: job-name-tsf-marine - description: job-description-deputy + description: job-description-tsf-marine playTimeTracker: JobSecurityOfficer requirements: - !type:OverallPlaytimeRequirement @@ -14,7 +14,7 @@ assignedCompany: TSF canBeAntag: false accessGroups: - - GeneralNfsdAccess + - TsfGeneral special: - !type:AddComponentSpecial components: diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/marsoc.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/marsoc.yml index 8cbb39223f9..09a69509400 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/marsoc.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/marsoc.yml @@ -5,14 +5,14 @@ playTimeTracker: JobTsfMarsoc requirements: - !type:DepartmentTimeRequirement # Requires time in both factions - department: Antag + department: Pdv time: 14400 # 4 hours # mono - !type:DepartmentTimeRequirement # Requires time in both factions - department: Security + department: Tsf time: 108000 # 30 hours # mono startingGear: MarsocOperativeGearHyperwarRole icon: JobIconTSFMarsoc - supervisors: job-supervisors-ws + supervisors: job-supervisors-tsf-commandingofficer weight: 45 displayWeight: 45 assignedCompany: TSF diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/officer.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/officer.yml index 5463dffc5e8..dcdbf1f0058 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/officer.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/officer.yml @@ -1,7 +1,7 @@ - type: job - id: Bailiff + id: TsfOfficer name: job-name-tsf-officer - description: job-description-bailiff + description: job-description-tsf-officer playTimeTracker: JobWarden requirements: # mono - lowers all of these tbh - !type:OverallPlaytimeRequirement @@ -20,11 +20,10 @@ assignedCompany: TSF canBeAntag: false access: - - Armory - - Sergeant - - Bailiff - - Medical - - Chemistry + - TsfOfficer + - TsfGeneral + - TsfmcEngineering + - TsfFtl - TsfmcEngineering # Mono accessGroups: - GeneralNfsdAccess @@ -54,6 +53,5 @@ # - Magazine45_ACPPistolFMJ # Mono - BaseSecurityUplinkRadioCaptain # - ShipVoucherNfsdBailiff # Mono - - RubberStampBailiff - RadioHandheldNF # Mono - RubberStampTSFCaptain # Mono diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/recruit.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/recruit.yml index 48595321730..7dc8290df28 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/recruit.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/recruit.yml @@ -1,25 +1,25 @@ - type: job - id: Cadet + id: TsfRecruit name: job-name-tsf-recruit - description: job-description-cadet-nf + description: job-description-tsf-recruit playTimeTracker: JobSecurityCadet requirements: - !type:OverallPlaytimeRequirement time: 32400 # 9 hours # mono - !type:DepartmentTimeRequirement - department: Security + department: Tsf time: 72000 # 20 hours # mono inverted: true # Leave slots open for newer, less confident players. startingGear: CadetGear icon: JobIconCadetNF - supervisors: job-supervisors-cadet + supervisors: job-supervisors-tsf-recruit weight: 70 displayWeight: 10 assignedCompany: TSF canBeAntag: false setPreference: false # mono - accessGroups: - - CadetNfsdAccess + access: + - TsfGeneral special: - !type:AddComponentSpecial components: diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/teamleader.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/teamleader.yml index 21263a3873f..d15141fe897 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/teamleader.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/teamleader.yml @@ -1,27 +1,24 @@ - type: job - id: SeniorOfficer + id: TsfTeamleader name: job-name-tsf-teamleader - description: job-description-senior-officer + description: job-description-tsf-teamleader playTimeTracker: JobSeniorOfficer requirements: - !type:OverallPlaytimeRequirement time: 72000 # 20 hours # mono - !type:DepartmentTimeRequirement - department: Security + department: Tsf time: 36000 # 10 hours # mono startingGear: SeniorOfficerGear icon: JobIconSergeant - supervisors: job-supervisors-sheriff + supervisors: job-supervisors-tsf-teamleader weight: 140 displayWeight: 50 assignedCompany: TSF canBeAntag: false access: - - Armory - - Sergeant - - Bailiff - - Medical - - Chemistry + - TsfGeneral + - TsfFtl - TsfmcEngineering special: - !type:AddComponentSpecial From 637466bdc1005c35060d49b2f131bc0b54d1f7c7 Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Mon, 13 Jul 2026 15:47:37 +0200 Subject: [PATCH 16/55] AI access fixes --- .../Mobs/Cyborgs/base_borg_chassis.yml | 22 ++++++------------- .../_Mono/Entities/Mobs/Player/silicon.yml | 11 +++++++++- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/Resources/Prototypes/_Mono/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/_Mono/Entities/Mobs/Cyborgs/base_borg_chassis.yml index 8f5bf4be270..b12a485449b 100644 --- a/Resources/Prototypes/_Mono/Entities/Mobs/Cyborgs/base_borg_chassis.yml +++ b/Resources/Prototypes/_Mono/Entities/Mobs/Cyborgs/base_borg_chassis.yml @@ -57,21 +57,13 @@ - TSFMC - type: Access tags: - - Security - - Armory - - Sergeant - - Bailiff - - Medical - - Chemistry + - TsfGeneral + - TsfFtl + - TsfOfficer - TsfmcEngineering - - Maintenance - - External - - Command - - Brig - Mercenary - - Captain - type: AccessReader - access: [["Security"], ["Armory"], ["Sergeant"], ["Bailiff"], ["TsfmcEngineering"], ["Brig"]] + access: [["TsfFtl"], ["TsfOfficer"], ["TsfmcEngineering"]] - type: IntrinsicRadioTransmitter channels: - Common @@ -123,12 +115,12 @@ - PirateNF - type: Access tags: - - Pirate + - PDVGeneral - PDVCommand - GrandVizier - Mercenary - type: AccessReader - access: [["GrandVizier"]] + access: [["GrandVizier"],["PDVCommand"]] - type: IntrinsicRadioTransmitter channels: - Common @@ -165,4 +157,4 @@ chance: 0.1 - type: ShowJobIcons - type: SiliconLawProvider - laws: PDVLawset \ No newline at end of file + laws: PDVLawset diff --git a/Resources/Prototypes/_Mono/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/_Mono/Entities/Mobs/Player/silicon.yml index ef8549dfe00..64d144b12de 100644 --- a/Resources/Prototypes/_Mono/Entities/Mobs/Player/silicon.yml +++ b/Resources/Prototypes/_Mono/Entities/Mobs/Player/silicon.yml @@ -538,6 +538,14 @@ - TauCetiBasic - RobotTalk - SolCommon + - type: Access + tags: + - TsfGeneral + - TsfmcEngineering + - TsfOfficer + - TsfCommander + - TsfFtl + - Mercenary - type: entity id: AiHeldTSFMC @@ -626,9 +634,10 @@ - Freespeak - type: Access tags: - - Pirate + - PDVGeneral - GrandVizier - PDVCommand + - Mercenary - type: entity id: AiHeldPDV From a0d72862500b01dcb5ac430d4ed452b710a69da0 Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Mon, 13 Jul 2026 15:59:29 +0200 Subject: [PATCH 17/55] i can't write rahkshan fucking properly --- .../Devices/Misc/identification_cards.yml | 22 +++++++++---------- .../_Mono/Entities/Objects/Devices/pda.yml | 10 ++++----- .../_Mono/Loadouts/PDV/role_loadouts_pdv.yml | 2 +- .../Supercapitals/jupiter.yml | 2 +- .../Supercapitals/jupiter_hw.yml | 2 +- .../_Mono/PointsOfInterest/pdvhelios.yml | 4 ++-- .../_Mono/Roles/Jobs/PDV/rahkshan.yml | 4 ++-- .../_Mono/Roles/Jobs/departments.yml | 2 +- .../_Mono/Shipyard/BlackMarket/bastion.yml | 2 +- .../_Mono/Shipyard/BlackMarket/carrion.yml | 2 +- .../_Mono/Shipyard/BlackMarket/eris.yml | 2 +- .../_Mono/Shipyard/BlackMarket/europa.yml | 2 +- .../_Mono/Shipyard/BlackMarket/fenrir.yml | 2 +- .../_Mono/Shipyard/BlackMarket/ganymede.yml | 2 +- .../_Mono/Shipyard/BlackMarket/garm.yml | 2 +- .../_Mono/Shipyard/BlackMarket/hazel.yml | 2 +- .../_Mono/Shipyard/BlackMarket/kalisto.yml | 2 +- .../_Mono/Shipyard/BlackMarket/kortik.yml | 2 +- .../_Mono/Shipyard/BlackMarket/kortik_t2.yml | 2 +- .../_Mono/Shipyard/BlackMarket/metis.yml | 2 +- .../_Mono/Shipyard/BlackMarket/motleyanne.yml | 2 +- .../_Mono/Shipyard/BlackMarket/neptune.yml | 2 +- .../_Mono/Shipyard/BlackMarket/saintie.yml | 2 +- .../_Mono/Shipyard/BlackMarket/scorpion.yml | 2 +- .../_Mono/Shipyard/BlackMarket/tethys.yml | 2 +- .../_Mono/Shipyard/BlackMarket/vulture.yml | 2 +- .../_Mono/Shipyard/Capitals/saturn.yml | 2 +- .../_NF/Entities/Markers/Spawners/jobs.yml | 10 ++++----- .../_NF/Entities/Markers/pacified_zone.yml | 16 +++++++------- .../_NF/Loadouts/Jobs/Pirates/pda.yml | 4 ++-- .../_NF/Loadouts/pirates_loadout_groups.yml | 6 ++--- Resources/Prototypes/_NF/Maps/debug.yml | 2 +- Resources/Prototypes/_NF/StatusIcon/job.yml | 4 ++-- 33 files changed, 64 insertions(+), 64 deletions(-) diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Devices/Misc/identification_cards.yml b/Resources/Prototypes/_Mono/Entities/Objects/Devices/Misc/identification_cards.yml index b39d0331b6b..a2ba8d84c28 100644 --- a/Resources/Prototypes/_Mono/Entities/Objects/Devices/Misc/identification_cards.yml +++ b/Resources/Prototypes/_Mono/Entities/Objects/Devices/Misc/identification_cards.yml @@ -65,7 +65,7 @@ name: TSFMC recruit ID card components: - type: PresetIdCard - job: Cadet + job: TsfRecruit - type: Sprite sprite: _NF/Objects/Misc/id_cards.rsi layers: @@ -82,7 +82,7 @@ name: TSFMC marine ID card components: - type: PresetIdCard - job: Deputy + job: TsfMarine - type: Sprite sprite: _NF/Objects/Misc/id_cards.rsi layers: @@ -95,7 +95,7 @@ name: TSFMC corpsman ID card components: - type: PresetIdCard - job: Brigmedic + job: TsfCorpsman - type: Sprite sprite: _NF/Objects/Misc/id_cards.rsi layers: @@ -108,7 +108,7 @@ name: TSFMC fireteam leader ID card components: - type: PresetIdCard - job: SeniorOfficer + job: TsfTeamleader - type: Sprite sprite: _NF/Objects/Misc/id_cards.rsi layers: @@ -121,7 +121,7 @@ name: TSFMC captain ID card components: - type: PresetIdCard - job: Bailiff + job: TsfOfficer - type: Sprite sprite: _NF/Objects/Misc/id_cards.rsi layers: @@ -134,7 +134,7 @@ name: TSFMC colonel ID card components: - type: PresetIdCard - job: Sheriff + job: TsfCommander - type: Sprite sprite: _NF/Objects/Misc/id_cards.rsi layers: @@ -182,8 +182,8 @@ - type: entity parent: PirateIDCard - id: PDVRakhshanIDCard - name: PDV rakhshan id card + id: PDVRahkshanIDCard + name: PDV Rahkshan id card components: - type: PresetIdCard job: Pirate @@ -191,7 +191,7 @@ sprite: _Mono/Objects/Misc/id_cards.rsi layers: - state: base - - state: id_rakhshan + - state: id_Rahkshan - type: entity parent: PirateIDCard @@ -263,7 +263,7 @@ sprite: _Mono/Objects/Misc/id_cards.rsi layers: - state: base - - state: id_rakhshan + - state: id_Rahkshan - type: AgentIDCard - type: ActivatableUI key: enum.AgentIDCardUiKey.Key @@ -273,7 +273,7 @@ - DoorBumpOpener - type: ChameleonClothing slot: [idcard] - default: PDVRakhshanIDCard + default: PDVRahkshanIDCard requireTag: WhitelistChameleonIdCard - type: UserInterface interfaces: diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_Mono/Entities/Objects/Devices/pda.yml index 220526f5e78..55a6f3ae5d0 100644 --- a/Resources/Prototypes/_Mono/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/_Mono/Entities/Objects/Devices/pda.yml @@ -292,16 +292,16 @@ - type: entity parent: BasePDVPDA - id: PDVRakhshanPDA - name: PDV rakhshan PDA + id: PDVRahkshanPDA + name: PDV Rahkshan PDA components: - type: Pda - id: PDVRakhshanIDCard + id: PDVRahkshanIDCard - type: Appearance appearanceDataInit: enum.PdaVisuals.PdaType: !type:String - pda-rakhshan + pda-Rahkshan - type: Geiger # Mono showExamine: true showControl: true @@ -405,7 +405,7 @@ appearanceDataInit: enum.PdaVisuals.PdaType: !type:String - pda-rakhshan + pda-Rahkshan - type: Geiger # Mono showExamine: true showControl: true diff --git a/Resources/Prototypes/_Mono/Loadouts/PDV/role_loadouts_pdv.yml b/Resources/Prototypes/_Mono/Loadouts/PDV/role_loadouts_pdv.yml index 9691b823897..d42de84aa24 100644 --- a/Resources/Prototypes/_Mono/Loadouts/PDV/role_loadouts_pdv.yml +++ b/Resources/Prototypes/_Mono/Loadouts/PDV/role_loadouts_pdv.yml @@ -11,7 +11,7 @@ - PDVShoes - PirateFace - ContractorBoxSurvival - - RakhshanPDA + - RahkshanPDA - ContractorWallet - NFSpeciesSpecific - PirateTrinkets diff --git a/Resources/Prototypes/_Mono/PointsOfInterest/Supercapitals/jupiter.yml b/Resources/Prototypes/_Mono/PointsOfInterest/Supercapitals/jupiter.yml index ea95ac2a223..fd82f528f5c 100644 --- a/Resources/Prototypes/_Mono/PointsOfInterest/Supercapitals/jupiter.yml +++ b/Resources/Prototypes/_Mono/PointsOfInterest/Supercapitals/jupiter.yml @@ -43,7 +43,7 @@ availableJobs: PDVAsvaran: [ 1, 1 ] # Mono PDVDenasvar: [ 2, 2 ] - PDVRakhshan: [ 8, 8 ] # Mono + PDVRahkshan: [ 8, 8 ] # Mono tags: - PDVCommand - type: StationDeadDropReporting diff --git a/Resources/Prototypes/_Mono/PointsOfInterest/Supercapitals/jupiter_hw.yml b/Resources/Prototypes/_Mono/PointsOfInterest/Supercapitals/jupiter_hw.yml index 5a1f82d4507..bedc404008f 100644 --- a/Resources/Prototypes/_Mono/PointsOfInterest/Supercapitals/jupiter_hw.yml +++ b/Resources/Prototypes/_Mono/PointsOfInterest/Supercapitals/jupiter_hw.yml @@ -39,7 +39,7 @@ availableJobs: PDVAsvaran: [ 1, 1 ] # Mono PDVDenasvar: [ 2, 2 ] - PDVRakhshan: [ 8, 8 ] # Mono + PDVRahkshan: [ 8, 8 ] # Mono tags: - PDVCommand - type: StationDeadDropReporting diff --git a/Resources/Prototypes/_Mono/PointsOfInterest/pdvhelios.yml b/Resources/Prototypes/_Mono/PointsOfInterest/pdvhelios.yml index 580e853b777..db466bd9c7b 100644 --- a/Resources/Prototypes/_Mono/PointsOfInterest/pdvhelios.yml +++ b/Resources/Prototypes/_Mono/PointsOfInterest/pdvhelios.yml @@ -43,7 +43,7 @@ PDVAsvaran: [ 1, 1 ] PDVDenasvar: [ 3, 3 ] PDVInfiltrator: [ 2, 2 ] - PDVRakhshan: [ -1, -1 ] + PDVRahkshan: [ -1, -1 ] PdvBorg: [ 2, 2 ] tags: - GrandVizier @@ -92,7 +92,7 @@ PDVAsvaran: [ 3, 3 ] PDVDenasvar: [ 6, 6 ] PDVInfiltrator: [ 2, 2 ] - PDVRakhshan: [ -1, -1 ] + PDVRahkshan: [ -1, -1 ] PdvBorg: [ 2, 2 ] tags: - CentralCommand diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/rahkshan.yml b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/rahkshan.yml index b9318a9189c..eb3c8b62cd9 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/rahkshan.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/rahkshan.yml @@ -1,6 +1,6 @@ - type: job id: Pirate - name: job-name-pdv-rahkshan + name: job-name-pdv-Rahkshan description: job-description-pirate playTimeTracker: JobPdvRahkshan requirements: @@ -28,7 +28,7 @@ factions: - PirateNF - type: ChatRank - rank: pdv-rahkshan + rank: pdv-Rahkshan - !type:AddImplantSpecial implants: [ FreelanceTrackingImplant ] - !type:AddLanguageSpecial # Monolith - Languages diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/departments.yml b/Resources/Prototypes/_Mono/Roles/Jobs/departments.yml index 00ecbfa094d..7845d096199 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/departments.yml @@ -44,7 +44,7 @@ - PDVGrandVizier - PDVAsvaran - PDVDenasvar - - PDVRakhshan + - PDVRahkshan - PDVInfiltrator - PDVBorg - PDVTarkhan diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/bastion.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/bastion.yml index 01c3ce1d504..8c343fba77a 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/bastion.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/bastion.yml @@ -33,5 +33,5 @@ prefixCreator: '14' - type: StationJobs availableJobs: - PDVRakhshan: [ 0, 0 ] + PDVRahkshan: [ 0, 0 ] PdvBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/carrion.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/carrion.yml index 4672dd94833..26844068fc1 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/carrion.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/carrion.yml @@ -33,5 +33,5 @@ prefixCreator: '14' - type: StationJobs availableJobs: - PDVRakhshan: [ 0, 0 ] + PDVRahkshan: [ 0, 0 ] PdvBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/eris.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/eris.yml index 0d7cd140e73..68138b6ce0b 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/eris.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/eris.yml @@ -37,5 +37,5 @@ prefixCreator: '14' - type: StationJobs availableJobs: - PDVRakhshan: [ 0, 0 ] + PDVRahkshan: [ 0, 0 ] PdvBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/europa.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/europa.yml index 79c405fcd61..4bdb3ba4f7a 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/europa.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/europa.yml @@ -40,5 +40,5 @@ prefixCreator: '14' - type: StationJobs availableJobs: - PDVRakhshan: [ 0, 0 ] + PDVRahkshan: [ 0, 0 ] PdvBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/fenrir.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/fenrir.yml index 5c2e8d60d2c..a17989c7cd1 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/fenrir.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/fenrir.yml @@ -34,5 +34,5 @@ prefixCreator: '14' - type: StationJobs availableJobs: - PDVRakhshan: [ 0, 0 ] + PDVRahkshan: [ 0, 0 ] PdvBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/ganymede.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/ganymede.yml index d3a6b521a6c..8f61aa01eba 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/ganymede.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/ganymede.yml @@ -40,5 +40,5 @@ prefixCreator: '14' - type: StationJobs availableJobs: - PDVRakhshan: [ 0, 0 ] + PDVRahkshan: [ 0, 0 ] PdvBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/garm.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/garm.yml index 5484e2c5921..94579b34dd7 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/garm.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/garm.yml @@ -36,5 +36,5 @@ prefixCreator: '14' - type: StationJobs availableJobs: - PDVRakhshan: [ 0, 0 ] + PDVRahkshan: [ 0, 0 ] PdvBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/hazel.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/hazel.yml index b70312ba5a7..cd7854a92be 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/hazel.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/hazel.yml @@ -33,5 +33,5 @@ prefixCreator: '14' - type: StationJobs availableJobs: - PDVRakhshan: [ 0, 0 ] + PDVRahkshan: [ 0, 0 ] PdvBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/kalisto.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/kalisto.yml index 6ed950f22f3..e6085140d70 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/kalisto.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/kalisto.yml @@ -37,5 +37,5 @@ prefixCreator: '14' - type: StationJobs availableJobs: - PDVRakhshan: [ 0, 0 ] + PDVRahkshan: [ 0, 0 ] PdvBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/kortik.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/kortik.yml index c53118f867c..254b9517ecd 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/kortik.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/kortik.yml @@ -38,5 +38,5 @@ prefixCreator: '14' - type: StationJobs availableJobs: - PDVRakhshan: [ 0, 0 ] + PDVRahkshan: [ 0, 0 ] PdvBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/kortik_t2.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/kortik_t2.yml index a5a38409347..716e57c2ff1 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/kortik_t2.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/kortik_t2.yml @@ -38,5 +38,5 @@ prefixCreator: '14' - type: StationJobs availableJobs: - PDVRakhshan: [ 0, 0 ] + PDVRahkshan: [ 0, 0 ] PdvBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/metis.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/metis.yml index bb21128cf3c..4ecf02c6516 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/metis.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/metis.yml @@ -36,5 +36,5 @@ prefixCreator: '14' - type: StationJobs availableJobs: - PDVRakhshan: [ 0, 0 ] + PDVRahkshan: [ 0, 0 ] PdvBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/motleyanne.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/motleyanne.yml index 42d0b00ebe3..817bd6cf8d1 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/motleyanne.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/motleyanne.yml @@ -36,5 +36,5 @@ prefixCreator: '14' - type: StationJobs availableJobs: - PDVRakhshan: [ 0, 0 ] + PDVRahkshan: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/neptune.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/neptune.yml index 1e6f7fa7f08..a11b56aa542 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/neptune.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/neptune.yml @@ -35,5 +35,5 @@ prefixCreator: '14' - type: StationJobs availableJobs: - PDVRakhshan: [ 0, 0 ] + PDVRahkshan: [ 0, 0 ] PdvBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/saintie.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/saintie.yml index ec3a4a713ea..47842683547 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/saintie.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/saintie.yml @@ -36,5 +36,5 @@ prefixCreator: '14' - type: StationJobs availableJobs: - PDVRakhshan: [ 0, 0 ] + PDVRahkshan: [ 0, 0 ] PdvBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/scorpion.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/scorpion.yml index 42d91cf35df..d716c3e445c 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/scorpion.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/scorpion.yml @@ -35,5 +35,5 @@ prefixCreator: '14' - type: StationJobs availableJobs: - PDVRakhshan: [ 0, 0 ] + PDVRahkshan: [ 0, 0 ] PdvBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/tethys.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/tethys.yml index 2332c5d84f6..bbd2dfb2100 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/tethys.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/tethys.yml @@ -32,5 +32,5 @@ prefixCreator: '14' - type: StationJobs availableJobs: - PDVRakhshan: [ 0, 0 ] + PDVRahkshan: [ 0, 0 ] PdvBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/vulture.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/vulture.yml index 418b1edea75..2282674db77 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/vulture.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/vulture.yml @@ -39,5 +39,5 @@ prefixCreator: '14' - type: StationJobs availableJobs: - PDVRakhshan: [ 0, 0 ] + PDVRahkshan: [ 0, 0 ] PdvBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/Capitals/saturn.yml b/Resources/Prototypes/_Mono/Shipyard/Capitals/saturn.yml index 1294bdee523..f93ae8f7595 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Capitals/saturn.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Capitals/saturn.yml @@ -51,4 +51,4 @@ prefixCreator: '14' - type: StationJobs availableJobs: - PDVRakhshan: [ 0, 0 ] + PDVRahkshan: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/jobs.yml index cbdc43aa8ad..af79a345860 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/jobs.yml @@ -47,12 +47,12 @@ - state: pilot - type: entity - id: SpawnPointPirate + id: SpawnPointPDVRahkshan parent: SpawnPointJobBase - name: pirate + name: PDV Rahkshan components: - type: SpawnPoint - job_id: Pirate + job_id: PDVRahkshanIDCard - type: Sprite sprite: Structures/Decoration/banner.rsi state: banner-red @@ -60,7 +60,7 @@ - type: entity id: SpawnPointPDVAsvaran parent: SpawnPointJobBase - name: pirate first mate + name: PDV Asvaran components: - type: SpawnPoint job_id: PDVAsvaran @@ -71,7 +71,7 @@ - type: entity id: SpawnPointPDVGrandVizier parent: SpawnPointJobBase - name: pirate captain + name: PDV Grand Vizier components: - type: SpawnPoint job_id: PDVGrandVizier diff --git a/Resources/Prototypes/_NF/Entities/Markers/pacified_zone.yml b/Resources/Prototypes/_NF/Entities/Markers/pacified_zone.yml index 186fbbd879d..a7044eaa9bc 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/pacified_zone.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/pacified_zone.yml @@ -13,13 +13,13 @@ - type: PacifiedZoneGenerator radius: 10 immuneRoles: - - Bailiff - - Brigmedic - - Cadet - - Deputy - - NFDetective - - SeniorOfficer - - Sheriff + #- Bailiff #mono start, why the hell would tsf have pacification immunity gr, jobs are deprecated anyway + #- Brigmedic + #- Cadet + #- Deputy + #- NFDetective + #- SeniorOfficer + #- Sheriff #mono end - SecurityGuard - StationRepresentative - StationTrafficController @@ -96,4 +96,4 @@ suffix: Panic Bunker, 100 components: - type: PacifiedZoneGenerator - radius: 100 \ No newline at end of file + radius: 100 diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/pda.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/pda.yml index 8d9f85a914a..83ce2002614 100644 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/pda.yml +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/pda.yml @@ -7,10 +7,10 @@ # SPDX-License-Identifier: MPL-2.0 - type: loadout - id: PDVRakhshanPDVRakhshanPDA + id: PDVRahkshanPDVRahkshanPDA price: 0 equipment: - id: PDVRakhshanPDA + id: PDVRahkshanPDA - type: loadout id: PDVGrandVizierPDVGrandVizierPDA diff --git a/Resources/Prototypes/_NF/Loadouts/pirates_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/pirates_loadout_groups.yml index ac715a5b628..7bddd080ead 100644 --- a/Resources/Prototypes/_NF/Loadouts/pirates_loadout_groups.yml +++ b/Resources/Prototypes/_NF/Loadouts/pirates_loadout_groups.yml @@ -12,13 +12,13 @@ - PirateMercenaryJumpsuit - type: loadoutGroup - id: RakhshanPDA + id: RahkshanPDA name: loadout-group-contractor-id hidden: true # No point in showing this, it gets auto-selected. loadouts: - - PDVRakhshanPDVRakhshanPDA + - PDVRahkshanPDVRahkshanPDA fallbacks: - - PDVRakhshanPDVRakhshanPDA + - PDVRahkshanPDVRahkshanPDA - type: loadoutGroup id: PirateFace diff --git a/Resources/Prototypes/_NF/Maps/debug.yml b/Resources/Prototypes/_NF/Maps/debug.yml index 3fcc74c1059..2b237160899 100644 --- a/Resources/Prototypes/_NF/Maps/debug.yml +++ b/Resources/Prototypes/_NF/Maps/debug.yml @@ -52,7 +52,7 @@ PDVGrandVizier: [ -1, -1] PDVAsvaran: [ -1, -1] PDVDenasvar: [ -1, -1] #Mono - PDVRakhshan: [ -1, -1] + PDVRahkshan: [ -1, -1] PDVInfiltrator: [ -1, -1] # Mono] TsfBorg: [ -1, -1 ] PdvBorg: [ -1, -1 ] diff --git a/Resources/Prototypes/_NF/StatusIcon/job.yml b/Resources/Prototypes/_NF/StatusIcon/job.yml index 1ad8604bc21..1cfff759fe3 100644 --- a/Resources/Prototypes/_NF/StatusIcon/job.yml +++ b/Resources/Prototypes/_NF/StatusIcon/job.yml @@ -35,10 +35,10 @@ - type: jobIcon parent: JobIcon - id: JobIconPDVRakhshan #Mono + id: JobIconPDVRahkshan #Mono icon: sprite: /Textures/_Mono/Interface/Misc/job_icons.rsi - state: PDVRakhshan + state: PDVRahkshan jobName: job-name-pdv-rahkshan - type: jobIcon From 9d23549f3387489703bc1d95873ac93a20537611 Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Mon, 13 Jul 2026 16:04:24 +0200 Subject: [PATCH 18/55] fard --- .../_Mono/Entities/Markers/Spawners/jobs.yml | 73 +++++++++++++++++++ .../_NF/Entities/Markers/Spawners/jobs.yml | 73 ------------------- 2 files changed, 73 insertions(+), 73 deletions(-) diff --git a/Resources/Prototypes/_Mono/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_Mono/Entities/Markers/Spawners/jobs.yml index 2ea1693a691..095893e8e49 100644 --- a/Resources/Prototypes/_Mono/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/_Mono/Entities/Markers/Spawners/jobs.yml @@ -48,6 +48,39 @@ - sprite: Mobs/Silicon/chassis.rsi state: robot_e +- type: entity + id: SpawnPointPDVRahkshan + parent: SpawnPointJobBase + name: PDV Rahkshan + components: + - type: SpawnPoint + job_id: PDVRahkshanIDCard + - type: Sprite + sprite: Structures/Decoration/banner.rsi + state: banner-red + +- type: entity + id: SpawnPointPDVAsvaran + parent: SpawnPointJobBase + name: PDV Asvaran + components: + - type: SpawnPoint + job_id: PDVAsvaran + - type: Sprite + sprite: Structures/Decoration/banner.rsi + state: banner-red + +- type: entity + id: SpawnPointPDVGrandVizier + parent: SpawnPointJobBase + name: PDV Grand Vizier + components: + - type: SpawnPoint + job_id: PDVGrandVizier + - type: Sprite + sprite: Structures/Decoration/banner.rsi + state: banner-red + #USSP - type: entity @@ -139,6 +172,46 @@ - sprite: Mobs/Silicon/chassis.rsi state: robot_e +- type: entity + id: SpawnPointSheriff + parent: SpawnPointHeadOfSecurity + name: sheriff + components: + - type: SpawnPoint + job_id: Sheriff + +- type: entity + id: SpawnPointBailiff + parent: SpawnPointWarden + name: bailiff + components: + - type: SpawnPoint + job_id: Bailiff + +- type: entity + id: NFSpawnPointSeniorOfficer + parent: SpawnPointWarden + name: sergeant + components: + - type: SpawnPoint + job_id: SeniorOfficer + +- type: entity + id: SpawnPointDeputy + parent: SpawnPointSecurityOfficer + name: deputy + components: + - type: SpawnPoint + job_id: Deputy + +- type: entity + id: SpawnPointCadet + parent: SpawnPointSecurityCadet + name: cadet + components: + - type: SpawnPoint + job_id: Cadet + # Viper Group - type: entity diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/jobs.yml index af79a345860..f72b75f479b 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/jobs.yml @@ -46,39 +46,6 @@ - state: green - state: pilot -- type: entity - id: SpawnPointPDVRahkshan - parent: SpawnPointJobBase - name: PDV Rahkshan - components: - - type: SpawnPoint - job_id: PDVRahkshanIDCard - - type: Sprite - sprite: Structures/Decoration/banner.rsi - state: banner-red - -- type: entity - id: SpawnPointPDVAsvaran - parent: SpawnPointJobBase - name: PDV Asvaran - components: - - type: SpawnPoint - job_id: PDVAsvaran - - type: Sprite - sprite: Structures/Decoration/banner.rsi - state: banner-red - -- type: entity - id: SpawnPointPDVGrandVizier - parent: SpawnPointJobBase - name: PDV Grand Vizier - components: - - type: SpawnPoint - job_id: PDVGrandVizier - - type: Sprite - sprite: Structures/Decoration/banner.rsi - state: banner-red - - type: entity id: SpawnPointStc parent: SpawnPointJobBase @@ -139,46 +106,6 @@ - type: SpawnPoint job_id: StationRepresentative -- type: entity - id: SpawnPointSheriff - parent: SpawnPointHeadOfSecurity - name: sheriff - components: - - type: SpawnPoint - job_id: Sheriff - -- type: entity - id: SpawnPointBailiff - parent: SpawnPointWarden - name: bailiff - components: - - type: SpawnPoint - job_id: Bailiff - -- type: entity - id: NFSpawnPointSeniorOfficer - parent: SpawnPointWarden - name: sergeant - components: - - type: SpawnPoint - job_id: SeniorOfficer - -- type: entity - id: SpawnPointDeputy - parent: SpawnPointSecurityOfficer - name: deputy - components: - - type: SpawnPoint - job_id: Deputy - -- type: entity - id: SpawnPointCadet - parent: SpawnPointSecurityCadet - name: cadet - components: - - type: SpawnPoint - job_id: Cadet - - type: entity id: NFSpawnPointDetective parent: SpawnPointDetective From df27edb7f4939e73721772155d59bebadff825ce Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Mon, 13 Jul 2026 16:57:39 +0200 Subject: [PATCH 19/55] i am fat and syupid --- .../Maps/_Mono/Supercapitals/chengdu.yml | 8 +-- Resources/Prototypes/Access/misc.yml | 4 +- .../_Mono/Catalogs/tsfmc_uplink_catalog.yml | 10 +-- .../_Mono/Entities/Markers/Spawners/jobs.yml | 72 ++++++++++++------- .../Loadouts/TSFMC/role_loadouts_tsfmc.yml | 12 ++-- .../Loadouts/civilian_playtime_groups.yml | 4 +- .../Supercapitals/chengdu.yml | 2 +- .../_Mono/PointsOfInterest/tsfmchalcyon.yml | 4 +- .../_Mono/Roles/Jobs/PDV/asvaran.yml | 2 +- .../_Mono/Roles/Jobs/PDV/rahkshan.yml | 6 +- .../_Mono/Roles/Jobs/PDV/tarkhan.yml | 2 +- .../Roles/Jobs/TSF/commandingofficer.yml | 4 +- .../_Mono/Roles/Jobs/TSF/corpsman.yml | 4 +- .../_Mono/Roles/Jobs/TSF/engineer.yml | 2 + .../_Mono/Roles/Jobs/TSF/marine.yml | 8 ++- .../_Mono/Roles/Jobs/TSF/officer.yml | 2 +- .../_Mono/Roles/Jobs/TSF/recruit.yml | 2 + .../_Mono/Roles/Jobs/TSF/teamleader.yml | 4 +- .../VendingMachines/Inventories/cart.yml | 11 ++- .../Prototypes/_NF/Mail/mailDeliveries.yml | 2 +- Resources/Prototypes/_NF/Maps/debug.yml | 2 +- Resources/Prototypes/_NF/StatusIcon/job.yml | 27 ++++--- .../Interface/Misc/job_icons.rsi/meta.json | 2 +- .../_Mono/Objects/Devices/pda.rsi/meta.json | 2 +- .../_Mono/Objects/Misc/id_cards.rsi/meta.json | 2 +- 25 files changed, 114 insertions(+), 86 deletions(-) diff --git a/Resources/Maps/_Mono/Supercapitals/chengdu.yml b/Resources/Maps/_Mono/Supercapitals/chengdu.yml index 8e158ce4547..e45a904290f 100644 --- a/Resources/Maps/_Mono/Supercapitals/chengdu.yml +++ b/Resources/Maps/_Mono/Supercapitals/chengdu.yml @@ -18157,7 +18157,7 @@ entities: - type: Transform pos: 0.5,-70.5 parent: 1 -- proto: NFSpawnPointSeniorOfficer +- proto: SpawnPointTsfTeamleader entities: - uid: 2689 components: @@ -20212,7 +20212,7 @@ entities: rot: 1.5707963267948966 rad pos: 10.5,-37.5 parent: 1 -- proto: SpawnPointBailiff +- proto: SpawnPointTsfOfficer entities: - uid: 3031 components: @@ -20306,7 +20306,7 @@ entities: - type: Transform pos: 9.5,-63.5 parent: 1 -- proto: SpawnPointDeputy +- proto: SpawnPointTsfMarine entities: - uid: 3049 components: @@ -20367,7 +20367,7 @@ entities: - type: Transform pos: 0.5,-57.5 parent: 1 -- proto: SpawnPointSheriff +- proto: SpawnPointTsfCommander entities: - uid: 3060 components: diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml index eaf80c3918f..abbbdf38eae 100644 --- a/Resources/Prototypes/Access/misc.yml +++ b/Resources/Prototypes/Access/misc.yml @@ -26,8 +26,8 @@ - Research - Service - StationTrafficController # Frontier - - Sergeant # Frontier - - Bailiff # Frontier +# - Sergeant # Frontier +# - Bailiff # Frontier - Maintenance - External - Janitor diff --git a/Resources/Prototypes/_Mono/Catalogs/tsfmc_uplink_catalog.yml b/Resources/Prototypes/_Mono/Catalogs/tsfmc_uplink_catalog.yml index 168ded2eacf..7eb07980462 100644 --- a/Resources/Prototypes/_Mono/Catalogs/tsfmc_uplink_catalog.yml +++ b/Resources/Prototypes/_Mono/Catalogs/tsfmc_uplink_catalog.yml @@ -91,8 +91,8 @@ - !type:BuyerJobCondition whitelist: - Brigmedic - - Bailiff - - Sheriff + - TsfOfficer + - TsfCommander - type: listing @@ -494,6 +494,6 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Sheriff - - Bailiff - - SeniorOfficer + - TsfCommander + - TsfOfficer + - TsfTeamleader diff --git a/Resources/Prototypes/_Mono/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_Mono/Entities/Markers/Spawners/jobs.yml index 095893e8e49..ba729922507 100644 --- a/Resources/Prototypes/_Mono/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/_Mono/Entities/Markers/Spawners/jobs.yml @@ -9,7 +9,7 @@ job_id: PDVDenasvar - type: Sprite sprite: Structures/Decoration/banner.rsi - state: banner-red + state: banner-yellow - type: entity id: SpawnPointPDVTarkhan @@ -20,7 +20,7 @@ job_id: PDVTarkhan - type: Sprite sprite: Structures/Decoration/banner.rsi - state: banner-red + state: banner-yellow - type: entity id: SpawnPointPDVInfiltrator @@ -31,7 +31,7 @@ job_id: PDVInfiltrator - type: Sprite sprite: Structures/Decoration/banner.rsi - state: banner-red + state: banner-yellow - type: entity id: SpawnPointPDVBorg @@ -57,7 +57,7 @@ job_id: PDVRahkshanIDCard - type: Sprite sprite: Structures/Decoration/banner.rsi - state: banner-red + state: banner-yellow - type: entity id: SpawnPointPDVAsvaran @@ -68,7 +68,7 @@ job_id: PDVAsvaran - type: Sprite sprite: Structures/Decoration/banner.rsi - state: banner-red + state: banner-yellow - type: entity id: SpawnPointPDVGrandVizier @@ -79,7 +79,7 @@ job_id: PDVGrandVizier - type: Sprite sprite: Structures/Decoration/banner.rsi - state: banner-red + state: banner-yellow #USSP @@ -173,44 +173,64 @@ state: robot_e - type: entity - id: SpawnPointSheriff - parent: SpawnPointHeadOfSecurity - name: sheriff + id: SpawnPointTsfCommander + parent: SpawnPointJobBase + name: Tsf Commanding Officer components: - type: SpawnPoint - job_id: Sheriff + job_id: TsfCommander + - type: Sprite + layers: + - sprite: _NF/Structures/Decoration/banner.rsi + state: nfsd-banner - type: entity - id: SpawnPointBailiff - parent: SpawnPointWarden - name: bailiff + id: SpawnPointTsfOfficer + parent: SpawnPointJobBase + name: Tsf Officer components: - type: SpawnPoint - job_id: Bailiff + job_id: TsfOfficer + - type: Sprite + layers: + - sprite: _NF/Structures/Decoration/banner.rsi + state: nfsd-banner - type: entity - id: NFSpawnPointSeniorOfficer - parent: SpawnPointWarden - name: sergeant + id: SpawnPointTsfTeamleader + parent: SpawnPointJobBase + name: Tsf Fireteam Leader components: - type: SpawnPoint - job_id: SeniorOfficer + job_id: TsfTeamleader + - type: Sprite + layers: + - sprite: _NF/Structures/Decoration/banner.rsi + state: nfsd-banner - type: entity - id: SpawnPointDeputy - parent: SpawnPointSecurityOfficer - name: deputy + id: SpawnPointTsfMarine + parent: SpawnPointJobBase + name: Tsf Marine components: - type: SpawnPoint - job_id: Deputy + job_id: TsfMarine + - type: Sprite + layers: + - sprite: _NF/Structures/Decoration/banner.rsi + state: nfsd-banner - type: entity - id: SpawnPointCadet - parent: SpawnPointSecurityCadet - name: cadet + id: SpawnPointTsfRecruit + parent: SpawnPointJobBase + name: Tsf Recruit components: - type: SpawnPoint - job_id: Cadet + job_id: TsfRecruit + - type: Sprite + layers: + - sprite: _NF/Structures/Decoration/banner.rsi + state: nfsd-banner # Viper Group diff --git a/Resources/Prototypes/_Mono/Loadouts/TSFMC/role_loadouts_tsfmc.yml b/Resources/Prototypes/_Mono/Loadouts/TSFMC/role_loadouts_tsfmc.yml index b82ce202e04..1121bba0724 100644 --- a/Resources/Prototypes/_Mono/Loadouts/TSFMC/role_loadouts_tsfmc.yml +++ b/Resources/Prototypes/_Mono/Loadouts/TSFMC/role_loadouts_tsfmc.yml @@ -15,7 +15,7 @@ - TsfmcBelt - TsfmcEars - NfsdBoxSurvival - - CadetPDA + - TSFRecruitPDA - ContractorWallet - ContractorCartridge # - ContractorImplanter # Mono - TSF has a skill issue sometimes @@ -45,7 +45,7 @@ - TsfmcBelt - TsfmcEars - NfsdBoxSurvival - - DeputyPDA + - TSFMarinePDA - ContractorWallet - ContractorCartridge - ContractorEncryptionKey @@ -76,7 +76,7 @@ - TsfmcBrigmedicBelt - TsfmcEars - NfsdBoxSurvival - - BrigmedicPDA + - TSFCorpsmanPDA - ContractorWallet - ContractorCartridge - ContractorEncryptionKey @@ -107,7 +107,7 @@ - TsfmcBelt - TsfmcEarsSenior - NfsdBoxSurvival - - BailiffPDA + - TSFOfficerPDA - ContractorWallet - ContractorCartridge - ContractorEncryptionKey @@ -138,7 +138,7 @@ - TsfmcBelt - TsfmcEarsSenior - NfsdBoxSurvival - - SeniorOfficerPDA + - TSFTeamleaderPDA - ContractorWallet - ContractorCartridge - ContractorEncryptionKey @@ -169,7 +169,7 @@ - TsfmcBelt - TsfmcEarsCommander - NfsdBoxSurvival - - SheriffPDA + - TSFCommanderPDA - ContractorWallet - ContractorCartridge - ContractorFun diff --git a/Resources/Prototypes/_Mono/Loadouts/civilian_playtime_groups.yml b/Resources/Prototypes/_Mono/Loadouts/civilian_playtime_groups.yml index ca61f770b32..08cd2851425 100644 --- a/Resources/Prototypes/_Mono/Loadouts/civilian_playtime_groups.yml +++ b/Resources/Prototypes/_Mono/Loadouts/civilian_playtime_groups.yml @@ -4,7 +4,7 @@ - !type:JobRequirementLoadoutEffect requirement: !type:DepartmentTimeRequirement - department: Security + department: Tsf time: 180000 # 50 hrs - type: loadoutEffectGroup @@ -22,7 +22,7 @@ - !type:JobRequirementLoadoutEffect requirement: !type:DepartmentTimeRequirement - department: Antag + department: Pdv time: 180000 # 50 hrs - type: loadoutEffectGroup diff --git a/Resources/Prototypes/_Mono/PointsOfInterest/Supercapitals/chengdu.yml b/Resources/Prototypes/_Mono/PointsOfInterest/Supercapitals/chengdu.yml index c5aa5d3d151..e73f132ec29 100644 --- a/Resources/Prototypes/_Mono/PointsOfInterest/Supercapitals/chengdu.yml +++ b/Resources/Prototypes/_Mono/PointsOfInterest/Supercapitals/chengdu.yml @@ -42,7 +42,7 @@ lobbySortOrder: 2 - type: StationJobs availableJobs: - Sheriff: [ 0, 1 ] + TsfCommander [ 0, 1 ] Bailiff: [ 0, 1 ] SeniorOfficer: [ 0, 2 ] Brigmedic: [ 0, 2 ] diff --git a/Resources/Prototypes/_Mono/PointsOfInterest/tsfmchalcyon.yml b/Resources/Prototypes/_Mono/PointsOfInterest/tsfmchalcyon.yml index 6a97ce36375..6a21da42635 100644 --- a/Resources/Prototypes/_Mono/PointsOfInterest/tsfmchalcyon.yml +++ b/Resources/Prototypes/_Mono/PointsOfInterest/tsfmchalcyon.yml @@ -50,7 +50,7 @@ lobbySortOrder: 2 - type: StationJobs availableJobs: - Sheriff: [ 1, 1 ] + TsfCommander [ 1, 1 ] Bailiff: [1, 1 ] SeniorOfficer: [ 3, 3 ] # Mono Brigmedic: [ 2, 2 ] # Mono @@ -106,7 +106,7 @@ lobbySortOrder: 2 - type: StationJobs availableJobs: - Sheriff: [ 1, 1 ] + TsfCommander [ 1, 1 ] TsfMarsoc: [ 3, 3 ] Bailiff: [ 3, 3 ] SeniorOfficer: [ 6, 6 ] # Mono diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/asvaran.yml b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/asvaran.yml index d02af6b4272..56e5277e8cd 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/asvaran.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/asvaran.yml @@ -21,7 +21,7 @@ assignedCompany: PDV setPreference: true access: - - Pirate + - PDVGeneral - PDVCommand - Mercenary accessGroups: diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/rahkshan.yml b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/rahkshan.yml index eb3c8b62cd9..c57eb59e198 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/rahkshan.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/rahkshan.yml @@ -1,7 +1,7 @@ - type: job - id: Pirate + id: PDVRahkshan name: job-name-pdv-Rahkshan - description: job-description-pirate + description: job-description-pdv-rahkshan playTimeTracker: JobPdvRahkshan requirements: - !type:OverallPlaytimeRequirement @@ -17,7 +17,7 @@ assignedCompany: PDV setPreference: true access: - - Pirate + - PDVGeneral - Mercenary accessGroups: - GeneralAccess diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/tarkhan.yml b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/tarkhan.yml index 35917a4a44e..d76a4357850 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/tarkhan.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/tarkhan.yml @@ -19,7 +19,7 @@ canBeAntag: false setPreference: true access: - - Pirate + - PDVGeneral - GrandVizier - PDVCommand - Mercenary diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/commandingofficer.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/commandingofficer.yml index 1cd7e44f172..86e514d6cc9 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/commandingofficer.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/commandingofficer.yml @@ -27,7 +27,9 @@ - TsfCommander - TsfOfficer - TsfFtl - - TsfGeneral #Mono End + - TsfGeneral + accessGroups: + - GeneralAccess special: - !type:AddComponentSpecial components: diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/corpsman.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/corpsman.yml index 9d07853b90c..870c7bd98ec 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/corpsman.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/corpsman.yml @@ -20,10 +20,12 @@ displayWeight: 35 assignedCompany: TSF canBeAntag: false - accessGroups: + access: - TsfGeneral - Medical - Chemistry + accessGroups: + - GeneralAccess special: - !type:AddComponentSpecial components: diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/engineer.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/engineer.yml index dc0fe61d6ef..636e24f6a83 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/engineer.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/engineer.yml @@ -20,6 +20,8 @@ - TsfmcEngineering - TsfGeneral - TsfFtl + accessGroups: + - GeneralAccess special: - !type:AddComponentSpecial components: diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/marine.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/marine.yml index 670cf96e750..40bb64e780d 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/marine.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/marine.yml @@ -7,14 +7,16 @@ - !type:OverallPlaytimeRequirement time: 36000 # 10 hours startingGear: DeputyGear - icon: JobIconDeputy - supervisors: job-supervisors-sergeant + icon: JobIconTSFMarine + supervisors: job-supervisors-tsf weight: 130 displayWeight: 40 assignedCompany: TSF canBeAntag: false - accessGroups: + access: - TsfGeneral + accessGroups: + - GeneralAccess special: - !type:AddComponentSpecial components: diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/officer.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/officer.yml index dcdbf1f0058..ceb19aa40d5 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/officer.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/officer.yml @@ -26,7 +26,7 @@ - TsfFtl - TsfmcEngineering # Mono accessGroups: - - GeneralNfsdAccess + - GeneralAccess special: - !type:AddComponentSpecial components: diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/recruit.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/recruit.yml index 7dc8290df28..66ada00231b 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/recruit.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/recruit.yml @@ -20,6 +20,8 @@ setPreference: false # mono access: - TsfGeneral + accessGroups: + - GeneralAccess special: - !type:AddComponentSpecial components: diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/teamleader.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/teamleader.yml index d15141fe897..d449bad4091 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/teamleader.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/teamleader.yml @@ -10,7 +10,7 @@ department: Tsf time: 36000 # 10 hours # mono startingGear: SeniorOfficerGear - icon: JobIconSergeant + icon: JobIconTsfTeamLeader supervisors: job-supervisors-tsf-teamleader weight: 140 displayWeight: 50 @@ -20,6 +20,8 @@ - TsfGeneral - TsfFtl - TsfmcEngineering + accessGroups: + - GeneralAccess special: - !type:AddComponentSpecial components: diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cart.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cart.yml index 5ca156df2d2..0b2b4461051 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cart.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cart.yml @@ -33,14 +33,11 @@ - type: vendingMachineInventory id: NFPTechNfsdInventory startingInventory: - CadetPDA: 10 - DeputyPDA: 10 + TSFRecruitPDA: 10 + TSFMarinePDA: 10 TSFCorpsmanPDA: 10 - NFDetectivePDA: 10 - SergeantPDA: 10 - BailiffPDA: 10 - ClearNFPDA: 4294967295 #infinite - ContractorIDCard: 4294967295 #infinite + TSFTeamleaderPDA: 10 + TSFOfficerPDA: 10 ClothingHeadsetPrison: 4294967295 #infinite RubberStampApproved: 4294967295 #Infinite RubberStampDenied: 4294967295 #Infinite diff --git a/Resources/Prototypes/_NF/Mail/mailDeliveries.yml b/Resources/Prototypes/_NF/Mail/mailDeliveries.yml index 7dd1fbc8661..7fcf574a1cf 100644 --- a/Resources/Prototypes/_NF/Mail/mailDeliveries.yml +++ b/Resources/Prototypes/_NF/Mail/mailDeliveries.yml @@ -116,7 +116,7 @@ MailCommandNFWristwatchGold: 0.5 MailStationRepNFClurger: 0.5 MailStationRepNFNukeDisk: 1 - Sheriff: + TsfCommander MailSecurityNonlethalsKit: 2 MailNFGoldCigars: 0.15 # 0.2 weight total MailCommandNFPlatinumCigars: 0.1 diff --git a/Resources/Prototypes/_NF/Maps/debug.yml b/Resources/Prototypes/_NF/Maps/debug.yml index 2b237160899..d779c00562d 100644 --- a/Resources/Prototypes/_NF/Maps/debug.yml +++ b/Resources/Prototypes/_NF/Maps/debug.yml @@ -47,7 +47,7 @@ Brigmedic: [ -1, -1] # NFDetective: [ -1, -1] Mono Deputy: [ -1, -1] - # Cadet: [ -1, -1] Mono + # TsfRecruit [ -1, -1] Mono # PublicAffairsLiaison: [ -1, -1] Mono PDVGrandVizier: [ -1, -1] PDVAsvaran: [ -1, -1] diff --git a/Resources/Prototypes/_NF/StatusIcon/job.yml b/Resources/Prototypes/_NF/StatusIcon/job.yml index 1cfff759fe3..72da2e18230 100644 --- a/Resources/Prototypes/_NF/StatusIcon/job.yml +++ b/Resources/Prototypes/_NF/StatusIcon/job.yml @@ -128,49 +128,48 @@ parent: JobIcon id: JobIconTSFRecruit #Mono icon: - sprite: /Textures/_NF/Interface/Misc/job_icons.rsi - state: tsfrecruit + sprite: /Textures/_Mono/Interface/Misc/job_icons.rsi + state: TSFRecruit jobName: job-name-tsf-recruit - type: jobIcon parent: JobIcon id: JobIconTSFMarine #Mono icon: - sprite: /Textures/_NF/Interface/Misc/job_icons.rsi - state: tsfmarine + sprite: /Textures/_Mono/Interface/Misc/job_icons.rsi + state: TSFMarine jobName: job-name-tsf-marine - - type: jobIcon parent: JobIcon id: JobIconTSFCorpsman #Mono icon: - sprite: /Textures/_NF/Interface/Misc/job_icons.rsi - state: tsfcorpsman + sprite: /Textures/_Mono/Interface/Misc/job_icons.rsi + state: TSFCorpsman jobName: job-name-tsf-corpsman - type: jobIcon parent: JobIcon - id: JobIconSergeant + id: JobIconTsfTeamLeader icon: - sprite: /Textures/_NF/Interface/Misc/job_icons.rsi - state: tsfteamleader + sprite: /Textures/_Mono/Interface/Misc/job_icons.rsi + state: TSFTeamleader jobName: job-name-tsf-teamleader - type: jobIcon parent: JobIcon id: JobIconTSFOfficer #mono icon: - sprite: /Textures/_NF/Interface/Misc/job_icons.rsi - state: tsfofficer + sprite: /Textures/_Mono/Interface/Misc/job_icons.rsi + state: TSFOfficer jobName: job-name-tsf-officer - type: jobIcon parent: JobIcon id: JobIconTSFCommander #Mono icon: - sprite: /Textures/_NF/Interface/Misc/job_icons.rsi - state: tsfcommander + sprite: /Textures/_Mono/Interface/Misc/job_icons.rsi + state: TSFCommander jobName: job-name-tsf-commandingofficer # allowSelection: false # Frontier: no impersonating command staff, literally 1984 - Mono Revert diff --git a/Resources/Textures/_Mono/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/_Mono/Interface/Misc/job_icons.rsi/meta.json index 9b278e4ce50..9acf442ea91 100644 --- a/Resources/Textures/_Mono/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/_Mono/Interface/Misc/job_icons.rsi/meta.json @@ -42,7 +42,7 @@ "name": "PDVInfiltrator" }, { - "name": "PDVRakhshan" + "name": "PDVRahkshan" }, { "name": "PDVVizier" diff --git a/Resources/Textures/_Mono/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/_Mono/Objects/Devices/pda.rsi/meta.json index 2c354846bd1..3cc359cdf54 100644 --- a/Resources/Textures/_Mono/Objects/Devices/pda.rsi/meta.json +++ b/Resources/Textures/_Mono/Objects/Devices/pda.rsi/meta.json @@ -45,7 +45,7 @@ "name": "pda-tarkhan" }, { - "name": "pda-rakhshan" + "name": "pda-rahkshan" }, { "name": "pda-denasvar" diff --git a/Resources/Textures/_Mono/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/_Mono/Objects/Misc/id_cards.rsi/meta.json index 6e94e021c75..2be687ab409 100644 --- a/Resources/Textures/_Mono/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/_Mono/Objects/Misc/id_cards.rsi/meta.json @@ -20,7 +20,7 @@ "name": "id_asvaran" }, { - "name": "id_rakhshan" + "name": "id_rahkshan" }, { "name": "id_vizier" From a6f51469c4463c6111aaea66db4dfaab6822a1b1 Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Mon, 13 Jul 2026 17:06:03 +0200 Subject: [PATCH 20/55] evil not consistent file name of doom and despair --- .../{PDVRakhshan.png => PDVRahkshan.png} | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename Resources/Textures/_Mono/Interface/Misc/job_icons.rsi/{PDVRakhshan.png => PDVRahkshan.png} (100%) diff --git a/Resources/Textures/_Mono/Interface/Misc/job_icons.rsi/PDVRakhshan.png b/Resources/Textures/_Mono/Interface/Misc/job_icons.rsi/PDVRahkshan.png similarity index 100% rename from Resources/Textures/_Mono/Interface/Misc/job_icons.rsi/PDVRakhshan.png rename to Resources/Textures/_Mono/Interface/Misc/job_icons.rsi/PDVRahkshan.png From 6627695f2527c156d288cebd80dd65883fb52742 Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Mon, 13 Jul 2026 17:11:16 +0200 Subject: [PATCH 21/55] more evuil named files --- .../pda.rsi/{pda-rakhshan.png => pda-rahkshan.png} | Bin .../{id_rakhshan.png => id_rahkshan.png} | Bin 2 files changed, 0 insertions(+), 0 deletions(-) rename Resources/Textures/_Mono/Objects/Devices/pda.rsi/{pda-rakhshan.png => pda-rahkshan.png} (100%) rename Resources/Textures/_Mono/Objects/Misc/id_cards.rsi/{id_rakhshan.png => id_rahkshan.png} (100%) diff --git a/Resources/Textures/_Mono/Objects/Devices/pda.rsi/pda-rakhshan.png b/Resources/Textures/_Mono/Objects/Devices/pda.rsi/pda-rahkshan.png similarity index 100% rename from Resources/Textures/_Mono/Objects/Devices/pda.rsi/pda-rakhshan.png rename to Resources/Textures/_Mono/Objects/Devices/pda.rsi/pda-rahkshan.png diff --git a/Resources/Textures/_Mono/Objects/Misc/id_cards.rsi/id_rakhshan.png b/Resources/Textures/_Mono/Objects/Misc/id_cards.rsi/id_rahkshan.png similarity index 100% rename from Resources/Textures/_Mono/Objects/Misc/id_cards.rsi/id_rakhshan.png rename to Resources/Textures/_Mono/Objects/Misc/id_cards.rsi/id_rahkshan.png From 5f564e7894b92a17eeebb7dae968983bde109977 Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Mon, 13 Jul 2026 17:16:45 +0200 Subject: [PATCH 22/55] ah cannae foken type roight mate --- .../_Mono/PointsOfInterest/tsfmchalcyon.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/Resources/Prototypes/_Mono/PointsOfInterest/tsfmchalcyon.yml b/Resources/Prototypes/_Mono/PointsOfInterest/tsfmchalcyon.yml index 6a21da42635..48abd006352 100644 --- a/Resources/Prototypes/_Mono/PointsOfInterest/tsfmchalcyon.yml +++ b/Resources/Prototypes/_Mono/PointsOfInterest/tsfmchalcyon.yml @@ -50,16 +50,15 @@ lobbySortOrder: 2 - type: StationJobs availableJobs: - TsfCommander [ 1, 1 ] - Bailiff: [1, 1 ] - SeniorOfficer: [ 3, 3 ] # Mono + TsfCommander: [ 1, 1 ] + TsfOfficer: [1, 1 ] + TsfTeamleader: [ 3, 3 ] # Mono Brigmedic: [ 2, 2 ] # Mono - Deputy: [ -1, -1 ] # Mono + TsfMarine: [ -1, -1 ] # Mono TsfEngineer: [ 2, 2 ] TsfBorg: [ 2, 2 ] tags: - - HeadOfPersonnel - - HeadOfSecurity + - CentralCommand - type: StationDeadDropReporting messageSet: Nfsd - type: StationDeadDropHintExempt @@ -106,12 +105,12 @@ lobbySortOrder: 2 - type: StationJobs availableJobs: - TsfCommander [ 1, 1 ] + TsfCommander: [ 1, 1 ] TsfMarsoc: [ 3, 3 ] - Bailiff: [ 3, 3 ] - SeniorOfficer: [ 6, 6 ] # Mono + TsfOfficer: [ 3, 3 ] + TsfTeamleader: [ 6, 6 ] # Mono Brigmedic: [ 4, 4 ] # Mono - Deputy: [ -1, -1 ] # Mono + TsfMarine: [ -1, -1 ] # Mono TsfEngineer: [ 4, 4 ] TsfBorg: [ 2, 2 ] tags: From 03ce77746b170918fb9a716ac412f9703cff31e0 Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Mon, 13 Jul 2026 17:19:16 +0200 Subject: [PATCH 23/55] anger --- .../_Mono/PointsOfInterest/Supercapitals/chengdu.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/_Mono/PointsOfInterest/Supercapitals/chengdu.yml b/Resources/Prototypes/_Mono/PointsOfInterest/Supercapitals/chengdu.yml index e73f132ec29..ce9934c103f 100644 --- a/Resources/Prototypes/_Mono/PointsOfInterest/Supercapitals/chengdu.yml +++ b/Resources/Prototypes/_Mono/PointsOfInterest/Supercapitals/chengdu.yml @@ -42,11 +42,11 @@ lobbySortOrder: 2 - type: StationJobs availableJobs: - TsfCommander [ 0, 1 ] - Bailiff: [ 0, 1 ] - SeniorOfficer: [ 0, 2 ] + TsfCommander: [ 0, 1 ] + TsfOfficer: [ 0, 1 ] + TsfTeamleader: [ 0, 2 ] Brigmedic: [ 0, 2 ] - Deputy: [ 0, -1 ] + TsfMarine: [ 0, -1 ] TsfEngineer: [ 0, 2 ] TsfBorg: [ 0, 2 ] tags: From de85f32bcda5a8d68b2ec2b91268f52f6b662d7e Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Mon, 13 Jul 2026 17:33:57 +0200 Subject: [PATCH 24/55] the evil colon i forgort: --- Resources/Prototypes/_NF/Mail/mailDeliveries.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Mail/mailDeliveries.yml b/Resources/Prototypes/_NF/Mail/mailDeliveries.yml index 7fcf574a1cf..f56e0b8daad 100644 --- a/Resources/Prototypes/_NF/Mail/mailDeliveries.yml +++ b/Resources/Prototypes/_NF/Mail/mailDeliveries.yml @@ -116,7 +116,7 @@ MailCommandNFWristwatchGold: 0.5 MailStationRepNFClurger: 0.5 MailStationRepNFNukeDisk: 1 - TsfCommander + TsfCommander: MailSecurityNonlethalsKit: 2 MailNFGoldCigars: 0.15 # 0.2 weight total MailCommandNFPlatinumCigars: 0.1 From 94b318f7bd64ecb5daf5bfb13bbf0af2be963330 Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Mon, 13 Jul 2026 17:52:31 +0200 Subject: [PATCH 25/55] changed job ids in shipyard and poi files and renamed all spawnpoints accordinggly in map files --- Resources/Maps/_Mono/POI/tsfmchalcyon.yml | 10 +++++----- Resources/Maps/_Mono/POI/tsfmchalcyon_hw.yml | 10 +++++----- Resources/Maps/_Mono/Supercapitals/chengdu.yml | 2 +- Resources/Maps/_Mono/Test/dev_map.yml | 12 ++++++------ Resources/Maps/_NF/POI/tsfmc.yml | 12 ++++++------ Resources/Maps/_NF/Test/dev_map.yml | 12 ++++++------ .../Entities/Markers/Spawners/jobs.yml | 4 ++-- Resources/Prototypes/Roles/Jobs/departments.yml | 16 ++++++++-------- .../_Mono/Shipyard/Capitals/flyssa.yml | 2 +- .../Prototypes/_Mono/Shipyard/Nfsd/aldebaran.yml | 2 +- .../Prototypes/_Mono/Shipyard/Nfsd/altair.yml | 2 +- .../Prototypes/_Mono/Shipyard/Nfsd/andromeda.yml | 2 +- .../Prototypes/_Mono/Shipyard/Nfsd/calypso.yml | 2 +- .../Prototypes/_Mono/Shipyard/Nfsd/dagger.yml | 2 +- .../Prototypes/_Mono/Shipyard/Nfsd/fracture.yml | 2 +- .../Prototypes/_Mono/Shipyard/Nfsd/hoplite.yml | 2 +- .../Prototypes/_Mono/Shipyard/Nfsd/jaguar.yml | 2 +- .../Prototypes/_Mono/Shipyard/Nfsd/mercury.yml | 2 +- .../Prototypes/_Mono/Shipyard/Nfsd/ocelot.yml | 2 +- .../Prototypes/_Mono/Shipyard/Nfsd/polaris.yml | 2 +- .../Prototypes/_Mono/Shipyard/Nfsd/sentinel.yml | 2 +- .../Prototypes/_Mono/Shipyard/Nfsd/shiv.yml | 2 +- .../Prototypes/_Mono/Shipyard/Nfsd/spekter.yml | 2 +- .../Prototypes/_Mono/Shipyard/Nfsd/spica.yml | 2 +- .../Prototypes/_Mono/Shipyard/Nfsd/syringe.yml | 2 +- .../Prototypes/_Mono/Shipyard/Nfsd/tarantula.yml | 2 +- .../Prototypes/_Mono/Shipyard/Nfsd/tumour.yml | 2 +- .../Prototypes/_Mono/Shipyard/Nfsd/welder.yml | 2 +- .../Prototypes/_NF/Loadouts/Jobs/Deputy/pda.yml | 5 ++--- Resources/Prototypes/_NF/Maps/debug.yml | 2 +- .../_Mono/Shuttles/Capitals/flyssa.yml | 2 +- 31 files changed, 63 insertions(+), 64 deletions(-) diff --git a/Resources/Maps/_Mono/POI/tsfmchalcyon.yml b/Resources/Maps/_Mono/POI/tsfmchalcyon.yml index 2efcdaf7c4a..5fc3c7d8cc1 100644 --- a/Resources/Maps/_Mono/POI/tsfmchalcyon.yml +++ b/Resources/Maps/_Mono/POI/tsfmchalcyon.yml @@ -50495,7 +50495,7 @@ entities: rot: -1.5707963267948966 rad pos: 15.5,-14.5 parent: 1 -- proto: SpawnPointBailiff +- proto: SpawnPointTsfOfficer entities: - uid: 7664 components: @@ -50507,7 +50507,7 @@ entities: - type: Transform pos: -4.5,19.5 parent: 1 -- proto: SpawnPointBrigmedic +- proto: SpawnPointTsfCorpsman entities: - uid: 7666 components: @@ -50519,7 +50519,7 @@ entities: - type: Transform pos: 28.5,-12.5 parent: 1 -- proto: SpawnPointCadet +- proto: SpawnPointTsfRecruit entities: - uid: 7668 components: @@ -50546,7 +50546,7 @@ entities: - type: Transform pos: 24.5,14.5 parent: 1 -- proto: SpawnPointDeputy +- proto: SpawnPointTsfMarine entities: - uid: 7673 components: @@ -50581,7 +50581,7 @@ entities: rot: 3.141592653589793 rad pos: 14.5,8.5 parent: 1 -- proto: SpawnPointSheriff +- proto: SpawnPointTsfCommander entities: - uid: 7679 components: diff --git a/Resources/Maps/_Mono/POI/tsfmchalcyon_hw.yml b/Resources/Maps/_Mono/POI/tsfmchalcyon_hw.yml index a169b83a2a8..59c9a5f29f2 100644 --- a/Resources/Maps/_Mono/POI/tsfmchalcyon_hw.yml +++ b/Resources/Maps/_Mono/POI/tsfmchalcyon_hw.yml @@ -50593,7 +50593,7 @@ entities: rot: -1.5707963267948966 rad pos: 15.5,-14.5 parent: 1 -- proto: SpawnPointBailiff +- proto: SpawnPointTsfOfficer entities: - uid: 7664 components: @@ -50605,7 +50605,7 @@ entities: - type: Transform pos: -4.5,19.5 parent: 1 -- proto: SpawnPointBrigmedic +- proto: SpawnPointTsfCorpsman entities: - uid: 7666 components: @@ -50617,7 +50617,7 @@ entities: - type: Transform pos: 28.5,-12.5 parent: 1 -- proto: SpawnPointCadet +- proto: SpawnPointTsfRecruit entities: - uid: 7668 components: @@ -50644,7 +50644,7 @@ entities: - type: Transform pos: 24.5,14.5 parent: 1 -- proto: SpawnPointDeputy +- proto: SpawnPointTsfMarine entities: - uid: 7673 components: @@ -50679,7 +50679,7 @@ entities: rot: 3.141592653589793 rad pos: 14.5,8.5 parent: 1 -- proto: SpawnPointSheriff +- proto: SpawnPointTsfCommander entities: - uid: 7679 components: diff --git a/Resources/Maps/_Mono/Supercapitals/chengdu.yml b/Resources/Maps/_Mono/Supercapitals/chengdu.yml index e45a904290f..147cee66a25 100644 --- a/Resources/Maps/_Mono/Supercapitals/chengdu.yml +++ b/Resources/Maps/_Mono/Supercapitals/chengdu.yml @@ -20259,7 +20259,7 @@ entities: - type: Transform pos: 9.5,-63.5 parent: 1 -- proto: SpawnPointBrigmedic +- proto: SpawnPointTsfCorpsman entities: - uid: 3040 components: diff --git a/Resources/Maps/_Mono/Test/dev_map.yml b/Resources/Maps/_Mono/Test/dev_map.yml index c3f3b7a0dff..dd1465a1dc3 100644 --- a/Resources/Maps/_Mono/Test/dev_map.yml +++ b/Resources/Maps/_Mono/Test/dev_map.yml @@ -6346,7 +6346,7 @@ entities: - type: Transform pos: -4.5,2.5 parent: 2 -- proto: NFSpawnPointSeniorOfficer +- proto: SpawnPointTsfTeamleader entities: - uid: 917 components: @@ -7719,7 +7719,7 @@ entities: - type: Transform pos: 3.5,7.5 parent: 2 -- proto: SpawnPointBailiff +- proto: SpawnPointTsfOfficer entities: - uid: 1120 components: @@ -7733,14 +7733,14 @@ entities: - type: Transform pos: -5.5,2.5 parent: 2 -- proto: SpawnPointBrigmedic +- proto: SpawnPointTsfCorpsman entities: - uid: 1122 components: - type: Transform pos: -4.5,2.5 parent: 2 -- proto: SpawnPointCadet +- proto: SpawnPointTsfRecruit entities: - uid: 1123 components: @@ -7761,7 +7761,7 @@ entities: - type: Transform pos: -4.5,2.5 parent: 2 -- proto: SpawnPointDeputy +- proto: SpawnPointTsfMarine entities: - uid: 1125 components: @@ -7936,7 +7936,7 @@ entities: - type: Transform pos: -4.5,2.5 parent: 2 -- proto: SpawnPointSheriff +- proto: SpawnPointTsfCommander entities: - uid: 1149 components: diff --git a/Resources/Maps/_NF/POI/tsfmc.yml b/Resources/Maps/_NF/POI/tsfmc.yml index bd89ceebba7..664c9767144 100644 --- a/Resources/Maps/_NF/POI/tsfmc.yml +++ b/Resources/Maps/_NF/POI/tsfmc.yml @@ -16013,7 +16013,7 @@ entities: - type: Transform pos: 17.5,-6.5 parent: 1 -- proto: NFSpawnPointSeniorOfficer +- proto: SpawnPointTsfTeamleader entities: - uid: 2275 components: @@ -17786,14 +17786,14 @@ entities: - type: Transform pos: 6.5,7.5 parent: 1 -- proto: SpawnPointBailiff +- proto: SpawnPointTsfOfficer entities: - uid: 2562 components: - type: Transform pos: 16.5,12.5 parent: 1 -- proto: SpawnPointBrigmedic +- proto: SpawnPointTsfCorpsman entities: - uid: 2563 components: @@ -17805,7 +17805,7 @@ entities: - type: Transform pos: 16.5,11.5 parent: 1 -- proto: SpawnPointCadet +- proto: SpawnPointTsfRecruit entities: - uid: 2565 components: @@ -17827,7 +17827,7 @@ entities: - type: Transform pos: 14.5,13.5 parent: 1 -- proto: SpawnPointDeputy +- proto: SpawnPointTsfMarine entities: - uid: 2569 components: @@ -17881,7 +17881,7 @@ entities: - type: Transform pos: -26.5,1.5 parent: 1 -- proto: SpawnPointSheriff +- proto: SpawnPointTsfCommander entities: - uid: 2579 components: diff --git a/Resources/Maps/_NF/Test/dev_map.yml b/Resources/Maps/_NF/Test/dev_map.yml index d1c91e27505..4735a3f4a4f 100644 --- a/Resources/Maps/_NF/Test/dev_map.yml +++ b/Resources/Maps/_NF/Test/dev_map.yml @@ -5760,7 +5760,7 @@ entities: - type: Transform pos: -3.5,2.5 parent: 179 -- proto: NFSpawnPointSeniorOfficer +- proto: SpawnPointTsfTeamleader entities: - uid: 382 components: @@ -7064,7 +7064,7 @@ entities: - type: Transform pos: 3.5,7.5 parent: 179 -- proto: SpawnPointBailiff +- proto: SpawnPointTsfOfficer entities: - uid: 1482 components: @@ -7078,14 +7078,14 @@ entities: - type: Transform pos: -4.5,2.5 parent: 179 -- proto: SpawnPointBrigmedic +- proto: SpawnPointTsfCorpsman entities: - uid: 1483 components: - type: Transform pos: -3.5,2.5 parent: 179 -- proto: SpawnPointCadet +- proto: SpawnPointTsfRecruit entities: - uid: 1484 components: @@ -7099,7 +7099,7 @@ entities: - type: Transform pos: -3.5,2.5 parent: 179 -- proto: SpawnPointDeputy +- proto: SpawnPointTsfMarine entities: - uid: 1486 components: @@ -7239,7 +7239,7 @@ entities: - type: Transform pos: -3.5,2.5 parent: 179 -- proto: SpawnPointSheriff +- proto: SpawnPointTsfCommander entities: - uid: 1455 components: diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml index a47ccb78c0e..6df6277e0b0 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml @@ -522,7 +522,7 @@ - state: detective - type: entity - id: SpawnPointBrigmedic + id: SpawnPointTsfCorpsman parent: SpawnPointJobBase name: brigmedic components: @@ -646,4 +646,4 @@ - type: Sprite layers: - state: green - - state: zookeeper \ No newline at end of file + - state: zookeeper diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 3c517fdc0ba..ca9e2a913e3 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -119,15 +119,15 @@ - Brigmedic # Frontier # - SecurityGuard # Frontier - NFDetective # Frontier - - Cadet # Frontier - - Deputy # Frontier - - Bailiff # Frontier - - Sheriff # Frontier - - SeniorOfficer # Frontier +# - Cadet # Mono +# - Deputy # Mono +# - Bailiff # Mono +# - Sheriff # Mono +# - SeniorOfficer # Mono - PublicAffairsLiaison # Frontier - - TsfEngineer # Mono - - TsfMarsoc # Mono - - TsfBorg # Mono +# - TsfEngineer # Mono +# - TsfMarsoc # Mono +# - TsfBorg # Mono - type: department id: Science diff --git a/Resources/Prototypes/_Mono/Shipyard/Capitals/flyssa.yml b/Resources/Prototypes/_Mono/Shipyard/Capitals/flyssa.yml index 96767f49fd8..b13f0852280 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Capitals/flyssa.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Capitals/flyssa.yml @@ -42,4 +42,4 @@ prefixCreator: '14' - type: StationJobs availableJobs: - Deputy: [ 0, 0 ] + TsfMarine: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/aldebaran.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/aldebaran.yml index 06f18d8441d..b7ac57dc6bd 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/aldebaran.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/aldebaran.yml @@ -37,6 +37,6 @@ prefixCreator: '14' - type: StationJobs availableJobs: - Deputy: [ 0, 0 ] + TsfMarine: [ 0, 0 ] TsfBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/altair.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/altair.yml index ccd12049c08..f7e9f0a5682 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/altair.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/altair.yml @@ -40,5 +40,5 @@ prefixCreator: '14' - type: StationJobs availableJobs: - Deputy: [ 0, 0 ] + TsfMarine: [ 0, 0 ] TsfBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/andromeda.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/andromeda.yml index 493da8039ce..6d6547b0bd8 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/andromeda.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/andromeda.yml @@ -39,5 +39,5 @@ prefixCreator: '14' - type: StationJobs availableJobs: - Deputy: [ 0, 0 ] + TsfMarine: [ 0, 0 ] TsfBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/calypso.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/calypso.yml index 645234b38cc..ff43c902ac0 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/calypso.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/calypso.yml @@ -33,6 +33,6 @@ prefixCreator: '14' - type: StationJobs availableJobs: - Deputy: [ 0, 0 ] + TsfMarine: [ 0, 0 ] TsfBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/dagger.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/dagger.yml index 07f2e83f302..be8027f05ff 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/dagger.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/dagger.yml @@ -34,6 +34,6 @@ prefixCreator: '14' - type: StationJobs availableJobs: - Deputy: [ 0, 0 ] + TsfMarine: [ 0, 0 ] TsfBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/fracture.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/fracture.yml index 1cacffb7ae9..7cc3a5dfdfb 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/fracture.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/fracture.yml @@ -32,5 +32,5 @@ prefixCreator: '14' - type: StationJobs availableJobs: - Deputy: [ 0, 0 ] + TsfMarine: [ 0, 0 ] TsfBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/hoplite.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/hoplite.yml index 388c6cc4197..d12994b206a 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/hoplite.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/hoplite.yml @@ -35,5 +35,5 @@ prefixCreator: '14' - type: StationJobs availableJobs: - Deputy: [ 0, 0 ] + TsfMarine: [ 0, 0 ] TsfBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/jaguar.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/jaguar.yml index 5b4a2130d57..bd0e9942e8d 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/jaguar.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/jaguar.yml @@ -34,6 +34,6 @@ prefixCreator: '14' - type: StationJobs availableJobs: - Deputy: [ 0, 0 ] + TsfMarine: [ 0, 0 ] TsfBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/mercury.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/mercury.yml index 59c337a7210..2c90268f1da 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/mercury.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/mercury.yml @@ -34,6 +34,6 @@ prefixCreator: '14' - type: StationJobs availableJobs: - Deputy: [ 0, 0 ] + TsfMarine: [ 0, 0 ] TsfBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/ocelot.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/ocelot.yml index 01c1ffaa711..41d0aaae525 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/ocelot.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/ocelot.yml @@ -35,6 +35,6 @@ prefixCreator: '14' - type: StationJobs availableJobs: - Deputy: [ 0, 0 ] + TsfMarine: [ 0, 0 ] TsfBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/polaris.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/polaris.yml index 6263142aaac..6032ffa9d6b 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/polaris.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/polaris.yml @@ -37,5 +37,5 @@ prefixCreator: '14' - type: StationJobs availableJobs: - Deputy: [ 0, 0 ] + TsfMarine: [ 0, 0 ] TsfBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/sentinel.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/sentinel.yml index f4079adc865..8f0b0e1ae4d 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/sentinel.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/sentinel.yml @@ -34,6 +34,6 @@ prefixCreator: '14' - type: StationJobs availableJobs: - Deputy: [ 0, 0 ] + TsfMarine: [ 0, 0 ] TsfBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/shiv.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/shiv.yml index df4c0c3a6cb..995d11230d6 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/shiv.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/shiv.yml @@ -37,6 +37,6 @@ prefixCreator: '14' - type: StationJobs availableJobs: - Deputy: [ 0, 0 ] + TsfMarine: [ 0, 0 ] TsfBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/spekter.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/spekter.yml index 30e8a494849..32ac82f3fc2 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/spekter.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/spekter.yml @@ -37,5 +37,5 @@ prefixCreator: '14' - type: StationJobs availableJobs: - Deputy: [ 0, 0 ] + TsfMarine: [ 0, 0 ] TsfBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/spica.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/spica.yml index 3fe036d8e56..e451ad849bc 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/spica.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/spica.yml @@ -37,5 +37,5 @@ prefixCreator: '14' - type: StationJobs availableJobs: - Deputy: [ 0, 0 ] + TsfMarine: [ 0, 0 ] TsfBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/syringe.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/syringe.yml index 6032f6e06ad..cffe1f60761 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/syringe.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/syringe.yml @@ -35,6 +35,6 @@ prefixCreator: '14' - type: StationJobs availableJobs: - Deputy: [ 0, 0 ] + TsfMarine: [ 0, 0 ] TsfBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/tarantula.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/tarantula.yml index e44873ae7d3..6d96d26fbf1 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/tarantula.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/tarantula.yml @@ -36,6 +36,6 @@ prefixCreator: '14' - type: StationJobs availableJobs: - Deputy: [ 0, 0 ] + TsfMarine: [ 0, 0 ] TsfBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/tumour.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/tumour.yml index e097e13e38f..050b26f42bd 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/tumour.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/tumour.yml @@ -33,6 +33,6 @@ prefixCreator: '14' - type: StationJobs availableJobs: - Deputy: [ 0, 0 ] + TsfMarine: [ 0, 0 ] TsfBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/welder.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/welder.yml index 92e8b62cd01..c1e566161cd 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/welder.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/welder.yml @@ -35,6 +35,6 @@ prefixCreator: '14' - type: StationJobs availableJobs: - Deputy: [ 0, 0 ] + TsfMarine: [ 0, 0 ] TsfBorg: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Deputy/pda.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Deputy/pda.yml index c30dd147e4c..f93054a4d2d 100644 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Deputy/pda.yml +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Deputy/pda.yml @@ -1,5 +1,4 @@ - type: loadout - id: DeputyDeputyPDA + id: TsfMarineTsfMarinePDA equipment: - id: DeputyPDA - \ No newline at end of file + id: TsfMarinePDA diff --git a/Resources/Prototypes/_NF/Maps/debug.yml b/Resources/Prototypes/_NF/Maps/debug.yml index d779c00562d..628f026d3a1 100644 --- a/Resources/Prototypes/_NF/Maps/debug.yml +++ b/Resources/Prototypes/_NF/Maps/debug.yml @@ -46,7 +46,7 @@ SeniorOfficer: [ -1, -1] Brigmedic: [ -1, -1] # NFDetective: [ -1, -1] Mono - Deputy: [ -1, -1] + TsfMarine: [ -1, -1] # TsfRecruit [ -1, -1] Mono # PublicAffairsLiaison: [ -1, -1] Mono PDVGrandVizier: [ -1, -1] diff --git a/Resources/SharedMaps/_Mono/Shuttles/Capitals/flyssa.yml b/Resources/SharedMaps/_Mono/Shuttles/Capitals/flyssa.yml index f0d2e4b7058..b5d130370fe 100644 --- a/Resources/SharedMaps/_Mono/Shuttles/Capitals/flyssa.yml +++ b/Resources/SharedMaps/_Mono/Shuttles/Capitals/flyssa.yml @@ -15442,7 +15442,7 @@ entities: - type: Transform pos: 5.5,6.5 parent: 1 -- proto: SpawnPointDeputy +- proto: SpawnPointTsfMarine entities: - uid: 1403 components: From 8b5ea5c43d3d30bbc0428c2f190f744dab6ea48c Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Mon, 13 Jul 2026 18:03:12 +0200 Subject: [PATCH 26/55] one gazillion spawnpoint replacements --- Resources/Locale/en-US/_NF/job/job-names.ftl | 2 +- Resources/Maps/_Mono/POI/pdvhelios.yml | 4 +- Resources/Maps/_Mono/POI/pdvhelios_hw.yml | 4 +- .../Maps/_Mono/Supercapitals/jupiter.yml | 4 +- .../Maps/_Mono/Supercapitals/jupiter_hw.yml | 2 +- Resources/Maps/_Mono/Test/dev_map.yml | 4 +- Resources/Maps/_NF/Test/dev_map.yml | 6 +- .../Devices/Misc/identification_cards.yml | 94 +------------------ .../_Mono/Shuttles/BlackMarket/carrion.yml | 2 +- .../_Mono/Shuttles/BlackMarket/kortik.yml | 2 +- .../_Mono/Shuttles/BlackMarket/kortik_t2.yml | 2 +- .../_Mono/Shuttles/BlackMarket/scorpion.yml | 2 +- .../_Mono/Shuttles/Capitals/saturn.yml | 2 +- 13 files changed, 23 insertions(+), 107 deletions(-) diff --git a/Resources/Locale/en-US/_NF/job/job-names.ftl b/Resources/Locale/en-US/_NF/job/job-names.ftl index 3e6e41e596f..ca4320bb263 100644 --- a/Resources/Locale/en-US/_NF/job/job-names.ftl +++ b/Resources/Locale/en-US/_NF/job/job-names.ftl @@ -14,7 +14,7 @@ JobERTMailCarrier = ERT Mail Carrier JobMercenary = Mercenary JobPilot = Pilot JobPDVInfiltrator = PDV Spasaka -JobPirate = PDV Rakhshan +JobPirate = PDV Rahkshan JobPdvGrandVizier = PDV Grand Vizier JobPdvAsvaran = PDV Asvaran JobPdvDenasvar = PDV Denasvar diff --git a/Resources/Maps/_Mono/POI/pdvhelios.yml b/Resources/Maps/_Mono/POI/pdvhelios.yml index b7e3d7b1ffe..5389b63c894 100644 --- a/Resources/Maps/_Mono/POI/pdvhelios.yml +++ b/Resources/Maps/_Mono/POI/pdvhelios.yml @@ -45149,7 +45149,7 @@ entities: - type: Transform pos: -4.5,62.5 parent: 1 -- proto: SpawnPointPirate +- proto: SpawnPointPDVRahkshan entities: - uid: 7578 components: @@ -45186,7 +45186,7 @@ entities: - type: Transform pos: -2.5,64.5 parent: 1 -- proto: SpawnPointPirateCaptain +- proto: SpawnPointPDVGrandVizier entities: - uid: 7856 components: diff --git a/Resources/Maps/_Mono/POI/pdvhelios_hw.yml b/Resources/Maps/_Mono/POI/pdvhelios_hw.yml index 2efeb414c38..d0653486a2c 100644 --- a/Resources/Maps/_Mono/POI/pdvhelios_hw.yml +++ b/Resources/Maps/_Mono/POI/pdvhelios_hw.yml @@ -45137,7 +45137,7 @@ entities: - type: Transform pos: -4.5,62.5 parent: 1 -- proto: SpawnPointPirate +- proto: SpawnPointPDVRahkshan entities: - uid: 7578 components: @@ -45174,7 +45174,7 @@ entities: - type: Transform pos: -2.5,64.5 parent: 1 -- proto: SpawnPointPirateCaptain +- proto: SpawnPointPDVGrandVizier entities: - uid: 7856 components: diff --git a/Resources/Maps/_Mono/Supercapitals/jupiter.yml b/Resources/Maps/_Mono/Supercapitals/jupiter.yml index fafe01bee68..985521545e1 100644 --- a/Resources/Maps/_Mono/Supercapitals/jupiter.yml +++ b/Resources/Maps/_Mono/Supercapitals/jupiter.yml @@ -31196,7 +31196,7 @@ entities: - type: Transform pos: 13.5,36.5 parent: 1 -- proto: SpawnPointPirate +- proto: SpawnPointPDVRahkshan entities: - uid: 4457 components: @@ -31228,7 +31228,7 @@ entities: - type: Transform pos: -8.5,24.5 parent: 1 -- proto: SpawnPointPirateCaptain +- proto: SpawnPointPDVGrandVizier entities: - uid: 4463 components: diff --git a/Resources/Maps/_Mono/Supercapitals/jupiter_hw.yml b/Resources/Maps/_Mono/Supercapitals/jupiter_hw.yml index 86d463d649e..52814ca297f 100644 --- a/Resources/Maps/_Mono/Supercapitals/jupiter_hw.yml +++ b/Resources/Maps/_Mono/Supercapitals/jupiter_hw.yml @@ -40330,7 +40330,7 @@ entities: - type: Transform pos: -12.5,48.5 parent: 1 -- proto: SpawnPointPirate +- proto: SpawnPointPDVRahkshan entities: - uid: 7488 components: diff --git a/Resources/Maps/_Mono/Test/dev_map.yml b/Resources/Maps/_Mono/Test/dev_map.yml index dd1465a1dc3..f6a3389b2b6 100644 --- a/Resources/Maps/_Mono/Test/dev_map.yml +++ b/Resources/Maps/_Mono/Test/dev_map.yml @@ -7887,14 +7887,14 @@ entities: - type: Transform pos: -4.5,2.5 parent: 2 -- proto: SpawnPointPirate +- proto: SpawnPointPDVRahkshan entities: - uid: 1142 components: - type: Transform pos: -4.5,2.5 parent: 2 -- proto: SpawnPointPirateCaptain +- proto: SpawnPointPDVGrandVizier entities: - uid: 1143 components: diff --git a/Resources/Maps/_NF/Test/dev_map.yml b/Resources/Maps/_NF/Test/dev_map.yml index 4735a3f4a4f..146574f71c7 100644 --- a/Resources/Maps/_NF/Test/dev_map.yml +++ b/Resources/Maps/_NF/Test/dev_map.yml @@ -7190,21 +7190,21 @@ entities: - type: Transform pos: -3.5,2.5 parent: 179 -- proto: SpawnPointPirate +- proto: SpawnPointPDVRahkshan entities: - uid: 1466 components: - type: Transform pos: -3.5,2.5 parent: 179 -- proto: SpawnPointPirateCaptain +- proto: SpawnPointPDVGrandVizier entities: - uid: 1465 components: - type: Transform pos: -3.5,2.5 parent: 179 -- proto: SpawnPointPirateFirstMate +- proto: SpawnPointPDVAsvaran entities: - uid: 1464 components: diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Devices/Misc/identification_cards.yml b/Resources/Prototypes/_Mono/Entities/Objects/Devices/Misc/identification_cards.yml index a2ba8d84c28..df7020d230b 100644 --- a/Resources/Prototypes/_Mono/Entities/Objects/Devices/Misc/identification_cards.yml +++ b/Resources/Prototypes/_Mono/Entities/Objects/Devices/Misc/identification_cards.yml @@ -57,91 +57,7 @@ - type: Item heldPrefix: medic -# MARK: TSF - -- type: entity - parent: IDCardStandard - id: TsfRecruitIDCard - name: TSFMC recruit ID card - components: - - type: PresetIdCard - job: TsfRecruit - - type: Sprite - sprite: _NF/Objects/Misc/id_cards.rsi - layers: - - state: nfsd - - state: idnfsdcadet - - type: Clothing - sprite: _NF/Objects/Misc/id_cards.rsi - - type: Item - heldPrefix: nfsd - -- type: entity - parent: TsfRecruitIDCard - id: TsfMarineIDCard - name: TSFMC marine ID card - components: - - type: PresetIdCard - job: TsfMarine - - type: Sprite - sprite: _NF/Objects/Misc/id_cards.rsi - layers: - - state: nfsd - - state: idnfsddeputy - -- type: entity - parent: TsfRecruitIDCard - id: TsfCorpsmanIDCard - name: TSFMC corpsman ID card - components: - - type: PresetIdCard - job: TsfCorpsman - - type: Sprite - sprite: _NF/Objects/Misc/id_cards.rsi - layers: - - state: nfsd - - state: idnfsdbrigmed - -- type: entity - parent: TsfRecruitIDCard - id: TsfTeamleaderIDCard - name: TSFMC fireteam leader ID card - components: - - type: PresetIdCard - job: TsfTeamleader - - type: Sprite - sprite: _NF/Objects/Misc/id_cards.rsi - layers: - - state: nfsd - - state: idnfsdsergeant - -- type: entity - parent: TsfRecruitIDCard - id: TsfOfficerIDCard - name: TSFMC captain ID card - components: - - type: PresetIdCard - job: TsfOfficer - - type: Sprite - sprite: _NF/Objects/Misc/id_cards.rsi - layers: - - state: nfsd - - state: idnfsdbailiff - -- type: entity - parent: TsfRecruitIDCard - id: TsfCommanderIDCard - name: TSFMC colonel ID card - components: - - type: PresetIdCard - job: TsfCommander - - type: Sprite - sprite: _NF/Objects/Misc/id_cards.rsi - layers: - - state: silver - - state: idnfsdsheriff - - type: Item - heldPrefix: silver +# MARK: TSF Engi - type: entity parent: IDCardStandard @@ -183,15 +99,15 @@ - type: entity parent: PirateIDCard id: PDVRahkshanIDCard - name: PDV Rahkshan id card + name: PDV rahkshan id card components: - type: PresetIdCard - job: Pirate + job: PDVRahkshan - type: Sprite sprite: _Mono/Objects/Misc/id_cards.rsi layers: - state: base - - state: id_Rahkshan + - state: id_rahkshan - type: entity parent: PirateIDCard @@ -263,7 +179,7 @@ sprite: _Mono/Objects/Misc/id_cards.rsi layers: - state: base - - state: id_Rahkshan + - state: id_rahkshan - type: AgentIDCard - type: ActivatableUI key: enum.AgentIDCardUiKey.Key diff --git a/Resources/SharedMaps/_Mono/Shuttles/BlackMarket/carrion.yml b/Resources/SharedMaps/_Mono/Shuttles/BlackMarket/carrion.yml index e154b6e36fa..3d6c98846e9 100644 --- a/Resources/SharedMaps/_Mono/Shuttles/BlackMarket/carrion.yml +++ b/Resources/SharedMaps/_Mono/Shuttles/BlackMarket/carrion.yml @@ -1406,7 +1406,7 @@ entities: - type: Transform pos: 0.5,2.5 parent: 2 -- proto: SpawnPointPirate +- proto: SpawnPointPDVRahkshan entities: - uid: 249 components: diff --git a/Resources/SharedMaps/_Mono/Shuttles/BlackMarket/kortik.yml b/Resources/SharedMaps/_Mono/Shuttles/BlackMarket/kortik.yml index f1f2092f350..a4e0974ef9b 100644 --- a/Resources/SharedMaps/_Mono/Shuttles/BlackMarket/kortik.yml +++ b/Resources/SharedMaps/_Mono/Shuttles/BlackMarket/kortik.yml @@ -7660,7 +7660,7 @@ entities: - type: Transform pos: 0.5,-9.5 parent: 1 -- proto: SpawnPointPirate +- proto: SpawnPointPDVRahkshan entities: - uid: 1105 components: diff --git a/Resources/SharedMaps/_Mono/Shuttles/BlackMarket/kortik_t2.yml b/Resources/SharedMaps/_Mono/Shuttles/BlackMarket/kortik_t2.yml index 360bf6898b6..c9860d8cb3d 100644 --- a/Resources/SharedMaps/_Mono/Shuttles/BlackMarket/kortik_t2.yml +++ b/Resources/SharedMaps/_Mono/Shuttles/BlackMarket/kortik_t2.yml @@ -7660,7 +7660,7 @@ entities: - type: Transform pos: 0.5,-9.5 parent: 1 -- proto: SpawnPointPirate +- proto: SpawnPointPDVRahkshan entities: - uid: 1105 components: diff --git a/Resources/SharedMaps/_Mono/Shuttles/BlackMarket/scorpion.yml b/Resources/SharedMaps/_Mono/Shuttles/BlackMarket/scorpion.yml index fe36853195b..5179678eb6e 100644 --- a/Resources/SharedMaps/_Mono/Shuttles/BlackMarket/scorpion.yml +++ b/Resources/SharedMaps/_Mono/Shuttles/BlackMarket/scorpion.yml @@ -4109,7 +4109,7 @@ entities: - type: Transform pos: -1.5,16.5 parent: 1 -- proto: SpawnPointPirate +- proto: SpawnPointPDVRahkshan entities: - uid: 578 components: diff --git a/Resources/SharedMaps/_Mono/Shuttles/Capitals/saturn.yml b/Resources/SharedMaps/_Mono/Shuttles/Capitals/saturn.yml index 15fdf2d6fbb..46cba9e52f4 100644 --- a/Resources/SharedMaps/_Mono/Shuttles/Capitals/saturn.yml +++ b/Resources/SharedMaps/_Mono/Shuttles/Capitals/saturn.yml @@ -19906,7 +19906,7 @@ entities: - type: Transform pos: -7.5,25.5 parent: 1 -- proto: SpawnPointPirate +- proto: SpawnPointPDVRahkshan entities: - uid: 3650 components: From 790a66a37f9036fb8e9c735702341a102e08e841 Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Mon, 13 Jul 2026 18:24:46 +0200 Subject: [PATCH 27/55] balls in my mouth --- .../_NF/CryoSleep/CryoSleepSystem.cs | 24 +++++++++---------- .../Components/IdCardConsoleComponent.cs | 9 +++---- .../Devices/Misc/identification_cards.yml | 12 +++++----- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/Content.Server/_NF/CryoSleep/CryoSleepSystem.cs b/Content.Server/_NF/CryoSleep/CryoSleepSystem.cs index c7cd130561d..a4d3c83120c 100644 --- a/Content.Server/_NF/CryoSleep/CryoSleepSystem.cs +++ b/Content.Server/_NF/CryoSleep/CryoSleepSystem.cs @@ -420,24 +420,24 @@ public void CryoStoreBody(EntityUid bodyId, EntityUid cryopod) if (jobTitle != null) { // Check if job is one of the pirate jobs - isPirate = jobTitle.Equals(Loc.GetString("job-name-pirate"), StringComparison.OrdinalIgnoreCase) || - jobTitle.Equals(Loc.GetString("job-name-pirate-captain"), StringComparison.OrdinalIgnoreCase) || - jobTitle.Equals(Loc.GetString("job-name-pirate-first-mate"), StringComparison.OrdinalIgnoreCase); + isPirate = jobTitle.Equals(Loc.GetString("job-name-pdv-rahkshan"), StringComparison.OrdinalIgnoreCase) || + jobTitle.Equals(Loc.GetString("job-name-pdv-vizier"), StringComparison.OrdinalIgnoreCase) || + jobTitle.Equals(Loc.GetString("job-name-pdv-denasvar"), StringComparison.OrdinalIgnoreCase) || + jobTitle.Equals(Loc.GetString("job-name-pdv-infiltrator"), StringComparison.OrdinalIgnoreCase) || + jobTitle.Equals(Loc.GetString("job-name-pdv-asvaran"), StringComparison.OrdinalIgnoreCase); } // Check if character is TSF, and if so, use TSF radio instead of Common bool isTSF = false; if (jobTitle != null) { - isTSF = jobTitle.Equals(Loc.GetString("job-name-bailiff"), StringComparison.OrdinalIgnoreCase) || - jobTitle.Equals(Loc.GetString("job-name-brigmedic"), StringComparison.OrdinalIgnoreCase) || - jobTitle.Equals(Loc.GetString("job-name-cadet-nf"), StringComparison.OrdinalIgnoreCase) || - jobTitle.Equals(Loc.GetString("job-name-deputy"), StringComparison.OrdinalIgnoreCase) || - jobTitle.Equals(Loc.GetString("job-name-nf-detective"), StringComparison.OrdinalIgnoreCase) || - jobTitle.Equals(Loc.GetString("job-name-sheriff"), StringComparison.OrdinalIgnoreCase) || - jobTitle.Equals(Loc.GetString("job-name-stc"), StringComparison.OrdinalIgnoreCase) || - jobTitle.Equals(Loc.GetString("job-name-sr"), StringComparison.OrdinalIgnoreCase) || - jobTitle.Equals(Loc.GetString("job-name-pal"), StringComparison.OrdinalIgnoreCase); + isTSF = jobTitle.Equals(Loc.GetString("job-name-tsf-officer"), StringComparison.OrdinalIgnoreCase) || + jobTitle.Equals(Loc.GetString("job-name-tsf-corpsman"), StringComparison.OrdinalIgnoreCase) || + jobTitle.Equals(Loc.GetString("job-name-tsf-recruit"), StringComparison.OrdinalIgnoreCase) || + jobTitle.Equals(Loc.GetString("job-name-tsf-marine"), StringComparison.OrdinalIgnoreCase) || + jobTitle.Equals(Loc.GetString("job-name-tsf-engineer"), StringComparison.OrdinalIgnoreCase) || + jobTitle.Equals(Loc.GetString("job-name-tsf-teamleader"), StringComparison.OrdinalIgnoreCase) || + jobTitle.Equals(Loc.GetString("job-name-tsf-commandingofficer"), StringComparison.OrdinalIgnoreCase); } // Send radio message on appropriate channel diff --git a/Content.Shared/Access/Components/IdCardConsoleComponent.cs b/Content.Shared/Access/Components/IdCardConsoleComponent.cs index e2304a57442..556c4c4b099 100644 --- a/Content.Shared/Access/Components/IdCardConsoleComponent.cs +++ b/Content.Shared/Access/Components/IdCardConsoleComponent.cs @@ -83,11 +83,12 @@ public WriteToTargetIdMessage(string fullName, string jobTitle, List Date: Mon, 13 Jul 2026 18:39:33 +0200 Subject: [PATCH 28/55] am amamfff losing it --- .../Devices/Misc/identification_cards.yml | 104 +++++++++++++++++- 1 file changed, 103 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Devices/Misc/identification_cards.yml b/Resources/Prototypes/_Mono/Entities/Objects/Devices/Misc/identification_cards.yml index 34396987b9f..a87864bd354 100644 --- a/Resources/Prototypes/_Mono/Entities/Objects/Devices/Misc/identification_cards.yml +++ b/Resources/Prototypes/_Mono/Entities/Objects/Devices/Misc/identification_cards.yml @@ -59,6 +59,108 @@ # MARK: TSF +- type: entity + parent: IDCardStandard + id: TsfRecruitIDCard + name: TSFMC recruit ID card + components: + - type: PresetIdCard + job: TsfRecruit + - type: Sprite + sprite: _NF/Objects/Misc/id_cards.rsi + layers: + - state: nfsd + - state: idnfsdcadet + - type: Clothing + sprite: _NF/Objects/Misc/id_cards.rsi + - type: Item + heldPrefix: nfsd + +- type: entity + parent: IDCardStandard + id: TsfMarineIDCard + name: TSFMC marine ID card + components: + - type: PresetIdCard + job: TsfMarine + - type: Sprite + sprite: _NF/Objects/Misc/id_cards.rsi + layers: + - state: nfsd + - state: idnfsddeputy + - type: Clothing + sprite: _NF/Objects/Misc/id_cards.rsi + - type: Item + heldPrefix: nfsd + +- type: entity + parent: IDCardStandard + id: TsfTeamleaderIDCard + name: TSFMC Fireteam Leader ID card + components: + - type: PresetIdCard + job: TsfTeamleader + - type: Sprite + sprite: _NF/Objects/Misc/id_cards.rsi + layers: + - state: nfsd + - state: idnfsdsergeant + - type: Clothing + sprite: _NF/Objects/Misc/id_cards.rsi + - type: Item + heldPrefix: nfsd + +- type: entity + parent: IDCardStandard + id: TsfOfficerIDCard + name: TSF Officer ID card + components: + - type: PresetIdCard + job: TsfOfficer + - type: Sprite + sprite: _NF/Objects/Misc/id_cards.rsi + layers: + - state: nfsd + - state: idnfsdbailiff + - type: Clothing + sprite: _NF/Objects/Misc/id_cards.rsi + - type: Item + heldPrefix: nfsd + +- type: entity + parent: IDCardStandard + id: TsfCommanderIDCard + name: TSF Commanding Officer ID card + components: + - type: PresetIdCard + job: TsfCommander + - type: Sprite + sprite: _NF/Objects/Misc/id_cards.rsi + layers: + - state: nfsd + - state: idnfsdsheriff + - type: Clothing + sprite: _NF/Objects/Misc/id_cards.rsi + - type: Item + heldPrefix: nfsd + +- type: entity + parent: IDCardStandard + id: TsfCorpsmanIDCard + name: TSF Commanding Officer ID card + components: + - type: PresetIdCard + job: TsfCorpsman + - type: Sprite + sprite: _NF/Objects/Misc/id_cards.rsi + layers: + - state: nfsd + - state: idnfsdbrigmed + - type: Clothing + sprite: _NF/Objects/Misc/id_cards.rsi + - type: Item + heldPrefix: nfsd + - type: entity parent: IDCardStandard id: TsfEngiIDCard @@ -173,7 +275,7 @@ - type: Access tags: - Maintenance - - Pirate + - PDVGeneral - Mercenary - type: Sprite sprite: _Mono/Objects/Misc/id_cards.rsi From 3b226580b4e144dce0108431d3b9ee8c0e250f18 Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Mon, 13 Jul 2026 19:40:54 +0200 Subject: [PATCH 29/55] database changes aren't real and cannot hurt me --- .../en-US/_Mono/job/department-desc.ftl | 1 + .../Locale/en-US/_Mono/job/department.ftl | 2 +- .../communications-console-component.ftl | 3 +- .../Locale/en-US/job/job-description.ftl | 2 + Resources/Locale/en-US/job/job-names.ftl | 5 +- Resources/Maps/_NF/Test/dev_map.yml | 10459 ---------------- .../Objects/Misc/identification_cards.yml | 6 +- .../Objects/Tools/access_configurator.yml | 8 +- .../Roles/Jobs/Security/brigmedic.yaml | 39 + .../Roles/Jobs/Security/senior_officer.yaml | 39 + .../Prototypes/Roles/Jobs/departments.yml | 4 +- .../Computers/rogue_comm_computer.yml | 4 +- .../Machines/Computers/tsf_comm_computer.yml | 7 +- .../Supercapitals/chengdu.yml | 2 +- .../_Mono/PointsOfInterest/tsfmcsecondary.yml | 7 +- .../_Mono/Roles/Jobs/PDV/rahkshan.yml | 2 +- .../_Mono/Roles/Jobs/PDV/spasaka.yml | 4 +- .../_Mono/Roles/Jobs/PDV/tarkhan.yml | 4 +- .../_Mono/Roles/Jobs/TSF/recruit.yml | 2 +- .../_Mono/Roles/Jobs/departments.yml | 2 +- .../_NF/Catalog/security_uplink_catalog.yml | 54 +- .../_NF/Entities/Objects/Specific/pirate.yml | 2 +- .../_NF/Entities/Structures/atm.yml | 4 +- .../_NF/Roles/Jobs/Frontier/nfdetective.yml | 2 +- .../Roles/Jobs/Frontier/public_affairs.yml | 2 +- 25 files changed, 152 insertions(+), 10514 deletions(-) delete mode 100644 Resources/Maps/_NF/Test/dev_map.yml create mode 100644 Resources/Prototypes/Roles/Jobs/Security/brigmedic.yaml create mode 100644 Resources/Prototypes/Roles/Jobs/Security/senior_officer.yaml diff --git a/Resources/Locale/en-US/_Mono/job/department-desc.ftl b/Resources/Locale/en-US/_Mono/job/department-desc.ftl index f15a7d6e1ac..8071e4081c5 100644 --- a/Resources/Locale/en-US/_Mono/job/department-desc.ftl +++ b/Resources/Locale/en-US/_Mono/job/department-desc.ftl @@ -6,3 +6,4 @@ department-NFCivilian-description = Team up with a crew and go out on adventures department-NFCommand-description = Manage the sector, keep things running efficiently. department-NFCentralCommand-description = Get the sector and your forces under control, keep command on its toes. department-Tsf-description = Expand the influence of Sol across the sector, crush any enemy resistance. Sol Invictus. +department-NF-description = Maintain a modicum of oder among the few civilized stations of the Colossus Sector diff --git a/Resources/Locale/en-US/_Mono/job/department.ftl b/Resources/Locale/en-US/_Mono/job/department.ftl index 1d579f90fd5..51dcb5f6814 100644 --- a/Resources/Locale/en-US/_Mono/job/department.ftl +++ b/Resources/Locale/en-US/_Mono/job/department.ftl @@ -7,4 +7,4 @@ department-Viper = Viper Group department-Pdv = Phaethon Dynasty Imperial Vanguard department-Command = Central Command department-Frontier = Colossus Frontier Colonization -department-Security = TSF Marine Corps Detachment +department-Tsf = TSF Navy and Marine Detachment diff --git a/Resources/Locale/en-US/communications/communications-console-component.ftl b/Resources/Locale/en-US/communications/communications-console-component.ftl index be9461b5bb6..3dcabc0cd27 100644 --- a/Resources/Locale/en-US/communications/communications-console-component.ftl +++ b/Resources/Locale/en-US/communications/communications-console-component.ftl @@ -31,4 +31,5 @@ comms-console-announcement-title-station-ai = Station AI comms-console-announcement-title-wizard = Wizard # Mono -comms-console-announcement-title-rogue = Phaethon Dynasty Imperial Vanguard +comms-console-announcement-title-pdv = Phaethon Dynasty Imperial Vanguard +comms-console-announcement-title-tsf = Trans Solar Federation Occupational Force diff --git a/Resources/Locale/en-US/job/job-description.ftl b/Resources/Locale/en-US/job/job-description.ftl index 9a8254b4a16..821e922ae2c 100644 --- a/Resources/Locale/en-US/job/job-description.ftl +++ b/Resources/Locale/en-US/job/job-description.ftl @@ -47,3 +47,5 @@ job-description-station-ai = Follow your laws, serve the crew. job-description-visitor = Enjoy your visit to the station. job-description-warden = Patrol the security department, ensure that no one is stealing from the armory, and make sure that all prisoners are processed and let out when their time is up. job-description-zookeeper = Put on a joyful display of cute animals and space carps for all the crew to see. Currently available on Oasis. +#Mono +job-description-senior = bald diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl index a993f1750a1..f78be0805c1 100644 --- a/Resources/Locale/en-US/job/job-names.ftl +++ b/Resources/Locale/en-US/job/job-names.ftl @@ -21,6 +21,9 @@ job-name-captain = Captain job-name-serviceworker = Service Worker job-name-centcomoff = CentComm Official job-name-cburn = Centcomm Quarantine Officer +job-name-brigmedic = Brigmedic +job-name-pirate = Pirate +job-name-senior = Senior Security Officer job-name-deathsquad = Centcomm Agent job-name-reporter = Reporter job-name-musician = Musician @@ -82,7 +85,7 @@ JobChiefEngineer = Chief Engineer JobChiefMedicalOfficer = Chief Medical Officer JobClown = Clown JobDetective = Detective -JobBrigmedic = Corpsman +JobBrigmedic = Brigmedic JobERTChaplain = ERT Chaplain JobERTEngineer = ERT Engineer JobERTJanitor = ERT Janitor diff --git a/Resources/Maps/_NF/Test/dev_map.yml b/Resources/Maps/_NF/Test/dev_map.yml deleted file mode 100644 index 146574f71c7..00000000000 --- a/Resources/Maps/_NF/Test/dev_map.yml +++ /dev/null @@ -1,10459 +0,0 @@ -# SPDX-FileCopyrightText: 2022 20kdc -# SPDX-FileCopyrightText: 2023 DrSmugleaf -# SPDX-FileCopyrightText: 2023 Emisse -# SPDX-FileCopyrightText: 2023 Kevin Zheng -# SPDX-FileCopyrightText: 2023 Leon Friedrich -# SPDX-FileCopyrightText: 2023 Morb -# SPDX-FileCopyrightText: 2023 Nemanja -# SPDX-FileCopyrightText: 2023 adamsong -# SPDX-FileCopyrightText: 2023 avery -# SPDX-FileCopyrightText: 2023 deltanedas -# SPDX-FileCopyrightText: 2023 deltanedas <@deltanedas:kde.org> -# SPDX-FileCopyrightText: 2023 metalgearsloth -# SPDX-FileCopyrightText: 2024 Alice "Arimah" Heurlin -# SPDX-FileCopyrightText: 2024 Brandon Hu -# SPDX-FileCopyrightText: 2024 Dvir -# SPDX-FileCopyrightText: 2024 Errant -# SPDX-FileCopyrightText: 2024 GreaseMonk -# SPDX-FileCopyrightText: 2024 Kara -# SPDX-FileCopyrightText: 2024 Verm -# SPDX-FileCopyrightText: 2024 Whatstone -# SPDX-FileCopyrightText: 2024 eoineoineoin -# SPDX-FileCopyrightText: 2025 ErhardSteinhauer -# SPDX-FileCopyrightText: 2025 Redrover1760 -# SPDX-FileCopyrightText: 2025 RikuTheKiller -# SPDX-FileCopyrightText: 2025 core-mene -# SPDX-FileCopyrightText: 2025 dustylens -# SPDX-FileCopyrightText: 2025 starch -# SPDX-FileCopyrightText: 2025 thoughtlessuser -# -# SPDX-License-Identifier: AGPL-3.0-or-later - -meta: - format: 6 - postmapinit: false -tilemap: - 0: Space - 89: FloorSteel - 104: FloorTechMaint - 108: FloorWhite - 120: Lattice - 121: Plating -entities: -- proto: "" - entities: - - uid: 179 - components: - - type: MetaData - - type: Transform - parent: 962 - - type: MapGrid - chunks: - -1,0: - ind: -1,0 - tiles: eQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - version: 6 - -1,-1: - ind: -1,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAA - version: 6 - 0,1: - ind: 0,1 - tiles: eAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAWQAAAAAAeAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAbAAAAAAAAAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAbAAAAAAAAAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAAAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAbAAAAAAAAAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAAAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAAAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - version: 6 - 0,0: - ind: 0,0 - tiles: eQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAA - version: 6 - 0,-1: - ind: 0,-1 - tiles: eQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAA - version: 6 - 1,-1: - ind: 1,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAA - version: 6 - -2,0: - ind: -2,0 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - version: 6 - -2,-1: - ind: -2,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAWQAAAAAA - version: 6 - 1,0: - ind: 1,0 - tiles: bAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAAAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAAAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAAAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAAAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAeQAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - version: 6 - 2,-1: - ind: 2,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - version: 6 - 1,1: - ind: 1,1 - tiles: WQAAAAAAWQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - version: 6 - -1,1: - ind: -1,1 - tiles: AAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - version: 6 - 0,-2: - ind: 0,-2 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAA - version: 6 - -1,-2: - ind: -1,-2 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAA - version: 6 - - type: Broadphase - - type: Physics - bodyStatus: InAir - angularDamping: 0.05 - linearDamping: 0.05 - fixedRotation: False - bodyType: Dynamic - - type: Fixtures - fixtures: {} - - type: Gravity - gravityShakeSound: !type:SoundPathSpecifier - path: /Audio/Effects/alert.ogg - - type: DecalGrid - chunkCollection: - version: 2 - nodes: [] - - type: OccluderTree - - type: Shuttle - - type: RadiationGridResistance - - type: GravityShake - shakeTimes: 10 - - type: GridAtmosphere - version: 2 - data: - tiles: - -4,0: - 0: 65532 - -4,-1: - 0: 65535 - -4,1: - 0: 4095 - -4,2: - 1: 8959 - -5,2: - 1: 204 - -4,3: - 1: 8738 - -4,4: - 1: 238 - -3,0: - 0: 65524 - -3,1: - 0: 61167 - -3,2: - 1: 35071 - -3,-1: - 0: 56797 - -2,0: - 0: 65534 - -2,1: - 0: 61167 - -3,3: - 1: 8 - -2,3: - 1: 15 - -2,2: - 0: 3822 - -2,-1: - 0: 61166 - -1,0: - 0: 65535 - -1,1: - 0: 65535 - -1,2: - 0: 53247 - -1,3: - 1: 2049 - 0: 12 - -1,-1: - 0: 65535 - 0,0: - 0: 65535 - 0,1: - 0: 65535 - 0,2: - 0: 65535 - 0,3: - 0: 52429 - 1: 4352 - -4,-2: - 0: 65535 - -5,-2: - 0: 34952 - 1: 8704 - -5,-1: - 0: 34952 - 1: 8738 - -3,-2: - 0: 56829 - -2,-2: - 0: 3838 - -2,-4: - 0: 60928 - -2,-3: - 0: 61166 - -1,-4: - 0: 65350 - -1,-3: - 0: 65535 - -1,-2: - 0: 4095 - -1,-5: - 0: 16384 - 0,-4: - 0: 65299 - 0,-3: - 0: 65535 - 0,-2: - 0: 53247 - 0,-1: - 0: 65535 - 0,4: - 1: 17 - 0: 3276 - -1,4: - 1: 255 - 0,5: - 0: 52428 - 0,6: - 0: 14 - 1,4: - 0: 17759 - 1,3: - 0: 65535 - 1,5: - 0: 58990 - 1,6: - 0: 26350 - 1,7: - 0: 4 - 2,4: - 0: 65419 - 2,5: - 0: 45311 - 2,6: - 0: 187 - 2,3: - 0: 16383 - 3,4: - 0: 46011 - 3,5: - 0: 47295 - 3,6: - 0: 35007 - 3,3: - 0: 8191 - 4,4: - 0: 12595 - 4,5: - 0: 13107 - 4,6: - 0: 13107 - 1,0: - 0: 65535 - 1,2: - 0: 65520 - 1,-1: - 0: 65535 - 1,1: - 0: 61166 - 2,2: - 0: 7632 - 2,0: - 1: 8738 - 2,1: - 1: 2 - 0: 60928 - 2,-1: - 1: 8738 - 3,1: - 0: 56780 - 3,2: - 0: 36828 - 3,0: - 0: 36590 - 3,-1: - 0: 36044 - 4,0: - 0: 8191 - 4,1: - 0: 65535 - 4,2: - 0: 65535 - 4,3: - 0: 8191 - 0,-5: - 0: 4096 - 1,-4: - 0: 13056 - 1,-3: - 0: 61747 - 1,-2: - 0: 273 - 2,-3: - 1: 12834 - 2,-2: - 1: 8738 - 2,-4: - 1: 61166 - 2,-5: - 1: 57344 - 3,-4: - 1: 13105 - 0: 2 - 3,-5: - 1: 4096 - 0: 8192 - 3,-2: - 0: 52224 - 4,-2: - 0: 65280 - 4,-1: - 0: 8191 - 5,-2: - 0: 65280 - 5,-1: - 0: 36863 - 5,0: - 0: 40959 - 6,-2: - 0: 47872 - 6,-1: - 0: 7103 - 6,0: - 0: 65535 - 7,-2: - 0: 65280 - 7,-1: - 0: 8191 - 7,0: - 0: 13107 - 8,-2: - 0: 13056 - 8,-1: - 0: 819 - -5,0: - 1: 17506 - -5,1: - 1: 17476 - 5,1: - 0: 64435 - 5,2: - 0: 65535 - 5,3: - 0: 4095 - 6,1: - 0: 65525 - 6,2: - 0: 4095 - 6,3: - 0: 626 - -3,4: - 1: 255 - -2,4: - 1: 255 - uniqueMixes: - - volume: 2500 - temperature: 293.15 - moles: - - 21.824879 - - 82.10312 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - volume: 2500 - immutable: True - moles: - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - chunkSize: 4 - - type: GasTileOverlay - - type: BecomesStation - id: NFDev - - type: StationTransit - - type: SpreaderGrid - - type: GridPathfinding - - type: NavMap - - uid: 962 - components: - - type: MetaData - name: NFDev - - type: Transform - - type: Map - mapPaused: True - - type: GridTree - - type: Broadphase - - type: OccluderTree - - type: LoadedMap -- proto: AdvancedCapacitorStockPart - entities: - - uid: 266 - components: - - type: Transform - pos: -3.9512415,8.862108 - parent: 179 -- proto: AdvancedMatterBinStockPart - entities: - - uid: 1252 - components: - - type: Transform - pos: -6.2495694,8.341274 - parent: 179 -- proto: AirAlarm - entities: - - uid: 800 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,-4.5 - parent: 179 - - type: DeviceList - devices: - - 801 -- proto: AirCanister - entities: - - uid: 458 - components: - - type: Transform - pos: 7.5,-0.5 - parent: 179 -- proto: Airlock - entities: - - uid: 48 - components: - - type: Transform - pos: 7.5,20.5 - parent: 179 - - uid: 119 - components: - - type: Transform - pos: 6.5,17.5 - parent: 179 - - uid: 170 - components: - - type: Transform - pos: 13.5,10.5 - parent: 179 - - uid: 378 - components: - - type: Transform - pos: -9.5,0.5 - parent: 179 - - uid: 1182 - components: - - type: Transform - pos: 6.5,28.5 - parent: 179 -- proto: AirlockCargo - entities: - - uid: 87 - components: - - type: Transform - pos: 2.5,-4.5 - parent: 179 -- proto: AirlockEngineering - entities: - - uid: 257 - components: - - type: Transform - pos: -7.5,-6.5 - parent: 179 - - uid: 258 - components: - - type: Transform - pos: 3.5,-4.5 - parent: 179 - - uid: 530 - components: - - type: Transform - pos: -10.5,-6.5 - parent: 179 - - uid: 563 - components: - - type: Transform - pos: -13.5,0.5 - parent: 179 - - uid: 867 - components: - - type: Transform - pos: -12.5,0.5 - parent: 179 -- proto: AirlockExternal - entities: - - uid: 155 - components: - - type: Transform - pos: 26.5,13.5 - parent: 179 - - uid: 203 - components: - - type: Transform - pos: 0.5,-14.5 - parent: 179 - - uid: 255 - components: - - type: Transform - pos: 7.5,-8.5 - parent: 179 - - uid: 256 - components: - - type: Transform - pos: 5.5,-8.5 - parent: 179 - - uid: 318 - components: - - type: Transform - pos: 24.5,13.5 - parent: 179 -- proto: AirlockExternalGlass - entities: - - uid: 216 - components: - - type: Transform - pos: -1.5,-14.5 - parent: 179 -- proto: AirlockExternalGlassShuttleTransit - entities: - - uid: 1367 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 13.5,-16.5 - parent: 179 - - uid: 1368 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 13.5,-15.5 - parent: 179 -- proto: AirlockGlassShuttle - entities: - - uid: 204 - components: - - type: Transform - pos: -1.5,-16.5 - parent: 179 -- proto: AirlockMedicalGlass - entities: - - uid: 177 - components: - - type: Transform - pos: 26.5,4.5 - parent: 179 - - uid: 178 - components: - - type: Transform - pos: 20.5,3.5 - parent: 179 - - uid: 206 - components: - - type: Transform - pos: 16.5,3.5 - parent: 179 - - uid: 207 - components: - - type: Transform - pos: 15.5,3.5 - parent: 179 - - uid: 369 - components: - - type: Transform - pos: 26.5,-3.5 - parent: 179 - - uid: 370 - components: - - type: Transform - pos: 28.5,-0.5 - parent: 179 -- proto: AirlockScience - entities: - - uid: 24 - components: - - type: Transform - pos: 14.5,24.5 - parent: 179 - - uid: 47 - components: - - type: Transform - pos: 16.5,18.5 - parent: 179 - - uid: 102 - components: - - type: Transform - pos: 16.5,15.5 - parent: 179 - - uid: 306 - components: - - type: Transform - pos: 12.5,15.5 - parent: 179 -- proto: AirlockScienceGlass - entities: - - uid: 26 - components: - - type: Transform - pos: 14.5,20.5 - parent: 179 -- proto: AirlockShuttle - entities: - - uid: 116 - components: - - type: Transform - pos: 0.5,-16.5 - parent: 179 -- proto: AirSensor - entities: - - uid: 801 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,-3.5 - parent: 179 -- proto: AlwaysPoweredWallLight - entities: - - uid: 59 - components: - - type: Transform - pos: -14.5,-0.5 - parent: 179 - - uid: 330 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -8.5,8.5 - parent: 179 - - uid: 398 - components: - - type: Transform - pos: 4.5,-5.5 - parent: 179 - - uid: 451 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -8.5,9.5 - parent: 179 - - uid: 662 - components: - - type: Transform - pos: 11.5,14.5 - parent: 179 - - uid: 667 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 8.5,10.5 - parent: 179 - - uid: 669 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -17.5,4.5 - parent: 179 - - uid: 852 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -6.5,0.5 - parent: 179 - - uid: 907 - components: - - type: Transform - pos: -4.5,-5.5 - parent: 179 - - uid: 910 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -2.5,-3.5 - parent: 179 - - uid: 913 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 5.5,-3.5 - parent: 179 - - uid: 914 - components: - - type: Transform - pos: 4.5,3.5 - parent: 179 - - uid: 915 - components: - - type: Transform - pos: 6.5,7.5 - parent: 179 - - uid: 916 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,7.5 - parent: 179 - - uid: 917 - components: - - type: Transform - pos: -2.5,10.5 - parent: 179 - - uid: 918 - components: - - type: Transform - pos: 3.5,18.5 - parent: 179 - - uid: 921 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -13.5,1.5 - parent: 179 - - uid: 922 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,16.5 - parent: 179 - - uid: 923 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -7.5,12.5 - parent: 179 - - uid: 924 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 14.5,6.5 - parent: 179 - - uid: 926 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -13.5,17.5 - parent: 179 - - uid: 953 - components: - - type: Transform - pos: -14.5,16.5 - parent: 179 - - uid: 957 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 11.5,16.5 - parent: 179 - - uid: 1047 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,-13.5 - parent: 179 - - uid: 1235 - components: - - type: Transform - pos: -13.5,6.5 - parent: 179 - - uid: 1407 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 23.5,12.5 - parent: 179 -- proto: AmmoTechFab - entities: - - uid: 134 - components: - - type: Transform - pos: -16.5,-7.5 - parent: 179 -- proto: AnomalyLocator - entities: - - uid: 1086 - components: - - type: Transform - pos: 17.237877,19.653782 - parent: 179 -- proto: AnomalyScanner - entities: - - uid: 1085 - components: - - type: Transform - pos: 17.539398,19.352007 - parent: 179 -- proto: APCBasic - entities: - - uid: 753 - components: - - type: Transform - pos: -2.5,11.5 - parent: 179 - - type: Battery - startingCharge: 500000000 - maxCharge: 500000000 - - type: PowerNetworkBattery - supplyRampRate: 50000 - supplyRampTolerance: 100000 - maxSupply: 1000000 - maxChargeRate: 500000 - - uid: 1015 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -5.5,-14.5 - parent: 179 -- proto: ArrivalsShuttleTimer - entities: - - uid: 1191 - components: - - type: Transform - pos: -7.5,5.5 - parent: 179 -- proto: AtmosDeviceFanDirectional - entities: - - uid: 135 - components: - - type: Transform - pos: -1.5,-16.5 - parent: 179 - - uid: 142 - components: - - type: Transform - pos: 0.5,-16.5 - parent: 179 - - uid: 509 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 13.5,-16.5 - parent: 179 - - uid: 901 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 13.5,-15.5 - parent: 179 - - uid: 992 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -10.5,7.5 - parent: 179 - - uid: 993 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -8.5,7.5 - parent: 179 - - uid: 1348 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -9.5,7.5 - parent: 179 - - uid: 1550 - components: - - type: Transform - pos: 1.5,-16.5 - parent: 179 - - uid: 1551 - components: - - type: Transform - pos: -2.5,-16.5 - parent: 179 - - uid: 1552 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 7.5,-8.5 - parent: 179 - - uid: 1553 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 26.5,13.5 - parent: 179 -- proto: Autolathe - entities: - - uid: 1 - components: - - type: Transform - pos: 12.5,21.5 - parent: 179 - - uid: 446 - components: - - type: Transform - pos: -6.5,5.5 - parent: 179 -- proto: BasePirateUplinkRadioDebug - entities: - - uid: 1258 - components: - - type: Transform - pos: 1.2513101,7.779885 - parent: 179 -- proto: BaseSecurityUplinkRadioDebug - entities: - - uid: 1257 - components: - - type: Transform - pos: 1.5742267,7.5403013 - parent: 179 -- proto: BaseUplinkRadioDebug - entities: - - uid: 732 - components: - - type: Transform - pos: 0.95964336,7.5090513 - parent: 179 -- proto: Basketball - entities: - - uid: 951 - components: - - type: Transform - pos: -9.702013,9.68404 - parent: 179 - - uid: 952 - components: - - type: Transform - pos: -10.879096,9.579802 - parent: 179 -- proto: Beaker - entities: - - uid: 324 - components: - - type: Transform - pos: 4.718221,9.39097 - parent: 179 - - uid: 735 - components: - - type: Transform - pos: 4.739054,9.807927 - parent: 179 - - uid: 920 - components: - - type: Transform - pos: -4.293744,10.966518 - parent: 179 - - uid: 950 - components: - - type: Transform - pos: -4.293744,10.966518 - parent: 179 - - uid: 1564 - components: - - type: Transform - pos: 25.274069,7.5452614 - parent: 179 - - uid: 1565 - components: - - type: Transform - pos: 25.274069,7.2640114 - parent: 179 -- proto: BikeHorn - entities: - - uid: 672 - components: - - type: Transform - pos: 1.6443362,8.150127 - parent: 179 -- proto: BiomassReclaimer - entities: - - uid: 253 - components: - - type: Transform - pos: 5.5,24.5 - parent: 179 -- proto: BlastDoor - entities: - - uid: 202 - components: - - type: Transform - pos: -2.5,-14.5 - parent: 179 - - uid: 697 - components: - - type: Transform - pos: 1.5,-14.5 - parent: 179 - - uid: 698 - components: - - type: Transform - pos: 1.5,-16.5 - parent: 179 - - uid: 984 - components: - - type: Transform - pos: -2.5,-16.5 - parent: 179 -- proto: BlueprintLithograph - entities: - - uid: 1088 - components: - - type: Transform - pos: 13.5,17.5 - parent: 179 -- proto: BluespaceBeaker - entities: - - uid: 1497 - components: - - type: Transform - pos: 25.746582,8.709498 - parent: 179 - - uid: 1566 - components: - - type: Transform - pos: 25.384317,8.685886 - parent: 179 - - uid: 1567 - components: - - type: Transform - pos: 5.924169,9.654636 - parent: 179 - - uid: 1591 - components: - - type: Transform - pos: 5.6205535,9.51221 - parent: 179 -- proto: BluespaceMatterBinStockPart - entities: - - uid: 1254 - components: - - type: Transform - pos: -5.541236,8.310024 - parent: 179 -- proto: BoozeDispenser - entities: - - uid: 752 - components: - - type: Transform - pos: 7.5,12.5 - parent: 179 -- proto: BoxBeaker - entities: - - uid: 280 - components: - - type: Transform - pos: 5.163024,9.63072 - parent: 179 -- proto: BoxMailCapsulePrimed - entities: - - uid: 578 - components: - - type: Transform - pos: -2.5470388,-3.54282 - parent: 179 -- proto: BoxSurvivalNFOxygenExtended - entities: - - uid: 419 - components: - - type: Transform - pos: -10.598265,6.692403 - parent: 179 -- proto: Brutepack - entities: - - uid: 150 - components: - - type: Transform - pos: 18.601385,5.512907 - parent: 179 - - uid: 151 - components: - - type: Transform - pos: 18.476385,4.841032 - parent: 179 -- proto: Bucket - entities: - - uid: 691 - components: - - type: Transform - pos: 7.1447573,15.900927 - parent: 179 -- proto: CableApcExtension - entities: - - uid: 15 - components: - - type: Transform - pos: 5.5,15.5 - parent: 179 - - uid: 23 - components: - - type: Transform - pos: 3.5,15.5 - parent: 179 - - uid: 58 - components: - - type: Transform - pos: 8.5,15.5 - parent: 179 - - uid: 90 - components: - - type: Transform - pos: 4.5,15.5 - parent: 179 - - uid: 174 - components: - - type: Transform - pos: 21.5,7.5 - parent: 179 - - uid: 176 - components: - - type: Transform - pos: 21.5,8.5 - parent: 179 - - uid: 281 - components: - - type: Transform - pos: -13.5,4.5 - parent: 179 - - uid: 389 - components: - - type: Transform - pos: 7.5,15.5 - parent: 179 - - uid: 397 - components: - - type: Transform - pos: 26.5,10.5 - parent: 179 - - uid: 399 - components: - - type: Transform - pos: 25.5,10.5 - parent: 179 - - uid: 453 - components: - - type: Transform - pos: 6.5,15.5 - parent: 179 - - uid: 583 - components: - - type: Transform - pos: 21.5,6.5 - parent: 179 - - uid: 589 - components: - - type: Transform - pos: 22.5,10.5 - parent: 179 - - uid: 664 - components: - - type: Transform - pos: 23.5,10.5 - parent: 179 - - uid: 736 - components: - - type: Transform - pos: -2.5,9.5 - parent: 179 - - uid: 760 - components: - - type: Transform - pos: -2.5,10.5 - parent: 179 - - uid: 761 - components: - - type: Transform - pos: -15.5,5.5 - parent: 179 - - uid: 763 - components: - - type: Transform - pos: -2.5,11.5 - parent: 179 - - uid: 764 - components: - - type: Transform - pos: -1.5,11.5 - parent: 179 - - uid: 765 - components: - - type: Transform - pos: -7.5,0.5 - parent: 179 - - uid: 766 - components: - - type: Transform - pos: -0.5,11.5 - parent: 179 - - uid: 767 - components: - - type: Transform - pos: -3.5,10.5 - parent: 179 - - uid: 768 - components: - - type: Transform - pos: -4.5,10.5 - parent: 179 - - uid: 769 - components: - - type: Transform - pos: -5.5,10.5 - parent: 179 - - uid: 770 - components: - - type: Transform - pos: -6.5,10.5 - parent: 179 - - uid: 771 - components: - - type: Transform - pos: -2.5,8.5 - parent: 179 - - uid: 772 - components: - - type: Transform - pos: -2.5,7.5 - parent: 179 - - uid: 773 - components: - - type: Transform - pos: -2.5,6.5 - parent: 179 - - uid: 774 - components: - - type: Transform - pos: -2.5,5.5 - parent: 179 - - uid: 775 - components: - - type: Transform - pos: -3.5,5.5 - parent: 179 - - uid: 776 - components: - - type: Transform - pos: -4.5,5.5 - parent: 179 - - uid: 777 - components: - - type: Transform - pos: -5.5,5.5 - parent: 179 - - uid: 778 - components: - - type: Transform - pos: -6.5,5.5 - parent: 179 - - uid: 779 - components: - - type: Transform - pos: -6.5,4.5 - parent: 179 - - uid: 780 - components: - - type: Transform - pos: -7.5,4.5 - parent: 179 - - uid: 781 - components: - - type: Transform - pos: -8.5,4.5 - parent: 179 - - uid: 782 - components: - - type: Transform - pos: -9.5,4.5 - parent: 179 - - uid: 783 - components: - - type: Transform - pos: -10.5,4.5 - parent: 179 - - uid: 784 - components: - - type: Transform - pos: -11.5,4.5 - parent: 179 - - uid: 785 - components: - - type: Transform - pos: -12.5,4.5 - parent: 179 - - uid: 786 - components: - - type: Transform - pos: -12.5,3.5 - parent: 179 - - uid: 787 - components: - - type: Transform - pos: -12.5,2.5 - parent: 179 - - uid: 788 - components: - - type: Transform - pos: -12.5,1.5 - parent: 179 - - uid: 789 - components: - - type: Transform - pos: -12.5,0.5 - parent: 179 - - uid: 790 - components: - - type: Transform - pos: -12.5,-0.5 - parent: 179 - - uid: 791 - components: - - type: Transform - pos: -2.5,4.5 - parent: 179 - - uid: 792 - components: - - type: Transform - pos: -2.5,2.5 - parent: 179 - - uid: 793 - components: - - type: Transform - pos: -2.5,1.5 - parent: 179 - - uid: 794 - components: - - type: Transform - pos: -2.5,0.5 - parent: 179 - - uid: 795 - components: - - type: Transform - pos: -2.5,3.5 - parent: 179 - - uid: 796 - components: - - type: Transform - pos: -2.5,-0.5 - parent: 179 - - uid: 797 - components: - - type: Transform - pos: -2.5,-1.5 - parent: 179 - - uid: 798 - components: - - type: Transform - pos: -2.5,-2.5 - parent: 179 - - uid: 799 - components: - - type: Transform - pos: -2.5,-3.5 - parent: 179 - - uid: 802 - components: - - type: Transform - pos: -8.5,0.5 - parent: 179 - - uid: 803 - components: - - type: Transform - pos: 2.5,-2.5 - parent: 179 - - uid: 804 - components: - - type: Transform - pos: 2.5,-3.5 - parent: 179 - - uid: 805 - components: - - type: Transform - pos: -9.5,0.5 - parent: 179 - - uid: 806 - components: - - type: Transform - pos: -10.5,0.5 - parent: 179 - - uid: 807 - components: - - type: Transform - pos: -14.5,0.5 - parent: 179 - - uid: 808 - components: - - type: Transform - pos: -11.5,0.5 - parent: 179 - - uid: 809 - components: - - type: Transform - pos: -15.5,0.5 - parent: 179 - - uid: 810 - components: - - type: Transform - pos: -15.5,0.5 - parent: 179 - - uid: 811 - components: - - type: Transform - pos: -16.5,0.5 - parent: 179 - - uid: 812 - components: - - type: Transform - pos: -16.5,5.5 - parent: 179 - - uid: 813 - components: - - type: Transform - pos: -16.5,4.5 - parent: 179 - - uid: 814 - components: - - type: Transform - pos: -16.5,3.5 - parent: 179 - - uid: 815 - components: - - type: Transform - pos: -16.5,2.5 - parent: 179 - - uid: 816 - components: - - type: Transform - pos: -16.5,1.5 - parent: 179 - - uid: 817 - components: - - type: Transform - pos: 7.5,5.5 - parent: 179 - - uid: 818 - components: - - type: Transform - pos: 7.5,7.5 - parent: 179 - - uid: 819 - components: - - type: Transform - pos: 7.5,8.5 - parent: 179 - - uid: 820 - components: - - type: Transform - pos: 7.5,9.5 - parent: 179 - - uid: 821 - components: - - type: Transform - pos: 8.5,9.5 - parent: 179 - - uid: 822 - components: - - type: Transform - pos: 6.5,9.5 - parent: 179 - - uid: 823 - components: - - type: Transform - pos: 5.5,9.5 - parent: 179 - - uid: 824 - components: - - type: Transform - pos: 4.5,9.5 - parent: 179 - - uid: 825 - components: - - type: Transform - pos: 8.5,10.5 - parent: 179 - - uid: 826 - components: - - type: Transform - pos: 8.5,11.5 - parent: 179 - - uid: 827 - components: - - type: Transform - pos: 8.5,12.5 - parent: 179 - - uid: 828 - components: - - type: Transform - pos: 7.5,12.5 - parent: 179 - - uid: 829 - components: - - type: Transform - pos: 7.5,11.5 - parent: 179 - - uid: 830 - components: - - type: Transform - pos: 2.5,-5.5 - parent: 179 - - uid: 831 - components: - - type: Transform - pos: 2.5,-4.5 - parent: 179 - - uid: 832 - components: - - type: Transform - pos: 1.5,-5.5 - parent: 179 - - uid: 833 - components: - - type: Transform - pos: 0.5,-5.5 - parent: 179 - - uid: 834 - components: - - type: Transform - pos: -0.5,-5.5 - parent: 179 - - uid: 835 - components: - - type: Transform - pos: -1.5,-5.5 - parent: 179 - - uid: 836 - components: - - type: Transform - pos: -2.5,-5.5 - parent: 179 - - uid: 837 - components: - - type: Transform - pos: -3.5,-5.5 - parent: 179 - - uid: 838 - components: - - type: Transform - pos: -4.5,-5.5 - parent: 179 - - uid: 839 - components: - - type: Transform - pos: 1.5,11.5 - parent: 179 - - uid: 840 - components: - - type: Transform - pos: 2.5,11.5 - parent: 179 - - uid: 841 - components: - - type: Transform - pos: 0.5,11.5 - parent: 179 - - uid: 842 - components: - - type: Transform - pos: 2.5,12.5 - parent: 179 - - uid: 843 - components: - - type: Transform - pos: 2.5,13.5 - parent: 179 - - uid: 844 - components: - - type: Transform - pos: 2.5,14.5 - parent: 179 - - uid: 845 - components: - - type: Transform - pos: 2.5,15.5 - parent: 179 - - uid: 853 - components: - - type: Transform - pos: -3.5,-3.5 - parent: 179 - - uid: 854 - components: - - type: Transform - pos: -4.5,-3.5 - parent: 179 - - uid: 855 - components: - - type: Transform - pos: -5.5,-3.5 - parent: 179 - - uid: 856 - components: - - type: Transform - pos: -6.5,-3.5 - parent: 179 - - uid: 857 - components: - - type: Transform - pos: -6.5,-2.5 - parent: 179 - - uid: 858 - components: - - type: Transform - pos: -6.5,-1.5 - parent: 179 - - uid: 859 - components: - - type: Transform - pos: -6.5,-0.5 - parent: 179 - - uid: 860 - components: - - type: Transform - pos: -6.5,0.5 - parent: 179 - - uid: 861 - components: - - type: Transform - pos: -6.5,1.5 - parent: 179 - - uid: 862 - components: - - type: Transform - pos: -6.5,2.5 - parent: 179 - - uid: 872 - components: - - type: Transform - pos: 7.5,6.5 - parent: 179 - - uid: 873 - components: - - type: Transform - pos: 8.5,21.5 - parent: 179 - - uid: 877 - components: - - type: Transform - pos: -6.5,3.5 - parent: 179 - - uid: 878 - components: - - type: Transform - pos: -2.5,-4.5 - parent: 179 - - uid: 879 - components: - - type: Transform - pos: -1.5,-4.5 - parent: 179 - - uid: 880 - components: - - type: Transform - pos: -0.5,-4.5 - parent: 179 - - uid: 881 - components: - - type: Transform - pos: 0.5,-4.5 - parent: 179 - - uid: 882 - components: - - type: Transform - pos: 1.5,-4.5 - parent: 179 - - uid: 883 - components: - - type: Transform - pos: 2.5,-4.5 - parent: 179 - - uid: 884 - components: - - type: Transform - pos: 3.5,-4.5 - parent: 179 - - uid: 885 - components: - - type: Transform - pos: 4.5,-4.5 - parent: 179 - - uid: 886 - components: - - type: Transform - pos: 5.5,-4.5 - parent: 179 - - uid: 887 - components: - - type: Transform - pos: 6.5,-4.5 - parent: 179 - - uid: 888 - components: - - type: Transform - pos: 7.5,-4.5 - parent: 179 - - uid: 889 - components: - - type: Transform - pos: 8.5,-4.5 - parent: 179 - - uid: 890 - components: - - type: Transform - pos: 8.5,-3.5 - parent: 179 - - uid: 891 - components: - - type: Transform - pos: 8.5,-2.5 - parent: 179 - - uid: 892 - components: - - type: Transform - pos: 8.5,-1.5 - parent: 179 - - uid: 893 - components: - - type: Transform - pos: 8.5,-0.5 - parent: 179 - - uid: 894 - components: - - type: Transform - pos: 8.5,0.5 - parent: 179 - - uid: 895 - components: - - type: Transform - pos: 8.5,1.5 - parent: 179 - - uid: 896 - components: - - type: Transform - pos: 8.5,2.5 - parent: 179 - - uid: 897 - components: - - type: Transform - pos: 8.5,3.5 - parent: 179 - - uid: 898 - components: - - type: Transform - pos: 8.5,4.5 - parent: 179 - - uid: 899 - components: - - type: Transform - pos: 8.5,5.5 - parent: 179 - - uid: 900 - components: - - type: Transform - pos: -14.5,5.5 - parent: 179 - - uid: 905 - components: - - type: Transform - pos: -12.5,5.5 - parent: 179 - - uid: 906 - components: - - type: Transform - pos: -14.5,4.5 - parent: 179 - - uid: 908 - components: - - type: Transform - pos: -15.5,4.5 - parent: 179 - - uid: 909 - components: - - type: Transform - pos: 8.5,20.5 - parent: 179 - - uid: 970 - components: - - type: Transform - pos: 9.5,12.5 - parent: 179 - - uid: 971 - components: - - type: Transform - pos: 10.5,12.5 - parent: 179 - - uid: 972 - components: - - type: Transform - pos: 11.5,12.5 - parent: 179 - - uid: 973 - components: - - type: Transform - pos: 12.5,12.5 - parent: 179 - - uid: 974 - components: - - type: Transform - pos: 13.5,12.5 - parent: 179 - - uid: 1026 - components: - - type: Transform - pos: -5.5,-14.5 - parent: 179 - - uid: 1027 - components: - - type: Transform - pos: -5.5,-13.5 - parent: 179 - - uid: 1028 - components: - - type: Transform - pos: -5.5,-12.5 - parent: 179 - - uid: 1029 - components: - - type: Transform - pos: -4.5,-12.5 - parent: 179 - - uid: 1030 - components: - - type: Transform - pos: -3.5,-12.5 - parent: 179 - - uid: 1031 - components: - - type: Transform - pos: -2.5,-12.5 - parent: 179 - - uid: 1032 - components: - - type: Transform - pos: -1.5,-12.5 - parent: 179 - - uid: 1033 - components: - - type: Transform - pos: -0.5,-12.5 - parent: 179 - - uid: 1034 - components: - - type: Transform - pos: 0.5,-12.5 - parent: 179 - - uid: 1035 - components: - - type: Transform - pos: 1.5,-12.5 - parent: 179 - - uid: 1036 - components: - - type: Transform - pos: 2.5,-12.5 - parent: 179 - - uid: 1037 - components: - - type: Transform - pos: 3.5,-12.5 - parent: 179 - - uid: 1038 - components: - - type: Transform - pos: 0.5,-13.5 - parent: 179 - - uid: 1039 - components: - - type: Transform - pos: 0.5,-14.5 - parent: 179 - - uid: 1040 - components: - - type: Transform - pos: 0.5,-15.5 - parent: 179 - - uid: 1041 - components: - - type: Transform - pos: -1.5,-13.5 - parent: 179 - - uid: 1042 - components: - - type: Transform - pos: -1.5,-14.5 - parent: 179 - - uid: 1043 - components: - - type: Transform - pos: -1.5,-15.5 - parent: 179 - - uid: 1044 - components: - - type: Transform - pos: 4.5,-12.5 - parent: 179 - - uid: 1045 - components: - - type: Transform - pos: 4.5,-13.5 - parent: 179 - - uid: 1051 - components: - - type: Transform - pos: 9.5,15.5 - parent: 179 - - uid: 1052 - components: - - type: Transform - pos: 9.5,16.5 - parent: 179 - - uid: 1053 - components: - - type: Transform - pos: 9.5,17.5 - parent: 179 - - uid: 1054 - components: - - type: Transform - pos: 9.5,18.5 - parent: 179 - - uid: 1055 - components: - - type: Transform - pos: 9.5,19.5 - parent: 179 - - uid: 1056 - components: - - type: Transform - pos: 9.5,20.5 - parent: 179 - - uid: 1057 - components: - - type: Transform - pos: 10.5,20.5 - parent: 179 - - uid: 1058 - components: - - type: Transform - pos: 11.5,20.5 - parent: 179 - - uid: 1059 - components: - - type: Transform - pos: 12.5,20.5 - parent: 179 - - uid: 1060 - components: - - type: Transform - pos: 13.5,20.5 - parent: 179 - - uid: 1061 - components: - - type: Transform - pos: 14.5,20.5 - parent: 179 - - uid: 1062 - components: - - type: Transform - pos: 15.5,20.5 - parent: 179 - - uid: 1063 - components: - - type: Transform - pos: 16.5,20.5 - parent: 179 - - uid: 1064 - components: - - type: Transform - pos: 16.5,21.5 - parent: 179 - - uid: 1065 - components: - - type: Transform - pos: 16.5,22.5 - parent: 179 - - uid: 1066 - components: - - type: Transform - pos: 16.5,23.5 - parent: 179 - - uid: 1067 - components: - - type: Transform - pos: 16.5,24.5 - parent: 179 - - uid: 1068 - components: - - type: Transform - pos: 16.5,25.5 - parent: 179 - - uid: 1069 - components: - - type: Transform - pos: 16.5,26.5 - parent: 179 - - uid: 1070 - components: - - type: Transform - pos: 16.5,27.5 - parent: 179 - - uid: 1079 - components: - - type: Transform - pos: 15.5,24.5 - parent: 179 - - uid: 1080 - components: - - type: Transform - pos: 14.5,24.5 - parent: 179 - - uid: 1081 - components: - - type: Transform - pos: 13.5,24.5 - parent: 179 - - uid: 1082 - components: - - type: Transform - pos: 12.5,24.5 - parent: 179 - - uid: 1097 - components: - - type: Transform - pos: 8.5,14.5 - parent: 179 - - uid: 1098 - components: - - type: Transform - pos: 8.5,13.5 - parent: 179 - - uid: 1099 - components: - - type: Transform - pos: 9.5,13.5 - parent: 179 - - uid: 1100 - components: - - type: Transform - pos: 10.5,13.5 - parent: 179 - - uid: 1101 - components: - - type: Transform - pos: 11.5,13.5 - parent: 179 - - uid: 1102 - components: - - type: Transform - pos: 12.5,13.5 - parent: 179 - - uid: 1103 - components: - - type: Transform - pos: 13.5,13.5 - parent: 179 - - uid: 1104 - components: - - type: Transform - pos: 14.5,13.5 - parent: 179 - - uid: 1105 - components: - - type: Transform - pos: 15.5,13.5 - parent: 179 - - uid: 1106 - components: - - type: Transform - pos: 16.5,13.5 - parent: 179 - - uid: 1107 - components: - - type: Transform - pos: 17.5,13.5 - parent: 179 - - uid: 1108 - components: - - type: Transform - pos: 18.5,13.5 - parent: 179 - - uid: 1109 - components: - - type: Transform - pos: 19.5,13.5 - parent: 179 - - uid: 1110 - components: - - type: Transform - pos: 20.5,13.5 - parent: 179 - - uid: 1111 - components: - - type: Transform - pos: 21.5,13.5 - parent: 179 - - uid: 1112 - components: - - type: Transform - pos: 22.5,13.5 - parent: 179 - - uid: 1113 - components: - - type: Transform - pos: 23.5,13.5 - parent: 179 - - uid: 1114 - components: - - type: Transform - pos: 24.5,13.5 - parent: 179 - - uid: 1115 - components: - - type: Transform - pos: 25.5,13.5 - parent: 179 - - uid: 1116 - components: - - type: Transform - pos: 16.5,12.5 - parent: 179 - - uid: 1117 - components: - - type: Transform - pos: 16.5,11.5 - parent: 179 - - uid: 1118 - components: - - type: Transform - pos: 16.5,10.5 - parent: 179 - - uid: 1119 - components: - - type: Transform - pos: 16.5,9.5 - parent: 179 - - uid: 1120 - components: - - type: Transform - pos: 16.5,8.5 - parent: 179 - - uid: 1121 - components: - - type: Transform - pos: 16.5,7.5 - parent: 179 - - uid: 1122 - components: - - type: Transform - pos: 16.5,6.5 - parent: 179 - - uid: 1123 - components: - - type: Transform - pos: 16.5,5.5 - parent: 179 - - uid: 1124 - components: - - type: Transform - pos: 16.5,4.5 - parent: 179 - - uid: 1125 - components: - - type: Transform - pos: 16.5,3.5 - parent: 179 - - uid: 1126 - components: - - type: Transform - pos: 16.5,2.5 - parent: 179 - - uid: 1127 - components: - - type: Transform - pos: 16.5,1.5 - parent: 179 - - uid: 1128 - components: - - type: Transform - pos: 16.5,0.5 - parent: 179 - - uid: 1129 - components: - - type: Transform - pos: 16.5,-0.5 - parent: 179 - - uid: 1130 - components: - - type: Transform - pos: 16.5,-1.5 - parent: 179 - - uid: 1131 - components: - - type: Transform - pos: 16.5,-2.5 - parent: 179 - - uid: 1132 - components: - - type: Transform - pos: 16.5,-3.5 - parent: 179 - - uid: 1133 - components: - - type: Transform - pos: 17.5,-3.5 - parent: 179 - - uid: 1134 - components: - - type: Transform - pos: 18.5,-3.5 - parent: 179 - - uid: 1135 - components: - - type: Transform - pos: 19.5,-3.5 - parent: 179 - - uid: 1136 - components: - - type: Transform - pos: 20.5,-3.5 - parent: 179 - - uid: 1137 - components: - - type: Transform - pos: 21.5,-3.5 - parent: 179 - - uid: 1138 - components: - - type: Transform - pos: 22.5,-3.5 - parent: 179 - - uid: 1139 - components: - - type: Transform - pos: 23.5,-3.5 - parent: 179 - - uid: 1140 - components: - - type: Transform - pos: 24.5,-3.5 - parent: 179 - - uid: 1141 - components: - - type: Transform - pos: 25.5,-3.5 - parent: 179 - - uid: 1142 - components: - - type: Transform - pos: 26.5,-3.5 - parent: 179 - - uid: 1143 - components: - - type: Transform - pos: 27.5,-3.5 - parent: 179 - - uid: 1144 - components: - - type: Transform - pos: 28.5,-3.5 - parent: 179 - - uid: 1145 - components: - - type: Transform - pos: 17.5,2.5 - parent: 179 - - uid: 1146 - components: - - type: Transform - pos: 18.5,2.5 - parent: 179 - - uid: 1147 - components: - - type: Transform - pos: 19.5,2.5 - parent: 179 - - uid: 1148 - components: - - type: Transform - pos: 20.5,2.5 - parent: 179 - - uid: 1149 - components: - - type: Transform - pos: 21.5,2.5 - parent: 179 - - uid: 1150 - components: - - type: Transform - pos: 22.5,2.5 - parent: 179 - - uid: 1151 - components: - - type: Transform - pos: 23.5,2.5 - parent: 179 - - uid: 1152 - components: - - type: Transform - pos: 24.5,2.5 - parent: 179 - - uid: 1153 - components: - - type: Transform - pos: 25.5,2.5 - parent: 179 - - uid: 1154 - components: - - type: Transform - pos: 26.5,2.5 - parent: 179 - - uid: 1155 - components: - - type: Transform - pos: 27.5,2.5 - parent: 179 - - uid: 1156 - components: - - type: Transform - pos: 28.5,2.5 - parent: 179 - - uid: 1157 - components: - - type: Transform - pos: 26.5,3.5 - parent: 179 - - uid: 1158 - components: - - type: Transform - pos: 26.5,4.5 - parent: 179 - - uid: 1159 - components: - - type: Transform - pos: 26.5,5.5 - parent: 179 - - uid: 1160 - components: - - type: Transform - pos: 26.5,6.5 - parent: 179 - - uid: 1161 - components: - - type: Transform - pos: 26.5,7.5 - parent: 179 - - uid: 1162 - components: - - type: Transform - pos: 26.5,8.5 - parent: 179 - - uid: 1163 - components: - - type: Transform - pos: 26.5,9.5 - parent: 179 - - uid: 1164 - components: - - type: Transform - pos: 21.5,10.5 - parent: 179 - - uid: 1165 - components: - - type: Transform - pos: 21.5,9.5 - parent: 179 - - uid: 1166 - components: - - type: Transform - pos: 16.5,19.5 - parent: 179 - - uid: 1167 - components: - - type: Transform - pos: 16.5,18.5 - parent: 179 - - uid: 1168 - components: - - type: Transform - pos: 16.5,17.5 - parent: 179 - - uid: 1169 - components: - - type: Transform - pos: 16.5,16.5 - parent: 179 - - uid: 1170 - components: - - type: Transform - pos: 16.5,15.5 - parent: 179 - - uid: 1171 - components: - - type: Transform - pos: 16.5,14.5 - parent: 179 - - uid: 1177 - components: - - type: Transform - pos: 8.5,22.5 - parent: 179 - - uid: 1178 - components: - - type: Transform - pos: 8.5,23.5 - parent: 179 - - uid: 1179 - components: - - type: Transform - pos: 8.5,24.5 - parent: 179 - - uid: 1180 - components: - - type: Transform - pos: 8.5,25.5 - parent: 179 - - uid: 1304 - components: - - type: Transform - pos: -10.5,9.5 - parent: 179 - - uid: 1305 - components: - - type: Transform - pos: -9.5,5.5 - parent: 179 - - uid: 1306 - components: - - type: Transform - pos: -9.5,6.5 - parent: 179 - - uid: 1307 - components: - - type: Transform - pos: -9.5,7.5 - parent: 179 - - uid: 1308 - components: - - type: Transform - pos: -9.5,8.5 - parent: 179 - - uid: 1309 - components: - - type: Transform - pos: -9.5,9.5 - parent: 179 - - uid: 1310 - components: - - type: Transform - pos: -11.5,9.5 - parent: 179 - - uid: 1311 - components: - - type: Transform - pos: -12.5,9.5 - parent: 179 - - uid: 1312 - components: - - type: Transform - pos: -13.5,9.5 - parent: 179 - - uid: 1313 - components: - - type: Transform - pos: -14.5,9.5 - parent: 179 - - uid: 1314 - components: - - type: Transform - pos: -14.5,10.5 - parent: 179 - - uid: 1315 - components: - - type: Transform - pos: -14.5,11.5 - parent: 179 - - uid: 1316 - components: - - type: Transform - pos: -14.5,12.5 - parent: 179 - - uid: 1317 - components: - - type: Transform - pos: -14.5,13.5 - parent: 179 - - uid: 1318 - components: - - type: Transform - pos: -14.5,14.5 - parent: 179 - - uid: 1319 - components: - - type: Transform - pos: -14.5,15.5 - parent: 179 - - uid: 1320 - components: - - type: Transform - pos: -14.5,16.5 - parent: 179 - - uid: 1321 - components: - - type: Transform - pos: -13.5,16.5 - parent: 179 - - uid: 1322 - components: - - type: Transform - pos: -12.5,16.5 - parent: 179 - - uid: 1323 - components: - - type: Transform - pos: -11.5,16.5 - parent: 179 - - uid: 1324 - components: - - type: Transform - pos: -10.5,16.5 - parent: 179 - - uid: 1325 - components: - - type: Transform - pos: -9.5,16.5 - parent: 179 - - uid: 1326 - components: - - type: Transform - pos: -8.5,16.5 - parent: 179 - - uid: 1327 - components: - - type: Transform - pos: -7.5,16.5 - parent: 179 - - uid: 1328 - components: - - type: Transform - pos: -6.5,16.5 - parent: 179 - - uid: 1329 - components: - - type: Transform - pos: -5.5,16.5 - parent: 179 - - uid: 1330 - components: - - type: Transform - pos: -4.5,16.5 - parent: 179 - - uid: 1331 - components: - - type: Transform - pos: -3.5,16.5 - parent: 179 - - uid: 1332 - components: - - type: Transform - pos: -2.5,16.5 - parent: 179 - - uid: 1333 - components: - - type: Transform - pos: -1.5,16.5 - parent: 179 - - uid: 1334 - components: - - type: Transform - pos: -0.5,16.5 - parent: 179 - - uid: 1337 - components: - - type: Transform - pos: -12.5,-1.5 - parent: 179 - - uid: 1338 - components: - - type: Transform - pos: -12.5,-2.5 - parent: 179 - - uid: 1339 - components: - - type: Transform - pos: 9.5,-9.5 - parent: 179 - - uid: 1340 - components: - - type: Transform - pos: -12.5,-3.5 - parent: 179 - - uid: 1349 - components: - - type: Transform - pos: 17.5,10.5 - parent: 179 - - uid: 1350 - components: - - type: Transform - pos: 18.5,10.5 - parent: 179 - - uid: 1351 - components: - - type: Transform - pos: 19.5,10.5 - parent: 179 - - uid: 1352 - components: - - type: Transform - pos: 20.5,10.5 - parent: 179 - - uid: 1358 - components: - - type: Transform - pos: 3.5,3.5 - parent: 179 - - uid: 1359 - components: - - type: Transform - pos: 2.5,3.5 - parent: 179 - - uid: 1369 - components: - - type: Transform - pos: 4.5,-11.5 - parent: 179 - - uid: 1370 - components: - - type: Transform - pos: 4.5,-10.5 - parent: 179 - - uid: 1371 - components: - - type: Transform - pos: 4.5,-9.5 - parent: 179 - - uid: 1372 - components: - - type: Transform - pos: 4.5,-8.5 - parent: 179 - - uid: 1373 - components: - - type: Transform - pos: 9.5,-8.5 - parent: 179 - - uid: 1374 - components: - - type: Transform - pos: 8.5,-8.5 - parent: 179 - - uid: 1375 - components: - - type: Transform - pos: 7.5,-8.5 - parent: 179 - - uid: 1376 - components: - - type: Transform - pos: 6.5,-8.5 - parent: 179 - - uid: 1377 - components: - - type: Transform - pos: 5.5,-8.5 - parent: 179 - - uid: 1378 - components: - - type: Transform - pos: 9.5,-10.5 - parent: 179 - - uid: 1379 - components: - - type: Transform - pos: 9.5,-11.5 - parent: 179 - - uid: 1380 - components: - - type: Transform - pos: 9.5,-12.5 - parent: 179 - - uid: 1381 - components: - - type: Transform - pos: 9.5,-13.5 - parent: 179 - - uid: 1382 - components: - - type: Transform - pos: 9.5,-14.5 - parent: 179 - - uid: 1383 - components: - - type: Transform - pos: 9.5,-15.5 - parent: 179 - - uid: 1384 - components: - - type: Transform - pos: 10.5,-15.5 - parent: 179 - - uid: 1385 - components: - - type: Transform - pos: 11.5,-15.5 - parent: 179 - - uid: 1386 - components: - - type: Transform - pos: 12.5,-15.5 - parent: 179 - - uid: 1389 - components: - - type: Transform - pos: -12.5,-4.5 - parent: 179 - - uid: 1411 - components: - - type: Transform - pos: -15.5,9.5 - parent: 179 - - uid: 1415 - components: - - type: Transform - pos: -5.5,-6.5 - parent: 179 - - uid: 1416 - components: - - type: Transform - pos: -12.5,-5.5 - parent: 179 - - uid: 1434 - components: - - type: Transform - pos: 1.5,3.5 - parent: 179 - - uid: 1435 - components: - - type: Transform - pos: -12.5,-6.5 - parent: 179 - - uid: 1436 - components: - - type: Transform - pos: -13.5,-6.5 - parent: 179 - - uid: 1437 - components: - - type: Transform - pos: -14.5,-6.5 - parent: 179 - - uid: 1447 - components: - - type: Transform - pos: 0.5,3.5 - parent: 179 - - uid: 1448 - components: - - type: Transform - pos: -0.5,3.5 - parent: 179 - - uid: 1449 - components: - - type: Transform - pos: -1.5,3.5 - parent: 179 - - uid: 1469 - components: - - type: Transform - pos: 15.5,7.5 - parent: 179 - - uid: 1470 - components: - - type: Transform - pos: 14.5,7.5 - parent: 179 - - uid: 1471 - components: - - type: Transform - pos: 13.5,7.5 - parent: 179 - - uid: 1472 - components: - - type: Transform - pos: 12.5,7.5 - parent: 179 - - uid: 1473 - components: - - type: Transform - pos: 11.5,7.5 - parent: 179 - - uid: 1474 - components: - - type: Transform - pos: 10.5,7.5 - parent: 179 - - uid: 1475 - components: - - type: Transform - pos: -5.5,-5.5 - parent: 179 - - uid: 1511 - components: - - type: Transform - pos: 24.5,10.5 - parent: 179 -- proto: CableApcStack - entities: - - uid: 70 - components: - - type: Transform - pos: 9.6740055,21.752274 - parent: 179 - - uid: 183 - components: - - type: Transform - pos: -6.6863613,7.351646 - parent: 179 - - uid: 351 - components: - - type: Transform - pos: 9.715672,21.418941 - parent: 179 - - uid: 537 - components: - - type: Transform - pos: -16.428322,-2.6005697 - parent: 179 - - uid: 538 - components: - - type: Transform - pos: -16.574154,-2.4443197 - parent: 179 -- proto: CableHV - entities: - - uid: 1019 - components: - - type: Transform - pos: -6.5,-13.5 - parent: 179 - - uid: 1020 - components: - - type: Transform - pos: -6.5,-12.5 - parent: 179 - - uid: 1021 - components: - - type: Transform - pos: -6.5,-11.5 - parent: 179 - - uid: 1269 - components: - - type: Transform - pos: -6.5,-10.5 - parent: 179 - - uid: 1270 - components: - - type: Transform - pos: -6.5,-9.5 - parent: 179 - - uid: 1271 - components: - - type: Transform - pos: -6.5,-8.5 - parent: 179 -- proto: CableHVStack - entities: - - uid: 184 - components: - - type: Transform - pos: -6.665528,7.840053 - parent: 179 -- proto: CableMV - entities: - - uid: 1023 - components: - - type: Transform - pos: -6.5,-13.5 - parent: 179 - - uid: 1024 - components: - - type: Transform - pos: -5.5,-13.5 - parent: 179 - - uid: 1025 - components: - - type: Transform - pos: -5.5,-14.5 - parent: 179 -- proto: CableMVStack - entities: - - uid: 325 - components: - - type: Transform - pos: -6.665528,7.5601244 - parent: 179 -- proto: CableTerminal - entities: - - uid: 1022 - components: - - type: Transform - pos: -6.5,-11.5 - parent: 179 -- proto: CannonBall - entities: - - uid: 954 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -1.7637842,17.141552 - parent: 179 - - uid: 1430 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -1.5867009,17.516552 - parent: 179 - - uid: 1431 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -1.3679509,17.15197 - parent: 179 -- proto: CapacitorStockPart - entities: - - uid: 704 - components: - - type: Transform - pos: -4.2429085,8.882941 - parent: 179 -- proto: CaptainIDCard - entities: - - uid: 726 - components: - - type: Transform - pos: 1.0387614,8.772884 - parent: 179 -- proto: CaptainSabre - entities: - - uid: 579 - components: - - type: Transform - pos: -2.0626638,-3.370945 - parent: 179 -- proto: CargoPallet - entities: - - uid: 1246 - components: - - type: Transform - pos: -2.5,-7.5 - parent: 179 - - uid: 1247 - components: - - type: Transform - pos: -2.5,-8.5 - parent: 179 - - uid: 1279 - components: - - type: Transform - pos: -1.5,-8.5 - parent: 179 - - uid: 1280 - components: - - type: Transform - pos: -1.5,-7.5 - parent: 179 -- proto: CargoPalletBuy - entities: - - uid: 1278 - components: - - type: Transform - pos: -0.5,-7.5 - parent: 179 - - uid: 1281 - components: - - type: Transform - pos: -0.5,-8.5 - parent: 179 - - uid: 1282 - components: - - type: Transform - pos: 0.5,-7.5 - parent: 179 - - uid: 1283 - components: - - type: Transform - pos: 0.5,-8.5 - parent: 179 -- proto: CargoPalletSell - entities: - - uid: 870 - components: - - type: Transform - pos: -4.5,-7.5 - parent: 179 - - uid: 1244 - components: - - type: Transform - pos: -3.5,-8.5 - parent: 179 - - uid: 1245 - components: - - type: Transform - pos: -3.5,-7.5 - parent: 179 - - uid: 1294 - components: - - type: Transform - pos: -4.5,-8.5 - parent: 179 -- proto: CargoTelepad - entities: - - uid: 1296 - components: - - type: Transform - pos: -0.5,-5.5 - parent: 179 -- proto: Catwalk - entities: - - uid: 2 - components: - - type: Transform - pos: 13.5,24.5 - parent: 179 - - uid: 7 - components: - - type: Transform - pos: 6.5,24.5 - parent: 179 - - uid: 20 - components: - - type: Transform - pos: 6.5,20.5 - parent: 179 - - uid: 120 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,18.5 - parent: 179 - - uid: 246 - components: - - type: Transform - pos: -6.5,-6.5 - parent: 179 - - uid: 247 - components: - - type: Transform - pos: -8.5,-6.5 - parent: 179 - - uid: 252 - components: - - type: Transform - pos: 4.5,-8.5 - parent: 179 - - uid: 269 - components: - - type: Transform - pos: 12.5,10.5 - parent: 179 - - uid: 286 - components: - - type: Transform - pos: 2.5,-11.5 - parent: 179 - - uid: 287 - components: - - type: Transform - pos: -4.5,-11.5 - parent: 179 - - uid: 308 - components: - - type: Transform - pos: -2.5,-12.5 - parent: 179 - - uid: 309 - components: - - type: Transform - pos: 1.5,-12.5 - parent: 179 - - uid: 333 - components: - - type: Transform - pos: 4.5,-13.5 - parent: 179 - - uid: 334 - components: - - type: Transform - pos: -5.5,-13.5 - parent: 179 - - uid: 345 - components: - - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,0.5 - parent: 179 - - uid: 346 - components: - - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,1.5 - parent: 179 - - uid: 347 - components: - - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,2.5 - parent: 179 - - uid: 348 - components: - - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,3.5 - parent: 179 - - uid: 349 - components: - - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,4.5 - parent: 179 - - uid: 403 - components: - - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-0.5 - parent: 179 - - uid: 404 - components: - - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-1.5 - parent: 179 - - uid: 405 - components: - - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-2.5 - parent: 179 - - uid: 406 - components: - - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-3.5 - parent: 179 - - uid: 407 - components: - - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-4.5 - parent: 179 - - uid: 408 - components: - - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-5.5 - parent: 179 - - uid: 409 - components: - - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-6.5 - parent: 179 - - uid: 410 - components: - - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-7.5 - parent: 179 - - uid: 411 - components: - - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-8.5 - parent: 179 - - uid: 412 - components: - - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-9.5 - parent: 179 - - uid: 413 - components: - - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-10.5 - parent: 179 - - uid: 414 - components: - - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-11.5 - parent: 179 - - uid: 415 - components: - - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 8.5,-8.5 - parent: 179 - - uid: 438 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -9.5,-0.5 - parent: 179 - - uid: 442 - components: - - type: Transform - pos: -9.5,8.5 - parent: 179 - - uid: 514 - components: - - type: Transform - pos: -10.5,8.5 - parent: 179 - - uid: 541 - components: - - type: Transform - pos: -11.5,-6.5 - parent: 179 - - uid: 542 - components: - - type: Transform - pos: -9.5,-6.5 - parent: 179 - - uid: 695 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -8.5,8.5 - parent: 179 - - uid: 1445 - components: - - type: Transform - pos: -16.5,-1.5 - parent: 179 - - uid: 1446 - components: - - type: Transform - pos: -15.5,-1.5 - parent: 179 -- proto: Chair - entities: - - uid: 580 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 14.5,6.5 - parent: 179 - - uid: 581 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 14.5,8.5 - parent: 179 - - uid: 582 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 14.5,7.5 - parent: 179 -- proto: ChairOfficeDark - entities: - - uid: 380 - components: - - type: Transform - rot: 3.1415926535897967 rad - pos: 0.5,-6.5 - parent: 179 -- proto: ChairOfficeLight - entities: - - uid: 576 - components: - - type: Transform - rot: 4.71238898038469 rad - pos: 19.5,4.5 - parent: 179 - - uid: 577 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 20.5,5.5 - parent: 179 -- proto: ChemDispenser - entities: - - uid: 750 - components: - - type: Transform - pos: 7.5,11.5 - parent: 179 -- proto: ChemicalPayload - entities: - - uid: 432 - components: - - type: Transform - pos: 6.4651074,9.828774 - parent: 179 -- proto: ChemMaster - entities: - - uid: 311 - components: - - type: Transform - pos: 8.5,11.5 - parent: 179 -- proto: ChemMasterMachineCircuitboard - entities: - - uid: 718 - components: - - type: Transform - pos: -4.5458,10.514079 - parent: 179 -- proto: CircuitImprinter - entities: - - uid: 332 - components: - - type: Transform - pos: -6.5,4.5 - parent: 179 - - uid: 506 - components: - - type: Transform - pos: 11.5,21.5 - parent: 179 -- proto: ClosetEmergencyFilledRandom - entities: - - uid: 319 - components: - - type: Transform - pos: 1.5,-10.5 - parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - uid: 322 - components: - - type: Transform - pos: 0.5,-10.5 - parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: ClosetRadiationSuitFilled - entities: - - uid: 1363 - components: - - type: Transform - pos: -6.5,-5.5 - parent: 179 -- proto: ClosetToolFilled - entities: - - uid: 526 - components: - - type: Transform - pos: -11.5,-3.5 - parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 1.9853759 - - 7.468795 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - uid: 527 - components: - - type: Transform - pos: -11.5,-2.5 - parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 1.9853759 - - 7.468795 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: ClothingBackpackDuffelNfsdTrackingBundle - entities: - - uid: 175 - components: - - type: Transform - pos: -2.1876638,-3.38657 - parent: 179 -- proto: ClothingBeltQuiverCrossbowFilledPlasma - entities: - - uid: 1619 - components: - - type: Transform - pos: -4.1021323,-3.2949362 - parent: 179 -- proto: ClothingBeltUtilityFilled - entities: - - uid: 427 - components: - - type: Transform - pos: -1.895102,-10.33495 - parent: 179 - - uid: 428 - components: - - type: Transform - pos: -1.770102,-10.63182 - parent: 179 -- proto: ClothingHandsGlovesColorYellow - entities: - - uid: 454 - components: - - type: Transform - pos: -0.78741443,4.322194 - parent: 179 -- proto: ClothingHeadHatWelding - entities: - - uid: 344 - components: - - type: Transform - pos: 0.7198646,4.374314 - parent: 179 -- proto: ClothingHeadsetAltCentCom - entities: - - uid: 1360 - components: - - type: Transform - pos: -2.586483,10.492826 - parent: 179 -- proto: ClothingMaskBreath - entities: - - uid: 955 - components: - - type: Transform - pos: -10.595239,6.1907988 - parent: 179 -- proto: ClothingMaskGas - entities: - - uid: 425 - components: - - type: Transform - pos: -0.2880585,-10.69432 - parent: 179 -- proto: ClothingModsuitAtmostechPowerCell - entities: - - uid: 270 - components: - - type: Transform - pos: -10.608681,4.536153 - parent: 179 -- proto: ClothingOuterVest - entities: - - uid: 426 - components: - - type: Transform - pos: -0.9130585,-10.66307 - parent: 179 -- proto: ClothingShoesBootsMag - entities: - - uid: 725 - components: - - type: Transform - pos: 0.5172012,8.121316 - parent: 179 -- proto: ClothingShoesBootsMagGaloshes - entities: - - uid: 1208 - components: - - type: Transform - pos: 0.5613978,8.433816 - parent: 179 -- proto: ClothingShoesBootsMagSecurityFilled - entities: - - uid: 1210 - components: - - type: Transform - pos: 0.26973104,8.662983 - parent: 179 -- proto: ClothingShoesBootsMagPirateFilled - entities: - - uid: 1206 - components: - - type: Transform - pos: 0.16303456,8.308816 - parent: 179 -- proto: ClothingUniformJumpsuitEngineering - entities: - - uid: 424 - components: - - type: Transform - pos: -0.6474335,-10.27245 - parent: 179 -- proto: ClownPDA - entities: - - uid: 91 - components: - - type: Transform - pos: -15.5,2.5 - parent: 179 - - uid: 762 - components: - - type: Transform - pos: -14.5,1.5 - parent: 179 - - uid: 864 - components: - - type: Transform - pos: -14.5,2.5 - parent: 179 - - uid: 912 - components: - - type: Transform - pos: -15.5,1.5 - parent: 179 -- proto: ComputerAdvancedRadar - entities: - - uid: 694 - components: - - type: Transform - pos: -1.5,3.5 - parent: 179 -- proto: ComputerAnalysisConsole - entities: - - uid: 1083 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 15.5,23.5 - parent: 179 - - type: DeviceLinkSource - linkedPorts: - 1078: - - ArtifactAnalyzerSender: ArtifactAnalyzerReceiver -- proto: ComputerBankATM - entities: - - uid: 532 - components: - - type: Transform - pos: -12.5,4.5 - parent: 179 -- proto: ComputerBlackMarketBankATM - entities: - - uid: 700 - components: - - type: Transform - pos: -11.5,4.5 - parent: 179 -- proto: ComputerCargoOrders - entities: - - uid: 283 - components: - - type: Transform - pos: 0.5,-5.5 - parent: 179 -- proto: ComputerContrabandPalletConsole - entities: - - uid: 874 - components: - - type: Transform - pos: 1.5,-5.5 - parent: 179 -- proto: ComputerContrabandPalletConsolePirate - entities: - - uid: 1289 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-7.5 - parent: 179 -- proto: ComputerCrewMonitoring - entities: - - uid: 1420 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 14.5,4.5 - parent: 179 -- proto: ComputerCriminalRecords - entities: - - uid: 1421 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 14.5,5.5 - parent: 179 -- proto: ComputerIFF - entities: - - uid: 1417 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -8.5,-2.5 - parent: 179 -- proto: ComputerIFFPOI - entities: - - uid: 1418 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -8.5,-3.5 - parent: 179 -- proto: ComputerIFFSyndicate - entities: - - uid: 1419 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -8.5,-4.5 - parent: 179 -- proto: ComputerMassMedia - entities: - - uid: 1341 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,-12.5 - parent: 179 -- proto: ComputerMedicalRecords - entities: - - uid: 152 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 22.5,-5.5 - parent: 179 - - uid: 591 - components: - - type: Transform - pos: 21.5,5.5 - parent: 179 -- proto: ComputerPalletConsoleNFHighMarket - entities: - - uid: 495 - components: - - type: Transform - pos: -1.5,-5.5 - parent: 179 -- proto: ComputerPalletConsoleNFLowMarket - entities: - - uid: 528 - components: - - type: Transform - pos: -3.5,-5.5 - parent: 179 -- proto: ComputerPalletConsoleNFNormalMarket - entities: - - uid: 512 - components: - - type: Transform - pos: -2.5,-5.5 - parent: 179 -- proto: ComputerPalletConsoleNFVeryLowMarket - entities: - - uid: 521 - components: - - type: Transform - pos: -4.5,-5.5 - parent: 179 -- proto: ComputerPirateBounty - entities: - - uid: 1288 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-6.5 - parent: 179 -- proto: ComputerPirateBountyRedemption - entities: - - uid: 1292 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-5.5 - parent: 179 -- proto: ComputerAdvancedRadar - entities: - - uid: 1391 - components: - - type: Transform - pos: 5.5,-10.5 - parent: 179 -- proto: ComputerResearchAndDevelopment - entities: - - uid: 88 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 8.5,19.5 - parent: 179 -- proto: ComputerRoboticsControl - entities: - - uid: 1422 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 13.5,18.5 - parent: 179 -- proto: ComputerShipyard - entities: - - uid: 323 - components: - - type: Transform - pos: -3.5,-11.5 - parent: 179 -- proto: ComputerShipyardBlackMarket - entities: - - uid: 421 - components: - - type: Transform - pos: -0.5,-11.5 - parent: 179 -- proto: ComputerShipyardExpedition - entities: - - uid: 420 - components: - - type: Transform - pos: -1.5,-11.5 - parent: 179 -- proto: ComputerShipyardNfsd - entities: - - uid: 284 - components: - - type: Transform - pos: -2.5,-11.5 - parent: 179 -- proto: ComputerShipyardScrap - entities: - - uid: 296 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,-13.5 - parent: 179 -- proto: ComputerShipyardSr - entities: - - uid: 492 - components: - - type: Transform - pos: 1.5,-11.5 - parent: 179 -- proto: ComputerShipyardSyndicate - entities: - - uid: 493 - components: - - type: Transform - pos: 0.5,-11.5 - parent: 179 -- proto: ComputerShuttle - entities: - - uid: 693 - components: - - type: Transform - pos: -2.5,3.5 - parent: 179 -- proto: ComputerStationRecords - entities: - - uid: 1227 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -11.5,1.5 - parent: 179 -- proto: ComputerSurveillanceCameraMonitor - entities: - - uid: 1185 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -8.5,1.5 - parent: 179 -- proto: ComputerWallmountBankATM - entities: - - uid: 1228 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -7.5,6.5 - parent: 179 -- proto: ComputerWallmountBlackMarketBankATM - entities: - - uid: 1225 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -11.5,6.5 - parent: 179 -- proto: ComputerWallmountWithdrawBankATM - entities: - - uid: 1234 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -16.5,3.5 - parent: 179 -- proto: ComputerWithdrawBankATM - entities: - - uid: 701 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -15.5,4.5 - parent: 179 -- proto: ContrabandPallet - entities: - - uid: 1284 - components: - - type: Transform - pos: 1.5,-7.5 - parent: 179 - - uid: 1287 - components: - - type: Transform - pos: 2.5,-7.5 - parent: 179 -- proto: ContrabandPalletPirate - entities: - - uid: 1285 - components: - - type: Transform - pos: 2.5,-8.5 - parent: 179 - - uid: 1286 - components: - - type: Transform - pos: 1.5,-8.5 - parent: 179 -- proto: ConveyorBelt - entities: - - uid: 164 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 19.5,12.5 - parent: 179 - - uid: 195 - components: - - type: Transform - pos: -2.5,-15.5 - parent: 179 - - uid: 259 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,-14.5 - parent: 179 - - uid: 400 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 19.5,10.5 - parent: 179 - - uid: 401 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 21.5,10.5 - parent: 179 - - uid: 463 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,-16.5 - parent: 179 - - uid: 517 - components: - - type: Transform - pos: 22.5,10.5 - parent: 179 - - uid: 574 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 8.5,25.5 - parent: 179 - - uid: 584 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 7.5,25.5 - parent: 179 - - uid: 587 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 20.5,10.5 - parent: 179 - - uid: 588 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 18.5,10.5 - parent: 179 - - uid: 677 - components: - - type: Transform - pos: -2.5,-14.5 - parent: 179 - - uid: 985 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,-13.5 - parent: 179 - - uid: 989 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,-15.5 - parent: 179 - - uid: 990 - components: - - type: Transform - pos: -2.5,-13.5 - parent: 179 - - uid: 991 - components: - - type: Transform - pos: -2.5,-16.5 - parent: 179 - - uid: 1183 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 18.5,12.5 - parent: 179 - - uid: 1298 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,3.5 - parent: 179 - - uid: 1510 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 9.5,25.5 - parent: 179 - - uid: 1512 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 20.5,12.5 - parent: 179 - - uid: 1513 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 21.5,12.5 - parent: 179 - - uid: 1514 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 22.5,12.5 - parent: 179 - - uid: 1515 - components: - - type: Transform - pos: 22.5,9.5 - parent: 179 - - uid: 1516 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 22.5,8.5 - parent: 179 - - uid: 1517 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 21.5,8.5 - parent: 179 - - uid: 1518 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 20.5,8.5 - parent: 179 - - uid: 1519 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 19.5,8.5 - parent: 179 - - uid: 1520 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 18.5,8.5 - parent: 179 - - uid: 1521 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 17.5,8.5 - parent: 179 - - uid: 1522 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 17.5,9.5 - parent: 179 - - uid: 1523 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 17.5,10.5 - parent: 179 - - uid: 1524 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 17.5,12.5 - parent: 179 -- proto: CrateEngineeringToolbox - entities: - - uid: 692 - components: - - type: Transform - pos: 1.5,3.5 - parent: 179 -- proto: CrateFoodMcCargo - entities: - - uid: 1476 - components: - - type: Transform - pos: 12.5,6.5 - parent: 179 -- proto: CrateHydroponicsSeeds - entities: - - uid: 754 - components: - - type: Transform - pos: 2.5,12.5 - parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: CrateHydroponicsTools - entities: - - uid: 755 - components: - - type: Transform - pos: 2.5,13.5 - parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: CrateMedical - entities: - - uid: 131 - components: - - type: Transform - pos: 31.5,-1.5 - parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - uid: 132 - components: - - type: Transform - pos: 32.5,-1.5 - parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: CrateNPCEmotionalSupport - entities: - - uid: 1344 - components: - - type: Transform - pos: 18.5,14.5 - parent: 179 -- proto: CrateScienceLabBundle - entities: - - uid: 1504 - components: - - type: Transform - pos: 13.5,19.5 - parent: 179 -- proto: CrewMonitoringServer - entities: - - uid: 1357 - components: - - type: Transform - pos: 11.5,6.5 - parent: 179 -- proto: CrossbowModern - entities: - - uid: 1617 - components: - - type: Transform - pos: -4.560466,-3.2324362 - parent: 179 -- proto: CrossbowModernHand - entities: - - uid: 1618 - components: - - type: Transform - pos: -4.487549,-3.6595192 - parent: 179 -- proto: Crowbar - entities: - - uid: 147 - components: - - type: Transform - pos: -0.10945782,4.5001388 - parent: 179 -- proto: CutterMachine - entities: - - uid: 902 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -11.5,-4.5 - parent: 179 -- proto: CyberPen - entities: - - uid: 1219 - components: - - type: Transform - pos: 10.064173,12.743989 - parent: 179 -- proto: DeathAcidifierImplanter - entities: - - uid: 1450 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 0.6328665,7.4945216 - parent: 179 -- proto: DeathAcidifierImplanterNF - entities: - - uid: 1451 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 0.48703322,7.5049386 - parent: 179 -- proto: DebugBatteryDischarger - entities: - - uid: 711 - components: - - type: Transform - pos: 0.5,-3.5 - parent: 179 -- proto: DefaultStationBeaconAISatellite - entities: - - uid: 1198 - components: - - type: Transform - pos: 11.5,-14.5 - parent: 179 -- proto: DefaultStationBeaconBotany - entities: - - uid: 1193 - components: - - type: Transform - pos: 3.5,15.5 - parent: 179 -- proto: DefaultStationBeaconChemistry - entities: - - uid: 1195 - components: - - type: Transform - pos: 7.5,10.5 - parent: 179 -- proto: DefaultStationBeaconCommand - entities: - - uid: 1196 - components: - - type: Transform - pos: 0.5,8.5 - parent: 179 -- proto: DefaultStationBeaconGravGen - entities: - - uid: 1172 - components: - - type: Transform - pos: 6.5,5.5 - parent: 179 -- proto: DefaultStationBeaconKitchen - entities: - - uid: 1603 - components: - - type: Transform - pos: 26.5,8.5 - parent: 179 -- proto: DefaultStationBeaconMedical - entities: - - uid: 1173 - components: - - type: Transform - pos: 19.5,5.5 - parent: 179 -- proto: DefaultStationBeaconScience - entities: - - uid: 1194 - components: - - type: Transform - pos: 12.5,20.5 - parent: 179 -- proto: DefaultStationBeaconSecurity - entities: - - uid: 1197 - components: - - type: Transform - pos: -14.5,17.5 - parent: 179 -- proto: DefaultStationBeaconSupply - entities: - - uid: 1175 - components: - - type: Transform - pos: -0.5,-11.5 - parent: 179 -- proto: DefaultStationBeaconToolRoom - entities: - - uid: 1174 - components: - - type: Transform - pos: -1.5,4.5 - parent: 179 -- proto: DemagUnlimited - entities: - - uid: 1396 - components: - - type: Transform - pos: -14.4983835,5.497082 - parent: 179 -- proto: DisposalPipe - entities: - - uid: 716 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,11.5 - parent: 179 - - uid: 717 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,10.5 - parent: 179 - - uid: 1214 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,12.5 - parent: 179 - - uid: 1544 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 26.5,14.5 - parent: 179 -- proto: DisposalTrunk - entities: - - uid: 285 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,10.5 - parent: 179 - - uid: 715 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -1.5,10.5 - parent: 179 - - uid: 720 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -1.5,11.5 - parent: 179 - - uid: 723 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,11.5 - parent: 179 - - uid: 1213 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,12.5 - parent: 179 - - uid: 1215 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -1.5,12.5 - parent: 179 - - uid: 1545 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 25.5,14.5 - parent: 179 -- proto: DisposalUnit - entities: - - uid: 719 - components: - - type: Transform - pos: -1.5,10.5 - parent: 179 -- proto: DoorRemoteAll - entities: - - uid: 1404 - components: - - type: Transform - pos: -0.8674887,-3.1671295 - parent: 179 -- proto: DrinkBeerglass - entities: - - uid: 688 - components: - - type: Transform - pos: 3.1981986,5.733985 - parent: 179 -- proto: DrinkColaCan - entities: - - uid: 690 - components: - - type: Transform - pos: 3.8231986,6.150942 - parent: 179 -- proto: DrinkShaker - entities: - - uid: 1562 - components: - - type: Transform - pos: 25.352194,7.9515114 - parent: 179 -- proto: Dropper - entities: - - uid: 730 - components: - - type: Transform - pos: 5.892191,9.4118185 - parent: 179 -- proto: EmagUnlimited - entities: - - uid: 1397 - components: - - type: Transform - pos: -13.5713,5.4762487 - parent: 179 -- proto: EngineeringTechFab - entities: - - uid: 262 - components: - - type: Transform - pos: -14.5,-7.5 - parent: 179 -- proto: ExGrenade - entities: - - uid: 433 - components: - - type: Transform - pos: -3.7704864,-1.6163371 - parent: 179 -- proto: ExosuitFabricator - entities: - - uid: 505 - components: - - type: Transform - pos: 10.5,21.5 - parent: 179 -- proto: ExplosivePayload - entities: - - uid: 668 - components: - - type: Transform - pos: 6.829691,9.4118185 - parent: 179 -- proto: FaxMachineCaptain - entities: - - uid: 967 - components: - - type: Transform - pos: 9.5,12.5 - parent: 179 -- proto: FaxMachineCentcom - entities: - - uid: 968 - components: - - type: Transform - pos: 11.5,12.5 - parent: 179 -- proto: FaxMachineShip - entities: - - uid: 1224 - components: - - type: Transform - pos: 9.5,15.5 - parent: 179 -- proto: FaxMachineShipAntag - entities: - - uid: 1222 - components: - - type: Transform - pos: 9.5,16.5 - parent: 179 -- proto: FaxMachineSyndie - entities: - - uid: 969 - components: - - type: Transform - pos: 13.5,12.5 - parent: 179 -- proto: FemtoManipulatorStockPart - entities: - - uid: 456 - components: - - type: Transform - pos: -5.503056,8.832919 - parent: 179 -- proto: FireExtinguisher - entities: - - uid: 868 - components: - - type: Transform - pos: -15.185464,-2.3818197 - parent: 179 -- proto: FlashlightLantern - entities: - - uid: 422 - components: - - type: Transform - pos: 1.1350493,8.198464 - parent: 179 -- proto: FloorDrain - entities: - - uid: 1509 - components: - - type: Transform - pos: 7.5,24.5 - parent: 179 - - type: Fixtures - fixtures: {} - - uid: 1586 - components: - - type: Transform - pos: 24.5,10.5 - parent: 179 - - type: Fixtures - fixtures: {} -- proto: FloorLavaEntity - entities: - - uid: 507 - components: - - type: Transform - pos: -15.5,-0.5 - parent: 179 - - uid: 1442 - components: - - type: Transform - pos: -15.5,-1.5 - parent: 179 -- proto: FloorLiquidPlasmaEntity - entities: - - uid: 501 - components: - - type: Transform - pos: -16.5,-0.5 - parent: 179 - - uid: 508 - components: - - type: Transform - pos: -16.5,-1.5 - parent: 179 -- proto: FloorWaterEntity - entities: - - uid: 1443 - components: - - type: Transform - pos: -14.5,-0.5 - parent: 179 - - uid: 1444 - components: - - type: Transform - pos: -14.5,-1.5 - parent: 179 -- proto: FoodApple - entities: - - uid: 16 - components: - - type: Transform - pos: 3.9853282,16.430082 - parent: 179 - - uid: 849 - components: - - type: Transform - pos: 3.7249117,16.242453 - parent: 179 - - uid: 866 - components: - - type: Transform - pos: 3.651995,16.55517 - parent: 179 -- proto: FoodBurgerBacon - entities: - - uid: 689 - components: - - type: Transform - pos: 3.3844857,6.0702233 - parent: 179 -- proto: FoodCarrot - entities: - - uid: 850 - components: - - type: Transform - pos: 3.6023045,15.67151 - parent: 179 - - uid: 851 - components: - - type: Transform - pos: 3.620745,15.015423 - parent: 179 - - uid: 863 - components: - - type: Transform - pos: 3.620745,14.389988 - parent: 179 -- proto: FoodPizzaPineapple - entities: - - uid: 687 - components: - - type: Transform - pos: 3.5215416,6.799056 - parent: 179 -- proto: GasAnalyzer - entities: - - uid: 876 - components: - - type: Transform - pos: 4.4732866,-0.48882532 - parent: 179 - - uid: 1492 - components: - - type: Transform - pos: 1.1525452,4.598274 - parent: 179 -- proto: GasFilter - entities: - - uid: 480 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,-3.5 - parent: 179 -- proto: GasFilterNitrogenOn - entities: - - uid: 1263 - components: - - type: Transform - pos: 0.5,1.5 - parent: 179 -- proto: GasFilterNitrogenOnFlipped - entities: - - uid: 1264 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,1.5 - parent: 179 -- proto: GasFilterOxygenOn - entities: - - uid: 1265 - components: - - type: Transform - pos: 3.5,1.5 - parent: 179 -- proto: GasFilterOxygenOnFlipped - entities: - - uid: 1266 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,1.5 - parent: 179 -- proto: GasMixer - entities: - - uid: 747 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,-2.5 - parent: 179 -- proto: GasMixerOn - entities: - - uid: 1262 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,-0.5 - parent: 179 -- proto: GasMixerOnFlipped - entities: - - uid: 1261 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 2.5,-1.5 - parent: 179 -- proto: GasOutletInjector - entities: - - uid: 429 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,-1.5 - parent: 179 -- proto: GasPipeBend - entities: - - uid: 727 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,-0.5 - parent: 179 -- proto: GasPipeFourway - entities: - - uid: 728 - components: - - type: Transform - pos: 5.5,-1.5 - parent: 179 -- proto: GasPipeStraight - entities: - - uid: 749 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,-3.5 - parent: 179 -- proto: GasPipeTJunction - entities: - - uid: 748 - components: - - type: Transform - pos: 5.5,-2.5 - parent: 179 -- proto: GasPort - entities: - - uid: 457 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,-0.5 - parent: 179 -- proto: GasPressurePump - entities: - - uid: 171 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-3.5 - parent: 179 -- proto: GasPressurePumpOn - entities: - - uid: 1259 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,-1.5 - parent: 179 -- proto: GasPressurePumpOnMax - entities: - - uid: 1260 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 0.5,-1.5 - parent: 179 -- proto: GasValve - entities: - - uid: 168 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-2.5 - parent: 179 -- proto: GasVentPump - entities: - - uid: 729 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,-3.5 - parent: 179 -- proto: GasVentScrubber - entities: - - uid: 452 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,-2.5 - parent: 179 -- proto: GasVolumePump - entities: - - uid: 160 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-1.5 - parent: 179 -- proto: GasVolumePumpOn - entities: - - uid: 1267 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,-1.5 - parent: 179 -- proto: GeigerCounter - entities: - - uid: 759 - components: - - type: Transform - pos: 1.8003306,4.661284 - parent: 179 -- proto: GeneratorBasic15kW - entities: - - uid: 1272 - components: - - type: Transform - pos: -6.5,-8.5 - parent: 179 -- proto: GibAcidifierImplanterNF - entities: - - uid: 1452 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 0.34119985,7.5049386 - parent: 179 -- proto: GravityGenerator - entities: - - uid: 744 - components: - - type: Transform - pos: 6.5,6.5 - parent: 179 -- proto: Grille - entities: - - uid: 108 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 14.5,23.5 - parent: 179 - - uid: 986 - components: - - type: Transform - pos: -0.5,-16.5 - parent: 179 - - uid: 987 - components: - - type: Transform - pos: -0.5,-15.5 - parent: 179 - - uid: 988 - components: - - type: Transform - pos: -0.5,-14.5 - parent: 179 - - uid: 1007 - components: - - type: Transform - pos: -3.5,-16.5 - parent: 179 - - uid: 1008 - components: - - type: Transform - pos: -3.5,-15.5 - parent: 179 - - uid: 1009 - components: - - type: Transform - pos: -3.5,-14.5 - parent: 179 - - uid: 1010 - components: - - type: Transform - pos: 2.5,-16.5 - parent: 179 - - uid: 1011 - components: - - type: Transform - pos: 2.5,-15.5 - parent: 179 - - uid: 1012 - components: - - type: Transform - pos: 2.5,-14.5 - parent: 179 - - uid: 1089 - components: - - type: Transform - pos: 8.5,17.5 - parent: 179 - - uid: 1090 - components: - - type: Transform - pos: 9.5,17.5 - parent: 179 - - uid: 1091 - components: - - type: Transform - pos: 10.5,17.5 - parent: 179 - - uid: 1092 - components: - - type: Transform - pos: 10.5,16.5 - parent: 179 -- proto: GunSafeShuttleCaptain - entities: - - uid: 146 - components: - - type: Transform - pos: 4.5,-9.5 - parent: 179 -- proto: Handcuffs - entities: - - uid: 331 - components: - - type: Transform - pos: -3.5805476,0.74100244 - parent: 179 -- proto: HandheldHealthAnalyzer - entities: - - uid: 513 - components: - - type: Transform - pos: -4.925259,-3.7194638 - parent: 179 -- proto: HandHeldMassScanner - entities: - - uid: 1205 - components: - - type: Transform - pos: 3.6764634,5.4411106 - parent: 179 -- proto: HandTeleporterAdmin - entities: - - uid: 1405 - components: - - type: Transform - pos: -0.982072,-3.4785347 - parent: 179 -- proto: HoloGraffitiProjector - entities: - - uid: 1495 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.00722605,4.669485 - parent: 179 -- proto: HolosignWetFloor - entities: - - uid: 848 - components: - - type: Transform - pos: -13.5,2.5 - parent: 179 - - type: Fixtures - fixtures: {} - missingComponents: - - TimedDespawn - - uid: 911 - components: - - type: Transform - pos: -13.5,1.5 - parent: 179 - - type: Fixtures - fixtures: {} - missingComponents: - - TimedDespawn -- proto: hydroponicsTray - entities: - - uid: 756 - components: - - type: Transform - pos: 2.5,14.5 - parent: 179 -- proto: hydroponicsTrayAnchored - entities: - - uid: 423 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 2.5,15.5 - parent: 179 -- proto: HypoBrigmedic - entities: - - uid: 1362 - components: - - type: Transform - pos: 19.907194,6.58735 - parent: 179 -- proto: HypoMini - entities: - - uid: 1361 - components: - - type: Transform - pos: 19.490526,6.58735 - parent: 179 -- proto: HypoMiniLimitedEdition - entities: - - uid: 1364 - components: - - type: Transform - pos: 20.313444,6.58735 - parent: 179 -- proto: Hypospray - entities: - - uid: 1365 - components: - - type: Transform - pos: 20.719694,6.639433 - parent: 179 -- proto: IngotGold - entities: - - uid: 1598 - components: - - type: Transform - pos: -0.46399713,8.047852 - parent: 179 -- proto: IngotSilver - entities: - - uid: 1601 - components: - - type: Transform - pos: -0.5160805,7.683268 - parent: 179 -- proto: JugBluespace - entities: - - uid: 1604 - components: - - type: Transform - pos: 6.797637,11.32471 - parent: 179 -- proto: Jukebox - entities: - - uid: 1388 - components: - - type: Transform - pos: 2.5,-10.5 - parent: 179 -- proto: KitchenAssembler - entities: - - uid: 1561 - components: - - type: Transform - pos: 25.5,6.5 - parent: 179 -- proto: KitchenDeepFryer - entities: - - uid: 1568 - components: - - type: Transform - pos: 27.5,9.5 - parent: 179 -- proto: KitchenElectricRange - entities: - - uid: 468 - components: - - type: Transform - pos: 27.5,5.5 - parent: 179 -- proto: KitchenMicrowave - entities: - - uid: 385 - components: - - type: Transform - pos: 27.5,6.5 - parent: 179 -- proto: KitchenReagentGrinder - entities: - - uid: 381 - components: - - type: Transform - pos: 27.5,7.5 - parent: 179 - - uid: 731 - components: - - type: Transform - pos: 8.5,9.5 - parent: 179 -- proto: KitchenSpike - entities: - - uid: 1587 - components: - - type: Transform - pos: 24.5,10.5 - parent: 179 -- proto: LargeBeaker - entities: - - uid: 210 - components: - - type: Transform - pos: 4.3272614,9.338851 - parent: 179 - - uid: 737 - components: - - type: Transform - pos: 4.2969,9.828774 - parent: 179 - - uid: 1563 - components: - - type: Transform - pos: 25.602194,7.3265114 - parent: 179 -- proto: LedLightTube - entities: - - uid: 481 - components: - - type: Transform - pos: -2.6010532,-10.491134 - parent: 179 -- proto: LessLethalVendingMachinePOI - entities: - - uid: 1238 - components: - - type: Transform - pos: -13.5,6.5 - parent: 179 -- proto: LockerBotanistFilled - entities: - - uid: 869 - components: - - type: Transform - pos: 2.5,16.5 - parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: LockerChemistryFilled - entities: - - uid: 297 - components: - - type: Transform - pos: 7.5,9.5 - parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: LockerChiefEngineerFilled - entities: - - uid: 447 - components: - - type: Transform - pos: 7.5,2.5 - parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: LockerElectricalSuppliesFilled - entities: - - uid: 444 - components: - - type: Transform - pos: 7.5,3.5 - parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: LockerEngineerFilled - entities: - - uid: 490 - components: - - type: Transform - pos: 7.5,4.5 - parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: LockerMailCarrierFilled - entities: - - uid: 1342 - components: - - type: Transform - pos: 5.5,4.5 - parent: 179 -- proto: LockerMedical - entities: - - uid: 129 - components: - - type: Transform - pos: 29.5,-1.5 - parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - uid: 130 - components: - - type: Transform - pos: 30.5,-1.5 - parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: LockerMedicalFilled - entities: - - uid: 865 - components: - - type: Transform - pos: -6.5,-3.5 - parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: LockerMedicineFilled - entities: - - uid: 562 - components: - - type: Transform - pos: -5.5,-3.5 - parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: LockerPsychologistFilled - entities: - - uid: 1268 - components: - - type: Transform - pos: -5.9910693,-3.4948432 - parent: 179 -- proto: LockerWeldingSuppliesFilled - entities: - - uid: 871 - components: - - type: Transform - pos: 7.5,1.5 - parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: Machete - entities: - - uid: 1556 - components: - - type: Transform - pos: 25.548134,7.5608864 - parent: 179 -- proto: MachineAnomalyGenerator - entities: - - uid: 1071 - components: - - type: Transform - pos: 16.5,25.5 - parent: 179 -- proto: MachineAnomalyVessel - entities: - - uid: 1087 - components: - - type: Transform - pos: 15.5,19.5 - parent: 179 -- proto: MachineArtifactAnalyzer - entities: - - uid: 1078 - components: - - type: Transform - pos: 12.5,24.5 - parent: 179 -- proto: MachineArtifactCrusher - entities: - - uid: 1423 - components: - - type: Transform - pos: 17.5,21.5 - parent: 179 -- proto: MachineCryoSleepPod - entities: - - uid: 1393 - components: - - type: Transform - pos: 18.5,0.5 - parent: 179 - - uid: 1394 - components: - - type: Transform - pos: 20.5,0.5 - parent: 179 - - uid: 1395 - components: - - type: Transform - pos: 22.5,0.5 - parent: 179 -- proto: MachineFrame - entities: - - uid: 533 - components: - - type: Transform - pos: -5.5,10.5 - parent: 179 -- proto: Magazine40mmBaton - entities: - - uid: 1424 - components: - - type: Transform - pos: -7.550851,17.250177 - parent: 179 -- proto: Magazine40mmBlast - entities: - - uid: 1425 - components: - - type: Transform - pos: -8.571684,16.500177 - parent: 179 -- proto: Magazine40mmEMP - entities: - - uid: 1412 - components: - - type: Transform - pos: -9.435917,17.239761 - parent: 179 -- proto: Magazine40mmFlash - entities: - - uid: 1426 - components: - - type: Transform - pos: -7.550851,16.448093 - parent: 179 -- proto: Magazine40mmFrag - entities: - - uid: 1427 - components: - - type: Transform - pos: -9.436268,16.427261 - parent: 179 -- proto: MailingUnit - entities: - - uid: 721 - components: - - type: Transform - pos: -1.5,11.5 - parent: 179 -- proto: MailTeleporter - entities: - - uid: 1297 - components: - - type: Transform - pos: 4.5,3.5 - parent: 179 -- proto: MaterialCloth - entities: - - uid: 1543 - components: - - type: Transform - pos: -16.430119,-2.7676265 - parent: 179 - - uid: 1547 - components: - - type: Transform - pos: -16.23244,-2.7682164 - parent: 179 - - uid: 1595 - components: - - type: Transform - pos: -0.5473305,8.652019 - parent: 179 -- proto: MaterialDurathread - entities: - - uid: 1301 - components: - - type: Transform - pos: -0.7452471,8.162435 - parent: 179 - - uid: 1546 - components: - - type: Transform - pos: -16.685566,-3.8463414 - parent: 179 -- proto: MaterialReclaimer - entities: - - uid: 586 - components: - - type: Transform - pos: 9.5,23.5 - parent: 179 -- proto: MatterBinStockPart - entities: - - uid: 1251 - components: - - type: Transform - pos: -6.634986,8.351691 - parent: 179 -- proto: MedicalScanner - entities: - - uid: 592 - components: - - type: Transform - pos: 18.5,-1.5 - parent: 179 - - type: ContainerContainer - containers: - MedicalScanner-bodyContainer: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - scanner-bodyContainer: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - uid: 593 - components: - - type: Transform - pos: 18.5,-5.5 - parent: 179 - - type: ContainerContainer - containers: - MedicalScanner-bodyContainer: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - scanner-bodyContainer: !type:ContainerSlot - showEnts: False - occludes: True - ent: null -- proto: MedicalTechFab - entities: - - uid: 261 - components: - - type: Transform - pos: -15.5,-7.5 - parent: 179 -- proto: MedicalTrackingImplanter - entities: - - uid: 1453 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 0.122449845,7.5361886 - parent: 179 -- proto: MedkitFilled - entities: - - uid: 153 - components: - - type: Transform - pos: 13.632214,1.5673001 - parent: 179 - - uid: 154 - components: - - type: Transform - pos: 13.460339,0.6141751 - parent: 179 - - uid: 321 - components: - - type: Transform - pos: 3.8440318,4.425983 - parent: 179 -- proto: MercenaryTechFab - entities: - - uid: 1408 - components: - - type: Transform - pos: -16.5,-5.5 - parent: 179 -- proto: MercenaryTechFabHacked - entities: - - uid: 1508 - components: - - type: Transform - pos: -14.5,-5.5 - parent: 179 -- proto: MicroManipulatorStockPart - entities: - - uid: 712 - components: - - type: Transform - pos: -6.7434506,8.817795 - parent: 179 - - uid: 959 - components: - - type: Transform - pos: -4.752078,10.904018 - parent: 179 -- proto: ModularGrenade - entities: - - uid: 435 - components: - - type: Transform - pos: 6.829691,9.860046 - parent: 179 -- proto: MopBucket - entities: - - uid: 696 - components: - - type: Transform - pos: 7.5,16.5 - parent: 179 -- proto: MopItem - entities: - - uid: 328 - components: - - type: Transform - pos: 7.6382103,16.08618 - parent: 179 - - type: SolutionContainerManager - solutions: - absorbed: - temperature: 293.15 - canReact: True - maxVol: 50 - name: null - reagents: - - data: null - ReagentId: Water - Quantity: 25 -- proto: Multitool - entities: - - uid: 307 - components: - - type: Transform - pos: -1.249865,-10.43489 - parent: 179 - - uid: 430 - components: - - type: Transform - pos: -0.6298993,4.7431083 - parent: 179 - - type: NetworkConfigurator - devices: - 'UID: 31739': 801 -- proto: NanoManipulatorStockPart - entities: - - uid: 441 - components: - - type: Transform - pos: -6.3051395,8.791253 - parent: 179 -- proto: NFEnergyPickaxe - entities: - - uid: 1217 - components: - - type: Transform - pos: -2.4220388,-3.35532 - parent: 179 -- proto: NfsdTechFab - entities: - - uid: 498 - components: - - type: Transform - pos: -16.5,-6.5 - parent: 179 -- proto: NFSpawnPointDetective - entities: - - uid: 1487 - components: - - type: Transform - pos: -3.5,2.5 - parent: 179 -- proto: NFSpawnPointJanitor - entities: - - uid: 1488 - components: - - type: Transform - pos: -3.5,2.5 - parent: 179 -- proto: SpawnPointTsfTeamleader - entities: - - uid: 382 - components: - - type: Transform - pos: -3.5,2.5 - parent: 179 -- proto: NFTelecomServerFilled - entities: - - uid: 963 - components: - - type: Transform - pos: -3.5,10.5 - parent: 179 -- proto: NFWeaponHoloflareGun - entities: - - uid: 1597 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -3.7657888,-3.620945 - parent: 179 -- proto: NitrogenCanister - entities: - - uid: 459 - components: - - type: Transform - pos: 7.5,-1.5 - parent: 179 -- proto: OilJarCorn - entities: - - uid: 1570 - components: - - type: Transform - pos: 27.471981,8.794899 - parent: 179 -- proto: OilJarGhee - entities: - - uid: 1569 - components: - - type: Transform - pos: 27.313929,8.529274 - parent: 179 -- proto: OilJarOlive - entities: - - uid: 361 - components: - - type: Transform - pos: 27.65654,8.638649 - parent: 179 -- proto: Ointment - entities: - - uid: 148 - components: - - type: Transform - pos: 18.77326,6.653532 - parent: 179 - - uid: 149 - components: - - type: Transform - pos: 18.49201,6.059782 - parent: 179 -- proto: OreProcessor - entities: - - uid: 1398 - components: - - type: Transform - pos: 2.5,18.5 - parent: 179 -- proto: OxygenCanister - entities: - - uid: 340 - components: - - type: Transform - pos: 7.5,-3.5 - parent: 179 -- proto: PaperBin10 - entities: - - uid: 977 - components: - - type: Transform - pos: 10.5,12.5 - parent: 179 -- proto: PartRodMetal - entities: - - uid: 133 - components: - - type: Transform - pos: -3.3409,8.122572 - parent: 179 -- proto: Pen - entities: - - uid: 978 - components: - - type: Transform - pos: 10.893699,12.7794075 - parent: 179 - - uid: 979 - components: - - type: Transform - pos: 10.862433,12.602201 - parent: 179 -- proto: PenCentcom - entities: - - uid: 1220 - components: - - type: Transform - pos: 10.032923,12.566905 - parent: 179 -- proto: PetRockCarrier - entities: - - uid: 1414 - components: - - type: Transform - pos: 12.506745,9.554711 - parent: 179 -- proto: PicoManipulatorStockPart - entities: - - uid: 455 - components: - - type: Transform - pos: -5.8988895,8.832919 - parent: 179 -- proto: PinpointerUniversalDebug - entities: - - uid: 1406 - components: - - type: Transform - pos: 1.6012614,8.679134 - parent: 179 -- proto: PlasmaCanister - entities: - - uid: 461 - components: - - type: Transform - pos: 7.5,-2.5 - parent: 179 -- proto: PlasticFlapsAirtightClear - entities: - - uid: 997 - components: - - type: Transform - pos: -2.5,-16.5 - parent: 179 - - uid: 998 - components: - - type: Transform - pos: -2.5,-14.5 - parent: 179 - - uid: 999 - components: - - type: Transform - pos: 1.5,-16.5 - parent: 179 - - uid: 1000 - components: - - type: Transform - pos: 1.5,-14.5 - parent: 179 -- proto: PlayerStationAi - entities: - - uid: 1295 - components: - - type: Transform - pos: -5.5,-5.5 - parent: 179 -- proto: PlushieJester - entities: - - uid: 1413 - components: - - type: Transform - pos: 10.524292,9.470358 - parent: 179 -- proto: PortableGeneratorDK - entities: - - uid: 484 - components: - - type: Transform - pos: -6.5,-11.5 - parent: 179 -- proto: PortableGeneratorJrPacmanShuttle - entities: - - uid: 1275 - components: - - type: Transform - pos: -5.5,-12.5 - parent: 179 -- proto: PortableGeneratorPacmanShuttle - entities: - - uid: 1274 - components: - - type: Transform - pos: -6.5,-9.5 - parent: 179 -- proto: PortableGeneratorSuperPacmanShuttle - entities: - - uid: 1273 - components: - - type: Transform - pos: -6.5,-10.5 - parent: 179 -- proto: PowerCellAntiqueProto - entities: - - uid: 1255 - components: - - type: Transform - pos: -4.847075,8.591274 - parent: 179 -- proto: PowerCellHigh - entities: - - uid: 703 - components: - - type: Transform - pos: -4.1841636,8.351739 - parent: 179 -- proto: PowerCellHyper - entities: - - uid: 567 - components: - - type: Transform - pos: -4.472075,8.351691 - parent: 179 -- proto: PowerCellMedium - entities: - - uid: 186 - components: - - type: Transform - pos: -2.7573035,-10.31405 - parent: 179 - - uid: 187 - components: - - type: Transform - pos: -2.3406367,-10.522384 - parent: 179 - - uid: 360 - components: - - type: Transform - pos: -3.8612468,8.351739 - parent: 179 -- proto: PowerCellMicroreactor - entities: - - uid: 1256 - components: - - type: Transform - pos: -4.8366585,8.247524 - parent: 179 -- proto: PowerCellRecharger - entities: - - uid: 709 - components: - - type: Transform - pos: -1.5,-3.5 - parent: 179 -- proto: PowerCellSmall - entities: - - uid: 705 - components: - - type: Transform - pos: -3.5904133,8.351739 - parent: 179 -- proto: Poweredlight - entities: - - uid: 93 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 31.5,-5.5 - parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 500 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -16.5,-5.5 - parent: 179 - - uid: 536 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,-0.5 - parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 660 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 29.5,1.5 - parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 661 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 27.5,7.5 - parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 663 - components: - - type: Transform - pos: 22.5,2.5 - parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 666 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 2.5,23.5 - parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 670 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 13.5,18.5 - parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 673 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,-5.5 - parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 676 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -6.5,-10.5 - parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 678 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 7.5,-1.5 - parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 680 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 16.5,-5.5 - parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 681 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 23.5,-5.5 - parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 682 - components: - - type: Transform - pos: 13.5,2.5 - parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 683 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 17.5,4.5 - parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1075 - components: - - type: Transform - pos: 16.5,27.5 - parent: 179 - - uid: 1076 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 15.5,22.5 - parent: 179 -- proto: PoweredSmallLight - entities: - - uid: 163 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,26.5 - parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 166 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 11.5,24.5 - parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 167 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 17.5,17.5 - parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 388 - components: - - type: Transform - pos: 0.5,-5.5 - parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 417 - components: - - type: Transform - pos: -4.5,-5.5 - parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 483 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-9.5 - parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 534 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -9.5,-5.5 - parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1602 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 25.5,12.5 - parent: 179 -- proto: Protolathe - entities: - - uid: 12 - components: - - type: Transform - pos: 13.5,21.5 - parent: 179 - - uid: 384 - components: - - type: Transform - pos: -6.5,6.5 - parent: 179 -- proto: QuadraticCapacitorStockPart - entities: - - uid: 265 - components: - - type: Transform - pos: -3.37047,8.853753 - parent: 179 -- proto: Railing - entities: - - uid: 665 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -15.5,9.5 - parent: 179 - - uid: 927 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -14.5,10.5 - parent: 179 - - uid: 928 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -14.5,11.5 - parent: 179 - - uid: 929 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -14.5,12.5 - parent: 179 - - uid: 930 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -14.5,13.5 - parent: 179 - - uid: 931 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -14.5,14.5 - parent: 179 - - uid: 932 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -14.5,15.5 - parent: 179 - - uid: 933 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -14.5,16.5 - parent: 179 - - uid: 934 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -13.5,17.5 - parent: 179 - - uid: 935 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -12.5,17.5 - parent: 179 - - uid: 936 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -11.5,17.5 - parent: 179 - - uid: 937 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -10.5,17.5 - parent: 179 - - uid: 938 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -9.5,17.5 - parent: 179 - - uid: 939 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -8.5,17.5 - parent: 179 - - uid: 940 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -7.5,17.5 - parent: 179 - - uid: 941 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -6.5,17.5 - parent: 179 - - uid: 942 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -5.5,17.5 - parent: 179 - - uid: 943 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -4.5,17.5 - parent: 179 - - uid: 944 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -3.5,17.5 - parent: 179 - - uid: 945 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -2.5,17.5 - parent: 179 - - uid: 946 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -1.5,17.5 - parent: 179 - - uid: 947 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,17.5 - parent: 179 - - uid: 948 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 0.5,17.5 - parent: 179 - - uid: 1231 - components: - - type: Transform - pos: 21.5,14.5 - parent: 179 - - uid: 1232 - components: - - type: Transform - pos: 22.5,14.5 - parent: 179 - - uid: 1233 - components: - - type: Transform - pos: 23.5,14.5 - parent: 179 -- proto: RailingCorner - entities: - - uid: 1428 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 20.5,14.5 - parent: 179 -- proto: RailingCornerSmall - entities: - - uid: 919 - components: - - type: Transform - pos: -14.5,9.5 - parent: 179 -- proto: RailingRound - entities: - - uid: 1343 - components: - - type: Transform - pos: 18.5,14.5 - parent: 179 -- proto: RCD - entities: - - uid: 260 - components: - - type: Transform - pos: -2.4740412,4.6355553 - parent: 179 -- proto: RCDAmmo - entities: - - uid: 1250 - components: - - type: Transform - pos: -1.2657079,4.7397223 - parent: 179 -- proto: Recycler - entities: - - uid: 402 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 8.5,25.5 - parent: 179 -- proto: ReinforcedWindow - entities: - - uid: 1084 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 14.5,23.5 - parent: 179 - - uid: 1093 - components: - - type: Transform - pos: 8.5,17.5 - parent: 179 - - uid: 1094 - components: - - type: Transform - pos: 9.5,17.5 - parent: 179 - - uid: 1095 - components: - - type: Transform - pos: 10.5,17.5 - parent: 179 - - uid: 1096 - components: - - type: Transform - pos: 10.5,16.5 - parent: 179 -- proto: RemoteSignallerAdvanced - entities: - - uid: 1490 - components: - - type: Transform - pos: -0.98269427,4.8303733 - parent: 179 -- proto: ResearchAndDevelopmentServer - entities: - - uid: 17 - components: - - type: Transform - pos: 8.5,18.5 - parent: 179 -- proto: ResearchDiskDebug - entities: - - uid: 54 - components: - - type: Transform - pos: 9.532393,18.446417 - parent: 179 -- proto: RPED - entities: - - uid: 1303 - components: - - type: Transform - pos: -6.4371862,9.596313 - parent: 179 -- proto: RubberStampCaptain - entities: - - uid: 982 - components: - - type: Transform - pos: 12.800895,12.664745 - parent: 179 -- proto: RubberStampCentcom - entities: - - uid: 980 - components: - - type: Transform - pos: 12.186007,12.716865 - parent: 179 -- proto: RubberStampSyndicate - entities: - - uid: 981 - components: - - type: Transform - pos: 12.436131,12.550082 - parent: 179 -- proto: SalvageTechfabNF - entities: - - uid: 1390 - components: - - type: Transform - pos: -11.5,-7.5 - parent: 179 -- proto: ScrapOre - entities: - - uid: 1499 - components: - - type: Transform - pos: 3.3558059,17.606743 - parent: 179 - - uid: 1500 - components: - - type: Transform - pos: 3.5589309,17.528618 - parent: 179 - - uid: 1501 - components: - - type: Transform - pos: 3.3401809,17.294243 - parent: 179 - - uid: 1502 - components: - - type: Transform - pos: 3.6995559,17.731743 - parent: 179 - - uid: 1503 - components: - - type: Transform - pos: 3.8089309,17.247368 - parent: 179 - - uid: 1607 - components: - - type: Transform - pos: 3.2739613,17.575039 - parent: 179 - - uid: 1608 - components: - - type: Transform - pos: 3.3885446,17.825039 - parent: 179 - - uid: 1609 - components: - - type: Transform - pos: 3.753128,17.700039 - parent: 179 - - uid: 1610 - components: - - type: Transform - pos: 3.940628,17.533373 - parent: 179 - - uid: 1611 - components: - - type: Transform - pos: 3.6489613,17.283373 - parent: 179 - - uid: 1612 - components: - - type: Transform - pos: 3.4614613,17.252123 - parent: 179 - - uid: 1613 - components: - - type: Transform - pos: 3.3260446,17.460457 - parent: 179 - - uid: 1614 - components: - - type: Transform - pos: 3.4197946,17.616707 - parent: 179 - - uid: 1615 - components: - - type: Transform - pos: 3.5552113,17.658373 - parent: 179 -- proto: ScrapProcessor - entities: - - uid: 1498 - components: - - type: Transform - pos: 3.5,18.5 - parent: 179 -- proto: Screen - entities: - - uid: 1192 - components: - - type: Transform - pos: 4.5,-14.5 - parent: 179 -- proto: Screwdriver - entities: - - uid: 431 - components: - - type: Transform - pos: 0.15561569,4.42027 - parent: 179 -- proto: SeedExtractor - entities: - - uid: 65 - components: - - type: Transform - pos: 2.5,17.5 - parent: 179 -- proto: ServiceTechFab - entities: - - uid: 1387 - components: - - type: Transform - pos: -12.5,-7.5 - parent: 179 -- proto: SheetGlass - entities: - - uid: 354 - components: - - type: Transform - pos: 8.434422,21.637691 - parent: 179 - - uid: 479 - components: - - type: Transform - pos: -4.9923964,7.624221 - parent: 179 - - uid: 529 - components: - - type: Transform - pos: -16.428322,-3.4026532 - parent: 179 - - uid: 564 - components: - - type: Transform - pos: -16.397072,-3.4755697 - parent: 179 - - uid: 565 - components: - - type: Transform - pos: -16.417904,-3.4443197 - parent: 179 - - uid: 566 - components: - - type: Transform - pos: -16.553322,-3.3922365 - parent: 179 -- proto: SheetGlass1 - entities: - - uid: 960 - components: - - type: Transform - pos: -3.981244,10.799851 - parent: 179 -- proto: Sheetifier - entities: - - uid: 136 - components: - - type: Transform - pos: -11.5,-5.5 - parent: 179 -- proto: SheetPaper - entities: - - uid: 1506 - components: - - type: Transform - pos: 13.352237,16.538458 - parent: 179 - - uid: 1507 - components: - - type: Transform - pos: 13.695987,16.538458 - parent: 179 -- proto: SheetPGlass - entities: - - uid: 416 - components: - - type: Transform - pos: -3.6257582,7.65191 - parent: 179 -- proto: SheetPlasma - entities: - - uid: 1077 - components: - - type: Transform - pos: 17.485096,24.503635 - parent: 179 - - uid: 1276 - components: - - type: Transform - pos: -6.5073137,-7.5018454 - parent: 179 -- proto: SheetPlasteel - entities: - - uid: 478 - components: - - type: Transform - pos: -4.099179,7.603388 - parent: 179 -- proto: SheetPlastic - entities: - - uid: 79 - components: - - type: Transform - pos: 8.903172,21.596024 - parent: 179 - - uid: 181 - components: - - type: Transform - pos: -4.6061954,7.604478 - parent: 179 -- proto: SheetRPGlass - entities: - - uid: 182 - components: - - type: Transform - pos: -6.1931067,7.666978 - parent: 179 -- proto: SheetRUGlass - entities: - - uid: 1438 - components: - - type: Transform - pos: -5.8076897,7.6148944 - parent: 179 -- proto: SheetSteel - entities: - - uid: 205 - components: - - type: Transform - pos: -16.594988,-4.371403 - parent: 179 - - uid: 305 - components: - - type: Transform - pos: 9.309422,21.648108 - parent: 179 - - uid: 473 - components: - - type: Transform - pos: -5.4743567,7.604478 - parent: 179 - - uid: 485 - components: - - type: Transform - pos: -16.386654,-4.3193197 - parent: 179 - - uid: 543 - components: - - type: Transform - pos: -16.449154,-4.340153 - parent: 179 - - uid: 544 - components: - - type: Transform - pos: -16.449154,-4.3297367 - parent: 179 -- proto: SheetUGlass - entities: - - uid: 1439 - components: - - type: Transform - pos: -3.237394,7.62066 - parent: 179 -- proto: SheetUranium - entities: - - uid: 1277 - components: - - type: Transform - pos: -6.2573137,-7.543512 - parent: 179 -- proto: ShelfWallFreezerWhite - entities: - - uid: 1590 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 24.5,11.5 - parent: 179 -- proto: ShipVoucherTsfT0 - entities: - - uid: 1291 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -3.7517176,-10.459884 - parent: 179 -- proto: ShipVoucherTsfT0 - entities: - - uid: 1290 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -3.2517176,-10.459884 - parent: 179 -- proto: ShipRepairDevice - entities: - - uid: 1248 - components: - - type: Transform - pos: -2.0677912,4.7188888 - parent: 179 -- proto: ShipRepairDeviceAmmo - entities: - - uid: 1249 - components: - - type: Transform - pos: -1.5573746,4.7501388 - parent: 179 -- proto: ShuttleGunDuster - entities: - - uid: 1366 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -8.5,17.5 - parent: 179 -- proto: ShuttleGunFriendship - entities: - - uid: 1392 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -6.5,17.5 - parent: 179 -- proto: ShuttleGunPirateCannon - entities: - - uid: 1429 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -2.5,17.5 - parent: 179 -- proto: SignalButton - entities: - - uid: 1013 - components: - - type: Transform - pos: -4.5,-14.5 - parent: 179 - - type: DeviceLinkSource - linkedPorts: - 202: - - Pressed: Toggle - 984: - - Pressed: Toggle - - uid: 1014 - components: - - type: Transform - pos: 3.5,-14.5 - parent: 179 - - type: DeviceLinkSource - linkedPorts: - 697: - - Pressed: Toggle - 698: - - Pressed: Toggle -- proto: SignCargoDock - entities: - - uid: 1046 - components: - - type: Transform - pos: 4.5,-4.5 - parent: 179 -- proto: SilverOre - entities: - - uid: 1432 - components: - - type: Transform - pos: 4.499173,17.526093 - parent: 179 - - uid: 1433 - components: - - type: Transform - pos: 4.5095897,17.119843 - parent: 179 -- proto: SinkWide - entities: - - uid: 1588 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 25.5,5.5 - parent: 179 -- proto: SmallGyroscope - entities: - - uid: 1403 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 9.5,-14.5 - parent: 179 -- proto: SmallLight - entities: - - uid: 1048 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,-15.5 - parent: 179 - - uid: 1049 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,-15.5 - parent: 179 -- proto: SmallThruster - entities: - - uid: 1402 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 9.5,-15.5 - parent: 179 -- proto: SMESBasic - entities: - - uid: 1017 - components: - - type: Transform - pos: -6.5,-12.5 - parent: 179 -- proto: SodaDispenser - entities: - - uid: 751 - components: - - type: Transform - pos: 8.5,12.5 - parent: 179 -- proto: SolidSecretDoor - entities: - - uid: 282 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 13.5,7.5 - parent: 179 -- proto: SpaceCash - entities: - - uid: 64 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -12.091256,2.3130608 - parent: 179 -- proto: SpaceCash10 - entities: - - uid: 503 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -11.756545,2.3143265 - parent: 179 -- proto: SpaceCash100 - entities: - - uid: 504 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -11.433628,2.3039098 - parent: 179 -- proto: SpaceCash1000 - entities: - - uid: 510 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -10.766962,2.3130608 - parent: 179 -- proto: SpaceCash10000 - entities: - - uid: 469 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -10.092518,2.302644 - parent: 179 -- proto: SpaceCash1000000 - entities: - - uid: 1241 - components: - - type: Transform - pos: -11.960137,3.9192598 - parent: 179 -- proto: SpaceCash25000 - entities: - - uid: 141 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -9.738351,2.3130608 - parent: 179 -- proto: SpaceCash500 - entities: - - uid: 502 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -11.100295,2.3234773 - parent: 179 -- proto: SpaceCash5000 - entities: - - uid: 499 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -10.425851,2.3130608 - parent: 179 -- proto: SpawnMobCatBloodCult - entities: - - uid: 1493 - components: - - type: Transform - pos: 20.5,14.5 - parent: 179 -- proto: SpawnMobCatCappy - entities: - - uid: 1230 - components: - - type: Transform - pos: 21.5,14.5 - parent: 179 -- proto: SpawnMobCatClarpy - entities: - - uid: 1229 - components: - - type: Transform - pos: 22.5,14.5 - parent: 179 -- proto: SpawnMobCatClippy - entities: - - uid: 1223 - components: - - type: Transform - pos: 23.5,14.5 - parent: 179 -- proto: SpawnMobCorgiMouse - entities: - - uid: 1050 - components: - - type: Transform - pos: 3.5,8.5 - parent: 179 -- proto: SpawnMobHuman - entities: - - uid: 138 - components: - - type: Transform - pos: -6.5,-0.5 - parent: 179 - - uid: 139 - components: - - type: Transform - pos: -6.5,0.5 - parent: 179 - - uid: 140 - components: - - type: Transform - pos: 3.5,7.5 - parent: 179 -- proto: SpawnPointTsfOfficer - entities: - - uid: 1482 - components: - - type: Transform - pos: -3.5,2.5 - parent: 179 -- proto: SpawnPointBorg - entities: - - uid: 1485 - components: - - type: Transform - pos: -4.5,2.5 - parent: 179 -- proto: SpawnPointTsfCorpsman - entities: - - uid: 1483 - components: - - type: Transform - pos: -3.5,2.5 - parent: 179 -- proto: SpawnPointTsfRecruit - entities: - - uid: 1484 - components: - - type: Transform - pos: -3.5,2.5 - parent: 179 -- proto: SpawnPointContractor - entities: - - uid: 1462 - components: - - type: Transform - pos: -3.5,2.5 - parent: 179 -- proto: SpawnPointTsfMarine - entities: - - uid: 1486 - components: - - type: Transform - pos: -3.5,2.5 - parent: 179 -- proto: SpawnPointERTChaplain - entities: - - uid: 1458 - components: - - type: Transform - pos: -3.5,2.5 - parent: 179 -- proto: SpawnPointERTEngineer - entities: - - uid: 1456 - components: - - type: Transform - pos: -3.5,2.5 - parent: 179 -- proto: SpawnPointERTJanitor - entities: - - uid: 1477 - components: - - type: Transform - pos: -3.5,2.5 - parent: 179 -- proto: SpawnPointERTLeader - entities: - - uid: 1478 - components: - - type: Transform - pos: -3.5,2.5 - parent: 179 -- proto: SpawnPointERTMailCarrier - entities: - - uid: 1479 - components: - - type: Transform - pos: -3.5,2.5 - parent: 179 -- proto: SpawnPointERTMedical - entities: - - uid: 1480 - components: - - type: Transform - pos: -3.5,2.5 - parent: 179 -- proto: SpawnPointERTSecurity - entities: - - uid: 1481 - components: - - type: Transform - pos: -3.5,2.5 - parent: 179 -- proto: SpawnPointLatejoin - entities: - - uid: 961 - components: - - type: Transform - pos: -3.5,3.5 - parent: 179 -- proto: SpawnPointMailCarrier - entities: - - uid: 1461 - components: - - type: Transform - pos: -3.5,2.5 - parent: 179 -- proto: SpawnPointMercenary - entities: - - uid: 1460 - components: - - type: Transform - pos: -3.5,2.5 - parent: 179 -- proto: SpawnPointObserver - entities: - - uid: 679 - components: - - type: Transform - pos: -3.5,4.5 - parent: 179 -- proto: SpawnPointPilot - entities: - - uid: 1463 - components: - - type: Transform - pos: -3.5,2.5 - parent: 179 -- proto: SpawnPointPDVRahkshan - entities: - - uid: 1466 - components: - - type: Transform - pos: -3.5,2.5 - parent: 179 -- proto: SpawnPointPDVGrandVizier - entities: - - uid: 1465 - components: - - type: Transform - pos: -3.5,2.5 - parent: 179 -- proto: SpawnPointPDVAsvaran - entities: - - uid: 1464 - components: - - type: Transform - pos: -3.5,2.5 - parent: 179 -- proto: SpawnPointPrisoner - entities: - - uid: 1459 - components: - - type: Transform - pos: -3.5,2.5 - parent: 179 -- proto: SpawnPointPrisonGuard - entities: - - uid: 1491 - components: - - type: Transform - pos: -3.5,2.5 - parent: 179 -- proto: SpawnPointPublicAffairsLiaison - entities: - - uid: 1489 - components: - - type: Transform - pos: -3.5,2.5 - parent: 179 -- proto: SpawnPointSecurityGuard - entities: - - uid: 1457 - components: - - type: Transform - pos: -3.5,2.5 - parent: 179 -- proto: SpawnPointTsfCommander - entities: - - uid: 1455 - components: - - type: Transform - pos: -3.5,2.5 - parent: 179 -- proto: SpawnPointStationRepresentative - entities: - - uid: 1454 - components: - - type: Transform - pos: -3.5,2.5 - parent: 179 -- proto: SpawnPointStc - entities: - - uid: 486 - components: - - type: Transform - pos: -3.5,2.5 - parent: 179 -- proto: SpawnPointCCServiceWorker - entities: - - uid: 1346 - components: - - type: Transform - pos: -3.5,2.5 - parent: 179 -- proto: SpawnVehicleATV - entities: - - uid: 1176 - components: - - type: Transform - pos: -7.5,1.5 - parent: 179 -- proto: SpawnVehicleJanicart - entities: - - uid: 904 - components: - - type: Transform - pos: 5.5,16.5 - parent: 179 -- proto: Spear - entities: - - uid: 1599 - components: - - type: Transform - pos: -1.9532888,-3.433445 - parent: 179 -- proto: SprayBottleWater - entities: - - uid: 903 - components: - - type: Transform - pos: 6.985283,16.424004 - parent: 179 -- proto: StationAdminBankATMFrontier - entities: - - uid: 1226 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -10.5,1.5 - parent: 179 -- proto: Stimpack - entities: - - uid: 462 - components: - - type: Transform - pos: 3.5410466,4.9723606 - parent: 179 -- proto: Stool - entities: - - uid: 383 - components: - - type: Transform - pos: -1.5,-9.5 - parent: 179 - - uid: 387 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -2.5,-6.5 - parent: 179 -- proto: Stunbaton - entities: - - uid: 1600 - components: - - type: Transform - pos: -2.1564138,-3.370945 - parent: 179 -- proto: SubstationBasic - entities: - - uid: 1018 - components: - - type: Transform - pos: -6.5,-13.5 - parent: 179 -- proto: SuitStorageWallmountSalv - entities: - - uid: 439 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -11.5,5.5 - parent: 179 -- proto: SuperCapacitorStockPart - entities: - - uid: 264 - components: - - type: Transform - pos: -3.6699915,8.851691 - parent: 179 -- proto: SuperMatterBinStockPart - entities: - - uid: 1253 - components: - - type: Transform - pos: -5.895403,8.320441 - parent: 179 -- proto: SurveillanceCameraGeneral - entities: - - uid: 1186 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -2.5,10.5 - parent: 179 - - uid: 1188 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 15.5,21.5 - parent: 179 - - uid: 1190 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 27.5,10.5 - parent: 179 -- proto: SurveillanceCameraRouterGeneral - entities: - - uid: 1356 - components: - - type: Transform - pos: 9.5,7.5 - parent: 179 -- proto: SyndicateKitchenElectricRange - entities: - - uid: 267 - components: - - type: Transform - pos: 23.5,5.5 - parent: 179 -- proto: SyndicateMicrowave - entities: - - uid: 1559 - components: - - type: Transform - pos: 23.5,6.5 - parent: 179 -- proto: Syringe - entities: - - uid: 460 - components: - - type: Transform - pos: 3.2502818,4.5823417 - parent: 179 - - uid: 738 - components: - - type: Transform - pos: 5.767191,9.787079 - parent: 179 -- proto: SyringeBluespace - entities: - - uid: 1606 - components: - - type: Transform - pos: 6.578887,11.88721 - parent: 179 -- proto: Table - entities: - - uid: 63 - components: - - type: Transform - pos: 9.5,21.5 - parent: 179 - - uid: 67 - components: - - type: Transform - pos: 8.5,21.5 - parent: 179 - - uid: 92 - components: - - type: Transform - pos: -16.5,-3.5 - parent: 179 - - uid: 127 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 27.5,8.5 - parent: 179 - - uid: 137 - components: - - type: Transform - pos: -16.5,-4.5 - parent: 179 - - uid: 143 - components: - - type: Transform - pos: 33.5,-3.5 - parent: 179 - - uid: 144 - components: - - type: Transform - pos: 33.5,-2.5 - parent: 179 - - uid: 145 - components: - - type: Transform - pos: 33.5,-1.5 - parent: 179 - - uid: 161 - components: - - type: Transform - pos: 24.5,-5.5 - parent: 179 - - uid: 162 - components: - - type: Transform - pos: 23.5,-5.5 - parent: 179 - - uid: 172 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,9.5 - parent: 179 - - uid: 180 - components: - - type: Transform - pos: -4.5,10.5 - parent: 179 - - uid: 185 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 25.5,8.5 - parent: 179 - - uid: 199 - components: - - type: Transform - pos: -16.5,-2.5 - parent: 179 - - uid: 298 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,9.5 - parent: 179 - - uid: 299 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,9.5 - parent: 179 - - uid: 300 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 8.5,9.5 - parent: 179 - - uid: 312 - components: - - type: Transform - pos: -3.5,-10.5 - parent: 179 - - uid: 313 - components: - - type: Transform - pos: -2.5,-10.5 - parent: 179 - - uid: 314 - components: - - type: Transform - pos: -1.5,-10.5 - parent: 179 - - uid: 315 - components: - - type: Transform - pos: -0.5,-10.5 - parent: 179 - - uid: 355 - components: - - type: Transform - pos: -6.5,7.5 - parent: 179 - - uid: 356 - components: - - type: Transform - pos: -5.5,7.5 - parent: 179 - - uid: 357 - components: - - type: Transform - pos: -4.5,7.5 - parent: 179 - - uid: 358 - components: - - type: Transform - pos: -3.5,7.5 - parent: 179 - - uid: 362 - components: - - type: Transform - pos: 0.5,7.5 - parent: 179 - - uid: 363 - components: - - type: Transform - pos: 1.5,7.5 - parent: 179 - - uid: 366 - components: - - type: Transform - pos: -2.5,4.5 - parent: 179 - - uid: 367 - components: - - type: Transform - pos: -1.5,4.5 - parent: 179 - - uid: 368 - components: - - type: Transform - pos: -0.5,4.5 - parent: 179 - - uid: 371 - components: - - type: Transform - pos: 1.5,4.5 - parent: 179 - - uid: 386 - components: - - type: Transform - pos: -3.5,-1.5 - parent: 179 - - uid: 434 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 23.5,6.5 - parent: 179 - - uid: 440 - components: - - type: Transform - pos: 0.5,4.5 - parent: 179 - - uid: 445 - components: - - type: Transform - pos: -3.5,-0.5 - parent: 179 - - uid: 448 - components: - - type: Transform - pos: 3.5,5.5 - parent: 179 - - uid: 465 - components: - - type: Transform - pos: 1.5,8.5 - parent: 179 - - uid: 466 - components: - - type: Transform - pos: 0.5,8.5 - parent: 179 - - uid: 467 - components: - - type: Transform - pos: -3.5,8.5 - parent: 179 - - uid: 470 - components: - - type: Transform - pos: -6.5,8.5 - parent: 179 - - uid: 471 - components: - - type: Transform - pos: -5.5,8.5 - parent: 179 - - uid: 472 - components: - - type: Transform - pos: -4.5,8.5 - parent: 179 - - uid: 568 - components: - - type: Transform - pos: 18.5,4.5 - parent: 179 - - uid: 569 - components: - - type: Transform - pos: 21.5,6.5 - parent: 179 - - uid: 570 - components: - - type: Transform - pos: 20.5,6.5 - parent: 179 - - uid: 571 - components: - - type: Transform - pos: 18.5,6.5 - parent: 179 - - uid: 572 - components: - - type: Transform - pos: 19.5,6.5 - parent: 179 - - uid: 573 - components: - - type: Transform - pos: 18.5,5.5 - parent: 179 - - uid: 575 - components: - - type: Transform - pos: 24.5,4.5 - parent: 179 - - uid: 590 - components: - - type: Transform - pos: -0.5,7.5 - parent: 179 - - uid: 594 - components: - - type: Transform - pos: 13.5,2.5 - parent: 179 - - uid: 595 - components: - - type: Transform - pos: 13.5,0.5 - parent: 179 - - uid: 596 - components: - - type: Transform - pos: 13.5,1.5 - parent: 179 - - uid: 684 - components: - - type: Transform - pos: -3.5,0.5 - parent: 179 - - uid: 685 - components: - - type: Transform - pos: 3.5,4.5 - parent: 179 - - uid: 686 - components: - - type: Transform - pos: 3.5,6.5 - parent: 179 - - uid: 706 - components: - - type: Transform - pos: -1.5,-3.5 - parent: 179 - - uid: 707 - components: - - type: Transform - pos: -0.5,-3.5 - parent: 179 - - uid: 710 - components: - - type: Transform - pos: 0.5,-3.5 - parent: 179 - - uid: 1189 - components: - - type: Transform - pos: -2.5,-1.5 - parent: 179 - - uid: 1203 - components: - - type: Transform - pos: -2.5,-0.5 - parent: 179 - - uid: 1302 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 27.5,7.5 - parent: 179 - - uid: 1347 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,8.5 - parent: 179 - - uid: 1353 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 25.5,7.5 - parent: 179 - - uid: 1355 - components: - - type: Transform - pos: -3.5,-3.5 - parent: 179 - - uid: 1505 - components: - - type: Transform - pos: 13.5,16.5 - parent: 179 - - uid: 1558 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 27.5,6.5 - parent: 179 - - uid: 1560 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 25.5,6.5 - parent: 179 - - uid: 1571 - components: - - type: Transform - pos: -2.5,0.5 - parent: 179 - - uid: 1596 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -2.5,-3.5 - parent: 179 - - uid: 1616 - components: - - type: Transform - pos: -4.5,-3.5 - parent: 179 -- proto: TableGlass - entities: - - uid: 964 - components: - - type: Transform - pos: 9.5,12.5 - parent: 179 - - uid: 965 - components: - - type: Transform - pos: 11.5,12.5 - parent: 179 - - uid: 966 - components: - - type: Transform - pos: 13.5,12.5 - parent: 179 - - uid: 975 - components: - - type: Transform - pos: 10.5,12.5 - parent: 179 - - uid: 976 - components: - - type: Transform - pos: 12.5,12.5 - parent: 179 - - uid: 1218 - components: - - type: Transform - pos: 9.5,16.5 - parent: 179 - - uid: 1221 - components: - - type: Transform - pos: 9.5,15.5 - parent: 179 -- proto: TargetHuman - entities: - - uid: 159 - components: - - type: Transform - pos: -6.5,-1.5 - parent: 179 -- proto: TelecomServerFilledFreelance - entities: - - uid: 1467 - components: - - type: Transform - pos: 9.5,6.5 - parent: 179 -- proto: TelecomServerFilledSyndicate - entities: - - uid: 1468 - components: - - type: Transform - pos: 10.5,6.5 - parent: 179 -- proto: Telecrystal - entities: - - uid: 1549 - components: - - type: Transform - pos: -14.256703,4.7913895 - parent: 179 -- proto: ThrusterNfsd - entities: - - uid: 1401 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 9.5,-16.5 - parent: 179 -- proto: TimerTrigger - entities: - - uid: 482 - components: - - type: Transform - pos: 6.413024,9.39097 - parent: 179 -- proto: ToiletDirtyWater - entities: - - uid: 722 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -1.5,12.5 - parent: 179 -- proto: ToiletEmpty - entities: - - uid: 1548 - components: - - type: Transform - pos: 25.5,14.5 - parent: 179 -- proto: ToyRubberDuck - entities: - - uid: 724 - components: - - type: Transform - pos: 20.017172,12.573236 - parent: 179 -- proto: trayScanner - entities: - - uid: 758 - components: - - type: Transform - pos: 1.5086639,4.5466213 - parent: 179 -- proto: TurboItemRecharger - entities: - - uid: 1594 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,-3.5 - parent: 179 -- proto: TwoWayLever - entities: - - uid: 699 - components: - - type: Transform - pos: -3.5,-13.5 - parent: 179 - - type: DeviceLinkSource - linkedPorts: - 990: - - Left: Forward - - Right: Reverse - - Middle: Off - 195: - - Left: Forward - - Right: Reverse - - Middle: Off - 991: - - Left: Forward - - Right: Reverse - - Middle: Off - - uid: 983 - components: - - type: Transform - pos: 2.5,-13.5 - parent: 179 - - type: DeviceLinkSource - linkedPorts: - 985: - - Left: Forward - - Right: Reverse - - Middle: Off - 259: - - Left: Forward - - Right: Reverse - - Middle: Off - 989: - - Left: Forward - - Right: Reverse - - Middle: Off - 463: - - Left: Forward - - Right: Reverse - - Middle: Off - - uid: 1299 - components: - - type: Transform - pos: 5.5,3.5 - parent: 179 - - type: DeviceLinkSource - linkedPorts: - 1298: - - Left: Forward - - Right: Reverse - - Middle: Off - - uid: 1354 - components: - - type: Transform - pos: 8.5,24.5 - parent: 179 - - type: DeviceLinkSource - linkedPorts: - 584: - - Left: Forward - - Right: Reverse - - Middle: Off - 574: - - Left: Forward - - Right: Reverse - - Middle: Off - 1510: - - Left: Forward - - Right: Reverse - - Middle: Off - 402: - - Left: Forward - - Right: Reverse - - Middle: Off - - uid: 1531 - components: - - type: Transform - pos: 18.5,13.5 - parent: 179 - - type: DeviceLinkSource - linkedPorts: - 1524: - - Left: Forward - - Right: Reverse - - Middle: Off - 1183: - - Left: Forward - - Right: Reverse - - Middle: Off - 164: - - Left: Forward - - Right: Reverse - - Middle: Off - 1512: - - Left: Forward - - Right: Reverse - - Middle: Off - 1513: - - Left: Forward - - Right: Reverse - - Middle: Off - 1514: - - Left: Forward - - Right: Reverse - - Middle: Off - - uid: 1532 - components: - - type: Transform - pos: 21.5,13.5 - parent: 179 - - type: DeviceLinkSource - linkedPorts: - 1524: - - Left: Forward - - Right: Reverse - - Middle: Off - 1183: - - Left: Forward - - Right: Reverse - - Middle: Off - 164: - - Left: Forward - - Right: Reverse - - Middle: Off - 1512: - - Left: Forward - - Right: Reverse - - Middle: Off - 1513: - - Left: Forward - - Right: Reverse - - Middle: Off - 1514: - - Left: Forward - - Right: Reverse - - Middle: Off - - uid: 1533 - components: - - type: Transform - pos: 18.5,9.5 - parent: 179 - - type: DeviceLinkSource - linkedPorts: - 1523: - - Left: Forward - - Right: Reverse - - Middle: Off - 588: - - Left: Forward - - Right: Reverse - - Middle: Off - 400: - - Left: Forward - - Right: Reverse - - Middle: Off - 587: - - Left: Forward - - Right: Reverse - - Middle: Off - 401: - - Left: Forward - - Right: Reverse - - Middle: Off - 517: - - Left: Forward - - Right: Reverse - - Middle: Off - 1515: - - Left: Forward - - Right: Reverse - - Middle: Off - 1516: - - Left: Forward - - Right: Reverse - - Middle: Off - 1517: - - Left: Forward - - Right: Reverse - - Middle: Off - 1518: - - Left: Forward - - Right: Reverse - - Middle: Off - 1519: - - Left: Forward - - Right: Reverse - - Middle: Off - 1520: - - Left: Forward - - Right: Reverse - - Middle: Off - 1521: - - Left: Forward - - Right: Reverse - - Middle: Off - 1522: - - Left: Forward - - Right: Reverse - - Middle: Off - - uid: 1534 - components: - - type: Transform - pos: 21.5,9.5 - parent: 179 - - type: DeviceLinkSource - linkedPorts: - 517: - - Left: Forward - - Right: Reverse - - Middle: Off - 1515: - - Left: Forward - - Right: Reverse - - Middle: Off - 1516: - - Left: Forward - - Right: Reverse - - Middle: Off - 1517: - - Left: Forward - - Right: Reverse - - Middle: Off - 1518: - - Left: Forward - - Right: Reverse - - Middle: Off - 1519: - - Left: Forward - - Right: Reverse - - Middle: Off - 1520: - - Left: Forward - - Right: Reverse - - Middle: Off - 1521: - - Left: Forward - - Right: Reverse - - Middle: Off - 1522: - - Left: Forward - - Right: Reverse - - Middle: Off - 1523: - - Left: Forward - - Right: Reverse - - Middle: Off - 588: - - Left: Forward - - Right: Reverse - - Middle: Off - 400: - - Left: Forward - - Right: Reverse - - Middle: Off - 587: - - Left: Forward - - Right: Reverse - - Middle: Off - 401: - - Left: Forward - - Right: Reverse - - Middle: Off -- proto: UnfinishedMachineFrame - entities: - - uid: 263 - components: - - type: Transform - pos: -13.5,-7.5 - parent: 179 - - uid: 522 - components: - - type: Transform - pos: -6.5,10.5 - parent: 179 -- proto: UniformPrinter - entities: - - uid: 443 - components: - - type: Transform - pos: -7.5,4.5 - parent: 179 -- proto: VariantCubeBox - entities: - - uid: 1589 - components: - - type: Transform - pos: 25.734358,8.234057 - parent: 179 -- proto: VehicleKeyATV - entities: - - uid: 1187 - components: - - type: Transform - pos: -6.8905525,1.5128828 - parent: 179 -- proto: VehicleKeyJanicart - entities: - - uid: 14 - components: - - type: Transform - pos: 6.5,16.5 - parent: 179 -- proto: VendingMachineAmmoPOI - entities: - - uid: 1239 - components: - - type: Transform - pos: -14.5,6.5 - parent: 179 -- proto: VendingMachineBooze - entities: - - uid: 1557 - components: - - type: Transform - pos: 25.5,10.5 - parent: 179 -- proto: VendingMachineChefvend - entities: - - uid: 1555 - components: - - type: Transform - pos: 27.5,10.5 - parent: 179 -- proto: VendingMachineDinnerware - entities: - - uid: 1554 - components: - - type: Transform - pos: 26.5,10.5 - parent: 179 -- proto: VendingMachineEngivendPOI - entities: - - uid: 523 - components: - - type: Transform - pos: -11.5,-1.5 - parent: 179 -- proto: VendingMachineExpeditionaryFlatpackVend - entities: - - uid: 1237 - components: - - type: Transform - pos: -12.5,6.5 - parent: 179 -- proto: VendingMachineFlatpackVend - entities: - - uid: 1236 - components: - - type: Transform - pos: -12.5,5.5 - parent: 179 -- proto: VendingMachineFuelVend - entities: - - uid: 94 - components: - - type: Transform - pos: -15.5,5.5 - parent: 179 -- proto: VendingMachineMedical - entities: - - uid: 156 - components: - - type: Transform - pos: 25.5,-5.5 - parent: 179 - - uid: 157 - components: - - type: Transform - pos: 27.5,-5.5 - parent: 179 - - uid: 158 - components: - - type: Transform - pos: 29.5,3.5 - parent: 179 -- proto: VendingMachineSyndieContraband - entities: - - uid: 1240 - components: - - type: Transform - pos: -15.5,6.5 - parent: 179 -- proto: VendingMachineTankDispenserEVAPOI - entities: - - uid: 875 - components: - - type: Transform - pos: 7.5,0.5 - parent: 179 -- proto: VendingMachineYouToolPOI - entities: - - uid: 350 - components: - - type: Transform - pos: -11.5,-0.5 - parent: 179 -- proto: VialBluespace - entities: - - uid: 1605 - components: - - type: Transform - pos: 6.9643035,11.970543 - parent: 179 -- proto: WallSolid - entities: - - uid: 3 - components: - - type: Transform - pos: 1.5,18.5 - parent: 179 - - uid: 4 - components: - - type: Transform - pos: 11.5,26.5 - parent: 179 - - uid: 5 - components: - - type: Transform - pos: 18.5,24.5 - parent: 179 - - uid: 6 - components: - - type: Transform - pos: 20.5,15.5 - parent: 179 - - uid: 8 - components: - - type: Transform - pos: 14.5,19.5 - parent: 179 - - uid: 9 - components: - - type: Transform - pos: 1.5,19.5 - parent: 179 - - uid: 10 - components: - - type: Transform - pos: 18.5,26.5 - parent: 179 - - uid: 11 - components: - - type: Transform - pos: 13.5,26.5 - parent: 179 - - uid: 13 - components: - - type: Transform - pos: 25.5,15.5 - parent: 179 - - uid: 18 - components: - - type: Transform - pos: 4.5,26.5 - parent: 179 - - uid: 19 - components: - - type: Transform - pos: 18.5,25.5 - parent: 179 - - uid: 21 - components: - - type: Transform - pos: 10.5,26.5 - parent: 179 - - uid: 22 - components: - - type: Transform - pos: 26.5,15.5 - parent: 179 - - uid: 25 - components: - - type: Transform - pos: 1.5,21.5 - parent: 179 - - uid: 27 - components: - - type: Transform - pos: 8.5,-0.5 - parent: 179 - - uid: 28 - components: - - type: Transform - pos: 18.5,18.5 - parent: 179 - - uid: 29 - components: - - type: Transform - pos: 18.5,21.5 - parent: 179 - - uid: 30 - components: - - type: Transform - pos: 1.5,22.5 - parent: 179 - - uid: 31 - components: - - type: Transform - pos: 1.5,20.5 - parent: 179 - - uid: 32 - components: - - type: Transform - pos: 18.5,19.5 - parent: 179 - - uid: 33 - components: - - type: Transform - pos: 23.5,15.5 - parent: 179 - - uid: 34 - components: - - type: Transform - pos: 12.5,22.5 - parent: 179 - - uid: 35 - components: - - type: Transform - pos: 27.5,15.5 - parent: 179 - - uid: 36 - components: - - type: Transform - pos: 7.5,22.5 - parent: 179 - - uid: 37 - components: - - type: Transform - pos: 14.5,22.5 - parent: 179 - - uid: 38 - components: - - type: Transform - pos: 10.5,23.5 - parent: 179 - - uid: 39 - components: - - type: Transform - pos: 10.5,24.5 - parent: 179 - - uid: 40 - components: - - type: Transform - pos: 8.5,26.5 - parent: 179 - - uid: 41 - components: - - type: Transform - pos: 10.5,25.5 - parent: 179 - - uid: 42 - components: - - type: Transform - pos: 18.5,22.5 - parent: 179 - - uid: 43 - components: - - type: Transform - pos: 14.5,27.5 - parent: 179 - - uid: 44 - components: - - type: Transform - pos: 14.5,26.5 - parent: 179 - - uid: 45 - components: - - type: Transform - pos: 1.5,16.5 - parent: 179 - - uid: 46 - components: - - type: Transform - pos: 18.5,27.5 - parent: 179 - - uid: 49 - components: - - type: Transform - pos: 7.5,28.5 - parent: 179 - - uid: 50 - components: - - type: Transform - pos: 13.5,22.5 - parent: 179 - - uid: 51 - components: - - type: Transform - pos: 12.5,26.5 - parent: 179 - - uid: 52 - components: - - type: Transform - pos: 1.5,15.5 - parent: 179 - - uid: 53 - components: - - type: Transform - pos: 9.5,26.5 - parent: 179 - - uid: 55 - components: - - type: Transform - pos: 24.5,15.5 - parent: 179 - - uid: 56 - components: - - type: Transform - pos: 14.5,25.5 - parent: 179 - - uid: 57 - components: - - type: Transform - pos: 14.5,21.5 - parent: 179 - - uid: 60 - components: - - type: Transform - pos: 7.5,21.5 - parent: 179 - - uid: 61 - components: - - type: Transform - pos: 18.5,20.5 - parent: 179 - - uid: 62 - components: - - type: Transform - pos: 18.5,23.5 - parent: 179 - - uid: 66 - components: - - type: Transform - pos: 18.5,17.5 - parent: 179 - - uid: 68 - components: - - type: Transform - pos: 18.5,28.5 - parent: 179 - - uid: 69 - components: - - type: Transform - pos: 28.5,15.5 - parent: 179 - - uid: 71 - components: - - type: Transform - pos: 11.5,22.5 - parent: 179 - - uid: 72 - components: - - type: Transform - pos: 1.5,17.5 - parent: 179 - - uid: 73 - components: - - type: Transform - pos: 14.5,28.5 - parent: 179 - - uid: 74 - components: - - type: Transform - pos: 10.5,22.5 - parent: 179 - - uid: 75 - components: - - type: Transform - pos: 9.5,22.5 - parent: 179 - - uid: 76 - components: - - type: Transform - pos: 8.5,-1.5 - parent: 179 - - uid: 77 - components: - - type: Transform - pos: 8.5,-2.5 - parent: 179 - - uid: 78 - components: - - type: Transform - pos: 21.5,15.5 - parent: 179 - - uid: 80 - components: - - type: Transform - pos: 18.5,16.5 - parent: 179 - - uid: 81 - components: - - type: Transform - pos: 18.5,15.5 - parent: 179 - - uid: 82 - components: - - type: Transform - pos: 14.5,18.5 - parent: 179 - - uid: 83 - components: - - type: Transform - pos: 4.5,28.5 - parent: 179 - - uid: 84 - components: - - type: Transform - pos: 7.5,26.5 - parent: 179 - - uid: 85 - components: - - type: Transform - pos: 1.5,23.5 - parent: 179 - - uid: 86 - components: - - type: Transform - pos: 17.5,15.5 - parent: 179 - - uid: 89 - components: - - type: Transform - pos: 22.5,15.5 - parent: 179 - - uid: 95 - components: - - type: Transform - pos: 8.5,22.5 - parent: 179 - - uid: 96 - components: - - type: Transform - pos: 7.5,27.5 - parent: 179 - - uid: 97 - components: - - type: Transform - pos: 8.5,-3.5 - parent: 179 - - uid: 98 - components: - - type: Transform - pos: 4.5,25.5 - parent: 179 - - uid: 99 - components: - - type: Transform - pos: 17.5,18.5 - parent: 179 - - uid: 100 - components: - - type: Transform - pos: 19.5,15.5 - parent: 179 - - uid: 101 - components: - - type: Transform - pos: 4.5,27.5 - parent: 179 - - uid: 103 - components: - - type: Transform - pos: 14.5,17.5 - parent: 179 - - uid: 104 - components: - - type: Transform - pos: 14.5,16.5 - parent: 179 - - uid: 105 - components: - - type: Transform - pos: 15.5,15.5 - parent: 179 - - uid: 106 - components: - - type: Transform - pos: 14.5,15.5 - parent: 179 - - uid: 107 - components: - - type: Transform - pos: 13.5,15.5 - parent: 179 - - uid: 109 - components: - - type: Transform - pos: 11.5,15.5 - parent: 179 - - uid: 110 - components: - - type: Transform - pos: 10.5,15.5 - parent: 179 - - uid: 112 - components: - - type: Transform - pos: 7.5,19.5 - parent: 179 - - uid: 113 - components: - - type: Transform - pos: 7.5,18.5 - parent: 179 - - uid: 114 - components: - - type: Transform - pos: 7.5,17.5 - parent: 179 - - uid: 117 - components: - - type: Transform - pos: 5.5,18.5 - parent: 179 - - uid: 118 - components: - - type: Transform - pos: 5.5,19.5 - parent: 179 - - uid: 121 - components: - - type: Transform - pos: 4.5,19.5 - parent: 179 - - uid: 122 - components: - - type: Transform - pos: 4.5,20.5 - parent: 179 - - uid: 123 - components: - - type: Transform - pos: 4.5,21.5 - parent: 179 - - uid: 124 - components: - - type: Transform - pos: 4.5,22.5 - parent: 179 - - uid: 125 - components: - - type: Transform - pos: 4.5,23.5 - parent: 179 - - uid: 126 - components: - - type: Transform - pos: 4.5,24.5 - parent: 179 - - uid: 165 - components: - - type: Transform - pos: 8.5,2.5 - parent: 179 - - uid: 169 - components: - - type: Transform - pos: 8.5,0.5 - parent: 179 - - uid: 173 - components: - - type: Transform - pos: 8.5,1.5 - parent: 179 - - uid: 189 - components: - - type: Transform - pos: -7.5,0.5 - parent: 179 - - uid: 190 - components: - - type: Transform - pos: -7.5,-0.5 - parent: 179 - - uid: 191 - components: - - type: Transform - pos: -7.5,-1.5 - parent: 179 - - uid: 192 - components: - - type: Transform - pos: -7.5,-2.5 - parent: 179 - - uid: 193 - components: - - type: Transform - pos: -7.5,-3.5 - parent: 179 - - uid: 196 - components: - - type: Transform - pos: 3.5,-14.5 - parent: 179 - - uid: 197 - components: - - type: Transform - pos: 4.5,-14.5 - parent: 179 - - uid: 198 - components: - - type: Transform - pos: -7.5,-10.5 - parent: 179 - - uid: 200 - components: - - type: Transform - pos: -7.5,-12.5 - parent: 179 - - uid: 201 - components: - - type: Transform - pos: -7.5,-13.5 - parent: 179 - - uid: 208 - components: - - type: Transform - pos: -7.5,-9.5 - parent: 179 - - uid: 209 - components: - - type: Transform - pos: -10.5,-7.5 - parent: 179 - - uid: 211 - components: - - type: Transform - pos: -10.5,-5.5 - parent: 179 - - uid: 212 - components: - - type: Transform - pos: -10.5,-4.5 - parent: 179 - - uid: 213 - components: - - type: Transform - pos: -10.5,-3.5 - parent: 179 - - uid: 214 - components: - - type: Transform - pos: -10.5,-2.5 - parent: 179 - - uid: 215 - components: - - type: Transform - pos: -10.5,-1.5 - parent: 179 - - uid: 217 - components: - - type: Transform - pos: 1.5,-4.5 - parent: 179 - - uid: 218 - components: - - type: Transform - pos: 0.5,-4.5 - parent: 179 - - uid: 219 - components: - - type: Transform - pos: -0.5,-4.5 - parent: 179 - - uid: 220 - components: - - type: Transform - pos: -1.5,-4.5 - parent: 179 - - uid: 221 - components: - - type: Transform - pos: -2.5,-4.5 - parent: 179 - - uid: 222 - components: - - type: Transform - pos: -3.5,-4.5 - parent: 179 - - uid: 223 - components: - - type: Transform - pos: -4.5,-4.5 - parent: 179 - - uid: 224 - components: - - type: Transform - pos: -5.5,-4.5 - parent: 179 - - uid: 225 - components: - - type: Transform - pos: -6.5,-4.5 - parent: 179 - - uid: 226 - components: - - type: Transform - pos: 4.5,-4.5 - parent: 179 - - uid: 227 - components: - - type: Transform - pos: 5.5,-4.5 - parent: 179 - - uid: 228 - components: - - type: Transform - pos: 6.5,-4.5 - parent: 179 - - uid: 229 - components: - - type: Transform - pos: -7.5,-14.5 - parent: 179 - - uid: 231 - components: - - type: Transform - pos: -6.5,-14.5 - parent: 179 - - uid: 232 - components: - - type: Transform - pos: -5.5,-14.5 - parent: 179 - - uid: 233 - components: - - type: Transform - pos: -4.5,-14.5 - parent: 179 - - uid: 234 - components: - - type: Transform - pos: 6.5,-10.5 - parent: 179 - - uid: 235 - components: - - type: Transform - pos: 6.5,-11.5 - parent: 179 - - uid: 236 - components: - - type: Transform - pos: 6.5,-12.5 - parent: 179 - - uid: 237 - components: - - type: Transform - pos: 6.5,-13.5 - parent: 179 - - uid: 238 - components: - - type: Transform - pos: 6.5,-14.5 - parent: 179 - - uid: 239 - components: - - type: Transform - pos: 5.5,-14.5 - parent: 179 - - uid: 240 - components: - - type: Transform - pos: -7.5,-8.5 - parent: 179 - - uid: 241 - components: - - type: Transform - pos: -7.5,-7.5 - parent: 179 - - uid: 242 - components: - - type: Transform - pos: -8.5,-8.5 - parent: 179 - - uid: 243 - components: - - type: Transform - pos: -9.5,-8.5 - parent: 179 - - uid: 244 - components: - - type: Transform - pos: -10.5,-8.5 - parent: 179 - - uid: 245 - components: - - type: Transform - pos: -7.5,-5.5 - parent: 179 - - uid: 248 - components: - - type: Transform - pos: 5.5,-7.5 - parent: 179 - - uid: 249 - components: - - type: Transform - pos: 5.5,-9.5 - parent: 179 - - uid: 250 - components: - - type: Transform - pos: 6.5,-9.5 - parent: 179 - - uid: 251 - components: - - type: Transform - pos: 6.5,-7.5 - parent: 179 - - uid: 254 - components: - - type: Transform - pos: 7.5,-9.5 - parent: 179 - - uid: 271 - components: - - type: Transform - pos: 1.5,14.5 - parent: 179 - - uid: 272 - components: - - type: Transform - pos: 1.5,13.5 - parent: 179 - - uid: 273 - components: - - type: Transform - pos: 1.5,12.5 - parent: 179 - - uid: 274 - components: - - type: Transform - pos: -7.5,11.5 - parent: 179 - - uid: 275 - components: - - type: Transform - pos: -6.5,11.5 - parent: 179 - - uid: 276 - components: - - type: Transform - pos: -5.5,11.5 - parent: 179 - - uid: 277 - components: - - type: Transform - pos: -4.5,11.5 - parent: 179 - - uid: 278 - components: - - type: Transform - pos: -3.5,11.5 - parent: 179 - - uid: 279 - components: - - type: Transform - pos: -2.5,11.5 - parent: 179 - - uid: 288 - components: - - type: Transform - pos: 12.5,8.5 - parent: 179 - - uid: 289 - components: - - type: Transform - pos: 11.5,8.5 - parent: 179 - - uid: 290 - components: - - type: Transform - pos: 10.5,8.5 - parent: 179 - - uid: 291 - components: - - type: Transform - pos: 9.5,8.5 - parent: 179 - - uid: 292 - components: - - type: Transform - pos: 8.5,8.5 - parent: 179 - - uid: 293 - components: - - type: Transform - pos: 7.5,8.5 - parent: 179 - - uid: 294 - components: - - type: Transform - pos: 6.5,8.5 - parent: 179 - - uid: 295 - components: - - type: Transform - pos: 5.5,8.5 - parent: 179 - - uid: 301 - components: - - type: Transform - pos: 9.5,11.5 - parent: 179 - - uid: 302 - components: - - type: Transform - pos: 10.5,11.5 - parent: 179 - - uid: 303 - components: - - type: Transform - pos: 11.5,11.5 - parent: 179 - - uid: 304 - components: - - type: Transform - pos: 12.5,11.5 - parent: 179 - - uid: 310 - components: - - type: Transform - pos: 9.5,9.5 - parent: 179 - - uid: 316 - components: - - type: Transform - pos: -7.5,-4.5 - parent: 179 - - uid: 317 - components: - - type: Transform - pos: 26.5,14.5 - parent: 179 - - uid: 320 - components: - - type: Transform - pos: 24.5,14.5 - parent: 179 - - uid: 326 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,-6.5 - parent: 179 - - uid: 329 - components: - - type: Transform - pos: -11.5,5.5 - parent: 179 - - uid: 335 - components: - - type: Transform - pos: 13.5,11.5 - parent: 179 - - uid: 336 - components: - - type: Transform - pos: 14.5,11.5 - parent: 179 - - uid: 337 - components: - - type: Transform - pos: 13.5,9.5 - parent: 179 - - uid: 338 - components: - - type: Transform - pos: 13.5,8.5 - parent: 179 - - uid: 339 - components: - - type: Transform - pos: 12.5,5.5 - parent: 179 - - uid: 341 - components: - - type: Transform - pos: 24.5,12.5 - parent: 179 - - uid: 342 - components: - - type: Transform - pos: 26.5,12.5 - parent: 179 - - uid: 352 - components: - - type: Transform - pos: 13.5,6.5 - parent: 179 - - uid: 353 - components: - - type: Transform - pos: 13.5,5.5 - parent: 179 - - uid: 372 - components: - - type: Transform - pos: 13.5,4.5 - parent: 179 - - uid: 373 - components: - - type: Transform - pos: 25.5,4.5 - parent: 179 - - uid: 374 - components: - - type: Transform - pos: 23.5,4.5 - parent: 179 - - uid: 375 - components: - - type: Transform - pos: 17.5,3.5 - parent: 179 - - uid: 376 - components: - - type: Transform - pos: -10.5,-0.5 - parent: 179 - - uid: 377 - components: - - type: Transform - pos: -10.5,0.5 - parent: 179 - - uid: 379 - components: - - type: Transform - pos: -8.5,0.5 - parent: 179 - - uid: 390 - components: - - type: Transform - pos: 18.5,3.5 - parent: 179 - - uid: 391 - components: - - type: Transform - pos: 19.5,3.5 - parent: 179 - - uid: 392 - components: - - type: Transform - pos: 21.5,3.5 - parent: 179 - - uid: 393 - components: - - type: Transform - pos: 22.5,3.5 - parent: 179 - - uid: 394 - components: - - type: Transform - pos: 22.5,4.5 - parent: 179 - - uid: 395 - components: - - type: Transform - pos: 22.5,5.5 - parent: 179 - - uid: 396 - components: - - type: Transform - pos: 22.5,6.5 - parent: 179 - - uid: 418 - components: - - type: Transform - pos: 7.5,-7.5 - parent: 179 - - uid: 449 - components: - - type: Transform - pos: -16.5,2.5 - parent: 179 - - uid: 450 - components: - - type: Transform - pos: -16.5,3.5 - parent: 179 - - uid: 464 - components: - - type: Transform - pos: 4.5,8.5 - parent: 179 - - uid: 474 - components: - - type: Transform - pos: -7.5,8.5 - parent: 179 - - uid: 475 - components: - - type: Transform - pos: -7.5,7.5 - parent: 179 - - uid: 476 - components: - - type: Transform - pos: -7.5,6.5 - parent: 179 - - uid: 477 - components: - - type: Transform - pos: -7.5,5.5 - parent: 179 - - uid: 487 - components: - - type: Transform - pos: -16.5,4.5 - parent: 179 - - uid: 488 - components: - - type: Transform - pos: 5.5,17.5 - parent: 179 - - uid: 489 - components: - - type: Transform - pos: -11.5,0.5 - parent: 179 - - uid: 491 - components: - - type: Transform - pos: -16.5,5.5 - parent: 179 - - uid: 494 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,7.5 - parent: 179 - - uid: 496 - components: - - type: Transform - pos: -16.5,1.5 - parent: 179 - - uid: 497 - components: - - type: Transform - pos: -16.5,0.5 - parent: 179 - - uid: 511 - components: - - type: Transform - pos: -7.5,-11.5 - parent: 179 - - uid: 515 - components: - - type: Transform - pos: -16.5,-8.5 - parent: 179 - - uid: 516 - components: - - type: Transform - pos: -17.5,-8.5 - parent: 179 - - uid: 518 - components: - - type: Transform - pos: 24.5,11.5 - parent: 179 - - uid: 519 - components: - - type: Transform - pos: 25.5,11.5 - parent: 179 - - uid: 520 - components: - - type: Transform - pos: -17.5,-7.5 - parent: 179 - - uid: 524 - components: - - type: Transform - pos: -17.5,-6.5 - parent: 179 - - uid: 525 - components: - - type: Transform - pos: -17.5,-5.5 - parent: 179 - - uid: 531 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -12.5,7.5 - parent: 179 - - uid: 535 - components: - - type: Transform - pos: -15.5,0.5 - parent: 179 - - uid: 539 - components: - - type: Transform - pos: 26.5,11.5 - parent: 179 - - uid: 540 - components: - - type: Transform - pos: 27.5,11.5 - parent: 179 - - uid: 545 - components: - - type: Transform - pos: 7.5,-4.5 - parent: 179 - - uid: 546 - components: - - type: Transform - pos: 8.5,-4.5 - parent: 179 - - uid: 547 - components: - - type: Transform - pos: 28.5,11.5 - parent: 179 - - uid: 548 - components: - - type: Transform - pos: 28.5,10.5 - parent: 179 - - uid: 549 - components: - - type: Transform - pos: 28.5,9.5 - parent: 179 - - uid: 550 - components: - - type: Transform - pos: 28.5,8.5 - parent: 179 - - uid: 551 - components: - - type: Transform - pos: 28.5,7.5 - parent: 179 - - uid: 552 - components: - - type: Transform - pos: 28.5,6.5 - parent: 179 - - uid: 553 - components: - - type: Transform - pos: 28.5,5.5 - parent: 179 - - uid: 554 - components: - - type: Transform - pos: 26.5,-2.5 - parent: 179 - - uid: 555 - components: - - type: Transform - pos: 26.5,-1.5 - parent: 179 - - uid: 556 - components: - - type: Transform - pos: 25.5,-0.5 - parent: 179 - - uid: 557 - components: - - type: Transform - pos: 26.5,-0.5 - parent: 179 - - uid: 558 - components: - - type: Transform - pos: 27.5,-0.5 - parent: 179 - - uid: 559 - components: - - type: Transform - pos: -17.5,-4.5 - parent: 179 - - uid: 560 - components: - - type: Transform - pos: -17.5,-3.5 - parent: 179 - - uid: 561 - components: - - type: Transform - pos: -14.5,0.5 - parent: 179 - - uid: 585 - components: - - type: Transform - pos: 9.5,10.5 - parent: 179 - - uid: 597 - components: - - type: Transform - pos: 22.5,-0.5 - parent: 179 - - uid: 598 - components: - - type: Transform - pos: 17.5,-0.5 - parent: 179 - - uid: 599 - components: - - type: Transform - pos: 18.5,-0.5 - parent: 179 - - uid: 600 - components: - - type: Transform - pos: 20.5,-0.5 - parent: 179 - - uid: 601 - components: - - type: Transform - pos: 21.5,-0.5 - parent: 179 - - uid: 602 - components: - - type: Transform - pos: 19.5,-0.5 - parent: 179 - - uid: 603 - components: - - type: Transform - pos: 14.5,3.5 - parent: 179 - - uid: 604 - components: - - type: Transform - pos: 13.5,3.5 - parent: 179 - - uid: 605 - components: - - type: Transform - pos: 12.5,3.5 - parent: 179 - - uid: 606 - components: - - type: Transform - pos: 12.5,2.5 - parent: 179 - - uid: 607 - components: - - type: Transform - pos: 12.5,1.5 - parent: 179 - - uid: 608 - components: - - type: Transform - pos: 12.5,0.5 - parent: 179 - - uid: 609 - components: - - type: Transform - pos: 12.5,-0.5 - parent: 179 - - uid: 610 - components: - - type: Transform - pos: 13.5,-0.5 - parent: 179 - - uid: 611 - components: - - type: Transform - pos: 14.5,-0.5 - parent: 179 - - uid: 612 - components: - - type: Transform - pos: 13.5,-1.5 - parent: 179 - - uid: 613 - components: - - type: Transform - pos: 13.5,-6.5 - parent: 179 - - uid: 614 - components: - - type: Transform - pos: 13.5,-5.5 - parent: 179 - - uid: 615 - components: - - type: Transform - pos: 13.5,-4.5 - parent: 179 - - uid: 616 - components: - - type: Transform - pos: 13.5,-3.5 - parent: 179 - - uid: 617 - components: - - type: Transform - pos: 13.5,-2.5 - parent: 179 - - uid: 618 - components: - - type: Transform - pos: 14.5,-6.5 - parent: 179 - - uid: 619 - components: - - type: Transform - pos: 15.5,-6.5 - parent: 179 - - uid: 620 - components: - - type: Transform - pos: 16.5,-6.5 - parent: 179 - - uid: 621 - components: - - type: Transform - pos: 17.5,-6.5 - parent: 179 - - uid: 622 - components: - - type: Transform - pos: 18.5,-6.5 - parent: 179 - - uid: 623 - components: - - type: Transform - pos: 19.5,-6.5 - parent: 179 - - uid: 624 - components: - - type: Transform - pos: 20.5,-6.5 - parent: 179 - - uid: 625 - components: - - type: Transform - pos: 21.5,-6.5 - parent: 179 - - uid: 626 - components: - - type: Transform - pos: 22.5,-6.5 - parent: 179 - - uid: 627 - components: - - type: Transform - pos: 23.5,-6.5 - parent: 179 - - uid: 628 - components: - - type: Transform - pos: 24.5,-6.5 - parent: 179 - - uid: 629 - components: - - type: Transform - pos: 25.5,-6.5 - parent: 179 - - uid: 630 - components: - - type: Transform - pos: 26.5,-6.5 - parent: 179 - - uid: 631 - components: - - type: Transform - pos: 26.5,-5.5 - parent: 179 - - uid: 632 - components: - - type: Transform - pos: 26.5,-4.5 - parent: 179 - - uid: 633 - components: - - type: Transform - pos: 27.5,-6.5 - parent: 179 - - uid: 634 - components: - - type: Transform - pos: 28.5,-6.5 - parent: 179 - - uid: 635 - components: - - type: Transform - pos: 29.5,-6.5 - parent: 179 - - uid: 636 - components: - - type: Transform - pos: 30.5,-6.5 - parent: 179 - - uid: 637 - components: - - type: Transform - pos: 31.5,-6.5 - parent: 179 - - uid: 638 - components: - - type: Transform - pos: 32.5,-6.5 - parent: 179 - - uid: 639 - components: - - type: Transform - pos: 33.5,-6.5 - parent: 179 - - uid: 640 - components: - - type: Transform - pos: 34.5,-6.5 - parent: 179 - - uid: 641 - components: - - type: Transform - pos: 34.5,-5.5 - parent: 179 - - uid: 642 - components: - - type: Transform - pos: 34.5,-4.5 - parent: 179 - - uid: 643 - components: - - type: Transform - pos: 34.5,-3.5 - parent: 179 - - uid: 644 - components: - - type: Transform - pos: 34.5,-2.5 - parent: 179 - - uid: 645 - components: - - type: Transform - pos: 34.5,-1.5 - parent: 179 - - uid: 646 - components: - - type: Transform - pos: 34.5,-0.5 - parent: 179 - - uid: 647 - components: - - type: Transform - pos: 33.5,-0.5 - parent: 179 - - uid: 648 - components: - - type: Transform - pos: 32.5,-0.5 - parent: 179 - - uid: 649 - components: - - type: Transform - pos: 31.5,-0.5 - parent: 179 - - uid: 650 - components: - - type: Transform - pos: 30.5,-0.5 - parent: 179 - - uid: 651 - components: - - type: Transform - pos: 29.5,-0.5 - parent: 179 - - uid: 652 - components: - - type: Transform - pos: 30.5,0.5 - parent: 179 - - uid: 653 - components: - - type: Transform - pos: 30.5,1.5 - parent: 179 - - uid: 654 - components: - - type: Transform - pos: 30.5,2.5 - parent: 179 - - uid: 655 - components: - - type: Transform - pos: 30.5,3.5 - parent: 179 - - uid: 656 - components: - - type: Transform - pos: 30.5,4.5 - parent: 179 - - uid: 657 - components: - - type: Transform - pos: 29.5,4.5 - parent: 179 - - uid: 658 - components: - - type: Transform - pos: 28.5,4.5 - parent: 179 - - uid: 659 - components: - - type: Transform - pos: 27.5,4.5 - parent: 179 - - uid: 674 - components: - - type: Transform - pos: -17.5,-2.5 - parent: 179 - - uid: 675 - components: - - type: Transform - pos: -17.5,-1.5 - parent: 179 - - uid: 702 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,6.5 - parent: 179 - - uid: 713 - components: - - type: Transform - pos: -7.5,9.5 - parent: 179 - - uid: 714 - components: - - type: Transform - pos: -7.5,10.5 - parent: 179 - - uid: 733 - components: - - type: Transform - pos: 4.5,5.5 - parent: 179 - - uid: 734 - components: - - type: Transform - pos: 4.5,4.5 - parent: 179 - - uid: 739 - components: - - type: Transform - pos: 8.5,7.5 - parent: 179 - - uid: 740 - components: - - type: Transform - pos: 8.5,6.5 - parent: 179 - - uid: 741 - components: - - type: Transform - pos: 8.5,5.5 - parent: 179 - - uid: 742 - components: - - type: Transform - pos: 8.5,4.5 - parent: 179 - - uid: 743 - components: - - type: Transform - pos: 8.5,3.5 - parent: 179 - - uid: 745 - components: - - type: Transform - pos: 4.5,7.5 - parent: 179 - - uid: 746 - components: - - type: Transform - pos: 4.5,6.5 - parent: 179 - - uid: 757 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -13.5,7.5 - parent: 179 - - uid: 846 - components: - - type: Transform - pos: 2.5,19.5 - parent: 179 - - uid: 847 - components: - - type: Transform - pos: 3.5,19.5 - parent: 179 - - uid: 925 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -14.5,17.5 - parent: 179 - - uid: 956 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,13.5 - parent: 179 - - uid: 958 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 15.5,18.5 - parent: 179 - - uid: 994 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -1.5,13.5 - parent: 179 - - uid: 995 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -15.5,7.5 - parent: 179 - - uid: 996 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -16.5,6.5 - parent: 179 - - uid: 1016 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -16.5,7.5 - parent: 179 - - uid: 1072 - components: - - type: Transform - pos: 15.5,28.5 - parent: 179 - - uid: 1073 - components: - - type: Transform - pos: 16.5,28.5 - parent: 179 - - uid: 1074 - components: - - type: Transform - pos: 17.5,28.5 - parent: 179 - - uid: 1181 - components: - - type: Transform - pos: 5.5,28.5 - parent: 179 - - uid: 1184 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -14.5,7.5 - parent: 179 - - uid: 1199 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,13.5 - parent: 179 - - uid: 1207 - components: - - type: Transform - pos: 11.5,5.5 - parent: 179 - - uid: 1209 - components: - - type: Transform - pos: 10.5,5.5 - parent: 179 - - uid: 1211 - components: - - type: Transform - pos: 9.5,5.5 - parent: 179 - - uid: 1212 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 0.5,13.5 - parent: 179 - - uid: 1216 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,12.5 - parent: 179 - - uid: 1242 - components: - - type: Transform - pos: -15.5,-8.5 - parent: 179 - - uid: 1243 - components: - - type: Transform - pos: -14.5,-8.5 - parent: 179 - - uid: 1293 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,-5.5 - parent: 179 - - uid: 1300 - components: - - type: Transform - pos: -13.5,-8.5 - parent: 179 - - uid: 1335 - components: - - type: Transform - pos: -12.5,-8.5 - parent: 179 - - uid: 1336 - components: - - type: Transform - pos: -11.5,-8.5 - parent: 179 - - uid: 1440 - components: - - type: Transform - pos: -17.5,-0.5 - parent: 179 - - uid: 1441 - components: - - type: Transform - pos: -17.5,0.5 - parent: 179 -- proto: WallWeaponCapacitorRecharger - entities: - - uid: 1409 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -3.5,-4.5 - parent: 179 - - uid: 1410 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -4.5,-4.5 - parent: 179 -- proto: WarpPoint - entities: - - uid: 1345 - components: - - type: Transform - pos: -4.5,3.5 - parent: 179 -- proto: WaterTankFull - entities: - - uid: 115 - components: - - type: Transform - pos: 4.5,18.5 - parent: 179 - - uid: 365 - components: - - type: Transform - pos: -0.5,3.5 - parent: 179 -- proto: WeaponCapacitorRecharger - entities: - - uid: 708 - components: - - type: Transform - pos: -0.5,-3.5 - parent: 179 -- proto: WeaponDisablerSMG - entities: - - uid: 1592 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.20608893,-3.35532 - parent: 179 -- proto: WeaponEmpEmitter - entities: - - uid: 1400 - components: - - type: Transform - pos: -8.590513,-1.4515159 - parent: 179 -- proto: WeaponEnergyGun - entities: - - uid: 1496 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -3.0939138,-3.48032 - parent: 179 -- proto: WeaponEnergyShotgun - entities: - - uid: 128 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -3.4845388,-3.464695 - parent: 179 -- proto: WeaponLaserCarbine - entities: - - uid: 188 - components: - - type: Transform - pos: -3.5226438,-0.45543313 - parent: 179 -- proto: WeaponLaserPistolNF - entities: - - uid: 1202 - components: - - type: Transform - pos: -3.433327,-1.5 - parent: 179 -- proto: WeaponLaserTurboNF - entities: - - uid: 1494 - components: - - type: Transform - pos: -3.471971,0.6138556 - parent: 179 -- proto: WeaponLauncherMultipleRocket - entities: - - uid: 671 - components: - - type: Transform - pos: -13.195735,9.730438 - parent: 179 -- proto: WeaponLauncherRocket - entities: - - uid: 436 - components: - - type: Transform - pos: -3.478273,-1.1611286 - parent: 179 -- proto: WeaponMailLake - entities: - - uid: 268 - components: - - type: Transform - pos: -2.2345388,-3.19907 - parent: 179 -- proto: WeaponPistolCHIMP - entities: - - uid: 1574 - components: - - type: Transform - pos: -0.055939436,-3.4089134 - parent: 179 -- proto: WeaponPistolEchis - entities: - - uid: 1593 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.4560889,-3.29282 - parent: 179 -- proto: WeaponPistolN1984 - entities: - - uid: 1581 - components: - - type: Transform - pos: -2.3059394,-1.3620384 - parent: 179 -- proto: WeaponPistolPollock - entities: - - uid: 1582 - components: - - type: Transform - pos: -2.2278144,-1.5651634 - parent: 179 -- proto: WeaponPistolMk32 - entities: - - uid: 1580 - components: - - type: Transform - pos: -2.5715644,-1.1120384 - parent: 179 -- proto: WeaponProtoKineticAcceleratorSawn - entities: - - uid: 1204 - components: - - type: Transform - pos: -6.5111876,-2.5449483 - parent: 179 -- proto: WeaponRevolverArgenti - entities: - - uid: 1572 - components: - - type: Transform - pos: -2.5090644,0.6692117 - parent: 179 -- proto: WeaponRevolverFaith - entities: - - uid: 1577 - components: - - type: Transform - pos: -2.3528144,-0.3151633 - parent: 179 -- proto: WeaponRevolverFitz - entities: - - uid: 1578 - components: - - type: Transform - pos: -2.3059394,-0.5495383 - parent: 179 -- proto: WeaponRevolverLucky - entities: - - uid: 1579 - components: - - type: Transform - pos: -2.5559394,-0.8464133 - parent: 179 -- proto: WeaponRifleAk - entities: - - uid: 437 - components: - - type: Transform - pos: -3.5018106,0.24183923 - parent: 179 - - uid: 949 - components: - - type: Transform - pos: -12.238617,9.081488 - parent: 179 -- proto: WeaponRifleGestio - entities: - - uid: 1200 - components: - - type: Transform - pos: -3.4749937,-0.052083336 - parent: 179 -- proto: WeaponRifleJackdaw - entities: - - uid: 1575 - components: - - type: Transform - pos: -2.5246894,0.13796169 - parent: 179 -- proto: WeaponRifleNovaliteC1 - entities: - - uid: 1201 - components: - - type: Transform - pos: -3.4437437,-0.7604167 - parent: 179 -- proto: WeaponRifleSVS - entities: - - uid: 1583 - components: - - type: Transform - pos: 0.45968556,-3.4714134 - parent: 179 -- proto: WeaponRifleVulcan - entities: - - uid: 1585 - components: - - type: Transform - pos: 0.66281056,-3.5807884 - parent: 179 -- proto: WeaponSniperHristov - entities: - - uid: 1576 - components: - - type: Transform - pos: -2.5559394,-0.080788314 - parent: 179 -- proto: WeaponSubMachineGunAtreides - entities: - - uid: 1573 - components: - - type: Transform - pos: -2.4778144,0.4504617 - parent: 179 -- proto: WeaponSubMachineGunTypewriter - entities: - - uid: 1584 - components: - - type: Transform - pos: 0.61593556,-3.3151634 - parent: 179 -- proto: WelderExperimental - entities: - - uid: 343 - components: - - type: Transform - pos: 0.6895334,4.7183027 - parent: 179 -- proto: WeldingFuelTankFull - entities: - - uid: 364 - components: - - type: Transform - pos: 0.5,3.5 - parent: 179 -- proto: Window - entities: - - uid: 111 - components: - - type: Transform - pos: -0.5,-15.5 - parent: 179 - - uid: 194 - components: - - type: Transform - pos: -0.5,-16.5 - parent: 179 - - uid: 230 - components: - - type: Transform - pos: -0.5,-14.5 - parent: 179 - - uid: 1001 - components: - - type: Transform - pos: -3.5,-16.5 - parent: 179 - - uid: 1002 - components: - - type: Transform - pos: -3.5,-15.5 - parent: 179 - - uid: 1003 - components: - - type: Transform - pos: -3.5,-14.5 - parent: 179 - - uid: 1004 - components: - - type: Transform - pos: 2.5,-16.5 - parent: 179 - - uid: 1005 - components: - - type: Transform - pos: 2.5,-15.5 - parent: 179 - - uid: 1006 - components: - - type: Transform - pos: 2.5,-14.5 - parent: 179 -- proto: WindowDirectional - entities: - - uid: 1525 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 22.5,12.5 - parent: 179 - - uid: 1526 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 22.5,12.5 - parent: 179 - - uid: 1527 - components: - - type: Transform - pos: 22.5,12.5 - parent: 179 - - uid: 1528 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 17.5,12.5 - parent: 179 - - uid: 1529 - components: - - type: Transform - pos: 17.5,12.5 - parent: 179 - - uid: 1530 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 17.5,12.5 - parent: 179 - - uid: 1535 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 22.5,10.5 - parent: 179 - - uid: 1536 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 22.5,10.5 - parent: 179 - - uid: 1537 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 22.5,8.5 - parent: 179 - - uid: 1538 - components: - - type: Transform - pos: 22.5,8.5 - parent: 179 - - uid: 1539 - components: - - type: Transform - pos: 17.5,8.5 - parent: 179 - - uid: 1540 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 17.5,8.5 - parent: 179 - - uid: 1541 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 17.5,10.5 - parent: 179 - - uid: 1542 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 17.5,10.5 - parent: 179 -- proto: Wirecutter - entities: - - uid: 359 - components: - - type: Transform - pos: -1.6207478,4.3951616 - parent: 179 -- proto: Wrench - entities: - - uid: 327 - components: - - type: Transform - pos: -0.11783123,4.753312 - parent: 179 -... diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index b6cf64178f9..5780c7a9e0b 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -858,11 +858,15 @@ - AllAccess - USSPAA # Mono tags: + - TsfCommander #Mono + - TsfOfficer #Mono + - TsfFtl #Mono + - TsfGeneral #Mono - CentralCommand - NuclearOperative - SyndicateAgent - Wizard - - Pirate # Mono + - PDVGeneral # Mono - TsfmcEngineering # Mono - GrandVizier - PDVCommand # Mono diff --git a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml index 150fd7b996d..d310154d0b3 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml @@ -118,7 +118,13 @@ - Maintenance - Medical - Mercenary # Frontier - - Pirate # Frontier + - PDVGeneral # Mono + - PDVCommand #Mono + - TsfCommander #Mono + - TsfOfficer #Mono + - GrandVizier + - TsfGeneral + - TsfmcEngineering - Quartermaster - Research - ResearchDirector diff --git a/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yaml b/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yaml new file mode 100644 index 00000000000..9c118324230 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yaml @@ -0,0 +1,39 @@ +- type: job #Mono, before you ask this is because brigmed was intertwined with corpsman and now it won't work if i don't give it a template brigmedic and my head hurts and i hate frontier and mono help me + id: Brigmedic + name: job-name-security + description: job-description-brigmedic + playTimeTracker: JobBrigmedic + requirements: + - !type:DepartmentTimeRequirement + department: Security + time: 36000 #10 hrs + startingGear: SecurityOfficerGear + icon: "JobIconSecurityOfficer" + supervisors: job-supervisors-hos + canBeAntag: false + ## Frontier: commented out stuff below + # access: + # - Security + # - Brig + # - Maintenance + # - Service + # - External + # - Cryogenics + # special: + # - !type:AddImplantSpecial + # implants: [ MindShieldImplant ] + ## End Frontier: commented out stuff above + setPreference: false # Frontier + accessGroups: # Frontier + - GeneralAccess # Frontier + +- type: startingGear + id: SecurityOfficerGear + equipment: + eyes: ClothingEyesGlassesSecurity + ears: ClothingHeadsetSecurity + pocket1: WeaponPistolMk58 + storage: + back: + - Flash + - Magazine45_ACPPistolFMJ diff --git a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yaml b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yaml new file mode 100644 index 00000000000..62d4d597912 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yaml @@ -0,0 +1,39 @@ +- type: job #Mono, before you ask this is because tsf ftl was intertwined with senior off and now it won't work if i don't give it a template thing and my head hurts and i hate frontier and mono help me + id: SeniorOfficer + name: job-name-senior + description: job-description-senior + playTimeTracker: JobBrigmedic #fuck this + requirements: + - !type:DepartmentTimeRequirement + department: Security + time: 36000 #10 hrs + startingGear: SecurityOfficerGear + icon: "JobIconSecurityOfficer" + supervisors: job-supervisors-hos + canBeAntag: false + ## Frontier: commented out stuff below + # access: + # - Security + # - Brig + # - Maintenance + # - Service + # - External + # - Cryogenics + # special: + # - !type:AddImplantSpecial + # implants: [ MindShieldImplant ] + ## End Frontier: commented out stuff above + setPreference: false # Frontier + accessGroups: # Frontier + - GeneralAccess # Frontier + +- type: startingGear + id: SecurityOfficerGear + equipment: + eyes: ClothingEyesGlassesSecurity + ears: ClothingHeadsetSecurity + pocket1: WeaponPistolMk58 + storage: + back: + - Flash + - Magazine45_ACPPistolFMJ diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index ca9e2a913e3..91365438ce1 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -106,7 +106,7 @@ - type: department id: Security name: department-Security - description: department-NFSecurity-description # Frontier + description: department-Security-description # Frontier color: "#326DA8" # Mono weight: 120 # Mono roles: @@ -116,7 +116,7 @@ # - SecurityOfficer # Frontier # - Warden # Frontier - PrisonGuard ##nyano - - Brigmedic # Frontier +# - Brigmedic # Frontier # - SecurityGuard # Frontier - NFDetective # Frontier # - Cadet # Mono diff --git a/Resources/Prototypes/_Mono/Entities/Structures/Machines/Computers/rogue_comm_computer.yml b/Resources/Prototypes/_Mono/Entities/Structures/Machines/Computers/rogue_comm_computer.yml index 27e79802422..a0b25e2b50e 100644 --- a/Resources/Prototypes/_Mono/Entities/Structures/Machines/Computers/rogue_comm_computer.yml +++ b/Resources/Prototypes/_Mono/Entities/Structures/Machines/Computers/rogue_comm_computer.yml @@ -20,10 +20,10 @@ - type: AccessReader access: [[ "PDVCommand" ]] - type: CommunicationsConsole - title: comms-console-announcement-title-rogue + title: comms-console-announcement-title-pdv color: "#D2B48C" canShuttle: false - global: true #announce to everyone they're about to fuck shit up + global: true #the sultan's larp will not be stopped sound: /Audio/Announcements/announce.ogg - type: Computer board: RogueCommsComputerCircuitboard diff --git a/Resources/Prototypes/_Mono/Entities/Structures/Machines/Computers/tsf_comm_computer.yml b/Resources/Prototypes/_Mono/Entities/Structures/Machines/Computers/tsf_comm_computer.yml index dfe53cba69b..bdeb7109e3b 100644 --- a/Resources/Prototypes/_Mono/Entities/Structures/Machines/Computers/tsf_comm_computer.yml +++ b/Resources/Prototypes/_Mono/Entities/Structures/Machines/Computers/tsf_comm_computer.yml @@ -20,10 +20,11 @@ access: [["TsfFtl"]] - type: CommunicationsConsole title: comms-console-announcement-title-tsf + color: "#2596be" canShuttle: false - global: true #SR WILL NOT BE IGNORED + global: true #loud mf - type: DeviceNetwork - deviceNetId: Wireless # Frontier + deviceNetId: Wireless # Frontier //no idea what this does ngl transmitFrequencyId: ShuttleTimer - type: ActivatableUI key: enum.CommunicationsConsoleUiKey.Key @@ -38,7 +39,7 @@ - type: PointLight radius: 1.5 energy: 1.6 - color: "#3c5eb5" + color: "#2596be" - type: Damageable damageContainer: StructuralInorganic damageModifierSet: StructuralMetallicStrong diff --git a/Resources/Prototypes/_Mono/PointsOfInterest/Supercapitals/chengdu.yml b/Resources/Prototypes/_Mono/PointsOfInterest/Supercapitals/chengdu.yml index ce9934c103f..36cc02c0697 100644 --- a/Resources/Prototypes/_Mono/PointsOfInterest/Supercapitals/chengdu.yml +++ b/Resources/Prototypes/_Mono/PointsOfInterest/Supercapitals/chengdu.yml @@ -45,7 +45,7 @@ TsfCommander: [ 0, 1 ] TsfOfficer: [ 0, 1 ] TsfTeamleader: [ 0, 2 ] - Brigmedic: [ 0, 2 ] + TsfCorpsman: [ 0, 2 ] TsfMarine: [ 0, -1 ] TsfEngineer: [ 0, 2 ] TsfBorg: [ 0, 2 ] diff --git a/Resources/Prototypes/_Mono/PointsOfInterest/tsfmcsecondary.yml b/Resources/Prototypes/_Mono/PointsOfInterest/tsfmcsecondary.yml index d9ae97052eb..867c5ad4c91 100644 --- a/Resources/Prototypes/_Mono/PointsOfInterest/tsfmcsecondary.yml +++ b/Resources/Prototypes/_Mono/PointsOfInterest/tsfmcsecondary.yml @@ -43,9 +43,10 @@ lobbySortOrder: 2 - type: StationJobs availableJobs: - SeniorOfficer: [ 0, 3 ] - Brigmedic: [ 0, 1 ] - Deputy: [ -1, -1 ] + TsfTeamleader: [ 0, 3 ] + TsfCorpsman: [ 0, 1 ] + TsfEngineer: [ 0, 1 ] + TsfMarine: [ -1, -1 ] tags: - HeadOfPersonnel - HeadOfSecurity diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/rahkshan.yml b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/rahkshan.yml index c57eb59e198..800703207eb 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/rahkshan.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/rahkshan.yml @@ -10,7 +10,7 @@ alwaysUseSpawner: true hideConsoleVisibility: true canBeAntag: true - icon: "JobIconPirate" + icon: "JobIconPDVRahkshan" supervisors: job-supervisors-pdv weight: 20 displayWeight: 20 diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/spasaka.yml b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/spasaka.yml index 25fc9967c21..46b58ab4f5c 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/spasaka.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/spasaka.yml @@ -10,7 +10,7 @@ role: JobPdvRahkshan time: 3600 # 1 hour - !type:DepartmentTimeRequirement - department: Security + department: Tsf time: 36000 # 10 hours # mono end whitelisted: true startingGear: PDVInfiltratorGear @@ -24,7 +24,7 @@ assignedCompany: PDV setPreference: true access: - - PdvGeneral + - PDVGeneral - Mercenary accessGroups: - GeneralAccess diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/tarkhan.yml b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/tarkhan.yml index d76a4357850..b8abb5d0d5f 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/tarkhan.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/tarkhan.yml @@ -5,10 +5,10 @@ playTimeTracker: JobPDVTarkhan requirements: - !type:DepartmentTimeRequirement # Requires time in both factions - department: Security + department: Tsf time: 14400 # 4 hours # mono - !type:DepartmentTimeRequirement # Requires time in both factions - department: Antag + department: Pdv time: 108000 # 30 hours # mono startingGear: PDVTarkhanGear icon: JobIconPDVTarkhan diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/recruit.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/recruit.yml index 66ada00231b..e28f07a2008 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/recruit.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/recruit.yml @@ -11,7 +11,7 @@ time: 72000 # 20 hours # mono inverted: true # Leave slots open for newer, less confident players. startingGear: CadetGear - icon: JobIconCadetNF + icon: JobIconTSFRecruit supervisors: job-supervisors-tsf-recruit weight: 70 displayWeight: 10 diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/departments.yml b/Resources/Prototypes/_Mono/Roles/Jobs/departments.yml index 7845d096199..a459087428d 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/departments.yml @@ -46,7 +46,7 @@ - PDVDenasvar - PDVRahkshan - PDVInfiltrator - - PDVBorg + - PdvBorg - PDVTarkhan - type: department diff --git a/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml b/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml index c1916bf2664..6901db9e9d0 100644 --- a/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml +++ b/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml @@ -354,7 +354,7 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Sheriff + - TsfCommander #Mono start @@ -442,8 +442,8 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Sheriff - - Brigmedic + - TsfCommander + - TsfCorpsman - type: listing id: UplinkSecurityMedicalAssembler @@ -461,8 +461,8 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Sheriff - - Brigmedic + - TsfCommander + - TsfCorpsman - type: listing id: UplinkSecurityCompactDefibrillator @@ -480,8 +480,8 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Sheriff - - Brigmedic + - TsfCommander + - TsfCorpsman - type: listing id: UplinkSecuritySyringeCaseFilled @@ -547,9 +547,9 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Bailiff - - SeniorOfficer - - Sheriff + - TsfOfficer + - TsfTeamleader + - TsfCommander #Mono end @@ -746,8 +746,8 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Brigmedic - - Sheriff + - TsfCorpsman + - TsfCommander - type: listing id: UplinkSecurityAmbuzol @@ -782,9 +782,9 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Brigmedic - - Bailiff - - Sheriff + - TsfCorpsman + - TsfOfficer + - TsfCommander - type: listing id: UplinkSecurityInspector @@ -819,9 +819,9 @@ - SecurityUplink - !type:BuyerJobCondition # Mono: Whitelisted Mateba to only Baliff, Sergeant and Sheriff whitelist: - - Bailiff - - SeniorOfficer - - Sheriff + - TsfOfficer + - TsfTeamleader + - TsfCommander - type: listing id: UplinkSecurityTruncheon @@ -888,9 +888,9 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Bailiff - - SeniorOfficer - - Sheriff + - TsfOfficer + - TsfTeamleader + - TsfCommander - type: listing id: UplinkSecurityPulseCarbine @@ -909,9 +909,9 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Sheriff - - Bailiff - - SeniorOfficer + - TsfCommander + - TsfOfficer + - TsfTeamleader - type: listing id: UplinkSecurityHammer @@ -978,9 +978,9 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Bailiff - - SeniorOfficer - - Sheriff + - TsfOfficer + - TsfTeamleader + - TsfCommander - type: listing id: UplinkSecuritySpeedloader diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/pirate.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/pirate.yml index 022e19b5f26..50ad936e16a 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Specific/pirate.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/pirate.yml @@ -97,7 +97,7 @@ - type: entity parent: BasePirateUplink - id: BasePirateUplinkRadioPdvGrandVizier + id: BasePirateUplinkRadioPDVGrandVizier suffix: Commander 125 components: - type: Store diff --git a/Resources/Prototypes/_NF/Entities/Structures/atm.yml b/Resources/Prototypes/_NF/Entities/Structures/atm.yml index b3fcb775ea1..273069a6402 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/atm.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/atm.yml @@ -287,7 +287,7 @@ requiredCompanies: - TSF - type: AccessReader - access: [["HeadOfSecurity"]] + access: [["TsfCommander"]] - type: entity parent: BaseStationAdminBankATM @@ -328,7 +328,7 @@ - type: StationBankATM account: BlackMarket - type: AccessReader - access: [["Pirate"]] + access: [["PDVCommand"]] - type: CompanyAccessReader requiredCompanies: - PDV diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Frontier/nfdetective.yml b/Resources/Prototypes/_NF/Roles/Jobs/Frontier/nfdetective.yml index 5da8a662686..e8006c01c45 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Frontier/nfdetective.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Frontier/nfdetective.yml @@ -24,7 +24,7 @@ access: - Detective accessGroups: - - GeneralNfsdAccess + - GeneralAccess special: - !type:AddComponentSpecial components: diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Frontier/public_affairs.yml b/Resources/Prototypes/_NF/Roles/Jobs/Frontier/public_affairs.yml index e43ab00b570..4dc553bca7b 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Frontier/public_affairs.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Frontier/public_affairs.yml @@ -22,7 +22,7 @@ assignedCompany: TSF setPreference: false # mono accessGroups: - - CadetNfsdAccess + - GeneralAccess special: - !type:AddComponentSpecial components: From ab88215bfbb8a584243691db3ff7b85a4f7fb345 Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Mon, 13 Jul 2026 21:16:20 +0200 Subject: [PATCH 30/55] bazinga --- Resources/Locale/en-US/job/department.ftl | 2 +- .../Entities/Mobs/Player/admin_ghost.yml | 2 +- .../_Mono/Loadouts/TSFMC/Specifics/pda.yml | 84 +++++++++++++++++++ .../_Mono/PointsOfInterest/tsfmchalcyon.yml | 2 +- .../_Mono/Roles/Jobs/PDV/asvaran.yml | 4 +- .../Devices/Electronics/door_access.yml | 2 +- .../Storage/Closets/Lockers/lockers.yml | 6 +- .../_NF/Loadouts/Jobs/Bailiff/head.yml | 4 - .../_NF/Loadouts/Jobs/Bailiff/jumpsuit.yml | 9 -- .../_NF/Loadouts/Jobs/Bailiff/neck.yml | 5 -- .../_NF/Loadouts/Jobs/Bailiff/outer.yml | 4 - .../_NF/Loadouts/Jobs/Bailiff/pda.yml | 5 -- .../_NF/Loadouts/Jobs/Brigmedic/head.yml | 4 - .../_NF/Loadouts/Jobs/Brigmedic/jumpsuit.yml | 9 -- .../_NF/Loadouts/Jobs/Brigmedic/neck.yml | 4 - .../_NF/Loadouts/Jobs/Brigmedic/outer.yml | 4 - .../_NF/Loadouts/Jobs/Brigmedic/pda.yml | 4 - .../_NF/Loadouts/Jobs/Cadet/head.yml | 4 - .../_NF/Loadouts/Jobs/Cadet/jumpsuit.yml | 9 -- .../_NF/Loadouts/Jobs/Cadet/neck.yml | 5 -- .../_NF/Loadouts/Jobs/Cadet/pda.yml | 5 -- .../_NF/Loadouts/Jobs/Deputy/head.yml | 4 - .../_NF/Loadouts/Jobs/Deputy/jumpsuit.yml | 9 -- .../_NF/Loadouts/Jobs/Deputy/neck.yml | 5 -- .../_NF/Loadouts/Jobs/Deputy/pda.yml | 4 - .../_NF/Loadouts/Jobs/Pirates/trinkets.yml | 6 -- .../_NF/Loadouts/Jobs/SeniorOfficer/head.yml | 4 - .../Loadouts/Jobs/SeniorOfficer/jumpsuit.yml | 9 -- .../_NF/Loadouts/Jobs/SeniorOfficer/neck.yml | 5 -- .../_NF/Loadouts/Jobs/SeniorOfficer/outer.yml | 4 - .../_NF/Loadouts/Jobs/SeniorOfficer/pda.yml | 5 -- .../Loadouts/Jobs/SeniorOfficer/trinkets.yml | 6 -- .../_NF/Loadouts/Jobs/Sheriff/ears.yml | 14 ---- .../_NF/Loadouts/Jobs/Sheriff/head.yml | 4 - .../_NF/Loadouts/Jobs/Sheriff/jumpsuit.yml | 9 -- .../_NF/Loadouts/Jobs/Sheriff/neck.yml | 15 ---- .../_NF/Loadouts/Jobs/Sheriff/outer.yml | 4 - .../_NF/Loadouts/Jobs/Sheriff/pda.yml | 4 - .../_NF/Loadouts/bailiff_loadout_groups.yml | 41 --------- .../_NF/Loadouts/brigmedic_loadout_groups.yml | 78 ----------------- .../_NF/Loadouts/cadet_loadout_groups.yml | 41 --------- .../_NF/Loadouts/deputy_loadout_groups.yml | 41 --------- .../senior_officer_loadout_groups.yml | 51 ----------- .../_NF/Loadouts/sheriff_loadout_groups.yml | 61 -------------- Resources/Prototypes/_NF/Maps/debug.yml | 8 +- 45 files changed, 97 insertions(+), 512 deletions(-) delete mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/Bailiff/head.yml delete mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/Bailiff/jumpsuit.yml delete mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/Bailiff/neck.yml delete mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/Bailiff/outer.yml delete mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/Bailiff/pda.yml delete mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/Brigmedic/head.yml delete mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/Brigmedic/jumpsuit.yml delete mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/Brigmedic/neck.yml delete mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/Brigmedic/outer.yml delete mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/Brigmedic/pda.yml delete mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/Cadet/head.yml delete mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/Cadet/jumpsuit.yml delete mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/Cadet/neck.yml delete mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/Cadet/pda.yml delete mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/Deputy/head.yml delete mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/Deputy/jumpsuit.yml delete mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/Deputy/neck.yml delete mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/Deputy/pda.yml delete mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/SeniorOfficer/head.yml delete mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/SeniorOfficer/jumpsuit.yml delete mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/SeniorOfficer/neck.yml delete mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/SeniorOfficer/outer.yml delete mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/SeniorOfficer/pda.yml delete mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/SeniorOfficer/trinkets.yml delete mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/Sheriff/ears.yml delete mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/Sheriff/head.yml delete mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/Sheriff/jumpsuit.yml delete mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/Sheriff/neck.yml delete mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/Sheriff/outer.yml delete mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/Sheriff/pda.yml delete mode 100644 Resources/Prototypes/_NF/Loadouts/bailiff_loadout_groups.yml delete mode 100644 Resources/Prototypes/_NF/Loadouts/brigmedic_loadout_groups.yml delete mode 100644 Resources/Prototypes/_NF/Loadouts/cadet_loadout_groups.yml delete mode 100644 Resources/Prototypes/_NF/Loadouts/deputy_loadout_groups.yml delete mode 100644 Resources/Prototypes/_NF/Loadouts/senior_officer_loadout_groups.yml delete mode 100644 Resources/Prototypes/_NF/Loadouts/sheriff_loadout_groups.yml diff --git a/Resources/Locale/en-US/job/department.ftl b/Resources/Locale/en-US/job/department.ftl index c611aeb226c..db6675bd6ab 100644 --- a/Resources/Locale/en-US/job/department.ftl +++ b/Resources/Locale/en-US/job/department.ftl @@ -4,7 +4,7 @@ department-Civilian = Civilian department-CentralCommand = Central Command department-Engineering = Engineering # department-Medical = Medical # Mono: redefined in _NF -# department-Security = Security # Frontier: redefined in _NF +department-Security = Security # Frontier: redefined in _NF department-Science = Science department-Silicon = Silicon department-Specific = Station specific diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml index 65719c1c041..33b2a96603f 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml @@ -39,7 +39,7 @@ - NuclearOperative - SyndicateAgent - CentralCommand - - Pirate # Frontier + - PdvGeneral # Frontier - type: UserInterface interfaces: enum.SolarControlConsoleUiKey.Key: diff --git a/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/pda.yml b/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/pda.yml index 4e20be664bb..9dc5fcf9c22 100644 --- a/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/pda.yml +++ b/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/pda.yml @@ -11,3 +11,87 @@ - TsfEngiPDA fallbacks: - TsfEngiPDA + +- type: loadout + id: TsfOfficerTsfOfficerPDA + equipment: + id: TsfOfficerPDA + +- type: loadoutGroup + id: TsfOfficerPDA + name: loadout-group-contractor-id + hidden: true # No point in showing this, it gets auto-selected. + loadouts: + - TsfOfficerTsfOfficerPDA + fallbacks: + - TsfOfficerTsfOfficerPDA + +- type: loadout + id: TSFCorpsmanPDA + equipment: + id: TSFCorpsmanPDA + +- type: loadoutGroup + id: TSFCorpsmanPDA + name: loadout-group-contractor-id + hidden: true # No point in showing this, it gets auto-selected. + loadouts: + - TSFCorpsmanPDA + fallbacks: + - TSFCorpsmanPDA + +- type: loadout + id: TSFRecruitPDA + equipment: + id: TSFRecruitPDA + +- type: loadoutGroup + id: TSFRecruitPDA + name: loadout-group-contractor-id + hidden: true # No point in showing this, it gets auto-selected. + loadouts: + - TSFRecruitPDA + fallbacks: + - TSFRecruitPDA + +- type: loadout + id: TsfMarineTsfMarinePDA + equipment: + id: TSFMarinePDA + +- type: loadoutGroup + id: TSFMarinePDA + name: loadout-group-contractor-id + hidden: true # No point in showing this, it gets auto-selected. + loadouts: + - TsfMarineTsfMarinePDA + fallbacks: + - TsfMarineTsfMarinePDA + +- type: loadout + id: TSFTeamleaderPDA + equipment: + id: TSFTeamleaderPDA + +- type: loadoutGroup + id: TSFTeamleaderPDA + name: loadout-group-contractor-id + hidden: true # No point in showing this, it gets auto-selected. + loadouts: + - TSFTeamleaderPDA + fallbacks: + - TSFTeamleaderPDA + +- type: loadout + id: TSFCommanderPDA + equipment: + id: TSFCommanderPDA + +- type: loadoutGroup + id: TSFCommanderPDA + name: loadout-group-contractor-id + hidden: true # No point in showing this, it gets auto-selected. + loadouts: + - TSFCommanderPDA + fallbacks: + - TSFCommanderPDA diff --git a/Resources/Prototypes/_Mono/PointsOfInterest/tsfmchalcyon.yml b/Resources/Prototypes/_Mono/PointsOfInterest/tsfmchalcyon.yml index 48abd006352..a1a72c5657f 100644 --- a/Resources/Prototypes/_Mono/PointsOfInterest/tsfmchalcyon.yml +++ b/Resources/Prototypes/_Mono/PointsOfInterest/tsfmchalcyon.yml @@ -53,7 +53,7 @@ TsfCommander: [ 1, 1 ] TsfOfficer: [1, 1 ] TsfTeamleader: [ 3, 3 ] # Mono - Brigmedic: [ 2, 2 ] # Mono + TsfCorpsman: [ 2, 2 ] # Mono TsfMarine: [ -1, -1 ] # Mono TsfEngineer: [ 2, 2 ] TsfBorg: [ 2, 2 ] diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/asvaran.yml b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/asvaran.yml index 56e5277e8cd..6fda6775a99 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/asvaran.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/asvaran.yml @@ -1,7 +1,7 @@ - type: job id: PDVAsvaran name: job-name-pdv-asvaran - description: job-description-pirate-first-mate + description: job-description-pdv-asvaran playTimeTracker: JobPDVAsvaran requirements: - !type:OverallPlaytimeRequirement @@ -15,7 +15,7 @@ hideConsoleVisibility: true canBeAntag: true icon: "JobIconPDVAsvaran" - supervisors: job-supervisors-captain + supervisors: job-supervisors-pdv-asvaran weight: 40 displayWeight: 40 assignedCompany: PDV diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/Electronics/door_access.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/Electronics/door_access.yml index fcba86f1ac8..ee5f7cccbff 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/Electronics/door_access.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/Electronics/door_access.yml @@ -45,4 +45,4 @@ suffix: Rogue, Locked components: - type: AccessReader - access: [["Pirate"]] + access: [["PDVGeneral"]] diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml index 32ceb5a250f..0e5281edbee 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -163,7 +163,7 @@ stateDoorOpen: nfsd_gold_open stateDoorClosed: nfsd_gold_door - type: AccessReader - access: [["Sergeant"]] + access: [["TsfFtl"]] # NFSD Gold - Bailiff - type: entity @@ -173,7 +173,7 @@ suffix: Bailiff components: - type: AccessReader - access: [["Bailiff"]] + access: [["TsfOfficer"]] # NFSD Sheriff - type: entity @@ -187,7 +187,7 @@ stateDoorOpen: nfsd_sheriff_open stateDoorClosed: nfsd_sheriff_door - type: AccessReader - access: [["HeadOfSecurity"]] + access: [["TsfCommander"]] # SR - type: entity diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Bailiff/head.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Bailiff/head.yml deleted file mode 100644 index 0eaa0a47f2f..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Bailiff/head.yml +++ /dev/null @@ -1,4 +0,0 @@ -- type: loadout - id: BailiffClothingHeadHatBailiff - equipment: - head: ClothingHeadHatNfsdBeretBrown diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Bailiff/jumpsuit.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Bailiff/jumpsuit.yml deleted file mode 100644 index a33354d08a3..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Bailiff/jumpsuit.yml +++ /dev/null @@ -1,9 +0,0 @@ -- type: loadout - id: BailiffClothingUniformJumpsuitBailiff - equipment: - jumpsuit: ClothingUniformJumpsuitNfsdTacCream - -- type: loadout - id: BailiffClothingUniformJumpskirtBailiff - equipment: - jumpsuit: ClothingUniformJumpskirtNfsd diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Bailiff/neck.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Bailiff/neck.yml deleted file mode 100644 index 20cb1d3c492..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Bailiff/neck.yml +++ /dev/null @@ -1,5 +0,0 @@ -#T0 -- type: loadout - id: BailiffClothingNeckBadgeBailiff - equipment: - neck: ClothingNeckNfsdBadgeWarden diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Bailiff/outer.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Bailiff/outer.yml deleted file mode 100644 index ba685e5adf2..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Bailiff/outer.yml +++ /dev/null @@ -1,4 +0,0 @@ -- type: loadout - id: BailiffOuterClothing - equipment: - outerClothing: ClothingOuterCoatNfsdFormal diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Bailiff/pda.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Bailiff/pda.yml deleted file mode 100644 index 92a3c70f33d..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Bailiff/pda.yml +++ /dev/null @@ -1,5 +0,0 @@ -- type: loadout - id: BailiffBailiffPDA - equipment: - id: BailiffPDA - \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Brigmedic/head.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Brigmedic/head.yml deleted file mode 100644 index de19797325a..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Brigmedic/head.yml +++ /dev/null @@ -1,4 +0,0 @@ -- type: loadout - id: BrigmedicClothingHeadHatBrigmedic - equipment: - head: ClothingHeadHatNfsdBeretCream diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Brigmedic/jumpsuit.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Brigmedic/jumpsuit.yml deleted file mode 100644 index dd6879cbec1..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Brigmedic/jumpsuit.yml +++ /dev/null @@ -1,9 +0,0 @@ -- type: loadout - id: BrigmedicClothingUniformJumpsuitBrigmedic - equipment: - jumpsuit: ClothingUniformJumpsuitNfsd - -- type: loadout - id: BrigmedicClothingUniformJumpskirtBrigmedic - equipment: - jumpsuit: ClothingUniformJumpskirtNfsd \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Brigmedic/neck.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Brigmedic/neck.yml deleted file mode 100644 index 28c1634149e..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Brigmedic/neck.yml +++ /dev/null @@ -1,4 +0,0 @@ -- type: loadout - id: BrigmedicClothingNeckNfsdBadgeSecurityBrigmedic - equipment: - neck: ClothingNeckNfsdBadgeSecurityBrigmedic diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Brigmedic/outer.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Brigmedic/outer.yml deleted file mode 100644 index 39db87ee013..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Brigmedic/outer.yml +++ /dev/null @@ -1,4 +0,0 @@ -- type: loadout - id: BrigmedicOuterClothing - equipment: - outerClothing: ClothingOuterCoatNfsdBomberBrigmed diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Brigmedic/pda.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Brigmedic/pda.yml deleted file mode 100644 index fc3feeae979..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Brigmedic/pda.yml +++ /dev/null @@ -1,4 +0,0 @@ -- type: loadout - id: TSFCorpsmanPDA - equipment: - id: TSFCorpsmanPDA diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Cadet/head.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Cadet/head.yml deleted file mode 100644 index 83167beb9a8..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Cadet/head.yml +++ /dev/null @@ -1,4 +0,0 @@ -- type: loadout - id: CadetClothingHeadHatCadet - equipment: - head: ClothingHeadHatNfsdSmallCampaign diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Cadet/jumpsuit.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Cadet/jumpsuit.yml deleted file mode 100644 index 5c5a5e822e5..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Cadet/jumpsuit.yml +++ /dev/null @@ -1,9 +0,0 @@ -- type: loadout - id: CadetClothingUniformJumpsuitCadet - equipment: - jumpsuit: ClothingUniformJumpsuitNfsdShort - -- type: loadout - id: CadetClothingUniformJumpskirtCadet - equipment: - jumpsuit: ClothingUniformJumpskirtNfsdShort \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Cadet/neck.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Cadet/neck.yml deleted file mode 100644 index d00d0ceb3bc..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Cadet/neck.yml +++ /dev/null @@ -1,5 +0,0 @@ -#T0 -- type: loadout - id: CadetClothingNeckBadgeCadet - equipment: - neck: ClothingNeckNfsdBadgeSecurityCadet diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Cadet/pda.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Cadet/pda.yml deleted file mode 100644 index 01b055c9b9e..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Cadet/pda.yml +++ /dev/null @@ -1,5 +0,0 @@ -- type: loadout - id: CadetCadetPDA - equipment: - id: CadetPDA - \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Deputy/head.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Deputy/head.yml deleted file mode 100644 index d1a157922bc..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Deputy/head.yml +++ /dev/null @@ -1,4 +0,0 @@ -- type: loadout - id: DeputyClothingHeadHatDeputy - equipment: - head: ClothingHeadHatNfsdSmallCampaign diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Deputy/jumpsuit.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Deputy/jumpsuit.yml deleted file mode 100644 index 68305fdc957..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Deputy/jumpsuit.yml +++ /dev/null @@ -1,9 +0,0 @@ -- type: loadout - id: DeputyClothingUniformJumpsuitDeputy - equipment: - jumpsuit: ClothingUniformJumpsuitNfsd - -- type: loadout - id: DeputyClothingUniformJumpskirtDeputy - equipment: - jumpsuit: ClothingUniformJumpskirtNfsd \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Deputy/neck.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Deputy/neck.yml deleted file mode 100644 index a435e34dbb3..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Deputy/neck.yml +++ /dev/null @@ -1,5 +0,0 @@ -#T0 -- type: loadout - id: DeputyClothingNeckBadgeDeputy - equipment: - neck: ClothingNeckNfsdBadgeSecurity diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Deputy/pda.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Deputy/pda.yml deleted file mode 100644 index f93054a4d2d..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Deputy/pda.yml +++ /dev/null @@ -1,4 +0,0 @@ -- type: loadout - id: TsfMarineTsfMarinePDA - equipment: - id: TsfMarinePDA diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/trinkets.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/trinkets.yml index aa0a73051a5..a0fd7aa9264 100644 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/trinkets.yml +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/trinkets.yml @@ -4,9 +4,3 @@ price: 0 equipment: gloves: NFPouchPirate - -- type: loadout - id: PirateNFPouchPirateCaptain - price: 0 - equipment: - gloves: NFPouchPirateCaptain diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/SeniorOfficer/head.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/SeniorOfficer/head.yml deleted file mode 100644 index 6f8ad893d7b..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/SeniorOfficer/head.yml +++ /dev/null @@ -1,4 +0,0 @@ -- type: loadout - id: SeniorOfficerClothingHeadHatSeniorOfficer - equipment: - head: ClothingHeadHatNfsdBeretGreen diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/SeniorOfficer/jumpsuit.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/SeniorOfficer/jumpsuit.yml deleted file mode 100644 index 0500d0fb116..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/SeniorOfficer/jumpsuit.yml +++ /dev/null @@ -1,9 +0,0 @@ -- type: loadout - id: SeniorOfficerClothingUniformJumpsuitSeniorOfficer - equipment: - jumpsuit: ClothingUniformJumpsuitNfsdTacBlack - -- type: loadout - id: SeniorOfficerClothingUniformJumpskirtSeniorOfficer - equipment: - jumpsuit: ClothingUniformJumpskirtNfsd \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/SeniorOfficer/neck.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/SeniorOfficer/neck.yml deleted file mode 100644 index 0d8b5117daf..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/SeniorOfficer/neck.yml +++ /dev/null @@ -1,5 +0,0 @@ -#T0 -- type: loadout - id: SeniorOfficerClothingNeckBadgeSeniorOfficer - equipment: - neck: ClothingNeckNfsdBadgeSeniorOfficer diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/SeniorOfficer/outer.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/SeniorOfficer/outer.yml deleted file mode 100644 index 120a6224a91..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/SeniorOfficer/outer.yml +++ /dev/null @@ -1,4 +0,0 @@ -- type: loadout - id: SeniorOfficerOuterClothing - equipment: - outerClothing: ClothingOuterCoatNfsdLongCoat diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/SeniorOfficer/pda.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/SeniorOfficer/pda.yml deleted file mode 100644 index 271cf4d3f6d..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/SeniorOfficer/pda.yml +++ /dev/null @@ -1,5 +0,0 @@ -- type: loadout - id: SeniorOfficerSeniorOfficerPDA - equipment: - id: SergeantPDA - \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/SeniorOfficer/trinkets.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/SeniorOfficer/trinkets.yml deleted file mode 100644 index 6c9485ceb18..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/SeniorOfficer/trinkets.yml +++ /dev/null @@ -1,6 +0,0 @@ -#T0 -- type: loadout - id: SeniorOfficerNFPouchNfsd - price: 0 - equipment: - gloves: NFPouchNfsd diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Sheriff/ears.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Sheriff/ears.yml deleted file mode 100644 index ea2bb3ee038..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Sheriff/ears.yml +++ /dev/null @@ -1,14 +0,0 @@ -- type: loadout - id: SheriffClothingHeadsetAltNfsdBrownCentcom - equipment: - ears: ClothingHeadsetAltNfsdBrownCentcom - -- type: loadout - id: SheriffClothingHeadsetAltNfsdCreamandBrownCentcom - equipment: - ears: ClothingHeadsetAltNfsdCreamandBrownCentcom - -- type: loadout - id: SheriffClothingHeadsetAltNfsdGreenCentcom - equipment: - ears: ClothingHeadsetAltNfsdGreenCentcom diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Sheriff/head.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Sheriff/head.yml deleted file mode 100644 index ea6dacf9a7e..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Sheriff/head.yml +++ /dev/null @@ -1,4 +0,0 @@ -- type: loadout - id: SheriffClothingHeadHatSheriff - equipment: - head: ClothingHeadHatNfsdCampaignFilled diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Sheriff/jumpsuit.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Sheriff/jumpsuit.yml deleted file mode 100644 index 43a35711218..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Sheriff/jumpsuit.yml +++ /dev/null @@ -1,9 +0,0 @@ -- type: loadout - id: SheriffClothingUniformJumpsuitSheriff - equipment: - jumpsuit: ClothingUniformJumpsuitNfsdTacGray - -- type: loadout - id: SheriffClothingUniformJumpskirtSheriff - equipment: - jumpsuit: ClothingUniformJumpskirtNfsd \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Sheriff/neck.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Sheriff/neck.yml deleted file mode 100644 index 42c2fe4498f..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Sheriff/neck.yml +++ /dev/null @@ -1,15 +0,0 @@ -#T0 -- type: loadout - id: SheriffClothingNeckMantleSheriff - equipment: - neck: ClothingNeckMantleSheriff - -- type: loadout - id: SheriffClothingNeckCloakSheriff - equipment: - neck: ClothingNeckCloakSheriff - -- type: loadout - id: SheriffClothingNeckNfsdBadgeSheriff - equipment: - neck: ClothingNeckNfsdBadgeSheriff diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Sheriff/outer.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Sheriff/outer.yml deleted file mode 100644 index 04a6b2af935..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Sheriff/outer.yml +++ /dev/null @@ -1,4 +0,0 @@ -- type: loadout - id: SheriffOuterClothing - equipment: - outerClothing: ClothingOuterCoatNfsdFormalSheriff diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Sheriff/pda.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Sheriff/pda.yml deleted file mode 100644 index 842667ad0ab..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Sheriff/pda.yml +++ /dev/null @@ -1,4 +0,0 @@ -- type: loadout - id: SheriffSheriffPDA - equipment: - id: SheriffPDA diff --git a/Resources/Prototypes/_NF/Loadouts/bailiff_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/bailiff_loadout_groups.yml deleted file mode 100644 index 4a1f24fc86d..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/bailiff_loadout_groups.yml +++ /dev/null @@ -1,41 +0,0 @@ -- type: loadoutGroup - id: BailiffJumpsuit - name: loadout-group-contractor-jumpsuit - loadouts: - - BailiffClothingUniformJumpsuitBailiff - - BailiffClothingUniformJumpskirtBailiff - fallbacks: - - BailiffClothingUniformJumpsuitBailiff - - BailiffClothingUniformJumpskirtBailiff - -- type: loadoutGroup - id: BailiffOuterClothing - name: loadout-group-contractor-outerclothing - minLimit: 0 - loadouts: - - BailiffOuterClothing - -- type: loadoutGroup - id: BailiffHead - name: loadout-group-contractor-head - minLimit: 0 - loadouts: - - BailiffClothingHeadHatBailiff - -- type: loadoutGroup - id: BailiffNeck - name: loadout-group-contractor-neck - hidden: true - loadouts: - - BailiffClothingNeckBadgeBailiff - fallbacks: - - BailiffClothingNeckBadgeBailiff - -- type: loadoutGroup - id: BailiffPDA - name: loadout-group-contractor-id - hidden: true # No point in showing this, it gets auto-selected. - loadouts: - - BailiffBailiffPDA - fallbacks: - - BailiffBailiffPDA diff --git a/Resources/Prototypes/_NF/Loadouts/brigmedic_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/brigmedic_loadout_groups.yml deleted file mode 100644 index fb51452f20f..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/brigmedic_loadout_groups.yml +++ /dev/null @@ -1,78 +0,0 @@ -- type: loadoutGroup - id: BrigmedicJumpsuit - name: loadout-group-contractor-jumpsuit - loadouts: - - BrigmedicClothingUniformJumpsuitBrigmedic - - BrigmedicClothingUniformJumpskirtBrigmedic - fallbacks: - - BrigmedicClothingUniformJumpsuitBrigmedic - - BrigmedicClothingUniformJumpskirtBrigmedic - -- type: loadoutGroup - id: BrigmedicOuterClothing - name: loadout-group-contractor-outerclothing - minLimit: 0 - loadouts: - - BrigmedicOuterClothing - -- type: loadoutGroup - id: BrigmedicHead - name: loadout-group-contractor-head - minLimit: 0 - loadouts: - - BrigmedicClothingHeadHatBrigmedic - -- type: loadoutGroup - id: BrigmedicGloves - name: loadout-group-contractor-gloves - hidden: true # No point in showing this, it gets auto-selected. - loadouts: - - NitrileGloves - fallbacks: - - NitrileGloves - -- type: loadoutGroup - id: BrigmedicNeck - name: loadout-group-contractor-neck - hidden: true - loadouts: - - BrigmedicClothingNeckNfsdBadgeSecurityBrigmedic - fallbacks: - - BrigmedicClothingNeckNfsdBadgeSecurityBrigmedic - -- type: loadoutGroup - id: BrigmedicPDA - name: loadout-group-contractor-id - hidden: true # No point in showing this, it gets auto-selected. - loadouts: - - TSFCorpsmanPDA - fallbacks: - - TSFCorpsmanPDA - -- type: loadoutGroup - id: BrigmedicGlasses - name: loadout-group-contractor-glasses - hidden: true # No point in showing this, it gets auto-selected. - loadouts: - - BrigmedicClothingEyesGlasses - fallbacks: - - BrigmedicClothingEyesGlasses - -- type: loadoutGroup - id: BrigmedicFace - name: loadout-group-contractor-face - hidden: true # No point in showing this, it gets auto-selected. - loadouts: - - BrigmedicClothingMaskBrigmedic - fallbacks: - - BrigmedicClothingMaskBrigmedic - -- type: loadoutGroup - id: BrigmedicBelt - minLimit: 1 - name: loadout-group-contractor-belt - hidden: true # No point in showing this, it gets auto-selected. - loadouts: - - BrigmedicClothingBeltBrigmedicWebbing - fallbacks: - - BrigmedicClothingBeltBrigmedicWebbing diff --git a/Resources/Prototypes/_NF/Loadouts/cadet_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/cadet_loadout_groups.yml deleted file mode 100644 index 1e72be51ef1..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/cadet_loadout_groups.yml +++ /dev/null @@ -1,41 +0,0 @@ -- type: loadoutGroup - id: CadetJumpsuit - name: loadout-group-contractor-jumpsuit - loadouts: - - CadetClothingUniformJumpsuitCadet - - CadetClothingUniformJumpskirtCadet - fallbacks: - - CadetClothingUniformJumpsuitCadet - - CadetClothingUniformJumpskirtCadet - -- type: loadoutGroup - id: CadetOuterClothing - name: loadout-group-contractor-outerclothing - minLimit: 0 - loadouts: - - NfsdOuterClothing - -- type: loadoutGroup - id: CadetHead - name: loadout-group-contractor-head - minLimit: 0 - loadouts: - - CadetClothingHeadHatCadet - -- type: loadoutGroup - id: CadetNeck - name: loadout-group-contractor-neck - hidden: true - loadouts: - - CadetClothingNeckBadgeCadet - fallbacks: - - CadetClothingNeckBadgeCadet - -- type: loadoutGroup - id: CadetPDA - name: loadout-group-contractor-id - hidden: true # No point in showing this, it gets auto-selected. - loadouts: - - CadetCadetPDA - fallbacks: - - CadetCadetPDA diff --git a/Resources/Prototypes/_NF/Loadouts/deputy_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/deputy_loadout_groups.yml deleted file mode 100644 index ec78bfd6d0f..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/deputy_loadout_groups.yml +++ /dev/null @@ -1,41 +0,0 @@ -- type: loadoutGroup - id: DeputyJumpsuit - name: loadout-group-contractor-jumpsuit - loadouts: - - DeputyClothingUniformJumpsuitDeputy - - DeputyClothingUniformJumpskirtDeputy - fallbacks: - - DeputyClothingUniformJumpsuitDeputy - - DeputyClothingUniformJumpskirtDeputy - -- type: loadoutGroup - id: DeputyOuterClothing - name: loadout-group-contractor-outerclothing - minLimit: 0 - loadouts: - - NfsdOuterClothing - -- type: loadoutGroup - id: DeputyHead - name: loadout-group-contractor-head - minLimit: 0 - loadouts: - - DeputyClothingHeadHatDeputy - -- type: loadoutGroup - id: DeputyNeck - name: loadout-group-contractor-neck - hidden: true # No point in showing this, it gets auto-selected. - loadouts: - - DeputyClothingNeckBadgeDeputy - fallbacks: - - DeputyClothingNeckBadgeDeputy - -- type: loadoutGroup - id: DeputyPDA - name: loadout-group-contractor-id - hidden: true # No point in showing this, it gets auto-selected. - loadouts: - - DeputyDeputyPDA - fallbacks: - - DeputyDeputyPDA diff --git a/Resources/Prototypes/_NF/Loadouts/senior_officer_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/senior_officer_loadout_groups.yml deleted file mode 100644 index a1f3b37fc12..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/senior_officer_loadout_groups.yml +++ /dev/null @@ -1,51 +0,0 @@ -- type: loadoutGroup - id: SeniorOfficerJumpsuit - name: loadout-group-contractor-jumpsuit - loadouts: - - SeniorOfficerClothingUniformJumpsuitSeniorOfficer - - SeniorOfficerClothingUniformJumpskirtSeniorOfficer - fallbacks: - - SeniorOfficerClothingUniformJumpsuitSeniorOfficer - - SeniorOfficerClothingUniformJumpskirtSeniorOfficer - -- type: loadoutGroup - id: SeniorOfficerOuterClothing - name: loadout-group-contractor-outerclothing - minLimit: 0 - loadouts: - - SeniorOfficerOuterClothing - -- type: loadoutGroup - id: SeniorOfficerHead - name: loadout-group-contractor-head - minLimit: 0 - loadouts: - - SeniorOfficerClothingHeadHatSeniorOfficer - -- type: loadoutGroup - id: SeniorOfficerNeck - name: loadout-group-contractor-neck - hidden: true - loadouts: - - SeniorOfficerClothingNeckBadgeSeniorOfficer - fallbacks: - - SeniorOfficerClothingNeckBadgeSeniorOfficer - -- type: loadoutGroup - id: SeniorOfficerPDA - name: loadout-group-contractor-id - hidden: true # No point in showing this, it gets auto-selected. - loadouts: - - SeniorOfficerSeniorOfficerPDA - fallbacks: - - SeniorOfficerSeniorOfficerPDA - -- type: loadoutGroup - id: SeniorOfficerTrinkets - name: loadout-group-contractor-trinkets - minLimit: 0 - maxLimit: 3 - loadouts: - - SeniorOfficerNFPouchNfsd - subgroups: - - ContractorTrinkets diff --git a/Resources/Prototypes/_NF/Loadouts/sheriff_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/sheriff_loadout_groups.yml deleted file mode 100644 index 0e557f00c22..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/sheriff_loadout_groups.yml +++ /dev/null @@ -1,61 +0,0 @@ -- type: loadoutGroup - id: SheriffJumpsuit - name: loadout-group-contractor-jumpsuit - loadouts: - - SheriffClothingUniformJumpsuitSheriff - - SheriffClothingUniformJumpskirtSheriff - fallbacks: - - SheriffClothingUniformJumpsuitSheriff - - SheriffClothingUniformJumpskirtSheriff - -- type: loadoutGroup - id: SheriffOuterClothing - name: loadout-group-contractor-outerclothing - minLimit: 0 - loadouts: - - SheriffOuterClothing - -- type: loadoutGroup - id: SheriffHead - name: loadout-group-contractor-head - minLimit: 0 - loadouts: - - SheriffClothingHeadHatSheriff - -- type: loadoutGroup - id: SheriffNeck - name: loadout-group-contractor-neck - loadouts: - - SheriffClothingNeckNfsdBadgeSheriff - - SheriffClothingNeckMantleSheriff - - SheriffClothingNeckCloakSheriff - fallbacks: - - SheriffClothingNeckNfsdBadgeSheriff - -- type: loadoutGroup - id: SheriffPDA - name: loadout-group-contractor-id - hidden: true # No point in showing this, it gets auto-selected. - loadouts: - - SheriffSheriffPDA - fallbacks: - - SheriffSheriffPDA - -- type: loadoutGroup - id: SheriffFace - name: loadout-group-contractor-face - hidden: true # No point in showing this, it gets auto-selected. - loadouts: - - SheriffClothingMaskSheriff - fallbacks: - - SheriffClothingMaskSheriff - -- type: loadoutGroup - id: SheriffEars - name: loadout-group-contractor-ears - loadouts: - - SheriffClothingHeadsetAltNfsdBrownCentcom - - SheriffClothingHeadsetAltNfsdCreamandBrownCentcom - - SheriffClothingHeadsetAltNfsdGreenCentcom - fallbacks: - - SheriffClothingHeadsetAltNfsdCreamandBrownCentcom diff --git a/Resources/Prototypes/_NF/Maps/debug.yml b/Resources/Prototypes/_NF/Maps/debug.yml index 628f026d3a1..231c813f9bd 100644 --- a/Resources/Prototypes/_NF/Maps/debug.yml +++ b/Resources/Prototypes/_NF/Maps/debug.yml @@ -41,10 +41,10 @@ CCServiceWorker: [ -1, -1 ] NFJanitor: [ -1, -1 ] MailCarrier: [ -1, -1 ] - Sheriff: [ -1, -1] - # Bailiff: [ -1, -1] Mono - SeniorOfficer: [ -1, -1] - Brigmedic: [ -1, -1] + TsfCommander: [ -1, -1] + TsfOfficer: [ -1, -1] #Mono + TsfTeamleader: [ -1, -1] + TsfCorpsman: [ -1, -1] # NFDetective: [ -1, -1] Mono TsfMarine: [ -1, -1] # TsfRecruit [ -1, -1] Mono From 8e6ba8d0976e4b2a0d3d84a2648523d715770bf0 Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Mon, 13 Jul 2026 22:01:52 +0200 Subject: [PATCH 31/55] sure whatever --- Resources/Maps/_Mono/POI/tsfmchalcyon.yml | 4 +- .../Entities/Mobs/Player/admin_ghost.yml | 2 +- .../Devices/Electronics/door_access.yml | 4 +- .../Structures/Doors/Windoors/windoor.yml | 12 +-- .../_Mono/Entities/Markers/Spawners/jobs.yml | 2 +- .../Entities/Objects/Devices/door_access.yml | 24 ++++++ .../Structures/Doors/Airlocks/access.yml | 11 +-- .../Doors/Airlocks/access_heavy.yml | 12 +-- .../Structures/Doors/Airlocks/shuttle.yml | 4 +- .../Entities/Structures/Doors/windoors.yml | 2 +- .../Loadouts/TSFMC/Specifics/commander.yml | 5 ++ .../_Mono/Loadouts/TSFMC/Specifics/pda.yml | 2 +- .../Devices/Electronics/door_access.yml | 8 +- .../Structures/Doors/Airlocks/access.yml | 73 +++---------------- .../Structures/Doors/Windoors/windoor.yml | 2 +- .../Entities/Structures/Wallmounts/switch.yml | 4 +- 16 files changed, 70 insertions(+), 101 deletions(-) diff --git a/Resources/Maps/_Mono/POI/tsfmchalcyon.yml b/Resources/Maps/_Mono/POI/tsfmchalcyon.yml index 5fc3c7d8cc1..a566a412115 100644 --- a/Resources/Maps/_Mono/POI/tsfmchalcyon.yml +++ b/Resources/Maps/_Mono/POI/tsfmchalcyon.yml @@ -5010,7 +5010,7 @@ entities: parent: 1 - type: AccessReader access: - - - HeadOfSecurity + - - TsfOfficer - proto: AirlockNfsdGlass entities: - uid: 102 @@ -64869,7 +64869,7 @@ entities: gridUid: 1 - type: AccessReader access: - - - HeadOfSecurity + - - TsfCommander - uid: 9947 components: - type: Transform diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml index 33b2a96603f..64ff4159171 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml @@ -39,7 +39,7 @@ - NuclearOperative - SyndicateAgent - CentralCommand - - PdvGeneral # Frontier + - PDVGeneral # Mono or something - type: UserInterface interfaces: enum.SolarControlConsoleUiKey.Key: diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml index f75fa2584e2..3c7933581ec 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml @@ -190,11 +190,11 @@ # Security - type: entity parent: DoorElectronics - id: DoorElectronicsHeadOfSecurity + id: DoorElectronicsHeadOfSecurity #Mono suffix: HeadOfSecurity, Locked components: - type: AccessReader - access: [["HeadOfSecurity"]] + access: [["TsfCommander"]] #Mono - type: entity parent: DoorElectronics diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml index db0fc13b977..e2485104192 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml @@ -157,7 +157,7 @@ components: - type: ContainerFill containers: - board: [ DoorElectronicsArmory ] + board: [ DoorElectronicsTsfTeamLeader ] #Mono - type: Wires layoutId: AirlockArmory @@ -168,7 +168,7 @@ components: - type: ContainerFill containers: - board: [ DoorElectronicsArmory ] + board: [ DoorElectronicsTsfTeamLeader ] #Mono - type: Wires layoutId: AirlockArmory @@ -419,22 +419,22 @@ - type: entity parent: WindoorSecure id: WindoorSecureSecurityLocked - suffix: Security, Locked + suffix: TSF, Locked components: - type: ContainerFill containers: - board: [ DoorElectronicsSecurity ] + board: [ DoorElectronicsTsf ] #Mono - type: Wires layoutId: AirlockSecurity - type: entity parent: WindoorSecurePlasma id: PlasmaWindoorSecureSecurityLocked - suffix: Security, Locked, Plasma + suffix: TSF, Locked, Plasma components: - type: ContainerFill containers: - board: [ DoorElectronicsSecurity ] + board: [ DoorElectronicsTsf ] #Mono - type: Wires layoutId: AirlockSecurity diff --git a/Resources/Prototypes/_Mono/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_Mono/Entities/Markers/Spawners/jobs.yml index ba729922507..918248b24ba 100644 --- a/Resources/Prototypes/_Mono/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/_Mono/Entities/Markers/Spawners/jobs.yml @@ -54,7 +54,7 @@ name: PDV Rahkshan components: - type: SpawnPoint - job_id: PDVRahkshanIDCard + job_id: PDVRahkshan - type: Sprite sprite: Structures/Decoration/banner.rsi state: banner-yellow diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Devices/door_access.yml b/Resources/Prototypes/_Mono/Entities/Objects/Devices/door_access.yml index 14d2c7f1e3c..2471554778f 100644 --- a/Resources/Prototypes/_Mono/Entities/Objects/Devices/door_access.yml +++ b/Resources/Prototypes/_Mono/Entities/Objects/Devices/door_access.yml @@ -30,6 +30,22 @@ - type: AccessReader access: [["TsfmcEngineering"]] +- type: entity + parent: DoorElectronics + id: DoorElectronicsTsfTeamLeader #Mono + suffix: TSF Teamleader, Locked + components: + - type: AccessReader + access: [["TsfFtl"]] #Mono + +- type: entity + parent: DoorElectronics + id: DoorElectronicsTsf + suffix: TSF, Locked + components: + - type: AccessReader + access: [["TsfGeneral"]] + - type: entity parent: DoorElectronics id: DoorElectronicsGrandVizier @@ -46,6 +62,14 @@ - type: AccessReader access: [["PDVCommand"]] +- type: entity + parent: DoorElectronics + id: DoorElectronicsPDV + suffix: PDV, Locked + components: + - type: AccessReader + access: [["PDVGeneral"]] + - type: entity parent: DoorElectronics id: DoorElectronicsViper diff --git a/Resources/Prototypes/_Mono/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/_Mono/Entities/Structures/Doors/Airlocks/access.yml index 03b1e42a2a8..60c6ce3523c 100644 --- a/Resources/Prototypes/_Mono/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/_Mono/Entities/Structures/Doors/Airlocks/access.yml @@ -5,7 +5,7 @@ components: - type: ContainerFill containers: - board: [ DoorElectronicsSecurity ] + board: [ DoorElectronicsTsf ] - type: entity parent: AirlockGlassShuttleNfsdOutpost @@ -14,7 +14,7 @@ components: - type: ContainerFill containers: - board: [ DoorElectronicsSecurity ] + board: [ DoorElectronicsTsf ] - type: entity parent: HighSecDoor @@ -23,7 +23,7 @@ components: - type: ContainerFill containers: - board: [ DoorElectronicsSecurity ] + board: [ DoorElectronicsTsf ] # Flyssa ports @@ -34,7 +34,7 @@ components: - type: ContainerFill containers: - board: [ DoorElectronicsSecurity ] + board: [ DoorElectronicsTsf ] - type: entity parent: AirlockGlassShuttleNfsdCapital @@ -43,4 +43,5 @@ components: - type: ContainerFill containers: - board: [ DoorElectronicsSecurity ] + board: [ DoorElectronicsTsf ] + diff --git a/Resources/Prototypes/_Mono/Entities/Structures/Doors/Airlocks/access_heavy.yml b/Resources/Prototypes/_Mono/Entities/Structures/Doors/Airlocks/access_heavy.yml index a2863b8cff5..8bd2df59e35 100644 --- a/Resources/Prototypes/_Mono/Entities/Structures/Doors/Airlocks/access_heavy.yml +++ b/Resources/Prototypes/_Mono/Entities/Structures/Doors/Airlocks/access_heavy.yml @@ -3,7 +3,7 @@ - type: entity parent: AirlockHeavy id: AirlockHeavyTSFMC - suffix: TSFMC + suffix: TSF components: - type: Sprite sprite: _Mono/Structures/Doors/HeavyAirlocks/Standard/tsfmc.rsi @@ -11,20 +11,20 @@ - type: entity parent: AirlockHeavyTSFMC id: AirlockHeavyTSFMCLocked - suffix: TSFMC, Locked + suffix: TSF, Locked components: - type: ContainerFill containers: - board: [ DoorElectronicsSecurity ] + board: [ DoorElectronicsTsf ] - type: entity parent: AirlockHeavyTSFMC id: AirlockHeavyTSFMCArmoryLocked - suffix: TSFMC Armory, Locked + suffix: TSF Command, Locked components: - type: ContainerFill containers: - board: [ DoorElectronicsArmory ] + board: [ DoorElectronicsTsfTeamLeader ] - type: entity parent: AirlockHeavyTSFMC @@ -52,7 +52,7 @@ components: - type: ContainerFill containers: - board: [ DoorElectronicsPirate ] + board: [ DoorElectronicsPDV ] - type: entity parent: AirlockHeavyPDV diff --git a/Resources/Prototypes/_Mono/Entities/Structures/Doors/Airlocks/shuttle.yml b/Resources/Prototypes/_Mono/Entities/Structures/Doors/Airlocks/shuttle.yml index 521b4e98e68..5636ed32765 100644 --- a/Resources/Prototypes/_Mono/Entities/Structures/Doors/Airlocks/shuttle.yml +++ b/Resources/Prototypes/_Mono/Entities/Structures/Doors/Airlocks/shuttle.yml @@ -167,7 +167,7 @@ components: - type: ContainerFill containers: - board: [ DoorElectronicsPirate ] + board: [ DoorElectronicsPDV ] - type: entity parent: AirlockGlassShuttleSyndicateCapital @@ -176,7 +176,7 @@ components: - type: ContainerFill containers: - board: [ DoorElectronicsPirate ] + board: [ DoorElectronicsPDV ] - type: entity id: AirlockGlassShuttleSyndicateCapital diff --git a/Resources/Prototypes/_Mono/Entities/Structures/Doors/windoors.yml b/Resources/Prototypes/_Mono/Entities/Structures/Doors/windoors.yml index c8fef9dfe55..58475b38127 100644 --- a/Resources/Prototypes/_Mono/Entities/Structures/Doors/windoors.yml +++ b/Resources/Prototypes/_Mono/Entities/Structures/Doors/windoors.yml @@ -5,4 +5,4 @@ components: - type: ContainerFill containers: - board: [ DoorElectronicsPirate ] + board: [ DoorElectronicsPDV ] diff --git a/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/commander.yml b/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/commander.yml index e7d87f5150f..ab1aa1d0ffc 100644 --- a/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/commander.yml +++ b/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/commander.yml @@ -41,3 +41,8 @@ id: TsfClothingNeckCaptainCloak equipment: neck: ClothingNeckCaptainCloak + +- type: loadout + id: SheriffClothingNeckMantleSheriff + equipment: + neck: ClothingNeckMantleSheriff diff --git a/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/pda.yml b/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/pda.yml index 9dc5fcf9c22..eb762b2edab 100644 --- a/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/pda.yml +++ b/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/pda.yml @@ -15,7 +15,7 @@ - type: loadout id: TsfOfficerTsfOfficerPDA equipment: - id: TsfOfficerPDA + id: TSFOfficerPDA - type: loadoutGroup id: TsfOfficerPDA diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/Electronics/door_access.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/Electronics/door_access.yml index ee5f7cccbff..87447081054 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/Electronics/door_access.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/Electronics/door_access.yml @@ -39,10 +39,4 @@ - type: AccessReader access: [["Mercenary"], ["Captain"]] -- type: entity - parent: DoorElectronics - id: DoorElectronicsPirate - suffix: Rogue, Locked - components: - - type: AccessReader - access: [["PDVGeneral"]] + diff --git a/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml index 3475eb2b507..6f6c8332fe5 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml @@ -87,7 +87,7 @@ components: - type: ContainerFill containers: - board: [ DoorElectronicsSecurity ] + board: [ DoorElectronicsTsf ] - type: entity parent: AirlockNfsd @@ -96,7 +96,7 @@ components: - type: ContainerFill containers: - board: [ DoorElectronicsSecurity ] + board: [ DoorElectronicsTsf ] - type: entity parent: AirlockNfsd @@ -155,20 +155,20 @@ - type: entity parent: AirlockNfsd id: AirlockNfsdArmoryLocked - suffix: TSFMC Armory, Locked + suffix: TSFMC Teamleader, Locked components: - type: ContainerFill containers: - board: [ DoorElectronicsArmory ] + board: [ DoorElectronicsTsfTeamLeader ] - type: entity parent: AirlockNfsdGlass id: AirlockNfsdArmoryGlassLocked - suffix: TSFMC Armory, Locked + suffix: TSF Teamleader, Locked components: - type: ContainerFill containers: - board: [ DoorElectronicsArmory ] + board: [ DoorElectronicsTsfTeamLeader ] - type: entity parent: AirlockExternal @@ -259,7 +259,7 @@ components: - type: ContainerFill containers: - board: [ DoorElectronicsSecurity ] + board: [ DoorElectronicsTsf ] - type: entity parent: AirlockShuttleNfsd @@ -268,7 +268,7 @@ components: - type: ContainerFill containers: - board: [ DoorElectronicsSecurity ] + board: [ DoorElectronicsTsf ] - type: entity parent: AirlockGlassShuttleNfsd @@ -277,59 +277,4 @@ components: - type: ContainerFill containers: - board: [ DoorElectronicsSecurity ] - -- type: entity - parent: AirlockGlass - id: AirlockRogueGlassLocked - suffix: PDV, Locked # Mono - PDV - components: - - type: ContainerFill - containers: - board: [ DoorElectronicsPirate ] - -- type: entity - parent: AirlockExternalGlass - id: AirlockExternalGlassRogueLocked - suffix: PDV, Glass, Locked # Mono - PDV - components: - - type: ContainerFill - containers: - board: [ DoorElectronicsPirate ] - -- type: entity - parent: AirlockMiningGlass - id: AirlockMiningGlassRogueLocked - suffix: PDV, Glass, Locked # Mono - PDV - components: - - type: ContainerFill - containers: - board: [ DoorElectronicsPirate ] - -- type: entity - parent: AirlockShuttleSyndicate - id: AirlockShuttleSyndicateRogueLocked - suffix: PDV, Locked # Mono - PDV - components: - - type: ContainerFill - containers: - board: [ DoorElectronicsPirate ] - -- type: entity - parent: AirlockGlassShuttleSyndicate - id: AirlockGlassShuttleSyndicateRogueLocked - suffix: PDV, Glass Locked # Mono - PDV - components: - - type: ContainerFill - containers: - board: [ DoorElectronicsPirate ] - -# Airtight Hatch -- type: entity - parent: AirlockHatch - id: AirlockHatchRogueLocked - suffix: PDV, Locked - components: - - type: ContainerFill - containers: - board: [ DoorElectronicsPirate ] + board: [ DoorElectronicsTsf ] diff --git a/Resources/Prototypes/_NF/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/_NF/Entities/Structures/Doors/Windoors/windoor.yml index ddaefe8e2d8..706e8b2390b 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Doors/Windoors/windoor.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Doors/Windoors/windoor.yml @@ -31,7 +31,7 @@ - type: entity parent: WindoorSecure id: WindoorSecureHeadOfSecurityLocked - suffix: Colonel, Locked + suffix: TSF Commander, Locked components: - type: ContainerFill containers: diff --git a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/switch.yml b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/switch.yml index 6d41974ee6f..c89f490955e 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/switch.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/switch.yml @@ -12,7 +12,7 @@ parent: LockableButton components: - type: AccessReader - access: [["Pirate"]] + access: [["PDVGeneral"]] - type: entity id: LockableButtonTSFMC @@ -20,4 +20,4 @@ parent: LockableButton components: - type: AccessReader - access: [["Security"]] + access: [["TsfGeneral"]] From caa07516cea1a75a2e4e0187a540ff4b66a1bf6c Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Mon, 13 Jul 2026 22:32:56 +0200 Subject: [PATCH 32/55] deleted rogue doors oops --- .../Objects/Misc/identification_cards.yml | 4 -- .../Roles/Jobs/Security/brigmedic.yaml | 39 ------------- .../Roles/Jobs/Security/senior_officer.yaml | 39 ------------- .../_Mono/Loadouts/TSFMC/Specifics/pda.yml | 2 +- .../Loadouts/TSFMC/role_loadouts_tsfmc.yml | 3 - .../_Mono/Roles/Jobs/PDV/rahkshan.yml | 2 +- .../Structures/Doors/Airlocks/access.yml | 55 +++++++++++++++++++ 7 files changed, 57 insertions(+), 87 deletions(-) delete mode 100644 Resources/Prototypes/Roles/Jobs/Security/brigmedic.yaml delete mode 100644 Resources/Prototypes/Roles/Jobs/Security/senior_officer.yaml diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 5780c7a9e0b..ca4442cd394 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -485,8 +485,6 @@ layers: - state: default - state: idbrigmedic - - type: PresetIdCard # Frontier - job: Brigmedic # Frontier - type: entity parent: IDCardStandard @@ -816,8 +814,6 @@ layers: - state: default - state: idseniorofficer - - type: PresetIdCard - job: SeniorOfficer - type: entity parent: IDCardStandard diff --git a/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yaml b/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yaml deleted file mode 100644 index 9c118324230..00000000000 --- a/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yaml +++ /dev/null @@ -1,39 +0,0 @@ -- type: job #Mono, before you ask this is because brigmed was intertwined with corpsman and now it won't work if i don't give it a template brigmedic and my head hurts and i hate frontier and mono help me - id: Brigmedic - name: job-name-security - description: job-description-brigmedic - playTimeTracker: JobBrigmedic - requirements: - - !type:DepartmentTimeRequirement - department: Security - time: 36000 #10 hrs - startingGear: SecurityOfficerGear - icon: "JobIconSecurityOfficer" - supervisors: job-supervisors-hos - canBeAntag: false - ## Frontier: commented out stuff below - # access: - # - Security - # - Brig - # - Maintenance - # - Service - # - External - # - Cryogenics - # special: - # - !type:AddImplantSpecial - # implants: [ MindShieldImplant ] - ## End Frontier: commented out stuff above - setPreference: false # Frontier - accessGroups: # Frontier - - GeneralAccess # Frontier - -- type: startingGear - id: SecurityOfficerGear - equipment: - eyes: ClothingEyesGlassesSecurity - ears: ClothingHeadsetSecurity - pocket1: WeaponPistolMk58 - storage: - back: - - Flash - - Magazine45_ACPPistolFMJ diff --git a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yaml b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yaml deleted file mode 100644 index 62d4d597912..00000000000 --- a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yaml +++ /dev/null @@ -1,39 +0,0 @@ -- type: job #Mono, before you ask this is because tsf ftl was intertwined with senior off and now it won't work if i don't give it a template thing and my head hurts and i hate frontier and mono help me - id: SeniorOfficer - name: job-name-senior - description: job-description-senior - playTimeTracker: JobBrigmedic #fuck this - requirements: - - !type:DepartmentTimeRequirement - department: Security - time: 36000 #10 hrs - startingGear: SecurityOfficerGear - icon: "JobIconSecurityOfficer" - supervisors: job-supervisors-hos - canBeAntag: false - ## Frontier: commented out stuff below - # access: - # - Security - # - Brig - # - Maintenance - # - Service - # - External - # - Cryogenics - # special: - # - !type:AddImplantSpecial - # implants: [ MindShieldImplant ] - ## End Frontier: commented out stuff above - setPreference: false # Frontier - accessGroups: # Frontier - - GeneralAccess # Frontier - -- type: startingGear - id: SecurityOfficerGear - equipment: - eyes: ClothingEyesGlassesSecurity - ears: ClothingHeadsetSecurity - pocket1: WeaponPistolMk58 - storage: - back: - - Flash - - Magazine45_ACPPistolFMJ diff --git a/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/pda.yml b/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/pda.yml index eb762b2edab..adb7492401a 100644 --- a/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/pda.yml +++ b/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/pda.yml @@ -18,7 +18,7 @@ id: TSFOfficerPDA - type: loadoutGroup - id: TsfOfficerPDA + id: TSFOfficerPDA name: loadout-group-contractor-id hidden: true # No point in showing this, it gets auto-selected. loadouts: diff --git a/Resources/Prototypes/_Mono/Loadouts/TSFMC/role_loadouts_tsfmc.yml b/Resources/Prototypes/_Mono/Loadouts/TSFMC/role_loadouts_tsfmc.yml index e7bedee4c8f..9009a901181 100644 --- a/Resources/Prototypes/_Mono/Loadouts/TSFMC/role_loadouts_tsfmc.yml +++ b/Resources/Prototypes/_Mono/Loadouts/TSFMC/role_loadouts_tsfmc.yml @@ -112,7 +112,6 @@ - ContractorCartridge - ContractorEncryptionKey - ContractorFun - - SeniorOfficerTrinkets - NfsdSpeciesSpecific - TsfmcFirearm - TsfmcSidearm @@ -143,7 +142,6 @@ - ContractorCartridge - ContractorEncryptionKey - ContractorFun - - SeniorOfficerTrinkets - NfsdSpeciesSpecific - TsfmcFirearm - TsfmcSidearm @@ -173,7 +171,6 @@ - ContractorWallet - ContractorCartridge - ContractorFun - - SeniorOfficerTrinkets - NfsdSpeciesSpecific - TsfmcFirearmColonel - TsfmcSidearm diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/rahkshan.yml b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/rahkshan.yml index 800703207eb..df6bd54382c 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/rahkshan.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/rahkshan.yml @@ -1,6 +1,6 @@ - type: job id: PDVRahkshan - name: job-name-pdv-Rahkshan + name: job-name-pdv-rahkshan description: job-description-pdv-rahkshan playTimeTracker: JobPdvRahkshan requirements: diff --git a/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml index 6f6c8332fe5..b5426c6adca 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml @@ -278,3 +278,58 @@ - type: ContainerFill containers: board: [ DoorElectronicsTsf ] + +- type: entity + parent: AirlockGlass + id: AirlockRogueGlassLocked + suffix: PDV, Locked # Mono - PDV + components: + - type: ContainerFill + containers: + board: [ DoorElectronicsPDV ] + +- type: entity + parent: AirlockExternalGlass + id: AirlockExternalGlassRogueLocked + suffix: PDV, Glass, Locked # Mono - PDV + components: + - type: ContainerFill + containers: + board: [ DoorElectronicsPDV ] + +- type: entity + parent: AirlockMiningGlass + id: AirlockMiningGlassRogueLocked + suffix: PDV, Glass, Locked # Mono - PDV + components: + - type: ContainerFill + containers: + board: [ DoorElectronicsPDV ] + +- type: entity + parent: AirlockShuttleSyndicate + id: AirlockShuttleSyndicateRogueLocked + suffix: PDV, Locked # Mono - PDV + components: + - type: ContainerFill + containers: + board: [ DoorElectronicsPDV ] + +- type: entity + parent: AirlockGlassShuttleSyndicate + id: AirlockGlassShuttleSyndicateRogueLocked + suffix: PDV, Glass Locked # Mono - PDV + components: + - type: ContainerFill + containers: + board: [ DoorElectronicsPDV ] + +# Airtight Hatch +- type: entity + parent: AirlockHatch + id: AirlockHatchRogueLocked + suffix: PDV, Locked + components: + - type: ContainerFill + containers: + board: [ DoorElectronicsPDV ] From 1b5002c0a1e1e90b38df35c2d587c830c341494c Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Mon, 13 Jul 2026 22:35:45 +0200 Subject: [PATCH 33/55] contra department shenanigans --- .../Prototypes/_Mono/Entities/Objects/base_contraband.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_Mono/Entities/Objects/base_contraband.yml b/Resources/Prototypes/_Mono/Entities/Objects/base_contraband.yml index 0aba06e09aa..1d0ede3162d 100644 --- a/Resources/Prototypes/_Mono/Entities/Objects/base_contraband.yml +++ b/Resources/Prototypes/_Mono/Entities/Objects/base_contraband.yml @@ -20,7 +20,7 @@ abstract: true components: - type: Contraband - allowedDepartments: [ Antag ] + allowedDepartments: [ Pdv ] - type: entity parent: BaseFactionGearPDVT0 @@ -62,7 +62,7 @@ abstract: true components: - type: Contraband - allowedDepartments: [ Security ] + allowedDepartments: [ Tsf ] - type: entity parent: BaseFactionGearTSFT0 From b8ad4b599837e22b68526b57da80f72e7742bf32 Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Mon, 13 Jul 2026 22:54:02 +0200 Subject: [PATCH 34/55] awyup --- .../_Mono/Catalogs/tsfmc_uplink_catalog.yml | 2 +- .../Pirates => _Mono/Loadouts/PDV}/pda.yml | 0 .../Loadouts/PDV}/trinkets.yml | 0 .../_Mono/Loadouts/PDV/universal_groups.yml | 54 ++++++ .../_Mono/PointsOfInterest/tsfmchalcyon.yml | 2 +- .../_Mono/Roles/Jobs/PDV/rahkshan.yml | 2 +- .../_NF/Loadouts/Jobs/Pirates/head.yml | 34 ---- .../_NF/Loadouts/Jobs/Pirates/jumpsuit.yml | 23 --- .../_NF/Loadouts/Jobs/Pirates/outer.yml | 11 -- .../_NF/Loadouts/Jobs/Pirates/shoes.yml | 11 -- .../_NF/Loadouts/Jobs/Pirates/wallet.yml | 4 - .../_NF/Loadouts/pirates_loadout_groups.yml | 176 ------------------ 12 files changed, 57 insertions(+), 262 deletions(-) rename Resources/Prototypes/{_NF/Loadouts/Jobs/Pirates => _Mono/Loadouts/PDV}/pda.yml (100%) rename Resources/Prototypes/{_NF/Loadouts/Jobs/Pirates => _Mono/Loadouts/PDV}/trinkets.yml (100%) delete mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/head.yml delete mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/jumpsuit.yml delete mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/outer.yml delete mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/shoes.yml delete mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/wallet.yml delete mode 100644 Resources/Prototypes/_NF/Loadouts/pirates_loadout_groups.yml diff --git a/Resources/Prototypes/_Mono/Catalogs/tsfmc_uplink_catalog.yml b/Resources/Prototypes/_Mono/Catalogs/tsfmc_uplink_catalog.yml index 7eb07980462..04daaa2fefe 100644 --- a/Resources/Prototypes/_Mono/Catalogs/tsfmc_uplink_catalog.yml +++ b/Resources/Prototypes/_Mono/Catalogs/tsfmc_uplink_catalog.yml @@ -90,7 +90,7 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Brigmedic + - TsfCorpsman - TsfOfficer - TsfCommander diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/pda.yml b/Resources/Prototypes/_Mono/Loadouts/PDV/pda.yml similarity index 100% rename from Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/pda.yml rename to Resources/Prototypes/_Mono/Loadouts/PDV/pda.yml diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/trinkets.yml b/Resources/Prototypes/_Mono/Loadouts/PDV/trinkets.yml similarity index 100% rename from Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/trinkets.yml rename to Resources/Prototypes/_Mono/Loadouts/PDV/trinkets.yml diff --git a/Resources/Prototypes/_Mono/Loadouts/PDV/universal_groups.yml b/Resources/Prototypes/_Mono/Loadouts/PDV/universal_groups.yml index 976789c924a..82e647634e7 100644 --- a/Resources/Prototypes/_Mono/Loadouts/PDV/universal_groups.yml +++ b/Resources/Prototypes/_Mono/Loadouts/PDV/universal_groups.yml @@ -105,3 +105,57 @@ fallbacks: - PDVClothingBeltWebbingsNormalBlack +- type: loadoutGroup + id: RahkshanPDA + name: loadout-group-contractor-id + hidden: true # No point in showing this, it gets auto-selected. + loadouts: + - PDVRahkshanPDVRahkshanPDA + fallbacks: + - PDVRahkshanPDVRahkshanPDA + +- type: loadoutGroup + id: PirateTrinkets + name: loadout-group-contractor-trinkets + minLimit: 0 + maxLimit: 3 + loadouts: + - PirateNFPouchPirate + subgroups: + - ContractorTrinkets + +- type: loadoutGroup + id: GrandVizierPDA + name: loadout-group-contractor-id + hidden: true # No point in showing this, it gets auto-selected. + loadouts: + - PDVGrandVizierPDVGrandVizierPDA + fallbacks: + - PDVGrandVizierPDVGrandVizierPDA + +- type: loadoutGroup + id: AsvaranPDA + name: loadout-group-contractor-id + hidden: true # No point in showing this, it gets auto-selected. + loadouts: + - PDVAsvaranPDVAsvaranPDA + fallbacks: + - PDVAsvaranPDVAsvaranPDA + +- type: loadoutGroup + id: PDVInfiltratorPDA + name: loadout-group-contractor-id + hidden: true # No point in showing this, it gets auto-selected. + loadouts: + - PDVSpasakaPDVSpasakaPDA + fallbacks: + - PDVSpasakaPDVSpasakaPDA + +- type: loadoutGroup + id: PDVDenasvarPDA + name: loadout-group-contractor-id + hidden: true # No point in showing this, it gets auto-selected. + loadouts: + - PDVDenasvarPDVDenasvarPDA + fallbacks: + - PDVDenasvarPDVDenasvarPDA diff --git a/Resources/Prototypes/_Mono/PointsOfInterest/tsfmchalcyon.yml b/Resources/Prototypes/_Mono/PointsOfInterest/tsfmchalcyon.yml index a1a72c5657f..cb7ea847419 100644 --- a/Resources/Prototypes/_Mono/PointsOfInterest/tsfmchalcyon.yml +++ b/Resources/Prototypes/_Mono/PointsOfInterest/tsfmchalcyon.yml @@ -109,7 +109,7 @@ TsfMarsoc: [ 3, 3 ] TsfOfficer: [ 3, 3 ] TsfTeamleader: [ 6, 6 ] # Mono - Brigmedic: [ 4, 4 ] # Mono + TsfCorpsman: [ 4, 4 ] # Mono TsfMarine: [ -1, -1 ] # Mono TsfEngineer: [ 4, 4 ] TsfBorg: [ 2, 2 ] diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/rahkshan.yml b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/rahkshan.yml index df6bd54382c..e9530b338ed 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/rahkshan.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/rahkshan.yml @@ -28,7 +28,7 @@ factions: - PirateNF - type: ChatRank - rank: pdv-Rahkshan + rank: pdv-rahkshan - !type:AddImplantSpecial implants: [ FreelanceTrackingImplant ] - !type:AddLanguageSpecial # Monolith - Languages diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/head.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/head.yml deleted file mode 100644 index 1fa616a7c10..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/head.yml +++ /dev/null @@ -1,34 +0,0 @@ -- type: loadout - id: PirateClothingHeadBandBlack - equipment: - head: ClothingHeadBandBlack - -- type: loadout - id: PirateClothingHeadBandBrown - equipment: - head: ClothingHeadBandBrown - -- type: loadout - id: PirateClothingHeadBandGrey - equipment: - head: ClothingHeadBandGrey - -- type: loadout - id: PirateClothingHeadBandRed - equipment: - head: ClothingHeadBandRed - -- type: loadout - id: PirateClothingHeadHatPirateTricord - equipment: - head: ClothingHeadHatPirateTricord - -- type: loadout - id: PirateClothingHeadHatPirate - equipment: - head: ClothingHeadHatPirate - -- type: loadout - id: PirateClothingHeadHatPirateLuffy - equipment: - head: ClothingHeadHatPirateLuffy diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/jumpsuit.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/jumpsuit.yml deleted file mode 100644 index bace9cba5be..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/jumpsuit.yml +++ /dev/null @@ -1,23 +0,0 @@ -- type: loadout - id: PirateJumpsuit - price: 0 - equipment: - jumpsuit: ClothingUniformJumpsuitPirate - -- type: loadout - id: PirateJumpskirt - price: 0 - equipment: - jumpsuit: ClothingUniformJumpskirtColorLightBrown - -- type: loadout - id: PirateClothingUniformJumpsuitPirateSlops - price: 0 - equipment: - jumpsuit: ClothingUniformJumpsuitPirateSlops - -- type: loadout - id: PirateClothingUniformJumpsuitPirateLuffy - price: 0 - equipment: - jumpsuit: ClothingUniformJumpsuitPirateLuffy diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/outer.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/outer.yml deleted file mode 100644 index b0c08b281bb..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/outer.yml +++ /dev/null @@ -1,11 +0,0 @@ -- type: loadout - id: PirateFirstMateClothingOuterCoatGentle - price: 0 - equipment: - outerClothing: ClothingOuterCoatGentle - -- type: loadout - id: PirateCaptainClothingOuterCoatPirate - price: 0 - equipment: - outerClothing: ClothingOuterCoatPirate diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/shoes.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/shoes.yml deleted file mode 100644 index c66789c05c5..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/shoes.yml +++ /dev/null @@ -1,11 +0,0 @@ -- type: loadout - id: PirateClothingShoesBootsLaceup - price: 0 - equipment: - shoes: ClothingShoesBootsLaceup - -- type: loadout - id: PirateClothingShoesBootsPirateLuffy - price: 0 - equipment: - shoes: ClothingShoesBootsPirateLuffy diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/wallet.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/wallet.yml deleted file mode 100644 index 6e964ce3954..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/wallet.yml +++ /dev/null @@ -1,4 +0,0 @@ -- type: loadout - id: PirateCaptainClothingWalletLeatherPirate - equipment: - wallet: ClothingWalletLeatherPirate diff --git a/Resources/Prototypes/_NF/Loadouts/pirates_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/pirates_loadout_groups.yml deleted file mode 100644 index 7bddd080ead..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/pirates_loadout_groups.yml +++ /dev/null @@ -1,176 +0,0 @@ -# Pirate loadouts - -- type: loadoutGroup - id: PirateJumpsuit - name: loadout-group-contractor-jumpsuit - loadouts: - - PirateJumpsuit - - PirateJumpskirt - - PirateClothingUniformJumpsuitPirateSlops - - PirateClothingUniformJumpsuitPirateLuffy - subgroups: # mono - - PirateMercenaryJumpsuit - -- type: loadoutGroup - id: RahkshanPDA - name: loadout-group-contractor-id - hidden: true # No point in showing this, it gets auto-selected. - loadouts: - - PDVRahkshanPDVRahkshanPDA - fallbacks: - - PDVRahkshanPDVRahkshanPDA - -- type: loadoutGroup - id: PirateFace - name: loadout-group-contractor-face - minLimit: 0 - loadouts: - - ContractorClothingMaskBreath - - ContractorClothingMaskBreathMedical - - ContractorClothingMaskGas - subgroups: # mono - - MercenaryFace - - PilotFace - -- type: loadoutGroup - id: PirateShoes - name: loadout-group-contractor-shoes - loadouts: - - PirateClothingShoesBootsLaceup - - PirateClothingShoesBootsPirateLuffy - subgroups: # mono - - MercenaryShoes - - ContractorShoes - - PilotShoes - -- type: loadoutGroup - id: PirateHead - name: loadout-group-contractor-head - minLimit: 0 - loadouts: - - PirateClothingHeadBandBlack - - PirateClothingHeadBandBrown - - PirateClothingHeadBandGrey - - PirateClothingHeadBandRed - subgroups: # mono - - MercenaryHead - - ContractorHead - - PilotHead - -- type: loadoutGroup - id: PirateTrinkets - name: loadout-group-contractor-trinkets - minLimit: 0 - maxLimit: 3 - loadouts: - - PirateNFPouchPirate - subgroups: - - ContractorTrinkets - -# Pirate Captain loadouts - -- type: loadoutGroup - id: PirateCaptainHead - name: loadout-group-contractor-head - minLimit: 0 - loadouts: - - PirateClothingHeadHatPirate - - PirateClothingHeadHatPirateLuffy - subgroups: # mono - - MercenaryHead - - ContractorHead - - PilotHead - -- type: loadoutGroup - id: PirateCaptainOuterClothing - name: loadout-group-contractor-outerclothing - hidden: false - minLimit: 0 - loadouts: - - PirateCaptainClothingOuterCoatPirate - subgroups: # mono - - ContractorOuterClothing - - MercenaryOuterClothing - - PilotOuterClothing - -- type: loadoutGroup - id: GrandVizierPDA - name: loadout-group-contractor-id - hidden: true # No point in showing this, it gets auto-selected. - loadouts: - - PDVGrandVizierPDVGrandVizierPDA - fallbacks: - - PDVGrandVizierPDVGrandVizierPDA - -- type: loadoutGroup - id: PirateCaptainWallet - name: loadout-group-contractor-wallet - hidden: true # No point in showing this, it gets auto-selected. - loadouts: - - PirateCaptainClothingWalletLeatherPirate - fallbacks: - - PirateCaptainClothingWalletLeatherPirate - -- type: loadoutGroup - id: PirateCaptainTrinkets - name: loadout-group-contractor-trinkets - minLimit: 0 - maxLimit: 3 - loadouts: - - PirateNFPouchPirateCaptain - subgroups: - - ContractorTrinkets - -# Pirate First Mate loadouts - -- type: loadoutGroup - id: PirateFirstMateHead - name: loadout-group-contractor-head - minLimit: 0 - loadouts: - - PirateClothingHeadHatPirateTricord - - PirateClothingHeadHatPirateLuffy - subgroups: # mono - - MercenaryHead - - ContractorHead - - PilotHead - -- type: loadoutGroup - id: PirateFirstMateOuterClothing - name: loadout-group-contractor-outerclothing - minLimit: 0 - loadouts: - - PirateFirstMateClothingOuterCoatGentle - subgroups: # mono - - MercenaryOuterClothing - - ContractorOuterClothing - - PilotOuterClothing - -- type: loadoutGroup - id: AsvaranPDA - name: loadout-group-contractor-id - hidden: true # No point in showing this, it gets auto-selected. - loadouts: - - PDVAsvaranPDVAsvaranPDA - fallbacks: - - PDVAsvaranPDVAsvaranPDA - -# PDV Additions - -- type: loadoutGroup - id: PDVInfiltratorPDA - name: loadout-group-contractor-id - hidden: true # No point in showing this, it gets auto-selected. - loadouts: - - PDVSpasakaPDVSpasakaPDA - fallbacks: - - PDVSpasakaPDVSpasakaPDA - -- type: loadoutGroup - id: PDVDenasvarPDA - name: loadout-group-contractor-id - hidden: true # No point in showing this, it gets auto-selected. - loadouts: - - PDVDenasvarPDVDenasvarPDA - fallbacks: - - PDVDenasvarPDVDenasvarPDA From 5c18961b208fb61021ac7c65ee0f3b778e33e8b1 Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Mon, 13 Jul 2026 23:07:41 +0200 Subject: [PATCH 35/55] the linter is working --- .../Entities/Markers/Spawners/jobs.yml | 22 +++++++++---------- .../_Mono/Entities/Markers/Spawners/jobs.yml | 12 ++++++++++ .../_Mono/Loadouts/PDV/role_loadouts_pdv.yml | 6 ++--- 3 files changed, 26 insertions(+), 14 deletions(-) diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml index 6df6277e0b0..9367a30364d 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml @@ -521,17 +521,17 @@ - state: green - state: detective -- type: entity - id: SpawnPointTsfCorpsman - parent: SpawnPointJobBase - name: brigmedic - components: - - type: SpawnPoint # Frontier - job_id: Brigmedic # Frontier - - type: Sprite - layers: - - state: green - - state: brigmedic +#- type: entity #Mono +# id: SpawnPointBrigmedic +# parent: SpawnPointJobBase +# name: brigmedic +# components: +# - type: SpawnPoint # Frontier +# job_id: Brigmedic # Frontier +# - type: Sprite +# layers: +# - state: green +# - state: brigmedic # SPECIAL # ERT diff --git a/Resources/Prototypes/_Mono/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_Mono/Entities/Markers/Spawners/jobs.yml index 918248b24ba..0017b4310cc 100644 --- a/Resources/Prototypes/_Mono/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/_Mono/Entities/Markers/Spawners/jobs.yml @@ -232,6 +232,18 @@ - sprite: _NF/Structures/Decoration/banner.rsi state: nfsd-banner +- type: entity + id: SpawnPointTsfCorpsman + parent: SpawnPointJobBase + name: Tsf Corpsman + components: + - type: SpawnPoint # Frontier + job_id: TsfCorpsman # Frontier + - type: Sprite + layers: + - sprite: _NF/Structures/Decoration/banner.rsi + state: nfsd-banner + # Viper Group - type: entity diff --git a/Resources/Prototypes/_Mono/Loadouts/PDV/role_loadouts_pdv.yml b/Resources/Prototypes/_Mono/Loadouts/PDV/role_loadouts_pdv.yml index d42de84aa24..f936e611ed6 100644 --- a/Resources/Prototypes/_Mono/Loadouts/PDV/role_loadouts_pdv.yml +++ b/Resources/Prototypes/_Mono/Loadouts/PDV/role_loadouts_pdv.yml @@ -9,7 +9,7 @@ - PDVHud - PDVBackpack - PDVShoes - - PirateFace + - PDVFace - ContractorBoxSurvival - RahkshanPDA - ContractorWallet @@ -66,7 +66,7 @@ - GrandVizierPDA - NFSpeciesSpecific - ContractorWallet - - PDVGrandVizierTrinkets + - PirateTrinkets - PDVBelt - ContractorEncryptionKey - RogueFirearm @@ -111,7 +111,7 @@ - PDVHud - PDVBackpack - PDVShoes - - PirateFace + - PDVFace - ContractorBoxSurvival - PDVDenasvarPDA - ContractorWallet From acc596ac0266095aa4369cf8444142d7070443c5 Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Tue, 14 Jul 2026 11:14:33 +0200 Subject: [PATCH 36/55] on e gorillion tracker changes --- .../_Mono/Loadouts/PDV/role_loadouts_pdv.yml | 2 +- .../Loadouts/TSFMC/role_loadouts_tsfmc.yml | 12 ++-- .../_Mono/Roles/Jobs/PDV/asvaran.yml | 4 +- .../_Mono/Roles/Jobs/PDV/denasvar.yml | 2 +- .../_Mono/Roles/Jobs/PDV/rahkshan.yml | 6 +- .../_Mono/Roles/Jobs/PDV/spasaka.yml | 2 +- .../Roles/Jobs/TSF/commandingofficer.yml | 8 +-- .../_Mono/Roles/Jobs/TSF/corpsman.yml | 6 +- .../_Mono/Roles/Jobs/TSF/marine.yml | 6 +- .../_Mono/Roles/Jobs/TSF/officer.yml | 4 +- .../_Mono/Roles/Jobs/TSF/recruit.yml | 6 +- .../_Mono/Roles/Jobs/TSF/teamleader.yml | 6 +- .../_Mono/Roles/Jobs/play_time_trackers.yml | 58 ++++++++++++++++--- .../Prototypes/_NF/Roles/Jobs/Frontier/sr.yml | 8 +-- .../_NF/Roles/play_time_trackers.yml | 15 ----- 15 files changed, 87 insertions(+), 58 deletions(-) diff --git a/Resources/Prototypes/_Mono/Loadouts/PDV/role_loadouts_pdv.yml b/Resources/Prototypes/_Mono/Loadouts/PDV/role_loadouts_pdv.yml index f936e611ed6..288fd39fabd 100644 --- a/Resources/Prototypes/_Mono/Loadouts/PDV/role_loadouts_pdv.yml +++ b/Resources/Prototypes/_Mono/Loadouts/PDV/role_loadouts_pdv.yml @@ -1,5 +1,5 @@ - type: roleLoadout - id: JobPdvRahkshan + id: JobPDVRahkshan groups: - PDVHead - PDVNeck diff --git a/Resources/Prototypes/_Mono/Loadouts/TSFMC/role_loadouts_tsfmc.yml b/Resources/Prototypes/_Mono/Loadouts/TSFMC/role_loadouts_tsfmc.yml index 9009a901181..a1a6eacc859 100644 --- a/Resources/Prototypes/_Mono/Loadouts/TSFMC/role_loadouts_tsfmc.yml +++ b/Resources/Prototypes/_Mono/Loadouts/TSFMC/role_loadouts_tsfmc.yml @@ -1,6 +1,6 @@ # Nfsd - type: roleLoadout - id: JobCadet # Unused + id: JobTsfRecruit # Unused groups: - TsfmcHead - TsfmcNeck @@ -30,7 +30,7 @@ canCustomizeName: true # pseudonym? - type: roleLoadout - id: JobDeputy # Marine + id: JobTsfMarine # Marine groups: - TsfmcHead - TsfmcNeck @@ -61,7 +61,7 @@ canCustomizeName: true - type: roleLoadout - id: JobBrigmedic # Brigmedic + id: JobTsfCorpsman # Brigmedic groups: - TsfmcHeadMedic - TsfmcNeckMedic @@ -92,7 +92,7 @@ canCustomizeName: true - type: roleLoadout - id: JobBailiff # Captain + id: JobTsfOfficer # Captain groups: - TsfmcHead - TsfmcNeckCaptain @@ -122,7 +122,7 @@ canCustomizeName: true - type: roleLoadout - id: JobSeniorOfficer # Fireteam Leader + id: JobTsfTeamleader # Fireteam Leader groups: - TsfmcHead - TsfmcNeckFTL @@ -152,7 +152,7 @@ canCustomizeName: true - type: roleLoadout - id: JobSheriff # Colonel + id: JobTsfCommander # Colonel groups: - TsfmcHead - TsfmcNeckCommander diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/asvaran.yml b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/asvaran.yml index 6fda6775a99..6a750e72e07 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/asvaran.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/asvaran.yml @@ -10,7 +10,7 @@ role: JobPDVDenasvar time: 28800 # 8 hours #whitelisted: true # mono - comment out - startingGear: PDVAsvaranNFGear + startingGear: PDVAsvaranGear alwaysUseSpawner: true hideConsoleVisibility: true canBeAntag: true @@ -46,7 +46,7 @@ prototype: FrontierBirthdayGift - type: startingGear - id: PDVAsvaranNFGear + id: PDVAsvaranGear equipment: ears: ClothingHeadsetAltVanguardCommand #belt: ClothingBeltUtility diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/denasvar.yml b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/denasvar.yml index 74e5c2de4b3..ee28d8dd1b4 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/denasvar.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/denasvar.yml @@ -22,7 +22,7 @@ - !type:OverallPlaytimeRequirement time: 72000 # 20 hours # mono - !type:RoleTimeRequirement - role: JobPdvRahkshan + role: JobPDVRahkshan time: 36000 # 10 hours startingGear: PDVDenasvarGear alwaysUseSpawner: true diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/rahkshan.yml b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/rahkshan.yml index e9530b338ed..6c58f735f9d 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/rahkshan.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/rahkshan.yml @@ -2,11 +2,11 @@ id: PDVRahkshan name: job-name-pdv-rahkshan description: job-description-pdv-rahkshan - playTimeTracker: JobPdvRahkshan + playTimeTracker: JobPDVRahkshan requirements: - !type:OverallPlaytimeRequirement time: 36000 # 10 hrs - mono - startingGear: PirateNFGear + startingGear: RahkshanGear alwaysUseSpawner: true hideConsoleVisibility: true canBeAntag: true @@ -41,7 +41,7 @@ prototype: FrontierBirthdayGift - type: startingGear - id: PirateNFGear + id: RahkshanGear equipment: ears: ClothingHeadsetAltFreelancer #belt: ClothingBeltUtility diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/spasaka.yml b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/spasaka.yml index 46b58ab4f5c..4954f531e3d 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/spasaka.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/spasaka.yml @@ -7,7 +7,7 @@ - !type:OverallPlaytimeRequirement # mono start time: 108000 # 65 hours - !type:RoleTimeRequirement - role: JobPdvRahkshan + role: JobPDVRahkshan time: 3600 # 1 hour - !type:DepartmentTimeRequirement department: Tsf diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/commandingofficer.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/commandingofficer.yml index 86e514d6cc9..5916c4a95eb 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/commandingofficer.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/commandingofficer.yml @@ -2,7 +2,7 @@ id: TsfCommander name: job-name-tsf-commandingofficer description: job-description-tsf-commandingofficer - playTimeTracker: JobHeadOfSecurity + playTimeTracker: JobTsfCommander requirements: - !type:OverallPlaytimeRequirement time: 144000 # 40 hours - mono @@ -10,10 +10,10 @@ department: Tsf time: 90000 # 25 hours - mono - !type:RoleTimeRequirement - role: JobWarden + role: JobTsfOfficer time: 18000 # 5 hours - mono whitelisted: true - startingGear: SheriffGear + startingGear: TsfCommanderGear alwaysUseSpawner: true icon: JobIconTSFCommander requireAdminNotify: true @@ -51,7 +51,7 @@ prototype: FrontierBirthdayGift - type: startingGear - id: SheriffGear + id: TsfCommanderGear equipment: pocket1: WeaponEnergyGunMultiphase # DeltaV gun pocket2: EnergySwordNfsd diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/corpsman.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/corpsman.yml index 870c7bd98ec..be513246877 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/corpsman.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/corpsman.yml @@ -2,7 +2,7 @@ id: TsfCorpsman name: job-name-tsf-corpsman description: job-description-tsf-corpsman - playTimeTracker: JobBrigmedic + playTimeTracker: JobTsfCorpsman requirements: - !type:OverallPlaytimeRequirement time: 72000 # 20 hours - mono @@ -13,7 +13,7 @@ longerPlaytimeLessSec: - !type:OverallPlaytimeRequirement time: 108000 # 30 hours - mono - startingGear: BrigmedicGear + startingGear: TsfCorpsmanGear icon: JobIconTSFCorpsman supervisors: job-supervisors-tsf weight: 125 @@ -46,7 +46,7 @@ prototype: FrontierBirthdayGift - type: startingGear - id: BrigmedicGear + id: TsfCorpsmanGear # equipment: # pocket1: WeaponPistolMk58 #WeaponPistolMk58Nonlethal storage: diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/marine.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/marine.yml index 40bb64e780d..94a217ff81b 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/marine.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/marine.yml @@ -2,11 +2,11 @@ id: TsfMarine name: job-name-tsf-marine description: job-description-tsf-marine - playTimeTracker: JobSecurityOfficer + playTimeTracker: JobTsfMarine requirements: - !type:OverallPlaytimeRequirement time: 36000 # 10 hours - startingGear: DeputyGear + startingGear: TsfMarineGear icon: JobIconTSFMarine supervisors: job-supervisors-tsf weight: 130 @@ -35,7 +35,7 @@ prototype: FrontierBirthdayGift - type: startingGear - id: DeputyGear + id: TsfMarineGear # equipment: # pocket1: WeaponPistolMk58 #WeaponPistolMk58Nonlethal storage: diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/officer.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/officer.yml index 4ff3900ecb6..d3f195e665e 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/officer.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/officer.yml @@ -12,7 +12,7 @@ - !type:RoleTimeRequirement role: JobTsfTeamleader time: 10800 # 3 hours - startingGear: BailiffGear + startingGear: TsfOfficerGear icon: JobIconTSFOfficer supervisors: job-supervisors-tsf-officer weight: 150 @@ -45,7 +45,7 @@ prototype: FrontierBirthdayGift - type: startingGear - id: BailiffGear + id: TsfOfficerGear # equipment: # pocket1: WeaponPistolMk58 #WeaponPistolMk58Nonlethal storage: diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/recruit.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/recruit.yml index e28f07a2008..7443955238c 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/recruit.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/recruit.yml @@ -2,7 +2,7 @@ id: TsfRecruit name: job-name-tsf-recruit description: job-description-tsf-recruit - playTimeTracker: JobSecurityCadet + playTimeTracker: JobTsfRecruit requirements: - !type:OverallPlaytimeRequirement time: 32400 # 9 hours # mono @@ -10,7 +10,7 @@ department: Tsf time: 72000 # 20 hours # mono inverted: true # Leave slots open for newer, less confident players. - startingGear: CadetGear + startingGear: TsfRecruitGear icon: JobIconTSFRecruit supervisors: job-supervisors-tsf-recruit weight: 70 @@ -40,7 +40,7 @@ prototype: FrontierBirthdayGift - type: startingGear - id: CadetGear + id: TsfRecruitGear equipment: pocket1: WeaponPistolMk58 #WeaponPistolMk58Nonlethal pocket2: BookSecurity diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/teamleader.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/teamleader.yml index d449bad4091..7ea1a472ab1 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/teamleader.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/teamleader.yml @@ -2,14 +2,14 @@ id: TsfTeamleader name: job-name-tsf-teamleader description: job-description-tsf-teamleader - playTimeTracker: JobSeniorOfficer + playTimeTracker: JobTsfTeamleader requirements: - !type:OverallPlaytimeRequirement time: 72000 # 20 hours # mono - !type:DepartmentTimeRequirement department: Tsf time: 36000 # 10 hours # mono - startingGear: SeniorOfficerGear + startingGear: TsfTeamleaderGear icon: JobIconTsfTeamLeader supervisors: job-supervisors-tsf-teamleader weight: 140 @@ -40,7 +40,7 @@ prototype: FrontierBirthdayGift - type: startingGear - id: SeniorOfficerGear + id: TsfTeamleaderGear # equipment: # pocket1: WeaponPistolMk58 #WeaponPistolMk58Nonlethal storage: diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/play_time_trackers.yml b/Resources/Prototypes/_Mono/Roles/Jobs/play_time_trackers.yml index d0cc53b1e3b..5ef9c3bc29c 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/play_time_trackers.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/play_time_trackers.yml @@ -1,3 +1,4 @@ +# USSP - type: playTimeTracker id: JobUSSPCommissar @@ -7,29 +8,72 @@ - type: playTimeTracker id: JobUSSPSergeant +# MD for some reason + - type: playTimeTracker - id: JobTsfEngineer + id: MdMedic +# Vipergroupo - type: playTimeTracker - id: JobTsfBorg + id: JobVGInfanteer + +- type: playTimeTracker + id: JobVGLieutenant + +- type: playTimeTracker + id: JobVGCommander + +# PDV +- type: playTimeTracker + id: JobPDVTarkhan - type: playTimeTracker id: JobPdvBorg - type: playTimeTracker - id: MdMedic + id: JobPDVAsvaran - type: playTimeTracker - id: JobVGInfanteer + id: JobPDVGrandVizier - type: playTimeTracker - id: JobVGLieutenant + id: JobPDVDenasvar - type: playTimeTracker - id: JobVGCommander + id: JobPDVRahkshan - type: playTimeTracker - id: JobPDVTarkhan + id: JobPDVInfiltrator + +#TSF - type: playTimeTracker id: JobTsfMarsoc + +- type: playTimeTracker + id: JobTsfEngineer + +- type: playTimeTracker + id: JobTsfBorg + +- type: playTimeTracker + id: JobTsfOfficer + +- type: playTimeTracker + id: JobTsfTeamleader + +- type: playTimeTracker + id: JobTsfCommander + +- type: playTimeTracker + id: JobTsfCorpsman + +- type: playTimeTracker + id: JobTsfMarine + +- type: playTimeTracker + id: JobTsfRecruit + + + + diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Frontier/sr.yml b/Resources/Prototypes/_NF/Roles/Jobs/Frontier/sr.yml index 24355ed79fa..7c12f79150b 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Frontier/sr.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Frontier/sr.yml @@ -9,12 +9,12 @@ - !type:RoleTimeRequirement role: JobSecurityGuard time: 18000 # 5 hrs as security guard - mono - # Factions are required here because Overseer needs to actually understand how both factions work. - - !type:RoleTimeRequirement - role: JobPdvRahkshan + # Factions are required here because Overseer needs to actually understand how both factions work. #Mono + - !type:DepartmentTimeRequirement + department: Pdv time: 36000 # 10 hours - !type:DepartmentTimeRequirement - department: Security + department: Tsf time: 36000 # 10 hours whitelisted: false startingGear: SrGear diff --git a/Resources/Prototypes/_NF/Roles/play_time_trackers.yml b/Resources/Prototypes/_NF/Roles/play_time_trackers.yml index acb5bdd1817..782ba6b695d 100644 --- a/Resources/Prototypes/_NF/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/_NF/Roles/play_time_trackers.yml @@ -31,20 +31,5 @@ - type: playTimeTracker id: JobStc -- type: playTimeTracker - id: JobPDVGrandVizier - -- type: playTimeTracker - id: JobPDVAsvaran - -- type: playTimeTracker - id: JobPdvRahkshan - -- type: playTimeTracker - id: JobPDVInfiltrator - -- type: playTimeTracker - id: JobPDVDenasvar - - type: playTimeTracker id: JobDirectorOfCare From 1eda80f78dca6662b331219fbd5b0663ae8be7c0 Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Tue, 14 Jul 2026 14:49:23 +0200 Subject: [PATCH 37/55] tentatively testing how adding operands changes the playtime reqs and if it shits something up --- Resources/Prototypes/_Mono/Roles/Jobs/PDV/asvaran.yml | 1 - Resources/Prototypes/_Mono/Roles/Jobs/PDV/denasvar.yml | 6 +++--- .../_Mono/Roles/Jobs/TSF/commandingofficer.yml | 4 ++-- Resources/Prototypes/_Mono/Roles/Jobs/TSF/engineer.yml | 2 +- Resources/Prototypes/_Mono/Roles/Jobs/TSF/officer.yml | 7 ++----- Resources/Prototypes/_NF/Roles/play_time_trackers.yml | 9 +++++++++ 6 files changed, 17 insertions(+), 12 deletions(-) diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/asvaran.yml b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/asvaran.yml index 6a750e72e07..7531bdfe7ba 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/asvaran.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/asvaran.yml @@ -9,7 +9,6 @@ - !type:RoleTimeRequirement role: JobPDVDenasvar time: 28800 # 8 hours - #whitelisted: true # mono - comment out startingGear: PDVAsvaranGear alwaysUseSpawner: true hideConsoleVisibility: true diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/denasvar.yml b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/denasvar.yml index ee28d8dd1b4..1f6f16bae29 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/denasvar.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/denasvar.yml @@ -21,9 +21,9 @@ requirements: - !type:OverallPlaytimeRequirement time: 72000 # 20 hours # mono - - !type:RoleTimeRequirement - role: JobPDVRahkshan - time: 36000 # 10 hours + - !type:DepartmentTimeRequirement + department: Pdv + time: 36000 # 10 hours # mono startingGear: PDVDenasvarGear alwaysUseSpawner: true hideConsoleVisibility: true diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/commandingofficer.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/commandingofficer.yml index 5916c4a95eb..0a69bf1e35c 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/commandingofficer.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/commandingofficer.yml @@ -7,10 +7,10 @@ - !type:OverallPlaytimeRequirement time: 144000 # 40 hours - mono - !type:DepartmentTimeRequirement - department: Tsf + department: Tsf + Security time: 90000 # 25 hours - mono - !type:RoleTimeRequirement - role: JobTsfOfficer + role: JobTsfOfficer + JobWarden time: 18000 # 5 hours - mono whitelisted: true startingGear: TsfCommanderGear diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/engineer.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/engineer.yml index 636e24f6a83..20317af195f 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/engineer.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/engineer.yml @@ -8,7 +8,7 @@ time: 54000 # 15 hours # mono #fuck this engineers aren't supposed to be the newbuddies - !type:DepartmentTimeRequirement department: Tsf - time: 7200 # 2 hours - mono + time: 18000 # 5 hours - mono startingGear: TsfEngiGear icon: JobIconTSFEngi supervisors: job-supervisors-tsf-teamleader diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/officer.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/officer.yml index d3f195e665e..b677aecf301 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/officer.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/officer.yml @@ -5,13 +5,10 @@ playTimeTracker: JobTsfOfficer requirements: # mono - lowers all of these tbh - !type:OverallPlaytimeRequirement - time: 72000 # 20 hours - - !type:DepartmentTimeRequirement - department: Tsf - time: 36000 # 10 hours + time: 180000 # 50 hours - !type:RoleTimeRequirement role: JobTsfTeamleader - time: 10800 # 3 hours + time: 28800 # 8 hours startingGear: TsfOfficerGear icon: JobIconTSFOfficer supervisors: job-supervisors-tsf-officer diff --git a/Resources/Prototypes/_NF/Roles/play_time_trackers.yml b/Resources/Prototypes/_NF/Roles/play_time_trackers.yml index 782ba6b695d..f425c045351 100644 --- a/Resources/Prototypes/_NF/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/_NF/Roles/play_time_trackers.yml @@ -33,3 +33,12 @@ - type: playTimeTracker id: JobDirectorOfCare + +- type: playTimeTracker + id: JobPirateCaptain + +- type: playTimeTracker + id: JobPirateFirstMate + +- type: playTimeTracker + id: JobPirate From 4b6e5fa8d80f8be932a9851c2f99d07cb30b77f0 Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Tue, 14 Jul 2026 15:20:59 +0200 Subject: [PATCH 38/55] thankfully this works --- ...mc_colonel.yml => ranks_tsf_commander.yml} | 0 ...sfmc_captain.yml => ranks_tsf_officer.yml} | 0 .../TSFMC/Specifics/Ranks/ranks_tsfmc_ftl.yml | 25 +++++++++++++---- .../Specifics/Ranks/ranks_tsfmc_marine.yml | 14 ++++++++-- .../TSFMC/Specifics/Ranks/ranks_tsfn_cn.yml | 7 ++++- .../Specifics/Ranks/ranks_tsfn_corpsmen.yml | 28 ++++++++++++++++--- .../_Mono/Roles/Jobs/PDV/denasvar.yml | 7 +++++ .../_Mono/Roles/Jobs/PDV/grandvizier.yml | 7 +++++ .../Roles/Jobs/TSF/commandingofficer.yml | 12 ++++++-- .../_Mono/Roles/Jobs/TSF/corpsman.yml | 7 +++-- .../_Mono/Roles/Jobs/TSF/engineer.yml | 5 ++++ .../_Mono/Roles/Jobs/TSF/officer.yml | 9 +++++- .../_Mono/Roles/Jobs/TSF/recruit.yml | 2 +- .../_Mono/Roles/Jobs/TSF/teamleader.yml | 5 ++++ 14 files changed, 110 insertions(+), 18 deletions(-) rename Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/{ranks_tsfmc_colonel.yml => ranks_tsf_commander.yml} (100%) rename Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/{ranks_tsfmc_captain.yml => ranks_tsf_officer.yml} (100%) diff --git a/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfmc_colonel.yml b/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsf_commander.yml similarity index 100% rename from Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfmc_colonel.yml rename to Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsf_commander.yml diff --git a/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfmc_captain.yml b/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsf_officer.yml similarity index 100% rename from Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfmc_captain.yml rename to Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsf_officer.yml diff --git a/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfmc_ftl.yml b/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfmc_ftl.yml index 592076f132b..d8f4be63ccf 100644 --- a/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfmc_ftl.yml +++ b/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfmc_ftl.yml @@ -28,8 +28,13 @@ - !type:JobRequirementLoadoutEffect requirement: !type:RoleTimeRequirement - role: JobSeniorOfficer + role: JobTsfTeamleader time: 36000 # 10hr + alternateRequirementSets: + longerPlaytimeLessSec: + - !type:RoleTimeRequirement + role: JobSeniorOfficer + time: 36000 - type: loadout id: TsfmcRankE7FTL @@ -47,8 +52,13 @@ - !type:JobRequirementLoadoutEffect requirement: !type:RoleTimeRequirement - role: JobSeniorOfficer - time: 180000 # 50hr + role: JobTsfTeamleader + time: 180000 # 10hr + alternateRequirementSets: + longerPlaytimeLessSec: + - !type:RoleTimeRequirement + role: JobSeniorOfficer + time: 180000 - type: loadout id: TsfmcRankE8FTL @@ -76,5 +86,10 @@ - !type:JobRequirementLoadoutEffect requirement: !type:RoleTimeRequirement - role: JobSeniorOfficer - time: 360000 # 100hr + role: JobTsfTeamleader + time: 360000 # 10hr + alternateRequirementSets: + longerPlaytimeLessSec: + - !type:RoleTimeRequirement + role: JobSeniorOfficer + time: 360000 diff --git a/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfmc_marine.yml b/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfmc_marine.yml index 52b430cf6c9..3eb11ecd76d 100644 --- a/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfmc_marine.yml +++ b/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfmc_marine.yml @@ -45,8 +45,13 @@ - !type:JobRequirementLoadoutEffect requirement: !type:RoleTimeRequirement - role: JobSecurityOfficer + role: JobTsfMarine time: 36000 # 10hr + alternateRequirementSets: + longerPlaytimeLessSec: + - !type:RoleTimeRequirement + role: JobSecurityOfficer #ihate frontier i hate fronteir hi fep f eh ezf hehfzeh + time: 36000 - type: loadoutEffectGroup id: TsfmcMarineSgt @@ -54,5 +59,10 @@ - !type:JobRequirementLoadoutEffect requirement: !type:RoleTimeRequirement - role: JobSecurityOfficer + role: JobTsfMarine time: 108000 # 30hr + alternateRequirementSets: + longerPlaytimeLessSec: + - !type:RoleTimeRequirement + role: JobSecurityOfficer #ihate frontier i hate fronteir hi fep f eh ezf hehfzeh + time: 108000 diff --git a/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfn_cn.yml b/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfn_cn.yml index 227a79eb352..2bc35264971 100644 --- a/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfn_cn.yml +++ b/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfn_cn.yml @@ -100,5 +100,10 @@ - !type:JobRequirementLoadoutEffect requirement: !type:DepartmentTimeRequirement - department: Security + department: Tsf time: 720000 # 200hr + alternateRequirementSets: + longerPlaytimeLessSec: + - !type:DepartmentTimeRequirement + department: Security + time: 720000 diff --git a/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfn_corpsmen.yml b/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfn_corpsmen.yml index 6e77ddc9ea2..072b7328db7 100644 --- a/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfn_corpsmen.yml +++ b/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfn_corpsmen.yml @@ -28,8 +28,13 @@ - !type:JobRequirementLoadoutEffect requirement: !type:RoleTimeRequirement - role: JobBrigmedic + role: JobTsfCorpsman time: 108000 # 30hr + alternateRequirementSets: + longerPlaytimeLessSec: + - !type:RoleTimeRequirement + role: JobBrigmedic + time: 108000 - type: loadout id: TsfnCorpsmanRankE5 @@ -47,8 +52,13 @@ - !type:JobRequirementLoadoutEffect requirement: !type:RoleTimeRequirement - role: JobBrigmedic + role: JobTsfCorpsman time: 180000 # 50hr + alternateRequirementSets: + longerPlaytimeLessSec: + - !type:RoleTimeRequirement + role: JobBrigmedic + time: 180000 - type: loadout id: TsfnCorpsmanRankE6 @@ -66,8 +76,13 @@ - !type:JobRequirementLoadoutEffect requirement: !type:RoleTimeRequirement - role: JobBrigmedic + role: JobTsfCorpsman time: 288000 # 80hr + alternateRequirementSets: + longerPlaytimeLessSec: + - !type:RoleTimeRequirement + role: JobBrigmedic + time: 288000 - type: loadout id: TsfnCorpsmanRankE7 @@ -85,5 +100,10 @@ - !type:JobRequirementLoadoutEffect requirement: !type:RoleTimeRequirement - role: JobBrigmedic + role: JobTsfCorpsman time: 360000 # 100hr + alternateRequirementSets: + longerPlaytimeLessSec: + - !type:RoleTimeRequirement + role: JobBrigmedic + time: 360000 diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/denasvar.yml b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/denasvar.yml index 1f6f16bae29..6fb20343e69 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/denasvar.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/denasvar.yml @@ -24,6 +24,13 @@ - !type:DepartmentTimeRequirement department: Pdv time: 36000 # 10 hours # mono + alternateRequirementSets: + longerPlaytimeLessSec: + - !type:OverallPlaytimeRequirement + time: 72000 # 20 hours # mono + - !type:DepartmentTimeRequirement + department: Antag + time: 36000 # 10 hours # mono startingGear: PDVDenasvarGear alwaysUseSpawner: true hideConsoleVisibility: true diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/grandvizier.yml b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/grandvizier.yml index cd9615d1336..c5e28c19c5e 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/grandvizier.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/grandvizier.yml @@ -9,6 +9,13 @@ - !type:RoleTimeRequirement role: JobPDVAsvaran time: 18000 # 5 hours - mono + alternateRequirementSets: + longerPlaytimeLessSec: + - !type:OverallPlaytimeRequirement + time: 144000 # 20 hours # mono + - !type:RoleTimeRequirement + role: JobPirateFirstMate + time: 18000 # 5 hours - mono whitelisted: true startingGear: PDVGrandVizierGear alwaysUseSpawner: true diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/commandingofficer.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/commandingofficer.yml index 0a69bf1e35c..6d37a7b6daf 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/commandingofficer.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/commandingofficer.yml @@ -7,11 +7,19 @@ - !type:OverallPlaytimeRequirement time: 144000 # 40 hours - mono - !type:DepartmentTimeRequirement - department: Tsf + Security + department: Tsf time: 90000 # 25 hours - mono - !type:RoleTimeRequirement - role: JobTsfOfficer + JobWarden + role: JobTsfOfficer time: 18000 # 5 hours - mono + alternateRequirementSets: + longerPlaytimeLessSec: + - !type:DepartmentTimeRequirement + department: Security + time: 90000 # 25 hours - mono + - !type:RoleTimeRequirement + role: JobWarden #old tsf officer id + time: 18000 #5 hours whitelisted: true startingGear: TsfCommanderGear alwaysUseSpawner: true diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/corpsman.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/corpsman.yml index be513246877..0ae44cdab65 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/corpsman.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/corpsman.yml @@ -8,11 +8,14 @@ time: 72000 # 20 hours - mono - !type:DepartmentTimeRequirement department: Tsf - time: 7200 # 2 hours - mono + time: 18000 # 5 hours - mono alternateRequirementSets: longerPlaytimeLessSec: + - !type:DepartmentTimeRequirement + department: Security #old tsf department name + time: 18000 # 5 hours - mono - !type:OverallPlaytimeRequirement - time: 108000 # 30 hours - mono + time: 72000 # 20 hours - mono startingGear: TsfCorpsmanGear icon: JobIconTSFCorpsman supervisors: job-supervisors-tsf diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/engineer.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/engineer.yml index 20317af195f..e949ff11e84 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/engineer.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/engineer.yml @@ -9,6 +9,11 @@ - !type:DepartmentTimeRequirement department: Tsf time: 18000 # 5 hours - mono + alternateRequirementSets: + longerPlaytimeLessSec: + - !type:DepartmentTimeRequirement + department: Security #old tsf department id + time: 18000 # 5 hours - mono startingGear: TsfEngiGear icon: JobIconTSFEngi supervisors: job-supervisors-tsf-teamleader diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/officer.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/officer.yml index b677aecf301..26896e5ca5b 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/officer.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/officer.yml @@ -3,12 +3,19 @@ name: job-name-tsf-officer description: job-description-tsf-officer playTimeTracker: JobTsfOfficer - requirements: # mono - lowers all of these tbh + requirements: - !type:OverallPlaytimeRequirement time: 180000 # 50 hours - !type:RoleTimeRequirement role: JobTsfTeamleader time: 28800 # 8 hours + alternateRequirementSets: + longerPlaytimeLessSec: + - !type:OverallPlaytimeRequirement + time: 180000 # 50 hours + - !type:RoleTimeRequirement + role: JobSeniorOfficer #old teamleader id + time: 28800 startingGear: TsfOfficerGear icon: JobIconTSFOfficer supervisors: job-supervisors-tsf-officer diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/recruit.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/recruit.yml index 7443955238c..c48cb2433be 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/recruit.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/recruit.yml @@ -8,7 +8,7 @@ time: 32400 # 9 hours # mono - !type:DepartmentTimeRequirement department: Tsf - time: 72000 # 20 hours # mono + time: 18000 # 5 hours # mono inverted: true # Leave slots open for newer, less confident players. startingGear: TsfRecruitGear icon: JobIconTSFRecruit diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/teamleader.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/teamleader.yml index 7ea1a472ab1..5742dd10fde 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/teamleader.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/teamleader.yml @@ -9,6 +9,11 @@ - !type:DepartmentTimeRequirement department: Tsf time: 36000 # 10 hours # mono + alternateRequirementSets: + longerPlaytimeLessSec: + - !type:DepartmentTimeRequirement + department: Security #old tsf department id -nuke when needed no more + time: 36000 # 10 hours - mono startingGear: TsfTeamleaderGear icon: JobIconTsfTeamLeader supervisors: job-supervisors-tsf-teamleader From 8d9afa505f0510d3a98f8d518f333141f1244858 Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Tue, 14 Jul 2026 15:46:06 +0200 Subject: [PATCH 39/55] fixes and shii --- .../Locale/en-US/_Mono/job/job-names.ftl | 14 +++++++++- .../en-US/_NF/job/department-roletimers.ftl | 2 -- Resources/Locale/en-US/_NF/job/job-names.ftl | 5 ---- .../TSFMC/Specifics/Ranks/ranks_tsfmc_ftl.yml | 27 +++++++++---------- .../Prototypes/_NF/Roles/Jobs/departments.yml | 12 ++++++++- 5 files changed, 36 insertions(+), 24 deletions(-) delete mode 100644 Resources/Locale/en-US/_NF/job/department-roletimers.ftl diff --git a/Resources/Locale/en-US/_Mono/job/job-names.ftl b/Resources/Locale/en-US/_Mono/job/job-names.ftl index f87766d3c62..ebf0e5c3475 100644 --- a/Resources/Locale/en-US/_Mono/job/job-names.ftl +++ b/Resources/Locale/en-US/_Mono/job/job-names.ftl @@ -40,4 +40,16 @@ job-name-security-guard = Judge job-name-stc = Station Traffic Controller job-name-sr = Overseer - +#Role timers +JobPDVInfiltrator = PDV Spasaka +JobPDVRahkshan = PDV Rahkshan +JobPDVGrandVizier = PDV Grand Vizier +JobPDVAsvaran = PDV Asvaran +JobPDVDenasvar = PDV Denasvar +JobTsfCommander = TSF Commanding Officer +JobTsfTeamleader = TSFMC Team leader +JobTsfOfficer = TSF Officer +JobTsfCorpsman = TSF Corpsman +JobTsfMarine = TSFMC Marine +JobTsfRecruit = TSFMC Recruit +JobTsfEngineer = TSF Engineer diff --git a/Resources/Locale/en-US/_NF/job/department-roletimers.ftl b/Resources/Locale/en-US/_NF/job/department-roletimers.ftl deleted file mode 100644 index 37567f72815..00000000000 --- a/Resources/Locale/en-US/_NF/job/department-roletimers.ftl +++ /dev/null @@ -1,2 +0,0 @@ -# Role timers (as of the June upstream merge) use the department as a localized string. -Security = TSFMC diff --git a/Resources/Locale/en-US/_NF/job/job-names.ftl b/Resources/Locale/en-US/_NF/job/job-names.ftl index ca4320bb263..208900d94e1 100644 --- a/Resources/Locale/en-US/_NF/job/job-names.ftl +++ b/Resources/Locale/en-US/_NF/job/job-names.ftl @@ -13,11 +13,6 @@ job-title-ert-mail-carrier = ERT Mail Carrier JobERTMailCarrier = ERT Mail Carrier JobMercenary = Mercenary JobPilot = Pilot -JobPDVInfiltrator = PDV Spasaka -JobPirate = PDV Rahkshan -JobPdvGrandVizier = PDV Grand Vizier -JobPdvAsvaran = PDV Asvaran -JobPdvDenasvar = PDV Denasvar JobSecurityGuard = Judge JobSTC = Station Traffic Controller diff --git a/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfmc_ftl.yml b/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfmc_ftl.yml index d8f4be63ccf..51271088b89 100644 --- a/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfmc_ftl.yml +++ b/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfmc_ftl.yml @@ -30,11 +30,10 @@ !type:RoleTimeRequirement role: JobTsfTeamleader time: 36000 # 10hr - alternateRequirementSets: - longerPlaytimeLessSec: - - !type:RoleTimeRequirement - role: JobSeniorOfficer - time: 36000 + alternateRequirementSets: + - !type:RoleTimeRequirement + role: JobSeniorOfficer + time: 36000 - type: loadout id: TsfmcRankE7FTL @@ -54,11 +53,10 @@ !type:RoleTimeRequirement role: JobTsfTeamleader time: 180000 # 10hr - alternateRequirementSets: - longerPlaytimeLessSec: - - !type:RoleTimeRequirement - role: JobSeniorOfficer - time: 180000 + alternateRequirementSets: + - !type:RoleTimeRequirement + role: JobSeniorOfficer + time: 180000 - type: loadout id: TsfmcRankE8FTL @@ -88,8 +86,7 @@ !type:RoleTimeRequirement role: JobTsfTeamleader time: 360000 # 10hr - alternateRequirementSets: - longerPlaytimeLessSec: - - !type:RoleTimeRequirement - role: JobSeniorOfficer - time: 360000 + alternateRequirementSets: + - !type:RoleTimeRequirement + role: JobSeniorOfficer + time: 360000 diff --git a/Resources/Prototypes/_NF/Roles/Jobs/departments.yml b/Resources/Prototypes/_NF/Roles/Jobs/departments.yml index aba405acdd5..47d70d64424 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/departments.yml @@ -22,4 +22,14 @@ - CCServiceWorker # nyano - NFJanitor - MailCarrier # nyano - - SecurityGuard \ No newline at end of file + - SecurityGuard + +- type: department + id: Antag + name: department-Frontier + description: department-NF-description + weight: 0 #it's some old name for the PDV department + roles: + - PirateCaptain + - PirateFirstMate + - Pirate From 2ff48b59696e1889c04f166971e7ba040aaef455 Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Tue, 14 Jul 2026 15:53:09 +0200 Subject: [PATCH 40/55] will this fix it --- .../Loadouts/TSFMC/Specifics/Ranks/ranks_tsfmc_ftl.yml | 6 +++--- Resources/Prototypes/_NF/Roles/Jobs/departments.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfmc_ftl.yml b/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfmc_ftl.yml index 51271088b89..a895342f47b 100644 --- a/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfmc_ftl.yml +++ b/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfmc_ftl.yml @@ -30,7 +30,7 @@ !type:RoleTimeRequirement role: JobTsfTeamleader time: 36000 # 10hr - alternateRequirementSets: + alternateRequirement: - !type:RoleTimeRequirement role: JobSeniorOfficer time: 36000 @@ -53,7 +53,7 @@ !type:RoleTimeRequirement role: JobTsfTeamleader time: 180000 # 10hr - alternateRequirementSets: + alternateRequirement: - !type:RoleTimeRequirement role: JobSeniorOfficer time: 180000 @@ -86,7 +86,7 @@ !type:RoleTimeRequirement role: JobTsfTeamleader time: 360000 # 10hr - alternateRequirementSets: + alternateRequirement: - !type:RoleTimeRequirement role: JobSeniorOfficer time: 360000 diff --git a/Resources/Prototypes/_NF/Roles/Jobs/departments.yml b/Resources/Prototypes/_NF/Roles/Jobs/departments.yml index 47d70d64424..529c3284afb 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/departments.yml @@ -30,6 +30,6 @@ description: department-NF-description weight: 0 #it's some old name for the PDV department roles: - - PirateCaptain - - PirateFirstMate - - Pirate +# - PirateCaptain +# - PirateFirstMate +# - Pirate From f18c117d86cd48b6396a882da80fdb9a8d965270 Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Tue, 14 Jul 2026 16:02:35 +0200 Subject: [PATCH 41/55] magic --- Resources/Prototypes/Roles/Jobs/departments.yml | 1 - Resources/Prototypes/_NF/Roles/Jobs/departments.yml | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 91365438ce1..0437c08eede 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -115,7 +115,6 @@ # - SecurityCadet # Frontier # - SecurityOfficer # Frontier # - Warden # Frontier - - PrisonGuard ##nyano # - Brigmedic # Frontier # - SecurityGuard # Frontier - NFDetective # Frontier diff --git a/Resources/Prototypes/_NF/Roles/Jobs/departments.yml b/Resources/Prototypes/_NF/Roles/Jobs/departments.yml index 529c3284afb..2afbff42cf8 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/departments.yml @@ -30,6 +30,7 @@ description: department-NF-description weight: 0 #it's some old name for the PDV department roles: + - PrisonGuard #random piece of job i took because errrrrr otherwise the antag department would shit itself #Mono # - PirateCaptain # - PirateFirstMate # - Pirate From 5d1f683e0b0370e52d961111032ddd8b7ffa2662 Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Tue, 14 Jul 2026 16:04:35 +0200 Subject: [PATCH 42/55] hopefullu this fixes it? test for one file first --- .../TSFMC/Specifics/Ranks/ranks_tsfmc_ftl.yml | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfmc_ftl.yml b/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfmc_ftl.yml index a895342f47b..3b2dc3224e5 100644 --- a/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfmc_ftl.yml +++ b/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfmc_ftl.yml @@ -30,10 +30,10 @@ !type:RoleTimeRequirement role: JobTsfTeamleader time: 36000 # 10hr - alternateRequirement: - - !type:RoleTimeRequirement - role: JobSeniorOfficer - time: 36000 + alternateRequirementSets: + - !type:RoleTimeRequirement + role: JobSeniorOfficer + time: 36000 - type: loadout id: TsfmcRankE7FTL @@ -53,10 +53,10 @@ !type:RoleTimeRequirement role: JobTsfTeamleader time: 180000 # 10hr - alternateRequirement: - - !type:RoleTimeRequirement - role: JobSeniorOfficer - time: 180000 + alternateRequirementSets: + - !type:RoleTimeRequirement + role: JobSeniorOfficer + time: 180000 - type: loadout id: TsfmcRankE8FTL @@ -86,7 +86,7 @@ !type:RoleTimeRequirement role: JobTsfTeamleader time: 360000 # 10hr - alternateRequirement: - - !type:RoleTimeRequirement - role: JobSeniorOfficer - time: 360000 + alternateRequirementSets: + - !type:RoleTimeRequirement + role: JobSeniorOfficer + time: 360000 From 0ce9e3ca0038bec7c06fdac48fd22374a971d844 Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Wed, 15 Jul 2026 12:19:18 +0200 Subject: [PATCH 43/55] aw yup --- .../TSFMC/Specifics/Ranks/ranks_tsfmc_ftl.yml | 16 +------- .../Specifics/Ranks/ranks_tsfmc_marine.yml | 38 +++++++++++++------ .../TSFMC/Specifics/Ranks/ranks_tsfn_cn.yml | 5 --- .../Specifics/Ranks/ranks_tsfn_corpsmen.yml | 20 ---------- 4 files changed, 28 insertions(+), 51 deletions(-) diff --git a/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfmc_ftl.yml b/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfmc_ftl.yml index 3b2dc3224e5..9dfe3bd46b0 100644 --- a/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfmc_ftl.yml +++ b/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfmc_ftl.yml @@ -30,10 +30,6 @@ !type:RoleTimeRequirement role: JobTsfTeamleader time: 36000 # 10hr - alternateRequirementSets: - - !type:RoleTimeRequirement - role: JobSeniorOfficer - time: 36000 - type: loadout id: TsfmcRankE7FTL @@ -52,11 +48,7 @@ requirement: !type:RoleTimeRequirement role: JobTsfTeamleader - time: 180000 # 10hr - alternateRequirementSets: - - !type:RoleTimeRequirement - role: JobSeniorOfficer - time: 180000 + time: 180000 # 50hr - type: loadout id: TsfmcRankE8FTL @@ -85,8 +77,4 @@ requirement: !type:RoleTimeRequirement role: JobTsfTeamleader - time: 360000 # 10hr - alternateRequirementSets: - - !type:RoleTimeRequirement - role: JobSeniorOfficer - time: 360000 + time: 360000 # 100hr diff --git a/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfmc_marine.yml b/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfmc_marine.yml index 3eb11ecd76d..24670bbac7e 100644 --- a/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfmc_marine.yml +++ b/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfmc_marine.yml @@ -8,6 +8,9 @@ - type: loadout id: TsfmcRankE2 name: TSFMC E-2 (PFC) + effects: + - !type:GroupLoadoutEffect + proto: TsfmcMarinePfc components: - type: ChatRank rank: tsf-e2 @@ -15,6 +18,9 @@ - type: loadout id: TsfmcRankE3 name: TSFMC E-3 (LCPL) + effects: + - !type:GroupLoadoutEffect + proto: TsfmcMarineLcpl components: - type: ChatRank rank: tsf-e3 @@ -40,29 +46,37 @@ rank: tsf-e5 - type: loadoutEffectGroup - id: TsfmcMarineCpl + id: TsfmcMarinePfc effects: - !type:JobRequirementLoadoutEffect requirement: !type:RoleTimeRequirement role: JobTsfMarine time: 36000 # 10hr - alternateRequirementSets: - longerPlaytimeLessSec: - - !type:RoleTimeRequirement - role: JobSecurityOfficer #ihate frontier i hate fronteir hi fep f eh ezf hehfzeh - time: 36000 - type: loadoutEffectGroup - id: TsfmcMarineSgt + id: TsfmcMarineLcpl effects: - !type:JobRequirementLoadoutEffect requirement: !type:RoleTimeRequirement role: JobTsfMarine time: 108000 # 30hr - alternateRequirementSets: - longerPlaytimeLessSec: - - !type:RoleTimeRequirement - role: JobSecurityOfficer #ihate frontier i hate fronteir hi fep f eh ezf hehfzeh - time: 108000 + +- type: loadoutEffectGroup + id: TsfmcMarineCpl + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobTsfMarine + time: 180000 # 50hr + +- type: loadoutEffectGroup + id: TsfmcMarineSgt + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobTsfMarine + time: 360000 # 100hr diff --git a/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfn_cn.yml b/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfn_cn.yml index 2bc35264971..63060f23806 100644 --- a/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfn_cn.yml +++ b/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfn_cn.yml @@ -102,8 +102,3 @@ !type:DepartmentTimeRequirement department: Tsf time: 720000 # 200hr - alternateRequirementSets: - longerPlaytimeLessSec: - - !type:DepartmentTimeRequirement - department: Security - time: 720000 diff --git a/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfn_corpsmen.yml b/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfn_corpsmen.yml index 072b7328db7..36bd81effc2 100644 --- a/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfn_corpsmen.yml +++ b/Resources/Prototypes/_Mono/Loadouts/TSFMC/Specifics/Ranks/ranks_tsfn_corpsmen.yml @@ -30,11 +30,6 @@ !type:RoleTimeRequirement role: JobTsfCorpsman time: 108000 # 30hr - alternateRequirementSets: - longerPlaytimeLessSec: - - !type:RoleTimeRequirement - role: JobBrigmedic - time: 108000 - type: loadout id: TsfnCorpsmanRankE5 @@ -54,11 +49,6 @@ !type:RoleTimeRequirement role: JobTsfCorpsman time: 180000 # 50hr - alternateRequirementSets: - longerPlaytimeLessSec: - - !type:RoleTimeRequirement - role: JobBrigmedic - time: 180000 - type: loadout id: TsfnCorpsmanRankE6 @@ -78,11 +68,6 @@ !type:RoleTimeRequirement role: JobTsfCorpsman time: 288000 # 80hr - alternateRequirementSets: - longerPlaytimeLessSec: - - !type:RoleTimeRequirement - role: JobBrigmedic - time: 288000 - type: loadout id: TsfnCorpsmanRankE7 @@ -102,8 +87,3 @@ !type:RoleTimeRequirement role: JobTsfCorpsman time: 360000 # 100hr - alternateRequirementSets: - longerPlaytimeLessSec: - - !type:RoleTimeRequirement - role: JobBrigmedic - time: 360000 From 16427ce1e4cc378c0330280a19be557f32f7d80b Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Wed, 15 Jul 2026 12:24:14 +0200 Subject: [PATCH 44/55] awyup more shipyard accesses related stuff --- Resources/Prototypes/_Mono/Shipyard/BlackMarket/bastion.yml | 2 +- Resources/Prototypes/_Mono/Shipyard/BlackMarket/carrion.yml | 2 +- Resources/Prototypes/_Mono/Shipyard/BlackMarket/eris.yml | 2 +- Resources/Prototypes/_Mono/Shipyard/BlackMarket/europa.yml | 2 +- Resources/Prototypes/_Mono/Shipyard/BlackMarket/fenrir.yml | 2 +- Resources/Prototypes/_Mono/Shipyard/BlackMarket/ganymede.yml | 2 +- Resources/Prototypes/_Mono/Shipyard/BlackMarket/garm.yml | 2 +- Resources/Prototypes/_Mono/Shipyard/BlackMarket/hazel.yml | 2 +- Resources/Prototypes/_Mono/Shipyard/BlackMarket/kalisto.yml | 2 +- Resources/Prototypes/_Mono/Shipyard/BlackMarket/metis.yml | 2 +- .../Prototypes/_Mono/Shipyard/BlackMarket/motleyanne.yml | 2 +- Resources/Prototypes/_Mono/Shipyard/BlackMarket/neptune.yml | 2 +- Resources/Prototypes/_Mono/Shipyard/BlackMarket/scorpion.yml | 2 +- Resources/Prototypes/_Mono/Shipyard/BlackMarket/tethys.yml | 2 +- Resources/Prototypes/_Mono/Shipyard/BlackMarket/vulture.yml | 2 +- Resources/Prototypes/_Mono/Shipyard/Capitals/flyssa.yml | 4 ++-- Resources/Prototypes/_Mono/Shipyard/Capitals/saturn.yml | 2 +- Resources/Prototypes/_Mono/Shipyard/Nfsd/aldebaran.yml | 4 ++-- Resources/Prototypes/_Mono/Shipyard/Nfsd/altair.yml | 4 ++-- Resources/Prototypes/_Mono/Shipyard/Nfsd/andromeda.yml | 2 +- Resources/Prototypes/_Mono/Shipyard/Nfsd/calypso.yml | 4 ++-- Resources/Prototypes/_Mono/Shipyard/Nfsd/dagger.yml | 4 ++-- Resources/Prototypes/_Mono/Shipyard/Nfsd/fracture.yml | 4 ++-- Resources/Prototypes/_Mono/Shipyard/Nfsd/hoplite.yml | 4 ++-- Resources/Prototypes/_Mono/Shipyard/Nfsd/jaguar.yml | 4 ++-- Resources/Prototypes/_Mono/Shipyard/Nfsd/mercury.yml | 4 ++-- Resources/Prototypes/_Mono/Shipyard/Nfsd/ocelot.yml | 4 ++-- Resources/Prototypes/_Mono/Shipyard/Nfsd/polaris.yml | 2 +- Resources/Prototypes/_Mono/Shipyard/Nfsd/sentinel.yml | 4 ++-- Resources/Prototypes/_Mono/Shipyard/Nfsd/shiv.yml | 4 ++-- Resources/Prototypes/_Mono/Shipyard/Nfsd/spekter.yml | 4 ++-- Resources/Prototypes/_Mono/Shipyard/Nfsd/spica.yml | 4 ++-- Resources/Prototypes/_Mono/Shipyard/Nfsd/syringe.yml | 4 ++-- Resources/Prototypes/_Mono/Shipyard/Nfsd/tarantula.yml | 4 ++-- Resources/Prototypes/_Mono/Shipyard/Nfsd/tumour.yml | 4 ++-- Resources/Prototypes/_Mono/Shipyard/Nfsd/welder.yml | 4 ++-- 36 files changed, 54 insertions(+), 54 deletions(-) diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/bastion.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/bastion.yml index 8c343fba77a..027c724c713 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/bastion.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/bastion.yml @@ -9,7 +9,7 @@ purchasable: false # voucher only category: Medium group: BlackMarket - access: Pirate + access: PDVGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/BlackMarket/bastion.yml guidebookPage: Null class: diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/carrion.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/carrion.yml index 26844068fc1..b7ca1faeb15 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/carrion.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/carrion.yml @@ -8,7 +8,7 @@ price: 29000 #Appraised at 26000-ish category: Small group: BlackMarket - access: Pirate + access: PDVGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/BlackMarket/carrion.yml guidebookPage: Null class: diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/eris.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/eris.yml index 68138b6ce0b..d3da108a46d 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/eris.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/eris.yml @@ -10,7 +10,7 @@ category: Small hyperwarTimelock: 0 group: BlackMarket - access: Pirate + access: PDVGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/BlackMarket/eris.yml guidebookPage: Null class: diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/europa.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/europa.yml index 4bdb3ba4f7a..3f1b44d66d3 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/europa.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/europa.yml @@ -12,7 +12,7 @@ purchasable: false # voucher only category: Large group: BlackMarket - access: Pirate + access: PDVGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/BlackMarket/europa.yml guidebookPage: Null class: diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/fenrir.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/fenrir.yml index a17989c7cd1..40cd68aadc9 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/fenrir.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/fenrir.yml @@ -9,7 +9,7 @@ purchasable: false # voucher only category: Medium group: BlackMarket - access: Pirate + access: PDVGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/BlackMarket/fenrir.yml guidebookPage: ShipyardFenrir class: diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/ganymede.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/ganymede.yml index 8f61aa01eba..56b123976d4 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/ganymede.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/ganymede.yml @@ -12,7 +12,7 @@ purchasable: false # voucher only category: Large group: BlackMarket - access: Pirate + access: PDVGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/BlackMarket/ganymede.yml guidebookPage: Null class: diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/garm.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/garm.yml index 94579b34dd7..e2b56dcc873 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/garm.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/garm.yml @@ -9,7 +9,7 @@ purchasable: false # voucher only category: Medium group: BlackMarket - access: Pirate + access: PDVGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/BlackMarket/garm.yml guidebookPage: Null class: diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/hazel.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/hazel.yml index cd7854a92be..6b0f50595ae 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/hazel.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/hazel.yml @@ -8,7 +8,7 @@ price: 67000 category: Small group: BlackMarket - access: Pirate + access: PDVGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/BlackMarket/hazel.yml guidebookPage: Null class: diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/kalisto.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/kalisto.yml index e6085140d70..35ac20802c0 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/kalisto.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/kalisto.yml @@ -9,7 +9,7 @@ purchasable: false # voucher only category: Medium group: BlackMarket - access: Pirate + access: PDVGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/BlackMarket/kalisto.yml guidebookPage: Null class: diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/metis.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/metis.yml index 4ecf02c6516..fb32e596cde 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/metis.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/metis.yml @@ -8,7 +8,7 @@ price: 79500 category: Medium group: BlackMarket - access: Pirate + access: PDVGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/BlackMarket/metis.yml guidebookPage: Null class: diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/motleyanne.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/motleyanne.yml index 817bd6cf8d1..d2de2b7bedc 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/motleyanne.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/motleyanne.yml @@ -11,7 +11,7 @@ purchasable: false category: Medium group: BlackMarket - access: Pirate + access: PDVGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/BlackMarket/motleyanne.yml guidebookPage: ShipyardMotleyAnne class: diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/neptune.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/neptune.yml index a11b56aa542..7023fe322e2 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/neptune.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/neptune.yml @@ -9,7 +9,7 @@ purchasable: false # voucher only category: Medium group: BlackMarket - access: Pirate + access: PDVGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/BlackMarket/neptune.yml guidebookPage: Null class: diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/scorpion.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/scorpion.yml index d716c3e445c..71895eed8b1 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/scorpion.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/scorpion.yml @@ -9,7 +9,7 @@ purchasable: false # voucher only category: Medium group: BlackMarket - access: Pirate + access: PDVGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/BlackMarket/scorpion.yml guidebookPage: Null class: diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/tethys.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/tethys.yml index bbd2dfb2100..2d4eca90b21 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/tethys.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/tethys.yml @@ -8,7 +8,7 @@ price: 72000 category: Medium group: BlackMarket - access: Pirate + access: PDVGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/BlackMarket/tethys.yml guidebookPage: Null class: diff --git a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/vulture.yml b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/vulture.yml index 2282674db77..f0d80cc783c 100644 --- a/Resources/Prototypes/_Mono/Shipyard/BlackMarket/vulture.yml +++ b/Resources/Prototypes/_Mono/Shipyard/BlackMarket/vulture.yml @@ -11,7 +11,7 @@ purchasable: false # voucher only category: Large group: BlackMarket - access: Pirate + access: PDVGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/BlackMarket/vulture.yml guidebookPage: Null class: diff --git a/Resources/Prototypes/_Mono/Shipyard/Capitals/flyssa.yml b/Resources/Prototypes/_Mono/Shipyard/Capitals/flyssa.yml index b13f0852280..2bf99496b80 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Capitals/flyssa.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Capitals/flyssa.yml @@ -9,8 +9,8 @@ price: 1225950 purchasable: false # voucher only category: Large - group: Security - access: Security + group: Tsf + access: TsfGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/Capitals/flyssa.yml guidebookPage: Null class: diff --git a/Resources/Prototypes/_Mono/Shipyard/Capitals/saturn.yml b/Resources/Prototypes/_Mono/Shipyard/Capitals/saturn.yml index f93ae8f7595..5c53d5e2a5d 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Capitals/saturn.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Capitals/saturn.yml @@ -18,7 +18,7 @@ purchasable: false # voucher only category: Large group: BlackMarket - access: Pirate + access: PDVGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/Capitals/saturn.yml guidebookPage: Null class: diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/aldebaran.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/aldebaran.yml index b7ac57dc6bd..a328395fa6e 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/aldebaran.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/aldebaran.yml @@ -8,8 +8,8 @@ price: 160200 purchasable: false # voucher only category: Medium - group: Security - access: Security + group: Tsf + access: TsfGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/Nfsd/aldebaran.yml guidebookPage: Null class: diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/altair.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/altair.yml index f7e9f0a5682..f52a52cbf7e 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/altair.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/altair.yml @@ -10,8 +10,8 @@ price: 425000 purchasable: false # voucher only category: Large - group: Security - access: Security + group: Tsf + access: TsfGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/Nfsd/altair.yml guidebookPage: Null class: diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/andromeda.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/andromeda.yml index 6d6547b0bd8..e1c39df70ef 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/andromeda.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/andromeda.yml @@ -11,7 +11,7 @@ price: 320000 purchasable: false # voucher only category: Large - group: Security + group: Tsf access: Armory shuttlePath: /SharedMaps/_Mono/Shuttles/Nfsd/andromeda.yml guidebookPage: Null diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/calypso.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/calypso.yml index ff43c902ac0..29dc23b3e72 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/calypso.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/calypso.yml @@ -7,8 +7,8 @@ price: 134000 purchasable: false # voucher only category: Medium - group: Security - access: Security + group: Tsf + access: TsfGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/Nfsd/calypso.yml guidebookPage: Null class: diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/dagger.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/dagger.yml index be8027f05ff..e540e21db28 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/dagger.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/dagger.yml @@ -8,8 +8,8 @@ price: 120000 purchasable: false # voucher only category: Medium - group: Security - access: Security + group: Tsf + access: TsfGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/Nfsd/dagger.yml guidebookPage: Null class: diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/fracture.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/fracture.yml index 7cc3a5dfdfb..db67541625d 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/fracture.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/fracture.yml @@ -6,8 +6,8 @@ description: A one-man ship with the armor of a brawler and the guns of a sniper. Armed with 2 220mm CYREXAs and 2 150mm TARNYXs, but no PD. Don't miss your bursts. price: 112500 category: Medium - group: Security - access: Security + group: Tsf + access: TsfGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/Nfsd/fracture.yml guidebookPage: Null class: diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/hoplite.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/hoplite.yml index d12994b206a..f4100453f87 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/hoplite.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/hoplite.yml @@ -6,8 +6,8 @@ description: A patrol craft meant to intercept light enemy craft with powerful engines and EMPs. It is equipped with 2 RUBICON, two plasma pulsers and two MARAUDER plasma cannons. Fast, deadly, and with some nice cargo space. price: 78500 category: Small - group: Security - access: Security + group: Tsf + access: TsfGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/Nfsd/hoplite.yml guidebookPage: Null class: diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/jaguar.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/jaguar.yml index bd0e9942e8d..366eb3fe3b9 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/jaguar.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/jaguar.yml @@ -7,8 +7,8 @@ description: A support fighter to assist other ships in combat, armed with TARYNX EMP cannon for disabling ships and 4 L-1 phalanxes to shred anything that gets too close. price: 58500 category: Small - group: Security - access: Security + group: Tsf + access: TsfGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/Nfsd/jaguar.yml guidebookPage: Null class: diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/mercury.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/mercury.yml index 2c90268f1da..e7d3e4491bf 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/mercury.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/mercury.yml @@ -8,8 +8,8 @@ price: 228621 # Appraises at 190518. 20% tax. purchasable: false # voucher only category: Medium - group: Security - access: Security + group: Tsf + access: TsfGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/Nfsd/mercury.yml guidebookPage: Null class: diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/ocelot.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/ocelot.yml index 41d0aaae525..28217288b7d 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/ocelot.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/ocelot.yml @@ -7,8 +7,8 @@ description: A highly manouverable corvette designed to work in tandem with the jaguar, with the ability to reveal cloaked ships. Armed with 2x cerberus plasma scattercannons, 2x Plasma autopulsers and 2x 20mm PD cannons price: 68500 category: Small - group: Security - access: Security + group: Tsf + access: TsfGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/Nfsd/ocelot.yml guidebookPage: Null class: diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/polaris.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/polaris.yml index 6032ffa9d6b..4c2b33440ca 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/polaris.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/polaris.yml @@ -11,7 +11,7 @@ price: 283000 purchasable: false # voucher only category: Large - group: Security + group: Tsf access: Armory shuttlePath: /SharedMaps/_Mono/Shuttles/Nfsd/polaris.yml guidebookPage: Null diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/sentinel.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/sentinel.yml index 8f0b0e1ae4d..90286dccdc5 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/sentinel.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/sentinel.yml @@ -8,8 +8,8 @@ price: 210200 # Appraises around 100k, but marked up since appraisegrid is too stupid to realize the true value of my creations (plastitanium walls probably has their value set really low) purchasable: false # voucher only category: Medium - group: Security - access: Security + group: Tsf + access: TsfGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/Nfsd/sentinel.yml guidebookPage: Null class: diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/shiv.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/shiv.yml index 995d11230d6..f062878db6c 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/shiv.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/shiv.yml @@ -8,8 +8,8 @@ price: 60000 category: Small hyperwarTimelock: 0 - group: Security - access: Security + group: Tsf + access: TsfGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/Nfsd/shiv.yml guidebookPage: Null class: diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/spekter.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/spekter.yml index 32ac82f3fc2..d412fb47652 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/spekter.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/spekter.yml @@ -11,8 +11,8 @@ hyperwarTimelock: 1800 purchasable: false # voucher only category: Medium - group: Security - access: Security + group: Tsf + access: TsfGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/Nfsd/spekter.yml guidebookPage: ShipyardNFROperation class: diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/spica.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/spica.yml index e451ad849bc..fdff2d84cd1 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/spica.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/spica.yml @@ -8,8 +8,8 @@ price: 117000 purchasable: false # voucher only category: Small - group: Security - access: Security + group: Tsf + access: TsfGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/Nfsd/spica.yml guidebookPage: Null class: diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/syringe.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/syringe.yml index cffe1f60761..6ff56132039 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/syringe.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/syringe.yml @@ -7,8 +7,8 @@ description: A small ship meant as an escort and render aid to other TSF vessels. It has a small interior and is lightly armed. price: 58500 category: Small - group: Security - access: Security + group: Tsf + access: TsfGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/Nfsd/syringe.yml guidebookPage: Null class: diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/tarantula.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/tarantula.yml index 6d96d26fbf1..32da28c5bfe 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/tarantula.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/tarantula.yml @@ -10,8 +10,8 @@ price: 140850 purchasable: false # voucher only category: Medium - group: Security - access: Security + group: Tsf + access: TsfGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/Nfsd/tarantula.yml guidebookPage: Null class: diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/tumour.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/tumour.yml index 050b26f42bd..7ca8bce0858 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/tumour.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/tumour.yml @@ -7,8 +7,8 @@ description: A ugly potato of a carrier. Little armament to defend itself, but carries lathes to support its fighters and other ships. price: 68250 category: Medium - group: Security - access: Security + group: Tsf + access: TsfGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/Nfsd/tumour.yml guidebookPage: Null class: diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/welder.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/welder.yml index c1e566161cd..edf0483d6d6 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/welder.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/welder.yml @@ -7,8 +7,8 @@ description: A multipurpose, utilitarian but cramped vessel envisioned as an all-in-one multitool for ship repair and resource extraction. Capable of detecting cloaked vessels. price: 78200 category: Small - group: Security - access: Security + group: Tsf + access: TsfGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/Nfsd/welder.yml guidebookPage: Null class: From a0f879d751c7a4701cd31acbb00d42241df73bc2 Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Wed, 15 Jul 2026 12:50:45 +0200 Subject: [PATCH 45/55] nothing ever happens ig --- .../Shipyard/Components/SharedShipyardConsoleComponent.cs | 5 +++-- .../Entities/Structures/Machines/Computers/shipyard.yml | 3 --- Resources/Prototypes/_Mono/Shipyard/Capitals/flyssa.yml | 2 +- Resources/Prototypes/_Mono/Shipyard/Nfsd/aldebaran.yml | 2 +- Resources/Prototypes/_Mono/Shipyard/Nfsd/altair.yml | 2 +- Resources/Prototypes/_Mono/Shipyard/Nfsd/andromeda.yml | 2 +- Resources/Prototypes/_Mono/Shipyard/Nfsd/calypso.yml | 2 +- Resources/Prototypes/_Mono/Shipyard/Nfsd/dagger.yml | 2 +- Resources/Prototypes/_Mono/Shipyard/Nfsd/fracture.yml | 2 +- Resources/Prototypes/_Mono/Shipyard/Nfsd/hoplite.yml | 2 +- Resources/Prototypes/_Mono/Shipyard/Nfsd/jaguar.yml | 2 +- Resources/Prototypes/_Mono/Shipyard/Nfsd/mercury.yml | 2 +- Resources/Prototypes/_Mono/Shipyard/Nfsd/ocelot.yml | 2 +- Resources/Prototypes/_Mono/Shipyard/Nfsd/polaris.yml | 2 +- Resources/Prototypes/_Mono/Shipyard/Nfsd/sentinel.yml | 2 +- Resources/Prototypes/_Mono/Shipyard/Nfsd/shiv.yml | 2 +- Resources/Prototypes/_Mono/Shipyard/Nfsd/spekter.yml | 2 +- Resources/Prototypes/_Mono/Shipyard/Nfsd/spica.yml | 2 +- Resources/Prototypes/_Mono/Shipyard/Nfsd/syringe.yml | 2 +- Resources/Prototypes/_Mono/Shipyard/Nfsd/tarantula.yml | 2 +- Resources/Prototypes/_Mono/Shipyard/Nfsd/tumour.yml | 2 +- Resources/Prototypes/_Mono/Shipyard/Nfsd/welder.yml | 2 +- .../Structures/Machines/Computers/computers_shipyard.yml | 4 +--- 23 files changed, 24 insertions(+), 28 deletions(-) diff --git a/Content.Shared/_NF/Shipyard/Components/SharedShipyardConsoleComponent.cs b/Content.Shared/_NF/Shipyard/Components/SharedShipyardConsoleComponent.cs index 05cc2e42115..4af9af9d38d 100644 --- a/Content.Shared/_NF/Shipyard/Components/SharedShipyardConsoleComponent.cs +++ b/Content.Shared/_NF/Shipyard/Components/SharedShipyardConsoleComponent.cs @@ -35,8 +35,9 @@ public sealed partial class ShipyardConsoleComponent : Component /// A second comms channel that announces the ship purchase, with some information redacted. /// Currently used for black market and syndicate shipyards to alert the NFSD. /// - [DataField("secretShipyardChannel")] - public ProtoId? SecretShipyardChannel = null; + /// Mono edit WHY EVEN IS THIS A THING THERE IS NO REASON NFSD IS DEAD AND WE KILLED IT + //DataField("secretShipyardChannel")] + //public ProtoId? SecretShipyardChannel = null; /// /// If non-empty, specifies the new job title that should be given to the owner of the ship. diff --git a/Resources/Prototypes/_Mono/Entities/Structures/Machines/Computers/shipyard.yml b/Resources/Prototypes/_Mono/Entities/Structures/Machines/Computers/shipyard.yml index c56a0e3109a..df9d238837e 100644 --- a/Resources/Prototypes/_Mono/Entities/Structures/Machines/Computers/shipyard.yml +++ b/Resources/Prototypes/_Mono/Entities/Structures/Machines/Computers/shipyard.yml @@ -23,7 +23,6 @@ state: telesci_key - type: ShipyardConsole shipyardChannel: Ussp - secretShipyardChannel: Nfsd ignoreBaseSaleRate: true # Fixed 70% sale rate. canTransferDeed: false @@ -52,7 +51,6 @@ state: gunnery_keys - type: ShipyardConsole shipyardChannel: SHM - secretShipyardChannel: Nfsd canTransferDeed: false - type: entity @@ -80,7 +78,6 @@ state: gunnery_keys - type: ShipyardConsole shipyardChannel: SHM - secretShipyardChannel: Nfsd canTransferDeed: false - type: entity diff --git a/Resources/Prototypes/_Mono/Shipyard/Capitals/flyssa.yml b/Resources/Prototypes/_Mono/Shipyard/Capitals/flyssa.yml index 2bf99496b80..6e57713721b 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Capitals/flyssa.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Capitals/flyssa.yml @@ -9,7 +9,7 @@ price: 1225950 purchasable: false # voucher only category: Large - group: Tsf + group: Security access: TsfGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/Capitals/flyssa.yml guidebookPage: Null diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/aldebaran.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/aldebaran.yml index a328395fa6e..80fba7462b8 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/aldebaran.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/aldebaran.yml @@ -8,7 +8,7 @@ price: 160200 purchasable: false # voucher only category: Medium - group: Tsf + group: Security access: TsfGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/Nfsd/aldebaran.yml guidebookPage: Null diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/altair.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/altair.yml index f52a52cbf7e..8a86638df9f 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/altair.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/altair.yml @@ -10,7 +10,7 @@ price: 425000 purchasable: false # voucher only category: Large - group: Tsf + group: Security access: TsfGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/Nfsd/altair.yml guidebookPage: Null diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/andromeda.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/andromeda.yml index e1c39df70ef..6d6547b0bd8 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/andromeda.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/andromeda.yml @@ -11,7 +11,7 @@ price: 320000 purchasable: false # voucher only category: Large - group: Tsf + group: Security access: Armory shuttlePath: /SharedMaps/_Mono/Shuttles/Nfsd/andromeda.yml guidebookPage: Null diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/calypso.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/calypso.yml index 29dc23b3e72..b64747f816e 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/calypso.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/calypso.yml @@ -7,7 +7,7 @@ price: 134000 purchasable: false # voucher only category: Medium - group: Tsf + group: Security access: TsfGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/Nfsd/calypso.yml guidebookPage: Null diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/dagger.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/dagger.yml index e540e21db28..b77957be3b6 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/dagger.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/dagger.yml @@ -8,7 +8,7 @@ price: 120000 purchasable: false # voucher only category: Medium - group: Tsf + group: Security access: TsfGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/Nfsd/dagger.yml guidebookPage: Null diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/fracture.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/fracture.yml index db67541625d..07be0ad6aad 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/fracture.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/fracture.yml @@ -6,7 +6,7 @@ description: A one-man ship with the armor of a brawler and the guns of a sniper. Armed with 2 220mm CYREXAs and 2 150mm TARNYXs, but no PD. Don't miss your bursts. price: 112500 category: Medium - group: Tsf + group: Security access: TsfGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/Nfsd/fracture.yml guidebookPage: Null diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/hoplite.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/hoplite.yml index f4100453f87..b32c5fbfdad 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/hoplite.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/hoplite.yml @@ -6,7 +6,7 @@ description: A patrol craft meant to intercept light enemy craft with powerful engines and EMPs. It is equipped with 2 RUBICON, two plasma pulsers and two MARAUDER plasma cannons. Fast, deadly, and with some nice cargo space. price: 78500 category: Small - group: Tsf + group: Security access: TsfGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/Nfsd/hoplite.yml guidebookPage: Null diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/jaguar.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/jaguar.yml index 366eb3fe3b9..4268b34dc1b 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/jaguar.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/jaguar.yml @@ -7,7 +7,7 @@ description: A support fighter to assist other ships in combat, armed with TARYNX EMP cannon for disabling ships and 4 L-1 phalanxes to shred anything that gets too close. price: 58500 category: Small - group: Tsf + group: Security access: TsfGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/Nfsd/jaguar.yml guidebookPage: Null diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/mercury.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/mercury.yml index e7d3e4491bf..f03e7bd5b5d 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/mercury.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/mercury.yml @@ -8,7 +8,7 @@ price: 228621 # Appraises at 190518. 20% tax. purchasable: false # voucher only category: Medium - group: Tsf + group: Security access: TsfGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/Nfsd/mercury.yml guidebookPage: Null diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/ocelot.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/ocelot.yml index 28217288b7d..17a528bb48a 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/ocelot.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/ocelot.yml @@ -7,7 +7,7 @@ description: A highly manouverable corvette designed to work in tandem with the jaguar, with the ability to reveal cloaked ships. Armed with 2x cerberus plasma scattercannons, 2x Plasma autopulsers and 2x 20mm PD cannons price: 68500 category: Small - group: Tsf + group: Security access: TsfGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/Nfsd/ocelot.yml guidebookPage: Null diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/polaris.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/polaris.yml index 4c2b33440ca..6032ffa9d6b 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/polaris.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/polaris.yml @@ -11,7 +11,7 @@ price: 283000 purchasable: false # voucher only category: Large - group: Tsf + group: Security access: Armory shuttlePath: /SharedMaps/_Mono/Shuttles/Nfsd/polaris.yml guidebookPage: Null diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/sentinel.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/sentinel.yml index 90286dccdc5..31f9e189609 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/sentinel.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/sentinel.yml @@ -8,7 +8,7 @@ price: 210200 # Appraises around 100k, but marked up since appraisegrid is too stupid to realize the true value of my creations (plastitanium walls probably has their value set really low) purchasable: false # voucher only category: Medium - group: Tsf + group: Security access: TsfGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/Nfsd/sentinel.yml guidebookPage: Null diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/shiv.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/shiv.yml index f062878db6c..138dafb387f 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/shiv.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/shiv.yml @@ -8,7 +8,7 @@ price: 60000 category: Small hyperwarTimelock: 0 - group: Tsf + group: Security access: TsfGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/Nfsd/shiv.yml guidebookPage: Null diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/spekter.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/spekter.yml index d412fb47652..a7b85e14141 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/spekter.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/spekter.yml @@ -11,7 +11,7 @@ hyperwarTimelock: 1800 purchasable: false # voucher only category: Medium - group: Tsf + group: Security access: TsfGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/Nfsd/spekter.yml guidebookPage: ShipyardNFROperation diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/spica.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/spica.yml index fdff2d84cd1..2922f5711fd 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/spica.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/spica.yml @@ -8,7 +8,7 @@ price: 117000 purchasable: false # voucher only category: Small - group: Tsf + group: Security access: TsfGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/Nfsd/spica.yml guidebookPage: Null diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/syringe.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/syringe.yml index 6ff56132039..7c44e3ed1b1 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/syringe.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/syringe.yml @@ -7,7 +7,7 @@ description: A small ship meant as an escort and render aid to other TSF vessels. It has a small interior and is lightly armed. price: 58500 category: Small - group: Tsf + group: Security access: TsfGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/Nfsd/syringe.yml guidebookPage: Null diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/tarantula.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/tarantula.yml index 32da28c5bfe..b73ec30bfe7 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/tarantula.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/tarantula.yml @@ -10,7 +10,7 @@ price: 140850 purchasable: false # voucher only category: Medium - group: Tsf + group: Security access: TsfGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/Nfsd/tarantula.yml guidebookPage: Null diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/tumour.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/tumour.yml index 7ca8bce0858..0edf02f4de6 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/tumour.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/tumour.yml @@ -7,7 +7,7 @@ description: A ugly potato of a carrier. Little armament to defend itself, but carries lathes to support its fighters and other ships. price: 68250 category: Medium - group: Tsf + group: Security access: TsfGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/Nfsd/tumour.yml guidebookPage: Null diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/welder.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/welder.yml index edf0483d6d6..b6c6eb835f9 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/welder.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/welder.yml @@ -7,7 +7,7 @@ description: A multipurpose, utilitarian but cramped vessel envisioned as an all-in-one multitool for ship repair and resource extraction. Capable of detecting cloaked vessels. price: 78200 category: Small - group: Tsf + group: Security access: TsfGeneral shuttlePath: /SharedMaps/_Mono/Shuttles/Nfsd/welder.yml guidebookPage: Null diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_shipyard.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_shipyard.yml index 32cd169ba05..70c71adee3a 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_shipyard.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_shipyard.yml @@ -108,7 +108,7 @@ type: ShipyardConsoleBoundUserInterface - type: ShipyardConsole shipyardChannel: Nfsd - newAccessLevels: [Captain, Security, Brig] + newAccessLevels: [Captain, TsfGeneral] - type: entity id: ComputerShipyardSyndicate @@ -135,7 +135,6 @@ state: blackmarket_key - type: ShipyardConsole shipyardChannel: Syndicate - secretShipyardChannel: Nfsd taxAccounts: BlackMarket: 0.1 # 0.3->0.1, made BM Mono ignoreBaseSaleRate: true # Fixed 70% sale rate. @@ -166,7 +165,6 @@ state: telesci_key # Mono - type: ShipyardConsole shipyardChannel: Freelance - secretShipyardChannel: Nfsd taxAccounts: BlackMarket: 0.30 # Made BM - Mono ignoreBaseSaleRate: true # Fixed 70% sale rate. From 02ade851ed7abdd02e7ec2209a6522f4196fa621 Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Wed, 15 Jul 2026 13:20:39 +0200 Subject: [PATCH 46/55] here goes nothing --- .../_Mono/Entities/Mobs/Player/silicon.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Resources/Prototypes/_Mono/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/_Mono/Entities/Mobs/Player/silicon.yml index 64d144b12de..ade32a78082 100644 --- a/Resources/Prototypes/_Mono/Entities/Mobs/Player/silicon.yml +++ b/Resources/Prototypes/_Mono/Entities/Mobs/Player/silicon.yml @@ -526,6 +526,13 @@ - !type:RoleTimeRequirement role: JobWarden time: 54000 # 15 hours + alternateRequirementSets: + longerPlaytimeLessSec: + - !type:OverallPlaytimeRequirement + time: 180000 # 50 hrs + - !type:RoleTimeRequirement + role: JobTsfOfficer + time: 54000 #15 hours - type: GhostTakeoverAvailable - type: RandomMetadata nameSegments: [ TSFMCCoreNameset ] @@ -620,6 +627,13 @@ - !type:RoleTimeRequirement role: JobPDVAsvaran time: 54000 # 15 hours + alternateRequirementSets: + longerPlaytimeLessSec: + - !type:OverallPlaytimeRequirement + time: 180000 # 50 hrs + - !type:RoleTimeRequirement + role: JobPirateFirstMate + time: 54000 #15 hours - type: GhostTakeoverAvailable - type: RandomMetadata nameSegments: [ PDVCoreNameset ] From e70b0ed107eea6c170902aa41fecc7ef085e55ec Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Thu, 16 Jul 2026 13:07:11 +0200 Subject: [PATCH 47/55] commented out secret shipyard channels in console system because why do we ahve those wtf --- .../_NF/Shipyard/Systems/ShipyardSystem.Consoles.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Server/_NF/Shipyard/Systems/ShipyardSystem.Consoles.cs b/Content.Server/_NF/Shipyard/Systems/ShipyardSystem.Consoles.cs index 7a1e1490195..5c9b20dfac8 100644 --- a/Content.Server/_NF/Shipyard/Systems/ShipyardSystem.Consoles.cs +++ b/Content.Server/_NF/Shipyard/Systems/ShipyardSystem.Consoles.cs @@ -391,8 +391,8 @@ private void OnPurchaseMessage(EntityUid shipyardConsoleUid, ShipyardConsoleComp } SendPurchaseMessage(shipyardConsoleUid, player, name, component.ShipyardChannel, secret: false); - if (component.SecretShipyardChannel is { } secretChannel) - SendPurchaseMessage(shipyardConsoleUid, player, name, secretChannel, secret: true); + ///if (component.SecretShipyardChannel is { } secretChannel) #Mono, why the hell do we have secret shipyard channels????? + /// SendPurchaseMessage(shipyardConsoleUid, player, name, secretChannel, secret: true); var vesselStore = EnsureComp(shuttleUid); vesselStore.VesselId = vessel.ID; From a5fac12d62e2d6164a67a58cfa1693921c26e62c Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Thu, 16 Jul 2026 13:09:08 +0200 Subject: [PATCH 48/55] ye --- .../_NF/Shipyard/Systems/ShipyardSystem.Consoles.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Server/_NF/Shipyard/Systems/ShipyardSystem.Consoles.cs b/Content.Server/_NF/Shipyard/Systems/ShipyardSystem.Consoles.cs index 5c9b20dfac8..ba6703ffef0 100644 --- a/Content.Server/_NF/Shipyard/Systems/ShipyardSystem.Consoles.cs +++ b/Content.Server/_NF/Shipyard/Systems/ShipyardSystem.Consoles.cs @@ -560,8 +560,8 @@ public void OnSellMessage(EntityUid uid, ShipyardConsoleComponent component, Shi var name = GetFullName(deed); SendSellMessage(uid, deed.ShuttleOwner!, name, component.ShipyardChannel, player, secret: false); - if (component.SecretShipyardChannel is { } secretChannel) - SendSellMessage(uid, deed.ShuttleOwner!, name, secretChannel, player, secret: true); + //if (component.SecretShipyardChannel is { } secretChannel) #Mono, WHY IS THERE A SECRET SHIPYARD CHANNEL WE NEVER USE THOSE + // SendSellMessage(uid, deed.ShuttleOwner!, name, secretChannel, player, secret: true); EntityUid? refreshId = targetId; From a37edd025011039e7a345df1fafb523bd83826bb Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Thu, 16 Jul 2026 14:13:48 +0200 Subject: [PATCH 49/55] fixes fixes and more fixes --- .../_Mono/Entities/Mobs/Player/silicon.yml | 20 +++---------------- .../_Mono/Shuttles/BlackMarket/prowler.yml | 6 +++--- 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/Resources/Prototypes/_Mono/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/_Mono/Entities/Mobs/Player/silicon.yml index ade32a78082..e6b25f8224a 100644 --- a/Resources/Prototypes/_Mono/Entities/Mobs/Player/silicon.yml +++ b/Resources/Prototypes/_Mono/Entities/Mobs/Player/silicon.yml @@ -524,15 +524,8 @@ - !type:OverallPlaytimeRequirement time: 180000 # 50 hrs - !type:RoleTimeRequirement - role: JobWarden - time: 54000 # 15 hours - alternateRequirementSets: - longerPlaytimeLessSec: - - !type:OverallPlaytimeRequirement - time: 180000 # 50 hrs - - !type:RoleTimeRequirement - role: JobTsfOfficer - time: 54000 #15 hours + role: JobTsfOfficer + time: 36000 # 10 hours - type: GhostTakeoverAvailable - type: RandomMetadata nameSegments: [ TSFMCCoreNameset ] @@ -626,14 +619,7 @@ time: 180000 # 50 hrs - !type:RoleTimeRequirement role: JobPDVAsvaran - time: 54000 # 15 hours - alternateRequirementSets: - longerPlaytimeLessSec: - - !type:OverallPlaytimeRequirement - time: 180000 # 50 hrs - - !type:RoleTimeRequirement - role: JobPirateFirstMate - time: 54000 #15 hours + time: 36000 # 15 hours - type: GhostTakeoverAvailable - type: RandomMetadata nameSegments: [ PDVCoreNameset ] diff --git a/Resources/SharedMaps/_Mono/Shuttles/BlackMarket/prowler.yml b/Resources/SharedMaps/_Mono/Shuttles/BlackMarket/prowler.yml index 3c7247526f5..a2ea3a7b0ed 100644 --- a/Resources/SharedMaps/_Mono/Shuttles/BlackMarket/prowler.yml +++ b/Resources/SharedMaps/_Mono/Shuttles/BlackMarket/prowler.yml @@ -1169,21 +1169,21 @@ entities: - type: Transform pos: -0.5,-6.5 parent: 1 -- proto: SpawnPointPirate +- proto: SpawnPointPDVRahkshan entities: - uid: 147 components: - type: Transform pos: -0.5,-6.5 parent: 1 -- proto: SpawnPointPirateCaptain +- proto: SpawnPointPDVGrandVizier entities: - uid: 148 components: - type: Transform pos: -0.5,-6.5 parent: 1 -- proto: SpawnPointPirateFirstMate +- proto: SpawnPointPDVAsvaran entities: - uid: 149 components: From 602dc728b16b4c3233a946cefd2b1b7bcdbf2130 Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Fri, 17 Jul 2026 16:00:29 +0200 Subject: [PATCH 50/55] uplink unfuckery --- .../Locale/en-US/_Mono/store/currency.ftl | 2 + .../en-US/_Mono/store/pdv-uplink-catalog.ftl | 323 ++-- .../en-US/{_NF => _Mono}/store/store.ftl | 0 .../_Mono/store/tsfmc-uplink-catalog.ftl | 399 +++- Resources/Locale/en-US/_NF/store/currency.ftl | 2 - .../en-US/_NF/store/pirate-uplink-catalog.ftl | 115 +- .../_NF/store/security-uplink-catalog.ftl | 164 -- Resources/Maps/_Mono/Test/dev_map.yml | 4 +- .../_Mono/Catalogs/pdv_uplink_catalog.yml | 468 ++--- .../_Mono/Catalogs/tsfmc_uplink_catalog.yml | 1650 +++++++++++++++-- .../Mobs/Ghostroles/MARSOC/loadouts.yml | 2 +- .../Objects/Specific/Factions/pdv_uplink.yml} | 28 +- .../Objects/Specific/Factions/tsf_uplink.yml} | 51 +- .../Entities/Structures/Machines/uplinks.yml | 22 +- .../_Mono/Roles/Jobs/PDV/asvaran.yml | 2 +- .../_Mono/Roles/Jobs/PDV/denasvar.yml | 2 +- .../_Mono/Roles/Jobs/PDV/grandvizier.yml | 2 +- .../_Mono/Roles/Jobs/PDV/rahkshan.yml | 2 +- .../Roles/Jobs/TSF/commandingofficer.yml | 2 +- .../_Mono/Roles/Jobs/TSF/corpsman.yml | 2 +- .../_Mono/Roles/Jobs/TSF/marine.yml | 2 +- .../_Mono/Roles/Jobs/TSF/officer.yml | 2 +- .../_Mono/Roles/Jobs/TSF/recruit.yml | 2 +- .../_Mono/Roles/Jobs/TSF/teamleader.yml | 2 +- .../Prototypes/_Mono/Store/categories.yml | 67 + .../{_NF => _Mono}/Store/presets.yml | 18 +- Resources/Prototypes/_Mono/tags.yml | 8 + .../_NF/Catalog/security_uplink_catalog.yml | 1383 -------------- .../_NF/Entities/Objects/base_contraband.yml | 247 --- Resources/Prototypes/_NF/Store/categories.yml | 67 - Resources/Prototypes/_NF/currency.yml | 4 +- Resources/Prototypes/_NF/tags.yml | 8 +- 32 files changed, 2429 insertions(+), 2623 deletions(-) create mode 100644 Resources/Locale/en-US/_Mono/store/currency.ftl rename Resources/Locale/en-US/{_NF => _Mono}/store/store.ftl (100%) delete mode 100644 Resources/Locale/en-US/_NF/store/currency.ftl delete mode 100644 Resources/Locale/en-US/_NF/store/security-uplink-catalog.ftl rename Resources/Prototypes/{_NF/Entities/Objects/Specific/pirate.yml => _Mono/Entities/Objects/Specific/Factions/pdv_uplink.yml} (79%) rename Resources/Prototypes/{_NF/Entities/Objects/Specific/security.yml => _Mono/Entities/Objects/Specific/Factions/tsf_uplink.yml} (68%) create mode 100644 Resources/Prototypes/_Mono/Store/categories.yml rename Resources/Prototypes/{_NF => _Mono}/Store/presets.yml (81%) delete mode 100644 Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml delete mode 100644 Resources/Prototypes/_NF/Entities/Objects/base_contraband.yml delete mode 100644 Resources/Prototypes/_NF/Store/categories.yml diff --git a/Resources/Locale/en-US/_Mono/store/currency.ftl b/Resources/Locale/en-US/_Mono/store/currency.ftl new file mode 100644 index 00000000000..8c50979ee44 --- /dev/null +++ b/Resources/Locale/en-US/_Mono/store/currency.ftl @@ -0,0 +1,2 @@ +store-currency-display-tsf-telecrystal = FMC +store-currency-display-pdv-telecrystal = DC diff --git a/Resources/Locale/en-US/_Mono/store/pdv-uplink-catalog.ftl b/Resources/Locale/en-US/_Mono/store/pdv-uplink-catalog.ftl index 35d775d0e8c..9132a5ebf04 100644 --- a/Resources/Locale/en-US/_Mono/store/pdv-uplink-catalog.ftl +++ b/Resources/Locale/en-US/_Mono/store/pdv-uplink-catalog.ftl @@ -1,96 +1,96 @@ # MARK: Medical -uplink-pirate-medical-bundle-name = Interdyne Medical Bundle -uplink-pirate-medical-bundle-desc = An assortment of autoinjectors and premium medical equipment to cover for every possible situation. Contains an elite compact defibrillator that can be used as a weapon. +uplink-pdv-medical-bundle-name = Interdyne Medical Bundle +uplink-pdv-medical-bundle-desc = An assortment of autoinjectors and premium medical equipment to cover for every possible situation. Contains an elite compact defibrillator that can be used as a weapon. -uplink-pirate-interdyne-defibrillator-name = Interdyne Defibrillator -uplink-pirate-interdyne-defibrillator-desc = An elite compact defibrillator that can be used as a weapon, now sold separately. Surprisingly deadly. +uplink-pdv-interdyne-defibrillator-name = Interdyne Defibrillator +uplink-pdv-interdyne-defibrillator-desc = An elite compact defibrillator that can be used as a weapon, now sold separately. Surprisingly deadly. -uplink-pirate-chemical-synthesis-kit-name = Chemical Synthesis Kit -uplink-pirate-chemical-synthesis-kit-desc = A starter kit for the aspiring chemist, includes toxin and vestine for all your criminal needs! +uplink-pdv-chemical-synthesis-kit-name = Chemical Synthesis Kit +uplink-pdv-chemical-synthesis-kit-desc = A starter kit for the aspiring chemist, includes toxin and vestine for all your criminal needs! -uplink-pirate-anti-poison-pen-name = Poison auto-injector -uplink-pirate-anti-poison-pen-desc = A rapid dose of anti-poison. Contains ultravasculine and epinephrine. +uplink-pdv-anti-poison-pen-name = Poison auto-injector +uplink-pdv-anti-poison-pen-desc = A rapid dose of anti-poison. Contains ultravasculine and epinephrine. -uplink-pirate-puncturase-pen-name = Puncturase auto-injector -uplink-pirate-puncturase-pen-desc = A rapid dose of puncturase and tranexamic acid, intended for combat applications. +uplink-pdv-puncturase-pen-name = Puncturase auto-injector +uplink-pdv-puncturase-pen-desc = A rapid dose of puncturase and tranexamic acid, intended for combat applications. -uplink-pirate-pyrazine-pen-name = Pyrzine auto-injector -uplink-pirate-pyrazine-pen-desc = A rapid dose of pyrazine and dermaline, intended for combat applications. +uplink-pdv-pyrazine-pen-name = Pyrzine auto-injector +uplink-pdv-pyrazine-pen-desc = A rapid dose of pyrazine and dermaline, intended for combat applications. -uplink-pirate-rad-pen-name = Rad auto-injector -uplink-pirate-rad-pen-desc = A rapid dose of anti-radiation. Contains arithrazine and bicaridine. +uplink-pdv-rad-pen-name = Rad auto-injector +uplink-pdv-rad-pen-desc = A rapid dose of anti-radiation. Contains arithrazine and bicaridine. -uplink-pirate-combat-medkit-name = Combat Medkit -uplink-pirate-combat-medkit-desc = A medkit containing the supplies to heal brute, bruise, and bloodloss. +uplink-pdv-combat-medkit-name = Combat Medkit +uplink-pdv-combat-medkit-desc = A medkit containing the supplies to heal brute, bruise, and bloodloss. -uplink-pirate-combat-pen-name = Combat Medipen -uplink-pirate-combat-pen-desc = A general use shot of omnizine, packaged in a autoinjector. +uplink-pdv-combat-pen-name = Combat Medipen +uplink-pdv-combat-pen-desc = A general use shot of omnizine, packaged in a autoinjector. -uplink-pirate-syringe-case-name = Medipen Case -uplink-pirate-syringe-case-desc = A pocket case filled with medipens for most combat scenarios. +uplink-pdv-syringe-case-name = Medipen Case +uplink-pdv-syringe-case-desc = A pocket case filled with medipens for most combat scenarios. -uplink-pirate-hyperzine-name = Hyperzine Injector -uplink-pirate-hyperzine-desc = Combat stimulants that prevent stuns and increase your movement capabilities. Lasts 30 seconds. +uplink-pdv-hyperzine-name = Hyperzine Injector +uplink-pdv-hyperzine-desc = Combat stimulants that prevent stuns and increase your movement capabilities. Lasts 30 seconds. -uplink-pirate-surgery-name = Surgical Kit -uplink-pirate-surgery-desc = A surgical kit containing the required minimum to save your friends or chop apart your enemy. +uplink-pdv-surgery-name = Surgical Kit +uplink-pdv-surgery-desc = A surgical kit containing the required minimum to save your friends or chop apart your enemy. -uplink-pirate-omnizine-jug-name = Omnizine Jug -uplink-pirate-omnizine-jug-desc = A jug of omnizine that can be used for making medipens and keeping your allies alive. Quietly imported from Harmony Medical Enterprises. +uplink-pdv-omnizine-jug-name = Omnizine Jug +uplink-pdv-omnizine-jug-desc = A jug of omnizine that can be used for making medipens and keeping your allies alive. Quietly imported from Harmony Medical Enterprises. -uplink-pirate-medical-assembler-name = Medical Assembler Flatpack -uplink-pirate-medical-assembler-desc = An assembler that can be used to make useful medical supplies. +uplink-pdv-medical-assembler-name = Medical Assembler Flatpack +uplink-pdv-medical-assembler-desc = An assembler that can be used to make useful medical supplies. # MARK: Utility -uplink-pirate-romerol-name = Romerol Syringe -uplink-pirate-romerol-desc = A bioweapon used in previous wars, and heavily outlawed. Its obviously taken some effort to smuggle this one. Reanimates the dead. +uplink-pdv-romerol-name = Romerol Syringe +uplink-pdv-romerol-desc = A bioweapon used in previous wars, and heavily outlawed. Its obviously taken some effort to smuggle this one. Reanimates the dead. -uplink-pirate-empty-implanter-name = Empty Implanter -uplink-pirate-empty-implanter-desc = A spare, empty implanter to remove implants with, including faction tracking implants. It does not backfire on you. +uplink-pdv-empty-implanter-name = Empty Implanter +uplink-pdv-empty-implanter-desc = A spare, empty implanter to remove implants with, including faction tracking implants. It does not backfire on you. -uplink-pirate-syndicate-magboots-name = Tactical Magboots -uplink-pirate-syndicate-magboots-desc = A pair of boots that prevent slipping and, in zero gravity, allow you to move normally, at the cost of a slight slowdown. Additionally, they have jetpack functionality and come fueled, but don't last for long. +uplink-pdv-syndicate-magboots-name = Tactical Magboots +uplink-pdv-syndicate-magboots-desc = A pair of boots that prevent slipping and, in zero gravity, allow you to move normally, at the cost of a slight slowdown. Additionally, they have jetpack functionality and come fueled, but don't last for long. -uplink-pirate-syndicate-jetpack-name = Black Jetpack -uplink-pirate-syndicate-jetpack-desc = A black jetpack. It allows you to fly around in space. Refills not included, use your fuel wisely. +uplink-pdv-syndicate-jetpack-name = Black Jetpack +uplink-pdv-syndicate-jetpack-desc = A black jetpack. It allows you to fly around in space. Refills not included, use your fuel wisely. -uplink-pirate-energy-shield-name = Energy Shield -uplink-pirate-energy-shield-desc = Exotic energy shield that reflects almost all laser beams, as well as a little protection from bullets and other physical attacks. +uplink-pdv-energy-shield-name = Energy Shield +uplink-pdv-energy-shield-desc = Exotic energy shield that reflects almost all laser beams, as well as a little protection from bullets and other physical attacks. -uplink-pirate-radio-jammer-name = Radio Jammer -uplink-pirate-radio-jammer-desc = This device will disrupt any nearby outgoing radio communication as well as suit sensors when activated. +uplink-pdv-radio-jammer-name = Radio Jammer +uplink-pdv-radio-jammer-desc = This device will disrupt any nearby outgoing radio communication as well as suit sensors when activated. -uplink-pirate-hypopen-name = Hypopen -uplink-pirate-hypopen-desc = A chemical hypospray disguised as a pen, capable of instantly injecting up to 10u of reagents. Starts empty. +uplink-pdv-hypopen-name = Hypopen +uplink-pdv-hypopen-desc = A chemical hypospray disguised as a pen, capable of instantly injecting up to 10u of reagents. Starts empty. -uplink-pirate-implanter-freelance-name = Vanguard Implanter -uplink-pirate-implanter-freelance-desc = Implants an Vanguard radio, allowing covert communication without a headset. +uplink-pdv-implanter-freelance-name = Vanguard Implanter +uplink-pdv-implanter-freelance-desc = Implants an Vanguard radio, allowing covert communication without a headset. -uplink-pirate-emag-name = Cryptographic Sequencer -uplink-pirate-emag-desc = A multipurpose hacking device that can configure the ways some machines work. +uplink-pdv-emag-name = Cryptographic Sequencer +uplink-pdv-emag-desc = A multipurpose hacking device that can configure the ways some machines work. -uplink-pirate-access-breaker-name = Authentication Disruptor -uplink-pirate-access-breaker-desc = A device that overrides the access reader on a machine or door, letting you access it freely. +uplink-pdv-access-breaker-name = Authentication Disruptor +uplink-pdv-access-breaker-desc = A device that overrides the access reader on a machine or door, letting you access it freely. -uplink-pirate-jaws-name = Advanced Jaws of Life -uplink-pirate-jaws-desc = A normal jaws-of-life illegally modified past restrictions, capable of opening doors 2x as fast as normal JOL. +uplink-pdv-jaws-name = Advanced Jaws of Life +uplink-pdv-jaws-desc = A normal jaws-of-life illegally modified past restrictions, capable of opening doors 2x as fast as normal JOL. -uplink-pirate-thruster-kit-name = Thruster Upgrade Kit -uplink-pirate-thruster-kit-desc = Contains 32 super capaciters. Perfect for upgrading eight thrusters. +uplink-pdv-thruster-kit-name = Thruster Upgrade Kit +uplink-pdv-thruster-kit-desc = Contains 32 super capaciters. Perfect for upgrading eight thrusters. -uplink-pirate-comms-computer-circuitboard-name = PDV communications computer board -uplink-pirate-comms-computer-circuitboard-desc = A computer printed circuit board for an PDV communications console. +uplink-pdv-comms-computer-circuitboard-name = PDV communications computer board +uplink-pdv-comms-computer-circuitboard-desc = A computer printed circuit board for an PDV communications console. -uplink-pirate-security-cyborg-module-name = Security Cyborg Module -uplink-pirate-security-cyborg-module-desc = A machete, an energy gun, and a stun baton, made specifically for borgs. Wait, doesn't TFSMC have the same thing? +uplink-pdv-security-cyborg-module-name = Security Cyborg Module +uplink-pdv-security-cyborg-module-desc = A machete, an energy gun, and a stun baton, made specifically for borgs. Wait, doesn't TFSMC have the same thing? -uplink-pirate-cash10000-name = 10,000 credits -uplink-pirate-cash10000-desc = That's my boy, you made my day. +uplink-pdv-cash10000-name = 10,000 credits +uplink-pdv-cash10000-desc = That's my boy, you made my day. -uplink-pirate-cash100000-name = 100,000 credits -uplink-pirate-cash100000-desc = That's my boy, you really made my day. +uplink-pdv-cash100000-name = 100,000 credits +uplink-pdv-cash100000-desc = That's my boy, you really made my day. # desc is quote uplink-syndicate-applicator-name = Advanced Nanite Applicator @@ -98,85 +98,85 @@ uplink-syndicate-applicator-desc = Advanced nanite applicator with a heavily upg # MARK: Weapons -uplink-pirate-energy-cutlass-name = Energy Cutlass -uplink-pirate-energy-cutlass-desc = An exotic energy weapon. +uplink-pdv-energy-cutlass-name = Energy Cutlass +uplink-pdv-energy-cutlass-desc = An exotic energy weapon. -uplink-pirate-energy-sword-name = Energy Sword -uplink-pirate-energy-sword-desc = Courtesy of the Gorlex Marauders. Make your mark, leave no witnesses. +uplink-pdv-energy-sword-name = Energy Sword +uplink-pdv-energy-sword-desc = Courtesy of the Gorlex Marauders. Make your mark, leave no witnesses. -uplink-pirate-python-name = Python -uplink-pirate-python-desc = A brutally simple, effective, and loud revolver. Comes loaded with .45 magnum rounds. +uplink-pdv-python-name = Python +uplink-pdv-python-desc = A brutally simple, effective, and loud revolver. Comes loaded with .45 magnum rounds. -uplink-pirate-viper-name = Viper -uplink-pirate-viper-desc = A small, easily concealable, but somewhat underpowered gun. Retrofitted with a fully automatic receiver. Uses pistol magazines (9x19mm FMJ). +uplink-pdv-viper-name = Viper +uplink-pdv-viper-desc = A small, easily concealable, but somewhat underpowered gun. Retrofitted with a fully automatic receiver. Uses pistol magazines (9x19mm FMJ). -uplink-pirate-kanabou-name = Kanabou -uplink-pirate-kanabou-desc = A weapon for those who wish to forgo subtlety. Particularly suited to oni. +uplink-pdv-kanabou-name = Kanabou +uplink-pdv-kanabou-desc = A weapon for those who wish to forgo subtlety. Particularly suited to oni. -uplink-pirate-ak-name = AKM -uplink-pirate-ak-desc = An iconic weapon of war. Uses 7.62x39mm ammo. +uplink-pdv-ak-name = AKM +uplink-pdv-ak-desc = An iconic weapon of war. Uses 7.62x39mm ammo. -uplink-pirate-laser-gun-name = Retro laser blaster -uplink-pirate-laser-gun-desc = A civilian grade weapon using light amplified by the stimulated emission of radiation. +uplink-pdv-laser-gun-name = Retro laser blaster +uplink-pdv-laser-gun-desc = A civilian grade weapon using light amplified by the stimulated emission of radiation. -uplink-pirate-c20-name = C-20r Bundle -uplink-pirate-c20-desc = A 9x19mm light SMG, packaged with a few mags. +uplink-pdv-c20-name = C-20r Bundle +uplink-pdv-c20-desc = A 9x19mm light SMG, packaged with a few mags. -uplink-pirate-atreides-name = Atreides bundle -uplink-pirate-atreides-desc = A .35 one-handed light SMG, packaged with some magazines. +uplink-pdv-atreides-name = Atreides bundle +uplink-pdv-atreides-desc = A .35 one-handed light SMG, packaged with some magazines. -uplink-pirate-bulldog-name = Bulldog Bundle -uplink-pirate-bulldog-desc = A automatic 12 gauge shotgun, packaged with a few drums. +uplink-pdv-bulldog-name = Bulldog Bundle +uplink-pdv-bulldog-desc = A automatic 12 gauge shotgun, packaged with a few drums. -uplink-pirate-vt7-name = VT7 HF Blade -uplink-pirate-vt7-desc = A high quality HF blade. +uplink-pdv-vt7-name = VT7 HF Blade +uplink-pdv-vt7-desc = A high quality HF blade. -uplink-pirate-desword-name = Double-Bladed Energy Sword -uplink-pirate-desword-desc = A two-handed variant of the Energy Sword. +uplink-pdv-desword-name = Double-Bladed Energy Sword +uplink-pdv-desword-desc = A two-handed variant of the Energy Sword. -uplink-pirate-anaconda-name = Anaconda -uplink-pirate-anaconda-desc = The pride of Cybersun engineers. A handheld, compact, self-recharging ballistic firearm. +uplink-pdv-anaconda-name = Anaconda +uplink-pdv-anaconda-desc = The pride of Cybersun engineers. A handheld, compact, self-recharging ballistic firearm. -uplink-pirate-wspr-name = WSPR -uplink-pirate-wspr-desc = A counter to the TSFMC's Annie. Uses the same 7.62x39mm ammo. +uplink-pdv-wspr-name = WSPR +uplink-pdv-wspr-desc = A counter to the TSFMC's Annie. Uses the same 7.62x39mm ammo. -uplink-pirate-burner-name = Burner Heavy Rifle -uplink-pirate-burner-desc = A destructive 12.7x99mm rifle. Supports HE ammo. Horribly destructive. +uplink-pdv-burner-name = Burner Heavy Rifle +uplink-pdv-burner-desc = A destructive 12.7x99mm rifle. Supports HE ammo. Horribly destructive. -uplink-pirate-blueprint-launcher-rocket-name = RPG-7 Blueprint -uplink-pirate-blueprint-launcher-rocket-desc = A blueprint for RPG-7 and the ammo for it. Good for long term terrorism! +uplink-pdv-blueprint-launcher-rocket-name = RPG-7 Blueprint +uplink-pdv-blueprint-launcher-rocket-desc = A blueprint for RPG-7 and the ammo for it. Good for long term terrorism! -uplink-pirate-grenade-launcher-bundle-name = China Lake Bundle -uplink-pirate-grenade-launcher-bundle-desc = PLOOP! +uplink-pdv-grenade-launcher-bundle-name = China Lake Bundle +uplink-pdv-grenade-launcher-bundle-desc = PLOOP! # MARK: Ammo -uplink-pirate-box-magazine-pistol-name = Box of pistol 9x19mm magazines -uplink-pirate-box-magazine-pistol-desc = A box filled with 4 9x19mm pistol magazines. +uplink-pdv-box-magazine-pistol-name = Box of pistol 9x19mm magazines +uplink-pdv-box-magazine-pistol-desc = A box filled with 4 9x19mm pistol magazines. -uplink-pirate-box-magazine-light-rifle-name = Box of 7.62x39mm magazines -uplink-pirate-box-magazine-light-rifle-desc = A box filled with 4 7.62x39mm magazines. +uplink-pdv-box-magazine-light-rifle-name = Box of 7.62x39mm magazines +uplink-pdv-box-magazine-light-rifle-desc = A box filled with 4 7.62x39mm magazines. -uplink-pirate-magazine-box-45_magnum-name = Box of .45 magnum speedloaders -uplink-pirate-magazine-box-45_magnum-desc = A box containing 4 .45 magnum speedloaders. +uplink-pdv-magazine-box-45_magnum-name = Box of .45 magnum speedloaders +uplink-pdv-magazine-box-45_magnum-desc = A box containing 4 .45 magnum speedloaders. -uplink-pirate-light-rifle-magazine-box-big-name = Ammunition box (7.62x39mm FMJ) -uplink-pirate-light-rifle-magazine-box-big-desc = A box containing 200 7.62x39mm catridges. +uplink-pdv-light-rifle-magazine-box-big-name = Ammunition box (7.62x39mm FMJ) +uplink-pdv-light-rifle-magazine-box-big-desc = A box containing 200 7.62x39mm catridges. -uplink-pirate-shell-box-lethal-name = Shell box (lethal) -uplink-pirate-shell-box-lethal-desc = A box containing 16, 12 gauge shotgun shells. +uplink-pdv-shell-box-lethal-name = Shell box (lethal) +uplink-pdv-shell-box-lethal-desc = A box containing 16, 12 gauge shotgun shells. -uplink-pirate-smg-ammo-box-name = Ammunition box (9x19mm FMJ) -uplink-pirate-smg-ammo-box-desc = A box containing 60 9x19mm pistol catridges. Can be used to load SMG magazines. +uplink-pdv-smg-ammo-box-name = Ammunition box (9x19mm FMJ) +uplink-pdv-smg-ammo-box-desc = A box containing 60 9x19mm pistol catridges. Can be used to load SMG magazines. -uplink-pirate-box-bulldog-ammo-name = Box of 12 gauge buckshot drums -uplink-pirate-box-bulldog-ammo-desc = A box containing 4 12 gauge buckshot shotgun drums. +uplink-pdv-box-bulldog-ammo-name = Box of 12 gauge buckshot drums +uplink-pdv-box-bulldog-ammo-desc = A box containing 4 12 gauge buckshot shotgun drums. -uplink-pirate-box-bulldog-slug-ammo-name = Box of 12 gauge slug drums -uplink-pirate-box-bulldog-slug-ammo-desc = A box containing 4 12 gauge slug shotgun drums. +uplink-pdv-box-bulldog-slug-ammo-name = Box of 12 gauge slug drums +uplink-pdv-box-bulldog-slug-ammo-desc = A box containing 4 12 gauge slug shotgun drums. -uplink-pirate-box-smg-magazine-name = Box of 9x19mm SMG magazines -uplink-pirate-box-smg-magazine-desc = A box filled with 3 9x19mm smg magazines. +uplink-pdv-box-smg-magazine-name = Box of 9x19mm SMG magazines +uplink-pdv-box-smg-magazine-desc = A box filled with 3 9x19mm smg magazines. uplink-subsonic-mag-name = 7.62x39mm subsonic rifle mag uplink-subsonic-mag-desc = Supports the WSPR. @@ -184,77 +184,77 @@ uplink-subsonic-mag-desc = Supports the WSPR. uplink-subsonic-box-name = 7.62x39mm subsonic rifle box uplink-subsonic-box-desc = A box of ammo for the WSPR. -uplink-pirate-box-highcal-name = 12.7x99mm box -uplink-pirate-box-highcal-desc = A box of general-purpose ammunition for the Burner heavy rifle. +uplink-pdv-box-highcal-name = 12.7x99mm box +uplink-pdv-box-highcal-desc = A box of general-purpose ammunition for the Burner heavy rifle. -uplink-pirate-box-highcal-he-name = HE 12.7x99mm box -uplink-pirate-box-highcal-he-desc = A box of explosive ammunition for the Burner heavy rifle. +uplink-pdv-box-highcal-he-name = HE 12.7x99mm box +uplink-pdv-box-highcal-he-desc = A box of explosive ammunition for the Burner heavy rifle. -uplink-pirate-sniper-ammo-name = 14.5x114mm box -uplink-pirate-sniper-ammo-desc = A box of high caliber sniper rounds for the Hristov. +uplink-pdv-sniper-ammo-name = 14.5x114mm box +uplink-pdv-sniper-ammo-desc = A box of high caliber sniper rounds for the Hristov. -uplink-pirate-emp-rocket-name = RPG-7 EMP Rocket -uplink-pirate-emp-rocket-desc = A rocket with vengeance against anything electrical. Disables and drains electrical items in it's radius. +uplink-pdv-emp-rocket-name = RPG-7 EMP Rocket +uplink-pdv-emp-rocket-desc = A rocket with vengeance against anything electrical. Disables and drains electrical items in it's radius. -uplink-pirate-frag-grenade-name = Frag Grenade -uplink-pirate-frag-grenade-desc = A widely destructive 40mm fragmentation grenade for the China Lake. Destroys everything a wide area. +uplink-pdv-frag-grenade-name = Frag Grenade +uplink-pdv-frag-grenade-desc = A widely destructive 40mm fragmentation grenade for the China Lake. Destroys everything a wide area. -uplink-pirate-blast-grenade-name = Blast Grenade -uplink-pirate-blast-grenade-desc = A highly lethal 40mm thermobaric grenade for the China Lake. Highly destructive in a pinpoint radius. +uplink-pdv-blast-grenade-name = Blast Grenade +uplink-pdv-blast-grenade-desc = A highly lethal 40mm thermobaric grenade for the China Lake. Highly destructive in a pinpoint radius. # MARK: Equipment -uplink-pirate-combat-hardsuit-name = SCAF Tacsuit -uplink-pirate-combat-hardsuit-desc = Basic protective gear of PDV military groups. +uplink-pdv-combat-hardsuit-name = SCAF Tacsuit +uplink-pdv-combat-hardsuit-desc = Basic protective gear of PDV military groups. -uplink-pirate-viper-group-standard-hardsuit-name = Viper Group JACKAL Hardsuit -uplink-pirate-viper-group-standard-hardsuit-desc = A heavy hardsuit adorned with signature markings of the Viper Group. The armor is remarkably flexible for its protection and has a built-in nightvision system. +uplink-pdv-viper-group-standard-hardsuit-name = Viper Group JACKAL Hardsuit +uplink-pdv-viper-group-standard-hardsuit-desc = A heavy hardsuit adorned with signature markings of the Viper Group. The armor is remarkably flexible for its protection and has a built-in nightvision system. -uplink-pirate-viper-group-medic-hardsuit-name = Viper Group IMP Hardsuit -uplink-pirate-viper-group-medic-hardsuit-desc = A light hardsuit adorned with signature markings of the Viper Group. The armor features various reinforced plating in vital areas and a medical HUD complemented by thermal pulse systems. +uplink-pdv-viper-group-medic-hardsuit-name = Viper Group IMP Hardsuit +uplink-pdv-viper-group-medic-hardsuit-desc = A light hardsuit adorned with signature markings of the Viper Group. The armor features various reinforced plating in vital areas and a medical HUD complemented by thermal pulse systems. -uplink-pirate-webvest-name = Webvest -uplink-pirate-webvest-desc = A webvest smuggled into the sector that hasn't been downgraded like ones utilized by civilian contractors. Great pierce resist, poor heat resist. +uplink-pdv-webvest-name = Webvest +uplink-pdv-webvest-desc = A webvest smuggled into the sector that hasn't been downgraded like ones utilized by civilian contractors. Great pierce resist, poor heat resist. -uplink-pirate-syndie-mask-name = Syndicate Gas Mask -uplink-pirate-syndie-mask-desc = A tactical flash resistant gas mask that can be connected to an air supply. +uplink-pdv-syndie-mask-name = Syndicate Gas Mask +uplink-pdv-syndie-mask-desc = A tactical flash resistant gas mask that can be connected to an air supply. -uplink-pirate-modsuit-name = RX-01 PDV Modsuit -uplink-pirate-modsuit-desc = An experimental modsuit prototype developed by Ullman Industries. When powered it provides enhanced agility and boosted sensors. "The original client died so uh, go nuts" - Felix Ullman +uplink-pdv-modsuit-name = RX-01 PDV Modsuit +uplink-pdv-modsuit-desc = An experimental modsuit prototype developed by Ullman Industries. When powered it provides enhanced agility and boosted sensors. "The original client died so uh, go nuts" - Felix Ullman # MARK: Explosives -uplink-pirate-flashbanggrenade-box-name = Flashbang Grenade Box -uplink-pirate-flashbanggrenade-box-desc = A box containing 4 flashbang grenades. +uplink-pdv-flashbanggrenade-box-name = Flashbang Grenade Box +uplink-pdv-flashbanggrenade-box-desc = A box containing 4 flashbang grenades. -uplink-pirate-smokegrenade-box-name = Smoke Grenade Box -uplink-pirate-smokegrenade-box-desc = A box containing 4 smoke grenades. +uplink-pdv-smokegrenade-box-name = Smoke Grenade Box +uplink-pdv-smokegrenade-box-desc = A box containing 4 smoke grenades. -uplink-pirate-c4-name = C-4 -uplink-pirate-c4-desc = Use it to breach walls, dispose of bodies, break equipment or attach it to that pet you dislike. Comes with modifiable timer with minimum of 10 second setting. +uplink-pdv-c4-name = C-4 +uplink-pdv-c4-desc = Use it to breach walls, dispose of bodies, break equipment or attach it to that pet you dislike. Comes with modifiable timer with minimum of 10 second setting. -uplink-pirate-c4-bundle-name = C-4 Bundle -uplink-pirate-c4-bundle-desc = Enough C-4 to blow your way into a vault and out through the back. +uplink-pdv-c4-bundle-name = C-4 Bundle +uplink-pdv-c4-bundle-desc = Enough C-4 to blow your way into a vault and out through the back. -uplink-pirate-empgrenade-box-name = EMP Grenade Box -uplink-pirate-empgrenade-box-desc = A box containing 4 EMP grenades. +uplink-pdv-empgrenade-box-name = EMP Grenade Box +uplink-pdv-empgrenade-box-desc = A box containing 4 EMP grenades. -uplink-pirate-incendiarygrenade-box-name = Incendiary Grenade Box -uplink-pirate-incendiarygrenade-box-desc = A box containing 4 incendiary grenades. +uplink-pdv-incendiarygrenade-box-name = Incendiary Grenade Box +uplink-pdv-incendiarygrenade-box-desc = A box containing 4 incendiary grenades. -uplink-pirate-shrapnelgrenade-box-name = Shrapnel Grenade Box -uplink-pirate-shrapnelgrenade-box-desc = A box containing 4 shrapnel grenades. +uplink-pdv-shrapnelgrenade-box-name = Shrapnel Grenade Box +uplink-pdv-shrapnelgrenade-box-desc = A box containing 4 shrapnel grenades. -uplink-pirate-explosivegrenade-box-name = Explosive Grenade Box -uplink-pirate-explosivegrenade-box-desc = A box containing 4 explosive grenades. +uplink-pdv-explosivegrenade-box-name = Explosive Grenade Box +uplink-pdv-explosivegrenade-box-desc = A box containing 4 explosive grenades. # MARK: $Gambling$ -uplink-pirate-syndisurplus-name = Surplus Crate -uplink-pirate-syndisurplus-desc = Contains a large amount of imported good from a company backing the Phaethon Dynasty. This item is non-refundable, don't argue with our lawyers. +uplink-pdv-syndisurplus-name = Surplus Crate +uplink-pdv-syndisurplus-desc = Contains a large amount of imported good from a company backing the Phaethon Dynasty. This item is non-refundable, don't argue with our lawyers. -uplink-pirate-syndisupersurplus-name = Super Surplus Crate -uplink-pirate-syndisupersurplus-desc = Contains a huge amount of imported good from a company backing the Phaethon Dynasty. This item is non-refundable, don't argue with our lawyers. +uplink-pdv-syndisupersurplus-name = Super Surplus Crate +uplink-pdv-syndisupersurplus-desc = Contains a huge amount of imported good from a company backing the Phaethon Dynasty. This item is non-refundable, don't argue with our lawyers. # Vouchers @@ -306,3 +306,14 @@ uplink-pdv-t3-kortik-voucher-desc = A small card that contains the data for the uplink-pdv-t4-saturn-voucher-name = PDV Saturn LPC [T4] uplink-pdv-t4-saturn-voucher-desc = A small card that authorizes the procurement of the Saturn. + +# Mono edit +store-category-pdvequipment = Equipment +store-category-pdvweapons = Weapons +store-category-pdvmedical = Medical +store-category-pdvutility = Utility +store-category-pdvammo = Ammunition +store-category-pdvexplosives = Explosives +store-category-pdvvouchers = Vouchers +store-category-pdvgambling = Gambling +# Mono edit end diff --git a/Resources/Locale/en-US/_NF/store/store.ftl b/Resources/Locale/en-US/_Mono/store/store.ftl similarity index 100% rename from Resources/Locale/en-US/_NF/store/store.ftl rename to Resources/Locale/en-US/_Mono/store/store.ftl diff --git a/Resources/Locale/en-US/_Mono/store/tsfmc-uplink-catalog.ftl b/Resources/Locale/en-US/_Mono/store/tsfmc-uplink-catalog.ftl index 1810a87e8d0..14438c2fc80 100644 --- a/Resources/Locale/en-US/_Mono/store/tsfmc-uplink-catalog.ftl +++ b/Resources/Locale/en-US/_Mono/store/tsfmc-uplink-catalog.ftl @@ -1,131 +1,358 @@ -uplink-security-anti-poison-pen-name = Poison auto-injector -uplink-security-anti-poison-pen-desc = A rapid dose of anti-poison. Contains ultravasculine and epinephrine. +uplink-tsf-anti-poison-pen-name = Poison auto-injector +uplink-tsf-anti-poison-pen-desc = A rapid dose of anti-poison. Contains ultravasculine and epinephrine. -uplink-security-puncturase-pen-name = Puncturase auto-injector -uplink-security-puncturase-pen-desc = A rapid dose of puncturase and tranexamic acid, intended for combat applications. +uplink-tsf-puncturase-pen-name = Puncturase auto-injector +uplink-tsf-puncturase-pen-desc = A rapid dose of puncturase and tranexamic acid, intended for combat applications. -uplink-security-pyrazine-pen-name = Pyrzine auto-injector -uplink-security-pyrazine-pen-desc = A rapid dose of pyrazine and dermaline, intended for combat applications. +uplink-tsf-pyrazine-pen-name = Pyrzine auto-injector +uplink-tsf-pyrazine-pen-desc = A rapid dose of pyrazine and dermaline, intended for combat applications. -uplink-security-rad-pen-name = Rad auto-injector -uplink-security-rad-pen-desc = A rapid dose of anti-radiation. Contains arithrazine and bicaridine. +uplink-tsf-rad-pen-name = Rad auto-injector +uplink-tsf-rad-pen-desc = A rapid dose of anti-radiation. Contains arithrazine and bicaridine. -uplink-security-combat-pen-name = Combat Medipen -uplink-security-combat-pen-desc = A general use shot of omnizine, packaged in a autoinjector. +uplink-tsf-combat-pen-name = Combat Medipen +uplink-tsf-combat-pen-desc = A general use shot of omnizine, packaged in a autoinjector. -uplink-security-syringe-case-name = Medipen Case -uplink-security-syringe-case-desc = A pocket case filled with medipens for most combat scenarios. +uplink-tsf-syringe-case-name = Medipen Case +uplink-tsf-syringe-case-desc = A pocket case filled with medipens for most combat scenarios. -uplink-security-compact-defibrillator-name = Compact Defibrillator -uplink-security-compact-defibrillator-desc = A portable defibrillator made for field revivals. +uplink-tsf-compact-defibrillator-name = Compact Defibrillator +uplink-tsf-compact-defibrillator-desc = A portable defibrillator made for field revivals. -uplink-security-cash7500-name = 7,500 Credits -uplink-security-cash7500-desc = Cold, hard cash. +uplink-tsf-cash7500-name = 7,500 Credits +uplink-tsf-cash7500-desc = Cold, hard cash. -uplink-security-thrusterkit-name = Thruster Upgrade Kit -uplink-security-thrusterkit-desc = Contains 32 super capaciters. Perfect for upgrading eight thrusters. +uplink-tsf-thrusterkit-name = Thruster Upgrade Kit +uplink-tsf-thrusterkit-desc = Contains 32 super capaciters. Perfect for upgrading eight thrusters. -uplink-security-cyborg-module-name = Security Cyborg Module -uplink-security-cyborg-module-desc = A machete, an energy gun, and a stun baton, made specifically for borgs. Wait, doesnt the Phaethon Dynasty have the same thing? +uplink-tsf-cyborg-module-name = Security Cyborg Module +uplink-tsf-cyborg-module-desc = A machete, an energy gun, and a stun baton, made specifically for borgs. Wait, doesnt the Phaethon Dynasty have the same thing? -uplink-security-eg4-name = EG-4 Energy Revolver -uplink-security-eg4-desc = A self-recharging energy weapon, capable of shooting both disabling and lethal bolts. Like a mini-energy gun. +uplink-tsf-eg4-name = EG-4 Energy Revolver +uplink-tsf-eg4-desc = A self-recharging energy weapon, capable of shooting both disabling and lethal bolts. Like a mini-energy gun. -uplink-security-annie-name = Annie -uplink-security-annie-desc = A 7.62x39mm subsonic weapon, made to shoulder the weight of impossible operations. +uplink-tsf-annie-name = Annie +uplink-tsf-annie-desc = A 7.62x39mm subsonic weapon, made to shoulder the weight of impossible operations. -uplink-security-mr8c-name = QBU-243 Xian BR -uplink-security-mr8c-desc = A semi-auto rifle firing 8x65mm SKR rounds, specially made for MARSOC usage. You're one lucky marine. +uplink-tsf-mr8c-name = QBU-243 Xian BR +uplink-tsf-mr8c-desc = A semi-auto rifle firing 8x65mm SKR rounds, specially made for MARSOC usage. You're one lucky marine. -uplink-security-mr8b-name = QJY-244 LWMMG -uplink-security-mr8b-desc = An expensive (relatively) light-weight GPMG branched off from the QBU-243. Compatible with both 8x65mm magazines and boxes. +uplink-tsf-mr8b-name = QJY-244 LWMMG +uplink-tsf-mr8b-desc = An expensive (relatively) light-weight GPMG branched off from the QBU-243. Compatible with both 8x65mm magazines and boxes. -uplink-security-8x65mm-magazine-name = 8x65mm SKR Magazine -uplink-security-8x65mm-magazine-desc = Compatible with the QBU-243 and QJY-244. Contains 25 rounds. +uplink-tsf-8x65mm-magazine-name = 8x65mm SKR Magazine +uplink-tsf-8x65mm-magazine-desc = Compatible with the QBU-243 and QJY-244. Contains 25 rounds. -uplink-security-8x65mm-boxmag-name = 8x65mm SKR Box Magazine -uplink-security-8x65mm-boxmag-desc = Compatible with the QJY-244 only. Contains 75 rounds. +uplink-tsf-8x65mm-boxmag-name = 8x65mm SKR Box Magazine +uplink-tsf-8x65mm-boxmag-desc = Compatible with the QJY-244 only. Contains 75 rounds. -uplink-security-8x65mm-box-name = 8x65mm SKR Box -uplink-security-8x65mm-box-desc = Used to refill magazines/boxes for the MQBU-243 and QJY-244. Contains 100 rounds. +uplink-tsf-8x65mm-box-name = 8x65mm SKR Box +uplink-tsf-8x65mm-box-desc = Used to refill magazines/boxes for the MQBU-243 and QJY-244. Contains 100 rounds. -uplink-security-68x52mm-magazine-name = 6.8x52mm Caseless Magazine -uplink-security-68x52mm-magazine-desc = Compatible with the Lecter. Contains 30 rounds. +uplink-tsf-68x52mm-magazine-name = 6.8x52mm Caseless Magazine +uplink-tsf-68x52mm-magazine-desc = Compatible with the Lecter. Contains 30 rounds. -uplink-security-68x52mm-box-name = 6.8x52mm Caseless Box -uplink-security-68x52mm-box-desc = Used to refill magazines for the Lecter. Contains 200 rounds. +uplink-tsf-68x52mm-box-name = 6.8x52mm Caseless Box +uplink-tsf-68x52mm-box-desc = Used to refill magazines for the Lecter. Contains 200 rounds. -uplink-security-portable-recharger-name = Portable Recharger -uplink-security-portable-recharger-desc = An experimental portable recharger equipped with an inbuilt microreactor. +uplink-tsf-portable-recharger-name = Portable Recharger +uplink-tsf-portable-recharger-desc = An experimental portable recharger equipped with an inbuilt microreactor. -uplink-security-cash75000-name = 75,000 Credits -uplink-security-cash75000-desc = Cold, hard cash, in bulk. +uplink-tsf-cash75000-name = 75,000 Credits +uplink-tsf-cash75000-desc = Cold, hard cash, in bulk. -uplink-security-surgery-duffel-name = Advanced Surgery Kit -uplink-security-surgery-duffel-desc = A duffel filled with advanced surgery tools, perfect for re-attaching some heads. +uplink-tsf-surgery-duffel-name = Advanced Surgery Kit +uplink-tsf-surgery-duffel-desc = A duffel filled with advanced surgery tools, perfect for re-attaching some heads. -uplink-security-omnizine-jug-name = Omnizine Jug -uplink-security-omnizine-jug-desc = A jug of omnizine, used for making medipens and keeping your allies up. Imported from Harmony Medical Enterprises. +uplink-tsf-omnizine-jug-name = Omnizine Jug +uplink-tsf-omnizine-jug-desc = A jug of omnizine, used for making medipens and keeping your allies up. Imported from Harmony Medical Enterprises. -uplink-security-medical-assembler-name = Medical Assembler Flatpack -uplink-security-medical-assembler-desc = An assembler that can be used to make useful medical supplies. +uplink-tsf-medical-assembler-name = Medical Assembler Flatpack +uplink-tsf-medical-assembler-desc = An assembler that can be used to make useful medical supplies. -uplink-security-hfblade-name = HF-Katana -uplink-security-hfblade-desc = A tool of justice. +uplink-tsf-hfblade-name = HF-Katana +uplink-tsf-hfblade-desc = A tool of justice. uplink-exosuit-aurora-name = M-320X AURORA uplink-exosuit-aurora-desc = A prototype exosuit for the future of warfare. Utilizes nanomachines in a basic amount to protect the wearer from vacuum, and protects very well against HF blades, while enhancing the wearers mobility. -uplink-security-ashstorm-name = EM72 Ashstorm -uplink-security-ashstorm-desc = The TSF-EM72 Ashstorm is a directed-energy light machine gun developed by Aetherion Dynamics under TSF weapons contract 934A. +uplink-tsf-ashstorm-name = EM72 Ashstorm +uplink-tsf-ashstorm-desc = The TSF-EM72 Ashstorm is a directed-energy light machine gun developed by Aetherion Dynamics under TSF weapons contract 934A. -uplink-security-smilodon-name = QBH-50-C Smilodon -uplink-security-smilodon-desc = The QBH-50-C Smilodon is a directed-energy light machine gun used by the TSF. Devastating. +uplink-tsf-smilodon-name = QBH-50-C Smilodon +uplink-tsf-smilodon-desc = The QBH-50-C Smilodon is a directed-energy light machine gun used by the TSF. Devastating. -uplink-security-t0-voucher-name = TSFMC Tier 0 Ship Voucher -uplink-security-t0-voucher-desc = A single-use voucher for any small ship. +uplink-tsf-t0-voucher-name = TSFMC Tier 0 Ship Voucher +uplink-tsf-t0-voucher-desc = A single-use voucher for any small ship. -uplink-security-t1-spica-voucher-name = TSFMC Spica LPC [T1] -uplink-security-t1-spica-voucher-desc = A small card that contains the data for the procurement of a Spica-class escort from the flagship's reserves. +uplink-tsf-t1-spica-voucher-name = TSFMC Spica LPC [T1] +uplink-tsf-t1-spica-voucher-desc = A small card that contains the data for the procurement of a Spica-class escort from the flagship's reserves. -uplink-security-t1-dagger-voucher-name = TSFMC Dagger LPC [T1] -uplink-security-t1-dagger-voucher-desc = A small card that contains the data for the procurement of a Dagger-class railgun destroyer from the flagship's reserves. +uplink-tsf-t1-dagger-voucher-name = TSFMC Dagger LPC [T1] +uplink-tsf-t1-dagger-voucher-desc = A small card that contains the data for the procurement of a Dagger-class railgun destroyer from the flagship's reserves. -uplink-security-t1-tarantula-voucher-name = TSFMC Tarantula LPC [T1] -uplink-security-t1-tarantula-voucher-desc = A small card that contains the data for the procurement of a Tarantula-class escort from the flagship's reserves. +uplink-tsf-t1-tarantula-voucher-name = TSFMC Tarantula LPC [T1] +uplink-tsf-t1-tarantula-voucher-desc = A small card that contains the data for the procurement of a Tarantula-class escort from the flagship's reserves. -uplink-security-t1-sentinel-voucher-name = TSFMC Sentinel LPC [T1] -uplink-security-t1-sentinel-voucher-desc = A small card that contains the data for the procurement of a Sentinel-class escort from the flagship's reserves. +uplink-tsf-t1-sentinel-voucher-name = TSFMC Sentinel LPC [T1] +uplink-tsf-t1-sentinel-voucher-desc = A small card that contains the data for the procurement of a Sentinel-class escort from the flagship's reserves. -uplink-security-t1-mercury-voucher-name = TSFMC Mercury LPC [T1] -uplink-security-t1-mercury-voucher-desc = A small card that contains the data for the procurement of a Mercury-class corvette from the flagship's reserves. +uplink-tsf-t1-mercury-voucher-name = TSFMC Mercury LPC [T1] +uplink-tsf-t1-mercury-voucher-desc = A small card that contains the data for the procurement of a Mercury-class corvette from the flagship's reserves. -uplink-security-t1-aldebaran-voucher-name = TSFMC Aldebaran LPC [T1] -uplink-security-t1-aldebaran-voucher-desc = A small card that contains the data for the procurement of an Aldebaran-class frigate from the flagship's reserves. +uplink-tsf-t1-aldebaran-voucher-name = TSFMC Aldebaran LPC [T1] +uplink-tsf-t1-aldebaran-voucher-desc = A small card that contains the data for the procurement of an Aldebaran-class frigate from the flagship's reserves. -uplink-security-t2-andromeda-voucher-name = TSFMC Andromeda LPC [T2] -uplink-security-t2-andromeda-voucher-desc = A small card that contains the data for the procurement of an Andromeda-class cruiser from the flagship's reserves. +uplink-tsf-t2-andromeda-voucher-name = TSFMC Andromeda LPC [T2] +uplink-tsf-t2-andromeda-voucher-desc = A small card that contains the data for the procurement of an Andromeda-class cruiser from the flagship's reserves. -uplink-security-t2-spekter-voucher-name = TSFMC Spekter LPC [T2] -uplink-security-t2-spekter-voucher-desc = A small card that contains the data for the procurement of an Spekter-class corvette from the flagship's reserves. +uplink-tsf-t2-spekter-voucher-name = TSFMC Spekter LPC [T2] +uplink-tsf-t2-spekter-voucher-desc = A small card that contains the data for the procurement of an Spekter-class corvette from the flagship's reserves. -uplink-security-t3-altair-voucher-name = TSFMC Altair LPC [T3] -uplink-security-t3-altair-voucher-desc = A small card that contains the data for the procurement of an Altair-class frigate from the flagship's reserves. +uplink-tsf-t3-altair-voucher-name = TSFMC Altair LPC [T3] +uplink-tsf-t3-altair-voucher-desc = A small card that contains the data for the procurement of an Altair-class frigate from the flagship's reserves. -uplink-security-t3-polaris-voucher-name = TSFMC Polaris LPC [T3] -uplink-security-t3-polaris-voucher-desc = A small card that contains the data for the procurement of an Type-56D Polaris-class frigate from the flagship's reserves. +uplink-tsf-t3-polaris-voucher-name = TSFMC Polaris LPC [T3] +uplink-tsf-t3-polaris-voucher-desc = A small card that contains the data for the procurement of an Type-56D Polaris-class frigate from the flagship's reserves. -uplink-security-flyssa-voucher-name = TSFMC Flyssa LPC [T4] -uplink-security-flyssa-voucher-desc = A small card that contains the data for the procurement of a Flyssa-class destroyer from the flagship's reserves. +uplink-tsf-flyssa-voucher-name = TSFMC Flyssa LPC [T4] +uplink-tsf-flyssa-voucher-desc = A small card that contains the data for the procurement of a Flyssa-class destroyer from the flagship's reserves. -uplink-security-sentry-mk290-name = MK-290 Deployable Sentry System -uplink-security-sentry-mk290-desc = A multipurpose portable sentry, capable of feeding from 5.56x45mm, 6.8x52mm, and 7.62x39mm magazines. Requires a screwdriver to disassemble once placed. +uplink-tsf-sentry-mk290-name = MK-290 Deployable Sentry System +uplink-tsf-sentry-mk290-desc = A multipurpose portable sentry, capable of feeding from 5.56x45mm, 6.8x52mm, and 7.62x39mm magazines. Requires a screwdriver to disassemble once placed. -uplink-security-hardsuit-m82b-name = M82b Hardsuit -uplink-security-hardsuit-m82b-desc = A variant of the M-82c for NBC protection, usually utilized by corpsmen. +uplink-tsf-hardsuit-m82b-name = M82b Hardsuit +uplink-tsf-hardsuit-m82b-desc = A variant of the M-82c for NBC protection, usually utilized by corpsmen. -uplink-security-hardsuit-m82c-name = M82c Hardsuit -uplink-security-hardsuit-m82c-desc = A basic protective system for dangerous environments (such as space). Takes the role of an armor vest in the average TSF marine's gear. +uplink-tsf-hardsuit-m82c-name = M82c Hardsuit +uplink-tsf-hardsuit-m82c-desc = A basic protective system for dangerous environments (such as space). Takes the role of an armor vest in the average TSF marine's gear. -uplink-security-pulserifle-name = Pulse Rifle -uplink-security-pulserifle-desc = A large, automatic pulse weapon. Larger cell, and high powered, perfect for chewing through groups of foes. +uplink-tsf-pulserifle-name = Pulse Rifle +uplink-tsf-pulserifle-desc = A large, automatic pulse weapon. Larger cell, and high powered, perfect for chewing through groups of foes. + +#store categories +store-category-tsfhardsuits = EVA Suits +store-category-tsfweapons = Weapons +store-category-tsfutility = Utility +store-category-tsfammo = Ammunition +store-category-tsfexplosives = Explosives +store-category-tsfbundles = Bundles +store-category-tsfvouchers = Vouchers + +uplink-tsf-hardsuit-name = Private M73 Tacsuit +uplink-tsf-hardsuit-desc = The standard-issue TSFMC space proof suit for patrol duty. This bronze variant has private rank markings. + +uplink-tsf-hardsuit-patrol-name = Corporal M73 Tacsuit +uplink-tsf-hardsuit-patrol-desc = The standard-issue TSFMC space proof suit for patrol duty. This silver variant has corporal rank markings. + +uplink-tsf-hardsuit-brigmedic-name = Corpsman M73 Tacsuit +uplink-tsf-hardsuit-brigmedic-desc = The standard-issue TSFMC space proof suit for patrol duty. This brighter variant has corpsman rank markings. + +uplink-tsf-hardsuit-warden-name = Captain M73 Tacsuit +uplink-tsf-hardsuit-warden-desc = The standard-issue TSFMC space proof suit for patrol duty. This gold variant has captain rank markings. + +uplink-tsf-hardsuit-experimental-name = M92-X Tacsuit +uplink-tsf-hardsuit-experimental-desc = A very heavily armored TSFMC suit. This space proof marvel of engineering uses state of the art alloys to provide immense protection while sacrificing little mobility. + +uplink-tsf-hardsuit-sheriff-name = M92 Tacsuit +uplink-tsf-hardsuit-sheriff-desc = The standard-issue TSFMC space proof suit for patrol duty. This gold variant has colonel rank markings. + +uplink-tsf-hardsuit-combat-name = M93 Tacsuit +uplink-tsf-hardsuit-combat-desc = A heavily armored TSFMC suit. Space proof, with thick armor plating at the expense of mobility. + +uplink-tsf-hardsuit-command-name = M93-C Tacsuit +uplink-tsf-hardsuit-command-desc = A heavily armored TSFMC suit. Space proof, with thick armor plating at the expense of mobility. This variant has supervisor rank markings. + +uplink-tsf-lethalarmory-name = Lethal Armory Stock Crate +uplink-tsf-lethalarmory-desc = A crate containing weapons necessary to fill an armory. + +uplink-tsf-nonlethalarmory-name = Non-lethal Armory Stock Crate +uplink-tsf-nonlethalarmory-desc = A crate containing non-lethal weapons necessary to fill an armory. + +uplink-tsf-mk58-name = MK58 +uplink-tsf-mk58-desc = Cheap, standard issue sidearm. Uses .45 ACP. + +uplink-tsf-disabler-name = Disabler +uplink-tsf-disabler-desc = Standard issue non-lethal stun gun. Has an internal battery, but requires using a security charging dock. + +uplink-tsf-stunbaton-name = Stun Baton +uplink-tsf-stunbaton-desc = Standard issue non-lethal stun baton. Has an internal battery, but requires using a security charging dock. + +uplink-tsf-emitter-name = EMP Emitter +uplink-tsf-emitter-desc = A high-energy pulse emitter tuned to disrupt electronics and power systems. Harmless to living things. Projectiles pass through glass. Has an internal battery, but requires using a security charging dock. + +uplink-tsf-enforcer-name = Enforcer +uplink-tsf-enforcer-desc = An updated model of the Kammerer, boasts a 7 shell magazine. Uses 12 gauge shotgun shells. + +uplink-tsf-lecter-name = Lecter +uplink-tsf-lecter-desc = Standard issue fully automatic rifle. Uses 6.8x52mm Caseless. + +uplink-tsf-vulcan-name = Vulcan +uplink-tsf-vulcan-desc = Heavy duty, select fire battle rifle. Uses 7.62x51mm. + +uplink-tsf-lasercarbine-name = Laser Rifle +uplink-tsf-lasercarbine-desc = Standard issue laser carbine. Has an internal battery, but requires using a security charging dock. Fires through glass. + +uplink-tsf-disablersmg-name = Disabler SMG +uplink-tsf-disablersmg-desc = Fully automatic, rapid fire disabler. Tuned to the same frequency as standard disablers, the ultimate less-lethal instrument. Has an internal battery, but requires using a security charging dock. + +uplink-tsf-energysword-name = Energy Sword +uplink-tsf-energysword-desc = Reverse-engineered, NT manufactured energy sword. Chance to reflect projectiles. + +uplink-tsf-wt550-name = WT550 +uplink-tsf-wt550-desc = A fully automatic submachine gun. This design uses special top-mounted magazines, allowing for simpler and faster operation in the field. Uses 4.6x30mm. + +uplink-tsf-energygun-name = Energy Gun +uplink-tsf-energygun-desc = A semi-automatic energy gun capable of firing both non-lethal stun bolts, as well as overcharged lethal energy bolts. Has an internal battery, but requires using a security charging dock. + +uplink-tsf-emprpg-name = RPG-7 +uplink-tsf-emprpg-desc = A rocket propelled grenade launcher. Comes with 1 EMP round. + +uplink-tsf-empgrenade-name = EMP Grenade +uplink-tsf-empgrenade-desc = A handheld grenade that emits a high energy pulse that disrupts electronics and power systems in a moderately large radius. + +uplink-tsf-forcefield-name = Tactical Forcefield Projector +uplink-tsf-forcefield-desc = A battery powered forcefield projector offering an advanced forcefield that blocks movement and bullets while allowing lasers to pass through. + +uplink-tsf-holo-name = Holobarrier +uplink-tsf-holo-desc = A battery powered holoprojecter that places temporary barriers to bar movement. + +uplink-tsf-jetpack-name = Jetpack +uplink-tsf-jetpack-desc = A pre-filled jetpack for EVA. Comes in a fashionable green. + +uplink-tsf-magboots-name = TSFMC Magboots +uplink-tsf-magboots-desc = Light weight magboots designed to keep the wearer grounded in low and no gravity environments. + +uplink-tsf-techfab-name = TSFMC Techfab +uplink-tsf-techfab-desc = A circuit board for a TSFMC Techfab. Allows the production of ammunition, magazines, weapons, and numerous other utilities. Uses raw resources. Can be upgraded. + +uplink-tsf-key-name = TSFMC Encryption Keys +uplink-tsf-key-desc = A box of 4 encryption keys that give access to the TSFMC radio channel. + +uplink-tsf-emprocket-name = EMP Rocket +uplink-tsf-emprocket-desc = An EMP rocket for the RPG-7. + +uplink-tsf-Magazine9x19mmPistolFMJ-name = 9x19mm Pistol Magazines +uplink-tsf-Magazine9x19mmPistolFMJ-desc = A box containing 4 filled 9x19mm magazines. + +uplink-tsf-Magazine9x19mmPistolFMJ-rubber-name = 9x19mm Pistol Rubber Magazines +uplink-tsf-Magazine9x19mmPistolFMJ-rubber-desc = A box containing 4 filled 9x19mm (rubber) magazines. + +uplink-tsf-5-56x45mmMagazine-name = 5.56x45mm Magazines +uplink-tsf-5-56x45mmMagazine-desc = A box containing 4 filled 5.56x45mm magazines. + +uplink-tsf-5-56x45mmMagazine-rubber-name = 5.56x45mm Rubber Magazines +uplink-tsf-5-56x45mmMagazine-rubber-desc = A box containing 4 filled 5.56x45mm (rubber) magazines. + +uplink-tsf-7-62x39mmMagazine-name = 7.62x39mm Magazines +uplink-tsf-7-62x39mmMagazine-desc = A box containing 4 filled 7.62x39mm magazines. + +uplink-tsf-7-62x39mmMagazine-rubber-name = 7.62x39mm Rubber Magazines +uplink-tsf-7-62x39mmMagazine-rubber-desc = a Box containing 4 filled 7.62x39mm (rubber) magazines. + +uplink-tsf-7-62x51mmMagazine-name = 7.62x51mm Magazines +uplink-tsf-7-62x51mmMagazine-desc = A box containing 4 filled 7.62x51mm magazines. + +uplink-tsf-7-62x51mmMagazine-rubber-name = 7.62x51mm Rubber Magazines +uplink-tsf-7-62x51mmMagazine-rubber-desc = a Box containing 4 filled 7.62x51mm (rubber) magazines. + +uplink-tsf-wt550magazine-name = 4.6x30mm Top-mounted Magazines +uplink-tsf-wt550magazine-desc = A box containing 4 filled 4.6x30mm top-mounted magazines. + +uplink-tsf-hypo-name = Hypospray +uplink-tsf-hypo-desc = A sterile medical injector for instant delivery of medications. + +uplink-tsf-ambuzol-name = Ambuzol Syringe +uplink-tsf-ambuzol-desc = 15u of anti-viral medication to halt the progress of the highly contagious zombie virus. + +uplink-tsf-medkit-name = Combat Medkit +uplink-tsf-medkit-desc = A kit containing advanced medical supplies suitable for use in the field. + +uplink-tsf-inspector-name = Inspector +uplink-tsf-inspector-desc = Standard issue revolver. Cheaply mass produced and found in all corners of the known universe. Uses .45 magnum. + +uplink-tsf-mateba-name = Mateba +uplink-tsf-mateba-desc = The Mateba Autorevolver's unique barrel alignment and recoil driven cylinder and hammer allow for unparalleled fire rate and accuracy. + +uplink-tsf-truncheon-name = Truncheon +uplink-tsf-truncheon-desc = Standard issue blunt object. Excellent for cracking windows and skulls alike. + +uplink-tsf-armingsword-name = Plasteel Arming Sword +uplink-tsf-armingsword-desc = Ancient design meets modern materials. + +uplink-tsf-captainsword-name = Captain's Sabre +uplink-tsf-captainsword-desc = A sword normally reserved for captains, admiralty, and other high command. Has a small chance to reflect incoming projectiles. + +uplink-tsf-navyofficersword-name = Navy Officer Sabre +uplink-tsf-navyofficersword-desc = A sword normally reserved for navy officers, admiralty, and other high command of the solarian naval forces. Has a small chance to reflect incoming projectiles. + +uplink-tsf-pulsepistol-name = Pulse Pistol +uplink-tsf-pulsepistol-desc = A high powered laser pistol normally reserved for elite ERT units. Has an internal battery, but requires using a security charging dock. + +uplink-tsf-pulsecarbine-name = Pulse Carbine +uplink-tsf-pulsecarbine-desc = A high powered laser carbine normally reserved for elite ERT and combat units. Has an internal battery, but requires using a security charging dock. + +uplink-tsf-hammer-name = Breaching Hammer +uplink-tsf-hammer-desc = A large, two-handed hammer that is perfect for breaking down doors, or breaching through hull plating. + +uplink-tsf-teleshield-name = Telescopic Shield +uplink-tsf-teleshield-desc = An expandable handheld shield offering excellent protection. + +uplink-tsf-energyshield-name = Energy Shield +uplink-tsf-energyshield-desc = An exotic energy shield that blocks most incoming damage. + +uplink-tsf-swat-name = Swat Gas Mask +uplink-tsf-swat-desc = A full-face covering version of the standard issue TSFMC Gas Mask. + +uplink-tsf-speedloader-name = .45 Magnum Speed Loader +uplink-tsf-speedloader-desc = A revolver speed loader that comes pre-loaded with .45 magnum cartridges. + +uplink-tsf-speedloaderrubber-name = .45 magnum Rubber Speed Loader +uplink-tsf-speedloaderrubber-desc = A revolver speed loader that comes pre-loaded with .45 rubber cartridges. + +uplink-tsf-shotlethal-name = Lethal Shotgun Shells +uplink-tsf-shotlethal-desc = A box of lethal 12 gauge buckshot shotgun shells. + +uplink-tsf-shotbeanbag-name = Beanbag Shotgun Shells +uplink-tsf-shotbeanbag-desc = A box of non-lethal 12 gauge beanbag shotgun shells. + +uplink-tsf-shotincend-name = Incendiary Shotgun Shells +uplink-tsf-shotincend-desc = A box of lethal 12 gauge incendiary shotgun shells. + +uplink-tsf-shotslug-name = Lethal Shotgun Slug Shells +uplink-tsf-shotslug-desc = A box of lethal 12 gauge slug shotgun shells. + +uplink-tsf-empgrenade-box-name = EMP Grenade Box +uplink-tsf-empgrenade-box-desc = A box containing 4 EMP grenades. +uplink-tsf-explosivegrenade-box-name = Explosive Grenade Box +uplink-tsf-explosivegrenade-box-desc = A box containing 4 explosive grenades. +uplink-tsf-incendiarygrenade-box-name = Incendiary Grenade Box +uplink-tsf-incendiarygrenade-box-desc = A box containing 4 incendiary grenades. +uplink-tsf-shrapnelgrenade-box-name = Shrapnel Grenade Box +uplink-tsf-shrapnelgrenade-box-desc = A box containing 4 shrapnel grenades. +uplink-tsf-smokegrenade-box-name = Smoke Grenade Box +uplink-tsf-smokegrenade-box-desc = A box containing 4 smoke grenades. +uplink-tsf-teargasgrenade-box-name = Tear Gas Grenade Box +uplink-tsf-teargasgrenade-box-desc = A box containing 4 tear gas grenades. +uplink-tsf-flashbanggrenade-box-name = Flashbang Grenade Box +uplink-tsf-flashbanggrenade-box-desc = A box containing 4 flasbang grenades. +uplink-tsf-stingergrenade-box-name = Stinger Grenade Box +uplink-tsf-stingergrenade-box-desc = A box containing 4 stinger grenades. +uplink-tsf-breachingcharge-box-name = Breaching Charge Box +uplink-tsf-breachingcharge-box-desc = A box containing 4 breaching charges. +uplink-tsf-hoverbike-name = TSFMC Hoverbike Flatpack +uplink-tsf-hoverbike-desc = Flatpack containing TSFMC issued turbine with bike handles. Keys already slotted in the ignition. Very safe. +uplink-tsf-trackingdart-bundle-name = Tracking Dart Bundle +uplink-tsf-trackingdart-bundle-desc = A bundle containing a Lake type launcher, 3 tracking darts and 3 pinpointers. +uplink-tsf-emp-bundle-name = EMP Bundle +uplink-tsf-emp-bundle-desc = A bundle containing a Lake type launcher and 12 EMP grenades. +uplink-tsf-emp-ammo-name = EMP Projectile Ammo +uplink-tsf-emp-ammo-desc = A box containing 4 EMP projectile grenades. +uplink-tsf-trackingdart-ammo-name = Tracking Darts Ammo +uplink-tsf-trackingdart-ammo-desc = A box containing 3 tracking darts and 3 pinpointers. +uplink-tsf-spaceblade-sec-name = Security SpaceBlade +uplink-tsf-spaceblade-sec-desc = The latest in stun tech. +uplink-tsf-contraband-forensics-module-name = Contraband Forenics Module +uplink-tsf-contraband-forensics-module-desc = A program for scanning and reporting contraband dead drops and pods for bounties. Slots into a forensic scanner. +uplink-tsf-mechpulserifle-name = CL-94 Pulse Emitter +uplink-tsf-mechpulserifle-desc = A mech-mounted Pulse Rifle. diff --git a/Resources/Locale/en-US/_NF/store/currency.ftl b/Resources/Locale/en-US/_NF/store/currency.ftl deleted file mode 100644 index bf5f4797d86..00000000000 --- a/Resources/Locale/en-US/_NF/store/currency.ftl +++ /dev/null @@ -1,2 +0,0 @@ -store-currency-display-security-telecrystal = FMC -store-currency-display-pirate-telecrystal = DC diff --git a/Resources/Locale/en-US/_NF/store/pirate-uplink-catalog.ftl b/Resources/Locale/en-US/_NF/store/pirate-uplink-catalog.ftl index 915560962a3..cb38652a868 100644 --- a/Resources/Locale/en-US/_NF/store/pirate-uplink-catalog.ftl +++ b/Resources/Locale/en-US/_NF/store/pirate-uplink-catalog.ftl @@ -1,63 +1,52 @@ -# Mono edit -store-category-pirateequipment = Equipment -store-category-pirateweapons = Weapons -store-category-piratemedical = Medical -store-category-pirateutility = Utility -store-category-pirateammo = Ammunition -store-category-pirateexplosives = Explosives -store-category-pdvvouchers = Vouchers -store-category-pirategambling = Gambling -# Mono edit end - -uplink-pirate-hardsuit-name = PDV Hardsuit -uplink-pirate-hardsuit-desc = A heavy space suit that provides some basic protection from the cold harsh realities of deep space. -uplink-pirate-hardsuit-captain-name = PDV Commander's Hardsuit -uplink-pirate-hardsuit-captain-desc = An ancient armored hardsuit, perfect for defending against space scurvy and toolbox-wielding scallywags. -uplink-pirate-hardsuit-elite-name = Elite PDV Operatives Hardsuit -uplink-pirate-hardsuit-elite-desc = An ancient elite armored hardsuit, designed by an unknown bearded man and built like a brick house. -uplink-pirate-crate-captain-name = PDV Commander's Cache -uplink-pirate-crate-captain-desc = A chest filled with the necessary goodies for a pirate captain. -uplink-pirate-crate-name = PDV Cache -uplink-pirate-crate-desc = A chest filled with the necessary goodies for the Dynasty. -uplink-pirate-magboots-name = PDV Magboots -uplink-pirate-magboots-desc = PDV magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. -uplink-pirate-hoverbike-name = Pirate Hoverbike Flatpack -uplink-pirate-hoverbike-desc = A flatpack containing the grand pirate mobile. The keys are already in the ignition, we don't need no damn safety around here. -uplink-pirate-blunderbuss-name = Blunderbuss -uplink-pirate-blunderbuss-desc = Deadly at close range, an illegal shotgun often found at the side of a pirate. -uplink-pirate-revolver-name = Suave Revolver -uplink-pirate-revolver-desc = An odd, illegal, old-looking revolver, favoured by imperial forces. Uses .45 magnum ammo. -uplink-pirate-cannon-name = Handheld Cannon -uplink-pirate-cannon-desc = Kaboom! -uplink-pirate-cannonball-name = Cannonball Chest -uplink-pirate-cannonball-desc = A chest full of balls made to be shot from a cannon. -uplink-pirate-cannonball-emp-name = Shockshot Chest -uplink-pirate-cannonball-emp-desc = A chest full of charged balls that cause an EMP on impact. -uplink-pirate-grapeshot-name = Grapeshot Chest -uplink-pirate-grapeshot-desc = A chest full of cluster balls made to shoot a wide spread of small projectiles. -uplink-pirate-glassshot-name = Glassshot Chest -uplink-pirate-glassshot-desc = A chest full of brittle glass balls that will fire multiple projectiles in a tight spread. -uplink-pirate-satchel-name = Pirate Satchel -uplink-pirate-satchel-desc = An inconspicuous satchel filled with pirate goodies. -uplink-pirate-flintlock-name = Flintlock Pistol -uplink-pirate-flintlock-desc = A pirate captain's companion. Yarrr! Uses 14.5x114mm ammo, somehow. -uplink-pirate-shotgunammo-name = Blunderbuss Shell Box -uplink-pirate-shotgunammo-desc = A box of 12 gauge shotgun shells, used in the blunderbuss. -uplink-pirate-revolverammo-name = Pirate Revolver Ammo Box -uplink-pirate-revolverammo-desc = A box of .45 magnum rounds, used in the pirate revolver. -uplink-pirate-flintlockammo-name = Flintlock Pistol Ammo Box -uplink-pirate-flintlockammo-desc = A box of 14.5x114mm rounds, used in the flintlock pistol. -uplink-pirate-ecutlass-name = Energy Cutlass -uplink-pirate-ecutlass-desc = An energy cutlass! -uplink-pirate-anchor-name = Anchor -uplink-pirate-anchor-desc = A large, heavy anchor to beat down anyone and anything standing between you and your plunder. -uplink-pirate-redgrenade-name = Improvised Red Grenade -uplink-pirate-redgrenade-desc = A grenade that's hot to the touch; prone to catch things on fire. -uplink-pirate-greengrenade-name = Improvised Green Grenade -uplink-pirate-greengrenade-desc = A foul-smelling grenade that makes you feel fuzzy. -uplink-pirate-graygrenade-name = Improvised Gray Grenade -uplink-pirate-graygrenade-desc = A solid grenade that feels like a cannonball. -uplink-pirate-accessconfigurator-captain-name = Black Market Access Configurator -uplink-pirate-accessconfigurator-captain-desc = An access Configurator only sold on the Colossus sector market. Lock TSF contraband behind PDV access, today! -uplink-pirate-radio-implanter-name = Radio Implanter -uplink-pirate-radio-implanter-desc = Implants a PDV Vanguard radio, allowing covert communication without a headset. +uplink-pdv-hardsuit-name = PDV Hardsuit +uplink-pdv-hardsuit-desc = A heavy space suit that provides some basic protection from the cold harsh realities of deep space. +uplink-pdv-hardsuit-captain-name = PDV Commander's Hardsuit +uplink-pdv-hardsuit-captain-desc = An ancient armored hardsuit, perfect for defending against space scurvy and toolbox-wielding scallywags. +uplink-pdv-hardsuit-elite-name = Elite PDV Operatives Hardsuit +uplink-pdv-hardsuit-elite-desc = An ancient elite armored hardsuit, designed by an unknown bearded man and built like a brick house. +uplink-pdv-crate-captain-name = PDV Commander's Cache +uplink-pdv-crate-captain-desc = A chest filled with the necessary goodies for a pirate captain. +uplink-pdv-crate-name = PDV Cache +uplink-pdv-crate-desc = A chest filled with the necessary goodies for the Dynasty. +uplink-pdv-magboots-name = PDV Magboots +uplink-pdv-magboots-desc = PDV magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. +uplink-pdv-hoverbike-name = Pirate Hoverbike Flatpack +uplink-pdv-hoverbike-desc = A flatpack containing the grand pirate mobile. The keys are already in the ignition, we don't need no damn safety around here. +uplink-pdv-blunderbuss-name = Blunderbuss +uplink-pdv-blunderbuss-desc = Deadly at close range, an illegal shotgun often found at the side of a pirate. +uplink-pdv-revolver-name = Suave Revolver +uplink-pdv-revolver-desc = An odd, illegal, old-looking revolver, favoured by imperial forces. Uses .45 magnum ammo. +uplink-pdv-cannon-name = Handheld Cannon +uplink-pdv-cannon-desc = Kaboom! +uplink-pdv-cannonball-name = Cannonball Chest +uplink-pdv-cannonball-desc = A chest full of balls made to be shot from a cannon. +uplink-pdv-cannonball-emp-name = Shockshot Chest +uplink-pdv-cannonball-emp-desc = A chest full of charged balls that cause an EMP on impact. +uplink-pdv-grapeshot-name = Grapeshot Chest +uplink-pdv-grapeshot-desc = A chest full of cluster balls made to shoot a wide spread of small projectiles. +uplink-pdv-glassshot-name = Glassshot Chest +uplink-pdv-glassshot-desc = A chest full of brittle glass balls that will fire multiple projectiles in a tight spread. +uplink-pdv-satchel-name = Pirate Satchel +uplink-pdv-satchel-desc = An inconspicuous satchel filled with pirate goodies. +uplink-pdv-flintlock-name = Flintlock Pistol +uplink-pdv-flintlock-desc = A pirate captain's companion. Yarrr! Uses 14.5x114mm ammo, somehow. +uplink-pdv-shotgunammo-name = Blunderbuss Shell Box +uplink-pdv-shotgunammo-desc = A box of 12 gauge shotgun shells, used in the blunderbuss. +uplink-pdv-revolverammo-name = Pirate Revolver Ammo Box +uplink-pdv-revolverammo-desc = A box of .45 magnum rounds, used in the pirate revolver. +uplink-pdv-flintlockammo-name = Flintlock Pistol Ammo Box +uplink-pdv-flintlockammo-desc = A box of 14.5x114mm rounds, used in the flintlock pistol. +uplink-pdv-ecutlass-name = Energy Cutlass +uplink-pdv-ecutlass-desc = An energy cutlass! +uplink-pdv-anchor-name = Anchor +uplink-pdv-anchor-desc = A large, heavy anchor to beat down anyone and anything standing between you and your plunder. +uplink-pdv-redgrenade-name = Improvised Red Grenade +uplink-pdv-redgrenade-desc = A grenade that's hot to the touch; prone to catch things on fire. +uplink-pdv-greengrenade-name = Improvised Green Grenade +uplink-pdv-greengrenade-desc = A foul-smelling grenade that makes you feel fuzzy. +uplink-pdv-graygrenade-name = Improvised Gray Grenade +uplink-pdv-graygrenade-desc = A solid grenade that feels like a cannonball. +uplink-pdv-accessconfigurator-captain-name = Black Market Access Configurator +uplink-pdv-accessconfigurator-captain-desc = An access Configurator only sold on the Colossus sector market. Lock TSF contraband behind PDV access, today! +uplink-pdv-radio-implanter-name = Radio Implanter +uplink-pdv-radio-implanter-desc = Implants a PDV Vanguard radio, allowing covert communication without a headset. diff --git a/Resources/Locale/en-US/_NF/store/security-uplink-catalog.ftl b/Resources/Locale/en-US/_NF/store/security-uplink-catalog.ftl deleted file mode 100644 index e6af06c3081..00000000000 --- a/Resources/Locale/en-US/_NF/store/security-uplink-catalog.ftl +++ /dev/null @@ -1,164 +0,0 @@ -store-category-sechardsuits = EVA Suits -store-category-secweapons = Weapons -store-category-secutility = Utility -store-category-secammo = Ammunition -store-category-secexplosives = Explosives -store-category-secbundles = Bundles -store-category-secvouchers = Vouchers - -uplink-security-hardsuit-name = Private M73 Tacsuit -uplink-security-hardsuit-desc = The standard-issue TSFMC space proof suit for patrol duty. This bronze variant has private rank markings. -uplink-security-hardsuit-patrol-name = Corporal M73 Tacsuit -uplink-security-hardsuit-patrol-desc = The standard-issue TSFMC space proof suit for patrol duty. This silver variant has corporal rank markings. -uplink-security-hardsuit-brigmedic-name = Corpsman M73 Tacsuit -uplink-security-hardsuit-brigmedic-desc = The standard-issue TSFMC space proof suit for patrol duty. This brighter variant has corpsman rank markings. -uplink-security-hardsuit-warden-name = Captain M73 Tacsuit -uplink-security-hardsuit-warden-desc = The standard-issue TSFMC space proof suit for patrol duty. This gold variant has captain rank markings. -uplink-security-hardsuit-experimental-name = M92-X Tacsuit -uplink-security-hardsuit-experimental-desc = A very heavily armored TSFMC suit. This space proof marvel of engineering uses state of the art alloys to provide immense protection while sacrificing little mobility. -uplink-security-hardsuit-sheriff-name = M92 Tacsuit -uplink-security-hardsuit-sheriff-desc = The standard-issue TSFMC space proof suit for patrol duty. This gold variant has colonel rank markings. -uplink-security-hardsuit-combat-name = M93 Tacsuit -uplink-security-hardsuit-combat-desc = A heavily armored TSFMC suit. Space proof, with thick armor plating at the expense of mobility. -uplink-security-hardsuit-command-name = M93-C Tacsuit -uplink-security-hardsuit-command-desc = A heavily armored TSFMC suit. Space proof, with thick armor plating at the expense of mobility. This variant has supervisor rank markings. -uplink-security-lethalarmory-name = Lethal Armory Stock Crate -uplink-security-lethalarmory-desc = A crate containing weapons necessary to fill an armory. -uplink-security-nonlethalarmory-name = Non-lethal Armory Stock Crate -uplink-security-nonlethalarmory-desc = A crate containing non-lethal weapons necessary to fill an armory. -uplink-security-mk58-name = MK58 -uplink-security-mk58-desc = Cheap, standard issue sidearm. Uses .45 ACP. -uplink-security-disabler-name = Disabler -uplink-security-disabler-desc = Standard issue non-lethal stun gun. Has an internal battery, but requires using a security charging dock. -uplink-security-stunbaton-name = Stun Baton -uplink-security-stunbaton-desc = Standard issue non-lethal stun baton. Has an internal battery, but requires using a security charging dock. -uplink-security-emitter-name = EMP Emitter -uplink-security-emitter-desc = A high-energy pulse emitter tuned to disrupt electronics and power systems. Harmless to living things. Projectiles pass through glass. Has an internal battery, but requires using a security charging dock. -uplink-security-enforcer-name = Enforcer -uplink-security-enforcer-desc = An updated model of the Kammerer, boasts a 7 shell magazine. Uses 12 gauge shotgun shells. -uplink-security-lecter-name = Lecter -uplink-security-lecter-desc = Standard issue fully automatic rifle. Uses 6.8x52mm Caseless. -uplink-security-vulcan-name = Vulcan -uplink-security-vulcan-desc = Heavy duty, select fire battle rifle. Uses 7.62x51mm. -uplink-security-lasercarbine-name = Laser Rifle -uplink-security-lasercarbine-desc = Standard issue laser carbine. Has an internal battery, but requires using a security charging dock. Fires through glass. -uplink-security-disablersmg-name = Disabler SMG -uplink-security-disablersmg-desc = Fully automatic, rapid fire disabler. Tuned to the same frequency as standard disablers, the ultimate less-lethal instrument. Has an internal battery, but requires using a security charging dock. -uplink-security-energysword-name = Energy Sword -uplink-security-energysword-desc = Reverse-engineered, NT manufactured energy sword. Chance to reflect projectiles. -uplink-security-wt550-name = WT550 -uplink-security-wt550-desc = A fully automatic submachine gun. This design uses special top-mounted magazines, allowing for simpler and faster operation in the field. Uses 4.6x30mm. -uplink-security-energygun-name = Energy Gun -uplink-security-energygun-desc = A semi-automatic energy gun capable of firing both non-lethal stun bolts, as well as overcharged lethal energy bolts. Has an internal battery, but requires using a security charging dock. -uplink-security-emprpg-name = RPG-7 -uplink-security-emprpg-desc = A rocket propelled grenade launcher. Comes with 1 EMP round. -uplink-security-empgrenade-name = EMP Grenade -uplink-security-empgrenade-desc = A handheld grenade that emits a high energy pulse that disrupts electronics and power systems in a moderately large radius. -uplink-security-forcefield-name = Tactical Forcefield Projector -uplink-security-forcefield-desc = A battery powered forcefield projector offering an advanced forcefield that blocks movement and bullets while allowing lasers to pass through. -uplink-security-holo-name = Holobarrier -uplink-security-holo-desc = A battery powered holoprojecter that places temporary barriers to bar movement. -uplink-security-jetpack-name = Jetpack -uplink-security-jetpack-desc = A pre-filled jetpack for EVA. Comes in a fashionable green. -uplink-security-magboots-name = TSFMC Magboots -uplink-security-magboots-desc = Light weight magboots designed to keep the wearer grounded in low and no gravity environments. -uplink-security-techfab-name = TSFMC Techfab -uplink-security-techfab-desc = A circuit board for a TSFMC Techfab. Allows the production of ammunition, magazines, weapons, and numerous other utilities. Uses raw resources. Can be upgraded. -uplink-security-key-name = TSFMC Encryption Keys -uplink-security-key-desc = A box of 4 encryption keys that give access to the TSFMC radio channel. -uplink-security-emprocket-name = EMP Rocket -uplink-security-emprocket-desc = An EMP rocket for the RPG-7. -uplink-security-Magazine9x19mmPistolFMJ-name = 9x19mm Pistol Magazines -uplink-security-Magazine9x19mmPistolFMJ-desc = A box containing 4 filled 9x19mm magazines. -uplink-security-Magazine9x19mmPistolFMJ-rubber-name = 9x19mm Pistol Rubber Magazines -uplink-security-Magazine9x19mmPistolFMJ-rubber-desc = A box containing 4 filled 9x19mm (rubber) magazines. -uplink-security-5-56x45mmMagazine-name = 5.56x45mm Magazines -uplink-security-5-56x45mmMagazine-desc = A box containing 4 filled 5.56x45mm magazines. -uplink-security-5-56x45mmMagazine-rubber-name = 5.56x45mm Rubber Magazines -uplink-security-5-56x45mmMagazine-rubber-desc = A box containing 4 filled 5.56x45mm (rubber) magazines. -uplink-security-7-62x39mmMagazine-name = 7.62x39mm Magazines -uplink-security-7-62x39mmMagazine-desc = A box containing 4 filled 7.62x39mm magazines. -uplink-security-7-62x39mmMagazine-rubber-name = 7.62x39mm Rubber Magazines -uplink-security-7-62x39mmMagazine-rubber-desc = a Box containing 4 filled 7.62x39mm (rubber) magazines. -uplink-security-7-62x51mmMagazine-name = 7.62x51mm Magazines -uplink-security-7-62x51mmMagazine-desc = A box containing 4 filled 7.62x51mm magazines. -uplink-security-7-62x51mmMagazine-rubber-name = 7.62x51mm Rubber Magazines -uplink-security-7-62x51mmMagazine-rubber-desc = a Box containing 4 filled 7.62x51mm (rubber) magazines. -uplink-security-wt550magazine-name = 4.6x30mm Top-mounted Magazines -uplink-security-wt550magazine-desc = A box containing 4 filled 4.6x30mm top-mounted magazines. -uplink-security-hypo-name = Hypospray -uplink-security-hypo-desc = A sterile medical injector for instant delivery of medications. -uplink-security-ambuzol-name = Ambuzol Syringe -uplink-security-ambuzol-desc = 15u of anti-viral medication to halt the progress of the highly contagious zombie virus. -uplink-security-medkit-name = Combat Medkit -uplink-security-medkit-desc = A kit containing advanced medical supplies suitable for use in the field. -uplink-security-inspector-name = Inspector -uplink-security-inspector-desc = Standard issue revolver. Cheaply mass produced and found in all corners of the known universe. Uses .45 magnum. -uplink-security-mateba-name = Mateba -uplink-security-mateba-desc = The Mateba Autorevolver's unique barrel alignment and recoil driven cylinder and hammer allow for unparalleled fire rate and accuracy. -uplink-security-truncheon-name = Truncheon -uplink-security-truncheon-desc = Standard issue blunt object. Excellent for cracking windows and skulls alike. -uplink-security-armingsword-name = Plasteel Arming Sword -uplink-security-armingsword-desc = Ancient design meets modern materials. -uplink-security-captainsword-name = Captain's Sabre -uplink-security-captainsword-desc = A sword normally reserved for captains, admiralty, and other high command. Has a small chance to reflect incoming projectiles. -uplink-security-navyofficersword-name = Navy Officer Sabre -uplink-security-navyofficersword-desc = A sword normally reserved for navy officers, admiralty, and other high command of the solarian naval forces. Has a small chance to reflect incoming projectiles. -uplink-security-pulsepistol-name = Pulse Pistol -uplink-security-pulsepistol-desc = A high powered laser pistol normally reserved for elite ERT units. Has an internal battery, but requires using a security charging dock. -uplink-security-pulsecarbine-name = Pulse Carbine -uplink-security-pulsecarbine-desc = A high powered laser carbine normally reserved for elite ERT and combat units. Has an internal battery, but requires using a security charging dock. -uplink-security-hammer-name = Breaching Hammer -uplink-security-hammer-desc = A large, two-handed hammer that is perfect for breaking down doors, or breaching through hull plating. -uplink-security-teleshield-name = Telescopic Shield -uplink-security-teleshield-desc = An expandable handheld shield offering excellent protection. -uplink-security-energyshield-name = Energy Shield -uplink-security-energyshield-desc = An exotic energy shield that blocks most incoming damage. -uplink-security-swat-name = Swat Gas Mask -uplink-security-swat-desc = A full-face covering version of the standard issue TSFMC Gas Mask. -uplink-security-speedloader-name = .45 Magnum Speed Loader -uplink-security-speedloader-desc = A revolver speed loader that comes pre-loaded with .45 magnum cartridges. -uplink-security-speedloaderrubber-name = .45 magnum Rubber Speed Loader -uplink-security-speedloaderrubber-desc = A revolver speed loader that comes pre-loaded with .45 rubber cartridges. -uplink-security-shotlethal-name = Lethal Shotgun Shells -uplink-security-shotlethal-desc = A box of lethal 12 gauge buckshot shotgun shells. -uplink-security-shotbeanbag-name = Beanbag Shotgun Shells -uplink-security-shotbeanbag-desc = A box of non-lethal 12 gauge beanbag shotgun shells. -uplink-security-shotincend-name = Incendiary Shotgun Shells -uplink-security-shotincend-desc = A box of lethal 12 gauge incendiary shotgun shells. -uplink-security-shotslug-name = Lethal Shotgun Slug Shells -uplink-security-shotslug-desc = A box of lethal 12 gauge slug shotgun shells. -uplink-security-empgrenade-box-name = EMP Grenade Box -uplink-security-empgrenade-box-desc = A box containing 4 EMP grenades. -uplink-security-explosivegrenade-box-name = Explosive Grenade Box -uplink-security-explosivegrenade-box-desc = A box containing 4 explosive grenades. -uplink-security-incendiarygrenade-box-name = Incendiary Grenade Box -uplink-security-incendiarygrenade-box-desc = A box containing 4 incendiary grenades. -uplink-security-shrapnelgrenade-box-name = Shrapnel Grenade Box -uplink-security-shrapnelgrenade-box-desc = A box containing 4 shrapnel grenades. -uplink-security-smokegrenade-box-name = Smoke Grenade Box -uplink-security-smokegrenade-box-desc = A box containing 4 smoke grenades. -uplink-security-teargasgrenade-box-name = Tear Gas Grenade Box -uplink-security-teargasgrenade-box-desc = A box containing 4 tear gas grenades. -uplink-security-flashbanggrenade-box-name = Flashbang Grenade Box -uplink-security-flashbanggrenade-box-desc = A box containing 4 flasbang grenades. -uplink-security-stingergrenade-box-name = Stinger Grenade Box -uplink-security-stingergrenade-box-desc = A box containing 4 stinger grenades. -uplink-security-breachingcharge-box-name = Breaching Charge Box -uplink-security-breachingcharge-box-desc = A box containing 4 breaching charges. -uplink-security-hoverbike-name = TSFMC Hoverbike Flatpack -uplink-security-hoverbike-desc = Flatpack containing TSFMC issued turbine with bike handles. Keys already slotted in the ignition. Very safe. -uplink-security-trackingdart-bundle-name = Tracking Dart Bundle -uplink-security-trackingdart-bundle-desc = A bundle containing a Lake type launcher, 3 tracking darts and 3 pinpointers. -uplink-security-emp-bundle-name = EMP Bundle -uplink-security-emp-bundle-desc = A bundle containing a Lake type launcher and 12 EMP grenades. -uplink-security-emp-ammo-name = EMP Projectile Ammo -uplink-security-emp-ammo-desc = A box containing 4 EMP projectile grenades. -uplink-security-trackingdart-ammo-name = Tracking Darts Ammo -uplink-security-trackingdart-ammo-desc = A box containing 3 tracking darts and 3 pinpointers. -uplink-security-spaceblade-sec-name = Security SpaceBlade -uplink-security-spaceblade-sec-desc = The latest in stun tech. -uplink-security-contraband-forensics-module-name = Contraband Forenics Module -uplink-security-contraband-forensics-module-desc = A program for scanning and reporting contraband dead drops and pods for bounties. Slots into a forensic scanner. -uplink-security-mechpulserifle-name = CL-94 Pulse Emitter -uplink-security-mechpulserifle-desc = A mech-mounted Pulse Rifle. diff --git a/Resources/Maps/_Mono/Test/dev_map.yml b/Resources/Maps/_Mono/Test/dev_map.yml index f6a3389b2b6..b00f1d79d3b 100644 --- a/Resources/Maps/_Mono/Test/dev_map.yml +++ b/Resources/Maps/_Mono/Test/dev_map.yml @@ -949,14 +949,14 @@ entities: - type: Transform pos: -6.5,5.5 parent: 2 -- proto: BasePirateUplinkRadioDebug +- proto: BasePDVUplinkRadioDebug entities: - uid: 88 components: - type: Transform pos: 1.2513101,7.779885 parent: 2 -- proto: BaseSecurityUplinkRadioDebug +- proto: BaseTSFUplinkRadioDebug entities: - uid: 89 components: diff --git a/Resources/Prototypes/_Mono/Catalogs/pdv_uplink_catalog.yml b/Resources/Prototypes/_Mono/Catalogs/pdv_uplink_catalog.yml index 24f9b411132..576aa29d95d 100644 --- a/Resources/Prototypes/_Mono/Catalogs/pdv_uplink_catalog.yml +++ b/Resources/Prototypes/_Mono/Catalogs/pdv_uplink_catalog.yml @@ -1,8 +1,8 @@ #MARK: Medical - type: listing id: UplinkPirateMedicalBundle - name: uplink-pirate-medical-bundle-name - description: uplink-pirate-medical-bundle-desc + name: uplink-pdv-medical-bundle-name + description: uplink-pdv-medical-bundle-desc productEntity: ClothingBackpackDuffelSyndicateMedicalBundleFilled cost: Doubloon: 150 @@ -12,12 +12,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateInterdyneDefibrillator - name: uplink-pirate-interdyne-defibrillator-name - description: uplink-pirate-interdyne-defibrillator-desc + name: uplink-pdv-interdyne-defibrillator-name + description: uplink-pdv-interdyne-defibrillator-desc productEntity: DefibrillatorSyndicate cost: Doubloon: 50 @@ -27,12 +27,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateChemicalSynthesisKit - name: uplink-pirate-chemical-synthesis-kit-name - description: uplink-pirate-chemical-synthesis-kit-desc + name: uplink-pdv-chemical-synthesis-kit-name + description: uplink-pdv-chemical-synthesis-kit-desc icon: { sprite: /Textures/Objects/Storage/boxicons.rsi, state: vials } productEntity: ChemicalSynthesisKit cost: @@ -43,12 +43,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateCombatMedkit - name: uplink-pirate-combat-medkit-name - description: uplink-pirate-combat-medkit-desc + name: uplink-pdv-combat-medkit-name + description: uplink-pdv-combat-medkit-desc productEntity: MedkitCombatFilled icon: { sprite: Objects/Specific/Medical/firstaidkits.rsi, state: blackkit } cost: @@ -59,12 +59,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateSyringeCaseFilled - name: uplink-pirate-syringe-case-name - description: uplink-pirate-syringe-case-desc + name: uplink-pdv-syringe-case-name + description: uplink-pdv-syringe-case-desc productEntity: SyringeCaseAltFilled cost: Doubloon: 50 @@ -74,12 +74,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateOmnizineJug - name: uplink-pirate-omnizine-jug-name - description: uplink-pirate-omnizine-jug-desc + name: uplink-pdv-omnizine-jug-name + description: uplink-pdv-omnizine-jug-desc productEntity: JugOmnizine cost: Doubloon: 65 @@ -89,12 +89,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateMedicalAssembler - name: uplink-pirate-medical-assembler-name - description: uplink-pirate-medical-assembler-desc + name: uplink-pdv-medical-assembler-name + description: uplink-pdv-medical-assembler-desc productEntity: MedicalAssemblerFlatpack cost: Doubloon: 6 @@ -104,12 +104,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink #- type: listing # id: UplinkPirateCombatPen -# name: uplink-pirate-combat-pen-name -# description: uplink-pirate-combat-pen-desc +# name: uplink-pdv-combat-pen-name +# description: uplink-pdv-combat-pen-desc # productEntity: CombatMedipen # icon: { sprite: Objects/Specific/Medical/medipen.rsi, state: morphen } # cost: @@ -120,12 +120,12 @@ # - !type:StoreWhitelistCondition # whitelist: # tags: -# - PirateUplink +# - PDVUplink #- type: listing # id: UplinkPirateAntiPoisonPen -# name: uplink-pirate-anti-poison-pen-name -# description: uplink-pirate-anti-poison-pen-desc +# name: uplink-pdv-anti-poison-pen-name +# description: uplink-pdv-anti-poison-pen-desc # productEntity: AntiPoisonMedipen # icon: { sprite: Objects/Specific/Medical/medipen.rsi, state: penacid } # cost: @@ -136,12 +136,12 @@ # - !type:StoreWhitelistCondition # whitelist: # tags: -# - PirateUplink +# - PDVUplink #- type: listing # id: UplinkPiratePuncturasePen -# name: uplink-pirate-puncturase-pen-name -# description: uplink-pirate-puncturase-pen-desc +# name: uplink-pdv-puncturase-pen-name +# description: uplink-pdv-puncturase-pen-desc # productEntity: PunctAutoInjector # icon: { sprite: Objects/Specific/Medical/medipen.rsi, state: punctpen } # cost: @@ -152,12 +152,12 @@ # - !type:StoreWhitelistCondition # whitelist: # tags: -# - PirateUplink +# - PDVUplink #- type: listing # id: UplinkPiratePyrazinePen -# name: uplink-pirate-pyrazine-pen-name -# description: uplink-pirate-pyrazine-pen-desc +# name: uplink-pdv-pyrazine-pen-name +# description: uplink-pdv-pyrazine-pen-desc # productEntity: PyraAutoInjector # icon: { sprite: Objects/Specific/Medical/medipen.rsi, state: pyrapen } # cost: @@ -168,12 +168,12 @@ # - !type:StoreWhitelistCondition # whitelist: # tags: -# - PirateUplink +# - PDVUplink #- type: listing # id: UplinkPirateRadPen -# name: uplink-pirate-rad-pen-name -# description: uplink-pirate-rad-pen-desc +# name: uplink-pdv-rad-pen-name +# description: uplink-pdv-rad-pen-desc # productEntity: RadAutoInjector # icon: { sprite: Objects/Specific/Medical/medipen.rsi, state: arithpen } # cost: @@ -184,12 +184,12 @@ # - !type:StoreWhitelistCondition # whitelist: # tags: -# - PirateUplink +# - PDVUplink #- type: listing # id: UplinkPirateHyperzine -# name: uplink-pirate-hyperzine-name -# description: uplink-pirate-hyperzine-desc +# name: uplink-pdv-hyperzine-name +# description: uplink-pdv-hyperzine-desc # productEntity: Stimpack # icon: { sprite: Objects/Specific/Medical/medipen.rsi, state: stimpen } # cost: @@ -200,12 +200,12 @@ # - !type:StoreWhitelistCondition # whitelist: # tags: -# - PirateUplink +# - PDVUplink - type: listing id: UplinkPirateSurgery - name: uplink-pirate-surgery-name - description: uplink-pirate-surgery-desc + name: uplink-pdv-surgery-name + description: uplink-pdv-surgery-desc productEntity: ClothingBackpackDuffelSyndicateFilledMedical icon: { sprite: Objects/Specific/Medical/Surgery/saw.rsi, state: advanced } cost: @@ -216,14 +216,14 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink #MARK: Utility - type: listing id: UplinkPirateImplanterEmpty - name: uplink-pirate-empty-implanter-name - description: uplink-pirate-empty-implanter-desc + name: uplink-pdv-empty-implanter-name + description: uplink-pdv-empty-implanter-desc productEntity: Implanter cost: Doubloon: 1 @@ -233,12 +233,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateRogueCommsComputerCircuitboard - name: uplink-pirate-comms-computer-circuitboard-name - description: uplink-pirate-comms-computer-circuitboard-desc + name: uplink-pdv-comms-computer-circuitboard-name + description: uplink-pdv-comms-computer-circuitboard-desc icon: { sprite: _Mono/Objects/Misc/module.rsi, state: cpu_rogue } productEntity: RogueCommsComputerCircuitboard cost: @@ -249,15 +249,15 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - !type:BuyerJobCondition whitelist: - PDVGrandVizier - type: listing id: UplinkPirateSyndicateMagboots - name: uplink-pirate-syndicate-magboots-name - description: uplink-pirate-syndicate-magboots-desc + name: uplink-pdv-syndicate-magboots-name + description: uplink-pdv-syndicate-magboots-desc productEntity: ClothingShoesBootsMagAshen cost: Doubloon: 5 @@ -267,12 +267,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateSyndicateJetpack - name: uplink-pirate-syndicate-jetpack-name - description: uplink-pirate-syndicate-jetpack-desc + name: uplink-pdv-syndicate-jetpack-name + description: uplink-pdv-syndicate-jetpack-desc productEntity: JetpackBlackFilled cost: Doubloon: 5 @@ -282,12 +282,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateHoverbikeFlatpack - name: uplink-pirate-hoverbike-name - description: uplink-pirate-hoverbike-desc + name: uplink-pdv-hoverbike-name + description: uplink-pdv-hoverbike-desc productEntity: HoverbikePirateFlatpack icon: { sprite: _NF/Objects/Vehicles/hoverbike.rsi, state: vehicle } cost: @@ -298,12 +298,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateEnergyShield - name: uplink-pirate-energy-shield-name - description: uplink-pirate-energy-shield-desc + name: uplink-pdv-energy-shield-name + description: uplink-pdv-energy-shield-desc icon: { sprite: /Textures/Objects/Weapons/Melee/e_shield.rsi, state: eshield-on } productEntity: EnergyShield cost: @@ -314,12 +314,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateThrusterKit - name: uplink-pirate-thruster-kit-name - description: uplink-pirate-thruster-kit-desc + name: uplink-pdv-thruster-kit-name + description: uplink-pdv-thruster-kit-desc icon: { sprite: Objects/Storage/boxes.rsi, state: box} productEntity: BoxT3SuperCapacitor cost: @@ -330,12 +330,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateRadioJammer - name: uplink-pirate-radio-jammer-name - description: uplink-pirate-radio-jammer-desc + name: uplink-pdv-radio-jammer-name + description: uplink-pdv-radio-jammer-desc productEntity: RadioJammer cost: Doubloon: 10 @@ -345,12 +345,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateHypopen - name: uplink-pirate-hypopen-name - description: uplink-pirate-hypopen-desc + name: uplink-pdv-hypopen-name + description: uplink-pdv-hypopen-desc productEntity: HypopenBox icon: { sprite: Objects/Misc/pens.rsi, state: pen } cost: @@ -361,12 +361,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateEmag - name: uplink-pirate-emag-name - description: uplink-pirate-emag-desc + name: uplink-pdv-emag-name + description: uplink-pdv-emag-desc productEntity: Emag icon: { sprite: Objects/Tools/emag.rsi, state: icon } cost: @@ -377,12 +377,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateAccessBreaker - name: uplink-pirate-access-breaker-name - description: uplink-pirate-access-breaker-desc + name: uplink-pdv-access-breaker-name + description: uplink-pdv-access-breaker-desc productEntity: AccessBreaker icon: { sprite: Objects/Tools/access_breaker.rsi, state: icon } cost: @@ -393,12 +393,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateJaws - name: uplink-pirate-jaws-name - description: uplink-pirate-jaws-desc + name: uplink-pdv-jaws-name + description: uplink-pdv-jaws-desc productEntity: SyndicateJawsOfLife icon: { sprite: Objects/Tools/jaws_of_life.rsi, state: syn_jaws_pry } cost: @@ -409,12 +409,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateImplanterFreelance - name: uplink-pirate-implanter-freelance-name - description: uplink-pirate-implanter-freelance-desc + name: uplink-pdv-implanter-freelance-name + description: uplink-pdv-implanter-freelance-desc icon: { sprite: Objects/Devices/encryption_keys.rsi, state: pirate_label } productEntity: RadioImplanterFreelance cost: @@ -425,12 +425,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateSecurityCyborgModule - name: uplink-pirate-security-cyborg-module-name - description: uplink-pirate-security-cyborg-module-desc + name: uplink-pdv-security-cyborg-module-name + description: uplink-pdv-security-cyborg-module-desc icon: { sprite: Interface/Actions/actions_borg.rsi, state: syndicate-weapon-module } productEntity: BorgModuleSecurity cost: @@ -441,12 +441,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateCash10000 - name: uplink-pirate-cash10000-name - description: uplink-pirate-cash10000-desc + name: uplink-pdv-cash10000-name + description: uplink-pdv-cash10000-desc productEntity: SpaceCash10000 icon: { sprite: Objects/Economy/cash.rsi, state: cash_1000000 } cost: @@ -457,12 +457,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateCash100000 - name: uplink-pirate-cash100000-name - description: uplink-pirate-cash100000-desc + name: uplink-pdv-cash100000-name + description: uplink-pdv-cash100000-desc productEntity: SpaceCash100000 icon: { sprite: _NF/Objects/Economy/cash.rsi, state: cash_100000 } cost: @@ -473,7 +473,7 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateSyndicateApplicator @@ -488,14 +488,14 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink #MARK: Ammunition #TODO: Make boxes of ammo similar to TSFMC - type: listing id: UplinkPirateShotgunDrum - name: uplink-pirate-box-bulldog-ammo-name - description: uplink-pirate-box-bulldog-ammo-desc + name: uplink-pdv-box-bulldog-ammo-name + description: uplink-pdv-box-bulldog-ammo-desc productEntity: BoxMagazine12_gauge cost: Doubloon: 5 @@ -505,12 +505,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateShotgunDrumSlug - name: uplink-pirate-box-bulldog-slug-ammo-name - description: uplink-pirate-box-bulldog-slug-ammo-desc + name: uplink-pdv-box-bulldog-slug-ammo-name + description: uplink-pdv-box-bulldog-slug-ammo-desc productEntity: BoxMagazine12_gaugeSlug cost: Doubloon: 5 @@ -520,12 +520,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateSMGMag - name: uplink-pirate-box-smg-magazine-name - description: uplink-pirate-box-smg-magazine-desc + name: uplink-pdv-box-smg-magazine-name + description: uplink-pdv-box-smg-magazine-desc productEntity: BoxMagazine9x19mmSubMachineGunFMJ cost: Doubloon: 5 @@ -535,12 +535,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateShellBoxLethal - name: uplink-pirate-shell-box-lethal-name - description: uplink-pirate-shell-box-lethal-desc + name: uplink-pdv-shell-box-lethal-name + description: uplink-pdv-shell-box-lethal-desc productEntity: AmmoBox12_gaugeBuckshot icon: { sprite: _Mono/Objects/Weapons/Guns/Ammunition/Boxes/12_gauge.rsi, state: lethal } cost: @@ -551,12 +551,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirate762x39mmAmmoBoxBig - name: uplink-pirate-light-rifle-magazine-box-big-name - description: uplink-pirate-light-rifle-magazine-box-big-desc + name: uplink-pdv-light-rifle-magazine-box-big-name + description: uplink-pdv-light-rifle-magazine-box-big-desc productEntity: AmmoBox762x39mmBigFMJ cost: Doubloon: 10 @@ -566,12 +566,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateAmmoBox45_magnum - name: uplink-pirate-magazine-box-45_magnum-name - description: uplink-pirate-magazine-box-45_magnum-desc + name: uplink-pdv-magazine-box-45_magnum-name + description: uplink-pdv-magazine-box-45_magnum-desc productEntity: BoxMagazine45_magnumFMJ cost: Doubloon: 5 @@ -581,12 +581,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateBoxMagazine762x39mmFMJ - name: uplink-pirate-box-magazine-light-rifle-name - description: uplink-pirate-box-magazine-light-rifle-desc + name: uplink-pdv-box-magazine-light-rifle-name + description: uplink-pdv-box-magazine-light-rifle-desc productEntity: BoxMagazine762x39mmFMJ cost: Doubloon: 5 @@ -596,7 +596,7 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateMagazineSubsonic @@ -611,7 +611,7 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateBoxSubsonic @@ -626,12 +626,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateBoxMagazine9x19mmFMJ - name: uplink-pirate-box-magazine-pistol-name - description: uplink-pirate-box-magazine-pistol-desc + name: uplink-pdv-box-magazine-pistol-name + description: uplink-pdv-box-magazine-pistol-desc productEntity: BoxMagazine9x19mmFMJ cost: Doubloon: 5 @@ -641,12 +641,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateBurnerBox - name: uplink-pirate-box-highcal-name - description: uplink-pirate-box-highcal-desc + name: uplink-pdv-box-highcal-name + description: uplink-pdv-box-highcal-desc productEntity: AmmoBox127x99mm cost: Doubloon: 15 @@ -656,12 +656,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateBurnerBoxHE - name: uplink-pirate-box-highcal-he-name - description: uplink-pirate-box-highcal-he-desc + name: uplink-pdv-box-highcal-he-name + description: uplink-pdv-box-highcal-he-desc productEntity: AmmoBox127x99mmExplosive cost: Doubloon: 30 @@ -671,12 +671,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink #- type: listing # id: UplinkPirateEmpRocket -# name: uplink-pirate-emp-rocket-name -# description: uplink-pirate-emp-rocket-desc +# name: uplink-pdv-emp-rocket-name +# description: uplink-pdv-emp-rocket-desc # productEntity: CartridgeRocketEmp # cost: # Doubloon: 10 @@ -686,12 +686,12 @@ # - !type:StoreWhitelistCondition # whitelist: # tags: -# - PirateUplink +# - PDVUplink - type: listing id: UplinkPirateSniperAmmo - name: uplink-pirate-sniper-ammo-name - description: uplink-pirate-sniper-ammo-desc + name: uplink-pdv-sniper-ammo-name + description: uplink-pdv-sniper-ammo-desc productEntity: AmmoBox145x114mm cost: Doubloon: 12 # Mono @@ -701,12 +701,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateFragGrenade - name: uplink-pirate-frag-grenade-name - description: uplink-pirate-frag-grenade-desc + name: uplink-pdv-frag-grenade-name + description: uplink-pdv-frag-grenade-desc productEntity: 40mmGrenadeFragmentation cost: Doubloon: 16 @@ -716,12 +716,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateBlastGrenade - name: uplink-pirate-blast-grenade-name - description: uplink-pirate-blast-grenade-desc + name: uplink-pdv-blast-grenade-name + description: uplink-pdv-blast-grenade-desc productEntity: 40mmGrenadeThermobaric cost: Doubloon: 32 @@ -731,14 +731,14 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink #MARK: Weapons - type: listing id: UplinkPirateEnergyCutlass - name: uplink-pirate-energy-cutlass-name - description: uplink-pirate-energy-cutlass-desc + name: uplink-pdv-energy-cutlass-name + description: uplink-pdv-energy-cutlass-desc productEntity: EnergyCutlass cost: Doubloon: 15 @@ -748,12 +748,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateEnergySword - name: uplink-pirate-energy-sword-name - description: uplink-pirate-energy-sword-desc + name: uplink-pdv-energy-sword-name + description: uplink-pdv-energy-sword-desc productEntity: EnergySword cost: Doubloon: 30 @@ -763,12 +763,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateVT7 - name: uplink-pirate-vt7-name - description: uplink-pirate-vt7-desc + name: uplink-pdv-vt7-name + description: uplink-pdv-vt7-desc productEntity: WeaponVT7 icon: { sprite: _Mono/Objects/Weapons/Melee/murasama.rsi, state: icon } cost: @@ -779,12 +779,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateC20 - name: uplink-pirate-c20-name - description: uplink-pirate-c20-desc + name: uplink-pdv-c20-name + description: uplink-pdv-c20-desc productEntity: ClothingBackpackDuffelSyndicateFilledSMG icon: { sprite: Objects/Weapons/Guns/SMGs/c20r.rsi, state: icon } cost: @@ -795,12 +795,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateAtreides - name: uplink-pirate-atreides-name - description: uplink-pirate-atreides-desc + name: uplink-pdv-atreides-name + description: uplink-pdv-atreides-desc productEntity: ClothingBackpackDuffelSyndicateFilledAtreides icon: { sprite: Objects/Weapons/Guns/SMGs/atreides.rsi, state: icon } cost: @@ -811,12 +811,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateBulldog - name: uplink-pirate-bulldog-name - description: uplink-pirate-bulldog-desc + name: uplink-pdv-bulldog-name + description: uplink-pdv-bulldog-desc productEntity: ClothingBackpackDuffelSyndicateFilledShotgun icon: { sprite: Objects/Weapons/Guns/Shotguns/bulldog.rsi, state: icon } cost: @@ -827,12 +827,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPiratePython - name: uplink-pirate-python-name - description: uplink-pirate-python-desc + name: uplink-pdv-python-name + description: uplink-pdv-python-desc productEntity: WeaponRevolverPython icon: { sprite: Objects/Weapons/Guns/Revolvers/python.rsi, state: icon } cost: @@ -843,12 +843,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateViper - name: uplink-pirate-viper-name - description: uplink-pirate-viper-desc + name: uplink-pdv-viper-name + description: uplink-pdv-viper-desc productEntity: WeaponPistolViper icon: { sprite: Objects/Weapons/Guns/Pistols/viper.rsi, state: icon } cost: @@ -859,12 +859,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateKanabou - name: uplink-pirate-kanabou-name - description: uplink-pirate-kanabou-desc + name: uplink-pdv-kanabou-name + description: uplink-pdv-kanabou-desc productEntity: Kanabou cost: Doubloon: 20 @@ -874,12 +874,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateAk - name: uplink-pirate-ak-name - description: uplink-pirate-ak-desc + name: uplink-pdv-ak-name + description: uplink-pdv-ak-desc productEntity: WeaponRifleAk icon: { sprite: Objects/Weapons/Guns/Rifles/ak.rsi, state: icon } cost: @@ -890,12 +890,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateBurner - name: uplink-pirate-burner-name - description: uplink-pirate-burner-desc + name: uplink-pdv-burner-name + description: uplink-pdv-burner-desc productEntity: ClothingBackpackDuffelSyndicateBurner icon: { sprite: _Goobstation/Objects/Weapons/Guns/Rifles/burner.rsi, state: icon } cost: @@ -906,12 +906,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateAnaconda - name: uplink-pirate-anaconda-name - description: uplink-pirate-anaconda-desc + name: uplink-pdv-anaconda-name + description: uplink-pdv-anaconda-desc productEntity: WeaponPistolAnaconda icon: { sprite: _Goobstation/Objects/Weapons/Guns/Pistols/anaconda.rsi, state: icon } cost: @@ -922,12 +922,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateWspr - name: uplink-pirate-wspr-name - description: uplink-pirate-wspr-desc + name: uplink-pdv-wspr-name + description: uplink-pdv-wspr-desc productEntity: ClothingBackpackDuffelSyndicateFilledWSPR icon: { sprite: _Goobstation/Objects/Weapons/Guns/Rifles/wspr.rsi, state: icon } cost: @@ -938,12 +938,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateLaserGun - name: uplink-pirate-laser-gun-name - description: uplink-pirate-laser-gun-desc + name: uplink-pdv-laser-gun-name + description: uplink-pdv-laser-gun-desc productEntity: WeaponLaserGun icon: { sprite: Objects/Weapons/Guns/Battery/laser_retro.rsi, state: icon } cost: @@ -954,12 +954,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink #- type: listing # id: UplinkPirateBlueprintLauncherRocket -# name: uplink-pirate-blueprint-launcher-rocket-name -# description: uplink-pirate-blueprint-launcher-rocket-desc +# name: uplink-pdv-blueprint-launcher-rocket-name +# description: uplink-pdv-blueprint-launcher-rocket-desc # productEntity: BlueprintLauncherRocket # cost: # Doubloon: 150 @@ -969,12 +969,12 @@ # - !type:StoreWhitelistCondition # whitelist: # tags: -# - PirateUplink +# - PDVUplink - type: listing id: UplinkPirateGrenadeLauncherBundle - name: uplink-pirate-grenade-launcher-bundle-name - description: uplink-pirate-grenade-launcher-bundle-desc + name: uplink-pdv-grenade-launcher-bundle-name + description: uplink-pdv-grenade-launcher-bundle-desc productEntity: ClothingBackpackDuffelSyndicateFilledGrenadeLauncher icon: { sprite: /Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi, state: icon } cost: @@ -985,7 +985,7 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateL6SawBundle @@ -1001,12 +1001,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateDesword - name: uplink-pirate-desword-name - description: uplink-pirate-desword-desc + name: uplink-pdv-desword-name + description: uplink-pdv-desword-desc productEntity: EnergySwordDouble icon: { sprite: Objects/Weapons/Melee/e_sword_double.rsi, state: icon } cost: @@ -1017,7 +1017,7 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - !type:BuyerJobCondition whitelist: - PDVDenasvar @@ -1028,8 +1028,8 @@ - type: listing id: UplinkPirateCombatHardsuit - name: uplink-pirate-combat-hardsuit-name - description: uplink-pirate-combat-hardsuit-desc + name: uplink-pdv-combat-hardsuit-name + description: uplink-pdv-combat-hardsuit-desc productEntity: ClothingOuterHardsuitPirateScaf icon: { sprite: _Mono/Clothing/OuterClothing/Hardsuits/scaf_pirate.rsi, state: icon } cost: @@ -1040,12 +1040,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateWebVest - name: uplink-pirate-webvest-name - description: uplink-pirate-webvest-desc + name: uplink-pdv-webvest-name + description: uplink-pdv-webvest-desc productEntity: ClothingOuterVestWeb icon: { sprite: Clothing/OuterClothing/Vests/webvest.rsi, state: icon } cost: @@ -1056,12 +1056,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateSyndieMask - name: uplink-pirate-syndie-mask-name - description: uplink-pirate-syndie-mask-desc + name: uplink-pdv-syndie-mask-name + description: uplink-pdv-syndie-mask-desc productEntity: ClothingMaskGasSyndicate icon: { sprite: Clothing/Mask/gassyndicate.rsi, state: icon } cost: @@ -1072,12 +1072,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink # - type: listing # id: UplinkPirateModsuit -# name: uplink-pirate-modsuit-name -# description: uplink-pirate-modsuit-desc +# name: uplink-pdv-modsuit-name +# description: uplink-pdv-modsuit-desc # productEntity: ClothingModsuitRoguePowerCell # cost: # Doubloon: 125 @@ -1087,14 +1087,14 @@ # - !type:StoreWhitelistCondition # whitelist: # tags: -# - PirateUplink +# - PDVUplink #MARK: Explosives - type: listing id: UplinkPirateFlashbangGrenadeBox - name: uplink-pirate-flashbanggrenade-box-name - description: uplink-pirate-flashbanggrenade-box-desc + name: uplink-pdv-flashbanggrenade-box-name + description: uplink-pdv-flashbanggrenade-box-desc productEntity: BoxFlashBangGrenades icon: { sprite: Objects/Weapons/Grenades/flashbang.rsi, state: icon} cost: @@ -1105,12 +1105,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateSmokeGrenadeBox - name: uplink-pirate-smokegrenade-box-name - description: uplink-pirate-smokegrenade-box-desc + name: uplink-pdv-smokegrenade-box-name + description: uplink-pdv-smokegrenade-box-desc productEntity: BoxSmokeGrenades icon: { sprite: Objects/Weapons/Grenades/smoke.rsi, state: icon} cost: @@ -1121,12 +1121,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateC4 - name: uplink-pirate-c4-name - description: uplink-pirate-c4-desc + name: uplink-pdv-c4-name + description: uplink-pdv-c4-desc productEntity: C4 cost: Doubloon: 5 @@ -1136,12 +1136,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateC4Bundle - name: uplink-pirate-c4-bundle-name - description: uplink-pirate-c4-bundle-desc + name: uplink-pdv-c4-bundle-name + description: uplink-pdv-c4-bundle-desc productEntity: ClothingBackpackDuffelSyndicateC4tBundle cost: Doubloon: 60 @@ -1151,12 +1151,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateEmpGrenadeBox - name: uplink-pirate-empgrenade-box-name - description: uplink-pirate-empgrenade-box-desc + name: uplink-pdv-empgrenade-box-name + description: uplink-pdv-empgrenade-box-desc productEntity: BoxEMPGrenadesNfsd icon: { sprite: Objects/Weapons/Grenades/empgrenade.rsi, state: icon} cost: @@ -1167,12 +1167,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateIncendiaryGrenadeBox - name: uplink-pirate-incendiarygrenade-box-name - description: uplink-pirate-incendiarygrenade-box-desc + name: uplink-pdv-incendiarygrenade-box-name + description: uplink-pdv-incendiarygrenade-box-desc productEntity: BoxIncendiaryGrenadesNfsd icon: { sprite: Objects/Weapons/Grenades/pyrogrenade.rsi, state: icon} cost: @@ -1183,12 +1183,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateShrapnelGrenadeBox - name: uplink-pirate-shrapnelgrenade-box-name - description: uplink-pirate-shrapnelgrenade-box-desc + name: uplink-pdv-shrapnelgrenade-box-name + description: uplink-pdv-shrapnelgrenade-box-desc productEntity: BoxShrapnelGrenadesNfsd icon: { sprite: Objects/Weapons/Grenades/shrapnelgrenade.rsi, state: icon} cost: @@ -1199,12 +1199,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateExplosiveGrenadeBox - name: uplink-pirate-explosivegrenade-box-name - description: uplink-pirate-explosivegrenade-box-desc + name: uplink-pdv-explosivegrenade-box-name + description: uplink-pdv-explosivegrenade-box-desc productEntity: BoxExplosiveGrenadesNfsd icon: { sprite: Objects/Weapons/Grenades/grenade.rsi, state: icon} cost: @@ -1215,7 +1215,7 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink # Misc @@ -1232,7 +1232,7 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink - type: listing id: UplinkPirateFactionLathe @@ -1247,12 +1247,12 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink + - PDVUplink #- type: listing # id: UplinkRomerol -# name: uplink-pirate-romerol-name -# description: uplink-pirate-romerol-desc +# name: uplink-pdv-romerol-name +# description: uplink-pdv-romerol-desc # productEntity: SyringeRomerol # cost: # Doubloon: 250 @@ -1262,14 +1262,14 @@ # - !type:StoreWhitelistCondition # whitelist: # tags: -# - PirateUplink +# - PDVUplink #MARK: $Gambling$ #- type: listing # id: UplinkPirateSurplus -# name: uplink-pirate-syndisurplus-name -# description: uplink-pirate-syndisurplus-desc +# name: uplink-pdv-syndisurplus-name +# description: uplink-pdv-syndisurplus-desc # productEntity: CrateSyndicateSurplusBundle # cost: # Doubloon: 125 @@ -1279,12 +1279,12 @@ # - !type:StoreWhitelistCondition # whitelist: # tags: -# - PirateUplink +# - PDVUplink # #- type: listing # id: UplinkPirateSuperSurplus -# name: uplink-pirate-syndisupersurplus-name -# description: uplink-pirate-syndisupersurplus-desc +# name: uplink-pdv-syndisupersurplus-name +# description: uplink-pdv-syndisupersurplus-desc # productEntity: CrateSyndicateSuperSurplusBundle # cost: # Doubloon: 250 @@ -1294,7 +1294,7 @@ # - !type:StoreWhitelistCondition # whitelist: # tags: -# - PirateUplink +# - PDVUplink # Vouchers diff --git a/Resources/Prototypes/_Mono/Catalogs/tsfmc_uplink_catalog.yml b/Resources/Prototypes/_Mono/Catalogs/tsfmc_uplink_catalog.yml index 04daaa2fefe..81a98d9affa 100644 --- a/Resources/Prototypes/_Mono/Catalogs/tsfmc_uplink_catalog.yml +++ b/Resources/Prototypes/_Mono/Catalogs/tsfmc_uplink_catalog.yml @@ -1,93 +1,93 @@ - type: listing - id: UplinkSecurityAnnie - name: uplink-security-annie-name - description: uplink-security-annie-desc + id: UplinkTsfAnnie + name: uplink-tsf-annie-name + description: uplink-tsf-annie-desc productEntity: WeaponRifleAnnie cost: FederationMilitaryCredit: 75 categories: - - UplinkSecurityWeapons + - UplinkTsfWeapons conditions: - !type:StoreWhitelistCondition whitelist: tags: - - SecurityUplink + - TSFUplink - type: listing - id: UplinkSecurityEg4 - name: uplink-security-eg4-name - description: uplink-security-eg4-desc + id: UplinkTsfEg4 + name: uplink-tsf-eg4-name + description: uplink-tsf-eg4-desc productEntity: WeaponEnergyRevolver cost: FederationMilitaryCredit: 35 categories: - - UplinkSecurityWeapons + - UplinkTsfWeapons conditions: - !type:StoreWhitelistCondition whitelist: tags: - - SecurityUplink + - TSFUplink - type: listing - id: UplinkSecurityMk290 - name: uplink-security-sentry-mk290-name - description: uplink-security-sentry-mk290-desc + id: UplinkTsfMk290 + name: uplink-tsf-sentry-mk290-name + description: uplink-tsf-sentry-mk290-desc productEntity: WeaponTurretMk290Packed cost: FederationMilitaryCredit: 100 categories: - - UplinkSecurityWeapons + - UplinkTsfWeapons conditions: - !type:StoreWhitelistCondition whitelist: tags: - - SecurityUplink + - TSFUplink - type: listing - id: UplinkSecurityMR8C - name: uplink-security-mr8c-name - description: uplink-security-mr8c-desc + id: UplinkTsfMR8C + name: uplink-tsf-mr8c-name + description: uplink-tsf-mr8c-desc productEntity: WeaponRifleMR8C cost: FederationMilitaryCredit: 125 categories: - - UplinkSecurityWeapons + - UplinkTsfWeapons conditions: - !type:StoreWhitelistCondition whitelist: tags: - - SecurityUplink + - TSFUplink - type: listing - id: UplinkSecuritySmilodon - name: uplink-security-smilodon-name - description: uplink-security-smilodon-desc + id: UplinkTsfSmilodon + name: uplink-tsf-smilodon-name + description: uplink-tsf-smilodon-desc productEntity: ClothingBackpackDuffelSmilodonBundle cost: FederationMilitaryCredit: 250 categories: - - UplinkSecurityWeapons + - UplinkTsfWeapons conditions: - !type:StoreWhitelistCondition whitelist: tags: - - SecurityUplink + - TSFUplink - type: listing - id: UplinkSecuritySurgeryDuffel - name: uplink-security-surgery-duffel-name - description: uplink-security-surgery-duffel-desc + id: UplinkTsfSurgeryDuffel + name: uplink-tsf-surgery-duffel-name + description: uplink-tsf-surgery-duffel-desc productEntity: ClothingBackpackDuffelSurgeryAdvancedFilled icon: { sprite: Objects/Specific/Medical/Surgery/scalpel.rsi, state: laser } cost: FederationMilitaryCredit: 20 categories: - - UplinkSecurityUtility + - UplinkTsfUtility conditions: - !type:StoreWhitelistCondition whitelist: tags: - - SecurityUplink + - TSFUplink - !type:BuyerJobCondition whitelist: - TsfCorpsman @@ -96,153 +96,153 @@ - type: listing - id: UplinkSecurityPortableRecharger - name: uplink-security-portable-recharger-name - description: uplink-security-portable-recharger-desc + id: UplinkTsfPortableRecharger + name: uplink-tsf-portable-recharger-name + description: uplink-tsf-portable-recharger-desc productEntity: PortableRecharger cost: FederationMilitaryCredit: 35 categories: - - UplinkSecurityUtility + - UplinkTsfUtility conditions: - !type:StoreWhitelistCondition whitelist: tags: - - SecurityUplink + - TSFUplink - type: listing - id: UplinkSecurityCash75000 - name: uplink-security-cash75000-name - description: uplink-security-cash75000-desc + id: UplinkTsfCash75000 + name: uplink-tsf-cash75000-name + description: uplink-tsf-cash75000-desc productEntity: SpaceCash75000 icon: { sprite: _NF/Objects/Economy/cash.rsi, state: cash_100000 } cost: FederationMilitaryCredit: 50 categories: - - UplinkSecurityUtility + - UplinkTsfUtility conditions: - !type:StoreWhitelistCondition whitelist: tags: - - SecurityUplink + - TSFUplink #- type: listing -# id: UplinkSecurityMagazineSubsonic +# id: UplinkTsfMagazineSubsonic # name: uplink-subsonic-mag-name # description: uplink-subsonic-mag-desc # productEntity: Magazine762x39mmSubsonic # cost: # FederationMilitaryCredit: 3 # categories: -# - UplinkSecurityAmmo +# - UplinkTsfAmmo # conditions: # - !type:StoreWhitelistCondition # whitelist: # tags: -# - SecurityUplink +# - TSFUplink #- type: listing -# id: UplinkSecurityBoxSubsonic +# id: UplinkTsfBoxSubsonic # name: uplink-subsonic-box-name # description: uplink-subsonic-box-desc # productEntity: AmmoBox762x39mmSubsonic # cost: # FederationMilitaryCredit: 10 # categories: -# - UplinkSecurityAmmo +# - UplinkTsfAmmo # conditions: # - !type:StoreWhitelistCondition # whitelist: # tags: -# - SecurityUplink +# - TSFUplink - type: listing - id: UplinkSecurityMagazine8x65mm - name: uplink-security-8x65mm-magazine-name - description: uplink-security-8x65mm-magazine-desc + id: UplinkTsfMagazine8x65mm + name: uplink-tsf-8x65mm-magazine-name + description: uplink-tsf-8x65mm-magazine-desc productEntity: Magazine8x65mmSKR cost: FederationMilitaryCredit: 5 categories: - - UplinkSecurityAmmo + - UplinkTsfAmmo conditions: - !type:StoreWhitelistCondition whitelist: tags: - - SecurityUplink + - TSFUplink - type: listing - id: UplinkSecurityBoxSKR - name: uplink-security-8x65mm-box-name - description: uplink-security-8x65mm-box-desc + id: UplinkTsfBoxSKR + name: uplink-tsf-8x65mm-box-name + description: uplink-tsf-8x65mm-box-desc productEntity: AmmoBox8x65mmSKR cost: FederationMilitaryCredit: 12 categories: - - UplinkSecurityAmmo + - UplinkTsfAmmo conditions: - !type:StoreWhitelistCondition whitelist: tags: - - SecurityUplink + - TSFUplink - type: listing - id: UplinkSecurityMagazine68x52mm - name: uplink-security-68x52mm-magazine-name - description: uplink-security-68x52mm-magazine-desc + id: UplinkTsfMagazine68x52mm + name: uplink-tsf-68x52mm-magazine-name + description: uplink-tsf-68x52mm-magazine-desc productEntity: Magazine68x52mmCaseless cost: FederationMilitaryCredit: 2 categories: - - UplinkSecurityAmmo + - UplinkTsfAmmo conditions: - !type:StoreWhitelistCondition whitelist: tags: - - SecurityUplink + - TSFUplink - type: listing - id: UplinkSecurityBox68x52mm - name: uplink-security-68x52mm-box-name - description: uplink-security-68x52mm-box-desc + id: UplinkTsfBox68x52mm + name: uplink-tsf-68x52mm-box-name + description: uplink-tsf-68x52mm-box-desc productEntity: AmmoBox68x52mmCaselessBig cost: FederationMilitaryCredit: 8 categories: - - UplinkSecurityAmmo + - UplinkTsfAmmo conditions: - !type:StoreWhitelistCondition whitelist: tags: - - SecurityUplink + - TSFUplink - type: listing - id: UplinkSecurityNavyOfficerSword - name: uplink-security-navyofficersword-name - description: uplink-security-navyofficersword-desc + id: UplinkTsfNavyOfficerSword + name: uplink-tsf-navyofficersword-name + description: uplink-tsf-navyofficersword-desc productEntity: ClothingBeltSheathFilledNavy icon: { sprite: _Mono/Objects/Weapons/Melee/ccsabre.rsi, state: icon } cost: FederationMilitaryCredit: 10 categories: - - UplinkSecurityWeapons + - UplinkTsfWeapons conditions: - !type:StoreWhitelistCondition whitelist: tags: - - SecurityUplink + - TSFUplink # Vouchers - type: listing - id: UplinkSecurityT0Voucher - name: uplink-security-t0-voucher-name - description: uplink-security-t0-voucher-desc + id: UplinkTsfT0Voucher + name: uplink-tsf-t0-voucher-name + description: uplink-tsf-t0-voucher-desc productEntity: ShipVoucherTsfT0 cost: FederationMilitaryCredit: 25 categories: - - UplinkSecurityVouchers + - UplinkTsfVouchers conditions: - !type:StoreWhitelistCondition whitelist: @@ -252,14 +252,14 @@ # start T1 - type: listing - id: UplinkSecurityT1VoucherSpica - name: uplink-security-t1-spica-voucher-name - description: uplink-security-t1-spica-voucher-desc + id: UplinkTsfT1VoucherSpica + name: uplink-tsf-t1-spica-voucher-name + description: uplink-tsf-t1-spica-voucher-desc productEntity: ShipVoucherSpica cost: FederationMilitaryCredit: 55 categories: - - UplinkSecurityVouchers + - UplinkTsfVouchers conditions: - !type:StoreWhitelistCondition whitelist: @@ -267,14 +267,14 @@ - FactionStaticUplinkTsf - type: listing - id: UplinkSecurityT1VoucherDagger - name: uplink-security-t1-dagger-voucher-name - description: uplink-security-t1-dagger-voucher-desc + id: UplinkTsfT1VoucherDagger + name: uplink-tsf-t1-dagger-voucher-name + description: uplink-tsf-t1-dagger-voucher-desc productEntity: ShipVoucherDagger cost: FederationMilitaryCredit: 75 categories: - - UplinkSecurityVouchers + - UplinkTsfVouchers conditions: - !type:StoreWhitelistCondition whitelist: @@ -282,14 +282,14 @@ - FactionStaticUplinkTsf - type: listing - id: UplinkSecurityT1VoucherTarantula - name: uplink-security-t1-tarantula-voucher-name - description: uplink-security-t1-tarantula-voucher-desc + id: UplinkTsfT1VoucherTarantula + name: uplink-tsf-t1-tarantula-voucher-name + description: uplink-tsf-t1-tarantula-voucher-desc productEntity: ShipVoucherTarantula cost: FederationMilitaryCredit: 85 categories: - - UplinkSecurityVouchers + - UplinkTsfVouchers conditions: - !type:StoreWhitelistCondition whitelist: @@ -297,14 +297,14 @@ - FactionStaticUplinkTsf - type: listing - id: UplinkSecurityT1VoucherSentinel - name: uplink-security-t1-sentinel-voucher-name - description: uplink-security-t1-sentinel-voucher-desc + id: UplinkTsfT1VoucherSentinel + name: uplink-tsf-t1-sentinel-voucher-name + description: uplink-tsf-t1-sentinel-voucher-desc productEntity: ShipVoucherSentinel cost: FederationMilitaryCredit: 85 categories: - - UplinkSecurityVouchers + - UplinkTsfVouchers conditions: - !type:StoreWhitelistCondition whitelist: @@ -312,14 +312,14 @@ - FactionStaticUplinkTsf - type: listing - id: UplinkSecurityT1VoucherMercury - name: uplink-security-t1-mercury-voucher-name - description: uplink-security-t1-mercury-voucher-desc + id: UplinkTsfT1VoucherMercury + name: uplink-tsf-t1-mercury-voucher-name + description: uplink-tsf-t1-mercury-voucher-desc productEntity: ShipVoucherMercury cost: FederationMilitaryCredit: 65 # Needs 2 man crew for GCS so its discounted categories: - - UplinkSecurityVouchers + - UplinkTsfVouchers conditions: - !type:StoreWhitelistCondition whitelist: @@ -327,14 +327,14 @@ - FactionStaticUplinkTsf - type: listing - id: UplinkSecurityT1VoucherAldebaran - name: uplink-security-t1-aldebaran-voucher-name - description: uplink-security-t1-aldebaran-voucher-desc + id: UplinkTsfT1VoucherAldebaran + name: uplink-tsf-t1-aldebaran-voucher-name + description: uplink-tsf-t1-aldebaran-voucher-desc productEntity: ShipVoucherAldebaran cost: FederationMilitaryCredit: 80 categories: - - UplinkSecurityVouchers + - UplinkTsfVouchers conditions: - !type:StoreWhitelistCondition whitelist: @@ -346,14 +346,14 @@ # start T2 - type: listing - id: UplinkSecurityT2VoucherAndromeda - name: uplink-security-t2-andromeda-voucher-name - description: uplink-security-t2-andromeda-voucher-desc + id: UplinkTsfT2VoucherAndromeda + name: uplink-tsf-t2-andromeda-voucher-name + description: uplink-tsf-t2-andromeda-voucher-desc productEntity: ShipVoucherAndromeda cost: FederationMilitaryCredit: 165 categories: - - UplinkSecurityVouchers + - UplinkTsfVouchers conditions: - !type:StoreWhitelistCondition whitelist: @@ -361,14 +361,14 @@ - FactionStaticUplinkTsf - type: listing - id: UplinkSecurityT2VoucherSpekter - name: uplink-security-t2-spekter-voucher-name - description: uplink-security-t2-spekter-voucher-desc + id: UplinkTsfT2VoucherSpekter + name: uplink-tsf-t2-spekter-voucher-name + description: uplink-tsf-t2-spekter-voucher-desc productEntity: ShipVoucherSpekter cost: FederationMilitaryCredit: 240 categories: - - UplinkSecurityVouchers + - UplinkTsfVouchers conditions: - !type:StoreWhitelistCondition whitelist: @@ -380,14 +380,14 @@ # start T3 - type: listing - id: UplinkSecurityT3VoucherAltair - name: uplink-security-t3-altair-voucher-name - description: uplink-security-t3-altair-voucher-desc + id: UplinkTsfT3VoucherAltair + name: uplink-tsf-t3-altair-voucher-name + description: uplink-tsf-t3-altair-voucher-desc productEntity: ShipVoucherAltair cost: FederationMilitaryCredit: 345 categories: - - UplinkSecurityVouchers + - UplinkTsfVouchers conditions: - !type:StoreWhitelistCondition whitelist: @@ -395,14 +395,14 @@ - FactionStaticUplinkTsf - type: listing - id: UplinkSecurityT3VoucherPolaris - name: uplink-security-t3-polaris-voucher-name - description: uplink-security-t3-polaris-voucher-desc + id: UplinkTsfT3VoucherPolaris + name: uplink-tsf-t3-polaris-voucher-name + description: uplink-tsf-t3-polaris-voucher-desc productEntity: ShipVoucherPolaris cost: FederationMilitaryCredit: 400 categories: - - UplinkSecurityVouchers + - UplinkTsfVouchers conditions: - !type:StoreWhitelistCondition whitelist: @@ -414,14 +414,14 @@ # start T4 - type: listing - id: UplinkSecurityFlyssaVoucher - name: uplink-security-flyssa-voucher-name - description: uplink-security-flyssa-voucher-desc + id: UplinkTsfFlyssaVoucher + name: uplink-tsf-flyssa-voucher-name + description: uplink-tsf-flyssa-voucher-desc productEntity: ShipVoucherFlyssa cost: FederationMilitaryCredit: 750 categories: - - UplinkSecurityVouchers + - UplinkTsfVouchers conditions: - !type:StoreWhitelistCondition whitelist: @@ -433,67 +433,1451 @@ # Misc - type: listing - id: UplinkSecurityFactionRDServer + id: UplinkTsfFactionRDServer name: uplink-faction-server-name description: uplink-faction-server-desc productEntity: RDServerTSFFlatpack cost: FederationMilitaryCredit: 100 categories: - - UplinkSecurityUtility + - UplinkTsfUtility conditions: - !type:StoreWhitelistCondition whitelist: tags: - - SecurityUplink + - TSFUplink - type: listing - id: UplinkSecurityFactionLathe + id: UplinkTsfFactionLathe name: uplink-faction-lathe-name description: uplink-faction-lathe-desc productEntity: FactionLatheFlatpack cost: FederationMilitaryCredit: 50 categories: - - UplinkSecurityUtility + - UplinkTsfUtility conditions: - !type:StoreWhitelistCondition whitelist: tags: - - SecurityUplink + - TSFUplink # - type: listing -# id: UplinkSecurityAuroraExosuit +# id: UplinkTsfAuroraExosuit # name: uplink-exosuit-aurora-name # description: uplink-exosuit-aurora-desc # productEntity: ClothingOuterExosuitAurora # cost: # FederationMilitaryCredit: 125 # categories: -# - UplinkSecurityHardsuits +# - UplinkTsfHardsuits # conditions: # - !type:StoreWhitelistCondition # whitelist: # tags: -# - SecurityUplink +# - TSFUplink - type: listing - id: UplinkSecurityPulseRifle - name: uplink-security-pulserifle-name - description: uplink-security-pulserifle-desc + id: UplinkTsfPulseRifle + name: uplink-tsf-pulserifle-name + description: uplink-tsf-pulserifle-desc productEntity: WeaponPulseRifle icon: { sprite: Objects/Weapons/Guns/Battery/pulse_rifle.rsi, state: base } cost: FederationMilitaryCredit: 100 categories: - - UplinkSecurityWeapons + - UplinkTsfWeapons conditions: - !type:StoreWhitelistCondition whitelist: tags: - - SecurityUplink + - TSFUplink - !type:BuyerJobCondition whitelist: - TsfCommander - TsfOfficer - TsfTeamleader + +# FUC->FMC. FMC cost 5x - Mono + +- type: listing + id: UplinkClothingOuterHardsuitM82c + name: uplink-tsf-hardsuit-m82c-name + description: uplink-tsf-hardsuit-m82c-desc + productEntity: ClothingOuterHardsuitM82c + icon: { sprite: _Mono/Clothing/OuterClothing/Hardsuits/m82c.rsi, state: icon } + cost: + FederationMilitaryCredit: 10 + categories: + - UplinkTsfHardsuits + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkClothingOuterHardsuitM82b + name: uplink-tsf-hardsuit-m82b-name + description: uplink-tsf-hardsuit-m82b-desc + productEntity: ClothingOuterHardsuitM82b + icon: { sprite: _Mono/Clothing/OuterClothing/Hardsuits/m82b.rsi, state: icon } + cost: + FederationMilitaryCredit: 10 + categories: + - UplinkTsfHardsuits + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfMK58 + name: uplink-tsf-mk58-name + description: uplink-tsf-mk58-desc + productEntity: WeaponPistolMk58 + icon: { sprite: Objects/Weapons/Guns/Pistols/mk58.rsi, state: icon } + cost: + FederationMilitaryCredit: 10 + categories: + - UplinkTsfWeapons + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfDisabler + name: uplink-tsf-disabler-name + description: uplink-tsf-disabler-desc + productEntity: WeaponDisabler + icon: { sprite: Objects/Weapons/Guns/Battery/disabler.rsi, state: base } + cost: + FederationMilitaryCredit: 5 + categories: + - UplinkTsfWeapons + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfStunbaton + name: uplink-tsf-stunbaton-name + description: uplink-tsf-stunbaton-desc + productEntity: Stunbaton + icon: { sprite: Objects/Weapons/Melee/stunbaton.rsi, state: stunbaton_off } + cost: + FederationMilitaryCredit: 5 + categories: + - UplinkTsfWeapons + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfEmitter + name: uplink-tsf-emitter-name + description: uplink-tsf-emitter-desc + productEntity: WeaponEmpEmitter + icon: { sprite: _NF/Objects/Weapons/Guns/Projectiles/emp.rsi, state: icon } + cost: + FederationMilitaryCredit: 15 #Mono Emmiter price: From 1 to 3 + categories: + - UplinkTsfWeapons + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfEnforcer + name: uplink-tsf-enforcer-name + description: uplink-tsf-enforcer-desc + productEntity: WeaponShotgunEnforcer + icon: { sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi, state: icon } + cost: + FederationMilitaryCredit: 15 + categories: + - UplinkTsfWeapons + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfLecter + name: uplink-tsf-lecter-name + description: uplink-tsf-lecter-desc + productEntity: WeaponRifleLecter + icon: { sprite: _Mono/Objects/Weapons/Guns/Rifles/lecter.rsi, state: icon } + cost: + FederationMilitaryCredit: 15 + categories: + - UplinkTsfWeapons + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +# - type: listing # Mono - this entire listing +# id: UplinkTsfHFBlade +# name: uplink-tsf-hfblade-name +# description: uplink-tsf-hfblade-desc +# productEntity: WeaponHFKatana +# icon: { sprite: _Mono/Objects/Weapons/Melee/hfblade.rsi, state: icon } +# cost: +# FederationMilitaryCredit: 50 +# categories: +# - UplinkTsfWeapons +# conditions: +# - !type:StoreWhitelistCondition +# whitelist: +# tags: +# - TSFUplink + +- type: listing + id: UplinkTsfVulcan + name: uplink-tsf-vulcan-name + description: uplink-tsf-vulcan-desc + productEntity: WeaponRifleVulcan + icon: { sprite: _DV/Objects/Weapons/Guns/Rifles/vulcan.rsi, state: icon } + cost: + FederationMilitaryCredit: 15 + categories: + - UplinkTsfWeapons + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfLaserCarbine + name: uplink-tsf-lasercarbine-name + description: uplink-tsf-lasercarbine-desc + productEntity: WeaponLaserCarbine + icon: { sprite: Objects/Weapons/Guns/Battery/laser_gun.rsi, state: icon } + cost: + FederationMilitaryCredit: 5 # GARBAGE!!! + categories: + - UplinkTsfWeapons + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfDisablerSMG + name: uplink-tsf-disablersmg-name + description: uplink-tsf-disablersmg-desc + productEntity: WeaponDisablerSMG + icon: { sprite: Objects/Weapons/Guns/Battery/disabler_smg.rsi, state: base } + cost: + FederationMilitaryCredit: 25 # STUNMETA!!! + categories: + - UplinkTsfWeapons + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfEnergySword + name: uplink-tsf-energysword-name + description: uplink-tsf-energysword-desc + productEntity: EnergySwordNfsd + icon: { sprite: Objects/Weapons/Melee/e_sword.rsi, state: e_sword } + cost: + FederationMilitaryCredit: 30 + categories: + - UplinkTsfWeapons + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfWT550 + name: uplink-tsf-wt550-name + description: uplink-tsf-wt550-desc + productEntity: WeaponSubMachineGunWt550 + icon: { sprite: Objects/Weapons/Guns/SMGs/wt550.rsi, state: icon } + cost: + FederationMilitaryCredit: 20 + categories: + - UplinkTsfWeapons + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfEnergyGun + name: uplink-tsf-energygun-name + description: uplink-tsf-energygun-desc + productEntity: WeaponEnergyGun + icon: { sprite: _DV/Objects/Weapons/Guns/Battery/energygun.rsi, state: icon } + cost: + FederationMilitaryCredit: 15 + categories: + - UplinkTsfWeapons + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfEmpRpg + name: uplink-tsf-emprpg-name + description: uplink-tsf-emprpg-desc + productEntity: WeaponLauncherRocketEmp + icon: { sprite: Objects/Weapons/Guns/Launchers/rocket.rsi, state: base } + cost: + FederationMilitaryCredit: 100 # Cost increased pending removal or rebalancing + categories: + - UplinkTsfWeapons + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + + +- type: listing + id: UplinkTsfHolo + name: uplink-tsf-holo-name + description: uplink-tsf-holo-desc + productEntity: HoloprojectorNfsd + icon: { sprite: _NF/Objects/Devices/Holoprojectors/nfsd.rsi, state: icon } + cost: + FederationMilitaryCredit: 5 + categories: + - UplinkTsfUtility + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkForcefieldTSF + name: uplink-tsf-forcefield-name + description: uplink-tsf-forcefield-desc + productEntity: HoloprojectorFieldTSF + icon: { sprite: _NF/Objects/Devices/Holoprojectors/nfsd.rsi, state: icon } + cost: + FederationMilitaryCredit: 55 + categories: + - UplinkTsfUtility + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfJetpack + name: uplink-tsf-jetpack-name + description: uplink-tsf-jetpack-desc + productEntity: JetpackNfsdFilled + icon: { sprite: _NF/Objects/Tanks/Jetpacks/nfsd.rsi, state: icon } + cost: + FederationMilitaryCredit: 5 + categories: + - UplinkTsfUtility + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfMagboots + name: uplink-tsf-magboots-name + description: uplink-tsf-magboots-desc + productEntity: ClothingShoesBootsMagSecurityFilled # Mono + icon: { sprite: _NF/Clothing/Shoes/Boots/magboots-security.rsi, state: icon } + cost: + FederationMilitaryCredit: 5 + categories: + - UplinkTsfUtility + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkNfsdTechfab + name: uplink-tsf-techfab-name + description: uplink-tsf-techfab-desc + productEntity: NfsdTechFabCircuitboard + icon: { sprite: _NF/Objects/Misc/module.rsi, state: nfsd } + cost: + FederationMilitaryCredit: 25 + categories: + - UplinkTsfUtility + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfKey + name: uplink-tsf-key-name + description: uplink-tsf-key-desc + productEntity: BoxEncryptionKeyNfsd + icon: { sprite: Objects/Storage/boxes.rsi, state: box } + cost: + FederationMilitaryCredit: 5 + categories: + - UplinkTsfUtility + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + - !type:BuyerJobCondition + whitelist: + - TsfCommander + +#Mono start + +#- type: listing +# id: UplinkTsfRadPen +# name: uplink-tsf-rad-pen-name +# description: uplink-tsf-rad-pen-desc +# productEntity: RadAutoInjector +# icon: { sprite: Objects/Specific/Medical/medipen.rsi, state: arithpen } +# cost: +# FederationMilitaryCredit: 18 +# categories: +# - UplinkTsfUtility +# conditions: +# - !type:StoreWhitelistCondition +# whitelist: +# tags: +# - TSFUplink +# - !type:BuyerJobCondition +# whitelist: +# - Sheriff +# - Brigmedic + +#- type: listing +# id: UplinkTsfPyrazinePen +# name: uplink-tsf-pyrazine-pen-name +# description: uplink-tsf-pyrazine-pen-desc +# productEntity: PyraAutoInjector +# icon: { sprite: Objects/Specific/Medical/medipen.rsi, state: pyrapen } +# cost: +# FederationMilitaryCredit: 18 +# categories: +# - UplinkTsfUtility +# conditions: +# - !type:StoreWhitelistCondition +# whitelist: +# tags: +# - TSFUplink + +#- type: listing +# id: UplinkTsfPuncturasePen +# name: uplink-tsf-puncturase-pen-name +# description: uplink-tsf-puncturase-pen-desc +# productEntity: PunctAutoInjector +# icon: { sprite: Objects/Specific/Medical/medipen.rsi, state: punctpen } +# cost: +# FederationMilitaryCredit: 18 +# categories: +# - UplinkTsfUtility +# conditions: +# - !type:StoreWhitelistCondition +# whitelist: +# tags: +# - TSFUplink + +#- type: listing +# id: UplinkTsfAntiPoisonPen +# name: uplink-tsf-anti-poison-pen-name +# description: uplink-tsf-anti-poison-pen-desc +# productEntity: AntiPoisonMedipen +# icon: { sprite: Objects/Specific/Medical/medipen.rsi, state: penacid } +# cost: +# FederationMilitaryCredit: 18 +# categories: +# - UplinkTsfUtility +# conditions: +# - !type:StoreWhitelistCondition +# whitelist: +# tags: +# - TSFUplink + +- type: listing + id: UplinkTsfOmnizineJug + name: uplink-tsf-omnizine-jug-name + description: uplink-tsf-omnizine-jug-desc + productEntity: JugOmnizine + cost: + FederationMilitaryCredit: 60 + categories: + - UplinkTsfUtility + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + - !type:BuyerJobCondition + whitelist: + - TsfCommander + - TsfCorpsman + +- type: listing + id: UplinkTsfMedicalAssembler + name: uplink-tsf-medical-assembler-name + description: uplink-tsf-medical-assembler-desc + productEntity: MedicalAssemblerFlatpack + cost: + FederationMilitaryCredit: 8 + categories: + - UplinkTsfUtility + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + - !type:BuyerJobCondition + whitelist: + - TsfCommander + - TsfCorpsman + +- type: listing + id: UplinkTsfCompactDefibrillator + name: uplink-tsf-compact-defibrillator-name + description: uplink-tsf-compact-defibrillator-desc + productEntity: DefibrillatorCompact + cost: + FederationMilitaryCredit: 15 + categories: + - UplinkTsfUtility + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + - !type:BuyerJobCondition + whitelist: + - TsfCommander + - TsfCorpsman + +- type: listing + id: UplinkTsfSyringeCaseFilled + name: uplink-tsf-syringe-case-name + description: uplink-tsf-syringe-case-desc + productEntity: SyringeCaseAltFilled + cost: + FederationMilitaryCredit: 50 + categories: + - UplinkTsfUtility + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +#- type: listing +# id: UplinkTsfCombatPen +# name: uplink-tsf-combat-pen-name +# description: uplink-tsf-combat-pen-desc +# productEntity: CombatMedipen +# icon: { sprite: Objects/Specific/Medical/medipen.rsi, state: morphen } +# cost: +# FederationMilitaryCredit: 12 +# categories: +# - UplinkTsfUtility +# conditions: +# - !type:StoreWhitelistCondition +# whitelist: +# tags: +# - TSFUplink + +- type: listing + id: UplinkTsfCyborgModule + name: uplink-tsf-cyborg-module-name + description: uplink-tsf-cyborg-module-desc + productEntity: BorgModuleSecurity + icon: { sprite: Interface/Actions/actions_borg.rsi, state: syndicate-weapon-module } + cost: + FederationMilitaryCredit: 50 + categories: + - UplinkTsfUtility + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfMechPulseRifle + name: uplink-tsf-mechpulserifle-name + description: uplink-tsf-mechpulserifle-desc + productEntity: WeaponMechCombatPulseRifleTSF + icon: { sprite: Objects/Specific/Mech/mecha_equipment.rsi, state: mecha_pulse } + cost: + FederationMilitaryCredit: 100 + categories: + - UplinkTsfWeapons + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + - !type:BuyerJobCondition + whitelist: + - TsfOfficer + - TsfTeamleader + - TsfCommander + +#Mono end + +- type: listing + id: UplinkTsfEmpRocket + name: uplink-tsf-emprocket-name + description: uplink-tsf-emprocket-desc + productEntity: CartridgeRocketEmp + icon: { sprite: _Mono/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi, state: rpg-emp } + cost: + FederationMilitaryCredit: 5 + categories: + - UplinkTsfAmmo + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfThrusterKit + name: uplink-tsf-thrusterkit-name + description: uplink-tsf-thrusterkit-desc + productEntity: BoxT3SuperCapacitor + icon: { sprite: Objects/Storage/boxes.rsi, state: box} + cost: + FederationMilitaryCredit: 20 + categories: + - UplinkTsfBundles + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfPistolMagazine + name: uplink-tsf-Magazine9x19mmPistolFMJ-name + description: uplink-tsf-Magazine9x19mmPistolFMJ-desc + productEntity: BoxMagazine9x19mmFMJ + icon: { sprite: Objects/Storage/boxes.rsi, state: box } + cost: + FederationMilitaryCredit: 5 + categories: + - UplinkTsfAmmo + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsf556x45mmMagazine + name: uplink-tsf-5-56x45mmMagazine-name + description: uplink-tsf-5-56x45mmMagazine-desc + productEntity: BoxMagazine556x45mmFMJ + icon: { sprite: Objects/Storage/boxes.rsi, state: box } + cost: + FederationMilitaryCredit: 5 + categories: + - UplinkTsfAmmo + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsf762x51mmMagazine + name: uplink-tsf-7-62x51mmMagazine-name + description: uplink-tsf-7-62x51mmMagazine-desc + productEntity: BoxMagazine762x51mmFMJ + icon: { sprite: Objects/Storage/boxes.rsi, state: box } + cost: + FederationMilitaryCredit: 5 + categories: + - UplinkTsfAmmo + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsf762x51mmMagazineRubber + name: uplink-tsf-7-62x51mmMagazine-rubber-name + description: uplink-tsf-7-62x51mmMagazine-rubber-desc + productEntity: BoxMagazine762x51mmRubber + icon: { sprite: Objects/Storage/boxes.rsi, state: box } + cost: + FederationMilitaryCredit: 5 + categories: + - UplinkTsfAmmo + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsf762x39mmMagazine + name: uplink-tsf-7-62x39mmMagazine-name + description: uplink-tsf-7-62x39mmMagazine-desc + productEntity: BoxMagazine762x39mmFMJ + icon: { sprite: Objects/Storage/boxes.rsi, state: box } + cost: + FederationMilitaryCredit: 5 + categories: + - UplinkTsfAmmo + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfWT550Magazine + name: uplink-tsf-wt550magazine-name + description: uplink-tsf-wt550magazine-desc + productEntity: BoxMagazine46x30mmSubMachineGunTopMountedFMJ + icon: { sprite: Objects/Storage/boxes.rsi, state: box } + cost: + FederationMilitaryCredit: 5 + categories: + - UplinkTsfAmmo + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfPistolMagazineRubber + name: uplink-tsf-Magazine9x19mmPistolFMJ-rubber-name + description: uplink-tsf-Magazine9x19mmPistolFMJ-rubber-desc + productEntity: BoxMagazine9x19mmRubber + icon: { sprite: Objects/Storage/boxes.rsi, state: box } + cost: + FederationMilitaryCredit: 5 + categories: + - UplinkTsfAmmo + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsf556x45mmMagazineRubber + name: uplink-tsf-5-56x45mmMagazine-rubber-name + description: uplink-tsf-5-56x45mmMagazine-rubber-desc + productEntity: BoxMagazine556x45mmRubber + icon: { sprite: Objects/Storage/boxes.rsi, state: box } + cost: + FederationMilitaryCredit: 5 + categories: + - UplinkTsfAmmo + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsf762x39mmMagazineRubber + name: uplink-tsf-7-62x39mmMagazine-rubber-name + description: uplink-tsf-7-62x39mmMagazine-rubber-desc + productEntity: BoxMagazine762x39mmRubber + icon: { sprite: Objects/Storage/boxes.rsi, state: box } + cost: + FederationMilitaryCredit: 5 + categories: + - UplinkTsfAmmo + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfHypo + name: uplink-tsf-hypo-name + description: uplink-tsf-hypo-desc + productEntity: HypoBrigmedic + icon: { sprite: _NF/Objects/Specific/Medical/hypobrigmedic.rsi, state: hypo } + cost: + FederationMilitaryCredit: 5 + categories: + - UplinkTsfUtility + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + - !type:BuyerJobCondition + whitelist: + - TsfCorpsman + - TsfCommander + +- type: listing + id: UplinkTsfAmbuzol + name: uplink-tsf-ambuzol-name + description: uplink-tsf-ambuzol-desc + productEntity: SyringeAmbuzol + icon: { sprite: Objects/Specific/Chemistry/syringe.rsi, state: syringe_base0 } + cost: + FederationMilitaryCredit: 5 + categories: + - UplinkTsfUtility + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfMedkit + name: uplink-tsf-medkit-name + description: uplink-tsf-medkit-desc + productEntity: MedkitCombatFilled + icon: { sprite: _NF/Objects/Specific/Medical/firstaidkits.rsi, state: blackkit } # Frontier: _NF prefix + cost: + FederationMilitaryCredit: 20 + categories: + - UplinkTsfUtility + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + - !type:BuyerJobCondition + whitelist: + - TsfCorpsman + - TsfOfficer + - TsfCommander + +- type: listing + id: UplinkTsfInspector + name: uplink-tsf-inspector-name + description: uplink-tsf-inspector-desc + productEntity: WeaponRevolverInspector + icon: { sprite: Objects/Weapons/Guns/Revolvers/inspector.rsi, state: icon } + cost: + FederationMilitaryCredit: 5 + categories: + - UplinkTsfWeapons + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfMateba + name: uplink-tsf-mateba-name + description: uplink-tsf-mateba-desc + productEntity: WeaponRevolverMateba + icon: { sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi, state: icon } + cost: + FederationMilitaryCredit: 15 + categories: + - UplinkTsfWeapons + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + - !type:BuyerJobCondition # Mono: Whitelisted Mateba to only Baliff, Sergeant and Sheriff + whitelist: + - TsfOfficer + - TsfTeamleader + - TsfCommander + +- type: listing + id: UplinkTsfTruncheon + name: uplink-tsf-truncheon-name + description: uplink-tsf-truncheon-desc + productEntity: Truncheon + icon: { sprite: Objects/Weapons/Melee/truncheon.rsi, state: icon } + cost: + FederationMilitaryCredit: 5 + categories: + - UplinkTsfWeapons + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfArmingSword + name: uplink-tsf-armingsword-name + description: uplink-tsf-armingsword-desc + productEntity: PlasteelArmingSword + icon: { sprite: _NF/Objects/Weapons/Melee/armingsword.rsi, state: icon } + cost: + FederationMilitaryCredit: 10 + categories: + - UplinkTsfWeapons + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink +# Mono +#- type: listing +# id: UplinkTsfCaptainSword +# name: uplink-tsf-captainsword-name +# description: uplink-tsf-captainsword-desc +# productEntity: ClothingBeltSheathFilled +# icon: { sprite: Objects/Weapons/Melee/captain_sabre.rsi, state: icon } +# cost: +# FederationMilitaryCredit: 10 #From 10 to 2 +# categories: +# - UplinkTsfWeapons +# conditions: +# - !type:StoreWhitelistCondition +# whitelist: +# tags: +# - TSFUplink + +- type: listing + id: UplinkTsfPulsePistol + name: uplink-tsf-pulsepistol-name + description: uplink-tsf-pulsepistol-desc + productEntity: WeaponPulsePistol + icon: { sprite: Objects/Weapons/Guns/Battery/pulse_pistol.rsi, state: base } + cost: + FederationMilitaryCredit: 60 + categories: + - UplinkTsfWeapons + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + - !type:BuyerJobCondition + whitelist: + - TsfOfficer + - TsfTeamleader + - TsfCommander + +- type: listing + id: UplinkTsfPulseCarbine + name: uplink-tsf-pulsecarbine-name + description: uplink-tsf-pulsecarbine-desc + productEntity: WeaponPulseCarbine + icon: { sprite: Objects/Weapons/Guns/Battery/pulse_carbine.rsi, state: base } + cost: + FederationMilitaryCredit: 250 + categories: + - UplinkTsfWeapons + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + - !type:BuyerJobCondition + whitelist: + - TsfCommander + - TsfOfficer + - TsfTeamleader + +- type: listing + id: UplinkTsfHammer + name: uplink-tsf-hammer-name + description: uplink-tsf-hammer-desc + productEntity: SecBreachingHammer + icon: { sprite: Nyanotrasen/Objects/Weapons/Melee/breaching_hammer.rsi, state: icon } + cost: + FederationMilitaryCredit: 15 + categories: + - UplinkTsfWeapons + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfTeleShield + name: uplink-tsf-teleshield-name + description: uplink-tsf-teleshield-desc + productEntity: TelescopicShield + icon: { sprite: Objects/Weapons/Melee/teleriot_shield.rsi, state: teleriot-on } + cost: + FederationMilitaryCredit: 10 + categories: + - UplinkTsfUtility + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfEnergyShield + name: uplink-tsf-energyshield-name + description: uplink-tsf-energyshield-desc + productEntity: EnergyShieldNfsd + icon: { sprite: _NF/Objects/Weapons/Melee/e_shield.rsi, state: eshield-on } + cost: + FederationMilitaryCredit: 40 + categories: + - UplinkTsfUtility + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfSwat + name: uplink-tsf-swat-name + description: uplink-tsf-swat-desc + productEntity: ClothingMaskGasSheriff + icon: { sprite: _NF/Clothing/Mask/nfsd_sheriff.rsi, state: icon} + cost: + FederationMilitaryCredit: 5 #Mono: From 3 to 1 + categories: + - UplinkTsfUtility + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + - !type:BuyerJobCondition + whitelist: + - TsfOfficer + - TsfTeamleader + - TsfCommander + +- type: listing + id: UplinkTsfSpeedloader + name: uplink-tsf-speedloader-name + description: uplink-tsf-speedloader-desc + productEntity: SpeedLoader45_magnumFMJ + icon: { sprite: _Mono/Objects/Weapons/Guns/Ammunition/SpeedLoaders/45_magnum/45_magnum_speed_loader.rsi, state: base } + cost: + FederationMilitaryCredit: 5 + categories: + - UplinkTsfAmmo + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfSpeedloaderRubber + name: uplink-tsf-speedloaderrubber-name + description: uplink-tsf-speedloaderrubber-desc + productEntity: SpeedLoader45_magnumRubber + icon: { sprite: _Mono/Objects/Weapons/Guns/Ammunition/SpeedLoaders/45_magnum/45_magnum_speed_loader.rsi, state: base } + cost: + FederationMilitaryCredit: 5 + categories: + - UplinkTsfAmmo + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfShotLethal + name: uplink-tsf-shotlethal-name + description: uplink-tsf-shotlethal-desc + productEntity: AmmoBox12_gaugeBuckshot + icon: { sprite: Objects/Storage/boxes.rsi, state: box } + cost: + FederationMilitaryCredit: 5 + categories: + - UplinkTsfAmmo + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfShotBeanbag + name: uplink-tsf-shotbeanbag-name + description: uplink-tsf-shotbeanbag-desc + productEntity: AmmoBox12_gaugeBeanbag + icon: { sprite: Objects/Storage/boxes.rsi, state: box } + cost: + FederationMilitaryCredit: 5 + categories: + - UplinkTsfAmmo + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfShotIncend + name: uplink-tsf-shotincend-name + description: uplink-tsf-shotincend-desc + productEntity: AmmoBox12_gaugeIncendiary + icon: { sprite: Objects/Storage/boxes.rsi, state: box } + cost: + FederationMilitaryCredit: 10 + categories: + - UplinkTsfAmmo + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfShotSlug + name: uplink-tsf-shotslug-name + description: uplink-tsf-shotslug-desc + productEntity: AmmoBox12_gaugeSlug + icon: { sprite: Objects/Storage/boxes.rsi, state: box } + cost: + FederationMilitaryCredit: 5 + categories: + - UplinkTsfAmmo + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfCash7500 + name: uplink-tsf-cash7500-name + description: uplink-tsf-cash7500-desc + productEntity: SpaceCash7500 # Mono: Changed the exchange rate from 1000 to 5000 to 7500 + icon: { sprite: Objects/Economy/cash.rsi, state: cash_1000000 } + cost: + FederationMilitaryCredit: 5 + categories: + - UplinkTsfUtility + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfSmokeGrenadeBox + name: uplink-tsf-smokegrenade-box-name + description: uplink-tsf-smokegrenade-box-desc + productEntity: BoxSmokeGrenades + icon: { sprite: Objects/Weapons/Grenades/smoke.rsi, state: icon} + cost: + FederationMilitaryCredit: 5 + categories: + - UplinkTsfExplosives # Moved to Explosives - Mono + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfTeargasGrenadeBox + name: uplink-tsf-teargasgrenade-box-name + description: uplink-tsf-teargasgrenade-box-desc + productEntity: BoxTeargasGrenades + icon: { sprite: Objects/Weapons/Grenades/tear_gas.rsi, state: icon} + cost: + FederationMilitaryCredit: 10 + categories: + - UplinkTsfExplosives # Moved to Explosives - Mono + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfFlashbangGrenadeBox + name: uplink-tsf-flashbanggrenade-box-name + description: uplink-tsf-flashbanggrenade-box-desc + productEntity: BoxFlashBangGrenades + icon: { sprite: Objects/Weapons/Grenades/flashbang.rsi, state: icon} + cost: + FederationMilitaryCredit: 5 + categories: + - UplinkTsfExplosives # Moved to Explosives - Mono + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfStingerGrenadeBox + name: uplink-tsf-stingergrenade-box-name + description: uplink-tsf-stingergrenade-box-desc + productEntity: BoxStingerGrenadesNfsd + icon: { sprite: Objects/Weapons/Grenades/stingergrenade.rsi, state: icon} + cost: + FederationMilitaryCredit: 10 + categories: + - UplinkTsfExplosives # Moved to Explosives - Mono + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfEmpGrenadeBox + name: uplink-tsf-empgrenade-box-name + description: uplink-tsf-empgrenade-box-desc + productEntity: BoxEMPGrenadesNfsd + icon: { sprite: Objects/Weapons/Grenades/empgrenade.rsi, state: icon} + cost: + FederationMilitaryCredit: 10 + categories: + - UplinkTsfExplosives + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfExplosiveGrenadeBox + name: uplink-tsf-explosivegrenade-box-name + description: uplink-tsf-explosivegrenade-box-desc + productEntity: BoxExplosiveGrenadesNfsd + icon: { sprite: Objects/Weapons/Grenades/grenade.rsi, state: icon} + cost: + FederationMilitaryCredit: 15 + categories: + - UplinkTsfExplosives + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfIncendiaryGrenadeBox + name: uplink-tsf-incendiarygrenade-box-name + description: uplink-tsf-incendiarygrenade-box-desc + productEntity: BoxIncendiaryGrenadesNfsd + icon: { sprite: Objects/Weapons/Grenades/pyrogrenade.rsi, state: icon} + cost: + FederationMilitaryCredit: 10 # Mono 3->2 + categories: + - UplinkTsfExplosives + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfShrapnelGrenadeBox + name: uplink-tsf-shrapnelgrenade-box-name + description: uplink-tsf-shrapnelgrenade-box-desc + productEntity: BoxShrapnelGrenadesNfsd + icon: { sprite: Objects/Weapons/Grenades/shrapnelgrenade.rsi, state: icon} + cost: + FederationMilitaryCredit: 10 + categories: + - UplinkTsfExplosives + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfBreachingChargesBox + name: uplink-tsf-breachingcharge-box-name + description: uplink-tsf-breachingcharge-box-desc + productEntity: BoxBreachingCharges + icon: { sprite: _DV/Objects/Weapons/Bombs/breaching.rsi, state: icon} + cost: + FederationMilitaryCredit: 15 + categories: + - UplinkTsfExplosives + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfHoverbikeNfsdFlatpack + name: uplink-tsf-hoverbike-name + description: uplink-tsf-hoverbike-desc + productEntity: HoverbikeNfsdFlatpack + icon: { sprite: _NF/Objects/Vehicles/hoverbike.rsi, state: vehicle } + cost: + FederationMilitaryCredit: 15 + categories: + - UplinkTsfUtility + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfLethalArmory + name: uplink-tsf-lethalarmory-name + description: uplink-tsf-lethalarmory-desc + productEntity: CrateArmoryLethalNfsd + icon: { sprite: _NF/Structures/Storage/Crates/nfsd_secure2.rsi, state: icon } + cost: + FederationMilitaryCredit: 75 + categories: + - UplinkTsfBundles + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfTrackingBundle + name: uplink-tsf-trackingdart-bundle-name + description: uplink-tsf-trackingdart-bundle-desc + productEntity: ClothingBackpackDuffelNfsdTrackingBundle + icon: { sprite: _NF/Clothing/Back/Duffels/nfsd_brown.rsi, state: icon } + cost: + FederationMilitaryCredit: 20 + categories: + - UplinkTsfBundles + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfEmpBundle + name: uplink-tsf-emp-bundle-name + description: uplink-tsf-emp-bundle-desc + productEntity: ClothingBackpackDuffelNfsdEmpBundle + icon: { sprite: _NF/Clothing/Back/Duffels/nfsd_brown.rsi, state: icon } + cost: + FederationMilitaryCredit: 20 + categories: + - UplinkTsfBundles + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfNonLethalArmory + name: uplink-tsf-nonlethalarmory-name + description: uplink-tsf-nonlethalarmory-desc + productEntity: CrateArmoryNonLethalNfsd + icon: { sprite: _NF/Structures/Storage/Crates/nfsd_secure1.rsi, state: icon } + cost: + FederationMilitaryCredit: 50 + categories: + - UplinkTsfBundles + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfEmpGrenadeAmmo + name: uplink-tsf-emp-ammo-name + description: uplink-tsf-emp-ammo-desc + productEntity: BoxEmpGrenadesAmmo + icon: { sprite: Objects/Storage/boxes.rsi, state: box } + cost: + FederationMilitaryCredit: 5 + categories: + - UplinkTsfAmmo + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfTrackingDartsAmmo + name: uplink-tsf-trackingdart-ammo-name + description: uplink-tsf-trackingdart-ammo-desc + productEntity: NFBoxDartsTracking + icon: { sprite: Objects/Storage/boxes.rsi, state: box } + cost: + FederationMilitaryCredit: 5 + categories: + - UplinkTsfAmmo + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfSpaceBladeSec + name: uplink-tsf-spaceblade-sec-name + description: uplink-tsf-spaceblade-sec-desc + productEntity: SpaceBladeSec + icon: { sprite: _NF/Objects/Fun/spaceblade.rsi, state: secblade } + cost: + FederationMilitaryCredit: 5 + categories: + - UplinkTsfUtility + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink + +- type: listing + id: UplinkTsfContrabandForensicsModule + name: uplink-tsf-contraband-forensics-module-name + description: uplink-tsf-contraband-forensics-module-desc + productEntity: ContrabandForensicsModule + icon: { sprite: _NF/Objects/Devices/cartridge.rsi, state: contraband_forensics } + cost: + FederationMilitaryCredit: 20 + categories: + - UplinkTsfUtility + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - TSFUplink diff --git a/Resources/Prototypes/_Mono/Entities/Mobs/Ghostroles/MARSOC/loadouts.yml b/Resources/Prototypes/_Mono/Entities/Mobs/Ghostroles/MARSOC/loadouts.yml index 9872b7b2a4b..6a633022926 100644 --- a/Resources/Prototypes/_Mono/Entities/Mobs/Ghostroles/MARSOC/loadouts.yml +++ b/Resources/Prototypes/_Mono/Entities/Mobs/Ghostroles/MARSOC/loadouts.yml @@ -20,7 +20,7 @@ storage: back: - RadioHandheldNF - - BaseSecurityUplinkRadioDeputy + - BaseTSFUplinkRadioMarine - DoubleEmergencyOxygenTank - MedkitCombatFilled - MedkitCombatFilled diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/pirate.yml b/Resources/Prototypes/_Mono/Entities/Objects/Specific/Factions/pdv_uplink.yml similarity index 79% rename from Resources/Prototypes/_NF/Entities/Objects/Specific/pirate.yml rename to Resources/Prototypes/_Mono/Entities/Objects/Specific/Factions/pdv_uplink.yml index 50ad936e16a..0cc8020abde 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Specific/pirate.yml +++ b/Resources/Prototypes/_Mono/Entities/Objects/Specific/Factions/pdv_uplink.yml @@ -3,9 +3,9 @@ - type: entity name: data chit parent: BaseItem - id: Doubloon + id: Doubloon #yes they are not doubloons but i found it very funny so it's staying that way, rare frontier codebase W suffix: 100 DC - description: A rugged, shielded disk containing encrypted intelligence. + description: A rugged, shielded disk containing encrypted intelligence. It can serve as a measure of how effective your service of the Dynasty is, and can be exchanged for equipment. components: - type: Sprite sprite: _Mono/Objects/Specific/Rogue/rogue_chits.rsi @@ -58,8 +58,8 @@ # Uplinks - type: entity - parent: [ BaseItem, StorePresetPirateUplink ] - id: BasePirateUplink + parent: [ BaseItem, StorePresetPDVUplink ] + id: BasePDVUplink name: PDV Uplink description: A scarred tablet encased in heat-resistant composite with slot for chits on the side. suffix: Empty @@ -84,11 +84,11 @@ key: enum.StoreUiKey.Key - type: Tag tags: - - PirateUplink + - PDVUplink - type: entity - parent: BasePirateUplink - id: BasePirateUplinkRadioDebug + parent: BasePDVUplink + id: BasePDVUplinkRadioDebug suffix: Pirate, DEBUG components: - type: Store @@ -96,8 +96,8 @@ Doubloon: 99999 - type: entity - parent: BasePirateUplink - id: BasePirateUplinkRadioPDVGrandVizier + parent: BasePDVUplink + id: BasePDVUplinkRadioPDVGrandVizier suffix: Commander 125 components: - type: Store @@ -105,12 +105,12 @@ Doubloon: 125 - type: Tag tags: - - PirateUplink + - PDVUplink - FactionStaticUplinkPdv - type: entity - parent: BasePirateUplink - id: BasePirateUplinkPirateCrew + parent: BasePDVUplink + id: BasePDVUplinkRahkshan suffix: Agent 75 components: - type: Store @@ -118,8 +118,8 @@ Doubloon: 75 - type: entity - parent: BasePirateUplink - id: BasePirateUplinkAsvaran + parent: BasePDVUplink + id: BasePDVUplinkAsvaran suffix: Asvaran 100 components: - type: Store diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/security.yml b/Resources/Prototypes/_Mono/Entities/Objects/Specific/Factions/tsf_uplink.yml similarity index 68% rename from Resources/Prototypes/_NF/Entities/Objects/Specific/security.yml rename to Resources/Prototypes/_Mono/Entities/Objects/Specific/Factions/tsf_uplink.yml index 4d001da082a..dcfc67250e5 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Specific/security.yml +++ b/Resources/Prototypes/_Mono/Entities/Objects/Specific/Factions/tsf_uplink.yml @@ -5,7 +5,7 @@ parent: BaseItem id: FederationMilitaryCredit # Mono - Renamed from FUCs suffix: 100 FMC # Mono - description: A token awarded to TSF personnel for turning in contraband. It can be exchanged in an TSFMC uplink device for a variety of law enforcement tools. + description: A token awarded to TSF personnel for turning in enemy equipment and valuable assets. It can be exchanged in a TSF uplink device for a variety of tools and equipment. components: - type: Sprite sprite: _NF/Objects/Specific/Security/frontieruplinkcoin.rsi @@ -58,8 +58,8 @@ # Uplinks - type: entity - parent: [ BaseItem, StorePresetSecurityUplink ] - id: BaseSecurityUplinkRadio + parent: [ BaseItem, StorePresetTSFUplink ] + id: BaseTSFUplinkRadio name: TSFMC uplink description: Retro looking old radio... suffix: Empty @@ -80,43 +80,43 @@ key: enum.StoreUiKey.Key - type: Tag tags: - - SecurityUplink + - TSFUplink - type: entity - parent: BaseSecurityUplinkRadio - id: BaseSecurityUplinkRadioDebug - suffix: Security, DEBUG + parent: BaseTSFUplinkRadio + id: BaseTSFUplinkRadioDebug + suffix: TSF, DEBUG components: - type: Store balance: FederationMilitaryCredit: 99999 - type: entity - parent: BaseSecurityUplinkRadio - id: BaseSecurityUplinkRadioSheriff - suffix: Colonel 125 + parent: BaseTSFUplinkRadio + id: BaseTSFUplinkRadioCommander + suffix: Commander 125 components: - type: Store balance: FederationMilitaryCredit: 125 - type: Tag tags: - - SecurityUplink + - TSFUplink - FactionStaticUplinkTsf - type: entity - parent: BaseSecurityUplinkRadio - id: BaseSecurityUplinkRadioCaptain - suffix: Captain 100 + parent: BaseTSFUplinkRadio + id: BaseTSFUplinkRadioOfficer + suffix: Officer 100 components: - type: Store balance: FederationMilitaryCredit: 100 - type: entity - parent: BaseSecurityUplinkRadio - id: BaseSecurityUplinkRadioOfficer - suffix: Officer 75 + parent: BaseTSFUplinkRadio + id: BaseTSFUplinkRadioTeamleader + suffix: Teamleader 75 components: - type: Store balance: @@ -125,8 +125,8 @@ #Mono - type: entity - parent: BaseSecurityUplinkRadio - id: BaseSecurityUplinkRadioDeputy + parent: BaseTSFUplinkRadio + id: BaseTSFUplinkRadioMarine suffix: Marine 75 components: - type: Store @@ -134,16 +134,3 @@ FederationMilitaryCredit: 75 #Mono End - -- type: entity - name: TSFMC deployable barrier - id: NfsdDeployableBarrier - description: A deployable barrier. Swipe your ID card to lock/unlock it. - parent: DeployableBarrier - components: - - type: Sprite - sprite: _NF/Objects/Specific/Security/nfsdbarrier.rsi - layers: - - state: idle - - state: locked - map: ["enum.LockVisualLayers.Lock"] diff --git a/Resources/Prototypes/_Mono/Entities/Structures/Machines/uplinks.yml b/Resources/Prototypes/_Mono/Entities/Structures/Machines/uplinks.yml index 26f55d7ebbd..4b010268ceb 100644 --- a/Resources/Prototypes/_Mono/Entities/Structures/Machines/uplinks.yml +++ b/Resources/Prototypes/_Mono/Entities/Structures/Machines/uplinks.yml @@ -1,5 +1,5 @@ - type: entity - parent: [StorePresetSecurityUplink, VendingMachine] + parent: [StorePresetTSFUplink, VendingMachine] id: VendingMachineTSFMCUplink name: TSFMC equipment requisition station description: A central TSFMC material access lift. Lets you access deep storage at the cost of FMC, which represent merit and accumulated resources. @@ -33,13 +33,13 @@ key: enum.StoreUiKey.Key - type: Store categories: - - UplinkSecurityHardsuits - - UplinkSecurityWeapons - - UplinkSecurityAmmo - - UplinkSecurityUtility - - UplinkSecurityExplosives - - UplinkSecurityBundles - - UplinkSecurityVouchers # Mono + - UplinkTsfHardsuits + - UplinkTsfWeapons + - UplinkTsfAmmo + - UplinkTsfUtility + - UplinkTsfExplosives + - UplinkTsfBundles + - UplinkTsfVouchers # Mono balance: FederationMilitaryCredit: 25 - type: AccessReader @@ -49,11 +49,11 @@ - TSF - type: Tag tags: - - SecurityUplink + - TSFUplink - FactionStaticUplinkTsf - type: entity - parent: [StorePresetPirateUplink, VendingMachine] + parent: [StorePresetPDVUplink, VendingMachine] id: VendingMachinePDVUplink name: PDV equipment requisition station description: A central PDV material access lift. Lets you access deep storage at the cost of data chits, which represent merit and accumulated resources. @@ -96,5 +96,5 @@ popupMessage: company-pdv-access-denied - type: Tag tags: - - PirateUplink + - PDVUplink - FactionStaticUplinkPdv diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/asvaran.yml b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/asvaran.yml index 7531bdfe7ba..32ba2d230a9 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/asvaran.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/asvaran.yml @@ -49,7 +49,7 @@ equipment: ears: ClothingHeadsetAltVanguardCommand #belt: ClothingBeltUtility - pocket1: BasePirateUplinkAsvaran + pocket1: BasePDVUplinkAsvaran #pocket2: AppraisalTool storage: back: diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/denasvar.yml b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/denasvar.yml index 6fb20343e69..0ea90a64973 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/denasvar.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/denasvar.yml @@ -69,7 +69,7 @@ equipment: ears: ClothingHeadsetAltVanguardCommand #belt: ClothingBeltUtility - pocket1: BasePirateUplinkPirateCrew + pocket1: BasePDVUplinkRahkshan #pocket2: AppraisalTool storage: back: diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/grandvizier.yml b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/grandvizier.yml index c5e28c19c5e..cd8ec9a13a9 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/grandvizier.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/grandvizier.yml @@ -58,7 +58,7 @@ equipment: ears: ClothingHeadsetAltVanguardCommand #belt: ClothingBeltUtility # mono - pocket1: BasePirateUplinkRadioPDVGrandVizier + pocket1: BasePDVUplinkRadioPDVGrandVizier pocket2: EnergySword storage: back: diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/rahkshan.yml b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/rahkshan.yml index 6c58f735f9d..823e4b5362b 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/PDV/rahkshan.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/PDV/rahkshan.yml @@ -45,7 +45,7 @@ equipment: ears: ClothingHeadsetAltFreelancer #belt: ClothingBeltUtility - pocket1: BasePirateUplinkPirateCrew + pocket1: BasePDVUplinkRahkshan #pocket2: AppraisalTool storage: back: diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/commandingofficer.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/commandingofficer.yml index 6d37a7b6daf..39158eb3a2f 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/commandingofficer.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/commandingofficer.yml @@ -67,6 +67,6 @@ back: - Multitool - DoorRemoteNfsd - - BaseSecurityUplinkRadioSheriff + - BaseTSFUplinkRadioCommander - PhoneInstrumentHigh - RubberStampTSFColonel #Mono. Look, it had comments on the Bailiff/Captain file. diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/corpsman.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/corpsman.yml index 0ae44cdab65..f09d128dba1 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/corpsman.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/corpsman.yml @@ -56,5 +56,5 @@ back: - EncryptionKeyMedical # - Magazine45_ACPPistolFMJ # Mono - - BaseSecurityUplinkRadioOfficer #Mono: Changed to officer uplink + - BaseTSFUplinkRadioTeamleader #Mono: Changed to officer uplink - RadioHandheldNF # Mono diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/marine.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/marine.yml index 94a217ff81b..95ddcc4bd5b 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/marine.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/marine.yml @@ -41,5 +41,5 @@ storage: back: # - Magazine45_ACPPistolFMJ Mono - - BaseSecurityUplinkRadioDeputy #Mono: Added Deputy uplink + - BaseTSFUplinkRadioMarine #Mono: Added Deputy uplink - RadioHandheldNF # Mono diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/officer.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/officer.yml index 26896e5ca5b..1ef0306f882 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/officer.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/officer.yml @@ -55,7 +55,7 @@ storage: back: # - Magazine45_ACPPistolFMJ # Mono - - BaseSecurityUplinkRadioCaptain + - BaseTSFUplinkRadioOfficer # - ShipVoucherNfsdBailiff # Mono - RadioHandheldNF # Mono - RubberStampTSFCaptain # Mono diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/recruit.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/recruit.yml index c48cb2433be..e00c626adb2 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/recruit.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/recruit.yml @@ -48,5 +48,5 @@ back: - Magazine45_ACPPistolFMJ - FederationMilitaryCredit50 - - BaseSecurityUplinkRadio + - BaseTSFUplinkRadio - RadioHandheldNF # Mono diff --git a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/teamleader.yml b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/teamleader.yml index 5742dd10fde..8c5c51b6418 100644 --- a/Resources/Prototypes/_Mono/Roles/Jobs/TSF/teamleader.yml +++ b/Resources/Prototypes/_Mono/Roles/Jobs/TSF/teamleader.yml @@ -51,6 +51,6 @@ storage: back: # - Magazine45_ACPPistolFMJ Mono - - BaseSecurityUplinkRadioOfficer + - BaseTSFUplinkRadioTeamleader # - ShipVoucherNfsdSergeant # Mono - RadioHandheldNF # Mono diff --git a/Resources/Prototypes/_Mono/Store/categories.yml b/Resources/Prototypes/_Mono/Store/categories.yml new file mode 100644 index 00000000000..8189a86560f --- /dev/null +++ b/Resources/Prototypes/_Mono/Store/categories.yml @@ -0,0 +1,67 @@ +#security +- type: storeCategory + id: UplinkTsfBundles + name: store-category-tsfbundles + +- type: storeCategory + id: UplinkTsfHardsuits + name: store-category-tsfhardsuits + +- type: storeCategory + id: UplinkTsfWeapons + name: store-category-tsfweapons + +- type: storeCategory + id: UplinkTsfAmmo + name: store-category-tsfammo + +- type: storeCategory + id: UplinkTsfUtility + name: store-category-tsfutility + +- type: storeCategory + id: UplinkTsfExplosives + name: store-category-tsfexplosives +# mono edit + +- type: storeCategory + id: UplinkTsfVouchers + name: store-category-tsfvouchers + +# MARK: Rogue +- type: storeCategory + id: UplinkPirateBundles + name: store-category-pdvbundles + +- type: storeCategory + id: UplinkPirateEquipment + name: store-category-pdvequipment + +- type: storeCategory + id: UplinkPirateWeapons + name: store-category-pdvweapons + +- type: storeCategory + id: UplinkPirateAmmo + name: store-category-pdvammo + +- type: storeCategory + id: UplinkPirateMedical + name: store-category-pdvmedical + +- type: storeCategory + id: UplinkPirateUtility + name: store-category-pdvutility + +- type: storeCategory + id: UplinkPirateExplosives + name: store-category-pdvexplosives + +- type: storeCategory + id: UplinkPdvVouchers + name: store-category-pdvvouchers + +#- type: storeCategory +# id: UplinkPirateGambling +# name: store-category-pdvgambling +# mono edit end diff --git a/Resources/Prototypes/_NF/Store/presets.yml b/Resources/Prototypes/_Mono/Store/presets.yml similarity index 81% rename from Resources/Prototypes/_NF/Store/presets.yml rename to Resources/Prototypes/_Mono/Store/presets.yml index 7a21baceb84..e2bfdaf7b44 100644 --- a/Resources/Prototypes/_NF/Store/presets.yml +++ b/Resources/Prototypes/_Mono/Store/presets.yml @@ -22,19 +22,19 @@ Telecrystal: 0 - type: entity - id: StorePresetSecurityUplink + id: StorePresetTSFUplink abstract: true components: - type: Store name: store-preset-name-nfsd-uplink categories: - - UplinkSecurityHardsuits - - UplinkSecurityWeapons - - UplinkSecurityAmmo - - UplinkSecurityUtility - - UplinkSecurityExplosives - - UplinkSecurityBundles - - UplinkSecurityVouchers # Mono + - UplinkTsfHardsuits + - UplinkTsfWeapons + - UplinkTsfAmmo + - UplinkTsfUtility + - UplinkTsfExplosives + - UplinkTsfBundles + - UplinkTsfVouchers # Mono currencyWhitelist: - FederationMilitaryCredit balance: @@ -42,7 +42,7 @@ # mono edit - type: entity - id: StorePresetPirateUplink + id: StorePresetPDVUplink abstract: true components: - type: Store diff --git a/Resources/Prototypes/_Mono/tags.yml b/Resources/Prototypes/_Mono/tags.yml index f016040c9ac..e2275226f51 100644 --- a/Resources/Prototypes/_Mono/tags.yml +++ b/Resources/Prototypes/_Mono/tags.yml @@ -691,3 +691,11 @@ - type: Tag id: PdvStation + +# Faction uplink tags + +- type: Tag + id: TSFUplink + +- type: Tag + id: PDVUplink diff --git a/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml b/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml deleted file mode 100644 index 6901db9e9d0..00000000000 --- a/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml +++ /dev/null @@ -1,1383 +0,0 @@ -# FUC->FMC. FMC cost 5x - Mono - -- type: listing - id: UplinkClothingOuterHardsuitM82c - name: uplink-security-hardsuit-m82c-name - description: uplink-security-hardsuit-m82c-desc - productEntity: ClothingOuterHardsuitM82c - icon: { sprite: _Mono/Clothing/OuterClothing/Hardsuits/m82c.rsi, state: icon } - cost: - FederationMilitaryCredit: 10 - categories: - - UplinkSecurityHardsuits - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkClothingOuterHardsuitM82b - name: uplink-security-hardsuit-m82b-name - description: uplink-security-hardsuit-m82b-desc - productEntity: ClothingOuterHardsuitM82b - icon: { sprite: _Mono/Clothing/OuterClothing/Hardsuits/m82b.rsi, state: icon } - cost: - FederationMilitaryCredit: 10 - categories: - - UplinkSecurityHardsuits - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityMK58 - name: uplink-security-mk58-name - description: uplink-security-mk58-desc - productEntity: WeaponPistolMk58 - icon: { sprite: Objects/Weapons/Guns/Pistols/mk58.rsi, state: icon } - cost: - FederationMilitaryCredit: 10 - categories: - - UplinkSecurityWeapons - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityDisabler - name: uplink-security-disabler-name - description: uplink-security-disabler-desc - productEntity: WeaponDisabler - icon: { sprite: Objects/Weapons/Guns/Battery/disabler.rsi, state: base } - cost: - FederationMilitaryCredit: 5 - categories: - - UplinkSecurityWeapons - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityStunbaton - name: uplink-security-stunbaton-name - description: uplink-security-stunbaton-desc - productEntity: Stunbaton - icon: { sprite: Objects/Weapons/Melee/stunbaton.rsi, state: stunbaton_off } - cost: - FederationMilitaryCredit: 5 - categories: - - UplinkSecurityWeapons - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityEmitter - name: uplink-security-emitter-name - description: uplink-security-emitter-desc - productEntity: WeaponEmpEmitter - icon: { sprite: _NF/Objects/Weapons/Guns/Projectiles/emp.rsi, state: icon } - cost: - FederationMilitaryCredit: 15 #Mono Emmiter price: From 1 to 3 - categories: - - UplinkSecurityWeapons - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityEnforcer - name: uplink-security-enforcer-name - description: uplink-security-enforcer-desc - productEntity: WeaponShotgunEnforcer - icon: { sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi, state: icon } - cost: - FederationMilitaryCredit: 15 - categories: - - UplinkSecurityWeapons - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityLecter - name: uplink-security-lecter-name - description: uplink-security-lecter-desc - productEntity: WeaponRifleLecter - icon: { sprite: _Mono/Objects/Weapons/Guns/Rifles/lecter.rsi, state: icon } - cost: - FederationMilitaryCredit: 15 - categories: - - UplinkSecurityWeapons - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -# - type: listing # Mono - this entire listing -# id: UplinkSecurityHFBlade -# name: uplink-security-hfblade-name -# description: uplink-security-hfblade-desc -# productEntity: WeaponHFKatana -# icon: { sprite: _Mono/Objects/Weapons/Melee/hfblade.rsi, state: icon } -# cost: -# FederationMilitaryCredit: 50 -# categories: -# - UplinkSecurityWeapons -# conditions: -# - !type:StoreWhitelistCondition -# whitelist: -# tags: -# - SecurityUplink - -- type: listing - id: UplinkSecurityVulcan - name: uplink-security-vulcan-name - description: uplink-security-vulcan-desc - productEntity: WeaponRifleVulcan - icon: { sprite: _DV/Objects/Weapons/Guns/Rifles/vulcan.rsi, state: icon } - cost: - FederationMilitaryCredit: 15 - categories: - - UplinkSecurityWeapons - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityLaserCarbine - name: uplink-security-lasercarbine-name - description: uplink-security-lasercarbine-desc - productEntity: WeaponLaserCarbine - icon: { sprite: Objects/Weapons/Guns/Battery/laser_gun.rsi, state: icon } - cost: - FederationMilitaryCredit: 5 # GARBAGE!!! - categories: - - UplinkSecurityWeapons - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityDisablerSMG - name: uplink-security-disablersmg-name - description: uplink-security-disablersmg-desc - productEntity: WeaponDisablerSMG - icon: { sprite: Objects/Weapons/Guns/Battery/disabler_smg.rsi, state: base } - cost: - FederationMilitaryCredit: 25 # STUNMETA!!! - categories: - - UplinkSecurityWeapons - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityEnergySword - name: uplink-security-energysword-name - description: uplink-security-energysword-desc - productEntity: EnergySwordNfsd - icon: { sprite: Objects/Weapons/Melee/e_sword.rsi, state: e_sword } - cost: - FederationMilitaryCredit: 30 - categories: - - UplinkSecurityWeapons - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityWT550 - name: uplink-security-wt550-name - description: uplink-security-wt550-desc - productEntity: WeaponSubMachineGunWt550 - icon: { sprite: Objects/Weapons/Guns/SMGs/wt550.rsi, state: icon } - cost: - FederationMilitaryCredit: 20 - categories: - - UplinkSecurityWeapons - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityEnergyGun - name: uplink-security-energygun-name - description: uplink-security-energygun-desc - productEntity: WeaponEnergyGun - icon: { sprite: _DV/Objects/Weapons/Guns/Battery/energygun.rsi, state: icon } - cost: - FederationMilitaryCredit: 15 - categories: - - UplinkSecurityWeapons - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityEmpRpg - name: uplink-security-emprpg-name - description: uplink-security-emprpg-desc - productEntity: WeaponLauncherRocketEmp - icon: { sprite: Objects/Weapons/Guns/Launchers/rocket.rsi, state: base } - cost: - FederationMilitaryCredit: 100 # Cost increased pending removal or rebalancing - categories: - - UplinkSecurityWeapons - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - - -- type: listing - id: UplinkSecurityHolo - name: uplink-security-holo-name - description: uplink-security-holo-desc - productEntity: HoloprojectorNfsd - icon: { sprite: _NF/Objects/Devices/Holoprojectors/nfsd.rsi, state: icon } - cost: - FederationMilitaryCredit: 5 - categories: - - UplinkSecurityUtility - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkForcefieldTSF - name: uplink-security-forcefield-name - description: uplink-security-forcefield-desc - productEntity: HoloprojectorFieldTSF - icon: { sprite: _NF/Objects/Devices/Holoprojectors/nfsd.rsi, state: icon } - cost: - FederationMilitaryCredit: 55 - categories: - - UplinkSecurityUtility - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityJetpack - name: uplink-security-jetpack-name - description: uplink-security-jetpack-desc - productEntity: JetpackNfsdFilled - icon: { sprite: _NF/Objects/Tanks/Jetpacks/nfsd.rsi, state: icon } - cost: - FederationMilitaryCredit: 5 - categories: - - UplinkSecurityUtility - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityMagboots - name: uplink-security-magboots-name - description: uplink-security-magboots-desc - productEntity: ClothingShoesBootsMagSecurityFilled # Mono - icon: { sprite: _NF/Clothing/Shoes/Boots/magboots-security.rsi, state: icon } - cost: - FederationMilitaryCredit: 5 - categories: - - UplinkSecurityUtility - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkNfsdTechfab - name: uplink-security-techfab-name - description: uplink-security-techfab-desc - productEntity: NfsdTechFabCircuitboard - icon: { sprite: _NF/Objects/Misc/module.rsi, state: nfsd } - cost: - FederationMilitaryCredit: 25 - categories: - - UplinkSecurityUtility - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityKey - name: uplink-security-key-name - description: uplink-security-key-desc - productEntity: BoxEncryptionKeyNfsd - icon: { sprite: Objects/Storage/boxes.rsi, state: box } - cost: - FederationMilitaryCredit: 5 - categories: - - UplinkSecurityUtility - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - - !type:BuyerJobCondition - whitelist: - - TsfCommander - -#Mono start - -#- type: listing -# id: UplinkSecurityRadPen -# name: uplink-security-rad-pen-name -# description: uplink-security-rad-pen-desc -# productEntity: RadAutoInjector -# icon: { sprite: Objects/Specific/Medical/medipen.rsi, state: arithpen } -# cost: -# FederationMilitaryCredit: 18 -# categories: -# - UplinkSecurityUtility -# conditions: -# - !type:StoreWhitelistCondition -# whitelist: -# tags: -# - SecurityUplink -# - !type:BuyerJobCondition -# whitelist: -# - Sheriff -# - Brigmedic - -#- type: listing -# id: UplinkSecurityPyrazinePen -# name: uplink-security-pyrazine-pen-name -# description: uplink-security-pyrazine-pen-desc -# productEntity: PyraAutoInjector -# icon: { sprite: Objects/Specific/Medical/medipen.rsi, state: pyrapen } -# cost: -# FederationMilitaryCredit: 18 -# categories: -# - UplinkSecurityUtility -# conditions: -# - !type:StoreWhitelistCondition -# whitelist: -# tags: -# - SecurityUplink - -#- type: listing -# id: UplinkSecurityPuncturasePen -# name: uplink-security-puncturase-pen-name -# description: uplink-security-puncturase-pen-desc -# productEntity: PunctAutoInjector -# icon: { sprite: Objects/Specific/Medical/medipen.rsi, state: punctpen } -# cost: -# FederationMilitaryCredit: 18 -# categories: -# - UplinkSecurityUtility -# conditions: -# - !type:StoreWhitelistCondition -# whitelist: -# tags: -# - SecurityUplink - -#- type: listing -# id: UplinkSecurityAntiPoisonPen -# name: uplink-security-anti-poison-pen-name -# description: uplink-security-anti-poison-pen-desc -# productEntity: AntiPoisonMedipen -# icon: { sprite: Objects/Specific/Medical/medipen.rsi, state: penacid } -# cost: -# FederationMilitaryCredit: 18 -# categories: -# - UplinkSecurityUtility -# conditions: -# - !type:StoreWhitelistCondition -# whitelist: -# tags: -# - SecurityUplink - -- type: listing - id: UplinkSecurityOmnizineJug - name: uplink-security-omnizine-jug-name - description: uplink-security-omnizine-jug-desc - productEntity: JugOmnizine - cost: - FederationMilitaryCredit: 60 - categories: - - UplinkSecurityUtility - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - - !type:BuyerJobCondition - whitelist: - - TsfCommander - - TsfCorpsman - -- type: listing - id: UplinkSecurityMedicalAssembler - name: uplink-security-medical-assembler-name - description: uplink-security-medical-assembler-desc - productEntity: MedicalAssemblerFlatpack - cost: - FederationMilitaryCredit: 8 - categories: - - UplinkSecurityUtility - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - - !type:BuyerJobCondition - whitelist: - - TsfCommander - - TsfCorpsman - -- type: listing - id: UplinkSecurityCompactDefibrillator - name: uplink-security-compact-defibrillator-name - description: uplink-security-compact-defibrillator-desc - productEntity: DefibrillatorCompact - cost: - FederationMilitaryCredit: 15 - categories: - - UplinkSecurityUtility - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - - !type:BuyerJobCondition - whitelist: - - TsfCommander - - TsfCorpsman - -- type: listing - id: UplinkSecuritySyringeCaseFilled - name: uplink-security-syringe-case-name - description: uplink-security-syringe-case-desc - productEntity: SyringeCaseAltFilled - cost: - FederationMilitaryCredit: 50 - categories: - - UplinkSecurityUtility - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -#- type: listing -# id: UplinkSecurityCombatPen -# name: uplink-security-combat-pen-name -# description: uplink-security-combat-pen-desc -# productEntity: CombatMedipen -# icon: { sprite: Objects/Specific/Medical/medipen.rsi, state: morphen } -# cost: -# FederationMilitaryCredit: 12 -# categories: -# - UplinkSecurityUtility -# conditions: -# - !type:StoreWhitelistCondition -# whitelist: -# tags: -# - SecurityUplink - -- type: listing - id: UplinkSecurityCyborgModule - name: uplink-security-cyborg-module-name - description: uplink-security-cyborg-module-desc - productEntity: BorgModuleSecurity - icon: { sprite: Interface/Actions/actions_borg.rsi, state: syndicate-weapon-module } - cost: - FederationMilitaryCredit: 50 - categories: - - UplinkSecurityUtility - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityMechPulseRifle - name: uplink-security-mechpulserifle-name - description: uplink-security-mechpulserifle-desc - productEntity: WeaponMechCombatPulseRifleTSF - icon: { sprite: Objects/Specific/Mech/mecha_equipment.rsi, state: mecha_pulse } - cost: - FederationMilitaryCredit: 100 - categories: - - UplinkSecurityWeapons - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - - !type:BuyerJobCondition - whitelist: - - TsfOfficer - - TsfTeamleader - - TsfCommander - -#Mono end - -- type: listing - id: UplinkSecurityEmpRocket - name: uplink-security-emprocket-name - description: uplink-security-emprocket-desc - productEntity: CartridgeRocketEmp - icon: { sprite: _Mono/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi, state: rpg-emp } - cost: - FederationMilitaryCredit: 5 - categories: - - UplinkSecurityAmmo - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityThrusterKit - name: uplink-security-thrusterkit-name - description: uplink-security-thrusterkit-desc - productEntity: BoxT3SuperCapacitor - icon: { sprite: Objects/Storage/boxes.rsi, state: box} - cost: - FederationMilitaryCredit: 20 - categories: - - UplinkSecurityBundles - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityPistolMagazine - name: uplink-security-Magazine9x19mmPistolFMJ-name - description: uplink-security-Magazine9x19mmPistolFMJ-desc - productEntity: BoxMagazine9x19mmFMJ - icon: { sprite: Objects/Storage/boxes.rsi, state: box } - cost: - FederationMilitaryCredit: 5 - categories: - - UplinkSecurityAmmo - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurity556x45mmMagazine - name: uplink-security-5-56x45mmMagazine-name - description: uplink-security-5-56x45mmMagazine-desc - productEntity: BoxMagazine556x45mmFMJ - icon: { sprite: Objects/Storage/boxes.rsi, state: box } - cost: - FederationMilitaryCredit: 5 - categories: - - UplinkSecurityAmmo - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurity762x51mmMagazine - name: uplink-security-7-62x51mmMagazine-name - description: uplink-security-7-62x51mmMagazine-desc - productEntity: BoxMagazine762x51mmFMJ - icon: { sprite: Objects/Storage/boxes.rsi, state: box } - cost: - FederationMilitaryCredit: 5 - categories: - - UplinkSecurityAmmo - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurity762x51mmMagazineRubber - name: uplink-security-7-62x51mmMagazine-rubber-name - description: uplink-security-7-62x51mmMagazine-rubber-desc - productEntity: BoxMagazine762x51mmRubber - icon: { sprite: Objects/Storage/boxes.rsi, state: box } - cost: - FederationMilitaryCredit: 5 - categories: - - UplinkSecurityAmmo - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurity762x39mmMagazine - name: uplink-security-7-62x39mmMagazine-name - description: uplink-security-7-62x39mmMagazine-desc - productEntity: BoxMagazine762x39mmFMJ - icon: { sprite: Objects/Storage/boxes.rsi, state: box } - cost: - FederationMilitaryCredit: 5 - categories: - - UplinkSecurityAmmo - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityWT550Magazine - name: uplink-security-wt550magazine-name - description: uplink-security-wt550magazine-desc - productEntity: BoxMagazine46x30mmSubMachineGunTopMountedFMJ - icon: { sprite: Objects/Storage/boxes.rsi, state: box } - cost: - FederationMilitaryCredit: 5 - categories: - - UplinkSecurityAmmo - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityPistolMagazineRubber - name: uplink-security-Magazine9x19mmPistolFMJ-rubber-name - description: uplink-security-Magazine9x19mmPistolFMJ-rubber-desc - productEntity: BoxMagazine9x19mmRubber - icon: { sprite: Objects/Storage/boxes.rsi, state: box } - cost: - FederationMilitaryCredit: 5 - categories: - - UplinkSecurityAmmo - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurity556x45mmMagazineRubber - name: uplink-security-5-56x45mmMagazine-rubber-name - description: uplink-security-5-56x45mmMagazine-rubber-desc - productEntity: BoxMagazine556x45mmRubber - icon: { sprite: Objects/Storage/boxes.rsi, state: box } - cost: - FederationMilitaryCredit: 5 - categories: - - UplinkSecurityAmmo - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurity762x39mmMagazineRubber - name: uplink-security-7-62x39mmMagazine-rubber-name - description: uplink-security-7-62x39mmMagazine-rubber-desc - productEntity: BoxMagazine762x39mmRubber - icon: { sprite: Objects/Storage/boxes.rsi, state: box } - cost: - FederationMilitaryCredit: 5 - categories: - - UplinkSecurityAmmo - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityHypo - name: uplink-security-hypo-name - description: uplink-security-hypo-desc - productEntity: HypoBrigmedic - icon: { sprite: _NF/Objects/Specific/Medical/hypobrigmedic.rsi, state: hypo } - cost: - FederationMilitaryCredit: 5 - categories: - - UplinkSecurityUtility - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - - !type:BuyerJobCondition - whitelist: - - TsfCorpsman - - TsfCommander - -- type: listing - id: UplinkSecurityAmbuzol - name: uplink-security-ambuzol-name - description: uplink-security-ambuzol-desc - productEntity: SyringeAmbuzol - icon: { sprite: Objects/Specific/Chemistry/syringe.rsi, state: syringe_base0 } - cost: - FederationMilitaryCredit: 5 - categories: - - UplinkSecurityUtility - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityMedkit - name: uplink-security-medkit-name - description: uplink-security-medkit-desc - productEntity: MedkitCombatFilled - icon: { sprite: _NF/Objects/Specific/Medical/firstaidkits.rsi, state: blackkit } # Frontier: _NF prefix - cost: - FederationMilitaryCredit: 20 - categories: - - UplinkSecurityUtility - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - - !type:BuyerJobCondition - whitelist: - - TsfCorpsman - - TsfOfficer - - TsfCommander - -- type: listing - id: UplinkSecurityInspector - name: uplink-security-inspector-name - description: uplink-security-inspector-desc - productEntity: WeaponRevolverInspector - icon: { sprite: Objects/Weapons/Guns/Revolvers/inspector.rsi, state: icon } - cost: - FederationMilitaryCredit: 5 - categories: - - UplinkSecurityWeapons - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityMateba - name: uplink-security-mateba-name - description: uplink-security-mateba-desc - productEntity: WeaponRevolverMateba - icon: { sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi, state: icon } - cost: - FederationMilitaryCredit: 15 - categories: - - UplinkSecurityWeapons - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - - !type:BuyerJobCondition # Mono: Whitelisted Mateba to only Baliff, Sergeant and Sheriff - whitelist: - - TsfOfficer - - TsfTeamleader - - TsfCommander - -- type: listing - id: UplinkSecurityTruncheon - name: uplink-security-truncheon-name - description: uplink-security-truncheon-desc - productEntity: Truncheon - icon: { sprite: Objects/Weapons/Melee/truncheon.rsi, state: icon } - cost: - FederationMilitaryCredit: 5 - categories: - - UplinkSecurityWeapons - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityArmingSword - name: uplink-security-armingsword-name - description: uplink-security-armingsword-desc - productEntity: PlasteelArmingSword - icon: { sprite: _NF/Objects/Weapons/Melee/armingsword.rsi, state: icon } - cost: - FederationMilitaryCredit: 10 - categories: - - UplinkSecurityWeapons - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink -# Mono -#- type: listing -# id: UplinkSecurityCaptainSword -# name: uplink-security-captainsword-name -# description: uplink-security-captainsword-desc -# productEntity: ClothingBeltSheathFilled -# icon: { sprite: Objects/Weapons/Melee/captain_sabre.rsi, state: icon } -# cost: -# FederationMilitaryCredit: 10 #From 10 to 2 -# categories: -# - UplinkSecurityWeapons -# conditions: -# - !type:StoreWhitelistCondition -# whitelist: -# tags: -# - SecurityUplink - -- type: listing - id: UplinkSecurityPulsePistol - name: uplink-security-pulsepistol-name - description: uplink-security-pulsepistol-desc - productEntity: WeaponPulsePistol - icon: { sprite: Objects/Weapons/Guns/Battery/pulse_pistol.rsi, state: base } - cost: - FederationMilitaryCredit: 60 - categories: - - UplinkSecurityWeapons - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - - !type:BuyerJobCondition - whitelist: - - TsfOfficer - - TsfTeamleader - - TsfCommander - -- type: listing - id: UplinkSecurityPulseCarbine - name: uplink-security-pulsecarbine-name - description: uplink-security-pulsecarbine-desc - productEntity: WeaponPulseCarbine - icon: { sprite: Objects/Weapons/Guns/Battery/pulse_carbine.rsi, state: base } - cost: - FederationMilitaryCredit: 250 - categories: - - UplinkSecurityWeapons - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - - !type:BuyerJobCondition - whitelist: - - TsfCommander - - TsfOfficer - - TsfTeamleader - -- type: listing - id: UplinkSecurityHammer - name: uplink-security-hammer-name - description: uplink-security-hammer-desc - productEntity: SecBreachingHammer - icon: { sprite: Nyanotrasen/Objects/Weapons/Melee/breaching_hammer.rsi, state: icon } - cost: - FederationMilitaryCredit: 15 - categories: - - UplinkSecurityWeapons - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityTeleShield - name: uplink-security-teleshield-name - description: uplink-security-teleshield-desc - productEntity: TelescopicShield - icon: { sprite: Objects/Weapons/Melee/teleriot_shield.rsi, state: teleriot-on } - cost: - FederationMilitaryCredit: 10 - categories: - - UplinkSecurityUtility - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityEnergyShield - name: uplink-security-energyshield-name - description: uplink-security-energyshield-desc - productEntity: EnergyShieldNfsd - icon: { sprite: _NF/Objects/Weapons/Melee/e_shield.rsi, state: eshield-on } - cost: - FederationMilitaryCredit: 40 - categories: - - UplinkSecurityUtility - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecuritySwat - name: uplink-security-swat-name - description: uplink-security-swat-desc - productEntity: ClothingMaskGasSheriff - icon: { sprite: _NF/Clothing/Mask/nfsd_sheriff.rsi, state: icon} - cost: - FederationMilitaryCredit: 5 #Mono: From 3 to 1 - categories: - - UplinkSecurityUtility - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - - !type:BuyerJobCondition - whitelist: - - TsfOfficer - - TsfTeamleader - - TsfCommander - -- type: listing - id: UplinkSecuritySpeedloader - name: uplink-security-speedloader-name - description: uplink-security-speedloader-desc - productEntity: SpeedLoader45_magnumFMJ - icon: { sprite: _Mono/Objects/Weapons/Guns/Ammunition/SpeedLoaders/45_magnum/45_magnum_speed_loader.rsi, state: base } - cost: - FederationMilitaryCredit: 5 - categories: - - UplinkSecurityAmmo - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecuritySpeedloaderRubber - name: uplink-security-speedloaderrubber-name - description: uplink-security-speedloaderrubber-desc - productEntity: SpeedLoader45_magnumRubber - icon: { sprite: _Mono/Objects/Weapons/Guns/Ammunition/SpeedLoaders/45_magnum/45_magnum_speed_loader.rsi, state: base } - cost: - FederationMilitaryCredit: 5 - categories: - - UplinkSecurityAmmo - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityShotLethal - name: uplink-security-shotlethal-name - description: uplink-security-shotlethal-desc - productEntity: AmmoBox12_gaugeBuckshot - icon: { sprite: Objects/Storage/boxes.rsi, state: box } - cost: - FederationMilitaryCredit: 5 - categories: - - UplinkSecurityAmmo - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityShotBeanbag - name: uplink-security-shotbeanbag-name - description: uplink-security-shotbeanbag-desc - productEntity: AmmoBox12_gaugeBeanbag - icon: { sprite: Objects/Storage/boxes.rsi, state: box } - cost: - FederationMilitaryCredit: 5 - categories: - - UplinkSecurityAmmo - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityShotIncend - name: uplink-security-shotincend-name - description: uplink-security-shotincend-desc - productEntity: AmmoBox12_gaugeIncendiary - icon: { sprite: Objects/Storage/boxes.rsi, state: box } - cost: - FederationMilitaryCredit: 10 - categories: - - UplinkSecurityAmmo - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityShotSlug - name: uplink-security-shotslug-name - description: uplink-security-shotslug-desc - productEntity: AmmoBox12_gaugeSlug - icon: { sprite: Objects/Storage/boxes.rsi, state: box } - cost: - FederationMilitaryCredit: 5 - categories: - - UplinkSecurityAmmo - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityCash7500 - name: uplink-security-cash7500-name - description: uplink-security-cash7500-desc - productEntity: SpaceCash7500 # Mono: Changed the exchange rate from 1000 to 5000 to 7500 - icon: { sprite: Objects/Economy/cash.rsi, state: cash_1000000 } - cost: - FederationMilitaryCredit: 5 - categories: - - UplinkSecurityUtility - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecuritySmokeGrenadeBox - name: uplink-security-smokegrenade-box-name - description: uplink-security-smokegrenade-box-desc - productEntity: BoxSmokeGrenades - icon: { sprite: Objects/Weapons/Grenades/smoke.rsi, state: icon} - cost: - FederationMilitaryCredit: 5 - categories: - - UplinkSecurityExplosives # Moved to Explosives - Mono - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityTeargasGrenadeBox - name: uplink-security-teargasgrenade-box-name - description: uplink-security-teargasgrenade-box-desc - productEntity: BoxTeargasGrenades - icon: { sprite: Objects/Weapons/Grenades/tear_gas.rsi, state: icon} - cost: - FederationMilitaryCredit: 10 - categories: - - UplinkSecurityExplosives # Moved to Explosives - Mono - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityFlashbangGrenadeBox - name: uplink-security-flashbanggrenade-box-name - description: uplink-security-flashbanggrenade-box-desc - productEntity: BoxFlashBangGrenades - icon: { sprite: Objects/Weapons/Grenades/flashbang.rsi, state: icon} - cost: - FederationMilitaryCredit: 5 - categories: - - UplinkSecurityExplosives # Moved to Explosives - Mono - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityStingerGrenadeBox - name: uplink-security-stingergrenade-box-name - description: uplink-security-stingergrenade-box-desc - productEntity: BoxStingerGrenadesNfsd - icon: { sprite: Objects/Weapons/Grenades/stingergrenade.rsi, state: icon} - cost: - FederationMilitaryCredit: 10 - categories: - - UplinkSecurityExplosives # Moved to Explosives - Mono - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityEmpGrenadeBox - name: uplink-security-empgrenade-box-name - description: uplink-security-empgrenade-box-desc - productEntity: BoxEMPGrenadesNfsd - icon: { sprite: Objects/Weapons/Grenades/empgrenade.rsi, state: icon} - cost: - FederationMilitaryCredit: 10 - categories: - - UplinkSecurityExplosives - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityExplosiveGrenadeBox - name: uplink-security-explosivegrenade-box-name - description: uplink-security-explosivegrenade-box-desc - productEntity: BoxExplosiveGrenadesNfsd - icon: { sprite: Objects/Weapons/Grenades/grenade.rsi, state: icon} - cost: - FederationMilitaryCredit: 15 - categories: - - UplinkSecurityExplosives - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityIncendiaryGrenadeBox - name: uplink-security-incendiarygrenade-box-name - description: uplink-security-incendiarygrenade-box-desc - productEntity: BoxIncendiaryGrenadesNfsd - icon: { sprite: Objects/Weapons/Grenades/pyrogrenade.rsi, state: icon} - cost: - FederationMilitaryCredit: 10 # Mono 3->2 - categories: - - UplinkSecurityExplosives - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityShrapnelGrenadeBox - name: uplink-security-shrapnelgrenade-box-name - description: uplink-security-shrapnelgrenade-box-desc - productEntity: BoxShrapnelGrenadesNfsd - icon: { sprite: Objects/Weapons/Grenades/shrapnelgrenade.rsi, state: icon} - cost: - FederationMilitaryCredit: 10 - categories: - - UplinkSecurityExplosives - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityBreachingChargesBox - name: uplink-security-breachingcharge-box-name - description: uplink-security-breachingcharge-box-desc - productEntity: BoxBreachingCharges - icon: { sprite: _DV/Objects/Weapons/Bombs/breaching.rsi, state: icon} - cost: - FederationMilitaryCredit: 15 - categories: - - UplinkSecurityExplosives - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityHoverbikeNfsdFlatpack - name: uplink-security-hoverbike-name - description: uplink-security-hoverbike-desc - productEntity: HoverbikeNfsdFlatpack - icon: { sprite: _NF/Objects/Vehicles/hoverbike.rsi, state: vehicle } - cost: - FederationMilitaryCredit: 15 - categories: - - UplinkSecurityUtility - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityLethalArmory - name: uplink-security-lethalarmory-name - description: uplink-security-lethalarmory-desc - productEntity: CrateArmoryLethalNfsd - icon: { sprite: _NF/Structures/Storage/Crates/nfsd_secure2.rsi, state: icon } - cost: - FederationMilitaryCredit: 75 - categories: - - UplinkSecurityBundles - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityTrackingBundle - name: uplink-security-trackingdart-bundle-name - description: uplink-security-trackingdart-bundle-desc - productEntity: ClothingBackpackDuffelNfsdTrackingBundle - icon: { sprite: _NF/Clothing/Back/Duffels/nfsd_brown.rsi, state: icon } - cost: - FederationMilitaryCredit: 20 - categories: - - UplinkSecurityBundles - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityEmpBundle - name: uplink-security-emp-bundle-name - description: uplink-security-emp-bundle-desc - productEntity: ClothingBackpackDuffelNfsdEmpBundle - icon: { sprite: _NF/Clothing/Back/Duffels/nfsd_brown.rsi, state: icon } - cost: - FederationMilitaryCredit: 20 - categories: - - UplinkSecurityBundles - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityNonLethalArmory - name: uplink-security-nonlethalarmory-name - description: uplink-security-nonlethalarmory-desc - productEntity: CrateArmoryNonLethalNfsd - icon: { sprite: _NF/Structures/Storage/Crates/nfsd_secure1.rsi, state: icon } - cost: - FederationMilitaryCredit: 50 - categories: - - UplinkSecurityBundles - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityEmpGrenadeAmmo - name: uplink-security-emp-ammo-name - description: uplink-security-emp-ammo-desc - productEntity: BoxEmpGrenadesAmmo - icon: { sprite: Objects/Storage/boxes.rsi, state: box } - cost: - FederationMilitaryCredit: 5 - categories: - - UplinkSecurityAmmo - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityTrackingDartsAmmo - name: uplink-security-trackingdart-ammo-name - description: uplink-security-trackingdart-ammo-desc - productEntity: NFBoxDartsTracking - icon: { sprite: Objects/Storage/boxes.rsi, state: box } - cost: - FederationMilitaryCredit: 5 - categories: - - UplinkSecurityAmmo - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecuritySpaceBladeSec - name: uplink-security-spaceblade-sec-name - description: uplink-security-spaceblade-sec-desc - productEntity: SpaceBladeSec - icon: { sprite: _NF/Objects/Fun/spaceblade.rsi, state: secblade } - cost: - FederationMilitaryCredit: 5 - categories: - - UplinkSecurityUtility - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - -- type: listing - id: UplinkSecurityContrabandForensicsModule - name: uplink-security-contraband-forensics-module-name - description: uplink-security-contraband-forensics-module-desc - productEntity: ContrabandForensicsModule - icon: { sprite: _NF/Objects/Devices/cartridge.rsi, state: contraband_forensics } - cost: - FederationMilitaryCredit: 20 - categories: - - UplinkSecurityUtility - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink diff --git a/Resources/Prototypes/_NF/Entities/Objects/base_contraband.yml b/Resources/Prototypes/_NF/Entities/Objects/base_contraband.yml deleted file mode 100644 index 7b2f849f40a..00000000000 --- a/Resources/Prototypes/_NF/Entities/Objects/base_contraband.yml +++ /dev/null @@ -1,247 +0,0 @@ -# Frontier-specific contraband targets. -# If you need multiple currency types, specify them in the actual object instead of inheriting multiple parents here. - -- type: entity # Mono - id: BaseContrabandNoValue - abstract: true - components: - - type: Contraband - turnInValues: - FederationMilitaryCredit: 0 - Doubloon: 0 - -# region Class 1 -- type: entity - parent: BaseContrabandNoValue - id: BaseC1Contraband - abstract: true - components: - - type: Contraband - severity: Class1 - # Pretty much everyone. - allowedDepartments: [ Civilian, Security, Command, Frontier, CentralCommand ] - -- type: entity - parent: BaseC1Contraband - id: BaseClearContraband - abstract: true - components: - - type: Contraband - hideValues: true -# endregion Class 1 - -# region Class 2 -# Class 2 contraband: explosives, unregistered firearms, - -# Specific parent for sensitive items (e.g. command headset, secway, secway keys) that should not be redeemed for FMCs -- type: entity - parent: BaseContrabandNoValue - id: BaseC2ContrabandUnredeemable - abstract: true - components: - - type: Contraband - severity: Class2 - # Security and heads only (finally, shotgun traffic controller) - allowedDepartments: [ Security, Command ] - -- type: entity - parent: BaseC2ContrabandUnredeemable - id: BaseC2ExpeditionContraband - abstract: true - components: - - type: Contraband - severity: Class2Expedition - turnInValues: - FederationMilitaryCredit: 5 - -- type: entity - parent: BaseC2ContrabandUnredeemable - id: BaseC2Contraband - abstract: true -# endregion - -# region Class 3 Objects -- type: entity - parent: BaseContrabandNoValue - id: BaseC3ContrabandUnredeemable - abstract: true - components: - - type: Contraband - severity: Class3General - -- type: entity - parent: BaseC3ContrabandUnredeemable - id: BaseC3ExpeditionContraband - abstract: true - components: - - type: Contraband - severity: Class3Expedition - turnInValues: - FederationMilitaryCredit: 15 - - type: ItemTax # Mono - taxAccounts: - nfsd: -0.05 - -- type: entity - parent: BaseC3ContrabandUnredeemable - id: BaseC3Contraband - abstract: true - components: - - type: Contraband - turnInValues: - FederationMilitaryCredit: 10 - - type: ItemTax # Mono - taxAccounts: - nfsd: -0.05 - -- type: entity - parent: BaseC3ContrabandUnredeemable - id: BaseC3ContrabandNoValue - abstract: true - -- type: entity - parent: BaseC3ContrabandUnredeemable - id: BaseC3CultContrabandUnredeemable - abstract: true - components: - - type: Contraband - severity: Class3Cult - -- type: entity - parent: BaseC3CultContrabandUnredeemable - id: BaseC3CultContraband - abstract: true - components: - - type: Contraband - turnInValues: - FederationMilitaryCredit: 10 - -- type: entity - parent: BaseC3ContrabandUnredeemable - id: BaseC3CultContrabandNoValue - abstract: true - -- type: entity - parent: BaseC3ContrabandUnredeemable - id: BaseC3PirateContrabandNoValue - abstract: true - components: - - type: Contraband - severity: Class3Pirate - -- type: entity - parent: BaseC3PirateContrabandNoValue - id: BaseC3PirateContraband - abstract: true - components: - - type: Contraband - turnInValues: - FederationMilitaryCredit: 5 - - type: ItemTax # Mono - taxAccounts: - nfsd: -0.1 - -- type: entity - parent: BaseC3PirateContrabandNoValue - id: BaseC3PirateContrabandHighValue # Mono - abstract: true - components: - - type: Contraband - severity: Class3PirateHighValue - turnInValues: - FederationMilitaryCredit: 20 - - type: ItemTax # Mono - taxAccounts: - nfsd: -0.1 - -- type: entity - parent: BaseC3ContrabandUnredeemable - id: BaseC3SyndicateContrabandUnredeemable - abstract: true - components: - - type: Contraband - severity: Class3Syndicate - -- type: entity - parent: BaseC3SyndicateContrabandUnredeemable - id: BaseC3SyndicateContrabandNoValue - abstract: true - -- type: entity - parent: BaseC3SyndicateContrabandUnredeemable - id: BaseC3SyndicateContraband - abstract: true - components: - - type: Contraband - turnInValues: - FederationMilitaryCredit: 10 - - type: ItemTax # Mono - taxAccounts: - nfsd: -0.2 - -- type: entity - parent: BaseC3ContrabandUnredeemable - id: BaseC3WizardContrabandUnredeemable - abstract: true - components: - - type: Contraband - severity: Class3Wizard - -- type: entity - parent: BaseC3ContrabandUnredeemable - id: BaseC3WizardContraband - abstract: true - components: - - type: Contraband - severity: Class3Wizard - turnInValues: - FederationMilitaryCredit: 5 -# endregion - -# region Class 3 Mobs -- type: entity - parent: BaseC3Contraband - id: BaseC3MobHuman # For people (should be sapients, humanoids) - abstract: true - components: - - type: Contraband - severity: Class3MobHuman - hideCarryStatus: true - -- type: entity - parent: BaseC3Contraband - id: BaseC3MobCreature # For non-humanoid/non-sapient beasts - abstract: true - components: - - type: Contraband - severity: Class3MobCreature - hideCarryStatus: true - -- type: entity - parent: BaseC3MobCreature - id: BaseC3MobCreatureNoValue # For non-humanoid/non-sapient beasts - abstract: true - -- type: entity - parent: BaseC3Contraband - id: BaseC3MobConstruct # For thinking artifacts, robots, etc. - abstract: true - components: - - type: Contraband - severity: Class3MobConstruct - hideCarryStatus: true -# endregion - -# region Miscellaneous -- type: entity - parent: BaseContrabandNoValue - id: BasePirateTarget - abstract: true - components: - - type: Contraband - severity: PirateTarget - # Security and heads only - turnInValues: - Doubloon: 5 - hideCarryStatus: true -# endregion diff --git a/Resources/Prototypes/_NF/Store/categories.yml b/Resources/Prototypes/_NF/Store/categories.yml deleted file mode 100644 index c34903237cd..00000000000 --- a/Resources/Prototypes/_NF/Store/categories.yml +++ /dev/null @@ -1,67 +0,0 @@ -#security -- type: storeCategory - id: UplinkSecurityBundles - name: store-category-secbundles - -- type: storeCategory - id: UplinkSecurityHardsuits - name: store-category-sechardsuits - -- type: storeCategory - id: UplinkSecurityWeapons - name: store-category-secweapons - -- type: storeCategory - id: UplinkSecurityAmmo - name: store-category-secammo - -- type: storeCategory - id: UplinkSecurityUtility - name: store-category-secutility - -- type: storeCategory - id: UplinkSecurityExplosives - name: store-category-secexplosives -# mono edit - -- type: storeCategory - id: UplinkSecurityVouchers - name: store-category-secvouchers - -# MARK: Rogue -- type: storeCategory - id: UplinkPirateBundles - name: store-category-piratebundles - -- type: storeCategory - id: UplinkPirateEquipment - name: store-category-pirateequipment - -- type: storeCategory - id: UplinkPirateWeapons - name: store-category-pirateweapons - -- type: storeCategory - id: UplinkPirateAmmo - name: store-category-pirateammo - -- type: storeCategory - id: UplinkPirateMedical - name: store-category-piratemedical - -- type: storeCategory - id: UplinkPirateUtility - name: store-category-pirateutility - -- type: storeCategory - id: UplinkPirateExplosives - name: store-category-pirateexplosives - -- type: storeCategory - id: UplinkPdvVouchers - name: store-category-pdvvouchers - -#- type: storeCategory -# id: UplinkPirateGambling -# name: store-category-pirategambling -# mono edit end diff --git a/Resources/Prototypes/_NF/currency.yml b/Resources/Prototypes/_NF/currency.yml index c2edf7c746d..88e4b7ccda5 100644 --- a/Resources/Prototypes/_NF/currency.yml +++ b/Resources/Prototypes/_NF/currency.yml @@ -7,14 +7,14 @@ - type: currency id: FederationMilitaryCredit - displayName: store-currency-display-security-telecrystal + displayName: store-currency-display-tsf-telecrystal cash: 1: FederationMilitaryCredit1 canWithdraw: true - type: currency id: Doubloon - displayName: store-currency-display-pirate-telecrystal + displayName: store-currency-display-pdv-telecrystal cash: 1: Doubloon1 canWithdraw: true diff --git a/Resources/Prototypes/_NF/tags.yml b/Resources/Prototypes/_NF/tags.yml index 48e22f42902..783b78a5a79 100644 --- a/Resources/Prototypes/_NF/tags.yml +++ b/Resources/Prototypes/_NF/tags.yml @@ -110,12 +110,6 @@ - type: Tag id: MailCapsule -- type: Tag - id: SecurityUplink - -- type: Tag - id: PirateUplink - - type: Tag id: DroneUsable @@ -168,4 +162,4 @@ id: NFPaperStampProtected - type: Tag - id: NFHotdog \ No newline at end of file + id: NFHotdog From 62335942db425ca71eb6af1df05ab4f55e8030f7 Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Fri, 17 Jul 2026 16:00:41 +0200 Subject: [PATCH 51/55] worthless file --- .../Prototypes/_NF/Catalog/uplink_catalog.yml | 21 ------------------- 1 file changed, 21 deletions(-) delete mode 100644 Resources/Prototypes/_NF/Catalog/uplink_catalog.yml diff --git a/Resources/Prototypes/_NF/Catalog/uplink_catalog.yml b/Resources/Prototypes/_NF/Catalog/uplink_catalog.yml deleted file mode 100644 index c662a63fc97..00000000000 --- a/Resources/Prototypes/_NF/Catalog/uplink_catalog.yml +++ /dev/null @@ -1,21 +0,0 @@ -# - type: listing # Mono Edit - Boring -# id: UplinkEmpGrenadeLauncherBundle -# name: uplink-emp-grenade-launcher-bundle-name -# description: uplink-emp-grenade-launcher-bundle-desc -# icon: { sprite: /Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi, state: icon } -# productEntity: ClothingBackpackDuffelSyndicateFilledEmpGrenadeLauncher -# cost: -# Telecrystal: 25 -# categories: -# - UplinkWeaponry - -- type: listing - id: UplinkSecuritySpaceBladeSyndicate - name: uplink-spaceblade-syndicate-name - description: uplink-spaceblade-syndicate-desc - productEntity: SpaceBladeContra - icon: { sprite: _NF/Objects/Fun/spaceblade.rsi, state: contraband } - cost: - Telecrystal: 5 - categories: - - UplinkPointless From 105f42dfe6d83c7763fdc7dc01f0cabc78660f67 Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Fri, 17 Jul 2026 16:08:53 +0200 Subject: [PATCH 52/55] oops nuked load bearing thing --- .../_NF/Entities/Objects/base_contraband.yml | 247 ++++++++++++++++++ 1 file changed, 247 insertions(+) create mode 100644 Resources/Prototypes/_NF/Entities/Objects/base_contraband.yml diff --git a/Resources/Prototypes/_NF/Entities/Objects/base_contraband.yml b/Resources/Prototypes/_NF/Entities/Objects/base_contraband.yml new file mode 100644 index 00000000000..0cf01f6a1ba --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/base_contraband.yml @@ -0,0 +1,247 @@ +# Frontier-specific contraband targets. +# If you need multiple currency types, specify them in the actual object instead of inheriting multiple parents here. + +- type entity # Mono + id BaseContrabandNoValue + abstract true + components + - type Contraband + turnInValues + FederationMilitaryCredit 0 + Doubloon 0 + +# region Class 1 +- type entity + parent BaseContrabandNoValue + id BaseC1Contraband + abstract true + components + - type Contraband + severity Class1 + # Pretty much everyone. + allowedDepartments [ Civilian, Security, Command, Frontier, CentralCommand ] + +- type entity + parent BaseC1Contraband + id BaseClearContraband + abstract true + components + - type Contraband + hideValues true +# endregion Class 1 + +# region Class 2 +# Class 2 contraband explosives, unregistered firearms, + +# Specific parent for sensitive items (e.g. command headset, secway, secway keys) that should not be redeemed for FMCs +- type entity + parent BaseContrabandNoValue + id BaseC2ContrabandUnredeemable + abstract true + components + - type Contraband + severity Class2 + # Security and heads only (finally, shotgun traffic controller) + allowedDepartments [ Security, Command ] + +- type entity + parent BaseC2ContrabandUnredeemable + id BaseC2ExpeditionContraband + abstract true + components + - type Contraband + severity Class2Expedition + turnInValues + FederationMilitaryCredit 5 + +- type entity + parent BaseC2ContrabandUnredeemable + id BaseC2Contraband + abstract true +# endregion + +# region Class 3 Objects +- type entity + parent BaseContrabandNoValue + id BaseC3ContrabandUnredeemable + abstract true + components + - type Contraband + severity Class3General + +- type entity + parent BaseC3ContrabandUnredeemable + id BaseC3ExpeditionContraband + abstract true + components + - type Contraband + severity Class3Expedition + turnInValues + FederationMilitaryCredit 15 + - type ItemTax # Mono + taxAccounts + nfsd -0.05 + +- type entity + parent BaseC3ContrabandUnredeemable + id BaseC3Contraband + abstract true + components + - type Contraband + turnInValues + FederationMilitaryCredit 10 + - type ItemTax # Mono + taxAccounts + nfsd -0.05 + +- type entity + parent BaseC3ContrabandUnredeemable + id BaseC3ContrabandNoValue + abstract true + +- type entity + parent BaseC3ContrabandUnredeemable + id BaseC3CultContrabandUnredeemable + abstract true + components + - type Contraband + severity Class3Cult + +- type entity + parent BaseC3CultContrabandUnredeemable + id BaseC3CultContraband + abstract true + components + - type Contraband + turnInValues + FederationMilitaryCredit 10 + +- type entity + parent BaseC3ContrabandUnredeemable + id BaseC3CultContrabandNoValue + abstract true + +- type entity + parent BaseC3ContrabandUnredeemable + id BaseC3PirateContrabandNoValue + abstract true + components + - type Contraband + severity Class3Pirate + +- type entity + parent BaseC3PirateContrabandNoValue + id BaseC3PirateContraband + abstract true + components + - type Contraband + turnInValues + FederationMilitaryCredit 5 + - type ItemTax # Mono + taxAccounts + nfsd -0.1 + +- type entity + parent BaseC3PirateContrabandNoValue + id BaseC3PirateContrabandHighValue # Mono + abstract true + components + - type Contraband + severity Class3PirateHighValue + turnInValues + FederationMilitaryCredit 20 + - type ItemTax # Mono + taxAccounts + nfsd -0.1 + +- type entity + parent BaseC3ContrabandUnredeemable + id BaseC3SyndicateContrabandUnredeemable + abstract true + components + - type Contraband + severity Class3Syndicate + +- type entity + parent BaseC3SyndicateContrabandUnredeemable + id BaseC3SyndicateContrabandNoValue + abstract true + +- type entity + parent BaseC3SyndicateContrabandUnredeemable + id BaseC3SyndicateContraband + abstract true + components + - type Contraband + turnInValues + FederationMilitaryCredit 10 + - type ItemTax # Mono + taxAccounts + nfsd -0.2 + +- type entity + parent BaseC3ContrabandUnredeemable + id BaseC3WizardContrabandUnredeemable + abstract true + components + - type Contraband + severity Class3Wizard + +- type entity + parent BaseC3ContrabandUnredeemable + id BaseC3WizardContraband + abstract true + components + - type Contraband + severity Class3Wizard + turnInValues + FederationMilitaryCredit 5 +# endregion + +# region Class 3 Mobs +- type entity + parent BaseC3Contraband + id BaseC3MobHuman # For people (should be sapients, humanoids) + abstract true + components + - type Contraband + severity Class3MobHuman + hideCarryStatus true + +- type entity + parent BaseC3Contraband + id BaseC3MobCreature # For non-humanoidnon-sapient beasts + abstract true + components + - type Contraband + severity Class3MobCreature + hideCarryStatus true + +- type entity + parent BaseC3MobCreature + id BaseC3MobCreatureNoValue # For non-humanoidnon-sapient beasts + abstract true + +- type entity + parent BaseC3Contraband + id BaseC3MobConstruct # For thinking artifacts, robots, etc. + abstract true + components + - type Contraband + severity Class3MobConstruct + hideCarryStatus true +# endregion + +# region Miscellaneous +- type entity + parent BaseContrabandNoValue + id BasePirateTarget + abstract true + components + - type Contraband + severity PirateTarget + # Security and heads only + turnInValues + Doubloon 5 + hideCarryStatus true +# endregion \ No newline at end of file From 1b347b101944d090954a58d52767cde18ea50ebb Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Fri, 17 Jul 2026 16:12:27 +0200 Subject: [PATCH 53/55] oops indentation error --- .../_NF/Entities/Objects/base_contraband.yml | 451 +++++++++--------- 1 file changed, 226 insertions(+), 225 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/base_contraband.yml b/Resources/Prototypes/_NF/Entities/Objects/base_contraband.yml index 0cf01f6a1ba..f3a9c0982c5 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/base_contraband.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/base_contraband.yml @@ -1,247 +1,248 @@ # Frontier-specific contraband targets. # If you need multiple currency types, specify them in the actual object instead of inheriting multiple parents here. -- type entity # Mono - id BaseContrabandNoValue - abstract true - components - - type Contraband - turnInValues - FederationMilitaryCredit 0 - Doubloon 0 + +- type: entity # Mono + id: BaseContrabandNoValue + abstract: true + components: + - type: Contraband + turnInValues: + FederationMilitaryCredit: 0 + Doubloon: 0 # region Class 1 -- type entity - parent BaseContrabandNoValue - id BaseC1Contraband - abstract true - components - - type Contraband - severity Class1 +- type: entity + parent: BaseContrabandNoValue + id: BaseC1Contraband + abstract: true + components: + - type: Contraband + severity: Class1 # Pretty much everyone. - allowedDepartments [ Civilian, Security, Command, Frontier, CentralCommand ] - -- type entity - parent BaseC1Contraband - id BaseClearContraband - abstract true - components - - type Contraband - hideValues true + allowedDepartments: [ Civilian, Security, Command, Frontier, CentralCommand ] + +- type: entity + parent: BaseC1Contraband + id: BaseClearContraband + abstract: true + components: + - type: Contraband + hideValues: true # endregion Class 1 # region Class 2 -# Class 2 contraband explosives, unregistered firearms, +# Class 2 contraband: explosives, unregistered firearms, # Specific parent for sensitive items (e.g. command headset, secway, secway keys) that should not be redeemed for FMCs -- type entity - parent BaseContrabandNoValue - id BaseC2ContrabandUnredeemable - abstract true - components - - type Contraband - severity Class2 +- type: entity + parent: BaseContrabandNoValue + id: BaseC2ContrabandUnredeemable + abstract: true + components: + - type: Contraband + severity: Class2 # Security and heads only (finally, shotgun traffic controller) - allowedDepartments [ Security, Command ] - -- type entity - parent BaseC2ContrabandUnredeemable - id BaseC2ExpeditionContraband - abstract true - components - - type Contraband - severity Class2Expedition - turnInValues - FederationMilitaryCredit 5 - -- type entity - parent BaseC2ContrabandUnredeemable - id BaseC2Contraband - abstract true + allowedDepartments: [ Security, Command ] + +- type: entity + parent: BaseC2ContrabandUnredeemable + id: BaseC2ExpeditionContraband + abstract: true + components: + - type: Contraband + severity: Class2Expedition + turnInValues: + FederationMilitaryCredit: 5 + +- type: entity + parent: BaseC2ContrabandUnredeemable + id: BaseC2Contraband + abstract: true # endregion # region Class 3 Objects -- type entity - parent BaseContrabandNoValue - id BaseC3ContrabandUnredeemable - abstract true - components - - type Contraband - severity Class3General - -- type entity - parent BaseC3ContrabandUnredeemable - id BaseC3ExpeditionContraband - abstract true - components - - type Contraband - severity Class3Expedition - turnInValues - FederationMilitaryCredit 15 - - type ItemTax # Mono - taxAccounts - nfsd -0.05 - -- type entity - parent BaseC3ContrabandUnredeemable - id BaseC3Contraband - abstract true - components - - type Contraband - turnInValues - FederationMilitaryCredit 10 - - type ItemTax # Mono - taxAccounts - nfsd -0.05 - -- type entity - parent BaseC3ContrabandUnredeemable - id BaseC3ContrabandNoValue - abstract true - -- type entity - parent BaseC3ContrabandUnredeemable - id BaseC3CultContrabandUnredeemable - abstract true - components - - type Contraband - severity Class3Cult - -- type entity - parent BaseC3CultContrabandUnredeemable - id BaseC3CultContraband - abstract true - components - - type Contraband - turnInValues - FederationMilitaryCredit 10 - -- type entity - parent BaseC3ContrabandUnredeemable - id BaseC3CultContrabandNoValue - abstract true - -- type entity - parent BaseC3ContrabandUnredeemable - id BaseC3PirateContrabandNoValue - abstract true - components - - type Contraband - severity Class3Pirate - -- type entity - parent BaseC3PirateContrabandNoValue - id BaseC3PirateContraband - abstract true - components - - type Contraband - turnInValues - FederationMilitaryCredit 5 - - type ItemTax # Mono - taxAccounts - nfsd -0.1 - -- type entity - parent BaseC3PirateContrabandNoValue - id BaseC3PirateContrabandHighValue # Mono - abstract true - components - - type Contraband - severity Class3PirateHighValue - turnInValues - FederationMilitaryCredit 20 - - type ItemTax # Mono - taxAccounts - nfsd -0.1 - -- type entity - parent BaseC3ContrabandUnredeemable - id BaseC3SyndicateContrabandUnredeemable - abstract true - components - - type Contraband - severity Class3Syndicate - -- type entity - parent BaseC3SyndicateContrabandUnredeemable - id BaseC3SyndicateContrabandNoValue - abstract true - -- type entity - parent BaseC3SyndicateContrabandUnredeemable - id BaseC3SyndicateContraband - abstract true - components - - type Contraband - turnInValues - FederationMilitaryCredit 10 - - type ItemTax # Mono - taxAccounts - nfsd -0.2 - -- type entity - parent BaseC3ContrabandUnredeemable - id BaseC3WizardContrabandUnredeemable - abstract true - components - - type Contraband - severity Class3Wizard - -- type entity - parent BaseC3ContrabandUnredeemable - id BaseC3WizardContraband - abstract true - components - - type Contraband - severity Class3Wizard - turnInValues - FederationMilitaryCredit 5 +- type: entity + parent: BaseContrabandNoValue + id: BaseC3ContrabandUnredeemable + abstract: true + components: + - type: Contraband + severity: Class3General + +- type: entity + parent: BaseC3ContrabandUnredeemable + id: BaseC3ExpeditionContraband + abstract: true + components: + - type: Contraband + severity: Class3Expedition + turnInValues: + FederationMilitaryCredit: 15 + - type: ItemTax # Mono + taxAccounts: + nfsd: -0.05 + +- type: entity + parent: BaseC3ContrabandUnredeemable + id: BaseC3Contraband + abstract: true + components: + - type: Contraband + turnInValues: + FederationMilitaryCredit: 10 + - type: ItemTax # Mono + taxAccounts: + nfsd: -0.05 + +- type: entity + parent: BaseC3ContrabandUnredeemable + id: BaseC3ContrabandNoValue + abstract: true + +- type: entity + parent: BaseC3ContrabandUnredeemable + id: BaseC3CultContrabandUnredeemable + abstract: true + components: + - type: Contraband + severity: Class3Cult + +- type: entity + parent: BaseC3CultContrabandUnredeemable + id: BaseC3CultContraband + abstract: true + components: + - type: Contraband + turnInValues: + FederationMilitaryCredit: 10 + +- type: entity + parent: BaseC3ContrabandUnredeemable + id: BaseC3CultContrabandNoValue + abstract: true + +- type: entity + parent: BaseC3ContrabandUnredeemable + id: BaseC3PirateContrabandNoValue + abstract: true + components: + - type: Contraband + severity: Class3Pirate + +- type: entity + parent: BaseC3PirateContrabandNoValue + id: BaseC3PirateContraband + abstract: true + components: + - type: Contraband + turnInValues: + FederationMilitaryCredit: 5 + - type: ItemTax # Mono + taxAccounts: + nfsd: -0.1 + +- type: entity + parent: BaseC3PirateContrabandNoValue + id: BaseC3PirateContrabandHighValue # Mono + abstract: true + components: + - type: Contraband + severity: Class3PirateHighValue + turnInValues: + FederationMilitaryCredit: 20 + - type: ItemTax # Mono + taxAccounts: + nfsd: -0.1 + +- type: entity + parent: BaseC3ContrabandUnredeemable + id: BaseC3SyndicateContrabandUnredeemable + abstract: true + components: + - type: Contraband + severity: Class3Syndicate + +- type: entity + parent: BaseC3SyndicateContrabandUnredeemable + id: BaseC3SyndicateContrabandNoValue + abstract: true + +- type: entity + parent: BaseC3SyndicateContrabandUnredeemable + id: BaseC3SyndicateContraband + abstract: true + components: + - type: Contraband + turnInValues: + FederationMilitaryCredit: 10 + - type: ItemTax # Mono + taxAccounts: + nfsd: -0.2 + +- type: entity + parent: BaseC3ContrabandUnredeemable + id: BaseC3WizardContrabandUnredeemable + abstract: true + components: + - type: Contraband + severity: Class3Wizard + +- type: entity + parent: BaseC3ContrabandUnredeemable + id: BaseC3WizardContraband + abstract: true + components: + - type: Contraband + severity: Class3Wizard + turnInValues: + FederationMilitaryCredit: 5 # endregion # region Class 3 Mobs -- type entity - parent BaseC3Contraband - id BaseC3MobHuman # For people (should be sapients, humanoids) - abstract true - components - - type Contraband - severity Class3MobHuman - hideCarryStatus true - -- type entity - parent BaseC3Contraband - id BaseC3MobCreature # For non-humanoidnon-sapient beasts - abstract true - components - - type Contraband - severity Class3MobCreature - hideCarryStatus true - -- type entity - parent BaseC3MobCreature - id BaseC3MobCreatureNoValue # For non-humanoidnon-sapient beasts - abstract true - -- type entity - parent BaseC3Contraband - id BaseC3MobConstruct # For thinking artifacts, robots, etc. - abstract true - components - - type Contraband - severity Class3MobConstruct - hideCarryStatus true +- type: entity + parent: BaseC3Contraband + id: BaseC3MobHuman # For people (should be sapients, humanoids) + abstract: true + components: + - type: Contraband + severity: Class3MobHuman + hideCarryStatus: true + +- type: entity + parent: BaseC3Contraband + id: BaseC3MobCreature # For non-humanoid/non-sapient beasts + abstract: true + components: + - type: Contraband + severity: Class3MobCreature + hideCarryStatus: true + +- type: entity + parent: BaseC3MobCreature + id: BaseC3MobCreatureNoValue # For non-humanoid/non-sapient beasts + abstract: true + +- type: entity + parent: BaseC3Contraband + id: BaseC3MobConstruct # For thinking artifacts, robots, etc. + abstract: true + components: + - type: Contraband + severity: Class3MobConstruct + hideCarryStatus: true # endregion # region Miscellaneous -- type entity - parent BaseContrabandNoValue - id BasePirateTarget - abstract true - components - - type Contraband - severity PirateTarget +- type: entity + parent: BaseContrabandNoValue + id: BasePirateTarget + abstract: true + components: + - type: Contraband + severity: PirateTarget # Security and heads only - turnInValues - Doubloon 5 - hideCarryStatus true -# endregion \ No newline at end of file + turnInValues: + Doubloon: 5 + hideCarryStatus: true +# endregion From 59430bdbac979a52cd9b0ffda2487b43c97564d1 Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Sat, 18 Jul 2026 17:12:40 +0200 Subject: [PATCH 54/55] i forgot a line --- Resources/Prototypes/_Mono/Catalogs/tsfmc_uplink_catalog.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/_Mono/Catalogs/tsfmc_uplink_catalog.yml b/Resources/Prototypes/_Mono/Catalogs/tsfmc_uplink_catalog.yml index e8330d900c4..ec933e392f2 100644 --- a/Resources/Prototypes/_Mono/Catalogs/tsfmc_uplink_catalog.yml +++ b/Resources/Prototypes/_Mono/Catalogs/tsfmc_uplink_catalog.yml @@ -409,6 +409,7 @@ tags: - FactionStaticUplinkTsf +- type: listing id: UplinkSecurityT3VoucherFujian name: uplink-tsf-t3-fujian-voucher-name description: uplink-tsf-t3-fujian-voucher-desc From d18d8fd7a571b44917e98c5aaabfaa3684ba5722 Mon Sep 17 00:00:00 2001 From: EldritchPineapple Date: Sat, 18 Jul 2026 17:24:53 +0200 Subject: [PATCH 55/55] a --- Resources/Prototypes/_Mono/Shipyard/Nfsd/fujian.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Mono/Shipyard/Nfsd/fujian.yml b/Resources/Prototypes/_Mono/Shipyard/Nfsd/fujian.yml index 63d6c454a71..dbe6ac49f89 100644 --- a/Resources/Prototypes/_Mono/Shipyard/Nfsd/fujian.yml +++ b/Resources/Prototypes/_Mono/Shipyard/Nfsd/fujian.yml @@ -36,6 +36,6 @@ prefixCreator: '14' - type: StationJobs availableJobs: - Deputy: [ 0, 0 ] + TsfMarine: [ 0, 0 ] TsfBorg: [ 0, 0 ]