From db2c29176e108165fdc6ea7eb0b129d502283617 Mon Sep 17 00:00:00 2001 From: mersen-tyn Date: Sun, 27 Oct 2024 02:09:37 +0900 Subject: [PATCH] =?UTF-8?q?=D0=95=D1=89=D1=91=20=D1=84=D0=B8=D0=BA=D1=81?= =?UTF-8?q?=D1=8B=20=D0=BF=D0=BE=20=D1=88=D0=B0=D1=82=D1=82=D0=BB=D0=B0?= =?UTF-8?q?=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Maps/Corvax/Bluespace/RuinedCourser.yml | 7 - .../Maps/Corvax/Bluespace/RuinedCrescent.yml | 7 - .../Maps/Corvax/Bluespace/RuinedSprinter.yml | 7 - Resources/Maps/Corvax/POI/cove.yml | 68 +- .../BlackMarket/QueenAnnesRevenge.yml | 816 ++++++------------ .../Corvax/Shuttles/BlackMarket/barnacle.yml | 38 +- .../Corvax/Shuttles/BlackMarket/bocakillo.yml | 54 +- .../Corvax/Shuttles/BlackMarket/falcon.yml | 102 +-- .../Maps/Corvax/Shuttles/BlackMarket/hog.yml | 347 ++------ .../Corvax/Shuttles/BlackMarket/menace.yml | 25 +- .../Corvax/Shuttles/BlackMarket/schooner.yml | 18 +- .../Corvax/Shuttles/Civilian/liquidator.yml | 4 - .../Maps/Corvax/Shuttles/Medical/stasis.yml | 46 - .../Maps/Corvax/Shuttles/Nfsd/broadhead.yml | 3 - .../Maps/Corvax/Shuttles/Nfsd/fighter.yml | 2 +- .../Maps/Corvax/Shuttles/Nfsd/hammer.yml | 54 +- .../Maps/Corvax/Shuttles/Nfsd/interceptor.yml | 2 +- .../Maps/Corvax/Shuttles/Nfsd/prowler.yml | 4 +- Resources/Maps/Corvax/Shuttles/Nfsd/rogue.yml | 5 +- .../Maps/Corvax/Shuttles/Nfsd/warrior.yml | 65 +- Resources/Maps/Corvax/Shuttles/Nfsd/wasp.yml | 16 +- .../Maps/Corvax/Shuttles/Science/lyrae.yml | 26 - .../Corvax/Shuttles/Service/bocadillo.yml | 5 - .../Corvax/Shuttles/Service/kontrashef.yml | 154 ---- .../Maps/Corvax/Shuttles/Syndicate/hunter.yml | 272 +++--- .../Corvax/Shuttles/Syndicate/infiltrator.yml | 284 ++---- Resources/Maps/_NF/Bluespace/bloodmoon.yml | 2 +- Resources/Maps/_NF/Bluespace/cache.yml | 2 +- Resources/Maps/_NF/Bluespace/cave.yml | 2 +- Resources/Maps/_NF/Bluespace/mcevent.yml | 2 +- .../Maps/_NF/Bluespace/syndieftlintercept.yml | 2 +- Resources/Maps/_NF/Bluespace/vault.yml | 2 +- Resources/Maps/_NF/Bluespace/vaultsmall.yml | 2 +- .../Maps/_NF/Bluespace/wizardprobealt.yml | 2 +- .../Maps/_NF/Shuttles/Nfsd/broadhead.yml | 3 - Resources/Maps/_NF/Shuttles/Nfsd/fighter.yml | 2 +- .../Maps/_NF/Shuttles/Nfsd/interceptor.yml | 2 +- Resources/Maps/_NF/Shuttles/Nfsd/prowler.yml | 4 +- Resources/Maps/_NF/Shuttles/Nfsd/rogue.yml | 2 +- Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml | 4 +- Resources/Maps/_NF/Shuttles/bocadillo.yml | 5 - Resources/Maps/_NF/Shuttles/liquidator.yml | 4 - Resources/Maps/_NF/Shuttles/lyrae.yml | 26 - Resources/Maps/_NF/Shuttles/stasis.yml | 46 - Resources/Maps/_NF/Test/dev_map.yml | 15 - .../Corvax/Shipyard/BlackMarket/barnacle.yml | 5 + .../Corvax/Shipyard/BlackMarket/bocakillo.yml | 5 + .../Corvax/Shipyard/BlackMarket/falcon.yml | 5 + .../Corvax/Shipyard/BlackMarket/menace.yml | 5 + .../Corvax/Shipyard/BlackMarket/schooner.yml | 4 + .../Corvax/Shipyard/Civilian/bottleneck.yml | 39 + .../Corvax/Shipyard/Civilian/broom.yml | 41 + .../Corvax/Shipyard/Civilian/watchdog.yml | 40 + .../Corvax/Shipyard/Service/parcel.yml | 41 + Resources/Prototypes/_NF/Shipyard/Baron.yml | 34 - .../_NF/Shipyard/BlackMarket/barnacle.yml | 17 +- .../_NF/Shipyard/BlackMarket/bocakillo.yml | 11 +- .../_NF/Shipyard/BlackMarket/falcon.yml | 15 +- .../_NF/Shipyard/BlackMarket/menace.yml | 23 +- .../_NF/Shipyard/BlackMarket/schooner.yml | 11 +- .../_NF/Shipyard/Expedition/ambition.yml | 82 +- .../_NF/Shipyard/Expedition/anchor.yml | 82 +- .../_NF/Shipyard/Expedition/brigand.yml | 80 +- .../_NF/Shipyard/Expedition/courserx.yml | 31 - .../_NF/Shipyard/Expedition/dartx.yml | 38 - .../_NF/Shipyard/Expedition/decadedove.yml | 80 +- .../_NF/Shipyard/Expedition/dragonfly.yml | 80 +- .../_NF/Shipyard/Expedition/gasbender.yml | 82 +- .../_NF/Shipyard/Expedition/gourd.yml | 84 +- .../_NF/Shipyard/Expedition/pathfinder.yml | 80 +- .../_NF/Shipyard/Expedition/rosebudmkii.yml | 31 - .../_NF/Shipyard/Expedition/sprinter.yml | 80 +- .../_NF/Shipyard/Nfsd/broadhead.yml | 78 +- .../Prototypes/_NF/Shipyard/Nfsd/cleric.yml | 58 +- .../Prototypes/_NF/Shipyard/Nfsd/empress.yml | 66 +- .../Prototypes/_NF/Shipyard/Nfsd/enforcer.yml | 31 - .../Prototypes/_NF/Shipyard/Nfsd/fighter.yml | 58 +- .../_NF/Shipyard/Nfsd/hospitaller.yml | 56 +- .../_NF/Shipyard/Nfsd/inquisitor.yml | 29 - .../_NF/Shipyard/Nfsd/interceptor.yml | 56 +- .../Prototypes/_NF/Shipyard/Nfsd/marauder.yml | 29 - .../_NF/Shipyard/Nfsd/opportunity.yml | 31 - .../Prototypes/_NF/Shipyard/Nfsd/prowler.yml | 56 +- .../Prototypes/_NF/Shipyard/Nfsd/rogue.yml | 58 +- .../Prototypes/_NF/Shipyard/Nfsd/templar.yml | 56 +- .../Prototypes/_NF/Shipyard/Nfsd/trident.yml | 31 - .../Prototypes/_NF/Shipyard/Nfsd/wasp.yml | 62 +- .../Prototypes/_NF/Shipyard/Nfsd/wendigo.yml | 74 +- .../Prototypes/_NF/Shipyard/Nfsd/whiskey.yml | 29 - .../Prototypes/_NF/Shipyard/Scrap/bison.yml | 63 +- .../_NF/Shipyard/Scrap/canister.yml | 70 +- .../_NF/Shipyard/Scrap/disciple.yml | 82 +- .../Prototypes/_NF/Shipyard/Scrap/nugget.yml | 82 +- .../Prototypes/_NF/Shipyard/Scrap/orange.yml | 64 +- .../Prototypes/_NF/Shipyard/Scrap/point.yml | 62 +- .../Prototypes/_NF/Shipyard/Scrap/tide.yml | 62 +- .../Prototypes/_NF/Shipyard/Sr/bottleneck.yml | 56 +- .../Prototypes/_NF/Shipyard/Sr/broom.yml | 62 +- .../Prototypes/_NF/Shipyard/Sr/chauffeur.yml | 72 +- .../Prototypes/_NF/Shipyard/Sr/mailpod.yml | 76 +- .../Prototypes/_NF/Shipyard/Sr/parcel.yml | 60 +- .../Prototypes/_NF/Shipyard/Sr/watchdog.yml | 72 +- .../_NF/Shipyard/Syndicate/hunter.yml | 54 +- .../_NF/Shipyard/Syndicate/infiltrator.yml | 54 +- Resources/Prototypes/_NF/Shipyard/akupara.yml | 80 +- .../Prototypes/_NF/Shipyard/apothecary.yml | 82 +- Resources/Prototypes/_NF/Shipyard/barge.yml | 83 +- Resources/Prototypes/_NF/Shipyard/bazaar.yml | 82 +- Resources/Prototypes/_NF/Shipyard/beaker.yml | 60 +- Resources/Prototypes/_NF/Shipyard/bigskat.yml | 34 - .../Prototypes/_NF/Shipyard/bocadillo.yml | 80 +- Resources/Prototypes/_NF/Shipyard/bodkin.yml | 74 +- .../Prototypes/_NF/Shipyard/bookworm.yml | 80 +- Resources/Prototypes/_NF/Shipyard/bulker.yml | 80 +- .../Prototypes/_NF/Shipyard/caduceus.yml | 62 +- Resources/Prototypes/_NF/Shipyard/camper.yml | 80 +- .../Prototypes/_NF/Shipyard/centurion.yml | 26 - Resources/Prototypes/_NF/Shipyard/ceres.yml | 80 +- Resources/Prototypes/_NF/Shipyard/chisel.yml | 82 +- .../Prototypes/_NF/Shipyard/cleithro.yml | 38 - Resources/Prototypes/_NF/Shipyard/comet.yml | 82 +- Resources/Prototypes/_NF/Shipyard/condor.yml | 32 - .../Prototypes/_NF/Shipyard/construct.yml | 60 +- .../Prototypes/_NF/Shipyard/crescent.yml | 85 +- Resources/Prototypes/_NF/Shipyard/crown.yml | 28 - Resources/Prototypes/_NF/Shipyard/eagle.yml | 82 +- Resources/Prototypes/_NF/Shipyard/esquire.yml | 41 - Resources/Prototypes/_NF/Shipyard/garden.yml | 80 +- Resources/Prototypes/_NF/Shipyard/hammer.yml | 80 +- .../Prototypes/_NF/Shipyard/harbormaster.yml | 80 +- Resources/Prototypes/_NF/Shipyard/hauler.yml | 62 +- Resources/Prototypes/_NF/Shipyard/helix.yml | 42 - Resources/Prototypes/_NF/Shipyard/honker.yml | 70 +- .../Prototypes/_NF/Shipyard/investigator.yml | 81 +- Resources/Prototypes/_NF/Shipyard/kestrel.yml | 80 +- .../Prototypes/_NF/Shipyard/kilderkin.yml | 80 +- .../Prototypes/_NF/Shipyard/knuckleverse.yml | 31 - Resources/Prototypes/_NF/Shipyard/lantern.yml | 81 +- Resources/Prototypes/_NF/Shipyard/legman.yml | 80 +- .../Prototypes/_NF/Shipyard/liquidator.yml | 80 +- Resources/Prototypes/_NF/Shipyard/loader.yml | 80 +- Resources/Prototypes/_NF/Shipyard/lyrae.yml | 80 +- Resources/Prototypes/_NF/Shipyard/mccargo.yml | 74 +- .../Prototypes/_NF/Shipyard/mcdelivery.yml | 68 +- .../Prototypes/_NF/Shipyard/metastable.yml | 34 - Resources/Prototypes/_NF/Shipyard/mission.yml | 41 - Resources/Prototypes/_NF/Shipyard/phoenix.yml | 72 +- .../Prototypes/_NF/Shipyard/piecrust.yml | 80 +- Resources/Prototypes/_NF/Shipyard/pioneer.yml | 80 +- Resources/Prototypes/_NF/Shipyard/placebo.yml | 70 +- .../Prototypes/_NF/Shipyard/prospector.yml | 80 +- Resources/Prototypes/_NF/Shipyard/pts.yml | 80 +- Resources/Prototypes/_NF/Shipyard/pulse.yml | 41 - .../Prototypes/_NF/Shipyard/rosebudmki.yml | 41 - .../Prototypes/_NF/Shipyard/searchlight.yml | 80 +- Resources/Prototypes/_NF/Shipyard/skipper.yml | 80 +- Resources/Prototypes/_NF/Shipyard/sparrow.yml | 82 +- Resources/Prototypes/_NF/Shipyard/spectre.yml | 80 +- Resources/Prototypes/_NF/Shipyard/spirit.yml | 80 +- Resources/Prototypes/_NF/Shipyard/stasis.yml | 80 +- .../Prototypes/_NF/Shipyard/stellaris.yml | 60 +- Resources/Prototypes/_NF/Shipyard/stratos.yml | 41 - .../Prototypes/_NF/Shipyard/the_defector.yml | 28 - Resources/Prototypes/_NF/Shipyard/tyne.yml | 74 +- .../Prototypes/_NF/Shipyard/vagabond.yml | 83 +- Resources/Prototypes/_NF/Shipyard/warrior.yml | 27 - .../Prototypes/_NF/Shipyard/waveshot.yml | 41 - 167 files changed, 4085 insertions(+), 5647 deletions(-) create mode 100644 Resources/Prototypes/Corvax/Shipyard/Civilian/bottleneck.yml create mode 100644 Resources/Prototypes/Corvax/Shipyard/Civilian/broom.yml create mode 100644 Resources/Prototypes/Corvax/Shipyard/Civilian/watchdog.yml create mode 100644 Resources/Prototypes/Corvax/Shipyard/Service/parcel.yml delete mode 100644 Resources/Prototypes/_NF/Shipyard/Baron.yml delete mode 100644 Resources/Prototypes/_NF/Shipyard/Expedition/courserx.yml delete mode 100644 Resources/Prototypes/_NF/Shipyard/Expedition/dartx.yml delete mode 100644 Resources/Prototypes/_NF/Shipyard/Expedition/rosebudmkii.yml delete mode 100644 Resources/Prototypes/_NF/Shipyard/Nfsd/enforcer.yml delete mode 100644 Resources/Prototypes/_NF/Shipyard/Nfsd/inquisitor.yml delete mode 100644 Resources/Prototypes/_NF/Shipyard/Nfsd/marauder.yml delete mode 100644 Resources/Prototypes/_NF/Shipyard/Nfsd/opportunity.yml delete mode 100644 Resources/Prototypes/_NF/Shipyard/Nfsd/trident.yml delete mode 100644 Resources/Prototypes/_NF/Shipyard/Nfsd/whiskey.yml delete mode 100644 Resources/Prototypes/_NF/Shipyard/bigskat.yml delete mode 100644 Resources/Prototypes/_NF/Shipyard/centurion.yml delete mode 100644 Resources/Prototypes/_NF/Shipyard/cleithro.yml delete mode 100644 Resources/Prototypes/_NF/Shipyard/condor.yml delete mode 100644 Resources/Prototypes/_NF/Shipyard/crown.yml delete mode 100644 Resources/Prototypes/_NF/Shipyard/esquire.yml delete mode 100644 Resources/Prototypes/_NF/Shipyard/helix.yml delete mode 100644 Resources/Prototypes/_NF/Shipyard/knuckleverse.yml delete mode 100644 Resources/Prototypes/_NF/Shipyard/metastable.yml delete mode 100644 Resources/Prototypes/_NF/Shipyard/mission.yml delete mode 100644 Resources/Prototypes/_NF/Shipyard/pulse.yml delete mode 100644 Resources/Prototypes/_NF/Shipyard/rosebudmki.yml delete mode 100644 Resources/Prototypes/_NF/Shipyard/stratos.yml delete mode 100644 Resources/Prototypes/_NF/Shipyard/the_defector.yml delete mode 100644 Resources/Prototypes/_NF/Shipyard/warrior.yml delete mode 100644 Resources/Prototypes/_NF/Shipyard/waveshot.yml diff --git a/Resources/Maps/Corvax/Bluespace/RuinedCourser.yml b/Resources/Maps/Corvax/Bluespace/RuinedCourser.yml index 709f4107849..d5390cfa329 100644 --- a/Resources/Maps/Corvax/Bluespace/RuinedCourser.yml +++ b/Resources/Maps/Corvax/Bluespace/RuinedCourser.yml @@ -2542,13 +2542,6 @@ entities: rot: -1.5707963267948966 rad pos: -6.5,-4.5 parent: 1 -- proto: GunSafeShuttleT3Spawner - entities: - - uid: 115 - components: - - type: Transform - pos: 1.5,4.5 - parent: 1 - proto: HospitalCurtainsOpen entities: - uid: 460 diff --git a/Resources/Maps/Corvax/Bluespace/RuinedCrescent.yml b/Resources/Maps/Corvax/Bluespace/RuinedCrescent.yml index 833152de780..d6a9ced0494 100644 --- a/Resources/Maps/Corvax/Bluespace/RuinedCrescent.yml +++ b/Resources/Maps/Corvax/Bluespace/RuinedCrescent.yml @@ -14946,13 +14946,6 @@ entities: - type: Transform pos: 29.5,19.5 parent: 1 -- proto: GunSafeShuttleT2Spawner - entities: - - uid: 3712 - components: - - type: Transform - pos: -12.5,5.5 - parent: 1 - proto: HospitalCurtainsOpen entities: - uid: 2200 diff --git a/Resources/Maps/Corvax/Bluespace/RuinedSprinter.yml b/Resources/Maps/Corvax/Bluespace/RuinedSprinter.yml index 142dd893b6d..46672ce71b7 100644 --- a/Resources/Maps/Corvax/Bluespace/RuinedSprinter.yml +++ b/Resources/Maps/Corvax/Bluespace/RuinedSprinter.yml @@ -2841,13 +2841,6 @@ entities: rot: 3.141592653589793 rad pos: 5.5,-9.5 parent: 1 -- proto: GunSafeShuttleT1Spawner - entities: - - uid: 70 - components: - - type: Transform - pos: 3.5,6.5 - parent: 1 - proto: Gyroscope entities: - uid: 580 diff --git a/Resources/Maps/Corvax/POI/cove.yml b/Resources/Maps/Corvax/POI/cove.yml index 649e5e1f194..f1bf59646bb 100644 --- a/Resources/Maps/Corvax/POI/cove.yml +++ b/Resources/Maps/Corvax/POI/cove.yml @@ -4958,31 +4958,11 @@ entities: - type: Transform pos: -0.5,16.5 parent: 1 - - type: ContainerContainer - containers: - ShipyardConsole-targetId: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - board: !type:Container - showEnts: False - occludes: True - ents: [] - uid: 1959 components: - type: Transform pos: -3.5,16.5 parent: 1 - - type: ContainerContainer - containers: - ShipyardConsole-targetId: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - board: !type:Container - showEnts: False - occludes: True - ents: [] - proto: ComputerTabletopIFFPOI entities: - uid: 1920 @@ -5018,18 +4998,6 @@ entities: - type: Transform pos: 5.5,2.5 parent: 1 - - type: ContainerContainer - containers: - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - board: !type:Container - showEnts: False - occludes: True - ents: [] - - type: Physics - canCollide: False - proto: ContrabandPalletPirate entities: - uid: 229 @@ -5653,28 +5621,16 @@ entities: - type: Transform pos: -3.015983,26.135101 parent: 1 - - type: ItemSlots - - type: ContainerContainer - containers: - paper_label: !type:ContainerSlot {} - uid: 1113 components: - type: Transform pos: -3.3076496,25.978851 parent: 1 - - type: ItemSlots - - type: ContainerContainer - containers: - paper_label: !type:ContainerSlot {} - uid: 1116 components: - type: Transform pos: 2.508083,11.4275875 parent: 1 - - type: ItemSlots - - type: ContainerContainer - containers: - paper_label: !type:ContainerSlot {} - proto: DrinkPremiumRumBottleFull entities: - uid: 1600 @@ -5903,7 +5859,7 @@ entities: pos: 7.5,28.5 parent: 1 - type: Door - secondsUntilStateChange: -7306.7144 + secondsUntilStateChange: -7358.568 state: Opening - proto: FenceWoodSmallCorner entities: @@ -7832,7 +7788,7 @@ entities: - type: Transform pos: 1.5,7.5 parent: 1 -- proto: KitchenDeepFryer +- proto: KitchenDeepFryerCauldron entities: - uid: 334 components: @@ -7840,13 +7796,6 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,5.5 parent: 1 -- proto: SyndicateKitchenElectricRange - entities: - - uid: 774 - components: - - type: Transform - pos: 0.5,7.5 - parent: 1 - proto: KitchenKnife entities: - uid: 234 @@ -8182,10 +8131,6 @@ entities: - type: Transform pos: 9.5,17.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PortableScrubber entities: - uid: 9 @@ -9259,6 +9204,8 @@ entities: rot: 1.5707963267948966 rad pos: 24.5,22.5 parent: 1 + missingComponents: + - Anchorable - proto: SignalButton entities: - uid: 173 @@ -9760,6 +9707,13 @@ entities: rot: -1.5707963267948966 rad pos: -2.4595704,36.201065 parent: 1 +- proto: SyndicateKitchenElectricRange + entities: + - uid: 774 + components: + - type: Transform + pos: 0.5,7.5 + parent: 1 - proto: SyndicateMicrowave entities: - uid: 149 diff --git a/Resources/Maps/Corvax/Shuttles/BlackMarket/QueenAnnesRevenge.yml b/Resources/Maps/Corvax/Shuttles/BlackMarket/QueenAnnesRevenge.yml index 121518f1996..82c07d51bd6 100644 --- a/Resources/Maps/Corvax/Shuttles/BlackMarket/QueenAnnesRevenge.yml +++ b/Resources/Maps/Corvax/Shuttles/BlackMarket/QueenAnnesRevenge.yml @@ -1242,8 +1242,8 @@ entities: 0: 41182 2: 256 0,1: - 0: 65533 - 1: 2 + 0: 61429 + 3: 4106 -1,1: 0: 16556 2: 512 @@ -1259,15 +1259,16 @@ entities: 0: 8 2: 128 0,-1: - 0: 26191 - 1: 34816 + 3: 34819 + 0: 26188 0,4: 0: 17476 2: 40960 1,0: 0: 45166 1,1: - 0: 20919 + 0: 16823 + 3: 4096 2: 2048 1,2: 0: 8275 @@ -1281,17 +1282,17 @@ entities: 0: 16 2: 256 0,-4: - 3: 3856 + 4: 3856 -1,-4: 2: 4224 - 3: 16384 + 4: 16384 0,-3: 0: 65535 -1,-3: 0: 34816 - 3: 2 - 4: 1536 - 5: 24576 + 4: 2 + 5: 1536 + 6: 24576 2: 4 0,-2: 0: 65295 @@ -1300,12 +1301,12 @@ entities: -1,-1: 0: 60687 1,-4: - 3: 16656 + 4: 16656 2: 32 1,-3: 0: 65297 2: 4 - 3: 8 + 4: 8 1,-2: 0: 48911 2,-2: @@ -1331,10 +1332,10 @@ entities: - 0 - 0 - volume: 2500 - temperature: 293.14996 + temperature: 293.1499 moles: - - 20.078888 - - 75.53487 + - 18.472576 + - 69.49208 - 0 - 0 - 0 @@ -1360,6 +1361,21 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.14996 + moles: + - 20.078888 + - 75.53487 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - volume: 2500 immutable: True moles: @@ -1499,7 +1515,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -17200.588 + secondsUntilStateChange: -17424.22 state: Opening - uid: 10 components: @@ -1511,7 +1527,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -17200.354 + secondsUntilStateChange: -17423.986 state: Opening - uid: 11 components: @@ -1523,7 +1539,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -17200.137 + secondsUntilStateChange: -17423.77 state: Opening - uid: 12 components: @@ -1535,7 +1551,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -17201.486 + secondsUntilStateChange: -17425.12 state: Opening - uid: 13 components: @@ -1547,7 +1563,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -17201.736 + secondsUntilStateChange: -17425.37 state: Opening - uid: 14 components: @@ -1559,7 +1575,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -17202.021 + secondsUntilStateChange: -17425.654 state: Opening - proto: AirSensor entities: @@ -1930,6 +1946,48 @@ entities: - type: Transform pos: -2.5,-8.5 parent: 1 +- proto: Basketball + entities: + - uid: 248 + components: + - type: Transform + pos: 0.56190515,9.674493 + parent: 1 + - uid: 249 + components: + - type: Transform + pos: 4.4994054,9.614871 + parent: 1 + - uid: 250 + components: + - type: Transform + pos: 5.615699,5.6150746 + parent: 1 + - uid: 251 + components: + - type: Transform + pos: 6.6414514,1.5262253 + parent: 1 + - uid: 252 + components: + - type: Transform + pos: -1.5286378,1.4830947 + parent: 1 + - uid: 253 + components: + - type: Transform + pos: 6.5685344,-1.5398065 + parent: 1 + - uid: 254 + components: + - type: Transform + pos: -1.4453048,-1.5841062 + parent: 1 + - uid: 255 + components: + - type: Transform + pos: -0.5110115,5.526995 + parent: 1 - proto: Bed entities: - uid: 67 @@ -1990,74 +2048,47 @@ entities: - type: Transform pos: -0.5,8.5 parent: 1 - - type: DeviceLinkSink - links: - - 466 - uid: 77 components: - type: Transform pos: 5.5,8.5 parent: 1 - - type: DeviceLinkSink - links: - - 652 - uid: 78 components: - type: Transform pos: 7.5,-0.5 parent: 1 - - type: DeviceLinkSink - links: - - 640 - uid: 79 components: - type: Transform pos: 7.5,0.5 parent: 1 - - type: DeviceLinkSink - links: - - 640 - uid: 80 components: - type: Transform pos: -2.5,-0.5 parent: 1 - - type: DeviceLinkSink - links: - - 470 - uid: 81 components: - type: Transform pos: -2.5,0.5 parent: 1 - - type: DeviceLinkSink - links: - - 470 - uid: 82 components: - type: Transform pos: -1.5,4.5 parent: 1 - - type: DeviceLinkSink - links: - - 641 - uid: 83 components: - type: Transform pos: 6.5,4.5 parent: 1 - - type: DeviceLinkSink - links: - - 642 - uid: 84 components: - type: Transform rot: 3.141592653589793 rad pos: 2.5,15.5 parent: 1 - - type: DeviceLinkSink - links: - - 657 - proto: BloodCultAlwaysPoweredLight entities: - uid: 85 @@ -2088,36 +2119,6 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,10.5 parent: 1 -- proto: BreachingCharge - entities: - - uid: 412 - components: - - type: Transform - parent: 280 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 837 - components: - - type: Transform - parent: 280 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 988 - components: - - type: Transform - parent: 290 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 989 - components: - - type: Transform - parent: 290 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: ButtonFrameCaution entities: - uid: 90 @@ -2885,333 +2886,51 @@ entities: - type: Transform pos: 0.49287558,-11.114133 parent: 1 -- proto: CannonBall +- proto: CannonBallEmp entities: - - uid: 240 - components: - - type: Transform - pos: 0.26775646,9.658323 - parent: 1 - uid: 241 components: - type: Transform - pos: 0.5607691,9.638792 - parent: 1 - - uid: 242 - components: - - type: Transform - pos: 0.8537817,9.619261 - parent: 1 - - uid: 243 - components: - - type: Transform - pos: 0.3263588,9.463011 - parent: 1 - - uid: 244 - components: - - type: Transform - pos: 0.67797375,9.44348 - parent: 1 - - uid: 245 - components: - - type: Transform - pos: 4.2527304,9.697386 - parent: 1 - - uid: 246 - components: - - type: Transform - pos: 4.565277,9.658323 - parent: 1 - - uid: 247 - components: - - type: Transform - pos: 4.8192215,9.619261 - parent: 1 - - uid: 248 - components: - - type: Transform - pos: 4.350401,9.482542 - parent: 1 - - uid: 249 - components: - - type: Transform - pos: 4.6238794,9.44348 - parent: 1 - - uid: 250 - components: - - type: Transform - pos: 5.3466444,5.6348853 - parent: 1 - - uid: 251 - components: - - type: Transform - pos: 5.5810537,5.6544166 - parent: 1 - - uid: 252 - components: - - type: Transform - pos: 5.7763968,5.6348853 - parent: 1 - - uid: 253 - components: - - type: Transform - pos: 5.483384,5.439573 - parent: 1 - - uid: 254 - components: - - type: Transform - pos: 5.6982603,5.380979 - parent: 1 - - uid: 255 - components: - - type: Transform - pos: 6.2647505,1.6436214 - parent: 1 - - uid: 256 - components: - - type: Transform - pos: 6.4600935,1.6436214 - parent: 1 - - uid: 257 - components: - - type: Transform - pos: 6.6749697,1.6631527 - parent: 1 - - uid: 258 - components: - - type: Transform - pos: 6.323354,1.3897152 - parent: 1 - - uid: 259 - components: - - type: Transform - pos: 6.6163664,1.4092464 - parent: 1 - - uid: 260 - components: - - type: Transform - pos: 6.2647505,-1.2239459 - parent: 1 - - uid: 261 - components: - - type: Transform - pos: 6.518695,-1.2825396 - parent: 1 - - uid: 262 - components: - - type: Transform - pos: 6.7921743,-1.4583209 - parent: 1 - - uid: 263 - components: - - type: Transform - pos: 6.342887,-1.5364459 - parent: 1 - - uid: 264 - components: - - type: Transform - pos: 6.557763,-1.6341021 - parent: 1 - - uid: 265 - components: - - type: Transform - pos: -1.6465939,-1.3801959 - parent: 1 - - uid: 266 - components: - - type: Transform - pos: -1.3535813,-1.2825396 - parent: 1 - - uid: 267 - components: - - type: Transform - pos: -1.119171,-1.5169146 - parent: 1 - - uid: 268 - components: - - type: Transform - pos: -1.470786,-1.6145709 - parent: 1 - - uid: 269 - components: - - type: Transform - pos: -1.8028678,-1.7512896 - parent: 1 - - uid: 270 - components: - - type: Transform - pos: -1.7247304,1.6471479 - parent: 1 - - uid: 271 - components: - - type: Transform - pos: -1.3926495,1.6862104 - parent: 1 - - uid: 272 - components: - - type: Transform - pos: -1.119171,1.6471479 - parent: 1 - - uid: 273 - components: - - type: Transform - pos: -1.5879916,1.3932416 - parent: 1 - - uid: 274 - components: - - type: Transform - pos: -1.1973075,1.3541791 - parent: 1 - - uid: 275 - components: - - type: Transform - pos: -0.748021,5.659576 - parent: 1 - - uid: 276 - components: - - type: Transform - pos: -0.43547428,5.659576 - parent: 1 - - uid: 277 - components: - - type: Transform - pos: -0.14246178,5.6400447 - parent: 1 - - uid: 278 - components: - - type: Transform - pos: -0.6112822,5.444732 - parent: 1 - - uid: 279 - components: - - type: Transform - pos: -0.2792015,5.3861384 - parent: 1 - - uid: 281 - components: - - type: Transform - parent: 280 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 282 - components: - - type: Transform - parent: 280 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 283 - components: - - type: Transform - parent: 280 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 284 - components: - - type: Transform - parent: 280 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 285 - components: - - type: Transform - parent: 280 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 291 - components: - - type: Transform - parent: 290 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 292 - components: - - type: Transform - parent: 290 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 293 - components: - - type: Transform - parent: 290 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 294 - components: - - type: Transform - parent: 290 + parent: 240 - type: Physics canCollide: False - type: InsideEntityStorage - - uid: 295 + - uid: 246 components: - type: Transform - parent: 290 + parent: 244 - type: Physics canCollide: False - type: InsideEntityStorage - proto: CannonBallGlassshot entities: - - uid: 286 - components: - - type: Transform - parent: 280 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 287 - components: - - type: Transform - parent: 280 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 288 - components: - - type: Transform - parent: 280 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 289 - components: - - type: Transform - parent: 280 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 296 + - uid: 243 components: - type: Transform - parent: 290 + parent: 240 - type: Physics canCollide: False - type: InsideEntityStorage - - uid: 297 + - uid: 245 components: - type: Transform - parent: 290 + parent: 244 - type: Physics canCollide: False - type: InsideEntityStorage - - uid: 298 +- proto: CannonBallGrapeshot + entities: + - uid: 242 components: - type: Transform - parent: 290 + parent: 240 - type: Physics canCollide: False - type: InsideEntityStorage - - uid: 299 + - uid: 247 components: - type: Transform - parent: 290 + parent: 244 - type: Physics canCollide: False - type: InsideEntityStorage @@ -3936,6 +3655,24 @@ entities: - type: Transform pos: 3.5,4.5 parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14923 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - proto: CratePirateChestCaptain entities: - uid: 433 @@ -3968,11 +3705,47 @@ entities: - type: Transform pos: 0.5,-3.5 parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14923 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - uid: 435 components: - type: Transform pos: 1.5,-3.5 parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14923 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - uid: 436 components: - type: Transform @@ -5173,19 +4946,21 @@ entities: parent: 1 - proto: GunSafe entities: - - uid: 280 + - uid: 240 components: - type: Transform pos: 1.5,3.5 parent: 1 + - type: Lock + locked: False - type: EntityStorage air: volume: 200 immutable: False - temperature: 293.14923 + temperature: 293.14908 moles: - - 1.7459903 - - 6.568249 + - 1.606311 + - 6.042789 - 0 - 0 - 0 @@ -5202,34 +4977,28 @@ entities: showEnts: False occludes: True ents: - - 286 - - 281 - - 282 - - 283 - - 287 - - 284 - - 288 - - 285 - - 412 - - 289 - - 837 + - 241 + - 242 + - 243 paper_label: !type:ContainerSlot showEnts: False occludes: True ent: null - - uid: 290 + - uid: 244 components: - type: Transform pos: 3.5,3.5 parent: 1 + - type: Lock + locked: False - type: EntityStorage air: volume: 200 immutable: False - temperature: 293.14923 + temperature: 293.14908 moles: - - 1.7459903 - - 6.568249 + - 1.606311 + - 6.042789 - 0 - 0 - 0 @@ -5246,17 +5015,9 @@ entities: showEnts: False occludes: True ents: - - 296 - - 297 - - 291 - - 292 - - 298 - - 293 - - 294 - - 299 - - 295 - - 988 - - 989 + - 245 + - 246 + - 247 paper_label: !type:ContainerSlot showEnts: False occludes: True @@ -5268,8 +5029,6 @@ entities: - type: Transform pos: 0.5,-7.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - proto: HarmonicaInstrument entities: - uid: 485 @@ -5545,17 +5304,12 @@ entities: parent: 1 - type: DeviceLinkSink invokeCounter: 6 - links: - - 656 - uid: 626 components: - type: Transform rot: 1.5707963267948966 rad pos: -2.5,-8.5 parent: 1 - - type: DeviceLinkSink - links: - - 655 - proto: Rack entities: - uid: 627 @@ -5699,9 +5453,8 @@ entities: rot: 3.141592653589793 rad pos: 2.5,14.5 parent: 1 - - type: DeviceLinkSink - links: - - 657 + missingComponents: + - Anchorable - proto: ShuttleGunPirateCannon entities: - uid: 464 @@ -5710,9 +5463,6 @@ entities: rot: -1.5707963267948966 rad pos: -1.5,4.5 parent: 1 - - type: DeviceLinkSink - links: - - 651 missingComponents: - Anchorable - uid: 467 @@ -5721,9 +5471,6 @@ entities: rot: -1.5707963267948966 rad pos: -2.5,0.5 parent: 1 - - type: DeviceLinkSink - links: - - 469 missingComponents: - Anchorable - uid: 471 @@ -5732,9 +5479,6 @@ entities: rot: 1.5707963267948966 rad pos: 6.5,4.5 parent: 1 - - type: DeviceLinkSink - links: - - 465 missingComponents: - Anchorable - uid: 639 @@ -5743,9 +5487,6 @@ entities: rot: -1.5707963267948966 rad pos: -2.5,-0.5 parent: 1 - - type: DeviceLinkSink - links: - - 469 missingComponents: - Anchorable - uid: 647 @@ -5754,9 +5495,6 @@ entities: rot: -1.5707963267948966 rad pos: -0.5,8.5 parent: 1 - - type: DeviceLinkSink - links: - - 651 missingComponents: - Anchorable - uid: 648 @@ -5765,9 +5503,6 @@ entities: rot: 1.5707963267948966 rad pos: 7.5,0.5 parent: 1 - - type: DeviceLinkSink - links: - - 468 missingComponents: - Anchorable - uid: 649 @@ -5776,9 +5511,6 @@ entities: rot: 1.5707963267948966 rad pos: 7.5,-0.5 parent: 1 - - type: DeviceLinkSink - links: - - 468 missingComponents: - Anchorable - uid: 650 @@ -5787,9 +5519,6 @@ entities: rot: 1.5707963267948966 rad pos: 5.5,8.5 parent: 1 - - type: DeviceLinkSink - links: - - 465 missingComponents: - Anchorable - proto: SignalButton @@ -5902,9 +5631,6 @@ entities: - type: Transform pos: -2.5,-7.5 parent: 1 - - type: DeviceLinkSink - links: - - 655 - type: AtmosPipeColor color: '#0000FFFF' - uid: 665 @@ -5915,8 +5641,6 @@ entities: parent: 1 - type: DeviceLinkSink invokeCounter: 6 - links: - - 656 - type: AtmosPipeColor color: '#FF1212FF' - proto: SMESBasic @@ -5931,7 +5655,7 @@ entities: - type: Transform pos: 4.5,-11.5 parent: 1 -- proto: soda_dispenser +- proto: SodaDispenser entities: - uid: 668 components: @@ -6032,6 +5756,63 @@ entities: - type: Transform pos: 3.5,-7.5 parent: 1 +- proto: StructureMeleeWeaponRack + entities: + - uid: 455 + components: + - type: Transform + pos: 1.5,-0.5 + parent: 1 + - type: ContainerContainer + containers: + storagebase: !type:Container + showEnts: False + occludes: True + ents: [] + weapon1_slot: !type:ContainerSlot + showEnts: False + occludes: True + ent: 456 + weapon2_slot: !type:ContainerSlot + showEnts: False + occludes: True + ent: 457 + weapon3_slot: !type:ContainerSlot + showEnts: False + occludes: True + ent: 458 + weapon4_slot: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + weapon5_slot: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + weapon6_slot: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + weapon1: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + weapon2: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + weapon3: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + weapon4: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + weapon5: !type:ContainerSlot + showEnts: False + occludes: True + ent: null - proto: SubstationWallBasic entities: - uid: 673 @@ -6073,32 +5854,60 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,7.5 parent: 1 - - type: Physics - canCollide: False + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14923 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - uid: 676 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,6.5 parent: 1 - - type: Physics - canCollide: False - uid: 677 components: - type: Transform rot: -1.5707963267948966 rad pos: 5.5,6.5 parent: 1 - - type: Physics - canCollide: False - uid: 678 components: - type: Transform rot: -1.5707963267948966 rad pos: 5.5,7.5 parent: 1 - - type: Physics - canCollide: False + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14923 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - proto: TableBrass entities: - uid: 679 @@ -6161,210 +5970,156 @@ entities: rot: -1.5707963267948966 rad pos: 0.5,-14.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 686 components: - type: Transform rot: 3.141592653589793 rad pos: 7.5,-11.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 687 components: - type: Transform rot: 3.141592653589793 rad pos: -2.5,-11.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 688 components: - type: Transform rot: 1.5707963267948966 rad pos: 4.5,-13.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 689 components: - type: Transform rot: -1.5707963267948966 rad pos: 0.5,-13.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 690 components: - type: Transform rot: 1.5707963267948966 rad pos: 4.5,-14.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 691 components: - type: Transform rot: 3.141592653589793 rad pos: 3.5,-13.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 692 components: - type: Transform rot: 3.141592653589793 rad pos: 2.5,-13.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 693 components: - type: Transform rot: 3.141592653589793 rad pos: 1.5,-13.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 694 components: - type: Transform rot: -1.5707963267948966 rad pos: 6.5,-12.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 695 components: - type: Transform rot: 1.5707963267948966 rad pos: -1.5,-12.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 696 components: - type: Transform pos: -3.5,-1.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 697 components: - type: Transform rot: 3.141592653589793 rad pos: -3.5,1.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 698 components: - type: Transform rot: 3.141592653589793 rad pos: -2.5,5.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 699 components: - type: Transform rot: 3.141592653589793 rad pos: -1.5,9.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 700 components: - type: Transform rot: 3.141592653589793 rad pos: 6.5,9.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 701 components: - type: Transform pos: 6.5,7.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 702 components: - type: Transform pos: 7.5,3.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 703 components: - type: Transform pos: 8.5,-1.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 704 components: - type: Transform pos: -2.5,3.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 705 components: - type: Transform pos: -1.5,7.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 706 components: - type: Transform rot: 3.141592653589793 rad pos: 7.5,5.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 707 components: - type: Transform rot: 3.141592653589793 rad pos: 8.5,1.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 708 components: - type: Transform rot: -1.5707963267948966 rad pos: 5.5,12.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 709 components: - type: Transform rot: -1.5707963267948966 rad pos: 5.5,11.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 710 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,11.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 711 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,12.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - proto: VendingMachineTankDispenserEVA entities: - uid: 712 @@ -7094,43 +6849,6 @@ entities: - type: Transform pos: 1.4429677,5.6385612 parent: 1 -- proto: WeaponRackMeleeBase - entities: - - uid: 455 - components: - - type: Transform - pos: 1.5,-0.5 - parent: 1 - - type: ContainerContainer - containers: - storagebase: !type:Container - showEnts: False - occludes: True - ents: [] - weapon1_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 456 - weapon2_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 457 - weapon3_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 458 - weapon4_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - weapon5_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - weapon6_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: WindowClockworkDirectional entities: - uid: 840 @@ -7900,7 +7618,7 @@ entities: pos: 5.5,-2.5 parent: 1 - type: Door - secondsUntilStateChange: -17417.637 + secondsUntilStateChange: -17641.27 state: Opening - uid: 974 components: @@ -7908,7 +7626,7 @@ entities: pos: 3.5,-6.5 parent: 1 - type: Door - secondsUntilStateChange: -17417.037 + secondsUntilStateChange: -17640.67 state: Opening - uid: 975 components: @@ -7916,7 +7634,7 @@ entities: pos: 1.5,-6.5 parent: 1 - type: Door - secondsUntilStateChange: -17416.486 + secondsUntilStateChange: -17640.12 state: Opening - uid: 976 components: @@ -7924,7 +7642,7 @@ entities: pos: -0.5,-2.5 parent: 1 - type: Door - secondsUntilStateChange: -17443.754 + secondsUntilStateChange: -17667.387 state: Opening - uid: 977 components: @@ -7932,7 +7650,7 @@ entities: pos: -0.5,2.5 parent: 1 - type: Door - secondsUntilStateChange: -17418.736 + secondsUntilStateChange: -17642.37 state: Opening - uid: 978 components: @@ -7940,6 +7658,6 @@ entities: pos: 5.5,2.5 parent: 1 - type: Door - secondsUntilStateChange: -17418.186 + secondsUntilStateChange: -17641.818 state: Opening ... diff --git a/Resources/Maps/Corvax/Shuttles/BlackMarket/barnacle.yml b/Resources/Maps/Corvax/Shuttles/BlackMarket/barnacle.yml index 1308cd190c1..3784937af09 100644 --- a/Resources/Maps/Corvax/Shuttles/BlackMarket/barnacle.yml +++ b/Resources/Maps/Corvax/Shuttles/BlackMarket/barnacle.yml @@ -499,44 +499,34 @@ entities: parent: 201 - proto: CannonBall entities: - - uid: 15 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 1.8835673,-2.403088 - parent: 201 - - uid: 19 + - uid: 72 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 1.6648173,-2.262463 + pos: 1.4037349,-2.3940208 parent: 201 - - uid: 72 +- proto: CannonBallEmp + entities: + - uid: 15 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 1.6023173,-2.512463 + pos: 1.4037349,-2.5816512 parent: 201 -- proto: CannonBallGlassshot - entities: - uid: 17 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 1.3054423,-2.449963 + pos: 1.6433182,-2.362749 parent: 201 - uid: 20 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 1.4616923,-2.137463 + pos: 1.1433182,-2.321054 parent: 201 -- proto: CannonBallGrapeshot +- proto: CannonBallGlassshot entities: - - uid: 76 + - uid: 19 components: - type: Transform - pos: 1.5241923,-2.309338 + pos: 1.7579015,-2.602499 parent: 201 - proto: CarpetBlack entities: @@ -1245,10 +1235,6 @@ entities: - type: Transform pos: 0.5,-6.5 parent: 201 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PowerCellRecharger entities: - uid: 197 @@ -1424,6 +1410,8 @@ entities: rot: 1.5707963267948966 rad pos: 1.5,-0.5 parent: 201 + missingComponents: + - Anchorable - proto: SignalButtonDirectional entities: - uid: 103 diff --git a/Resources/Maps/Corvax/Shuttles/BlackMarket/bocakillo.yml b/Resources/Maps/Corvax/Shuttles/BlackMarket/bocakillo.yml index 03e35d4841e..5d73f4e89e7 100644 --- a/Resources/Maps/Corvax/Shuttles/BlackMarket/bocakillo.yml +++ b/Resources/Maps/Corvax/Shuttles/BlackMarket/bocakillo.yml @@ -252,7 +252,7 @@ entities: pos: 1.5,-0.5 parent: 2 - type: Door - secondsUntilStateChange: -239.95091 + secondsUntilStateChange: -272.3784 state: Opening - type: DeviceLinkSource lastSignals: @@ -434,49 +434,31 @@ entities: - type: Transform pos: -0.5,12.5 parent: 2 - - type: DeviceLinkSink - links: - - 186 - uid: 171 components: - type: Transform pos: 1.5,6.5 parent: 2 - - type: DeviceLinkSink - links: - - 186 - uid: 184 components: - type: Transform pos: 1.5,12.5 parent: 2 - - type: DeviceLinkSink - links: - - 186 - uid: 212 components: - type: Transform pos: -0.5,8.5 parent: 2 - - type: DeviceLinkSink - links: - - 186 - uid: 219 components: - type: Transform pos: 0.5,12.5 parent: 2 - - type: DeviceLinkSink - links: - - 186 - uid: 220 components: - type: Transform pos: -2.5,0.5 parent: 2 - - type: DeviceLinkSink - links: - - 186 - proto: BoxBodyBag entities: - uid: 192 @@ -1200,11 +1182,15 @@ entities: - uid: 131 components: - type: Transform + anchored: False rot: 3.141592653589793 rad pos: -0.5,0.5 parent: 2 - type: AtmosPipeColor color: '#0088FFFF' + - type: Physics + canCollide: True + bodyType: Dynamic - proto: GasVentPump entities: - uid: 23 @@ -1286,8 +1272,6 @@ entities: - type: Transform pos: -0.5,5.5 parent: 2 - - type: Thruster - originalPowerLoad: 1500 - proto: LockerWallMedicalFilled entities: - uid: 216 @@ -1388,10 +1372,6 @@ entities: - type: Transform pos: -0.5,6.5 parent: 2 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PowerCellRecharger entities: - uid: 157 @@ -1485,18 +1465,16 @@ entities: rot: 1.5707963267948966 rad pos: 3.5,5.5 parent: 2 - - type: DeviceLinkSink - links: - - 226 + missingComponents: + - Anchorable - uid: 86 components: - type: Transform rot: 1.5707963267948966 rad pos: 3.5,7.5 parent: 2 - - type: DeviceLinkSink - links: - - 226 + missingComponents: + - Anchorable - proto: SignalButtonDirectional entities: - uid: 186 @@ -1594,54 +1572,40 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,-0.5 parent: 2 - - type: Thruster - originalPowerLoad: 1500 - uid: 13 components: - type: Transform rot: 3.141592653589793 rad pos: 3.5,-1.5 parent: 2 - - type: Thruster - originalPowerLoad: 1500 - uid: 15 components: - type: Transform rot: 3.141592653589793 rad pos: -3.5,-0.5 parent: 2 - - type: Thruster - originalPowerLoad: 1500 - uid: 182 components: - type: Transform pos: -2.5,4.5 parent: 2 - - type: Thruster - originalPowerLoad: 1500 - uid: 187 components: - type: Transform rot: 3.141592653589793 rad pos: -2.5,-0.5 parent: 2 - - type: Thruster - originalPowerLoad: 1500 - uid: 225 components: - type: Transform pos: -3.5,4.5 parent: 2 - - type: Thruster - originalPowerLoad: 1500 - uid: 236 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,3.5 parent: 2 - - type: Thruster - originalPowerLoad: 1500 - proto: WallPlastitanium entities: - uid: 18 diff --git a/Resources/Maps/Corvax/Shuttles/BlackMarket/falcon.yml b/Resources/Maps/Corvax/Shuttles/BlackMarket/falcon.yml index ec7d61daf66..edae9d1ec5f 100644 --- a/Resources/Maps/Corvax/Shuttles/BlackMarket/falcon.yml +++ b/Resources/Maps/Corvax/Shuttles/BlackMarket/falcon.yml @@ -1308,27 +1308,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage - - uid: 549 - components: - - type: Transform - parent: 539 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 550 - components: - - type: Transform - parent: 539 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 551 - components: - - type: Transform - parent: 539 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: CannonBallGlassshot entities: - uid: 543 @@ -1338,27 +1317,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage - - uid: 545 - components: - - type: Transform - parent: 539 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 546 - components: - - type: Transform - parent: 539 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 547 - components: - - type: Transform - parent: 539 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: CannonBallGrapeshot entities: - uid: 540 @@ -1368,27 +1326,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage - - uid: 541 - components: - - type: Transform - parent: 539 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 542 - components: - - type: Transform - parent: 539 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 544 - components: - - type: Transform - parent: 539 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: CarpetBlack entities: - uid: 140 @@ -1764,19 +1701,10 @@ entities: showEnts: False occludes: True ents: - - 540 - - 541 - - 542 - - 543 - - 544 - - 545 - - 546 - - 547 - - 548 - 262 - - 549 - - 550 - - 551 + - 548 + - 543 + - 540 paper_label: !type:ContainerSlot showEnts: False occludes: True @@ -1834,28 +1762,16 @@ entities: - type: Transform pos: 5.286945,-7.6460857 parent: 3 - - type: ItemSlots - - type: ContainerContainer - containers: - paper_label: !type:ContainerSlot {} - uid: 236 components: - type: Transform pos: 5.5473614,-7.3856688 parent: 3 - - type: ItemSlots - - type: ContainerContainer - containers: - paper_label: !type:ContainerSlot {} - uid: 239 components: - type: Transform pos: 5.7348614,-7.6669188 parent: 3 - - type: ItemSlots - - type: ContainerContainer - containers: - paper_label: !type:ContainerSlot {} - proto: DrinkRumBottleFull entities: - uid: 228 @@ -2773,19 +2689,11 @@ entities: - type: Transform pos: -1.5,-8.5 parent: 3 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - uid: 124 components: - type: Transform pos: -0.5,-8.5 parent: 3 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PosterLegitCarpMount entities: - uid: 225 @@ -3035,12 +2943,16 @@ entities: rot: 3.141592653589793 rad pos: 5.5,0.5 parent: 3 + missingComponents: + - Anchorable - uid: 192 components: - type: Transform rot: 3.141592653589793 rad pos: 4.5,0.5 parent: 3 + missingComponents: + - Anchorable - proto: SignalButtonDirectional entities: - uid: 152 diff --git a/Resources/Maps/Corvax/Shuttles/BlackMarket/hog.yml b/Resources/Maps/Corvax/Shuttles/BlackMarket/hog.yml index af6768e3e12..a3d800d8031 100644 --- a/Resources/Maps/Corvax/Shuttles/BlackMarket/hog.yml +++ b/Resources/Maps/Corvax/Shuttles/BlackMarket/hog.yml @@ -1854,65 +1854,51 @@ entities: parent: 1 - proto: CannonBall entities: - - uid: 84 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -4.67929,4.394949 - parent: 1 - - uid: 621 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -4.46054,4.316824 - parent: 1 - uid: 622 components: - type: Transform rot: 1.5707963267948966 rad pos: -4.476165,4.660574 parent: 1 - - uid: 624 + - uid: 625 components: - type: Transform rot: 1.5707963267948966 rad - pos: -4.194915,4.473074 + pos: -4.74179,4.723074 parent: 1 - - uid: 625 + - uid: 629 components: - type: Transform rot: 1.5707963267948966 rad - pos: -4.74179,4.723074 + pos: 5.69571,4.566824 parent: 1 - - uid: 626 + - uid: 630 components: - type: Transform rot: 1.5707963267948966 rad - pos: 5.523835,4.348074 + pos: 5.38321,4.566824 parent: 1 - - uid: 627 +- proto: CannonBallEmp + entities: + - uid: 238 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 5.273835,4.301199 + pos: -4.6918826,4.376812 parent: 1 - - uid: 628 + - uid: 239 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 5.78946,4.394949 + pos: -4.4731326,4.3872356 parent: 1 - - uid: 629 + - uid: 241 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 5.69571,4.566824 + pos: 5.283502,4.5018992 parent: 1 - - uid: 630 + - uid: 242 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 5.38321,4.566824 + pos: 5.5855856,4.460203 parent: 1 - proto: Catwalk entities: @@ -2255,110 +2241,34 @@ entities: - 0 - 0 - 0 -- proto: CratePirateChest +- proto: CratePirate entities: - - uid: 197 + - uid: 84 components: - type: Transform - pos: 0.5,2.5 + pos: -3.5,5.5 parent: 1 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14923 - moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: CratePirateChestCannonBall - entities: - - uid: 637 + - uid: 236 components: - type: Transform - pos: 4.5,3.5 + pos: 4.5,5.5 parent: 1 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14923 - moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - uid: 638 + - uid: 237 components: - type: Transform pos: -3.5,3.5 parent: 1 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14923 - moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: CratePirateChestCaptain - entities: - - uid: 636 + - uid: 240 components: - type: Transform - pos: 1.5,2.5 + pos: 4.5,3.5 parent: 1 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14923 - moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: CratePirateChestGlassShot +- proto: CratePirateChest entities: - - uid: 635 + - uid: 197 components: - type: Transform - pos: -3.5,5.5 + pos: 0.5,2.5 parent: 1 - type: EntityStorage air: @@ -2378,10 +2288,12 @@ entities: - 0 - 0 - 0 - - uid: 639 +- proto: CratePirateChestCaptain + entities: + - uid: 636 components: - type: Transform - pos: 4.5,5.5 + pos: 1.5,2.5 parent: 1 - type: EntityStorage air: @@ -2409,7 +2321,7 @@ entities: pos: 1.5,9.5 parent: 1 - type: Door - secondsUntilStateChange: -4885.02 + secondsUntilStateChange: -4978.725 state: Opening - uid: 161 components: @@ -2417,7 +2329,7 @@ entities: pos: 0.5,9.5 parent: 1 - type: Door - secondsUntilStateChange: -3070.7441 + secondsUntilStateChange: -3164.449 state: Opening - uid: 562 components: @@ -2450,7 +2362,7 @@ entities: pos: 0.5,1.5 parent: 1 - type: Door - secondsUntilStateChange: -3640.442 + secondsUntilStateChange: -3734.1467 state: Closing - uid: 393 components: @@ -2486,103 +2398,6 @@ entities: parent: 585 - type: Physics canCollide: False -- proto: d6Dice - entities: - - uid: 237 - components: - - type: Transform - parent: 236 - - type: Physics - canCollide: False - - uid: 238 - components: - - type: Transform - parent: 236 - - type: Physics - canCollide: False - - uid: 239 - components: - - type: Transform - parent: 236 - - type: Physics - canCollide: False - - uid: 240 - components: - - type: Transform - parent: 236 - - type: Physics - canCollide: False - - uid: 241 - components: - - type: Transform - parent: 236 - - type: Physics - canCollide: False - - uid: 242 - components: - - type: Transform - parent: 236 - - type: Physics - canCollide: False - - uid: 243 - components: - - type: Transform - parent: 236 - - type: Physics - canCollide: False - - uid: 244 - components: - - type: Transform - parent: 236 - - type: Physics - canCollide: False -- proto: DiceBag - entities: - - uid: 236 - components: - - type: Transform - pos: 3.385871,-1.6798351 - parent: 1 - - type: Storage - storedItems: - 237: - position: 0,0 - _rotation: South - 238: - position: 1,0 - _rotation: South - 239: - position: 2,0 - _rotation: South - 240: - position: 3,0 - _rotation: South - 241: - position: 0,1 - _rotation: South - 242: - position: 1,1 - _rotation: South - 243: - position: 2,1 - _rotation: South - 244: - position: 3,1 - _rotation: South - - type: ContainerContainer - containers: - storagebase: !type:Container - showEnts: False - occludes: True - ents: - - 237 - - 238 - - 239 - - 240 - - 241 - - 242 - - 243 - - 244 - proto: DogBed entities: - uid: 426 @@ -4527,6 +4342,63 @@ entities: - type: Transform pos: 1.5,-4.5 parent: 1 +- proto: StructureMeleeWeaponRack + entities: + - uid: 585 + components: + - type: Transform + pos: -1.5,12.5 + parent: 1 + - type: ContainerContainer + containers: + storagebase: !type:Container + showEnts: False + occludes: True + ents: [] + weapon1_slot: !type:ContainerSlot + showEnts: False + occludes: True + ent: 586 + weapon2_slot: !type:ContainerSlot + showEnts: False + occludes: True + ent: 587 + weapon3_slot: !type:ContainerSlot + showEnts: False + occludes: True + ent: 588 + weapon4_slot: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + weapon5_slot: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + weapon6_slot: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + weapon1: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + weapon2: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + weapon3: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + weapon4: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + weapon5: !type:ContainerSlot + showEnts: False + occludes: True + ent: null - proto: SubstationBasic entities: - uid: 510 @@ -5557,41 +5429,4 @@ entities: rot: 3.141592653589793 rad pos: 1.5,4.5 parent: 1 -- proto: WeaponRackMeleeBase - entities: - - uid: 585 - components: - - type: Transform - pos: -1.5,12.5 - parent: 1 - - type: ContainerContainer - containers: - storagebase: !type:Container - showEnts: False - occludes: True - ents: [] - weapon1_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 586 - weapon2_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 587 - weapon3_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: 588 - weapon4_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - weapon5_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - weapon6_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null ... diff --git a/Resources/Maps/Corvax/Shuttles/BlackMarket/menace.yml b/Resources/Maps/Corvax/Shuttles/BlackMarket/menace.yml index b75161fa2fd..418f61229bf 100644 --- a/Resources/Maps/Corvax/Shuttles/BlackMarket/menace.yml +++ b/Resources/Maps/Corvax/Shuttles/BlackMarket/menace.yml @@ -649,11 +649,6 @@ entities: parent: 1 - proto: CannonBall entities: - - uid: 101 - components: - - type: Transform - pos: 1.0542351,4.114599 - parent: 1 - uid: 225 components: - type: Transform @@ -664,6 +659,18 @@ entities: - type: Transform pos: 1.352911,4.131369 parent: 1 +- proto: CannonBallEmp + entities: + - uid: 101 + components: + - type: Transform + pos: 0.7694856,4.3385043 + parent: 1 + - uid: 146 + components: + - type: Transform + pos: 0.97781897,4.0883307 + parent: 1 - proto: Catwalk entities: - uid: 46 @@ -1162,12 +1169,8 @@ entities: - type: Transform pos: 6.5,1.5 parent: 1 - - type: FuelGenerator - on: False - type: MaterialStorageMagnetPickup magnetEnabled: True - - type: Physics - bodyType: Static - proto: Poweredlight entities: - uid: 155 @@ -1380,12 +1383,16 @@ entities: rot: 3.141592653589793 rad pos: -0.5,4.5 parent: 1 + missingComponents: + - Anchorable - uid: 222 components: - type: Transform rot: 3.141592653589793 rad pos: 2.5,4.5 parent: 1 + missingComponents: + - Anchorable - proto: SignalButtonDirectional entities: - uid: 26 diff --git a/Resources/Maps/Corvax/Shuttles/BlackMarket/schooner.yml b/Resources/Maps/Corvax/Shuttles/BlackMarket/schooner.yml index 83f7e001450..5040cd10c6c 100644 --- a/Resources/Maps/Corvax/Shuttles/BlackMarket/schooner.yml +++ b/Resources/Maps/Corvax/Shuttles/BlackMarket/schooner.yml @@ -908,8 +908,6 @@ entities: - type: Transform pos: 1.5,12.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSofaMiddle entities: - uid: 26 @@ -917,8 +915,6 @@ entities: - type: Transform pos: 0.5,12.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSofaRight entities: - uid: 27 @@ -926,8 +922,6 @@ entities: - type: Transform pos: -0.5,12.5 parent: 1 - - type: Physics - bodyType: Static - proto: ButtonFrameCaution entities: - uid: 2 @@ -2343,10 +2337,6 @@ entities: - type: Transform pos: -0.5,8.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PosterContrabandDonk entities: - uid: 284 @@ -2799,24 +2789,32 @@ entities: rot: -1.5707963267948966 rad pos: -5.5,3.5 parent: 1 + missingComponents: + - Anchorable - uid: 502 components: - type: Transform rot: -1.5707963267948966 rad pos: -5.5,-3.5 parent: 1 + missingComponents: + - Anchorable - uid: 503 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,-3.5 parent: 1 + missingComponents: + - Anchorable - uid: 504 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,3.5 parent: 1 + missingComponents: + - Anchorable - proto: SignalButtonDirectional entities: - uid: 274 diff --git a/Resources/Maps/Corvax/Shuttles/Civilian/liquidator.yml b/Resources/Maps/Corvax/Shuttles/Civilian/liquidator.yml index 739c9bc731e..5ca77aaaabd 100644 --- a/Resources/Maps/Corvax/Shuttles/Civilian/liquidator.yml +++ b/Resources/Maps/Corvax/Shuttles/Civilian/liquidator.yml @@ -2046,8 +2046,6 @@ entities: pos: 1.5,-5.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 396 - type: AtmosPipeColor @@ -2105,8 +2103,6 @@ entities: pos: 0.5,-5.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 396 - type: AtmosPipeColor diff --git a/Resources/Maps/Corvax/Shuttles/Medical/stasis.yml b/Resources/Maps/Corvax/Shuttles/Medical/stasis.yml index 74e01c88171..4f2f0a55aa7 100644 --- a/Resources/Maps/Corvax/Shuttles/Medical/stasis.yml +++ b/Resources/Maps/Corvax/Shuttles/Medical/stasis.yml @@ -1713,21 +1713,6 @@ entities: - type: Transform pos: 13.5,-7.5 parent: 1 - - uid: 274 - components: - - type: Transform - pos: 12.5,-8.5 - parent: 1 - - uid: 618 - components: - - type: Transform - pos: 14.5,-6.5 - parent: 1 - - uid: 621 - components: - - type: Transform - pos: 14.5,-5.5 - parent: 1 - proto: CableMV entities: - uid: 5 @@ -3328,17 +3313,6 @@ entities: - 419 - type: AtmosPipeColor color: '#990000FF' - - uid: 535 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 12.5,4.5 - parent: 1 - - type: DeviceNetwork - deviceLists: - - 419 - - type: AtmosPipeColor - color: '#990000FF' - uid: 536 components: - type: Transform @@ -3746,20 +3720,6 @@ entities: rot: 3.141592653589793 rad pos: 11.5,4.5 parent: 1 -- proto: NFPosterContrabandFsbLogo - entities: - - uid: 458 - components: - - type: Transform - pos: 22.5,6.5 - parent: 1 -- proto: NFPosterContrabandFsbStasis - entities: - - uid: 233 - components: - - type: Transform - pos: 17.5,7.5 - parent: 1 - proto: NitrogenCanister entities: - uid: 135 @@ -3894,12 +3854,6 @@ entities: rot: 3.141592653589793 rad pos: 20.5,-4.5 parent: 1 - - uid: 204 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 21.5,-8.5 - parent: 1 - uid: 216 components: - type: Transform diff --git a/Resources/Maps/Corvax/Shuttles/Nfsd/broadhead.yml b/Resources/Maps/Corvax/Shuttles/Nfsd/broadhead.yml index c6feee60426..7f4e2485d0f 100644 --- a/Resources/Maps/Corvax/Shuttles/Nfsd/broadhead.yml +++ b/Resources/Maps/Corvax/Shuttles/Nfsd/broadhead.yml @@ -4429,9 +4429,6 @@ entities: - type: Transform pos: 8.5,-12.5 parent: 2 - - type: DeviceNetwork - configurators: - - invalid - proto: SurveillanceCameraSecurity entities: - uid: 244 diff --git a/Resources/Maps/Corvax/Shuttles/Nfsd/fighter.yml b/Resources/Maps/Corvax/Shuttles/Nfsd/fighter.yml index 1b429284f65..7d08d8aa038 100644 --- a/Resources/Maps/Corvax/Shuttles/Nfsd/fighter.yml +++ b/Resources/Maps/Corvax/Shuttles/Nfsd/fighter.yml @@ -418,7 +418,7 @@ entities: rot: 3.141592653589793 rad pos: 1.5,1.5 parent: 1 -- proto: BaseComputer #corvax-frontier +- proto: ComputerIFF entities: - uid: 52 components: diff --git a/Resources/Maps/Corvax/Shuttles/Nfsd/hammer.yml b/Resources/Maps/Corvax/Shuttles/Nfsd/hammer.yml index aebbaa39e86..b1f1e677f33 100644 --- a/Resources/Maps/Corvax/Shuttles/Nfsd/hammer.yml +++ b/Resources/Maps/Corvax/Shuttles/Nfsd/hammer.yml @@ -1185,10 +1185,12 @@ entities: showEnts: False occludes: True ents: - - 86 - 88 - - 85 + - 82 + - 81 - 87 + - 83 + - 84 - uid: 89 components: - type: Transform @@ -1218,11 +1220,12 @@ entities: showEnts: False occludes: True ents: - - 95 - - 94 - - 93 + - 90 + - 85 + - 86 - 96 - 97 + - 91 - proto: ClosetWallYellow entities: - uid: 98 @@ -1310,39 +1313,60 @@ entities: - type: Transform pos: -0.5,-0.5 parent: 1 - - uid: 85 +- proto: GrenadeEMP + entities: + - uid: 81 components: - type: Transform parent: 80 - type: Physics - angularDamping: 0 - linearDamping: 0 canCollide: False - type: InsideEntityStorage - - uid: 86 + - uid: 83 components: - type: Transform parent: 80 - type: Physics - angularDamping: 0 - linearDamping: 0 canCollide: False - type: InsideEntityStorage - - uid: 93 + - uid: 84 + components: + - type: Transform + parent: 80 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 85 + components: + - type: Transform + parent: 89 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 86 components: - type: Transform parent: 89 - type: Physics canCollide: False - type: InsideEntityStorage - - uid: 94 + - uid: 91 components: - type: Transform parent: 89 - type: Physics canCollide: False - type: InsideEntityStorage - - uid: 95 +- proto: GrenadeFrag + entities: + - uid: 82 + components: + - type: Transform + parent: 80 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 90 components: - type: Transform parent: 89 @@ -1616,7 +1640,6 @@ entities: missingComponents: - Machine - Anchorable - - Construction - uid: 137 components: - type: Transform @@ -1626,7 +1649,6 @@ entities: missingComponents: - Machine - Anchorable - - Construction - proto: SignalButtonWindows entities: - uid: 274 diff --git a/Resources/Maps/Corvax/Shuttles/Nfsd/interceptor.yml b/Resources/Maps/Corvax/Shuttles/Nfsd/interceptor.yml index c0ee3b56059..d4d70be3993 100644 --- a/Resources/Maps/Corvax/Shuttles/Nfsd/interceptor.yml +++ b/Resources/Maps/Corvax/Shuttles/Nfsd/interceptor.yml @@ -636,7 +636,7 @@ entities: rot: 3.141592653589793 rad pos: -7.5,-1.5 parent: 1 -- proto: BaseComputer #corvax-frontier +- proto: ComputerTabletopIFF entities: - uid: 82 components: diff --git a/Resources/Maps/Corvax/Shuttles/Nfsd/prowler.yml b/Resources/Maps/Corvax/Shuttles/Nfsd/prowler.yml index 09d745e830a..de1a67fbcd8 100644 --- a/Resources/Maps/Corvax/Shuttles/Nfsd/prowler.yml +++ b/Resources/Maps/Corvax/Shuttles/Nfsd/prowler.yml @@ -1772,7 +1772,7 @@ entities: - type: Transform pos: -2.5,7.5 parent: 1 -- proto: BaseComputer +- proto: ComputerIFF entities: - uid: 243 components: @@ -4385,4 +4385,4 @@ entities: rot: -1.5707963267948966 rad pos: 7.5,0.5 parent: 1 -... +... \ No newline at end of file diff --git a/Resources/Maps/Corvax/Shuttles/Nfsd/rogue.yml b/Resources/Maps/Corvax/Shuttles/Nfsd/rogue.yml index aca888f08a5..b5bbf3e904e 100644 --- a/Resources/Maps/Corvax/Shuttles/Nfsd/rogue.yml +++ b/Resources/Maps/Corvax/Shuttles/Nfsd/rogue.yml @@ -530,7 +530,7 @@ entities: rot: 3.141592653589793 rad pos: 1.5,0.5 parent: 1 -- proto: BaseComputer +- proto: ComputerIFF entities: - uid: 69 components: @@ -750,6 +750,9 @@ entities: entities: - 67 - 68 + missingComponents: + - Machine + - Anchorable - proto: SignNfsd entities: - uid: 125 diff --git a/Resources/Maps/Corvax/Shuttles/Nfsd/warrior.yml b/Resources/Maps/Corvax/Shuttles/Nfsd/warrior.yml index 65fc7023d9c..f92bd2fd17c 100644 --- a/Resources/Maps/Corvax/Shuttles/Nfsd/warrior.yml +++ b/Resources/Maps/Corvax/Shuttles/Nfsd/warrior.yml @@ -17,6 +17,7 @@ entities: name: Вариор - type: Transform pos: -0.515625,-0.5 + parent: invalid - type: BecomesStation id: Warrior - type: MapGrid @@ -744,6 +745,30 @@ entities: - type: Transform pos: -0.5,-0.5 parent: 2 +- proto: GrenadeEMP + entities: + - uid: 10 + components: + - type: Transform + pos: 3.3064265,0.6250687 + parent: 2 + - uid: 62 + components: + - type: Transform + pos: 3.473093,0.6250687 + parent: 2 + - uid: 64 + components: + - type: Transform + pos: 3.6814265,0.6250687 + parent: 2 +- proto: GrenadeFrag + entities: + - uid: 97 + components: + - type: Transform + pos: 3.5251765,0.4061668 + parent: 2 - proto: GyroscopeNfsd entities: - uid: 18 @@ -767,10 +792,6 @@ entities: - type: Transform pos: 1.5,4.5 parent: 2 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PoweredlightColoredRed entities: - uid: 104 @@ -817,39 +838,17 @@ entities: - type: Transform pos: -2.671875,-1.6678174 parent: 2 -- proto: ShuttleMagnumRifle +- proto: ShuttleGunFriendshipNoUse entities: - - uid: 62 + - uid: 36 components: - type: Transform rot: 3.141592653589793 rad pos: 3.5,2.5 parent: 2 - - type: ContainerContainer - containers: - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - ballistic-ammo: !type:Container - showEnts: False - occludes: True - ents: [] - gun_magazine: !type:ContainerSlot - showEnts: False - occludes: True - ent: null -- proto: ShuttleMagnumRifleAmmoBox - entities: - - uid: 36 - components: - - type: Transform - pos: 3.4730253,0.501276 - parent: 2 + missingComponents: + - Machine + - Anchorable - proto: SignalButton entities: - uid: 59 @@ -857,10 +856,6 @@ entities: - type: Transform pos: 0.5,5.5 parent: 2 - - type: DeviceLinkSource - linkedPorts: - 62: - - Pressed: Toggle - uid: 60 components: - type: Transform diff --git a/Resources/Maps/Corvax/Shuttles/Nfsd/wasp.yml b/Resources/Maps/Corvax/Shuttles/Nfsd/wasp.yml index 71043f8e185..954266da90a 100644 --- a/Resources/Maps/Corvax/Shuttles/Nfsd/wasp.yml +++ b/Resources/Maps/Corvax/Shuttles/Nfsd/wasp.yml @@ -1258,6 +1258,13 @@ entities: - type: Transform pos: 4.5,-5.5 parent: 1 +- proto: BaseComputer + entities: + - uid: 60 + components: + - type: Transform + pos: 0.5,16.5 + parent: 1 - proto: Bed entities: - uid: 76 @@ -4270,7 +4277,7 @@ entities: rot: 1.5707963267948966 rad pos: -1.5,14.5 parent: 1 -- proto: BaseComputer #corvax-frontier +- proto: ComputerIFF entities: - uid: 652 components: @@ -4298,13 +4305,6 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,13.5 parent: 1 -- proto: BaseComputer #corvax-frontier - entities: - - uid: 656 - components: - - type: Transform - pos: 0.5,16.5 - parent: 1 - proto: ComputerShuttle entities: - uid: 657 diff --git a/Resources/Maps/Corvax/Shuttles/Science/lyrae.yml b/Resources/Maps/Corvax/Shuttles/Science/lyrae.yml index e6411cf23c2..48b4b9fcf78 100644 --- a/Resources/Maps/Corvax/Shuttles/Science/lyrae.yml +++ b/Resources/Maps/Corvax/Shuttles/Science/lyrae.yml @@ -2383,8 +2383,6 @@ entities: pos: -2.5,1.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 63 - uid: 625 @@ -2402,8 +2400,6 @@ entities: pos: -9.5,-1.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 63 - uid: 630 @@ -2412,8 +2408,6 @@ entities: pos: -2.5,4.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 63 - proto: GasMixerOn @@ -3188,8 +3182,6 @@ entities: pos: -2.5,5.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 63 - type: AtmosPipeColor @@ -3200,8 +3192,6 @@ entities: pos: -4.5,-0.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 63 - type: AtmosPipeColor @@ -3223,8 +3213,6 @@ entities: pos: -8.5,-2.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 63 - type: AtmosPipeColor @@ -3246,8 +3234,6 @@ entities: pos: -2.5,2.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 63 - type: AtmosPipeColor @@ -3258,8 +3244,6 @@ entities: pos: -7.5,3.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 63 - type: AtmosPipeColor @@ -3327,8 +3311,6 @@ entities: pos: -1.5,-0.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 63 - type: AtmosPipeColor @@ -3361,8 +3343,6 @@ entities: pos: -9.5,-2.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 63 - type: AtmosPipeColor @@ -3374,8 +3354,6 @@ entities: pos: -3.5,6.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 63 - type: AtmosPipeColor @@ -3387,8 +3365,6 @@ entities: pos: -3.5,3.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 63 - type: AtmosPipeColor @@ -3399,8 +3375,6 @@ entities: pos: -8.5,3.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 63 - type: AtmosPipeColor diff --git a/Resources/Maps/Corvax/Shuttles/Service/bocadillo.yml b/Resources/Maps/Corvax/Shuttles/Service/bocadillo.yml index 82105dfb1e1..e4cc68faae5 100644 --- a/Resources/Maps/Corvax/Shuttles/Service/bocadillo.yml +++ b/Resources/Maps/Corvax/Shuttles/Service/bocadillo.yml @@ -1534,11 +1534,6 @@ entities: - type: Transform pos: -0.5,6.5 parent: 2 - - uid: 173 - components: - - type: Transform - pos: -1.5,6.5 - parent: 2 - proto: Thruster entities: - uid: 34 diff --git a/Resources/Maps/Corvax/Shuttles/Service/kontrashef.yml b/Resources/Maps/Corvax/Shuttles/Service/kontrashef.yml index 6280b080920..2dbba6df141 100644 --- a/Resources/Maps/Corvax/Shuttles/Service/kontrashef.yml +++ b/Resources/Maps/Corvax/Shuttles/Service/kontrashef.yml @@ -1918,42 +1918,6 @@ entities: - type: Transform pos: 15.5,-0.5 parent: 2 -- proto: CrateFreezer - entities: - - uid: 696 - components: - - type: Transform - pos: 17.5,5.5 - parent: 2 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 234.99934 - moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 697 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: CrateNPCCow entities: - uid: 154 @@ -3379,32 +3343,6 @@ entities: - type: Transform pos: 18.5,5.5 parent: 2 -- proto: KoboldCubeWrapped - entities: - - uid: 97 - components: - - type: Transform - parent: 96 - - type: Physics - canCollide: False - - uid: 98 - components: - - type: Transform - parent: 96 - - type: Physics - canCollide: False - - uid: 99 - components: - - type: Transform - parent: 96 - - type: Physics - canCollide: False - - uid: 100 - components: - - type: Transform - parent: 96 - - type: Physics - canCollide: False - proto: LockerWallColorServiceWorker entities: - uid: 79 @@ -3449,7 +3387,6 @@ entities: - 9 - 91 - 112 - - 96 - 116 - 124 - 126 @@ -3494,32 +3431,6 @@ entities: - type: Transform pos: 19.5,-1.5 parent: 2 -- proto: MonkeyCubeWrapped - entities: - - uid: 101 - components: - - type: Transform - parent: 96 - - type: Physics - canCollide: False - - uid: 102 - components: - - type: Transform - parent: 96 - - type: Physics - canCollide: False - - uid: 103 - components: - - type: Transform - parent: 96 - - type: Physics - canCollide: False - - uid: 104 - components: - - type: Transform - parent: 96 - - type: Physics - canCollide: False - proto: MouseTimedSpawner entities: - uid: 687 @@ -4686,71 +4597,6 @@ entities: - type: Transform pos: 11.282652,1.791623 parent: 2 -- proto: VariantCubeBox - entities: - - uid: 96 - components: - - type: Transform - parent: 79 - - type: Storage - storedItems: - 97: - position: 0,0 - _rotation: South - 98: - position: 1,0 - _rotation: South - 99: - position: 2,0 - _rotation: South - 100: - position: 0,1 - _rotation: South - 101: - position: 1,1 - _rotation: South - 102: - position: 2,1 - _rotation: South - 103: - position: 0,2 - _rotation: South - 104: - position: 1,2 - _rotation: South - - type: ContainerContainer - containers: - storagebase: !type:Container - showEnts: False - occludes: True - ents: - - 97 - - 98 - - 99 - - 100 - - 101 - - 102 - - 103 - - 104 - - type: Physics - canCollide: False - - type: UseDelay - delays: - default: - length: 1 - quickInsert: - endTime: 21874.0625054 - startTime: 21873.5625054 - length: 0.5 - storage: {} - - type: InsideEntityStorage - - uid: 697 - components: - - type: Transform - parent: 696 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: VendingMachineChefDrobe entities: - uid: 229 diff --git a/Resources/Maps/Corvax/Shuttles/Syndicate/hunter.yml b/Resources/Maps/Corvax/Shuttles/Syndicate/hunter.yml index d96ba3e9409..30c5b895420 100644 --- a/Resources/Maps/Corvax/Shuttles/Syndicate/hunter.yml +++ b/Resources/Maps/Corvax/Shuttles/Syndicate/hunter.yml @@ -154,36 +154,40 @@ entities: data: tiles: 0,0: - 0: 55 - 1: 64 + 0: 3 + 1: 68 0,-1: - 0: 32767 + 0: 13079 1: 32768 -1,0: - 0: 140 - 1: 64 - -1,-1: - 0: 52975 - 1: 12560 + 0: 8 + 1: 68 0,-4: - 0: 65392 + 0: 45856 1: 128 + -1,-4: + 0: 43136 + 1: 304 0,-3: - 0: 65535 + 0: 8189 + -1,-3: + 0: 3814 0,-2: 0: 65535 + -1,-2: + 0: 65262 + -1,-1: + 0: 34828 + 1: 12560 1,-4: - 1: 560 - 0: 4352 - 1,-3: - 0: 4369 - 1: 8736 + 1: 816 1,-2: - 0: 4369 + 0: 4096 1: 8194 1,-1: - 0: 1 1: 13106 + 1,-3: + 1: 8736 -2,-4: 1: 2176 -2,-3: @@ -192,13 +196,6 @@ entities: 1: 32776 -2,-1: 1: 34952 - -1,-4: - 1: 48 - 0: 65472 - -1,-3: - 0: 65535 - -1,-2: - 0: 65535 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -216,7 +213,7 @@ entities: - 0 - 0 - volume: 2500 - temperature: 293.15 + immutable: True moles: - 0 - 0 @@ -244,23 +241,13 @@ entities: parent: 1 - type: DeviceList devices: - - 201 - - 205 - - 14 - - 12 - - 199 - - 11 - 202 -- proto: AirCanister - entities: - - uid: 3 - components: - - type: Transform - anchored: True - pos: -2.5,-9.5 - parent: 1 - - type: Physics - bodyType: Static + - 11 + - 199 + - 12 + - 14 + - 205 + - 201 - proto: AirlockExternalGlass entities: - uid: 4 @@ -278,12 +265,12 @@ entities: - uid: 6 components: - type: Transform - pos: -0.5,-14.5 + pos: 1.5,-14.5 parent: 1 - uid: 7 components: - type: Transform - pos: 1.5,-14.5 + pos: -0.5,-14.5 parent: 1 - proto: AirlockSyndicate entities: @@ -312,11 +299,17 @@ entities: - type: Transform pos: 0.5,-12.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2 - uid: 12 components: - type: Transform pos: 0.5,-9.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2 - uid: 13 components: - type: Transform @@ -327,6 +320,9 @@ entities: - type: Transform pos: 0.5,-0.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2 - proto: APCBasic entities: - uid: 15 @@ -340,31 +336,29 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,-1.5 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 17 components: - type: Transform - rot: 3.141592653589793 rad + rot: 1.5707963267948966 rad pos: 4.5,-4.5 parent: 1 - uid: 18 components: - type: Transform - rot: 3.141592653589793 rad + rot: -1.5707963267948966 rad pos: -3.5,-4.5 parent: 1 - uid: 19 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,-14.5 + pos: 1.5,-14.5 parent: 1 - uid: 20 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,-14.5 + pos: -0.5,-14.5 parent: 1 - proto: AtmosFixBlockerMarker entities: @@ -555,43 +549,28 @@ entities: - type: Transform pos: -0.5,1.5 parent: 1 - - type: DeviceLinkSink - links: - - 254 - uid: 22 components: - type: Transform pos: 0.5,1.5 parent: 1 - - type: DeviceLinkSink - links: - - 254 - uid: 23 components: - type: Transform pos: 1.5,1.5 parent: 1 - - type: DeviceLinkSink - links: - - 254 - uid: 166 components: - type: Transform rot: 3.141592653589793 rad pos: -1.5,0.5 parent: 1 - - type: DeviceLinkSink - links: - - 254 - uid: 355 components: - type: Transform rot: 3.141592653589793 rad pos: 2.5,0.5 parent: 1 - - type: DeviceLinkSink - links: - - 254 - proto: CableApcExtension entities: - uid: 24 @@ -819,6 +798,16 @@ entities: - type: Transform pos: 2.5,0.5 parent: 1 + - uid: 364 + components: + - type: Transform + pos: 0.5,-3.5 + parent: 1 + - uid: 365 + components: + - type: Transform + pos: 2.5,-10.5 + parent: 1 - proto: CableHV entities: - uid: 87 @@ -1104,11 +1093,6 @@ entities: - type: Transform pos: -0.5,-10.5 parent: 1 - - uid: 140 - components: - - type: Transform - pos: -1.5,-10.5 - parent: 1 - uid: 141 components: - type: Transform @@ -1130,6 +1114,12 @@ entities: rot: -1.5707963267948966 rad pos: 1.5,-10.5 parent: 1 + - uid: 363 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-9.5 + parent: 1 - proto: ChairOfficeDark entities: - uid: 145 @@ -1194,12 +1184,12 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,-1.5 parent: 1 -- proto: CratePlasma +- proto: DefibrillatorCabinetFilled entities: - - uid: 251 + - uid: 150 components: - type: Transform - pos: -0.5,-9.5 + pos: -2.5,-3.5 parent: 1 - proto: EmergencyLight entities: @@ -1260,6 +1250,19 @@ entities: parent: 1 - type: Fixtures fixtures: {} +- proto: GasMixerOnFlipped + entities: + - uid: 140 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-10.5 + parent: 1 + - type: GasMixer + inletTwoConcentration: 0.79 + inletOneConcentration: 0.21 + - type: AtmosPipeColor + color: '#0055CCFF' - proto: GasPassiveVent entities: - uid: 351 @@ -1270,22 +1273,25 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' -- proto: GasPipeFourway +- proto: GasPipeBend entities: - - uid: 172 + - uid: 3 components: - type: Transform - pos: 1.5,-4.5 + rot: 3.141592653589793 rad + pos: -2.5,-10.5 parent: 1 - type: AtmosPipeColor - color: '#990000FF' - - uid: 183 + color: '#0055CCFF' +- proto: GasPipeFourway + entities: + - uid: 172 components: - type: Transform - pos: -0.5,-9.5 + pos: 1.5,-4.5 parent: 1 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#990000FF' - proto: GasPipeStraight entities: - uid: 171 @@ -1357,14 +1363,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 184 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,-10.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 186 components: - type: Transform @@ -1445,6 +1443,14 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 183 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-9.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 190 components: - type: Transform @@ -1453,24 +1459,26 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' -- proto: GasPort - entities: - - uid: 196 + - uid: 197 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,-9.5 + rot: -1.5707963267948966 rad + pos: -0.5,-10.5 parent: 1 - type: AtmosPipeColor - color: '#0335FCFF' -- proto: GasPressurePump + color: '#0055CCFF' +- proto: GasPort entities: - - uid: 197 + - uid: 184 components: - type: Transform - rot: 1.5707963267948966 rad pos: -1.5,-9.5 parent: 1 + - uid: 196 + components: + - type: Transform + pos: -2.5,-9.5 + parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - proto: GasVentPump @@ -1497,6 +1505,9 @@ entities: rot: 3.141592653589793 rad pos: -0.5,-12.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 201 @@ -1504,6 +1515,9 @@ entities: - type: Transform pos: -0.5,-1.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2 - type: AtmosPipeColor color: '#0055CCFF' - proto: GasVentScrubber @@ -1530,6 +1544,9 @@ entities: rot: 3.141592653589793 rad pos: 1.5,-12.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2 - type: AtmosPipeColor color: '#990000FF' - uid: 205 @@ -1537,6 +1554,9 @@ entities: - type: Transform pos: 1.5,-1.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2 - type: AtmosPipeColor color: '#990000FF' - proto: GeneratorWallmountAPU @@ -1624,6 +1644,34 @@ entities: - type: Transform pos: -2.5,-7.5 parent: 1 +- proto: LockerWallMaterialsFuelPlasmaFilled + entities: + - uid: 362 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,-12.5 + parent: 1 +- proto: NitrogenCanister + entities: + - uid: 361 + components: + - type: Transform + anchored: True + pos: -1.5,-9.5 + parent: 1 + - type: Physics + bodyType: Static +- proto: OxygenCanister + entities: + - uid: 251 + components: + - type: Transform + anchored: True + pos: -2.5,-9.5 + parent: 1 + - type: Physics + bodyType: Static - proto: PaperCaptainsThoughts entities: - uid: 158 @@ -1645,10 +1693,6 @@ entities: - type: Transform pos: 3.5,-12.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PoweredlightColoredRed entities: - uid: 221 @@ -1930,8 +1974,6 @@ entities: - type: Transform pos: 1.5,-11.5 parent: 1 - - type: Physics - canCollide: False - proto: SyndicateWhistle entities: - uid: 200 @@ -1985,24 +2027,24 @@ entities: - uid: 264 components: - type: Transform - pos: -2.5,-0.5 + pos: 3.5,-0.5 parent: 1 - uid: 265 components: - type: Transform - pos: 3.5,-0.5 + pos: -2.5,-0.5 parent: 1 - uid: 266 components: - type: Transform rot: 3.141592653589793 rad - pos: 4.5,-14.5 + pos: 3.5,-14.5 parent: 1 - uid: 267 components: - type: Transform rot: 3.141592653589793 rad - pos: 3.5,-14.5 + pos: 4.5,-14.5 parent: 1 - uid: 268 components: @@ -2019,26 +2061,26 @@ entities: - uid: 270 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,-8.5 + rot: 1.5707963267948966 rad + pos: -4.5,-8.5 parent: 1 - uid: 271 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -4.5,-8.5 + rot: -1.5707963267948966 rad + pos: 5.5,-9.5 parent: 1 - uid: 272 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -4.5,-9.5 + rot: -1.5707963267948966 rad + pos: 5.5,-8.5 parent: 1 - uid: 273 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,-9.5 + rot: 1.5707963267948966 rad + pos: -4.5,-9.5 parent: 1 - proto: ToolboxSyndicateFilled entities: diff --git a/Resources/Maps/Corvax/Shuttles/Syndicate/infiltrator.yml b/Resources/Maps/Corvax/Shuttles/Syndicate/infiltrator.yml index e107f09600f..3c507d1a9fa 100644 --- a/Resources/Maps/Corvax/Shuttles/Syndicate/infiltrator.yml +++ b/Resources/Maps/Corvax/Shuttles/Syndicate/infiltrator.yml @@ -61,98 +61,88 @@ entities: version: 2 data: tiles: + -3,-5: + 0: 49152 + -2,-5: + 0: 64012 + 1: 1 + -2,-4: + 0: 52362 + 1: 256 + -2,-3: + 1: 36384 + 0: 136 + -2,-2: + 0: 52224 + 1: 4 + -2,-1: + 1: 32 + 0: 8 -1,-4: - 0: 65535 + 0: 61071 -1,-3: - 0: 65279 1: 256 + 0: 52430 -1,-2: - 0: 65535 + 0: 65528 -1,-1: - 0: 4095 + 0: 239 + -1,-5: + 0: 65421 0,-4: - 0: 65535 + 0: 48015 0,-3: - 0: 29695 + 0: 4507 1: 35840 0,-2: - 0: 65535 + 0: 48944 0,-1: - 0: 2047 + 0: 59 + 0,-5: + 0: 65295 1,-4: - 0: 13183 + 0: 4354 1: 1024 1,-3: - 0: 19 1: 800 1,-2: 1: 1 - 0: 13104 - 1,-1: - 0: 19 - 1: 32 - 0,-5: - 0: 65535 + 0: 4352 1,-5: - 0: 65395 - 1: 4 - -1,-5: - 0: 65535 - -3,-4: - 0: 12 - -2,-4: - 0: 61183 - 1: 256 - -2,-2: - 0: 61160 + 0: 61953 1: 4 - -2,-1: - 0: 206 + 1,-1: 1: 32 - -2,-3: - 0: 206 - 1: 36384 - -3,-5: - 0: 52224 - -2,-8: - 0: 65056 - 1: 192 + 2,-5: + 0: 4096 -2,-7: - 0: 65535 + 0: 61166 -2,-6: - 0: 65535 - -2,-5: - 1: 1 - 0: 65534 + 0: 52974 + -2,-8: + 1: 704 -1,-8: - 0: 4368 - 1: 8736 + 1: 8752 -1,-7: - 0: 65297 + 0: 55296 1: 238 -1,-6: - 0: 65535 - 0,-8: - 1: 8864 - 0: 52288 + 0: 64925 0,-7: 1: 51 - 0: 65348 + 0: 53248 2: 136 0,-6: - 0: 65535 + 0: 65421 + 0,-8: + 1: 8928 1,-8: - 1: 16 - 0: 29472 + 1: 528 1,-7: - 0: 30549 + 0: 12288 3: 34 1,-6: - 0: 30583 - 2,-4: - 0: 1 - 2,-5: - 0: 4352 + 0: 4867 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -170,7 +160,7 @@ entities: - 0 - 0 - volume: 2500 - temperature: 293.15 + immutable: True moles: - 0 - 0 @@ -574,8 +564,6 @@ entities: parent: 1 - type: DeviceLinkSink invokeCounter: 1 - links: - - 10 - type: DeviceLinkSource linkedPorts: 10: @@ -594,8 +582,6 @@ entities: parent: 1 - type: DeviceLinkSink invokeCounter: 1 - links: - - 8 - type: DeviceLinkSource linkedPorts: 8: @@ -608,8 +594,6 @@ entities: parent: 1 - type: DeviceLinkSink invokeCounter: 1 - links: - - 12 - type: DeviceLinkSource linkedPorts: 12: @@ -622,8 +606,6 @@ entities: parent: 1 - type: DeviceLinkSink invokeCounter: 1 - links: - - 6 - type: DeviceLinkSource linkedPorts: 6: @@ -642,8 +624,6 @@ entities: parent: 1 - type: DeviceLinkSink invokeCounter: 1 - links: - - 4 - type: DeviceLinkSource linkedPorts: 4: @@ -656,8 +636,6 @@ entities: parent: 1 - type: DeviceLinkSink invokeCounter: 1 - links: - - 7 - type: DeviceLinkSource linkedPorts: 7: @@ -1094,15 +1072,6 @@ entities: - type: Transform pos: -2.5,-12.5 parent: 1 -- proto: BoxEncryptionKeySyndie - entities: - - uid: 34 - components: - - type: Transform - parent: 33 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: BoxFlashbang entities: - uid: 42 @@ -2533,24 +2502,6 @@ entities: - type: Transform pos: -3.1200604,-17.289778 parent: 1 -- proto: ClothingHeadHatSyndieMAA - entities: - - uid: 35 - components: - - type: Transform - parent: 33 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: ClothingHeadPyjamaSyndicateRed - entities: - - uid: 36 - components: - - type: Transform - parent: 33 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: ClothingMaskBreathMedical entities: - uid: 353 @@ -2558,42 +2509,6 @@ entities: - type: Transform pos: -5.4188166,-4.5927215 parent: 1 -- proto: ClothingOuterCoatSyndieCap - entities: - - uid: 38 - components: - - type: Transform - parent: 33 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: ClothingUniformJumpskirtSyndieFormalDress - entities: - - uid: 39 - components: - - type: Transform - parent: 33 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: ClothingUniformJumpsuitPyjamaSyndicateRed - entities: - - uid: 40 - components: - - type: Transform - parent: 33 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: ClothingUniformJumpsuitSyndieFormal - entities: - - uid: 41 - components: - - type: Transform - parent: 33 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: ComfyChair entities: - uid: 318 @@ -2647,6 +2562,14 @@ entities: - type: Transform pos: -3.492848,-22.485775 parent: 1 +- proto: DefibrillatorCabinetFilled + entities: + - uid: 569 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,-3.5 + parent: 1 - proto: DisposalBend entities: - uid: 325 @@ -3764,13 +3687,6 @@ entities: - type: Transform pos: 3.5,-3.5 parent: 1 -- proto: SyndicateMicrowave - entities: - - uid: 497 - components: - - type: Transform - pos: 3.5,-19.5 - parent: 1 - proto: KnifePlastic entities: - uid: 498 @@ -3801,50 +3717,13 @@ entities: - type: Physics canCollide: True - type: ActionsContainer -- proto: LockerSyndicatePersonal +- proto: LockerSyndicatePersonalFilled entities: - uid: 33 components: - type: Transform pos: 4.5,-5.5 parent: 1 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 34 - - 35 - - 38 - - 41 - - 40 - - 36 - - 39 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null -- proto: LockerSyndicatePersonalFilled - entities: - uid: 506 components: - type: Transform @@ -4477,97 +4356,61 @@ entities: - type: Transform pos: -6.5,-4.5 parent: 1 - - type: DeviceLinkSink - links: - - 21 - uid: 598 components: - type: Transform pos: 5.5,-4.5 parent: 1 - - type: DeviceLinkSink - links: - - 20 - uid: 599 components: - type: Transform pos: 1.5,-9.5 parent: 1 - - type: DeviceLinkSink - links: - - 609 - uid: 600 components: - type: Transform pos: -2.5,-9.5 parent: 1 - - type: DeviceLinkSink - links: - - 609 - uid: 601 components: - type: Transform pos: -4.5,-2.5 parent: 1 - - type: DeviceLinkSink - links: - - 21 - uid: 602 components: - type: Transform pos: 3.5,-2.5 parent: 1 - - type: DeviceLinkSink - links: - - 20 - uid: 603 components: - type: Transform pos: 1.5,-1.5 parent: 1 - - type: DeviceLinkSink - links: - - 21 - uid: 604 components: - type: Transform pos: -0.5,-1.5 parent: 1 - - type: DeviceLinkSink - links: - - 21 - uid: 605 components: - type: Transform pos: 5.5,-19.5 parent: 1 - - type: DeviceLinkSink - links: - - 611 - uid: 606 components: - type: Transform pos: -1.5,-1.5 parent: 1 - - type: DeviceLinkSink - links: - - 21 - uid: 607 components: - type: Transform pos: 0.5,-1.5 parent: 1 - - type: DeviceLinkSink - links: - - 21 - uid: 608 components: - type: Transform pos: -2.5,-1.5 parent: 1 - - type: DeviceLinkSink - links: - - 21 - proto: SignalButton entities: - uid: 609 @@ -4707,7 +4550,7 @@ entities: - type: Transform pos: 2.4424396,-17.430403 parent: 1 -- proto: soda_dispenser +- proto: SodaDispenser entities: - uid: 626 components: @@ -4757,6 +4600,13 @@ entities: - type: Transform pos: 0.5,-23.5 parent: 1 +- proto: SyndicateMicrowave + entities: + - uid: 497 + components: + - type: Transform + pos: 3.5,-19.5 + parent: 1 - proto: SyndicateWhistle entities: - uid: 886 diff --git a/Resources/Maps/_NF/Bluespace/bloodmoon.yml b/Resources/Maps/_NF/Bluespace/bloodmoon.yml index f61b74e571f..07f0a1b2eb2 100644 --- a/Resources/Maps/_NF/Bluespace/bloodmoon.yml +++ b/Resources/Maps/_NF/Bluespace/bloodmoon.yml @@ -21,7 +21,7 @@ entities: - uid: 1 components: - type: MetaData - name: Неопознанный объект #corvax-frontier + name: Unidentified Vessel - type: Transform pos: -0.5156249,-0.5312496 parent: invalid diff --git a/Resources/Maps/_NF/Bluespace/cache.yml b/Resources/Maps/_NF/Bluespace/cache.yml index f9913f792c8..eebf3db4101 100644 --- a/Resources/Maps/_NF/Bluespace/cache.yml +++ b/Resources/Maps/_NF/Bluespace/cache.yml @@ -17,7 +17,7 @@ entities: - uid: 1 components: - type: MetaData - name: Неопознанный объект #corvax-frontier + name: Syndicate Weapons Cache - type: Transform pos: 0.055290222,-0.28995132 parent: invalid diff --git a/Resources/Maps/_NF/Bluespace/cave.yml b/Resources/Maps/_NF/Bluespace/cave.yml index c712d4b7784..be83bb2e938 100644 --- a/Resources/Maps/_NF/Bluespace/cave.yml +++ b/Resources/Maps/_NF/Bluespace/cave.yml @@ -13,7 +13,7 @@ entities: - uid: 1 components: - type: MetaData - name: Неопознанный объект #corvax-frontier + name: Cave - type: Transform pos: -0.453125,-0.52345467 parent: invalid diff --git a/Resources/Maps/_NF/Bluespace/mcevent.yml b/Resources/Maps/_NF/Bluespace/mcevent.yml index b0dba05c1a6..74e67454e82 100644 --- a/Resources/Maps/_NF/Bluespace/mcevent.yml +++ b/Resources/Maps/_NF/Bluespace/mcevent.yml @@ -15,7 +15,7 @@ entities: - uid: 1 components: - type: MetaData - name: Неопознанный объект #corvax-frontier + name: McDelivery - type: Transform pos: -0.48958334,-0.5208333 parent: invalid diff --git a/Resources/Maps/_NF/Bluespace/syndieftlintercept.yml b/Resources/Maps/_NF/Bluespace/syndieftlintercept.yml index fe0aaaab379..df09a61efd0 100644 --- a/Resources/Maps/_NF/Bluespace/syndieftlintercept.yml +++ b/Resources/Maps/_NF/Bluespace/syndieftlintercept.yml @@ -22,7 +22,7 @@ entities: - uid: 1 components: - type: MetaData - name: Неопознанный объект #corvax-frontier + name: Unidentified Vessel - type: Transform pos: -0.484375,-0.49998474 parent: invalid diff --git a/Resources/Maps/_NF/Bluespace/vault.yml b/Resources/Maps/_NF/Bluespace/vault.yml index b1d526b2e82..0ef678d0d02 100644 --- a/Resources/Maps/_NF/Bluespace/vault.yml +++ b/Resources/Maps/_NF/Bluespace/vault.yml @@ -24,7 +24,7 @@ entities: - uid: 1 components: - type: MetaData - name: Защищенное хранилище NT #corvax-frontier + name: Secure NT Vault - type: Transform pos: 0.07584572,0.026101112 parent: invalid diff --git a/Resources/Maps/_NF/Bluespace/vaultsmall.yml b/Resources/Maps/_NF/Bluespace/vaultsmall.yml index 48a1b82a9e1..65846a342f5 100644 --- a/Resources/Maps/_NF/Bluespace/vaultsmall.yml +++ b/Resources/Maps/_NF/Bluespace/vaultsmall.yml @@ -15,7 +15,7 @@ entities: - uid: 1 components: - type: MetaData - name: Защищенное хранилище NT #corvax-frontier + name: NT Secure Vault - type: Transform pos: 0.12484646,0.026101112 parent: invalid diff --git a/Resources/Maps/_NF/Bluespace/wizardprobealt.yml b/Resources/Maps/_NF/Bluespace/wizardprobealt.yml index 8341d1907ee..010882ed53b 100644 --- a/Resources/Maps/_NF/Bluespace/wizardprobealt.yml +++ b/Resources/Maps/_NF/Bluespace/wizardprobealt.yml @@ -13,7 +13,7 @@ entities: - uid: 1 components: - type: MetaData - name: Неопознанный объект #corvax-frontier + name: Unidentified Vessel - type: Transform pos: -0.5,-0.50708264 parent: invalid diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/broadhead.yml b/Resources/Maps/_NF/Shuttles/Nfsd/broadhead.yml index c6feee60426..7f4e2485d0f 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/broadhead.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/broadhead.yml @@ -4429,9 +4429,6 @@ entities: - type: Transform pos: 8.5,-12.5 parent: 2 - - type: DeviceNetwork - configurators: - - invalid - proto: SurveillanceCameraSecurity entities: - uid: 244 diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/fighter.yml b/Resources/Maps/_NF/Shuttles/Nfsd/fighter.yml index 1b429284f65..7d08d8aa038 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/fighter.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/fighter.yml @@ -418,7 +418,7 @@ entities: rot: 3.141592653589793 rad pos: 1.5,1.5 parent: 1 -- proto: BaseComputer #corvax-frontier +- proto: ComputerIFF entities: - uid: 52 components: diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/interceptor.yml b/Resources/Maps/_NF/Shuttles/Nfsd/interceptor.yml index c0ee3b56059..d4d70be3993 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/interceptor.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/interceptor.yml @@ -636,7 +636,7 @@ entities: rot: 3.141592653589793 rad pos: -7.5,-1.5 parent: 1 -- proto: BaseComputer #corvax-frontier +- proto: ComputerTabletopIFF entities: - uid: 82 components: diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/prowler.yml b/Resources/Maps/_NF/Shuttles/Nfsd/prowler.yml index 09d745e830a..de1a67fbcd8 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/prowler.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/prowler.yml @@ -1772,7 +1772,7 @@ entities: - type: Transform pos: -2.5,7.5 parent: 1 -- proto: BaseComputer +- proto: ComputerIFF entities: - uid: 243 components: @@ -4385,4 +4385,4 @@ entities: rot: -1.5707963267948966 rad pos: 7.5,0.5 parent: 1 -... +... \ No newline at end of file diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/rogue.yml b/Resources/Maps/_NF/Shuttles/Nfsd/rogue.yml index aca888f08a5..d5193795948 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/rogue.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/rogue.yml @@ -530,7 +530,7 @@ entities: rot: 3.141592653589793 rad pos: 1.5,0.5 parent: 1 -- proto: BaseComputer +- proto: ComputerIFF entities: - uid: 69 components: diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml b/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml index 71043f8e185..a4bbae57f93 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml @@ -4270,7 +4270,7 @@ entities: rot: 1.5707963267948966 rad pos: -1.5,14.5 parent: 1 -- proto: BaseComputer #corvax-frontier +- proto: ComputerIFF entities: - uid: 652 components: @@ -4298,7 +4298,7 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,13.5 parent: 1 -- proto: BaseComputer #corvax-frontier +- proto: ComputerSalvageExpedition entities: - uid: 656 components: diff --git a/Resources/Maps/_NF/Shuttles/bocadillo.yml b/Resources/Maps/_NF/Shuttles/bocadillo.yml index 82105dfb1e1..e4cc68faae5 100644 --- a/Resources/Maps/_NF/Shuttles/bocadillo.yml +++ b/Resources/Maps/_NF/Shuttles/bocadillo.yml @@ -1534,11 +1534,6 @@ entities: - type: Transform pos: -0.5,6.5 parent: 2 - - uid: 173 - components: - - type: Transform - pos: -1.5,6.5 - parent: 2 - proto: Thruster entities: - uid: 34 diff --git a/Resources/Maps/_NF/Shuttles/liquidator.yml b/Resources/Maps/_NF/Shuttles/liquidator.yml index 739c9bc731e..5ca77aaaabd 100644 --- a/Resources/Maps/_NF/Shuttles/liquidator.yml +++ b/Resources/Maps/_NF/Shuttles/liquidator.yml @@ -2046,8 +2046,6 @@ entities: pos: 1.5,-5.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 396 - type: AtmosPipeColor @@ -2105,8 +2103,6 @@ entities: pos: 0.5,-5.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 396 - type: AtmosPipeColor diff --git a/Resources/Maps/_NF/Shuttles/lyrae.yml b/Resources/Maps/_NF/Shuttles/lyrae.yml index e6411cf23c2..48b4b9fcf78 100644 --- a/Resources/Maps/_NF/Shuttles/lyrae.yml +++ b/Resources/Maps/_NF/Shuttles/lyrae.yml @@ -2383,8 +2383,6 @@ entities: pos: -2.5,1.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 63 - uid: 625 @@ -2402,8 +2400,6 @@ entities: pos: -9.5,-1.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 63 - uid: 630 @@ -2412,8 +2408,6 @@ entities: pos: -2.5,4.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 63 - proto: GasMixerOn @@ -3188,8 +3182,6 @@ entities: pos: -2.5,5.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 63 - type: AtmosPipeColor @@ -3200,8 +3192,6 @@ entities: pos: -4.5,-0.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 63 - type: AtmosPipeColor @@ -3223,8 +3213,6 @@ entities: pos: -8.5,-2.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 63 - type: AtmosPipeColor @@ -3246,8 +3234,6 @@ entities: pos: -2.5,2.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 63 - type: AtmosPipeColor @@ -3258,8 +3244,6 @@ entities: pos: -7.5,3.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 63 - type: AtmosPipeColor @@ -3327,8 +3311,6 @@ entities: pos: -1.5,-0.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 63 - type: AtmosPipeColor @@ -3361,8 +3343,6 @@ entities: pos: -9.5,-2.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 63 - type: AtmosPipeColor @@ -3374,8 +3354,6 @@ entities: pos: -3.5,6.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 63 - type: AtmosPipeColor @@ -3387,8 +3365,6 @@ entities: pos: -3.5,3.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 63 - type: AtmosPipeColor @@ -3399,8 +3375,6 @@ entities: pos: -8.5,3.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 63 - type: AtmosPipeColor diff --git a/Resources/Maps/_NF/Shuttles/stasis.yml b/Resources/Maps/_NF/Shuttles/stasis.yml index 74e01c88171..4f2f0a55aa7 100644 --- a/Resources/Maps/_NF/Shuttles/stasis.yml +++ b/Resources/Maps/_NF/Shuttles/stasis.yml @@ -1713,21 +1713,6 @@ entities: - type: Transform pos: 13.5,-7.5 parent: 1 - - uid: 274 - components: - - type: Transform - pos: 12.5,-8.5 - parent: 1 - - uid: 618 - components: - - type: Transform - pos: 14.5,-6.5 - parent: 1 - - uid: 621 - components: - - type: Transform - pos: 14.5,-5.5 - parent: 1 - proto: CableMV entities: - uid: 5 @@ -3328,17 +3313,6 @@ entities: - 419 - type: AtmosPipeColor color: '#990000FF' - - uid: 535 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 12.5,4.5 - parent: 1 - - type: DeviceNetwork - deviceLists: - - 419 - - type: AtmosPipeColor - color: '#990000FF' - uid: 536 components: - type: Transform @@ -3746,20 +3720,6 @@ entities: rot: 3.141592653589793 rad pos: 11.5,4.5 parent: 1 -- proto: NFPosterContrabandFsbLogo - entities: - - uid: 458 - components: - - type: Transform - pos: 22.5,6.5 - parent: 1 -- proto: NFPosterContrabandFsbStasis - entities: - - uid: 233 - components: - - type: Transform - pos: 17.5,7.5 - parent: 1 - proto: NitrogenCanister entities: - uid: 135 @@ -3894,12 +3854,6 @@ entities: rot: 3.141592653589793 rad pos: 20.5,-4.5 parent: 1 - - uid: 204 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 21.5,-8.5 - parent: 1 - uid: 216 components: - type: Transform diff --git a/Resources/Maps/_NF/Test/dev_map.yml b/Resources/Maps/_NF/Test/dev_map.yml index 1d2aa7a84a8..13357aa9c9f 100644 --- a/Resources/Maps/_NF/Test/dev_map.yml +++ b/Resources/Maps/_NF/Test/dev_map.yml @@ -3741,21 +3741,6 @@ entities: parent: 179 - proto: ComputerShipyardSr entities: - - uid: 382 - components: - - type: Transform - pos: 2.5,-11.5 - parent: 179 - - type: ContainerContainer - containers: - ShipyardConsole-targetId: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - board: !type:Container - showEnts: False - occludes: True - ents: [] - uid: 492 components: - type: Transform diff --git a/Resources/Prototypes/Corvax/Shipyard/BlackMarket/barnacle.yml b/Resources/Prototypes/Corvax/Shipyard/BlackMarket/barnacle.yml index 696e04b63a3..05f36b0eff1 100644 --- a/Resources/Prototypes/Corvax/Shipyard/BlackMarket/barnacle.yml +++ b/Resources/Prototypes/Corvax/Shipyard/BlackMarket/barnacle.yml @@ -11,6 +11,11 @@ category: Small group: BlackMarket shuttlePath: /Maps/Corvax/Shuttles/BlackMarket/barnacle.yml + guidebookPage: Null + class: + - Pirate + engine: + - Plasma - type: gameMap id: Barnacle diff --git a/Resources/Prototypes/Corvax/Shipyard/BlackMarket/bocakillo.yml b/Resources/Prototypes/Corvax/Shipyard/BlackMarket/bocakillo.yml index 16e26d12b39..47dddec7245 100644 --- a/Resources/Prototypes/Corvax/Shipyard/BlackMarket/bocakillo.yml +++ b/Resources/Prototypes/Corvax/Shipyard/BlackMarket/bocakillo.yml @@ -16,6 +16,11 @@ category: Small group: BlackMarket shuttlePath: /Maps/Corvax/Shuttles/BlackMarket/bocakillo.yml + guidebookPage: Null + class: + - Pirate + engine: + - Plasma - type: gameMap id: Bocakillo diff --git a/Resources/Prototypes/Corvax/Shipyard/BlackMarket/falcon.yml b/Resources/Prototypes/Corvax/Shipyard/BlackMarket/falcon.yml index f3f76af11a0..bab55170e16 100644 --- a/Resources/Prototypes/Corvax/Shipyard/BlackMarket/falcon.yml +++ b/Resources/Prototypes/Corvax/Shipyard/BlackMarket/falcon.yml @@ -11,6 +11,11 @@ category: Medium group: BlackMarket shuttlePath: /Maps/Corvax/Shuttles/BlackMarket/falcon.yml + guidebookPage: Null + class: + - Pirate + engine: + - Plasma - type: gameMap id: Falcon diff --git a/Resources/Prototypes/Corvax/Shipyard/BlackMarket/menace.yml b/Resources/Prototypes/Corvax/Shipyard/BlackMarket/menace.yml index 1be4a8f0814..17af62d5831 100644 --- a/Resources/Prototypes/Corvax/Shipyard/BlackMarket/menace.yml +++ b/Resources/Prototypes/Corvax/Shipyard/BlackMarket/menace.yml @@ -16,6 +16,11 @@ category: Small group: BlackMarket shuttlePath: /Maps/Corvax/Shuttles/BlackMarket/menace.yml + guidebookPage: Null + class: + - Pirate + engine: + - Plasma - type: gameMap id: Menace diff --git a/Resources/Prototypes/Corvax/Shipyard/BlackMarket/schooner.yml b/Resources/Prototypes/Corvax/Shipyard/BlackMarket/schooner.yml index 1f354946117..d0acddcbccb 100644 --- a/Resources/Prototypes/Corvax/Shipyard/BlackMarket/schooner.yml +++ b/Resources/Prototypes/Corvax/Shipyard/BlackMarket/schooner.yml @@ -6,6 +6,10 @@ category: Medium group: BlackMarket shuttlePath: /Maps/Corvax/Shuttles/BlackMarket/schooner.yml + class: + - Pirate + engine: + - Uranium - type: gameMap id: Schooner diff --git a/Resources/Prototypes/Corvax/Shipyard/Civilian/bottleneck.yml b/Resources/Prototypes/Corvax/Shipyard/Civilian/bottleneck.yml new file mode 100644 index 00000000000..fc09efa16ec --- /dev/null +++ b/Resources/Prototypes/Corvax/Shipyard/Civilian/bottleneck.yml @@ -0,0 +1,39 @@ +# Author Info +# GitHub: Tych0theSynth +# Discord: Tych0 + +# Maintainer Info +# GitHub: Tych0theSynth +# Discord: Tych0 + +# Shuttle Notes: +# +- type: vessel + id: Bottleneck + name: NT Горлышко бутылки + description: Личный транспорт и мобильный офис для представителя Фронтиры + price: 16000 #Appraises at ~14477, margin of ~10% - TODO: fix this value, getting tests to pass - Whatstone + category: Small + group: Sr + access: HeadOfPersonnel + shuttlePath: /Maps/_NF/Shuttles/Sr/bottleneck.yml + guidebookPage: Null + class: + - Civilian + engine: + - Plasma + +- type: gameMap + id: Bottleneck + mapName: 'NT Горлышко бутылки' + mapPath: /Maps/_NF/Shuttles/Sr/bottleneck.yml + minPlayers: 0 + stations: + Bottleneck: + stationProto: StandardFrontierVessel + components: + - type: StationNameSetup + mapNameTemplate: 'Горлышко бутылки {1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: '14' \ No newline at end of file diff --git a/Resources/Prototypes/Corvax/Shipyard/Civilian/broom.yml b/Resources/Prototypes/Corvax/Shipyard/Civilian/broom.yml new file mode 100644 index 00000000000..460b8644daa --- /dev/null +++ b/Resources/Prototypes/Corvax/Shipyard/Civilian/broom.yml @@ -0,0 +1,41 @@ +# Author Info +# GitHub: erhardsteinhauer +# Discord: erhardsteinhauer + +# Maintainer Info +# GitHub: erhardsteinhauer +# Discord: erhardsteinhauer + +# Shuttle Notes: +# +- type: vessel + id: Broom + name: LVHI Метла + description: Тесный, но надежный шаттл для оказания услуг по уборке помещений. + price: 11000 # ~9650$ on mapinit + ~1450$ from 15% markup + category: Micro + group: Sr + access: Janitor + shuttlePath: /Maps/_NF/Shuttles/Sr/broom.yml + guidebookPage: Null + class: + - Civilian + engine: + - Plasma + +- type: gameMap + id: Broom + mapName: 'Метла' + mapPath: /Maps/_NF/Shuttles/Sr/broom.yml + minPlayers: 0 + stations: + Broom: + stationProto: StandardFrontierVessel + components: + - type: StationNameSetup + mapNameTemplate: 'Метла {1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: '14' + - type: StationJobs + availableJobs: {} diff --git a/Resources/Prototypes/Corvax/Shipyard/Civilian/watchdog.yml b/Resources/Prototypes/Corvax/Shipyard/Civilian/watchdog.yml new file mode 100644 index 00000000000..f6423a3cfd8 --- /dev/null +++ b/Resources/Prototypes/Corvax/Shipyard/Civilian/watchdog.yml @@ -0,0 +1,40 @@ +# Author Info +# GitHub: UncaughtEx (https://github.com/UncaughtEx/) +# Discord: @uncaughtowl + +# Maintainer Info +# GitHub: ??? +# Discord: ??? + +# Shuttle Notes: +# Placeholder for a Station Guard-specific ship, duplicated the SBI Crown for now. Sorry, Eli. + +- type: vessel + id: Watchdog + name: SBI Сторожевой пёс + description: Обновленная и перекрашенная старая модель "Тамплиера" NSF, предназначенная для использования наемниками и "перепрофилированная" для станционной охраны + price: 20000 + category: Small + group: Sr + access: Brig # Oddball, matches guard ID, specific enough to exclude cadets + shuttlePath: /Maps/_NF/Shuttles/Sr/watchdog.yml + guidebookPage: Null + class: + - Civilian + engine: + - Plasma + +- type: gameMap + id: Watchdog + mapName: 'SBI Сторожевой пёс' + mapPath: /Maps/_NF/Shuttles/Sr/watchdog.yml + minPlayers: 0 + stations: + Watchdog: + stationProto: StandardFrontierVessel + components: + - type: StationNameSetup + mapNameTemplate: 'Сторожевой пёс {1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: '14' diff --git a/Resources/Prototypes/Corvax/Shipyard/Service/parcel.yml b/Resources/Prototypes/Corvax/Shipyard/Service/parcel.yml new file mode 100644 index 00000000000..1d6e333773e --- /dev/null +++ b/Resources/Prototypes/Corvax/Shipyard/Service/parcel.yml @@ -0,0 +1,41 @@ +# Author Info +# GitHub: ??? +# Discord: ??? + +# Maintainer Info +# GitHub: ??? +# Discord: ??? + +# Shuttle Notes: +# +- type: vessel + id: Parcel + name: NC Парцелла + description: Надежный шаттл для доставки почты и посылок. + price: 18000 + category: Small + group: Sr + access: Mail + shuttlePath: /Maps/_NF/Shuttles/Sr/parcel.yml + guidebookPage: Null + class: + - Cargo + engine: + - Plasma + +- type: gameMap + id: Parcel + mapName: 'NC Парцелла' + mapPath: /Maps/_NF/Shuttles/Sr/parcel.yml + minPlayers: 0 + stations: + Parcel: + stationProto: StandardFrontierVessel + components: + - type: StationNameSetup + mapNameTemplate: 'Парцелла {1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: '14' + - type: StationJobs + availableJobs: {} diff --git a/Resources/Prototypes/_NF/Shipyard/Baron.yml b/Resources/Prototypes/_NF/Shipyard/Baron.yml deleted file mode 100644 index 6587d3978b3..00000000000 --- a/Resources/Prototypes/_NF/Shipyard/Baron.yml +++ /dev/null @@ -1,34 +0,0 @@ -# - type: vessel -# id: Baron -# name: NSF Барон -# description: Сверхогромный многофункциональный шаттл ДСБФ. Рекомендованный состав команды 5-15 человек. -# price: 720500 #Appraisal value is 440000 -# category: Large -# group: Security -# access: Frontier -# shuttlePath: /Maps/Corvax/Shuttles/Nfsd/Baron.yml -# -# - type: gameMap -# id: Baron -# mapName: 'NSF Барон' -# mapPath: /Maps/Corvax/Shuttles/Nfsd/Baron.yml -# minPlayers: 0 -# stations: -# Baron: -# stationProto: StandardFrontierSecurityVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Барон {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# PrisonGuard: [ 0, 0 ] -# SeniorOfficer: [ 0, 0 ] -# Brigmedic: [ 0, 0 ] -# DetectiveNF: [ 0, 0 ] -# Deputy: [ 0, 0 ] -# Cadet: [ 0, 0 ] -# Chef: [ 0, 0 ] -# Bailiff: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/BlackMarket/barnacle.yml b/Resources/Prototypes/_NF/Shipyard/BlackMarket/barnacle.yml index ad0f918db0c..f974d480dd2 100644 --- a/Resources/Prototypes/_NF/Shipyard/BlackMarket/barnacle.yml +++ b/Resources/Prototypes/_NF/Shipyard/BlackMarket/barnacle.yml @@ -5,16 +5,21 @@ # # a wooden pirate version of the classic Prospector # - type: vessel # id: Barnacle - # name: Моряк - # description: 'Малогабаритный пиратский шаттл.' - # price: 16000 + # name: Barnacle + # description: 'Nobody expects the lowly barnacle' + # price: 17000 # Appraises for 15445, price set to 17k, margin of ~10% - TODO: review ship values - Whatstone # category: Small # group: BlackMarket # shuttlePath: /Maps/_NF/Shuttles/BlackMarket/barnacle.yml + # guidebookPage: Null + # class: + # - Pirate + # engine: + # - Plasma # - type: gameMap # id: Barnacle - # mapName: 'Моряк' + # mapName: 'Barnacle' # mapPath: /Maps/_NF/Shuttles/BlackMarket/barnacle.yml # minPlayers: 0 # stations: @@ -22,10 +27,10 @@ # stationProto: StandardFrontierVessel # components: # - type: StationNameSetup - # mapNameTemplate: 'Старатель {1}' # Fake name eh? + # mapNameTemplate: 'Prospector {1}' # Fake name eh? # nameGenerator: # !type:NanotrasenNameGenerator # prefixCreator: '14' # - type: StationJobs - # availableJobs: + # availableJobs: # Pirate: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/BlackMarket/bocakillo.yml b/Resources/Prototypes/_NF/Shipyard/BlackMarket/bocakillo.yml index 2ae6d1827c8..fe40a27eae9 100644 --- a/Resources/Prototypes/_NF/Shipyard/BlackMarket/bocakillo.yml +++ b/Resources/Prototypes/_NF/Shipyard/BlackMarket/bocakillo.yml @@ -10,12 +10,17 @@ # # # - type: vessel # id: Bocakillo - # name: Сэндвич - # description: Малогабаритный пиратский шаттл. Рекомендованный размер команды 2-3 человека. + # name: Bocakillo + # description: A tiny plastitanium vessel suited to a crew of 2 to 3 pirates. Has two broadside cannons and a rear-facing disposals launcher. Runs on plasma. # price: 35000 #Cheap # category: Small # group: BlackMarket # shuttlePath: /Maps/_NF/Shuttles/BlackMarket/bocakillo.yml + # guidebookPage: Null + # class: + # - Pirate + # engine: + # - Plasma # - type: gameMap # id: Bocakillo @@ -27,7 +32,7 @@ # stationProto: StandardFrontierVessel # components: # - type: StationNameSetup - # mapNameTemplate: 'Сэндвич {1}' #Sneaky spoofed name + # mapNameTemplate: 'Bocadillo {1}' #Sneaky spoofed name # nameGenerator: # !type:NanotrasenNameGenerator # prefixCreator: '14' diff --git a/Resources/Prototypes/_NF/Shipyard/BlackMarket/falcon.yml b/Resources/Prototypes/_NF/Shipyard/BlackMarket/falcon.yml index 642e9569864..03076580598 100644 --- a/Resources/Prototypes/_NF/Shipyard/BlackMarket/falcon.yml +++ b/Resources/Prototypes/_NF/Shipyard/BlackMarket/falcon.yml @@ -1,16 +1,21 @@ -# Author Info -# GitHub: Leander_0 +# # Author Info +# # GitHub: Leander_0 # # Shuttle Notes: # # Kestrel looking ship with hangar bay meant to be used along with hoverbikes. # - type: vessel # id: Falcon - # name: Сокол - # description: Пиратский среднегабаритный шаттл. Рекомендованный размер команды 3-4 человека. + # name: Falcon + # description: Rebuilt mining vessel made into a pirate ship with hangar bay to store vehicles, fits between 3-4 crew. # price: 70000 #Selling price is 22520 # category: Medium # group: BlackMarket # shuttlePath: /Maps/_NF/Shuttles/BlackMarket/falcon.yml + # guidebookPage: Null + # class: + # - Pirate + # engine: + # - Plasma # - type: gameMap # id: Falcon @@ -22,7 +27,7 @@ # stationProto: StandardFrontierVessel # components: # - type: StationNameSetup - # mapNameTemplate: 'Пустельга {1}' # Very fake name + # mapNameTemplate: 'Kestrel {1}' # Very fake name # nameGenerator: # !type:NanotrasenNameGenerator # prefixCreator: '14' diff --git a/Resources/Prototypes/_NF/Shipyard/BlackMarket/menace.yml b/Resources/Prototypes/_NF/Shipyard/BlackMarket/menace.yml index 07704783bc2..b5c00b6c953 100644 --- a/Resources/Prototypes/_NF/Shipyard/BlackMarket/menace.yml +++ b/Resources/Prototypes/_NF/Shipyard/BlackMarket/menace.yml @@ -1,21 +1,26 @@ -# Author Info -# GitHub: erhardsteinhauer -# Discord: erhardsteinhauer +# # Author Info +# # GitHub: erhardsteinhauer +# # Discord: erhardsteinhauer -# Maintainer Info -# GitHub: erhardsteinhauer -# Discord: erhardsteinhauer +# # Maintainer Info +# # GitHub: erhardsteinhauer +# # Discord: erhardsteinhauer # # Shuttle Notes: # # # - type: vessel # id: Menace - # name: Предъява - # description: Малогабаритный штурмовой шаттл Синдиката. Рекомендованный размер команды 1-2 человека. + # name: Menace + # description: 'Mail is no longer an option: you either receive it or you die.' # price: 21000 # category: Small # group: BlackMarket # shuttlePath: /Maps/_NF/Shuttles/BlackMarket/menace.yml + # guidebookPage: Null + # class: + # - Pirate + # engine: + # - Plasma # - type: gameMap # id: Menace @@ -27,7 +32,7 @@ # stationProto: StandardFrontierVessel # components: # - type: StationNameSetup - # mapNameTemplate: 'Пачка {1}' # Fake name eh? + # mapNameTemplate: 'Parcel {1}' # Fake name eh? # nameGenerator: # !type:NanotrasenNameGenerator # prefixCreator: '14' diff --git a/Resources/Prototypes/_NF/Shipyard/BlackMarket/schooner.yml b/Resources/Prototypes/_NF/Shipyard/BlackMarket/schooner.yml index 0b7abbfb95b..52c03e387b4 100644 --- a/Resources/Prototypes/_NF/Shipyard/BlackMarket/schooner.yml +++ b/Resources/Prototypes/_NF/Shipyard/BlackMarket/schooner.yml @@ -1,11 +1,16 @@ # - type: vessel # id: Schooner - # name: Шхуна - # description: Среднегабаритный пиратский шаттл. Рекомендованный состав команды 2-4 человека. + # name: Schooner + # description: A small wooden ship with 2 central cargo bays. # price: 60000 # category: Medium # group: BlackMarket # shuttlePath: /Maps/_NF/Shuttles/BlackMarket/schooner.yml + # guidebookPage: Null + # class: + # - Pirate + # engine: + # - Uranium # - type: gameMap # id: Schooner @@ -17,7 +22,7 @@ # stationProto: StandardFrontierVessel # components: # - type: StationNameSetup - # mapNameTemplate: 'Шхуна {1}' + # mapNameTemplate: 'Schooner {1}' # nameGenerator: # !type:NanotrasenNameGenerator # prefixCreator: '14' diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/ambition.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/ambition.yml index 06827b49b60..c5c6ef07713 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/ambition.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/ambition.yml @@ -1,42 +1,44 @@ -# Author Info -# GitHub: Cu1r (https://github.com/Cu1r/) -# Discord: cu1r -# -# Maintainer Info -# GitHub: ??? -# Discord: ??? -# -# Shuttle Notes: -# +# # Author Info +# # GitHub: Cu1r (https://github.com/Cu1r/) +# # Discord: cu1r + +# # Maintainer Info +# # GitHub: ??? +# # Discord: ??? + +# # Shuttle Notes: +# # # - type: vessel -# id: Ambition -# name: UAC Амбициозный -# description: Промышленная газодобывающая платформа, расчитанная на экипаж 8+ человек. -# price: 156000 -# category: Large -# group: Expedition -# shuttlePath: /Maps/_NF/Shuttles/Expedition/ambition.yml -# guidebookPage: ShipyardAmbition -# class: -# - Expedition -# - Atmospherics -# + # id: Ambition + # name: UAC Ambition + # description: Declassified gas production and distribution platform seized in a hostile takeover of an Atmosian conglomerate. For the ultimate insurgent. + # price: 156000 # ~120000$ on mapinit + ~36000$ from 30% markup + # category: Large + # group: Expedition + # shuttlePath: /Maps/_NF/Shuttles/Expedition/ambition.yml + # guidebookPage: ShipyardAmbition + # class: + # - Expedition + # - Atmospherics + # engine: + # - AME + # - type: gameMap -# id: Ambition -# mapName: 'UAC Ambition' -# mapPath: /Maps/_NF/Shuttles/Expedition/ambition.yml -# minPlayers: 0 -# stations: -# Ambition: -# stationProto: StandardFrontierExpeditionVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Амбициозный {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Ambition + # mapName: 'UAC Ambition' + # mapPath: /Maps/_NF/Shuttles/Expedition/ambition.yml + # minPlayers: 0 + # stations: + # Ambition: + # stationProto: StandardFrontierExpeditionVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Ambition {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml index 318df0b93eb..0fe0044c81f 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml @@ -1,42 +1,44 @@ -# Author Info -# GitHub: Kesiath (https://github.com/Kesiath) -# Discord: ??? -# -# Maintainer Info -# GitHub: ??? -# Discord: ??? -# -# Shuttle Notes: -# +# # Author Info +# # GitHub: Kesiath (https://github.com/Kesiath) +# # Discord: ??? + +# # Maintainer Info +# # GitHub: ??? +# # Discord: ??? + +# # Shuttle Notes: +# # # - type: vessel -# id: Anchor -# name: KC Якорь -# description: Крупногабаритный экспедиционный шаттл. Рекомендованный размер команды 4-8 человек. -# price: 105300 # $81000 +30% -# category: Large -# group: Expedition -# shuttlePath: /Maps/_NF/Shuttles/Expedition/anchor.yml -# guidebookPage: Null -# class: -# - Expedition -# - Civilian -# + # id: Anchor + # name: KC Anchor + # description: A large luxury cruiser capable of long ranged travel acrossed the sector, expedition capable. + # price: 140000 # $108432 after appraisal +30ish% (~32000) + # category: Large + # group: Expedition + # shuttlePath: /Maps/_NF/Shuttles/Expedition/anchor.yml + # guidebookPage: Null + # class: + # - Expedition + # - Civilian + # engine: + # - AME + # - type: gameMap -# id: Anchor -# mapName: 'KC Якорь' -# mapPath: /Maps/_NF/Shuttles/Expedition/anchor.yml -# minPlayers: 0 -# stations: -# Anchor: -# stationProto: StandardFrontierExpeditionVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Якорь {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Anchor + # mapName: 'KC Anchor' + # mapPath: /Maps/_NF/Shuttles/Expedition/anchor.yml + # minPlayers: 0 + # stations: + # Anchor: + # stationProto: StandardFrontierExpeditionVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Anchor {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/brigand.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/brigand.yml index eabaf1fa13c..3d9b76226ed 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/brigand.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/brigand.yml @@ -1,41 +1,43 @@ -# Author Info -# GitHub: erhardsteinhauer -# Discord: erhardsteinhauer -# -# Maintainer Info -# GitHub: erhardsteinhauer -# Discord: erhardsteinhauer -# -# Shuttle Notes: -# +# # Author Info +# # GitHub: erhardsteinhauer +# # Discord: erhardsteinhauer + +# # Maintainer Info +# # GitHub: erhardsteinhauer +# # Discord: erhardsteinhauer + +# # Shuttle Notes: +# # # - type: vessel -# id: Brigand -# name: NT Разбойник -# description: Среднегабаритный экспедиционный шаттл. Рекомендованный размер команды 3-6 человек. -# price: 61000 # ~47835$ on mapinit + ~7175$ from 15% markup -# category: Medium -# group: Expedition -# shuttlePath: /Maps/_NF/Shuttles/Expedition/brigand.yml -# guidebookPage: ShipyardBrigand -# class: -# - Expedition -# + # id: Brigand + # name: LVHI Brigand + # description: Civilian conversion of an old military light frigate from the early days of humanity's expansion to the stars, predating FTL technology. Manufactured by Langstad-Voigt Heavy Industries. + # price: 55500 # ~42645$ on mapinit + ~12800$ from 30% markup + # category: Medium + # group: Expedition + # shuttlePath: /Maps/_NF/Shuttles/Expedition/brigand.yml + # guidebookPage: ShipyardBrigand + # class: + # - Expedition + # engine: + # - AME + # - type: gameMap -# id: Brigand -# mapName: 'NT Разбойник' -# mapPath: /Maps/_NF/Shuttles/Expedition/brigand.yml -# minPlayers: 0 -# stations: -# Brigand: -# stationProto: StandardFrontierExpeditionVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Разбойник {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Brigand + # mapName: 'Brigand' + # mapPath: /Maps/_NF/Shuttles/Expedition/brigand.yml + # minPlayers: 0 + # stations: + # Brigand: + # stationProto: StandardFrontierExpeditionVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Brigand {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/courserx.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/courserx.yml deleted file mode 100644 index b81964d5a2f..00000000000 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/courserx.yml +++ /dev/null @@ -1,31 +0,0 @@ -# - type: vessel -# # id: CourserX -# # name: NT Дальнобойщик-Х -# # description: Среднегабаритный экспедиционный шаттл. Рекомендованный размер команды 3-6 человек. -# # price: 68650 -# # category: Medium -# # group: Expedition -# # shuttlePath: /Maps/_NF/Shuttles/Expedition/courserx.yml -# # guidebookPage: Null -# # class: -# # - Expedition -# -# - type: gameMap -# # id: CourserX -# # mapName: 'NT Дальнобойщик-Х' -# # mapPath: /Maps/_NF/Shuttles/Expedition/courserx.yml -# # minPlayers: 0 -# # stations: -# # CourserX: -# # stationProto: StandardFrontierExpeditionVessel -# # components: -# # - type: StationNameSetup -# # mapNameTemplate: 'Дальнобойщик-Х {1}' -# # nameGenerator: -# # !type:NanotrasenNameGenerator -# # prefixCreator: '14' -# # - type: StationJobs -# # availableJobs: -# # Contractor: [ 0, 0 ] -# # Pilot: [ 0, 0 ] -# # Mercenary: [ 0, 0 ] \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/dartx.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/dartx.yml deleted file mode 100644 index ec3e4904ab2..00000000000 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/dartx.yml +++ /dev/null @@ -1,38 +0,0 @@ -# Author Info -# GitHub: Checkraze??? -# Discord: ??? -# -# Maintainer Info -# GitHub: ??? -# Discord: ??? -# -# Shuttle Notes: -# -# - type: vessel -# id: DartX -# name: NT Копьё-X -# description: Среднегабаритный экспедиционный шаттл. Рекомендованный размер команды 3-6 человек. -# price: 83500 # ~64000$ on mapinit + ~19200$ from 30% markup -# category: Medium -# group: Expedition -# shuttlePath: /Maps/_NF/Shuttles/Expedition/dartx.yml -# -# - type: gameMap -# id: DartX -# mapName: 'NT Копьё-X' -# mapPath: /Maps/_NF/Shuttles/Expedition/dartx.yml -# minPlayers: 0 -# stations: -# DartX: -# stationProto: StandardFrontierExpeditionVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Копьё-X {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/decadedove.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/decadedove.yml index b5af02b0f16..2fb04429fcf 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/decadedove.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/decadedove.yml @@ -1,41 +1,43 @@ -# Author Info -# GitHub: crystalHex (https://github.com/crystalHex) -# Discord: ??? -# -# Maintainer Info -# GitHub: crystalHex (https://github.com/crystalHex) -# Discord: ??? -# -# Shuttle Notes: -# +# # Author Info +# # GitHub: crystalHex (https://github.com/crystalHex) +# # Discord: ??? + +# # Maintainer Info +# # GitHub: crystalHex (https://github.com/crystalHex) +# # Discord: ??? + +# # Shuttle Notes: +# # # - type: vessel -# id: DecadeDove -# name: DYS Голубь -# description: Среднегабаритный экспедиционный шаттл. Рекомендованный размер команды 2-6 человек. -# price: 78500 # ~60100$ on mapinit + ~18000$ from 30% markup -# category: Medium -# group: Expedition -# shuttlePath: /Maps/_NF/Shuttles/Expedition/decadedove.yml -# guidebookPage: Null -# class: -# - Expedition -# + # id: DecadeDove + # name: DYS Dove + # description: Versatile expedition-capable multi-purpose light freighter. + # price: 78500 # ~60100$ on mapinit + ~18000$ from 30% markup + # category: Medium + # group: Expedition + # shuttlePath: /Maps/_NF/Shuttles/Expedition/decadedove.yml + # guidebookPage: Null + # class: + # - Expedition + # engine: + # - AME + # - type: gameMap -# id: DecadeDove -# mapName: 'DYS Голубь' -# mapPath: /Maps/_NF/Shuttles/Expedition/decadedove.yml -# minPlayers: 0 -# stations: -# DecadeDove: -# stationProto: StandardFrontierExpeditionVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Голубь {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: DecadeDove + # mapName: 'DYS Dove' + # mapPath: /Maps/_NF/Shuttles/Expedition/decadedove.yml + # minPlayers: 0 + # stations: + # DecadeDove: + # stationProto: StandardFrontierExpeditionVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Dove {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/dragonfly.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/dragonfly.yml index 6702db07f2c..1448922461d 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/dragonfly.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/dragonfly.yml @@ -1,41 +1,43 @@ -# Author Info -# GitHub: crystalHex (https://github.com/crystalHex) -# Discord: ??? -# -# Maintainer Info -# GitHub: crystalHex (https://github.com/crystalHex) -# Discord: ??? -# -# Shuttle Notes: -# +# # Author Info +# # GitHub: crystalHex (https://github.com/crystalHex) +# # Discord: ??? + +# # Maintainer Info +# # GitHub: crystalHex (https://github.com/crystalHex) +# # Discord: ??? + +# # Shuttle Notes: +# # # - type: vessel -# id: Dragonfly -# name: DYS Стрекоза -# description: Среднегабаритный экспедиционный шаттл. Рекомендованный размер команды 2-5 человек. -# price: 81000 # ~62075$ on mapinit + ~18650$ from 30% markup -# category: Medium -# group: Expedition -# shuttlePath: /Maps/_NF/Shuttles/Expedition/dragonfly.yml -# guidebookPage: Null -# class: -# - Expedition -# + # id: Dragonfly + # name: DYS Dragonfly + # description: Highly modular salvaging vessel welded together from smaller re-purposed hulls. + # price: 81000 # ~62075$ on mapinit + ~18650$ from 30% markup + # category: Medium + # group: Expedition + # shuttlePath: /Maps/_NF/Shuttles/Expedition/dragonfly.yml + # guidebookPage: Null + # class: + # - Expedition + # engine: + # - AME + # - type: gameMap -# id: Dragonfly -# mapName: 'DYS Стрекоза' -# mapPath: /Maps/_NF/Shuttles/Expedition/dragonfly.yml -# minPlayers: 0 -# stations: -# Dragonfly: -# stationProto: StandardFrontierExpeditionVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Стрекоза {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Dragonfly + # mapName: 'DYS Dragonfly' + # mapPath: /Maps/_NF/Shuttles/Expedition/dragonfly.yml + # minPlayers: 0 + # stations: + # Dragonfly: + # stationProto: StandardFrontierExpeditionVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Dragonfly {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/gasbender.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/gasbender.yml index acbf1c3ea55..eabc2d77bf4 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/gasbender.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/gasbender.yml @@ -1,42 +1,44 @@ -# Author Info -# GitHub: erhardsteinhauer -# Discord: erhardsteinhauer -# -# Maintainer Info -# GitHub: erhardsteinhauer -# Discord: erhardsteinhauer -# -# Shuttle Notes: -# +# # Author Info +# # GitHub: erhardsteinhauer +# # Discord: erhardsteinhauer + +# # Maintainer Info +# # GitHub: erhardsteinhauer +# # Discord: erhardsteinhauer + +# # Shuttle Notes: +# # # - type: vessel -# id: gasbender -# name: NT Газовый Гигант -# description: Крупногабаритный инженерный шаттл. Рекомендованный размер команды 3-6 человек. -# price: 88500 # ~68140$ on mapinit + 20500$ from 30% markup -# category: Medium -# group: Expedition -# shuttlePath: /Maps/_NF/Shuttles/Expedition/gasbender.yml -# guidebookPage: ShipyardGasbender -# class: -# - Expedition -# - Atmospherics -# + # id: Gasbender + # name: LVHI Gasbender + # description: The Gasbender is a medium-sized engineering vessel outfitted for deep space construction projects. Features atmospherics setup with mixing/ignition chamber. Designed to work in pair with smaller salvage ship. Manufactured by Langstad-Voigt Heavy Industries. + # price: 82500 # ~63330$ on mapinit + 19000$ from 30% markup + # category: Medium + # group: Expedition + # shuttlePath: /Maps/_NF/Shuttles/Expedition/gasbender.yml + # guidebookPage: ShipyardGasbender + # class: + # - Expedition + # - Atmospherics + # engine: + # - AME + # - type: gameMap -# id: gasbender -# mapName: 'NT Газовый Гигант' -# mapPath: /Maps/_NF/Shuttles/Expedition/gasbender.yml -# minPlayers: 0 -# stations: -# gasbender: -# stationProto: StandardFrontierExpeditionVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Газовый Гигант {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Gasbender + # mapName: 'Gasbender' + # mapPath: /Maps/_NF/Shuttles/Expedition/gasbender.yml + # minPlayers: 0 + # stations: + # Gasbender: + # stationProto: StandardFrontierExpeditionVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Gasbender {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/gourd.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/gourd.yml index 59c08f7b931..3caa1436e2c 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/gourd.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/gourd.yml @@ -1,43 +1,45 @@ -# Author Info -# GitHub: YumiGumi (https://github.com/YumiGumi) -# Discord: ??? -# -# Maintainer Info -# GitHub: ??? -# Discord: ??? -# -# Shuttle Notes: -# +# # Author Info +# # GitHub: YumiGumi (https://github.com/YumiGumi) +# # Discord: ??? + +# # Maintainer Info +# # GitHub: ??? +# # Discord: ??? + +# # Shuttle Notes: +# # # - type: vessel -# id: Gourd -# name: SLI Цукини -# description: Крупногабаритный экспедиционный шаттл. Рекомендованный размер команды 4-8 человек. -# price: 150000 # ~115000$ on mapinit + ~34000$ from 30% markup -# category: Large -# group: Expedition -# shuttlePath: /Maps/_NF/Shuttles/Expedition/gourd.yml -# guidebookPage: ShipyardGourd -# class: -# - Expedition -# - Science -# - Civilian -# + # id: Gourd + # name: SLI Gourd + # description: The Gourd is a Science/Expedition vessel with a dedicated blast chamber. + # price: 150000 # ~115000$ on mapinit + ~34000$ from 30% markup + # category: Large + # group: Expedition + # shuttlePath: /Maps/_NF/Shuttles/Expedition/gourd.yml + # guidebookPage: ShipyardGourd + # class: + # - Expedition + # - Science + # - Civilian + # engine: + # - AME + # - type: gameMap -# id: Gourd -# mapName: 'SLI Цукини' -# mapPath: /Maps/_NF/Shuttles/Expedition/gourd.yml -# minPlayers: 0 -# stations: -# Gourd: -# stationProto: StandardFrontierExpeditionVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Цукини {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Gourd + # mapName: 'SLI Gourd' + # mapPath: /Maps/_NF/Shuttles/Expedition/gourd.yml + # minPlayers: 0 + # stations: + # Gourd: + # stationProto: StandardFrontierExpeditionVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Gourd {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/pathfinder.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/pathfinder.yml index 28b691d24b9..e8a40a65a98 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/pathfinder.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/pathfinder.yml @@ -1,41 +1,43 @@ -# Author Info -# GitHub: Kesiath (https://github.com/Kesiath) -# Discord: @kesiath -# -# Maintainer Info -# GitHub: ??? -# Discord: ??? -# -# Shuttle Notes: -# +# # Author Info +# # GitHub: Kesiath (https://github.com/Kesiath) +# # Discord: @kesiath + +# # Maintainer Info +# # GitHub: ??? +# # Discord: ??? + +# # Shuttle Notes: +# # # - type: vessel -# id: Pathfinder -# name: KC Следопыт -# description: Малогабаритный экспедиционный шаттл. Рекомендуемый состав команды 2-4 человека. -# price: 52920 -# category: Small -# group: Expedition -# shuttlePath: /Maps/_NF/Shuttles/Expedition/pathfinder.yml -# guidebookPage: ShipyardPathfinder -# class: -# - Expedition -# + # id: Pathfinder + # name: KC Pathfinder + # description: Once a scout ship serving with the Nanotrasen Marine Expeditionary Forces, this now decommissioned expedition capable ship can be yours! + # price: 52920 + # category: Small + # group: Expedition + # shuttlePath: /Maps/_NF/Shuttles/Expedition/pathfinder.yml + # guidebookPage: ShipyardPathfinder + # class: + # - Expedition + # engine: + # - AME + # - type: gameMap -# id: Pathfinder -# mapName: 'KC Следопыт' -# mapPath: /Maps/_NF/Shuttles/Expedition/pathfinder.yml -# minPlayers: 0 -# stations: -# Pathfinder: -# stationProto: StandardFrontierExpeditionVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Следопыт {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Pathfinder + # mapName: 'KC Pathfinder' + # mapPath: /Maps/_NF/Shuttles/Expedition/pathfinder.yml + # minPlayers: 0 + # stations: + # Pathfinder: + # stationProto: StandardFrontierExpeditionVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Pathfinder {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/rosebudmkii.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/rosebudmkii.yml deleted file mode 100644 index 57a4e6492db..00000000000 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/rosebudmkii.yml +++ /dev/null @@ -1,31 +0,0 @@ -# - type: vessel -# # id: RosebudMKII -# # name: NT Бутон MKII -# # description: Среднегабаритный экспедиционный шаттл. Рекомендованный состав команды 3-6 человек. -# # price: 138000 -# # category: Medium -# # group: Expedition -# # shuttlePath: /Maps/_NF/Shuttles/Expedition/rosebudmkii.yml -# # guidebookPage: Null -# # class: -# # - Expedition -# -# - type: gameMap -# # id: RosebudMKII -# # mapName: 'NT Бутон MKII' -# # mapPath: /Maps/_NF/Shuttles/Expedition/rosebudmkii.yml -# # minPlayers: 0 -# # stations: -# # RosebudMKII: -# # stationProto: StandardFrontierExpeditionVessel -# # components: -# # - type: StationNameSetup -# # mapNameTemplate: 'Бутон MKII {1}' -# # nameGenerator: -# # !type:NanotrasenNameGenerator -# # prefixCreator: '14' -# # - type: StationJobs -# # availableJobs: -# # Contractor: [ 0, 0 ] -# # Pilot: [ 0, 0 ] -# # Mercenary: [ 0, 0 ] \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/sprinter.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/sprinter.yml index c0c6ce38bb0..a39ebd80c7d 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/sprinter.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/sprinter.yml @@ -1,41 +1,43 @@ -# Author Info -# GitHub: Kesiath (https://github.com/Kesiath) -# Discord: @kesiath -# -# Maintainer Info -# GitHub: ??? -# Discord: ??? -# -# Shuttle Notes: -# +# # Author Info +# # GitHub: Kesiath (https://github.com/Kesiath) +# # Discord: @kesiath + +# # Maintainer Info +# # GitHub: ??? +# # Discord: ??? + +# # Shuttle Notes: +# # # - type: vessel -# id: Sprinter -# name: KC Спринтер -# description: Среднегабаритный экспедиционный шаттл. Рекомендованный состав команды 3-6 человек. -# price: 66500 # ~51200$ on mapinit + ~15360$ from 30% markup -# category: Medium -# group: Expedition -# shuttlePath: /Maps/_NF/Shuttles/Expedition/sprinter.yml -# guidebookPage: Null -# class: -# - Expedition -# + # id: Sprinter + # name: KC Sprinter + # description: A light freighter often picked by bounty hunters due to its quick acceleration, expedition capable. + # price: 56800 # ~$43700 on mapinit plus ~30% markup + # category: Medium + # group: Expedition + # shuttlePath: /Maps/_NF/Shuttles/Expedition/sprinter.yml + # guidebookPage: Null + # class: + # - Expedition + # engine: + # - AME + # - type: gameMap -# id: Sprinter -# mapName: 'KC Спринтер' -# mapPath: /Maps/_NF/Shuttles/Expedition/sprinter.yml -# minPlayers: 0 -# stations: -# Sprinter: -# stationProto: StandardFrontierExpeditionVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Спринтер {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Sprinter + # mapName: 'KC Sprinter' + # mapPath: /Maps/_NF/Shuttles/Expedition/sprinter.yml + # minPlayers: 0 + # stations: + # Sprinter: + # stationProto: StandardFrontierExpeditionVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Sprinter {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/broadhead.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/broadhead.yml index 41ee5e7f924..3fcc59df95b 100644 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/broadhead.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/broadhead.yml @@ -1,41 +1,41 @@ -# Author Info -# GitHub: Tych0theSynth -# Discord: Tych0 -# -# Maintainer Info -# GitHub: Tych0theSynth -# Discord: Tych0 -# -# Shuttle Notes: -# +# # Author Info +# # GitHub: Tych0theSynth +# # Discord: Tych0 + +# # Maintainer Info +# # GitHub: Tych0theSynth +# # Discord: Tych0 + +# # Shuttle Notes: +# # # - type: vessel -# id: Broadhead -# name: NSF Авангард -# description: Среднегабаритный шаттл ДСБФ, предназначенный для проведения раследований. -# price: 50000 -# category: Medium -# group: Security -# access: Detective -# shuttlePath: /Maps/_NF/Shuttles/Nfsd/broadhead.yml -# guidebookPage: Null -# class: -# - Detective -# + # id: Broadhead + # name: NSF Broadhead + # description: A medium size detective ship with facilities for autopsies, interrogations and detailed investigations. + # price: 60000 # TODO: fix these values, getting tests to pass - Whatstone + # category: Medium + # group: Security + # access: Detective + # shuttlePath: /Maps/_NF/Shuttles/Nfsd/broadhead.yml + # guidebookPage: Null + # class: + # - Detective + # engine: + # - Uranium + # - type: gameMap -# id: Broadhead -# mapName: 'NSF Авангард' -# mapPath: /Maps/_NF/Shuttles/Nfsd/broadhead.yml -# minPlayers: 0 -# stations: -# Broadhead: -# stationProto: StandardFrontierSecurityVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Авангард {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Detective: [ 0, 0 ] -# SecurityOfficer: [ 0, 0 ] + # id: Broadhead + # mapName: 'NSF Broadhead' + # mapPath: /Maps/_NF/Shuttles/Nfsd/broadhead.yml + # minPlayers: 0 + # stations: + # Broadhead: + # stationProto: StandardFrontierSecurityVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Broadhead {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: {} diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/cleric.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/cleric.yml index 39a3e2592d1..556a6e5527f 100644 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/cleric.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/cleric.yml @@ -1,30 +1,32 @@ # - type: vessel -# id: Cleric -# name: NSF Пастырь -# description: Малогабаритный медицинский шаттл ДСБФ. Рекомендованный состав команды 1 человек. -# price: 11800 #Appraisal is 10500 -# category: Micro -# group: Custom -# access: Security -# mapchecker_group_override: Security # Treat this as a security vessel for mapchecker purposes -# shuttlePath: /Maps/_NF/Shuttles/Nfsd/cleric.yml -# guidebookPage: Null -# class: -# - Medical -# + # id: Cleric + # name: NSF Cleric + # description: Micro support vessel used for emergency rescues and first aid. + # price: 11800 #Appraisal is 10500 + # category: Micro + # group: Custom + # access: Security + # mapchecker_group_override: Security # Treat this as a security vessel for mapchecker purposes + # shuttlePath: /Maps/_NF/Shuttles/Nfsd/cleric.yml + # guidebookPage: Null + # class: + # - Medical + # engine: + # - APU + # - type: gameMap -# id: Cleric -# mapName: 'NSF Пастырь' -# mapPath: /Maps/_NF/Shuttles/Nfsd/cleric.yml -# minPlayers: 0 -# stations: -# Cleric: -# stationProto: StandardFrontierSecurityVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Пастырь {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: {} + # id: Cleric + # mapName: 'NSF Cleric' + # mapPath: /Maps/_NF/Shuttles/Nfsd/cleric.yml + # minPlayers: 0 + # stations: + # Cleric: + # stationProto: StandardFrontierSecurityVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Cleric {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: {} diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/empress.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/empress.yml index 1493c03342b..9883e43f642 100644 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/empress.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/empress.yml @@ -1,34 +1,36 @@ # - type: vessel -# id: Empress -# name: NSF Императрица -# description: Крупногабаритный патрульшый шаттл ДСБФ. Рекомендованный состав команды 4-8 человек. -# price: 170000 #Appraisal value is 150000 -# category: Large -# group: Security -# access: Bailiff -# shuttlePath: /Maps/_NF/Shuttles/Nfsd/empress.yml -# guidebookPage: Null -# class: -# - Capital -# + # id: Empress + # name: NSF Empress + # description: A large patrol vessel capable of carrying up to 3 smaller faster attack ships. the flagship vessel of the nfsd. + # price: 170000 #Appraisal value is 150000 + # category: Large + # group: Security + # access: Bailiff + # shuttlePath: /Maps/_NF/Shuttles/Nfsd/empress.yml + # guidebookPage: Null + # class: + # - Capital + # engine: + # - AME + # - type: gameMap -# id: Empress -# mapName: 'NSF Императрица' -# mapPath: /Maps/_NF/Shuttles/Nfsd/empress.yml -# minPlayers: 0 -# stations: -# Empress: -# stationProto: StandardFrontierSecurityVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Императрица {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# PrisonGuard: [ 0, 0 ] -# SecurityOfficer: [ 0, 0 ] -# Warden: [ 0, 0 ] -# Brigmedic: [ 0, 0 ] -# Chef: [ 0, 0 ] + # id: Empress + # mapName: 'NSF Empress' + # mapPath: /Maps/_NF/Shuttles/Nfsd/empress.yml + # minPlayers: 0 + # stations: + # Empress: + # stationProto: StandardFrontierSecurityVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Empress {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: +# # PrisonGuard: [ 0, 0 ] +# # SecurityOfficer: [ 0, 0 ] +# # Warden: [ 0, 0 ] +# # Brigmedic: [ 0, 0 ] + # Chef: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/enforcer.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/enforcer.yml deleted file mode 100644 index 3cf9305ae95..00000000000 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/enforcer.yml +++ /dev/null @@ -1,31 +0,0 @@ -# - type: vessel -# # id: Enforcer -# # name: NSF Блюститель -# # description: Небольшой патрульный шаттл быстрого реагирования. -# # price: 21350 -# # category: Small -# # group: Security -# # access: Bailiff -# # shuttlePath: /Maps/_NF/Shuttles/Nfsd/enforcer.yml -# # guidebookPage: Null -# # class: -# # - Fighter # Where does this belong? -# -# - type: gameMap -# # id: Enforcer -# # mapName: 'NSF Блюститель' -# # mapPath: /Maps/_NF/Shuttles/Nfsd/enforcer.yml -# # minPlayers: 0 -# # stations: -# # Enforcer: -# # stationProto: StandardFrontierSecurityVessel -# # components: -# # - type: StationNameSetup -# # mapNameTemplate: '{0} Блюститель {1}' -# # nameGenerator: -# # !type:NanotrasenNameGenerator -# # prefixCreator: '14' -# # - type: StationJobs -# # availableJobs: -# # PrisonGuard: [ 0, 0 ] -# # SecurityOfficer: [ 1, 1 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/fighter.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/fighter.yml index 50ba3cb659a..8b5993b60fd 100644 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/fighter.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/fighter.yml @@ -1,30 +1,32 @@ # - type: vessel -# id: Fighter -# name: NSF Истребитель -# description: Малогабаритный атакующий шаттл ДСБФ. -# price: 9000 #not sure how much mark up % to add but the appraisal is 7150$ now -# category: Micro -# group: Custom -# access: Security -# mapchecker_group_override: Security # Treat this as a security vessel for mapchecker purposes -# shuttlePath: /Maps/_NF/Shuttles/Nfsd/fighter.yml -# guidebookPage: Null -# class: -# - Fighter -# + # id: Fighter + # name: NSF Fighter + # description: Micro attack vessel used for boarding and transport of prisoners. + # price: 9000 #not sure how much mark up % to add but the appraisal is 7150$ now + # category: Micro + # group: Custom + # access: Security + # mapchecker_group_override: Security # Treat this as a security vessel for mapchecker purposes + # shuttlePath: /Maps/_NF/Shuttles/Nfsd/fighter.yml + # guidebookPage: Null + # class: + # - Fighter + # engine: + # - APU + # - type: gameMap -# id: Fighter -# mapName: 'NSF Истребитель' -# mapPath: /Maps/_NF/Shuttles/Nfsd/fighter.yml -# minPlayers: 0 -# stations: -# Fighter: -# stationProto: StandardFrontierSecurityVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Истребитель {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: {} + # id: Fighter + # mapName: 'NSF Fighter' + # mapPath: /Maps/_NF/Shuttles/Nfsd/fighter.yml + # minPlayers: 0 + # stations: + # Fighter: + # stationProto: StandardFrontierSecurityVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Fighter {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: {} diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/hospitaller.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/hospitaller.yml index 379cc80f1a4..9b3644820aa 100644 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/hospitaller.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/hospitaller.yml @@ -1,29 +1,31 @@ # - type: vessel -# id: Hospitaller -# name: NSF Лазарет -# description: Малогабаритный медицинский шаттл. Рекомендованный состав команды 1-3 человека. -# price: 28220 -# category: Small -# group: Security -# access: Security -# shuttlePath: /Maps/_NF/Shuttles/Nfsd/hospitaller.yml -# guidebookPage: Null -# class: -# - Medical -# + # id: Hospitaller + # name: NSF Hospitaller + # description: A small security medical craft designed for emergency response and search and rescue operations. + # price: 28220 + # category: Small + # group: Security + # access: Security + # shuttlePath: /Maps/_NF/Shuttles/Nfsd/hospitaller.yml + # guidebookPage: Null + # class: + # - Medical + # engine: + # - APU + # - type: gameMap -# id: Hospitaller -# mapName: 'NSF Лазарет' -# mapPath: /Maps/_NF/Shuttles/Nfsd/hospitaller.yml -# minPlayers: 0 -# stations: -# Hospitaller: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Лазарет {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: {} + # id: Hospitaller + # mapName: 'NSF Hospitaller' + # mapPath: /Maps/_NF/Shuttles/Nfsd/hospitaller.yml + # minPlayers: 0 + # stations: + # Hospitaller: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Hospitaller {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: {} diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/inquisitor.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/inquisitor.yml deleted file mode 100644 index 6d0c0b65801..00000000000 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/inquisitor.yml +++ /dev/null @@ -1,29 +0,0 @@ -# - type: vessel -# id: Inquisitor -# name: NSF Инквизитор -# description: Малогабаритный патрульный шаттл. Рекомендованный состав команды 1-3 человека. -# price: 29000 -# category: Small -# group: Security -# access: Detective -# shuttlePath: /Maps/_NF/Shuttles/Nfsd/inquisitor.yml -# guidebookPage: Null -# class: -# - Detective -# -# - type: gameMap -# id: Inquisitor -# mapName: 'NSF Инквизитор' -# mapPath: /Maps/_NF/Shuttles/Nfsd/inquisitor.yml -# minPlayers: 0 -# stations: -# Inquisitor: -# stationProto: StandardFrontierSecurityVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Инквизитор {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: {} diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/interceptor.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/interceptor.yml index f4592178afc..43f293c62de 100644 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/interceptor.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/interceptor.yml @@ -1,29 +1,31 @@ # - type: vessel -# id: Interceptor -# name: NSF Перехватчик -# description: Малогабаритный патрульный шаттл. Рекомендованный состав команды 1-2 человека. -# price: 21350 -# category: Small -# group: Security -# access: Detective -# shuttlePath: /Maps/_NF/Shuttles/Nfsd/interceptor.yml -# guidebookPage: Null -# class: -# - Detective -# + # id: Interceptor + # name: NSF Interceptor + # description: A small security vessel specializing in crime scene forensics. + # price: 21350 + # category: Small + # group: Security + # access: Detective + # shuttlePath: /Maps/_NF/Shuttles/Nfsd/interceptor.yml + # guidebookPage: Null + # class: + # - Detective + # engine: + # - Plasma + # - type: gameMap -# id: Interceptor -# mapName: 'NSF Перехватчик' -# mapPath: /Maps/_NF/Shuttles/Nfsd/interceptor.yml -# minPlayers: 0 -# stations: -# Interceptor: -# stationProto: StandardFrontierSecurityVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Перехватчик {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: {} + # id: Interceptor + # mapName: 'NSF Interceptor' + # mapPath: /Maps/_NF/Shuttles/Nfsd/interceptor.yml + # minPlayers: 0 + # stations: + # Interceptor: + # stationProto: StandardFrontierSecurityVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Interceptor {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: {} diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/marauder.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/marauder.yml deleted file mode 100644 index 2664050330e..00000000000 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/marauder.yml +++ /dev/null @@ -1,29 +0,0 @@ -# - type: vessel -# id: Marauder -# name: NSF Мародёр -# description: Тяжёлый крупногабаритный патрульный шаттл. Рекомендованный состав команды 4-8 человек. -# price: 80000 -# category: Large -# group: Security -# access: Bailiff -# shuttlePath: /Maps/_NF/Shuttles/Nfsd/marauder.yml -# guidebookPage: Null -# class: -# - Capital -# -# - type: gameMap -# id: Marauder -# mapName: 'NSF Мародёр' -# mapPath: /Maps/_NF/Shuttles/Nfsd/marauder.yml -# minPlayers: 0 -# stations: -# Marauder: -# stationProto: StandardFrontierSecurityVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Мародёр {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: {} diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/opportunity.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/opportunity.yml deleted file mode 100644 index 440f482fe44..00000000000 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/opportunity.yml +++ /dev/null @@ -1,31 +0,0 @@ -# - type: vessel -# # id: Opportunity -# # name: NSF Opportunity -# # description: A medium expeditionary prison vessel capable of incarcerating up to 4 criminals. The ship is capable of planetfall and mining operations. Find a reliable crew of prison guards to help you keep your prisoners in line. -# # price: 70000 -# # category: Medium -# # group: Security -# # access: Bailiff -# # shuttlePath: /Maps/_NF/Shuttles/Nfsd/opportunity.yml -# # guidebookPage: Null -# # class: -# # - Detainment -# # - Expedition -# -# - type: gameMap -# # id: Opportunity -# # mapName: 'NSF Opportunity' -# # mapPath: /Maps/_NF/Shuttles/Nfsd/opportunity.yml -# # minPlayers: 0 -# # stations: -# # Opportunity: -# # stationProto: StandardFrontierSecurityExpeditionVessel -# # components: -# # - type: StationNameSetup -# # mapNameTemplate: 'Opportunity {1}' -# # nameGenerator: -# # !type:NanotrasenNameGenerator -# # prefixCreator: '14' -# # - type: StationJobs -# # availableJobs: -# # Prisoner: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/prowler.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/prowler.yml index b9435d5cca2..776dac6da0f 100644 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/prowler.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/prowler.yml @@ -1,29 +1,31 @@ # - type: vessel -# id: Prowler -# name: NSF Бродяга -# description: Среднегабаритный патрульный шаттл. Рекомендованный состав команды 3-6 человек. -# price: 49220 -# category: Medium -# group: Security -# access: Sergeant -# shuttlePath: /Maps/_NF/Shuttles/Nfsd/prowler.yml -# guidebookPage: Null -# class: -# - Stealth -# + # id: Prowler + # name: NSF Prowler + # description: A medium-sized patrol craft, the Prowler class is a dedicated deep space pursuit vessel with an advanced sensor suite. + # price: 42000 #Appraises on purchase at ~35000. 20% markup applied due to the presence of the radar. + # category: Medium + # group: Security + # access: Sergeant + # shuttlePath: /Maps/_NF/Shuttles/Nfsd/prowler.yml + # guidebookPage: Null + # class: + # - Patrol + # engine: + # - AME + # - type: gameMap -# id: Prowler -# mapName: 'NSF Бродяга' -# mapPath: /Maps/_NF/Shuttles/Nfsd/prowler.yml -# minPlayers: 0 -# stations: -# Prowler: -# stationProto: StandardFrontierSecurityVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Бродяга {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: {} + # id: Prowler + # mapName: 'NSF Prowler' + # mapPath: /Maps/_NF/Shuttles/Nfsd/prowler.yml + # minPlayers: 0 + # stations: + # Prowler: + # stationProto: StandardFrontierSecurityVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Prowler {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: {} diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/rogue.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/rogue.yml index 3b7be4c25cb..548fcd6c937 100644 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/rogue.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/rogue.yml @@ -1,30 +1,32 @@ # - type: vessel -# id: Rogue -# name: NSF Плут -# description: Малогабаритный штурмовой шаттл ДСБФ с системами активной маскировки. -# price: 12200 #the appraisal is 9100$ -# category: Micro -# group: Custom -# access: Security -# mapchecker_group_override: Security # Treat this as a security vessel for mapchecker purposes -# shuttlePath: /Maps/_NF/Shuttles/Nfsd/rogue.yml -# guidebookPage: Null -# class: -# - Fighter -# + # id: Rogue + # name: NSF Rogue + # description: Micro assault vessel with a toggle for going dark in deep space. + # price: 12200 #the appraisal is 9100$ + # category: Micro + # group: Custom + # access: Security + # mapchecker_group_override: Security # Treat this as a security vessel for mapchecker purposes + # shuttlePath: /Maps/_NF/Shuttles/Nfsd/rogue.yml + # guidebookPage: Null + # class: + # - Fighter + # engine: + # - APU + # - type: gameMap -# id: Rogue -# mapName: 'NSF Плут' -# mapPath: /Maps/_NF/Shuttles/Nfsd/rogue.yml -# minPlayers: 0 -# stations: -# Rogue: -# stationProto: StandardFrontierSecurityVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Плут {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: {} + # id: Rogue + # mapName: 'NSF Rogue' + # mapPath: /Maps/_NF/Shuttles/Nfsd/rogue.yml + # minPlayers: 0 + # stations: + # Rogue: + # stationProto: StandardFrontierSecurityVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Rogue {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: {} diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/templar.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/templar.yml index d41d45a0eb6..e2749b82e65 100644 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/templar.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/templar.yml @@ -1,29 +1,31 @@ # - type: vessel -# id: Templar -# name: NSF Тамплиер -# description: Малогабаритный штурмовой шаттл ДСБФ. Рекомендованный состав команды 1-3 человека. -# price: 24220 -# category: Small -# group: Security -# access: Security -# shuttlePath: /Maps/_NF/Shuttles/Nfsd/templar.yml -# guidebookPage: Null -# class: -# - Fighter -# + # id: Templar + # name: NSF Templar + # description: A small security assault craft designed for combat interdiction operations. + # price: 24220 + # category: Small + # group: Security + # access: Security + # shuttlePath: /Maps/_NF/Shuttles/Nfsd/templar.yml + # guidebookPage: Null + # class: + # - Pursuit + # engine: + # - APU + # - type: gameMap -# id: Templar -# mapName: 'NSF Тамплиер' -# mapPath: /Maps/_NF/Shuttles/Nfsd/templar.yml -# minPlayers: 0 -# stations: -# Templar: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Тамплиер {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: {} + # id: Templar + # mapName: 'NSF Templar' + # mapPath: /Maps/_NF/Shuttles/Nfsd/templar.yml + # minPlayers: 0 + # stations: + # Templar: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Templar {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: {} diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/trident.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/trident.yml deleted file mode 100644 index dc3bae48564..00000000000 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/trident.yml +++ /dev/null @@ -1,31 +0,0 @@ -# - type: vessel -# # id: Trident -# # name: NSF Трезубец -# # description: Среднегабаритный патрульный шаттл. Рекомендованный состав команды 3-6 человек. -# # price: 49300 -# # category: Medium -# # group: Security -# # access: Bailiff -# # shuttlePath: /Maps/_NF/Shuttles/Nfsd/trident.yml -# # guidebookPage: Null -# # class: -# # - Capital -# -# - type: gameMap -# # id: Trident -# # mapName: 'NSF Трезубец' -# # mapPath: /Maps/_NF/Shuttles/Nfsd/trident.yml -# # minPlayers: 0 -# # stations: -# # Trident: -# # stationProto: StandardFrontierSecurityVessel -# # components: -# # - type: StationNameSetup -# # mapNameTemplate: '{0} Трезубец {1}' -# # nameGenerator: -# # !type:NanotrasenNameGenerator -# # prefixCreator: '14' -# # - type: StationJobs -# # availableJobs: -# # PrisonGuard: [ 0, 0 ] -# # SecurityOfficer: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/wasp.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/wasp.yml index 181dc53f832..686790729b5 100644 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/wasp.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/wasp.yml @@ -1,32 +1,34 @@ # - type: vessel -# id: Wasp -# name: NSF Шершень -# description: Крупногабаритный каторжный шаттл. Рекомендованный состав команды 8+ человек. -# price: 135000 -# category: Large -# group: Security -# access: Bailiff -# shuttlePath: /Maps/_NF/Shuttles/Nfsd/wasp.yml -# guidebookPage: Null -# class: -# - Capital -# - Detainment -# - Expedition -# + # id: Wasp + # name: NSF Wasp + # description: A large expedition oriented ship for holding prisoners and making them work planetside. + # price: 135000 + # category: Large + # group: Security + # access: Bailiff + # shuttlePath: /Maps/_NF/Shuttles/Nfsd/wasp.yml + # guidebookPage: Null + # class: + # - Capital + # - Detainment + # - Expedition + # engine: + # - AME + # - type: gameMap -# id: Wasp -# mapName: 'NSF Шершень' -# mapPath: /Maps/_NF/Shuttles/Nfsd/wasp.yml -# minPlayers: 0 -# stations: -# Wasp: -# stationProto: StandardFrontierExpeditionVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Шершень {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Prisoner: [ 0, 0 ] + # id: Wasp + # mapName: 'NSF Wasp' + # mapPath: /Maps/_NF/Shuttles/Nfsd/wasp.yml + # minPlayers: 0 + # stations: + # Wasp: + # stationProto: StandardFrontierExpeditionVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Wasp {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Prisoner: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/wendigo.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/wendigo.yml index 0f6b6183359..42440b92ab3 100644 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/wendigo.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/wendigo.yml @@ -1,40 +1,40 @@ -# Author Info -# GitHub: MagnusCrowe -# Discord: MagnusCrowe +# # Author Info +# # GitHub: MagnusCrowe +# # Discord: MagnusCrowe -# Maintainer Info -# GitHub: MagnusCrowe -# Discord: MagnusCrowe +# # Maintainer Info +# # GitHub: MagnusCrowe +# # Discord: MagnusCrowe -# Shuttle Notes: -# -- type: vessel - id: Wendigo - name: NSF Вендиго - description: Шаттл среднего класса с рекомендуемым экипажем из 2-3 офицеров, "Вендиго" - это специализированное судно для перехвата, оснащенное мощным электромагнитным устройством для борьбы с убегающими судами. - price: 34500 - category: Medium - group: Security - access: Sergeant - shuttlePath: /Maps/_NF/Shuttles/Nfsd/wendigo.yml - class: - - Pursuit - engine: - - Uranium +# # Shuttle Notes: +# # +# - type: vessel + # id: Wendigo + # name: NSF Wendigo + # description: A light medium ship with a recommended crew of 2 to 3 officers, the Wendigo is a dedicated interdiction vessel outfitted with a powerful EMP device for tackling escaping vessels. + # price: 34500 + # category: Medium + # group: Security + # access: Sergeant + # shuttlePath: /Maps/_NF/Shuttles/Nfsd/wendigo.yml + # class: + # - Pursuit + # engine: + # - Uranium -- type: gameMap - id: Wendigo - mapName: 'NSF Вендиго' - mapPath: /Maps/_NF/Shuttles/Nfsd/wendigo.yml - minPlayers: 0 - stations: - Wendigo: - stationProto: StandardFrontierSecurityVessel - components: - - type: StationNameSetup - mapNameTemplate: 'Вендиго {1}' - nameGenerator: - !type:NanotrasenNameGenerator - prefixCreator: '14' - - type: StationJobs - availableJobs: {} +# - type: gameMap + # id: Wendigo + # mapName: 'NSF Wendigo' + # mapPath: /Maps/_NF/Shuttles/Nfsd/wendigo.yml + # minPlayers: 0 + # stations: + # Wendigo: + # stationProto: StandardFrontierSecurityVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Wendigo {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: {} diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/whiskey.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/whiskey.yml deleted file mode 100644 index d4d77edc40a..00000000000 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/whiskey.yml +++ /dev/null @@ -1,29 +0,0 @@ -# - type: vessel -# id: Whiskey -# name: NSF Whiskey -# description: A heavy duty NSFD rescue ship, suited for one to two brigmedics and a pilot. -# price: 55000 -# category: Medium -# group: Security -# access: Bailiff -# shuttlePath: /Maps/_NF/Shuttles/Nfsd/whiskey.yml -# guidebookPage: Null -# class: -# - Medical -# -# - type: gameMap -# id: Whiskey -# mapName: 'NSF Whiskey' -# mapPath: /Maps/_NF/Shuttles/Nfsd/whiskey.yml -# minPlayers: 0 -# stations: -# Whiskey: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Whiskey {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: {} \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/bison.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/bison.yml index 864974ce320..191260c9c92 100644 --- a/Resources/Prototypes/_NF/Shipyard/Scrap/bison.yml +++ b/Resources/Prototypes/_NF/Shipyard/Scrap/bison.yml @@ -1,32 +1,35 @@ # - type: vessel -# id: Bison -# name: NT Бизон -# description: Крупногобаритный многоцелевой шаттл. Рекомендованный размер команды 4-8 человек. -# price: 166138 -# category: Large -# group: Scrap -# shuttlePath: /Maps/_NF/Shuttles/Scrap/bison.yml -# guidebookPage: Null -# class: -# - Scrapyard -# - Salvage -# + # id: Bison + # name: NT Bison + # description: A heavy duty ship breaker with a durable hull and a substantial amount of living space, built for long journeys with self-sufficiency. + # price: 166138 + # category: Large + # group: Scrap + # shuttlePath: /Maps/_NF/Shuttles/Scrap/bison.yml + # guidebookPage: Null + # class: + # - Scrapyard + # - Salvage + # - Civilian + # engine: + # - Plasma + # - type: gameMap -# id: Bison -# mapName: 'NT Бизон' -# mapPath: /Maps/_NF/Shuttles/Scrap/bison.yml -# minPlayers: 0 -# stations: -# Bison: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Бизон {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Bison + # mapName: 'NT Bison' + # mapPath: /Maps/_NF/Shuttles/Scrap/bison.yml + # minPlayers: 0 + # stations: + # Bison: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Bison {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/canister.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/canister.yml index 2f735c72038..2399d83a6d3 100644 --- a/Resources/Prototypes/_NF/Shipyard/Scrap/canister.yml +++ b/Resources/Prototypes/_NF/Shipyard/Scrap/canister.yml @@ -1,36 +1,38 @@ -# Author Info -# GitHub: Cu1r (https://github.com/Cu1r/) -# Discord: cu1r -# +# # Author Info +# # GitHub: Cu1r (https://github.com/Cu1r/) +# # Discord: cu1r +# # # - type: vessel -# id: Canister -# name: UAC Канистра -# description: Малогабаритный транспортный шаттл. Рекомендуется для 1 игрока. -# price: 8000 -# category: Micro -# group: Scrap -# shuttlePath: /Maps/_NF/Shuttles/Scrap/canister.yml -# guidebookPage: Null -# class: -# - Scrapyard -# - Civilian -# + # id: Canister + # name: UAC Canister + # description: Whatever you're bringing, it won't fit. Seats two. Gravity included. + # price: 8000 + # category: Micro + # group: Scrap + # shuttlePath: /Maps/_NF/Shuttles/Scrap/canister.yml + # guidebookPage: Null + # class: + # - Scrapyard + # - Civilian + # engine: + # - Plasma + # - type: gameMap -# id: Canister -# mapName: 'UAC Канистра' -# mapPath: /Maps/_NF/Shuttles/Scrap/canister.yml -# minPlayers: 0 -# stations: -# Canister: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Канистра {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Canister + # mapName: 'UAC Canister' + # mapPath: /Maps/_NF/Shuttles/Scrap/canister.yml + # minPlayers: 0 + # stations: + # Canister: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Canister {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/disciple.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/disciple.yml index 0bb5a9d19a2..5091ae5ffbf 100644 --- a/Resources/Prototypes/_NF/Shipyard/Scrap/disciple.yml +++ b/Resources/Prototypes/_NF/Shipyard/Scrap/disciple.yml @@ -1,42 +1,44 @@ -# Author Info -# GitHub: Nyozzl https://github.com/nyozzl -# Discord: Nyozzl -# -# Maintainer Info -# GitHub: Nyozzl https://github.com/nyozzl -# Discord: Nyozzl -# -# Shuttle Notes:I liked the idea of a scrap church also 9kw is probably all thats needed to run it -# +# # Author Info +# # GitHub: Nyozzl https://github.com/nyozzl +# # Discord: Nyozzl + +# # Maintainer Info +# # GitHub: Nyozzl https://github.com/nyozzl +# # Discord: Nyozzl + +# # Shuttle Notes:I liked the idea of a scrap church also 9kw is probably all thats needed to run it +# # # - type: vessel -# id: Disciple -# name: NSV Диакон -# description: Малогабаритный сервисный шаттл. Рекомендованный состав команды 1 человек. -# price: 11300 -# category: Small -# group: Scrap -# shuttlePath: /Maps/_NF/Shuttles/Scrap/disciple.yml -# guidebookPage: Null -# class: -# - Scrapyard -# - Civilian -# + # id: Disciple + # name: NSV Disciple + # description: A cheaply made amalgamation of religious ships. For the seasoned religious assistant. + # price: 15000 # Appraises at 12179, ~25% margin - TODO: fix this value, getting tests to pass - Whatstone + # category: Small + # group: Scrap + # shuttlePath: /Maps/_NF/Shuttles/Scrap/disciple.yml + # guidebookPage: Null + # class: + # - Scrapyard + # - Civilian + # engine: + # - Plasma + # - type: gameMap -# id: Disciple -# mapName: 'NSV Диакон' -# mapPath: /Maps/_NF/Shuttles/Scrap/disciple.yml -# minPlayers: 0 -# stations: -# Disciple: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Диакон {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Disciple + # mapName: 'NSV Disciple' + # mapPath: /Maps/_NF/Shuttles/Scrap/disciple.yml + # minPlayers: 0 + # stations: + # Disciple: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Disciple {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/nugget.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/nugget.yml index 301cdcba3ed..ba0785e01d8 100644 --- a/Resources/Prototypes/_NF/Shipyard/Scrap/nugget.yml +++ b/Resources/Prototypes/_NF/Shipyard/Scrap/nugget.yml @@ -1,42 +1,44 @@ -# Author Info -# GitHub: ??? -# Discord: ??? -# -# Maintainer Info -# GitHub: ??? -# Discord: ??? -# -# Shuttle Notes: -# +# # Author Info +# # GitHub: ??? +# # Discord: ??? + +# # Maintainer Info +# # GitHub: ??? +# # Discord: ??? + +# # Shuttle Notes: +# # # - type: vessel -# id: Nugget -# name: SV Наггетс -# description: Кусок мусора с двигателями. Рекомендуемый размер команды 1-2 человека. -# price: 15950 # +1450 from 10% Markup -# category: Small -# group: Scrap -# shuttlePath: /Maps/_NF/Shuttles/Scrap/nugget.yml -# guidebookPage: Null -# class: -# - Scrapyard -# - Kitchen -# + # id: Nugget + # name: SV Nugget + # description: A flying hunk of wood and metal disguised as a kitchen shuttle. Not FDA approved. + # price: 15950 # +1450 from 10% Markup + # category: Small + # group: Scrap + # shuttlePath: /Maps/_NF/Shuttles/Scrap/nugget.yml + # guidebookPage: Null + # class: + # - Scrapyard + # - Kitchen + # engine: + # - Plasma + # - type: gameMap -# id: Nugget -# mapName: 'SV Наггетс' -# mapPath: /Maps/_NF/Shuttles/Scrap/nugget.yml -# minPlayers: 0 -# stations: -# Nugget: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Наггетс {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Nugget + # mapName: 'SV Nugget' + # mapPath: /Maps/_NF/Shuttles/Scrap/nugget.yml + # minPlayers: 0 + # stations: + # Nugget: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Nugget {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/orange.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/orange.yml index 20fb83cb3ae..8e246d05831 100644 --- a/Resources/Prototypes/_NF/Shipyard/Scrap/orange.yml +++ b/Resources/Prototypes/_NF/Shipyard/Scrap/orange.yml @@ -1,33 +1,35 @@ # - type: vessel -# id: Orange -# name: SV Обломок -# description: Малогабаритный кусок мусора. Рекомендованный состав команды 1-2 человека. -# price: 16000 #Appraisal is 14500 -# category: Small -# group: Scrap -# shuttlePath: /Maps/_NF/Shuttles/Scrap/orange.yml -# guidebookPage: Null -# class: -# - Scrapyard -# - Cargo -# - Salvage -# + # id: Orange + # name: SV Orange + # description: A cargo slash salvage shuttle made from scavenged wrecks, comes with some damage. + # price: 18000 #Appraisal is 15800, +5% margin - TODO: fix this value, getting tests to pass - Whatstone + # category: Small + # group: Scrap + # shuttlePath: /Maps/_NF/Shuttles/Scrap/orange.yml + # guidebookPage: Null + # class: + # - Scrapyard + # - Cargo + # - Salvage + # engine: + # - Uranium + # - type: gameMap -# id: Orange -# mapName: 'SV Обломок' -# mapPath: /Maps/_NF/Shuttles/Scrap/orange.yml -# minPlayers: 0 -# stations: -# Orange: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Обломок {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Orange + # mapName: 'SV Orange' + # mapPath: /Maps/_NF/Shuttles/Scrap/orange.yml + # minPlayers: 0 + # stations: + # Orange: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Orange {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/point.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/point.yml index 3ecadd8f39b..9aaef40d04c 100644 --- a/Resources/Prototypes/_NF/Shipyard/Scrap/point.yml +++ b/Resources/Prototypes/_NF/Shipyard/Scrap/point.yml @@ -1,32 +1,34 @@ # - type: vessel -# id: Point -# name: SV Пунктир -# description: Разрушенный научный шаттл. Рекомендованный состав команды 1-2 человека. -# price: 16100 -# category: Small -# group: Scrap -# shuttlePath: /Maps/_NF/Shuttles/Scrap/point.yml -# guidebookPage: Null -# class: -# - Scrapyard -# - Science -# + # id: Point + # name: SV Point + # description: Two wrecks welded together that are somehow capable of research. + # price: 16100 + # category: Small + # group: Scrap + # shuttlePath: /Maps/_NF/Shuttles/Scrap/point.yml + # guidebookPage: Null + # class: + # - Scrapyard + # - Science + # engine: + # - Plasma + # - type: gameMap -# id: Point -# mapName: 'SV Пунктир' -# mapPath: /Maps/_NF/Shuttles/Scrap/point.yml -# minPlayers: 0 -# stations: -# Point: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Пунктир {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Point + # mapName: 'SV Point' + # mapPath: /Maps/_NF/Shuttles/Scrap/point.yml + # minPlayers: 0 + # stations: + # Point: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Point {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/tide.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/tide.yml index 2a97772a0a5..d19e604ff64 100644 --- a/Resources/Prototypes/_NF/Shipyard/Scrap/tide.yml +++ b/Resources/Prototypes/_NF/Shipyard/Scrap/tide.yml @@ -1,32 +1,34 @@ # - type: vessel -# id: Tide -# name: SV Волна -# description: Малогабаритный обломок шаттла. Рекомендованный состав команды 1-2 человека. -# price: 9700 -# category: Small -# group: Scrap -# shuttlePath: /Maps/_NF/Shuttles/Scrap/tide.yml -# guidebookPage: Null -# class: -# - Scrapyard -# - Civilian -# + # id: Tide + # name: SV Tide + # description: A cheaply made mass-produced shuttle made from salvaged wrecks. For the seasoned assistant. + # price: 9700 + # category: Small + # group: Scrap + # shuttlePath: /Maps/_NF/Shuttles/Scrap/tide.yml + # guidebookPage: Null + # class: + # - Scrapyard + # - Civilian + # engine: + # - Plasma + # - type: gameMap -# id: Tide -# mapName: 'SV Волна' -# mapPath: /Maps/_NF/Shuttles/Scrap/tide.yml -# minPlayers: 0 -# stations: -# Tide: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Волна {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Tide + # mapName: 'SV Tide' + # mapPath: /Maps/_NF/Shuttles/Scrap/tide.yml + # minPlayers: 0 + # stations: + # Tide: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Tide {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/Sr/bottleneck.yml b/Resources/Prototypes/_NF/Shipyard/Sr/bottleneck.yml index 96dd5e3a4ca..7f9c0e23378 100644 --- a/Resources/Prototypes/_NF/Shipyard/Sr/bottleneck.yml +++ b/Resources/Prototypes/_NF/Shipyard/Sr/bottleneck.yml @@ -8,32 +8,32 @@ # Shuttle Notes: # -- type: vessel - id: Bottleneck - name: NT Пробка - description: Персональный шаттл Представителя Фронтира. - price: 16000 #Appraises at ~14477, margin of ~10% - TODO: fix this value, getting tests to pass - Whatstone - category: Small - group: Sr - access: HeadOfPersonnel - shuttlePath: /Maps/_NF/Shuttles/Sr/bottleneck.yml - guidebookPage: Null - class: - - Civilian - engine: - - Plasma +# - type: vessel + # id: Bottleneck + # name: NT Bottleneck + # description: A personal transport and mobile office for the station representative. + # price: 16000 #Appraises at ~14477, margin of ~10% - TODO: fix this value, getting tests to pass - Whatstone + # category: Small + # group: Sr + # access: HeadOfPersonnel + # shuttlePath: /Maps/_NF/Shuttles/Sr/bottleneck.yml + # guidebookPage: Null + # class: + # - Civilian + # engine: + # - Plasma -- type: gameMap - id: Bottleneck - mapName: 'NT Пробка' - mapPath: /Maps/_NF/Shuttles/Sr/bottleneck.yml - minPlayers: 0 - stations: - Bottleneck: - stationProto: StandardFrontierVessel - components: - - type: StationNameSetup - mapNameTemplate: 'Пробка {1}' - nameGenerator: - !type:NanotrasenNameGenerator - prefixCreator: '14' +# - type: gameMap + # id: Bottleneck + # mapName: 'NT Bottleneck' + # mapPath: /Maps/_NF/Shuttles/Sr/bottleneck.yml + # minPlayers: 0 + # stations: + # Bottleneck: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Bottleneck {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Shipyard/Sr/broom.yml b/Resources/Prototypes/_NF/Shipyard/Sr/broom.yml index b83af9171d3..22a155cf08e 100644 --- a/Resources/Prototypes/_NF/Shipyard/Sr/broom.yml +++ b/Resources/Prototypes/_NF/Shipyard/Sr/broom.yml @@ -7,35 +7,35 @@ # Discord: erhardsteinhauer # Shuttle Notes: -# -- type: vessel - id: Broom - name: LVHI Метёлка - description: Одноместный шаттл, предназначенный для уборщика аванпоста. - price: 11000 # ~9650$ on mapinit + ~1450$ from 15% markup - category: Micro - group: Sr - access: Janitor - shuttlePath: /Maps/_NF/Shuttles/Sr/broom.yml - guidebookPage: Null - class: - - Civilian - engine: - - Plasma +# +# - type: vessel + # id: Broom + # name: LVHI Broom + # description: A cramped yet reliable shuttle for providing janitorial services. + # price: 11000 # ~9650$ on mapinit + ~1450$ from 15% markup + # category: Micro + # group: Sr + # access: Janitor + # shuttlePath: /Maps/_NF/Shuttles/Sr/broom.yml + # guidebookPage: Null + # class: + # - Civilian + # engine: + # - Plasma -- type: gameMap - id: Broom - mapName: 'Метёлка' - mapPath: /Maps/_NF/Shuttles/Sr/broom.yml - minPlayers: 0 - stations: - Broom: - stationProto: StandardFrontierVessel - components: - - type: StationNameSetup - mapNameTemplate: 'Метёлка {1}' - nameGenerator: - !type:NanotrasenNameGenerator - prefixCreator: '14' - - type: StationJobs - availableJobs: {} +# - type: gameMap + # id: Broom + # mapName: 'Broom' + # mapPath: /Maps/_NF/Shuttles/Sr/broom.yml + # minPlayers: 0 + # stations: + # Broom: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Broom {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: {} diff --git a/Resources/Prototypes/_NF/Shipyard/Sr/chauffeur.yml b/Resources/Prototypes/_NF/Shipyard/Sr/chauffeur.yml index 2a93881747b..112595766a6 100644 --- a/Resources/Prototypes/_NF/Shipyard/Sr/chauffeur.yml +++ b/Resources/Prototypes/_NF/Shipyard/Sr/chauffeur.yml @@ -1,40 +1,40 @@ -# Author Info -# GitHub: arimah -# Discord: arimah +# # Author Info +# # GitHub: arimah +# # Discord: arimah -# Maintainer Info -# GitHub: ??? -# Discord: ??? +# # Maintainer Info +# # GitHub: ??? +# # Discord: ??? -# Shuttle Notes: -# Placeholder for a Valet-specific ship, duplicated the PTS for now. Sorry, Arimah. +# # Shuttle Notes: +# # Placeholder for a Valet-specific ship, duplicated the PTS for now. Sorry, Arimah. -- type: vessel - id: Chauffeur - name: NC Chauffeur - description: A small transport shuttle with space for 4 passengers. Comes with the latest audio entertainment technology. - price: 16500 # $14325 after appraisal + ~$1200 (~5% markup) - TODO: fix this value, getting tests to pass - Whatstone - category: Small - group: Sr - access: Service - shuttlePath: /Maps/_NF/Shuttles/pts.yml - guidebookPage: Null - class: - - Civilian - engine: - - Plasma +# - type: vessel + # id: Chauffeur + # name: NC Chauffeur + # description: A small transport shuttle with space for 4 passengers. Comes with the latest audio entertainment technology. + # price: 16500 # $14325 after appraisal + ~$1200 (~5% markup) - TODO: fix this value, getting tests to pass - Whatstone + # category: Small + # group: Sr + # access: Service + # shuttlePath: /Maps/_NF/Shuttles/pts.yml + # guidebookPage: Null + # class: + # - Civilian + # engine: + # - Plasma -- type: gameMap - id: Chauffeur - mapName: 'NC Chauffeur' - mapPath: /Maps/_NF/Shuttles/pts.yml - minPlayers: 0 - stations: - Chauffeur: - stationProto: StandardFrontierVessel - components: - - type: StationNameSetup - mapNameTemplate: 'Chauffeur {1}' - nameGenerator: - !type:NanotrasenNameGenerator - prefixCreator: '14' +# - type: gameMap + # id: Chauffeur + # mapName: 'NC Chauffeur' + # mapPath: /Maps/_NF/Shuttles/pts.yml + # minPlayers: 0 + # stations: + # Chauffeur: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Chauffeur {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' diff --git a/Resources/Prototypes/_NF/Shipyard/Sr/mailpod.yml b/Resources/Prototypes/_NF/Shipyard/Sr/mailpod.yml index ef446ddafc0..cc9e01cf85f 100644 --- a/Resources/Prototypes/_NF/Shipyard/Sr/mailpod.yml +++ b/Resources/Prototypes/_NF/Shipyard/Sr/mailpod.yml @@ -1,41 +1,41 @@ -# Author Info -# GitHub: ??? -# Discord: ??? +# # Author Info +# # GitHub: ??? +# # Discord: ??? -# Maintainer Info -# GitHub: ??? -# Discord: ??? +# # Maintainer Info +# # GitHub: ??? +# # Discord: ??? -# Shuttle Notes: -# -#- type: vessel -# id: MailPod -# name: NC Ямщик -# description: Малогабаритный почтовый шаттл, предназначенный для 1 человека. -# price: 15000 -# category: Micro -# group: Sr -# access: Mail -# shuttlePath: /Maps/_NF/Shuttles/mailpod.yml -# shuttlePath: /Maps/Corvax/Shuttles/mailpod.yml # Corvax-Frontier -# guidebookPage: Null -# class: -# - Cargo +# # Shuttle Notes: +# # +# - type: vessel + # id: MailPod + # name: NC Mail Pod + # description: A cramped yet reliable shuttle for delivering packages. + # price: 15000 + # category: Micro + # group: Sr + # access: Mail + # shuttlePath: /Maps/_NF/Shuttles/Sr/mailpod.yml + # guidebookPage: Null + # class: + # - Cargo + # engine: + # - Plasma -#- type: gameMap -# id: MailPod -# mapName: 'NC Ямщик' -# mapPath: /Maps/_NF/Shuttles/mailpod.yml -# mapPath: /Maps/Corvax/Shuttles/mailpod.yml # Corvax-Frontier -# minPlayers: 0 -# stations: -# MailPod: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Ямщик {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: {} +# - type: gameMap + # id: MailPod + # mapName: 'NC Mail Pod' + # mapPath: /Maps/_NF/Shuttles/Sr/mailpod.yml + # minPlayers: 0 + # stations: + # MailPod: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Mail Pod {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: {} diff --git a/Resources/Prototypes/_NF/Shipyard/Sr/parcel.yml b/Resources/Prototypes/_NF/Shipyard/Sr/parcel.yml index 1dd66777ceb..bd7e786a7a0 100644 --- a/Resources/Prototypes/_NF/Shipyard/Sr/parcel.yml +++ b/Resources/Prototypes/_NF/Shipyard/Sr/parcel.yml @@ -8,34 +8,34 @@ # Shuttle Notes: # -- type: vessel - id: Parcel - name: NC Пачка - description: Малогабаритный почтовый шаттл. Рекомендованный размер команды 1 человек. - price: 18000 - category: Small - group: Sr - access: Mail - shuttlePath: /Maps/_NF/Shuttles/Sr/parcel.yml - guidebookPage: Null - class: - - Cargo - engine: - - Plasma +# - type: vessel + # id: Parcel + # name: NC Parcel + # description: A reliable shuttle for delivering mail and packages. + # price: 18000 + # category: Small + # group: Sr + # access: Mail + # shuttlePath: /Maps/_NF/Shuttles/Sr/parcel.yml + # guidebookPage: Null + # class: + # - Cargo + # engine: + # - Plasma -- type: gameMap - id: Parcel - mapName: 'NC Пачка' - mapPath: /Maps/_NF/Shuttles/Sr/parcel.yml - minPlayers: 0 - stations: - Parcel: - stationProto: StandardFrontierVessel - components: - - type: StationNameSetup - mapNameTemplate: 'Пачка {1}' - nameGenerator: - !type:NanotrasenNameGenerator - prefixCreator: '14' - - type: StationJobs - availableJobs: {} +# - type: gameMap + # id: Parcel + # mapName: 'NC Parcel' + # mapPath: /Maps/_NF/Shuttles/Sr/parcel.yml + # minPlayers: 0 + # stations: + # Parcel: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Parcel {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: {} diff --git a/Resources/Prototypes/_NF/Shipyard/Sr/watchdog.yml b/Resources/Prototypes/_NF/Shipyard/Sr/watchdog.yml index 95ad653cb87..6a013373cfc 100644 --- a/Resources/Prototypes/_NF/Shipyard/Sr/watchdog.yml +++ b/Resources/Prototypes/_NF/Shipyard/Sr/watchdog.yml @@ -1,40 +1,40 @@ -# Author Info -# GitHub: UncaughtEx (https://github.com/UncaughtEx/) -# Discord: @uncaughtowl +# # Author Info +# # GitHub: UncaughtEx (https://github.com/UncaughtEx/) +# # Discord: @uncaughtowl -# Maintainer Info -# GitHub: ??? -# Discord: ??? +# # Maintainer Info +# # GitHub: ??? +# # Discord: ??? -# Shuttle Notes: -# Placeholder for a Station Guard-specific ship, duplicated the SBI Crown for now. Sorry, Eli. +# # Shuttle Notes: +# # Placeholder for a Station Guard-specific ship, duplicated the SBI Crown for now. Sorry, Eli. -- type: vessel - id: Watchdog - name: SBI Watchdog - description: "A refurbished and repainted older model of the NSF Templar for use for Mercenaries and 'repurposed' for the Station Guard, mind the gap." - price: 20000 - category: Small - group: Sr - access: Brig # Oddball, matches guard ID, specific enough to exclude cadets - shuttlePath: /Maps/_NF/Shuttles/Sr/watchdog.yml - guidebookPage: Null - class: - - Civilian - engine: - - Plasma +# - type: vessel + # id: Watchdog + # name: SBI Watchdog + # description: "A refurbished and repainted older model of the NSF Templar for use for Mercenaries and 'repurposed' for the Station Guard, mind the gap." + # price: 20000 + # category: Small + # group: Sr + # access: Brig # Oddball, matches guard ID, specific enough to exclude cadets + # shuttlePath: /Maps/_NF/Shuttles/Sr/watchdog.yml + # guidebookPage: Null + # class: + # - Civilian + # engine: + # - Plasma -- type: gameMap - id: Watchdog - mapName: 'SBI Watchdog' - mapPath: /Maps/_NF/Shuttles/Sr/watchdog.yml - minPlayers: 0 - stations: - Watchdog: - stationProto: StandardFrontierVessel - components: - - type: StationNameSetup - mapNameTemplate: 'Watchdog {1}' - nameGenerator: - !type:NanotrasenNameGenerator - prefixCreator: '14' +# - type: gameMap + # id: Watchdog + # mapName: 'SBI Watchdog' + # mapPath: /Maps/_NF/Shuttles/Sr/watchdog.yml + # minPlayers: 0 + # stations: + # Watchdog: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Watchdog {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' diff --git a/Resources/Prototypes/_NF/Shipyard/Syndicate/hunter.yml b/Resources/Prototypes/_NF/Shipyard/Syndicate/hunter.yml index 591fb4f86b8..28401d6b2e3 100644 --- a/Resources/Prototypes/_NF/Shipyard/Syndicate/hunter.yml +++ b/Resources/Prototypes/_NF/Shipyard/Syndicate/hunter.yml @@ -1,28 +1,30 @@ # - type: vessel -# id: Hunter -# name: Охотник -# description: Малогабаритный штурмовой шаттл синдиката. Рекомендованный состав команды 1-4 человека. -# price: 50000 -# category: Small -# group: Syndicate -# shuttlePath: /Maps/_NF/Shuttles/Syndicate/hunter.yml -# guidebookPage: Null -# class: -# - Syndicate -# + # id: Hunter + # name: Hunter + # description: A small armored Syndicate assault shuttle, perfect for devious operations! + # price: 50000 + # category: Small + # group: Syndicate + # shuttlePath: /Maps/_NF/Shuttles/Syndicate/hunter.yml + # guidebookPage: Null + # class: + # - Syndicate + # engine: + # - Plasma + # - type: gameMap -# id: Hunter -# mapName: 'Охотник' -# mapPath: /Maps/_NF/Shuttles/Syndicate/hunter.yml -# minPlayers: 0 -# stations: -# Hunter: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Охотник {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: {} + # id: Hunter + # mapName: 'Hunter' + # mapPath: /Maps/_NF/Shuttles/Syndicate/hunter.yml + # minPlayers: 0 + # stations: + # Hunter: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Hunter {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: {} diff --git a/Resources/Prototypes/_NF/Shipyard/Syndicate/infiltrator.yml b/Resources/Prototypes/_NF/Shipyard/Syndicate/infiltrator.yml index e91c6367045..ba3e148d59d 100644 --- a/Resources/Prototypes/_NF/Shipyard/Syndicate/infiltrator.yml +++ b/Resources/Prototypes/_NF/Shipyard/Syndicate/infiltrator.yml @@ -1,28 +1,30 @@ # - type: vessel -# id: Infiltrator -# name: Лазутчик -# description: Среднегабаритный экспедиционный шаттл синдиката. Рекомендованный состав команды 2-5 человек. -# price: 85000 -# category: Medium -# group: Syndicate -# shuttlePath: /Maps/_NF/Shuttles/Syndicate/infiltrator.yml -# guidebookPage: Null -# class: -# - Syndicate -# + # id: Infiltrator + # name: Infiltrator + # description: A Syndicate nuclear operative infiltration ship. + # price: 85000 + # category: Medium + # group: Syndicate + # shuttlePath: /Maps/_NF/Shuttles/Syndicate/infiltrator.yml + # guidebookPage: Null + # class: + # - Syndicate + # engine: + # - AME + # - type: gameMap -# id: Infiltrator -# mapName: 'Лазутчик' -# mapPath: /Maps/_NF/Shuttles/Syndicate/infiltrator.yml -# minPlayers: 0 -# stations: -# Infiltrator: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Лазутчик {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: {} + # id: Infiltrator + # mapName: 'Infiltrator' + # mapPath: /Maps/_NF/Shuttles/Syndicate/infiltrator.yml + # minPlayers: 0 + # stations: + # Infiltrator: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Infiltrator {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: {} diff --git a/Resources/Prototypes/_NF/Shipyard/akupara.yml b/Resources/Prototypes/_NF/Shipyard/akupara.yml index e4ca0f5671c..09b784cfd3e 100644 --- a/Resources/Prototypes/_NF/Shipyard/akupara.yml +++ b/Resources/Prototypes/_NF/Shipyard/akupara.yml @@ -1,41 +1,43 @@ -# Author Info -# GitHub: tonotom1 -# Discord: rws -# -# Maintainer Info -# GitHub: tonotom1 -# Discord: rws -# -# Shuttle Notes: -# hi +# # Author Info +# # GitHub: tonotom1 +# # Discord: rws + +# # Maintainer Info +# # GitHub: tonotom1 +# # Discord: rws + +# # Shuttle Notes: +# # hi # - type: vessel -# id: Akupara -# name: UW Акупара -# description: Полнофункциональный шаттл для ботанических исследований среднего размера, оборудованный для того, чтобы помочь ботаникам полностью взаимодействовать со своими растениями. -# price: 50000 #~41500 -# category: Medium -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/akupara.yml -# guidebookPage: ShipyardAkupara -# class: -# - Botany -# + # id: Akupara + # name: UW Akupara + # description: A medium full-feature botanical research biodome equipped to help a botanist fully interact with their plants in almost any way conceivable. + # price: 50000 #~41500 + # category: Medium + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/akupara.yml + # guidebookPage: ShipyardAkupara + # class: + # - Botany + # engine: + # - Uranium + # - type: gameMap -# id: Akupara -# mapName: 'Акупара' -# mapPath: /Maps/_NF/Shuttles/akupara.yml -# minPlayers: 0 -# stations: -# Akupara: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Акупара {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Akupara + # mapName: 'Akupara' + # mapPath: /Maps/_NF/Shuttles/akupara.yml + # minPlayers: 0 + # stations: + # Akupara: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Akupara {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/apothecary.yml b/Resources/Prototypes/_NF/Shipyard/apothecary.yml index b578c8ee1ee..a120af0969f 100644 --- a/Resources/Prototypes/_NF/Shipyard/apothecary.yml +++ b/Resources/Prototypes/_NF/Shipyard/apothecary.yml @@ -1,42 +1,44 @@ -# Author Info -# GitHub: dustylens (https://github.com/dustylens) -# Discord: dustylens -# -# Maintainer Info -# GitHub: dustylens (https://github.com/dustylens) -# Discord: dustylens -# -# Shuttle Notes: -# +# # Author Info +# # GitHub: dustylens (https://github.com/dustylens) +# # Discord: dustylens + +# # Maintainer Info +# # GitHub: dustylens (https://github.com/dustylens) +# # Discord: dustylens + +# # Shuttle Notes: +# # # - type: vessel -# id: Apothecary -# name: NM Апотекарий -# description: Малогабаритный медицинский шаттл. Рекомендованный состав команды 1-2 человека. -# price: 31000 #Appraise value 27000 with markup for chemistry equipment and rounding. Feel free to adjust on the backend. Medics are always poor. -# category: Small -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/apothecary.yml -# guidebookPage: ShipyardApothecary -# class: -# - Medical -# - Chemistry -# + # id: Apothecary + # name: FSB Apothecary + # description: A small medical and chemistry support vessel. Deployed by the Far Star Biotech company to provide aid and medical services to the Frontier. + # price: 35500 # TODO: fix this value, gettings to pass - Whatstone + # category: Small + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/apothecary.yml + # guidebookPage: ShipyardApothecary + # class: + # - Medical + # - Chemistry + # engine: + # - Uranium + # - type: gameMap -# id: Apothecary -# mapName: 'NM Апотекарий' -# mapPath: /Maps/_NF/Shuttles/apothecary.yml -# minPlayers: 0 -# stations: -# Apothecary: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Апотекарий {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Apothecary + # mapName: 'FSB Apothecary' + # mapPath: /Maps/_NF/Shuttles/apothecary.yml + # minPlayers: 0 + # stations: + # Apothecary: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Apothecary {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/barge.yml b/Resources/Prototypes/_NF/Shipyard/barge.yml index c378a2ccff8..5bd1422590b 100644 --- a/Resources/Prototypes/_NF/Shipyard/barge.yml +++ b/Resources/Prototypes/_NF/Shipyard/barge.yml @@ -1,42 +1,45 @@ -# Author Info -# GitHub: ??? -# Discord: ??? -# -# Maintainer Info -# GitHub: ??? -# Discord: ??? -# -# Shuttle Notes: -# +# # Author Info +# # GitHub: ??? +# # Discord: ??? + +# # Maintainer Info +# # GitHub: ??? +# # Discord: ??? + +# # Shuttle Notes: +# # # - type: vessel -# id: Barge -# name: NC Баржа -# description: Среднегабаритный добывающий шаттл. Рекомендованный размер команды 3-6 человек. -# price: 42300 -# category: Medium -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/barge.yml -# guidebookPage: Null -# class: -# - Cargo -# - Salvage -# + # id: Barge + # name: NC Barge + # description: A medium shipping vessel repurposed into a salvage bar. + # price: 47000 # Appraises for 42901, margin of ~10% - TODO: fix these values, getting tests to pass - Whatstone + # category: Medium + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/barge.yml + # guidebookPage: ShipyardBarge + # class: + # - Cargo + # - Salvage + # engine: + # - Solar + # - Plasma + # - type: gameMap -# id: Barge -# mapName: 'NC Баржа' -# mapPath: /Maps/_NF/Shuttles/barge.yml -# minPlayers: 0 -# stations: -# Barge: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Баржа {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Barge + # mapName: 'NC Barge' + # mapPath: /Maps/_NF/Shuttles/barge.yml + # minPlayers: 0 + # stations: + # Barge: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Barge {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/bazaar.yml b/Resources/Prototypes/_NF/Shipyard/bazaar.yml index 052146b0487..f120366e31f 100644 --- a/Resources/Prototypes/_NF/Shipyard/bazaar.yml +++ b/Resources/Prototypes/_NF/Shipyard/bazaar.yml @@ -1,42 +1,44 @@ -# Author Info -# GitHub: YumiGumi (https://github.com/YumiGumi) -# Discord: ??? -# -# Maintainer Info -# GitHub: ??? -# Discord: ??? -# -# Shuttle Notes: -# +# # Author Info +# # GitHub: YumiGumi (https://github.com/YumiGumi) +# # Discord: ??? + +# # Maintainer Info +# # GitHub: ??? +# # Discord: ??? + +# # Shuttle Notes: +# # # - type: vessel -# id: Bazaar -# name: SLI Барахолка -# description: Среднегабаритный торговый шаттл. Рекомендованный размер команды 2-4 человека. -# price: 65555 # on init ~57005$ + 8550$ from 15% markup -# category: Medium -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/bazaar.yml -# guidebookPage: ShipyardBazaar -# class: -# - Cargo -# - Civilian -# + # id: Bazaar + # name: SLI Bazaar + # description: The Bazaar is a personal service vessel designed to provide a platform for merchants to sell their goods, it features two locking cargo docks, a spacious cargo hold, and a mercenary post for shop security. + # price: 77000 # on init ~72808$ + ~5000$ from ~5% markup - TODO: fix this number, just getting tests to pass - Whatstone + # category: Medium + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/bazaar.yml + # guidebookPage: ShipyardBazaar + # class: + # - Cargo + # - Civilian + # engine: + # - Uranium + # - type: gameMap -# id: Bazaar -# mapName: 'SLI Барахолка' -# mapPath: /Maps/_NF/Shuttles/bazaar.yml -# minPlayers: 0 -# stations: -# Bazaar: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'SLI Барахолка {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Bazaar + # mapName: 'SLI Bazaar' + # mapPath: /Maps/_NF/Shuttles/bazaar.yml + # minPlayers: 0 + # stations: + # Bazaar: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'SLI Bazaar {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/beaker.yml b/Resources/Prototypes/_NF/Shipyard/beaker.yml index 31fe8531c85..c182f9aa80f 100644 --- a/Resources/Prototypes/_NF/Shipyard/beaker.yml +++ b/Resources/Prototypes/_NF/Shipyard/beaker.yml @@ -1,31 +1,33 @@ # - type: vessel -# id: Beaker -# name: SBI Мензурка -# description: Малогабаритная химическая лаборатория. Рекомендованный состав команды 1-2 человека. -# price: 65000 -# category: Small -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/beaker.yml -# guidebookPage: Null -# class: -# - Chemistry -# + # id: Beaker + # name: SBI Beaker + # description: "A fully functional Chemistry Lab. Perfect for the prospecting chemist or high school chemistry teachers. Yeah, Science!" + # price: 65000 + # category: Small + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/beaker.yml + # guidebookPage: Null + # class: + # - Chemistry + # engine: + # - Uranium + # - type: gameMap -# id: Beaker -# mapName: 'SBI Мензурка' -# mapPath: /Maps/_NF/Shuttles/beaker.yml -# minPlayers: 0 -# stations: -# Beaker: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Мензурка {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Beaker + # mapName: 'SBI Beaker' + # mapPath: /Maps/_NF/Shuttles/beaker.yml + # minPlayers: 0 + # stations: + # Beaker: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Beaker {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/bigskat.yml b/Resources/Prototypes/_NF/Shipyard/bigskat.yml deleted file mode 100644 index 7a5ec945f77..00000000000 --- a/Resources/Prototypes/_NF/Shipyard/bigskat.yml +++ /dev/null @@ -1,34 +0,0 @@ -# - type: vessel -# id: BigSkat -# name: NSF Большой скат -# description: Сверхогромный многофункциональный шаттл ДСБФ. Рекомендованный состав команды 10-16 человек. -# price: 520500 #Appraisal value is 440000 -# category: Large -# group: Security -# access: Frontier -# shuttlePath: /Maps/Corvax/Shuttles/Nfsd/bigskat.yml -# -# - type: gameMap -# id: BigSkat -# mapName: 'NSF Большой скат' -# mapPath: /Maps/Corvax/Shuttles/Nfsd/bigskat.yml -# minPlayers: 0 -# stations: -# BigSkat: -# stationProto: StandardFrontierSecurityVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Большой скат {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# PrisonGuard: [ 0, 0 ] -# SeniorOfficer: [ 0, 0 ] -# Brigmedic: [ 0, 0 ] -# DetectiveNF: [ 0, 0 ] -# Deputy: [ 0, 0 ] -# Cadet: [ 0, 0 ] -# Chef: [ 0, 0 ] -# Bailiff: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/bocadillo.yml b/Resources/Prototypes/_NF/Shipyard/bocadillo.yml index 14ebfe126c7..8627c1047f6 100644 --- a/Resources/Prototypes/_NF/Shipyard/bocadillo.yml +++ b/Resources/Prototypes/_NF/Shipyard/bocadillo.yml @@ -1,41 +1,43 @@ -# Author Info -# GitHub: kennedytcooper (https://github.com/kennedytcooper) -# Discord: ??? -# -# Maintainer Info -# GitHub: erhardsteinhauer -# Discord: erhardsteinhauer -# -# Shuttle Notes: -# +# # Author Info +# # GitHub: kennedytcooper (https://github.com/kennedytcooper) +# # Discord: ??? + +# # Maintainer Info +# # GitHub: erhardsteinhauer +# # Discord: erhardsteinhauer + +# # Shuttle Notes: +# # # - type: vessel -# id: Bocadillo -# name: NC Фудтрак -# description: Малогабаритный шаттл-ресторан. Рекомендованный размер команды 1-2 человека. -# price: 19780 # 13.5% markup (+2350 from init) -# category: Small -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/bocadillo.yml -# guidebookPage: ShipyardBocadillo -# class: -# - Kitchen -# + # id: Bocadillo + # name: NC Bocadillo + # description: A tiny food truck perfect for a solo chef. + # price: 23500 # appraises for ~$21110, markup of ~7% - TODO: fix this value, getting tests to pass - Whatstone + # category: Small + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/bocadillo.yml + # guidebookPage: ShipyardBocadillo + # class: + # - Kitchen + # engine: + # - Plasma + # - type: gameMap -# id: Bocadillo -# mapName: 'NC Фудтрак' -# mapPath: /Maps/_NF/Shuttles/bocadillo.yml -# minPlayers: 0 -# stations: -# Bocadillo: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Фудтрак {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Bocadillo + # mapName: 'Bocadillo' + # mapPath: /Maps/_NF/Shuttles/bocadillo.yml + # minPlayers: 0 + # stations: + # Bocadillo: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Bocadillo {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/bodkin.yml b/Resources/Prototypes/_NF/Shipyard/bodkin.yml index 2b0223834f4..863211f0dd6 100644 --- a/Resources/Prototypes/_NF/Shipyard/bodkin.yml +++ b/Resources/Prototypes/_NF/Shipyard/bodkin.yml @@ -1,40 +1,40 @@ -# Author Info -# GitHub: Tych0theSynth -# Discord: tych0 +# # Author Info +# # GitHub: Tych0theSynth +# # Discord: tych0 -# Maintainer Info -# GitHub: Tych0theSynth -# Discord: Tych0 +# # Maintainer Info +# # GitHub: Tych0theSynth +# # Discord: Tych0 -# Shuttle Notes: -# -- type: vessel - id: Bodkin - name: SBB Бодкин - description: Среднегабаритный грузовой шаттл. Рекомендованный размер команды 1-4 человек. - price: 39000 #Grid appraises at 35693. Slapped on a ~10% markup. - category: Medium - group: Shipyard - shuttlePath: /Maps/_NF/Shuttles/bodkin.yml - class: - - Salvage +# # Shuttle Notes: +# # +# - type: vessel + # id: Bodkin + # name: SBB Bodkin + # description: The smaller sibling to the Broadhead, the SBB Bodkin is designed for rockhopping and salvage recovery. + # price: 39000 #Grid appraises at 35693. Slapped on a ~10% markup. + # category: Medium + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/bodkin.yml + # class: + # - Salvage -- type: gameMap - id: Bodkin - mapName: 'SBB Бодкин' - mapPath: /Maps/_NF/Shuttles/bodkin.yml - minPlayers: 0 - stations: - Bodkin: - stationProto: StandardFrontierVessel - components: - - type: StationNameSetup - mapNameTemplate: 'Бодкин {1}' - nameGenerator: - !type:NanotrasenNameGenerator - prefixCreator: '14' - - type: StationJobs - availableJobs: - Contractor: [ 0, 0 ] - Pilot: [ 0, 0 ] - Mercenary: [ 0, 0 ] \ No newline at end of file +# - type: gameMap + # id: Bodkin + # mapName: 'SBB Bodkin' + # mapPath: /Maps/_NF/Shuttles/bodkin.yml + # minPlayers: 0 + # stations: + # Bodkin: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Bodkin {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Shipyard/bookworm.yml b/Resources/Prototypes/_NF/Shipyard/bookworm.yml index 240e20fcfb3..7333eb266e0 100644 --- a/Resources/Prototypes/_NF/Shipyard/bookworm.yml +++ b/Resources/Prototypes/_NF/Shipyard/bookworm.yml @@ -1,41 +1,43 @@ -# Author Info -# GitHub: arimah -# Discord: arimah -# -# Maintainer Info -# GitHub: arimah -# Discord: arimah -# -# Shuttle Notes: -# +# # Author Info +# # GitHub: arimah +# # Discord: arimah + +# # Maintainer Info +# # GitHub: arimah +# # Discord: arimah + +# # Shuttle Notes: +# # # - type: vessel -# id: Bookworm -# name: SBB Книжный червь -# description: Среднегабаритный космический источник знаний. Рекомендованный состав команды 1-3 человека. -# price: 28000 -# category: Medium -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/bookworm.yml -# guidebookPage: ShipyardBookworm -# class: -# - Civilian -# + # id: Bookworm + # name: SBB Bookworm + # description: A cozy medium-size library for travellers who wish to relax with a book or perhaps a board game. + # price: 30000 # ~24660 after purchase + ~9% markup + # category: Medium + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/bookworm.yml + # guidebookPage: ShipyardBookworm + # class: + # - Civilian + # engine: + # - Plasma + # - type: gameMap -# id: Bookworm -# mapName: 'SBB Книжный червь' -# mapPath: /Maps/_NF/Shuttles/bookworm.yml -# minPlayers: 0 -# stations: -# Bookworm: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Книжный червь {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Bookworm + # mapName: 'SBB Bookworm' + # mapPath: /Maps/_NF/Shuttles/bookworm.yml + # minPlayers: 0 + # stations: + # Bookworm: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Bookworm {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/bulker.yml b/Resources/Prototypes/_NF/Shipyard/bulker.yml index d9e4687d0f1..588bc6088fc 100644 --- a/Resources/Prototypes/_NF/Shipyard/bulker.yml +++ b/Resources/Prototypes/_NF/Shipyard/bulker.yml @@ -1,41 +1,43 @@ -# Author Info -# GitHub: CharcoalShipyard (https://github.com/CharcoalShipyard) -# Discord: ??? -# -# Maintainer Info -# GitHub: ??? -# Discord: ??? -# -# Shuttle Notes: -# +# # Author Info +# # GitHub: CharcoalShipyard (https://github.com/CharcoalShipyard) +# # Discord: ??? + +# # Maintainer Info +# # GitHub: ??? +# # Discord: ??? + +# # Shuttle Notes: +# # # - type: vessel -# id: Bulker -# name: KL Балкер -# description: Среднегабаритный добывающий шаттл. Рекомендуемый размер команды 2-4 человека. -# price: 47500 #41245$ before the +15% (6190$) -# category: Medium -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/bulker.yml -# guidebookPage: ShipyardBulker -# class: -# - Salvage -# + # id: Bulker + # name: KL Bulker + # description: A medium mining vessel designed for deep space missions + # price: 47500 #41245$ before the +15% (6190$) + # category: Medium + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/bulker.yml + # guidebookPage: ShipyardBulker + # class: + # - Salvage + # engine: + # - Uranium + # - type: gameMap -# id: Bulker -# mapName: 'KL Балкер' -# mapPath: /Maps/_NF/Shuttles/bulker.yml -# minPlayers: 0 -# stations: -# Bulker: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Балкер {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Bulker + # mapName: 'KL Bulker' + # mapPath: /Maps/_NF/Shuttles/bulker.yml + # minPlayers: 0 + # stations: + # Bulker: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Bulker {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/caduceus.yml b/Resources/Prototypes/_NF/Shipyard/caduceus.yml index 921638abfbd..960dd19954f 100644 --- a/Resources/Prototypes/_NF/Shipyard/caduceus.yml +++ b/Resources/Prototypes/_NF/Shipyard/caduceus.yml @@ -1,32 +1,34 @@ # - type: vessel -# id: caduceus -# name: NM Кадуцей -# description: Крупногабаритный медицинский шаттл. Рекомендованный размер команды 4-8 человек. -# price: 105000 -# category: Large -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/caduceus.yml -# guidebookPage: Null -# class: -# - Medical -# - Chemistry -# + # id: Caduceus + # name: NM Caduceus + # description: A former humanitarian vessel, the Caduceus now works as the best mobile hospital money can buy. + # price: 109000 # TODO: fix this value, getting tests to pass - Whatstone + # category: Large + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/caduceus.yml + # guidebookPage: Null + # class: + # - Medical + # - Chemistry + # engine: + # - AME + # - type: gameMap -# id: caduceus -# mapName: 'NM Кадуцей' -# mapPath: /Maps/_NF/Shuttles/caduceus.yml -# minPlayers: 0 -# stations: -# caduceus: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Кадуцей {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Caduceus + # mapName: 'NM Caduceus' + # mapPath: /Maps/_NF/Shuttles/caduceus.yml + # minPlayers: 0 + # stations: + # Caduceus: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Caduceus {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/camper.yml b/Resources/Prototypes/_NF/Shipyard/camper.yml index aa1962d6da5..c3102324cbd 100644 --- a/Resources/Prototypes/_NF/Shipyard/camper.yml +++ b/Resources/Prototypes/_NF/Shipyard/camper.yml @@ -1,41 +1,43 @@ -# Author Info -# GitHub: https://github.com/AF-Buyrcsp2 -# Discord: -# -# Maintainer Info -# -# -# Shuttle Notes: -# -# +# # Author Info +# # GitHub: https://github.com/AF-Buyrcsp2 +# # Discord: + +# # Maintainer Info +# # + +# # Shuttle Notes: +# # + # - type: vessel -# id: Camper -# name: SSS Кемпер -# description: Персональный малогабаритный шаттл на 1 человека. -# price: 12000 -# category: Small -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/camper.yml -# guidebookPage: ShipyardCamper -# class: -# - Civilian -# + # id: Camper + # name: SSS Camper + # description: A personal camper shuttle for those who prefer to live in emptiness of space. + # price: 12000 + # category: Small + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/camper.yml + # guidebookPage: ShipyardCamper + # class: + # - Civilian + # engine: + # - Plasma + # - type: gameMap -# id: Camper -# mapName: 'SSS Кемпер' -# mapPath: /Maps/_NF/Shuttles/camper.yml -# minPlayers: 0 -# stations: -# Camper: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Кемпер {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Camper + # mapName: 'SSS Camper' + # mapPath: /Maps/_NF/Shuttles/camper.yml + # minPlayers: 0 + # stations: + # Camper: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Camper {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/centurion.yml b/Resources/Prototypes/_NF/Shipyard/centurion.yml deleted file mode 100644 index 904b54db815..00000000000 --- a/Resources/Prototypes/_NF/Shipyard/centurion.yml +++ /dev/null @@ -1,26 +0,0 @@ -# - type: vessel -# id: Centurion -# name: NSF Центурион -# description: Штурмовое судно Центурион. Произведено частной военно-производственной компаний Vitezstvi по чертежам шаттла "Мародер" по спец. заказу НТ. Рекомендуемый состав команды 3-7 человек. -# price: 190030 -# category: Large -# group: Security -# access: Bailiff -# shuttlePath: /Maps/Corvax/Shuttles/Nfsd/centurion.yml -# -# - type: gameMap -# id: Centurion -# mapName: 'NSF Центурион' -# mapPath: /Maps/Corvax/Shuttles/Nfsd/centurion.yml -# minPlayers: 0 -# stations: -# Centurion: -# stationProto: StandardFrontierSecurityVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Центурион {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: {} diff --git a/Resources/Prototypes/_NF/Shipyard/ceres.yml b/Resources/Prototypes/_NF/Shipyard/ceres.yml index bbd623e3087..2bf890a2be7 100644 --- a/Resources/Prototypes/_NF/Shipyard/ceres.yml +++ b/Resources/Prototypes/_NF/Shipyard/ceres.yml @@ -1,41 +1,43 @@ -# Author Info -# GitHub: arimah -# Discord: arimah -# -# Maintainer Info -# GitHub: arimah -# Discord: arimah -# -# Shuttle Notes: -# +# # Author Info +# # GitHub: arimah +# # Discord: arimah + +# # Maintainer Info +# # GitHub: arimah +# # Discord: arimah + +# # Shuttle Notes: +# # # - type: vessel -# id: Ceres -# name: SBB Церера -# description: Среднегабаритный шаттл-ресторан. Рекомендованный размер команды 2-5 человек. -# price: 49500 -# category: Medium -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/ceres.yml -# guidebookPage: ShipyardCeres -# class: -# - Kitchen -# + # id: Ceres + # name: SBB Ceres + # description: A medium-size, high-class restaurant ship with ample seating, integrated botany and a dining room for VIP guests + # price: 60000 # ~5% markup - TODO: fix this value, just getting tests to pass - Whatstone + # category: Medium + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/ceres.yml + # guidebookPage: ShipyardCeres + # class: + # - Kitchen + # engine: + # - Uranium + # - type: gameMap -# id: Ceres -# mapName: 'SBB Церера' -# mapPath: /Maps/_NF/Shuttles/ceres.yml -# minPlayers: 0 -# stations: -# Ceres: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Церера {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Ceres + # mapName: 'SBB Ceres' + # mapPath: /Maps/_NF/Shuttles/ceres.yml + # minPlayers: 0 + # stations: + # Ceres: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Ceres {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/chisel.yml b/Resources/Prototypes/_NF/Shipyard/chisel.yml index 8b301e67fad..a10dbfc9427 100644 --- a/Resources/Prototypes/_NF/Shipyard/chisel.yml +++ b/Resources/Prototypes/_NF/Shipyard/chisel.yml @@ -1,42 +1,44 @@ -# Author Info -# GitHub: Blackszedows (https://github.com/Blackszedows) -# Discord: ??? -# -# Maintainer Info -# GitHub: erhardsteinhauer -# Discord: erhardsteinhauer -# -# Shuttle Notes: -# +# # Author Info +# # GitHub: Blackszedows (https://github.com/Blackszedows) +# # Discord: ??? + +# # Maintainer Info +# # GitHub: erhardsteinhauer +# # Discord: erhardsteinhauer + +# # Shuttle Notes: +# # # - type: vessel -# id: Chisel -# name: ICR Зубило -# description: Среднегабаритный добывающий шаттл. Рекомендованный размер команды 2-4 человека. -# price: 34615 # on init 30100$, 15% markup 4515$ -# category: Small -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/chisel.yml -# guidebookPage: ShipyardChisel -# class: -# - Salvage -# - Cargo #??? -# + # id: Chisel + # name: ICR Chisel + # description: Standard small size multipurpose vessel , originally meant to aid in ship scrapping. + # price: 34615 # on init 30100$, 15% markup 4515$ + # category: Small + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/chisel.yml + # guidebookPage: ShipyardChisel + # class: + # - Salvage + # - Cargo #??? + # engine: + # - Plasma + # - type: gameMap -# id: Chisel -# mapName: 'ICR Зубило' -# mapPath: /Maps/_NF/Shuttles/chisel.yml -# minPlayers: 0 -# stations: -# Chisel: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Зубило {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Chisel + # mapName: 'ICR Chisel' + # mapPath: /Maps/_NF/Shuttles/chisel.yml + # minPlayers: 0 + # stations: + # Chisel: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Chisel {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/cleithro.yml b/Resources/Prototypes/_NF/Shipyard/cleithro.yml deleted file mode 100644 index 69299e13b64..00000000000 --- a/Resources/Prototypes/_NF/Shipyard/cleithro.yml +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer Info -# GitHub: dvir001 -# Discord: dvir01 (84770870936997888) -# -# Shuttle Notes: -# -# -# - type: vessel -# id: Cleithro -# name: DC Клейтро -# description: Малогабаритный сервисный шаттл. Рекомендованный размер команды 2-4 человека. -# price: 30000 # 10+% up from sell -# category: Medium -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/cleithro.yml -# guidebookPage: Null -# class: -# - Medical # HEH -# -# - type: gameMap -# id: Cleithro -# mapName: 'DC Клейтро' -# mapPath: /Maps/_NF/Shuttles/cleithro.yml -# minPlayers: 0 -# stations: -# Cleithro: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Клейтро {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Shipyard/comet.yml b/Resources/Prototypes/_NF/Shipyard/comet.yml index 95a22f495d2..ce2d7176c86 100644 --- a/Resources/Prototypes/_NF/Shipyard/comet.yml +++ b/Resources/Prototypes/_NF/Shipyard/comet.yml @@ -1,42 +1,44 @@ -# Author Info -# GitHub: Shodhans -# Discord: ??? -# -# Maintainer Info -# GitHub: ??? -# Discord: ??? -# -# Shuttle Notes: -# +# # Author Info +# # GitHub: Shodhans +# # Discord: ??? + +# # Maintainer Info +# # GitHub: ??? +# # Discord: ??? + +# # Shuttle Notes: +# # # - type: vessel -# id: Comet -# name: NT Комета -# description: Среднегабаритный инженерный шаттл. Рекомендованный размер команды 3-6 человек. -# price: 55000 -# category: Medium -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/comet.yml -# guidebookPage: ShipyardComet -# class: -# - Salvage -# - Engineering -# + # id: Comet + # name: NT Comet + # description: A mining and construction vessel intended to help build or repair quickly. + # price: 55000 + # category: Medium + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/comet.yml + # guidebookPage: ShipyardComet + # class: + # - Salvage + # - Engineering + # engine: + # - AME + # - type: gameMap -# id: Comet -# mapName: 'NT Комета' -# mapPath: /Maps/_NF/Shuttles/comet.yml -# minPlayers: 0 -# stations: -# Comet: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Комета {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Comet + # mapName: 'NT Comet' + # mapPath: /Maps/_NF/Shuttles/comet.yml + # minPlayers: 0 + # stations: + # Comet: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Comet {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/condor.yml b/Resources/Prototypes/_NF/Shipyard/condor.yml deleted file mode 100644 index 63cd68c3af5..00000000000 --- a/Resources/Prototypes/_NF/Shipyard/condor.yml +++ /dev/null @@ -1,32 +0,0 @@ -# - type: vessel -# # id: Condor -# # name: NR Кондор -# # description: Среднегабаритный научно-инженерный шаттл. Рекомендованный размер команды 2-6 человек. -# # price: 72890 -# # category: Medium -# # group: Shipyard -# # shuttlePath: /Maps/_NF/Shuttles/condor.yml -# # guidebookPage: Null -# # class: -# # - Science -# # - Engineering -# -# - type: gameMap -# # id: Condor -# # mapName: 'NR Кондор' -# # mapPath: /Maps/_NF/Shuttles/condor.yml -# # minPlayers: 0 -# # stations: -# # Condor: -# # stationProto: StandardFrontierVessel -# # components: -# # - type: StationNameSetup -# # mapNameTemplate: 'Кондор {1}' -# # nameGenerator: -# # !type:NanotrasenNameGenerator -# # prefixCreator: '14' -# # - type: StationJobs -# # availableJobs: -# # Contractor: [ 0, 0 ] -# # Pilot: [ 0, 0 ] -# # Mercenary: [ 0, 0 ] \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Shipyard/construct.yml b/Resources/Prototypes/_NF/Shipyard/construct.yml index f11cb3d93a7..ac36b025ad5 100644 --- a/Resources/Prototypes/_NF/Shipyard/construct.yml +++ b/Resources/Prototypes/_NF/Shipyard/construct.yml @@ -1,31 +1,33 @@ # - type: vessel -# id: Construct -# name: NT Каркас -# description: Чисто технически это тоже шаттл. Не рекомендуется никому. -# price: 10500 -# category: Micro -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/construct.yml -# guidebookPage: ShipyardConstruct -# class: -# - Engineering -# + # id: Construct + # name: NT Construct + # description: A technically spacefaring vessel. No livery. + # price: 10500 + # category: Micro + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/construct.yml + # guidebookPage: ShipyardConstruct + # class: + # - Engineering + # engine: + # - Plasma + # - type: gameMap -# id: Construct -# mapName: 'NT Каркас' -# mapPath: /Maps/_NF/Shuttles/construct.yml -# minPlayers: 0 -# stations: -# Construct: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Каркас {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Construct + # mapName: 'NT Construct' + # mapPath: /Maps/_NF/Shuttles/construct.yml + # minPlayers: 0 + # stations: + # Construct: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Construct {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/crescent.yml b/Resources/Prototypes/_NF/Shipyard/crescent.yml index a5227e1001c..a660ce39a4a 100644 --- a/Resources/Prototypes/_NF/Shipyard/crescent.yml +++ b/Resources/Prototypes/_NF/Shipyard/crescent.yml @@ -1,43 +1,46 @@ -# Author Info -# GitHub: Kesiath (https://github.com/Kesiath) -# Discord: @kesiath -# -# Maintainer Info -# GitHub: ??? -# Discord: ??? -# -# Shuttle Notes: -# +# # Author Info +# # GitHub: Kesiath (https://github.com/Kesiath) +# # Discord: @kesiath + +# # Maintainer Info +# # GitHub: ??? +# # Discord: ??? + +# # Shuttle Notes: +# # # - type: vessel -# id: Crescent -# name: KC Полумесяц -# description: Крупногабаритный многоцелевой шаттл. Рекомендованный размер команды 6+ человек. -# price: 208020 -# category: Large -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/crescent.yml -# guidebookPage: Null -# class: -# - Science -# - Chemistry -# - Civilian -# + # id: Crescent + # name: KC Crescent + # description: The Crescent, named for its exterior shape, is a vessel focused on providing service, medical aide, and scientific breakthroughs for smaller vessels. + # price: 350020 # It do be like this. + # category: Large + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/crescent.yml + # guidebookPage: Null + # class: + # - Science + # - Chemistry + # - Civilian + # engine: + # - AME + # - type: gameMap -# id: Crescent -# mapName: 'KC Полумесяц' -# mapPath: /Maps/_NF/Shuttles/crescent.yml -# minPlayers: 0 -# stations: -# Crescent: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Полумесяц {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Crescent + # mapName: 'KC Crescent' + # mapPath: /Maps/_NF/Shuttles/crescent.yml + # minPlayers: 0 + # stations: + # Crescent: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Crescent {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] +# # StationAi: [ 0, 1 ] \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Shipyard/crown.yml b/Resources/Prototypes/_NF/Shipyard/crown.yml deleted file mode 100644 index 78834b07d43..00000000000 --- a/Resources/Prototypes/_NF/Shipyard/crown.yml +++ /dev/null @@ -1,28 +0,0 @@ -# - type: vessel -# id: Crown -# name: SBI Ворон -# description: Малогабаритный шаттл для наёмников, рекомендуемый состав экипажа 2 человека. -# price: 20000 -# category: Small -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/crown.yml -# -# - type: gameMap -# id: Crown -# mapName: 'SBI Ворон' -# mapPath: /Maps/_NF/Shuttles/crown.yml -# minPlayers: 0 -# stations: -# Crown: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Ворон {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/eagle.yml b/Resources/Prototypes/_NF/Shipyard/eagle.yml index 5e9d34b62c7..5ecdf27f596 100644 --- a/Resources/Prototypes/_NF/Shipyard/eagle.yml +++ b/Resources/Prototypes/_NF/Shipyard/eagle.yml @@ -1,42 +1,44 @@ -# Author Info -# GitHub: ThatOneGoblin25 (https://github.com/ThatOneGoblin25) -# Discord: ??? -# -# Maintainer Info -# GitHub: ??? -# Discord: ??? -# -# Shuttle Notes: -# +# # Author Info +# # GitHub: ThatOneGoblin25 (https://github.com/ThatOneGoblin25) +# # Discord: ??? + +# # Maintainer Info +# # GitHub: ??? +# # Discord: ??? + +# # Shuttle Notes: +# # # - type: vessel -# id: Eagle -# name: NM Орлан -# description: Среднегабаритный медико-инженерный шаттл. Рекомендованный размер команды 3-5 человек. -# price: 50950 -# category: Medium -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/eagle.yml -# guidebookPage: Null -# class: -# - Medical -# - Engineering -# + # id: Eagle + # name: NM Eagle + # description: "A modern, medium-sized medical & engineering vessel. Focusing on responding to shuttle distress, Eagle bears the motto 'Recover, Restore, Repair!'." + # price: 60000 + # category: Medium + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/eagle.yml + # guidebookPage: ShipyardEagle + # class: + # - Medical + # - Engineering + # engine: + # - Uranium + # - type: gameMap -# id: Eagle -# mapName: 'NM Орлан' -# mapPath: /Maps/_NF/Shuttles/eagle.yml -# minPlayers: 0 -# stations: -# Eagle: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Орлан {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Eagle + # mapName: 'NM Eagle' + # mapPath: /Maps/_NF/Shuttles/eagle.yml + # minPlayers: 0 + # stations: + # Eagle: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Eagle {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/esquire.yml b/Resources/Prototypes/_NF/Shipyard/esquire.yml deleted file mode 100644 index fe615b43dd7..00000000000 --- a/Resources/Prototypes/_NF/Shipyard/esquire.yml +++ /dev/null @@ -1,41 +0,0 @@ -# Author Info -# GitHub: ??? -# Discord: ??? -# -# Maintainer Info -# GitHub: ??? -# Discord: ??? -# -# Shuttle Notes: -# -# - type: vessel -# # id: Esquire -# # name: NT Дворянин -# # description: Среднегабаритный шаттл предоставления юридических услуг. Рекомендованный размер команды 2-4 человека. -# # price: 38500 -# # category: Medium -# # group: Shipyard -# # shuttlePath: /Maps/_NF/Shuttles/esquire.yml -# # guidebookPage: Null -# # class: -# # - Civilian -# -# - type: gameMap -# # id: Esquire -# # mapName: 'NT Дворянин' -# # mapPath: /Maps/_NF/Shuttles/esquire.yml -# # minPlayers: 0 -# # stations: -# # Esquire: -# # stationProto: StandardFrontierVessel -# # components: -# # - type: StationNameSetup -# # mapNameTemplate: 'Дворянин {1}' -# # nameGenerator: -# # !type:NanotrasenNameGenerator -# # prefixCreator: '14' -# # - type: StationJobs -# # availableJobs: -# # Contractor: [ 0, 0 ] -# # Pilot: [ 0, 0 ] -# # Mercenary: [ 0, 0 ] \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Shipyard/garden.yml b/Resources/Prototypes/_NF/Shipyard/garden.yml index aa379f9e657..762c7edc28e 100644 --- a/Resources/Prototypes/_NF/Shipyard/garden.yml +++ b/Resources/Prototypes/_NF/Shipyard/garden.yml @@ -1,41 +1,43 @@ -# Author Info -# GitHub: DustScoundrel (https://github.com/DustScoundrel) -# Discord: ??? -# -# Maintainer Info -# GitHub: erhardsteinhauer -# Discord: erhardsteinhauer -# -# Shuttle Notes: -# +# # Author Info +# # GitHub: DustScoundrel (https://github.com/DustScoundrel) +# # Discord: ??? + +# # Maintainer Info +# # GitHub: erhardsteinhauer +# # Discord: erhardsteinhauer + +# # Shuttle Notes: +# # # - type: vessel -# id: Garden -# name: HS Розарий -# description: Малогабаритный ботанический шаттл. Рекомендованный размер команды 1-2 человека. -# price: 24750 -# category: Small -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/garden.yml -# guidebookPage: ShipyardGarden -# class: -# - Botany -# + # id: Garden + # name: HS Garden + # description: A small botany vessel dedicated to horiticultural experimentation. + # price: 26000 + # category: Small + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/garden.yml + # guidebookPage: ShipyardGarden + # class: + # - Botany + # engine: + # - Plasma + # - type: gameMap -# id: Garden -# mapName: 'HS Розарий' -# mapPath: /Maps/_NF/Shuttles/garden.yml -# minPlayers: 0 -# stations: -# Garden: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Розарий {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Garden + # mapName: 'HS Garden' + # mapPath: /Maps/_NF/Shuttles/garden.yml + # minPlayers: 0 + # stations: + # Garden: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Garden {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/hammer.yml b/Resources/Prototypes/_NF/Shipyard/hammer.yml index 6a697e14f5e..433b1bd23fd 100644 --- a/Resources/Prototypes/_NF/Shipyard/hammer.yml +++ b/Resources/Prototypes/_NF/Shipyard/hammer.yml @@ -1,41 +1,43 @@ -# Author Info -# GitHub: arimah -# Discord: arimah -# -# Maintainer Info -# GitHub: arimah -# Discord: arimah -# -# Shuttle Notes: -# +# # Author Info +# # GitHub: arimah +# # Discord: arimah + +# # Maintainer Info +# # GitHub: arimah +# # Discord: arimah + +# # Shuttle Notes: +# # # - type: vessel -# id: Hammer -# name: SBB Наковальня -# description: Среднегабаритный инженерный шаттл. Рекомендованный состав команды 2-4 человека. -# price: 31500 # ~28000 after purchase, ~13% markup -# category: Medium -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/hammer.yml -# guidebookPage: ShipyardHammer -# class: -# - Engineering -# + # id: Hammer + # name: SBB Hammer + # description: A mobile engineering platform for deep-space repairs, upgrades and remodelling. + # price: 40000 + # category: Medium + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/hammer.yml + # guidebookPage: ShipyardHammer + # class: + # - Engineering + # engine: + # - Plasma + # - type: gameMap -# id: Hammer -# mapName: 'SBB Наковальня' -# mapPath: /Maps/_NF/Shuttles/hammer.yml -# minPlayers: 0 -# stations: -# Hammer: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Наковальня {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Hammer + # mapName: 'SBB Hammer' + # mapPath: /Maps/_NF/Shuttles/hammer.yml + # minPlayers: 0 + # stations: + # Hammer: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Hammer {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/harbormaster.yml b/Resources/Prototypes/_NF/Shipyard/harbormaster.yml index 45dd134b992..331fb998dec 100644 --- a/Resources/Prototypes/_NF/Shipyard/harbormaster.yml +++ b/Resources/Prototypes/_NF/Shipyard/harbormaster.yml @@ -1,41 +1,43 @@ -# Author Info -# GitHub: erhardsteinhauer -# Discord: erhardsteinhauer -# -# Maintainer Info -# GitHub: erhardsteinhauer -# Discord: erhardsteinhauer -# -# Shuttle Notes: -# +# # Author Info +# # GitHub: erhardsteinhauer +# # Discord: erhardsteinhauer + +# # Maintainer Info +# # GitHub: erhardsteinhauer +# # Discord: erhardsteinhauer + +# # Shuttle Notes: +# # # - type: vessel -# id: harbormaster -# name: NC Квадрон -# description: Малогабаритный персональный шаттл. Рекомендованный размер команды 1 человек. -# price: 28300 # ~24600$ on mapinit + ~3690$ from 15% markup -# category: Small -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/harbormaster.yml -# guidebookPage: ShipyardHarbormaster -# class: -# - Civilian -# + # id: Harbormaster + # name: LVHI Harbormaster + # description: A small tugboat. Manufactured by Langstad-Voigt Heavy Industries. + # price: 27000 # ~23375$ on mapinit + ~3500$ from 15% markup + # category: Small + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/harbormaster.yml + # guidebookPage: ShipyardHarbormaster + # class: + # - Civilian + # engine: + # - Plasma + # - type: gameMap -# id: harbormaster -# mapName: 'Квадрон' -# mapPath: /Maps/_NF/Shuttles/harbormaster.yml -# minPlayers: 0 -# stations: -# harbormaster: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Квадрон {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Harbormaster + # mapName: 'Harbormaster' + # mapPath: /Maps/_NF/Shuttles/harbormaster.yml + # minPlayers: 0 + # stations: + # Harbormaster: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Harbormaster {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/hauler.yml b/Resources/Prototypes/_NF/Shipyard/hauler.yml index 7f4d70e87b6..0f37ea2851d 100644 --- a/Resources/Prototypes/_NF/Shipyard/hauler.yml +++ b/Resources/Prototypes/_NF/Shipyard/hauler.yml @@ -1,32 +1,34 @@ # - type: vessel -# id: hauler -# name: NC Тягач -# description: Среднегабаритный добывающий шаттл. Рекомендованный состав команды 3-6 человек. -# price: 60000 -# category: Medium -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/hauler.yml -# guidebookPage: Null -# class: -# - Cargo -# - Salvage -# + # id: Hauler + # name: NC Hauler + # description: A medium sized vessel specializing in long-haul salvage, mining, and cargo operations. + # price: 77000 + # category: Medium + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/hauler.yml + # guidebookPage: ShipyardHauler + # class: + # - Cargo + # - Salvage + # engine: + # - Uranium + # - type: gameMap -# id: hauler -# mapName: 'NC Тягач' -# mapPath: /Maps/_NF/Shuttles/hauler.yml -# minPlayers: 0 -# stations: -# hauler: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Тягач {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Hauler + # mapName: 'NC Hauler' + # mapPath: /Maps/_NF/Shuttles/hauler.yml + # minPlayers: 0 + # stations: + # Hauler: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Hauler {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/helix.yml b/Resources/Prototypes/_NF/Shipyard/helix.yml deleted file mode 100644 index b2f3c48979b..00000000000 --- a/Resources/Prototypes/_NF/Shipyard/helix.yml +++ /dev/null @@ -1,42 +0,0 @@ -# # Author Info -# # GitHub: ??? -# # Discord: ??? -# -# # Maintainer Info -# # GitHub: ??? -# # Discord: ??? -# -# # Shuttle Notes: -# # -# - type: vessel -# # id: Helix -# # name: NM Helix -# # description: A medium, modular hospital. Standard issue equipped with chem lab, cloning, and treatment ward -# # price: 44600 # +5800 from 15% markup -# # category: Medium -# # group: Shipyard -# # shuttlePath: /Maps/_NF/Shuttles/helix.yml -# # guidebookPage: Null -# # class: -# # - Medical -# # - Chemistry -# -# - type: gameMap -# # id: Helix -# # mapName: 'NM Helix' -# # mapPath: /Maps/_NF/Shuttles/helix.yml -# # minPlayers: 0 -# # stations: -# # Helix: -# # stationProto: StandardFrontierVessel -# # components: -# # - type: StationNameSetup -# # mapNameTemplate: 'Helix {1}' -# # nameGenerator: -# # !type:NanotrasenNameGenerator -# # prefixCreator: '14' -# # - type: StationJobs -# # availableJobs: -# # Contractor: [ 0, 0 ] -# # Pilot: [ 0, 0 ] -# # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/honker.yml b/Resources/Prototypes/_NF/Shipyard/honker.yml index c572c899b22..7078708919d 100644 --- a/Resources/Prototypes/_NF/Shipyard/honker.yml +++ b/Resources/Prototypes/_NF/Shipyard/honker.yml @@ -1,31 +1,43 @@ +# # Author Info +# # GitHub: ??? +# # Discord: ??? + +# # Maintainer Info +# # GitHub: ??? +# # Discord: ??? + +# # Shuttle Notes: +# # # - type: vessel -# id: Honker -# name: NT ХОНКЕР -# description: ХОНК ХОНК ХОНК ХОНК ХОНК ХОНК -# price: 22500 -# category: Small -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/honker.yml -# guidebookPage: Null -# class: -# - Civilian -# + # id: Honker + # name: NT Honker + # description: HONK HONK HONK HONK HONK HONK + # price: 22500 + # category: Small + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/honker.yml + # guidebookPage: ShipyardHonker + # class: + # - Civilian + # engine: + # - Plasma + # - type: gameMap -# id: Honker -# mapName: 'NT ХОНКЕР' -# mapPath: /Maps/_NF/Shuttles/honker.yml -# minPlayers: 0 -# stations: -# Honker: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'ХОНКЕР {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Honker + # mapName: 'NT Honker' + # mapPath: /Maps/_NF/Shuttles/honker.yml + # minPlayers: 0 + # stations: + # Honker: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Honker {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/investigator.yml b/Resources/Prototypes/_NF/Shipyard/investigator.yml index b6ee3a64be6..08b675411cb 100644 --- a/Resources/Prototypes/_NF/Shipyard/investigator.yml +++ b/Resources/Prototypes/_NF/Shipyard/investigator.yml @@ -1,41 +1,44 @@ -# Author Info -# GitHub: UbaserB (https://github.com/UbaserB) -# Discord: ??? -# -# Maintainer Info -# GitHub: ??? -# Discord: ??? -# -# Shuttle Notes: -# +# # Author Info +# # GitHub: UbaserB (https://github.com/UbaserB) +# # Discord: ??? + +# # Maintainer Info +# # GitHub: ??? +# # Discord: ??? + +# # Shuttle Notes: +# # # - type: vessel -# id: Investigator -# name: NR Исследователь -# description: Среднегабаритный исследовательский шаттл. Рекомендованный состав команды 1-2 человека. -# price: 42100 # ~36540$ on mapinit + ~5480$ from 15% markup -# category: Medium -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/investigator.yml -# guidebookPage: ShipyardInvestigator -# class: -# - Science -# + # id: Investigator + # name: NR Investigator + # description: A medium research shuttle designed for xenoarcheological studies. + # price: 42100 # ~36540$ on mapinit + ~5480$ from 15% markup + # category: Medium + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/investigator.yml + # guidebookPage: ShipyardInvestigator + # class: + # - Science + # engine: + # - Solar + # - Plasma + # - type: gameMap -# id: Investigator -# mapName: 'NR Исследователь' -# mapPath: /Maps/_NF/Shuttles/investigator.yml -# minPlayers: 0 -# stations: -# Investigator: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Исследователь {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Investigator + # mapName: 'NR Investigator' + # mapPath: /Maps/_NF/Shuttles/investigator.yml + # minPlayers: 0 + # stations: + # Investigator: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Investigator {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/kestrel.yml b/Resources/Prototypes/_NF/Shipyard/kestrel.yml index 5569d288e59..84aac09be70 100644 --- a/Resources/Prototypes/_NF/Shipyard/kestrel.yml +++ b/Resources/Prototypes/_NF/Shipyard/kestrel.yml @@ -1,41 +1,43 @@ -# Author Info -# GitHub: @No-Dad-Not-The-Belt (https://github.com/No-Dad-Not-The-Belt) -# Discord: ??? -# -# Maintainer Info -# GitHub: ??? -# Discord: ??? -# -# Shuttle Notes: -# +# # Author Info +# # GitHub: @No-Dad-Not-The-Belt (https://github.com/No-Dad-Not-The-Belt) +# # Discord: ??? + +# # Maintainer Info +# # GitHub: ??? +# # Discord: ??? + +# # Shuttle Notes: +# # # - type: vessel -# id: Kestrel -# name: NC Пустельга -# description: Среднегабаритный добывающий шаттл. Рекомендуемый состав команды 2-6 человек. -# price: 52200 # ~45370$ on mapinit + ~6805$ from 15% markup -# category: Small -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/kestrel.yml -# guidebookPage: ShipyardKestrel -# class: -# - Salvage -# + # id: Kestrel + # name: NC Kestrel + # description: Once a local shipping lane freighter, this model has been converted for use in debris field mining and salvage operations. + # price: 52200 # ~45370$ on mapinit + ~6805$ from 15% markup + # category: Small + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/kestrel.yml + # guidebookPage: ShipyardKestrel + # class: + # - Salvage + # engine: + # - Uranium + # - type: gameMap -# id: Kestrel -# mapName: 'NC Пустельга' -# mapPath: /Maps/_NF/Shuttles/kestrel.yml -# minPlayers: 0 -# stations: -# Kestrel: -# stationProto: StandardFrontierExpeditionVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Пустельга {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Kestrel + # mapName: 'NC Kestrel' + # mapPath: /Maps/_NF/Shuttles/kestrel.yml + # minPlayers: 0 + # stations: + # Kestrel: + # stationProto: StandardFrontierExpeditionVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Kestrel {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/kilderkin.yml b/Resources/Prototypes/_NF/Shipyard/kilderkin.yml index c53f565debd..4aa1b3aef1d 100644 --- a/Resources/Prototypes/_NF/Shipyard/kilderkin.yml +++ b/Resources/Prototypes/_NF/Shipyard/kilderkin.yml @@ -1,41 +1,43 @@ -# Author Info -# GitHub: erhardsteinhauer -# Discord: erhardsteinhauer -# -# Maintainer Info -# GitHub: erhardsteinhauer -# Discord: erhardsteinhauer -# -# Shuttle Notes: -# +# # Author Info +# # GitHub: erhardsteinhauer +# # Discord: erhardsteinhauer + +# # Maintainer Info +# # GitHub: erhardsteinhauer +# # Discord: erhardsteinhauer + +# # Shuttle Notes: +# # # - type: vessel -# id: kilderkin -# name: NC Бочка -# description: Среднегабаритный шаттл-бар. Рекомендованный состав команды 2-4 человека. -# price: 45900 # ~41730$ on mapinit + ~4170$ from 10% markup -# category: Medium -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/kilderkin.yml -# guidebookPage: ShipyardKilderkin -# class: -# - Civilian -# + # id: Kilderkin + # name: LVHI Kilderkin + # description: "Spaceworthy bar/microbrewery with everything one needs to facilitate poor life choices: lots of booze, smokes, and lack of food. Manufactured by Langstad-Voigt Heavy Industries." + # price: 47000 # ~39600$ on mapinit + ~5950$ from 15% markup + # category: Medium + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/kilderkin.yml + # guidebookPage: ShipyardKilderkin + # class: + # - Civilian + # engine: + # - Plasma + # - type: gameMap -# id: kilderkin -# mapName: 'Бочка' -# mapPath: /Maps/_NF/Shuttles/kilderkin.yml -# minPlayers: 0 -# stations: -# kilderkin: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Бочка {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Kilderkin + # mapName: 'Kilderkin' + # mapPath: /Maps/_NF/Shuttles/kilderkin.yml + # minPlayers: 0 + # stations: + # Kilderkin: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Kilderkin {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/knuckleverse.yml b/Resources/Prototypes/_NF/Shipyard/knuckleverse.yml deleted file mode 100644 index 2495dfd1b1e..00000000000 --- a/Resources/Prototypes/_NF/Shipyard/knuckleverse.yml +++ /dev/null @@ -1,31 +0,0 @@ -# - type: vessel -# # id: KnuckleVerse -# # name: SSC КостоЛом -# # description: Среднегабаритный шаттл с боксёрским рингом. Рекомендованный размер команды 2-6 человек. -# # price: 36500 -# # category: Medium -# # group: Shipyard -# # shuttlePath: /Maps/_NF/Shuttles/knuckleverse.yml -# # guidebookPage: Null -# # type: -# # - Entertainment -# -# - type: gameMap -# # id: KnuckleVerse -# # mapName: 'КостоЛом' -# # mapPath: /Maps/_NF/Shuttles/knuckleverse.yml -# # minPlayers: 0 -# # stations: -# # KnuckleVerse: -# # stationProto: StandardFrontierVessel -# # components: -# # - type: StationNameSetup -# # mapNameTemplate: 'КостоЛом {1}' -# # nameGenerator: -# # !type:NanotrasenNameGenerator -# # prefixCreator: '14' -# # - type: StationJobs -# # availableJobs: -# # Contractor: [ 0, 0 ] -# # Pilot: [ 0, 0 ] -# # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/lantern.yml b/Resources/Prototypes/_NF/Shipyard/lantern.yml index 0b8693d23c9..270ce6645c0 100644 --- a/Resources/Prototypes/_NF/Shipyard/lantern.yml +++ b/Resources/Prototypes/_NF/Shipyard/lantern.yml @@ -1,41 +1,44 @@ -# Author Info -# GitHub: erhardsteinhauer -# Discord: erhardsteinhauer -# -# Maintainer Info -# GitHub: erhardsteinhauer -# Discord: erhardsteinhauer -# -# Shuttle Notes: -# +# # Author Info +# # GitHub: erhardsteinhauer +# # Discord: erhardsteinhauer + +# # Maintainer Info +# # GitHub: erhardsteinhauer +# # Discord: erhardsteinhauer + +# # Shuttle Notes: +# # # - type: vessel -# id: lantern -# name: LVHI Кадило -# description: Среднегабаритный шаттл-церковь. Рекомендованный состав команды 2-3 человека. -# price: 34125 # ~31020$ on mapinit + ~3100$ from 10% markup -# category: Medium -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/lantern.yml -# guidebookPage: ShipyardLantern -# class: -# - Civilian -# + # id: Lantern + # name: LVHI Lantern + # description: The Lantern is a medium-sized chapel-vessel equipped with everything chaplain might need in their never ending battle for salvation of NT personnel souls. Manufactured by Langstad-Voigt Heavy Industries. + # price: 34000 # ~27900$ on mapinit + ~4200$ from 10% markup + # category: Medium + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/lantern.yml + # guidebookPage: ShipyardLantern + # class: + # - Civilian + # engine: + # - Solar + # - Plasma + # - type: gameMap -# id: lantern -# mapName: 'Кадило' -# mapPath: /Maps/_NF/Shuttles/lantern.yml -# minPlayers: 0 -# stations: -# lantern: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Кадило {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Lantern + # mapName: 'Lantern' + # mapPath: /Maps/_NF/Shuttles/lantern.yml + # minPlayers: 0 + # stations: + # Lantern: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Lantern {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/legman.yml b/Resources/Prototypes/_NF/Shipyard/legman.yml index c010c3c2199..86d40fe9bc8 100644 --- a/Resources/Prototypes/_NF/Shipyard/legman.yml +++ b/Resources/Prototypes/_NF/Shipyard/legman.yml @@ -1,41 +1,43 @@ -# Author Info -# GitHub: erhardsteinhauer -# Discord: erhardsteinhauer -# -# Maintainer Info -# GitHub: erhardsteinhauer -# Discord: erhardsteinhauer -# -# Shuttle Notes: -# +# # Author Info +# # GitHub: erhardsteinhauer +# # Discord: erhardsteinhauer + +# # Maintainer Info +# # GitHub: erhardsteinhauer +# # Discord: erhardsteinhauer + +# # Shuttle Notes: +# # # - type: vessel -# id: Legman -# name: LVHI Интервьюер -# description: Малогабаритный репортёрский шаттл. Рекомендованный размер команды 1 человек. -# price: 10670 # 9700$ on mapinit + 970$ from 10% markup -# category: Small -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/legman.yml -# guidebookPage: ShipyardLegman -# class: -# - Civilian -# + # id: Legman + # name: LVHI Legman + # description: A small maneuverable shuttle with low operational costs for reporters who want to be first on a scene. Manufactured by Langstad-Voigt Heavy Industries. + # price: 11100 # 9700$ on mapinit + 1455$ from 15% markup + # category: Small + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/legman.yml + # guidebookPage: ShipyardLegman + # class: + # - Civilian + # engine: + # - Plasma + # - type: gameMap -# id: Legman -# mapName: 'Интервьюер' -# mapPath: /Maps/_NF/Shuttles/legman.yml -# minPlayers: 0 -# stations: -# Legman: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Интервьюер {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Legman + # mapName: 'Legman' + # mapPath: /Maps/_NF/Shuttles/legman.yml + # minPlayers: 0 + # stations: + # Legman: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Legman {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/liquidator.yml b/Resources/Prototypes/_NF/Shipyard/liquidator.yml index c735b46cf99..3fc0c86388a 100644 --- a/Resources/Prototypes/_NF/Shipyard/liquidator.yml +++ b/Resources/Prototypes/_NF/Shipyard/liquidator.yml @@ -1,41 +1,43 @@ -# Author Info -# GitHub: erhardsteinhauer -# Discord: erhardsteinhauer -# -# Maintainer Info -# GitHub: erhardsteinhauer -# Discord: erhardsteinhauer -# -# Shuttle Notes: -# +# # Author Info +# # GitHub: erhardsteinhauer +# # Discord: erhardsteinhauer + +# # Maintainer Info +# # GitHub: erhardsteinhauer +# # Discord: erhardsteinhauer + +# # Shuttle Notes: +# # # - type: vessel -# id: Liquidator -# name: LVHI Подметатор -# description: Малогабаритный уборочный шаттл. Рекомендованный размер команды 1 человек. -# price: 29035 # ~25245$ on mapinit + 3785$ from 15% markup -# category: Small -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/liquidator.yml -# guidebookPage: ShipyardLiquidator -# class: -# - Civilian -# + # id: Liquidator + # name: LVHI Liquidator + # description: A small vessel equipped with everything you need to make even the dirtiest ship squeaky clean (ducky slippers included). Manufactured by Langstad-Voigt Heavy Industries. + # price: 27300 # ~23800$ on mapinit + 3500$ from 15% markup + # category: Small + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/liquidator.yml + # guidebookPage: ShipyardLiquidator + # class: + # - Civilian + # engine: + # - Uranium + # - type: gameMap -# id: Liquidator -# mapName: 'Подметатор' -# mapPath: /Maps/_NF/Shuttles/liquidator.yml -# minPlayers: 0 -# stations: -# Liquidator: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Подметатор {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Liquidator + # mapName: 'Liquidator' + # mapPath: /Maps/_NF/Shuttles/liquidator.yml + # minPlayers: 0 + # stations: + # Liquidator: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Liquidator {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/loader.yml b/Resources/Prototypes/_NF/Shipyard/loader.yml index a44e42a1e21..ae290199da5 100644 --- a/Resources/Prototypes/_NF/Shipyard/loader.yml +++ b/Resources/Prototypes/_NF/Shipyard/loader.yml @@ -1,41 +1,43 @@ -# Author Info -# GitHub: SurfinNinja1 -# Discord: ??? -# -# Maintainer Info -# GitHub: ??? -# Discord: ??? -# -# Shuttle Notes: -# +# # Author Info +# # GitHub: SurfinNinja1 +# # Discord: ??? + +# # Maintainer Info +# # GitHub: ??? +# # Discord: ??? + +# # Shuttle Notes: +# # # - type: vessel -# id: Loader -# name: NC Такелажник -# description: Малогабаритный грузовой шаттл. Рекомендованный состав команды 1-2 человека. -# price: 18000 -# category: Small -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/loader.yml -# guidebookPage: ShipyardLoader -# class: -# - Cargo -# + # id: Loader + # name: NC Loader + # description: A compact cargo ship designed for hauling shipments. + # price: 22000 + # category: Small + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/loader.yml + # guidebookPage: ShipyardLoader + # class: + # - Cargo + # engine: + # - Plasma + # - type: gameMap -# id: Loader -# mapName: 'NC Такелажник' -# mapPath: /Maps/_NF/Shuttles/loader.yml -# minPlayers: 0 -# stations: -# Loader: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Такелажник {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Loader + # mapName: 'NC Loader' + # mapPath: /Maps/_NF/Shuttles/loader.yml + # minPlayers: 0 + # stations: + # Loader: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Loader {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/lyrae.yml b/Resources/Prototypes/_NF/Shipyard/lyrae.yml index 7f11e479ab3..c3bc91f5def 100644 --- a/Resources/Prototypes/_NF/Shipyard/lyrae.yml +++ b/Resources/Prototypes/_NF/Shipyard/lyrae.yml @@ -1,41 +1,43 @@ -# Author Info -# GitHub: Tych0theSynth -# Discord: Tych0 -# -# Maintainer Info -# GitHub: Tych0theSynth -# Discord: Tych0 -# -# Shuttle Notes: -# +# # Author Info +# # GitHub: Tych0theSynth +# # Discord: Tych0 + +# # Maintainer Info +# # GitHub: Tych0theSynth +# # Discord: Tych0 + +# # Shuttle Notes: +# # # - type: vessel -# id: Lyrae -# name: SBB Лира -# description: Среднегабаритный исследовательский шаттл. Рекомендованный состав команды 2-5 человек. -# price: 51000 -# category: Medium -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/lyrae.yml -# guidebookPage: Null -# class: -# - Science -# + # id: Lyrae + # name: SBB Lyrae + # description: A medium size science vessel with laboratories for both anomalous and xenoarchaeology research. + # price: 60000 # TODO: fix this value, getting tests to pass - Whatstone + # category: Medium + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/lyrae.yml + # guidebookPage: Null + # class: + # - Science + # engine: + # - AME + # - type: gameMap -# id: Lyrae -# mapName: 'SBB Лира' -# mapPath: /Maps/_NF/Shuttles/lyrae.yml -# minPlayers: 0 -# stations: -# Lyrae: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Лира {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Lyrae + # mapName: 'SBB Lyrae' + # mapPath: /Maps/_NF/Shuttles/lyrae.yml + # minPlayers: 0 + # stations: + # Lyrae: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Lyrae {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/mccargo.yml b/Resources/Prototypes/_NF/Shipyard/mccargo.yml index a992c82f486..6fd41078d75 100644 --- a/Resources/Prototypes/_NF/Shipyard/mccargo.yml +++ b/Resources/Prototypes/_NF/Shipyard/mccargo.yml @@ -1,38 +1,40 @@ -# Maintainer Info -# GitHub: dvir001 -# Discord: dvir01 (84770870936997888) -# -# Shuttle Notes: -# -# +# # Maintainer Info +# # GitHub: dvir001 +# # Discord: dvir01 (84770870936997888) + +# # Shuttle Notes: +# # + # - type: vessel -# id: McCargo -# name: DC Каргония -# description: Среднегабаритный шаттл-ресторан. Рекомендованный состав команды 3-6 человек. -# price: 70000 # 10% up from sell -# category: Medium -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/mccargo.yml -# guidebookPage: ShipyardMcCargo -# class: -# - Kitchen -# + # id: McCargo + # name: DC McCargo + # description: "Your very own McCargo™ franchise! Comes fully stocked and ready for production of McMeals." + # price: 75000 # appraises at 67456, ~10% margin - TODO: fix these values, getting tests to pass - Whatstone + # category: Medium + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/mccargo.yml + # guidebookPage: ShipyardMcCargo + # class: + # - Kitchen + # engine: + # - Plasma + # - type: gameMap -# id: McCargo -# mapName: 'DC Каргония' -# mapPath: /Maps/_NF/Shuttles/mccargo.yml -# minPlayers: 0 -# stations: -# McCargo: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Каргония {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: McCargo + # mapName: 'DC McCargo' + # mapPath: /Maps/_NF/Shuttles/mccargo.yml + # minPlayers: 0 + # stations: + # McCargo: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'McCargo {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/mcdelivery.yml b/Resources/Prototypes/_NF/Shipyard/mcdelivery.yml index 7e311097f39..793f245cf08 100644 --- a/Resources/Prototypes/_NF/Shipyard/mcdelivery.yml +++ b/Resources/Prototypes/_NF/Shipyard/mcdelivery.yml @@ -1,35 +1,37 @@ -# Maintainer Info -# GitHub: dvir001 -# Discord: dvir01 (84770870936997888) -# -# Shuttle Notes: -# -# +# # Maintainer Info +# # GitHub: dvir001 +# # Discord: dvir01 (84770870936997888) + +# # Shuttle Notes: +# # + # - type: vessel -# id: McDelivery -# name: DC Курьер -# description: Персональный малогабаритный шаттл доставки продуктов. -# price: 8500 -# category: Micro -# group: Custom -# shuttlePath: /Maps/_NF/Shuttles/mcdelivery.yml -# guidebookPage: ShipyardMcDelivery -# class: -# - Civilian -# + # id: McDelivery + # name: DC McDelivery + # description: "Fast food fast ship, bring the McCargo meals to the people" + # price: 8500 + # category: Micro + # group: Custom + # shuttlePath: /Maps/_NF/Shuttles/mcdelivery.yml + # guidebookPage: ShipyardMcDelivery + # class: + # - Civilian + # engine: + # - Welding + # - type: gameMap -# id: McDelivery -# mapName: 'DC Курьер' -# mapPath: /Maps/_NF/Shuttles/mcdelivery.yml -# minPlayers: 0 -# stations: -# McDelivery: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Курьер {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: {} + # id: McDelivery + # mapName: 'DC McDelivery' + # mapPath: /Maps/_NF/Shuttles/mcdelivery.yml + # minPlayers: 0 + # stations: + # McDelivery: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'McDelivery {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: {} diff --git a/Resources/Prototypes/_NF/Shipyard/metastable.yml b/Resources/Prototypes/_NF/Shipyard/metastable.yml deleted file mode 100644 index 06cc7e2eed2..00000000000 --- a/Resources/Prototypes/_NF/Shipyard/metastable.yml +++ /dev/null @@ -1,34 +0,0 @@ -# - type: vessel -# # id: Metastable -# # name: TC Гармония -# # description: Среднегабаритный многоцелевой шаттл. Рекомендуемый состав команды 3-6 человек. -# # price: 95000 -# # category: Medium -# # group: Shipyard -# # shuttlePath: /Maps/_NF/Shuttles/metastable.yml -# # guidebookPage: Null -# # class: -# # - Science -# # - Engineering -# # - Medical -# # - Civilian -# -# - type: gameMap -# # id: Metastable -# # mapName: 'TC Гармония' -# # mapPath: /Maps/_NF/Shuttles/metastable.yml -# # minPlayers: 0 -# # stations: -# # Metastable: -# # stationProto: StandardFrontierVessel -# # components: -# # - type: StationNameSetup -# # mapNameTemplate: 'Гармония {1}' -# # nameGenerator: -# # !type:NanotrasenNameGenerator -# # prefixCreator: '14' -# # - type: StationJobs -# # availableJobs: -# # Contractor: [ 0, 0 ] -# # Pilot: [ 0, 0 ] -# # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/mission.yml b/Resources/Prototypes/_NF/Shipyard/mission.yml deleted file mode 100644 index a73bd175d5b..00000000000 --- a/Resources/Prototypes/_NF/Shipyard/mission.yml +++ /dev/null @@ -1,41 +0,0 @@ -# Author Info -# GitHub: ??? -# Discord: ??? -# -# Maintainer Info -# GitHub: ??? -# Discord: ??? -# -# Shuttle Notes: -# -# - type: vessel -# # id: Mission -# # name: NC Мессия -# # description: Малогабаритный шаттл-церковь. Рекомендованный состав команды 1-2 человека. -# # price: 19000 -# # category: Small -# # group: Shipyard -# # shuttlePath: /Maps/_NF/Shuttles/mission.yml -# # guidebookPage: Null -# # class: -# # - Civilian -# -# - type: gameMap -# # id: Mission -# # mapName: 'NC Мессия' -# # mapPath: /Maps/_NF/Shuttles/mission.yml -# # minPlayers: 0 -# # stations: -# # Mission: -# # stationProto: StandardFrontierVessel -# # components: -# # - type: StationNameSetup -# # mapNameTemplate: 'Мессия {1}' -# # nameGenerator: -# # !type:NanotrasenNameGenerator -# # prefixCreator: '14' -# # - type: StationJobs -# # availableJobs: -# # Contractor: [ 0, 0 ] -# # Pilot: [ 0, 0 ] -# # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/phoenix.yml b/Resources/Prototypes/_NF/Shipyard/phoenix.yml index f921004ced6..23cfbc99c47 100644 --- a/Resources/Prototypes/_NF/Shipyard/phoenix.yml +++ b/Resources/Prototypes/_NF/Shipyard/phoenix.yml @@ -1,32 +1,44 @@ +# # Author Info +# # GitHub: ??? +# # Discord: ??? + +# # Maintainer Info +# # GitHub: ??? +# # Discord: ??? + +# # Shuttle Notes: +# # # - type: vessel -# id: phoenix -# name: NR Феникс -# description: Среднегабаритный ксеноархеологический шаттл. Рекомендуемый состав команды 2-4 человека. -# price: 60000 -# category: Medium -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/phoenix.yml -# guidebookPage: Null -# class: -# - Science -# - Engineering -# + # id: Phoenix + # name: NR Phoenix + # description: A research and salvage vessel designed for deep space exploration. + # price: 62500 # TODO - fix this value, getting tests to pass - Whatstone + # category: Medium + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/phoenix.yml + # guidebookPage: ShipyardPhoenix + # class: + # - Science + # - Engineering + # engine: + # - Plasma + # - type: gameMap -# id: phoenix -# mapName: 'NR Феникс' -# mapPath: /Maps/_NF/Shuttles/phoenix.yml -# minPlayers: 0 -# stations: -# phoenix: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Феникс {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Phoenix + # mapName: 'NR Phoenix' + # mapPath: /Maps/_NF/Shuttles/phoenix.yml + # minPlayers: 0 + # stations: + # Phoenix: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Phoenix {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/piecrust.yml b/Resources/Prototypes/_NF/Shipyard/piecrust.yml index 5b2dc6df875..2003f77f7eb 100644 --- a/Resources/Prototypes/_NF/Shipyard/piecrust.yml +++ b/Resources/Prototypes/_NF/Shipyard/piecrust.yml @@ -1,41 +1,43 @@ -# Author Info -# GitHub: https://github.com/MoistBiscuits -# Discord: moistbiscuits -# -# Maintainer Info -# GitHub: https://github.com/MoistBiscuits -# Discord: moistbiscuits -# -# Shuttle Notes: -# +# # Author Info +# # GitHub: https://github.com/MoistBiscuits +# # Discord: moistbiscuits + +# # Maintainer Info +# # GitHub: https://github.com/MoistBiscuits +# # Discord: moistbiscuits + +# # Shuttle Notes: +# # # - type: vessel -# id: Piecrust -# name: NC Пирожок -# description: Малогабаритный шаттл ресторан с зоопарком. Рекомендованный состав команды 1-2 человека. -# price: 27500 -# category: Small -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/piecrust.yml -# guidebookPage: Null -# class: -# - Kitchen -# + # id: Piecrust + # name: NC Piecrust + # description: A combination animal ranch and pie bakery + # price: 33000 # TODO: fix this value, getting tests to pass - Whatstone + # category: Small + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/piecrust.yml + # guidebookPage: Null + # class: + # - Kitchen + # engine: + # - Plasma + # - type: gameMap -# id: Piecrust -# mapName: 'NT Пирожок' -# mapPath: /Maps/_NF/Shuttles/piecrust.yml -# minPlayers: 0 -# stations: -# Piecrust: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Пирожок {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Piecrust + # mapName: 'NT Piecrust' + # mapPath: /Maps/_NF/Shuttles/piecrust.yml + # minPlayers: 0 + # stations: + # Piecrust: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Piecrust {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/pioneer.yml b/Resources/Prototypes/_NF/Shipyard/pioneer.yml index cf767b81c7b..10efaeff2d6 100644 --- a/Resources/Prototypes/_NF/Shipyard/pioneer.yml +++ b/Resources/Prototypes/_NF/Shipyard/pioneer.yml @@ -1,41 +1,43 @@ -# Author Info -# GitHub: erhardsteinhauer -# Discord: erhardsteinhauer -# -# Maintainer Info -# GitHub: erhardsteinhauer -# Discord: erhardsteinhauer -# -# Shuttle Notes: -# +# # Author Info +# # GitHub: erhardsteinhauer +# # Discord: erhardsteinhauer + +# # Maintainer Info +# # GitHub: erhardsteinhauer +# # Discord: erhardsteinhauer + +# # Shuttle Notes: +# # # - type: vessel -# id: Pioneer -# name: LVHI Пионер -# description: Одноместный грузовой контейнер, переоборудованный под выход в открытый космос. -# price: 12200 # ~10600$ on mapinit + ~1600$ from 15% markup -# category: Small -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/pioneer.yml -# guidebookPage: ShipyardPioneer -# class: -# - Salvage -# + # id: Pioneer + # name: LVHI Pioneer + # description: A cargo container outfitted to be space-capable and equipped for salvaging and mining either on its own or as part of a fleet. Manufactured by Langstad-Voigt Heavy Industries. + # price: 10000 # ~8670$ on mapinit + ~1300$ from 15% markup + # category: Small + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/pioneer.yml + # guidebookPage: ShipyardPioneer + # class: + # - Salvage + # engine: + # - Plasma + # - type: gameMap -# id: Pioneer -# mapName: 'Пионер' -# mapPath: /Maps/_NF/Shuttles/pioneer.yml -# minPlayers: 0 -# stations: -# Pioneer: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Пионер {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Pioneer + # mapName: 'Pioneer' + # mapPath: /Maps/_NF/Shuttles/pioneer.yml + # minPlayers: 0 + # stations: + # Pioneer: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Pioneer {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/placebo.yml b/Resources/Prototypes/_NF/Shipyard/placebo.yml index 1b0024ca1a8..1283ea2f6f8 100644 --- a/Resources/Prototypes/_NF/Shipyard/placebo.yml +++ b/Resources/Prototypes/_NF/Shipyard/placebo.yml @@ -1,31 +1,43 @@ +# # Author Info +# # GitHub: ??? +# # Discord: ??? + +# # Maintainer Info +# # GitHub: ??? +# # Discord: ??? + +# # Shuttle Notes: +# # # - type: vessel -# id: Placebo -# name: NC Плацебо -# description: Малогабаритный шаттл психолога. Рекомендуемый состав команды 1 человек. -# price: 20000 -# category: Small -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/placebo.yml -# guidebookPage: Null -# class: -# - Medical -# + # id: Placebo + # name: NC Placebo + # description: A small psychology vessel. Named after the famous Placebo effect. + # price: 20000 + # category: Small + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/placebo.yml + # guidebookPage: ShipyardPlacebo + # class: + # - Medical + # engine: + # - Plasma + # - type: gameMap -# id: Placebo -# mapName: 'NC Плацебо' -# mapPath: /Maps/_NF/Shuttles/placebo.yml -# minPlayers: 0 -# stations: -# Placebo: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Плацебо {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Placebo + # mapName: 'NC Placebo' + # mapPath: /Maps/_NF/Shuttles/placebo.yml + # minPlayers: 0 + # stations: + # Placebo: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Placebo {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Shipyard/prospector.yml b/Resources/Prototypes/_NF/Shipyard/prospector.yml index a3f666f9f34..6a64ecff858 100644 --- a/Resources/Prototypes/_NF/Shipyard/prospector.yml +++ b/Resources/Prototypes/_NF/Shipyard/prospector.yml @@ -1,41 +1,43 @@ -# Author Info -# GitHub: ??? -# Discord: ??? -# -# Maintainer Info -# GitHub: ??? -# Discord: ??? -# -# Shuttle Notes: -# +# # Author Info +# # GitHub: ??? +# # Discord: ??? + +# # Maintainer Info +# # GitHub: ??? +# # Discord: ??? + +# # Shuttle Notes: +# # # - type: vessel -# id: Prospector -# name: NC Старатель -# description: Малогабаритный добывающий шаттл. Рекомендованный состав команды 1-3 человека. -# price: 24500 -# category: Small -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/prospector.yml -# guidebookPage: ShipyardProspector -# class: -# - Salvage -# + # id: Prospector + # name: NC Prospector + # description: A small mining vessel designed to assist salvage operations. + # price: 24500 + # category: Small + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/prospector.yml + # guidebookPage: ShipyardProspector + # class: + # - Salvage + # engine: + # - Plasma + # - type: gameMap -# id: Prospector -# mapName: 'NC Старатель' -# mapPath: /Maps/_NF/Shuttles/prospector.yml -# minPlayers: 0 -# stations: -# Prospector: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Старатель {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Prospector + # mapName: 'NC Prospector' + # mapPath: /Maps/_NF/Shuttles/prospector.yml + # minPlayers: 0 + # stations: + # Prospector: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Prospector {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/pts.yml b/Resources/Prototypes/_NF/Shipyard/pts.yml index 62357e1d380..619d61e63cc 100644 --- a/Resources/Prototypes/_NF/Shipyard/pts.yml +++ b/Resources/Prototypes/_NF/Shipyard/pts.yml @@ -1,41 +1,43 @@ -# Author Info -# GitHub: arimah -# Discord: arimah -# -# Maintainer Info -# GitHub: arimah -# Discord: arimah -# -# Shuttle Notes: -# +# # Author Info +# # GitHub: arimah +# # Discord: arimah + +# # Maintainer Info +# # GitHub: arimah +# # Discord: arimah + +# # Shuttle Notes: +# # # - type: vessel -# id: PTS -# name: NC Бомбила -# description: Малогабаритный транспортный шаттл на 5 пассажиров. Рекомендованный состав команды 1-3 человека. -# price: 13000 -# category: Small -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/pts.yml -# guidebookPage: Null -# class: -# - Civilian -# + # id: PTS + # name: NC Personal Transport + # description: A small transport shuttle with space for 4 passengers. Comes with the latest audio entertainment technology. + # price: 16500 # $14325 after appraisal + $1200 (~5% markup) + # category: Small + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/pts.yml + # guidebookPage: Null + # class: + # - Civilian + # engine: + # - Plasma + # - type: gameMap -# id: PTS -# mapName: 'NC Бомбила' -# mapPath: /Maps/_NF/Shuttles/pts.yml -# minPlayers: 0 -# stations: -# PTS: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Бомбила {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: PTS + # mapName: 'NC Personal Transport' + # mapPath: /Maps/_NF/Shuttles/pts.yml + # minPlayers: 0 + # stations: + # PTS: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'PTS {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/pulse.yml b/Resources/Prototypes/_NF/Shipyard/pulse.yml deleted file mode 100644 index 8d2f59862c9..00000000000 --- a/Resources/Prototypes/_NF/Shipyard/pulse.yml +++ /dev/null @@ -1,41 +0,0 @@ -# Author Info -# GitHub: ??? -# Discord: ??? -# -# Maintainer Info -# GitHub: ??? -# Discord: ??? -# -# Shuttle Notes: -# -# - type: vessel -# # id: Pulse -# # name: NM Пульс -# # description: Малогабаритный медицинский шаттл. Рекомендованный состав команды 1-2 человека. -# # price: 20500 -# # category: Small -# # group: Shipyard -# # shuttlePath: /Maps/_NF/Shuttles/pulse.yml -# # guidebookPage: Null -# # class: -# # - Medical -# -# - type: gameMap -# # id: Pulse -# # mapName: 'NM Пульс' -# # mapPath: /Maps/_NF/Shuttles/pulse.yml -# # minPlayers: 0 -# # stations: -# # Pulse: -# # stationProto: StandardFrontierVessel -# # components: -# # - type: StationNameSetup -# # mapNameTemplate: 'Пульс {1}' -# # nameGenerator: -# # !type:NanotrasenNameGenerator -# # prefixCreator: '14' -# # - type: StationJobs -# # availableJobs: -# # Contractor: [ 0, 0 ] -# # Pilot: [ 0, 0 ] -# # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/rosebudmki.yml b/Resources/Prototypes/_NF/Shipyard/rosebudmki.yml deleted file mode 100644 index 311b87db896..00000000000 --- a/Resources/Prototypes/_NF/Shipyard/rosebudmki.yml +++ /dev/null @@ -1,41 +0,0 @@ -# Author Info -# GitHub: @rosieposieeee (https://github.com/rosieposieeee) -# Discord: -# -# Maintainer Info -# GitHub: -# Discord: -# -# Shuttle Notes: -# -# - type: vessel -# # id: RosebudMKI -# # name: NT Бутон MKI -# # description: Среднеразмерный добывающий шаттл. Рекомендованный состав команды 2-6 человек. -# # price: 92115 -# # category: Medium -# # group: Shipyard -# # shuttlePath: /Maps/_NF/Shuttles/rosebudmki.yml -# # guidebookPage: Null -# # class: -# # - Salvage -# -# - type: gameMap -# # id: RosebudMKI -# # mapName: 'NT Бутон MKI' -# # mapPath: /Maps/_NF/Shuttles/rosebudmki.yml -# # minPlayers: 0 -# # stations: -# # RosebudMKI: -# # stationProto: StandardFrontierVessel -# # components: -# # - type: StationNameSetup -# # mapNameTemplate: 'Бутон MKI {1}' -# # nameGenerator: -# # !type:NanotrasenNameGenerator -# # prefixCreator: '14' -# # - type: StationJobs -# # availableJobs: -# # Contractor: [ 0, 0 ] -# # Pilot: [ 0, 0 ] -# # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/searchlight.yml b/Resources/Prototypes/_NF/Shipyard/searchlight.yml index 977d49ea42f..781cc613ebf 100644 --- a/Resources/Prototypes/_NF/Shipyard/searchlight.yml +++ b/Resources/Prototypes/_NF/Shipyard/searchlight.yml @@ -1,41 +1,43 @@ -# Author Info -# GitHub: erhardsteinhauer -# Discord: erhardsteinhauer -# -# Maintainer Info -# GitHub: erhardsteinhauer -# Discord: erhardsteinhauer -# -# Shuttle Notes: -# +# # Author Info +# # GitHub: erhardsteinhauer +# # Discord: erhardsteinhauer + +# # Maintainer Info +# # GitHub: erhardsteinhauer +# # Discord: erhardsteinhauer + +# # Shuttle Notes: +# # # - type: vessel -# id: Searchlight -# name: LVHI Прожектор -# description: Малогабаритный медицинский шаттл. Рекомендованный состав команды 1-3 человека. -# price: 29050 # ~26400$ on mapinit + ~2640$ from 10% markup -# category: Small -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/searchlight.yml -# guidebookPage: ShipyardSearchlight -# class: -# - Medical -# + # id: Searchlight + # name: LVHI Searchlight + # description: A small vessel outfitted for the search and recovery of wounded NT personnel. Manufactured by Langstad-Voigt Heavy Industries. + # price: 25700 # ~22400$ on mapinit + ~3360$ from 15% markup + # category: Small + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/searchlight.yml + # guidebookPage: ShipyardSearchlight + # class: + # - Medical + # engine: + # - Plasma + # - type: gameMap -# id: Searchlight -# mapName: 'Прожектор' -# mapPath: /Maps/_NF/Shuttles/searchlight.yml -# minPlayers: 0 -# stations: -# Searchlight: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Прожектор {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Searchlight + # mapName: 'Searchlight' + # mapPath: /Maps/_NF/Shuttles/searchlight.yml + # minPlayers: 0 + # stations: + # Searchlight: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Searchlight {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/skipper.yml b/Resources/Prototypes/_NF/Shipyard/skipper.yml index adb5f68403a..63022830cf2 100644 --- a/Resources/Prototypes/_NF/Shipyard/skipper.yml +++ b/Resources/Prototypes/_NF/Shipyard/skipper.yml @@ -1,41 +1,43 @@ -# Author Info -# GitHub: ??? -# Discord: ??? -# -# Maintainer Info -# GitHub: ??? -# Discord: ??? -# -# Shuttle Notes: -# +# # Author Info +# # GitHub: ??? +# # Discord: ??? + +# # Maintainer Info +# # GitHub: ??? +# # Discord: ??? + +# # Shuttle Notes: +# # # - type: vessel -# id: Skipper -# name: NC Шкипер -# description: Малогабаритный ботанический шаттл-ресторан. Рекомендованный состав команды 1-2 человека. -# price: 37500 -# category: Small -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/skipper.yml -# guidebookPage: Null -# class: -# - Kitchen -# + # id: Skipper + # name: NC Skipper + # description: A small service ship with a full service kitchen and hydroponics garden. + # price: 31500 + # category: Small + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/skipper.yml + # guidebookPage: ShipyardSkipper + # class: + # - Kitchen + # engine: + # - Plasma + # - type: gameMap -# id: Skipper -# mapName: 'NC Шкипер' -# mapPath: /Maps/_NF/Shuttles/skipper.yml -# minPlayers: 0 -# stations: -# Skipper: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Шкипер {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Skipper + # mapName: 'NC Skipper' + # mapPath: /Maps/_NF/Shuttles/skipper.yml + # minPlayers: 0 + # stations: + # Skipper: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Skipper {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/sparrow.yml b/Resources/Prototypes/_NF/Shipyard/sparrow.yml index 89114ad76fa..4a681f1d5c4 100644 --- a/Resources/Prototypes/_NF/Shipyard/sparrow.yml +++ b/Resources/Prototypes/_NF/Shipyard/sparrow.yml @@ -1,42 +1,44 @@ -# Author Info -# GitHub: ??? -# Discord: ??? -# -# Maintainer Info -# GitHub: ??? -# Discord: ??? -# -# Shuttle Notes: -# +# # Author Info +# # GitHub: ??? +# # Discord: ??? + +# # Maintainer Info +# # GitHub: ??? +# # Discord: ??? + +# # Shuttle Notes: +# # # - type: vessel -# id: Sparrow -# name: NR Воробей -# description: Малогабаритный инженерно-исследовательский шаттл. Рекомендованный состав команды 1-4 человека. -# price: 37000 # +4800 from 15% markup -# category: Small -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/sparrow.yml -# guidebookPage: Null -# class: -# - Science -# - Engineering -# + # id: Sparrow + # name: NR Sparrow + # description: A small research and engineering vessel. + # price: 37000 # +4800 from 15% markup + # category: Small + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/sparrow.yml + # guidebookPage: ShipyardSparrow + # class: + # - Science + # - Engineering + # engine: + # - Plasma + # - type: gameMap -# id: Sparrow -# mapName: 'NR Воробей' -# mapPath: /Maps/_NF/Shuttles/sparrow.yml -# minPlayers: 0 -# stations: -# Sparrow: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Воробей {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Sparrow + # mapName: 'NR Sparrow' + # mapPath: /Maps/_NF/Shuttles/sparrow.yml + # minPlayers: 0 + # stations: + # Sparrow: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Sparrow {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/spectre.yml b/Resources/Prototypes/_NF/Shipyard/spectre.yml index 9560f500874..363ff5dc8cd 100644 --- a/Resources/Prototypes/_NF/Shipyard/spectre.yml +++ b/Resources/Prototypes/_NF/Shipyard/spectre.yml @@ -1,41 +1,43 @@ -# Author Info -# GitHub: Wolfhauler -# Discord: wolfhauler -# -# Maintainer Info -# GitHub: ThatOneGoblin25 -# Discord: thedaarkgoblin -# -# Shuttle Notes: -# +# # Author Info +# # GitHub: Wolfhauler +# # Discord: wolfhauler + +# # Maintainer Info +# # GitHub: ThatOneGoblin25 +# # Discord: thedaarkgoblin + +# # Shuttle Notes: +# # # - type: vessel -# id: Spectre -# name: NR Спектр -# description: Крупногабаритный научный шаттл. Рекомендованный состав команды 4-5 человек. -# price: 185000 -# category: Large -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/spectre.yml -# guidebookPage: Null -# class: -# - Science -# + # id: Spectre + # name: NR Spectre + # description: A large, attractive but dated vessel with a pure focus on research and development. It is capable of generating anomalies. + # price: 185000 # Anomaly spawner + # category: Large + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/spectre.yml + # guidebookPage: Null + # class: + # - Science + # engine: + # - AME + # - type: gameMap -# id: Spectre -# mapName: 'NR Спектр' -# mapPath: /Maps/_NF/Shuttles/spectre.yml -# minPlayers: 0 -# stations: -# Spectre: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Спектр {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Spectre + # mapName: 'NR Spectre' + # mapPath: /Maps/_NF/Shuttles/spectre.yml + # minPlayers: 0 + # stations: + # Spectre: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Spectre {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/spirit.yml b/Resources/Prototypes/_NF/Shipyard/spirit.yml index afda4a7844d..e07806ada7c 100644 --- a/Resources/Prototypes/_NF/Shipyard/spirit.yml +++ b/Resources/Prototypes/_NF/Shipyard/spirit.yml @@ -1,41 +1,43 @@ -# Author Info -# GitHub: Actualcatmoment (https://github.com/Actualcatmoment) -# Discord: @iNoahGuy -# -# Maintainer Info -# GitHub: dustylens -# Discord: dustylens -# -# Shuttle Notes: -# +# # Author Info +# # GitHub: Actualcatmoment (https://github.com/Actualcatmoment) +# # Discord: @iNoahGuy + +# # Maintainer Info +# # GitHub: dustylens +# # Discord: dustylens + +# # Shuttle Notes: +# # # - type: vessel -# id: Spirit -# name: NM Дух -# description: Крошечный медицинский поисково-спасательный шаттл, столь же маневренный, сколь и тесный. Эксплуатационные расходы гарантированно* будут на 5% ниже, чем у конкурирующих моделей! -# price: 15500 -# category: Small -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/spirit.yml -# guidebookPage: ShipyardSpirit -# class: -# - Medical -# + # id: Spirit + # name: FSB Spirit + # description: A tiny medical search and rescue shuttle, as nimble as it is cramped. Running costs guarenteed* to be 5% lower than competing models! + # price: 17000 + # category: Small + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/spirit.yml + # guidebookPage: ShipyardSpirit + # class: + # - Medical + # engine: + # - Plasma + # - type: gameMap -# id: Spirit -# mapName: 'NM Дух' -# mapPath: /Maps/_NF/Shuttles/spirit.yml -# minPlayers: 0 -# stations: -# Spirit: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Дух {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Spirit + # mapName: 'FSB Spirit' + # mapPath: /Maps/_NF/Shuttles/spirit.yml + # minPlayers: 0 + # stations: + # Spirit: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Spirit {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/stasis.yml b/Resources/Prototypes/_NF/Shipyard/stasis.yml index cd450d12847..83e600b4672 100644 --- a/Resources/Prototypes/_NF/Shipyard/stasis.yml +++ b/Resources/Prototypes/_NF/Shipyard/stasis.yml @@ -1,41 +1,43 @@ -# Author Info -# GitHub: dustylens (https://github.com/dustylens) -# Discord: dustylens -# -# Maintainer Info -# GitHub: dustylens (https://github.com/dustylens) -# Discord: dustylens -# -# Shuttle Notes: -# +# # Author Info +# # GitHub: dustylens (https://github.com/dustylens) +# # Discord: dustylens + +# # Maintainer Info +# # GitHub: dustylens (https://github.com/dustylens) +# # Discord: dustylens + +# # Shuttle Notes: +# # # - type: vessel -# id: Stasis -# name: FSB Stasis -# description: A medium medical vessel providing cryogenic and support medical services for the traumas of deep space operations. Designed, developed and deployed by the Far Star Biotech company to render aid wherever it is needed. -# price: 47000 #Appraise value 40800 with 15% markup. -# category: Medium -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/stasis.yml -# guidebookPage: ShipyardStasis -# class: -# - Medical -# + # id: Stasis + # name: FSB Stasis + # description: A medium medical vessel providing cryogenic and support medical services for the traumas of deep space operations. Designed, developed and deployed by the Far Star Biotech company to render aid wherever it is needed. + # price: 55000 # TODO: fix this value, getting tests to pass - Whatstone + # category: Medium + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/stasis.yml + # guidebookPage: ShipyardStasis + # class: + # - Medical + # engine: + # - Uranium + # - type: gameMap -# id: Stasis -# mapName: 'FSB Stasis' -# mapPath: /Maps/_NF/Shuttles/stasis.yml -# minPlayers: 0 -# stations: -# Stasis: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Stasis {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Stasis + # mapName: 'FSB Stasis' + # mapPath: /Maps/_NF/Shuttles/stasis.yml + # minPlayers: 0 + # stations: + # Stasis: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Stasis {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/stellaris.yml b/Resources/Prototypes/_NF/Shipyard/stellaris.yml index 4c63fe3c3d6..564541fadeb 100644 --- a/Resources/Prototypes/_NF/Shipyard/stellaris.yml +++ b/Resources/Prototypes/_NF/Shipyard/stellaris.yml @@ -1,31 +1,33 @@ # - type: vessel -# id: Stellaris -# name: NT Межзвёздный -# description: Среднегабаритный шаттл-ресторан с театром. Рекомендованный состав команды 2-5 человек. -# price: 45000 -# category: Medium -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/stellaris.yml -# guidebookPage: Null -# class: -# - Civilian -# + # id: Stellaris + # name: NT Stellaris + # description: A mobile theatre perfect for putting on any show. + # price: 48000 # Appraises for 45469, margin of 7% - TODO: fix this value, getting tests to pass - Whatstone + # category: Medium + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/stellaris.yml + # guidebookPage: Null + # class: + # - Civilian + # engine: + # - Plasma + # - type: gameMap -# id: Stellaris -# mapName: 'NT Межзвёздный' -# mapPath: /Maps/_NF/Shuttles/stellaris.yml -# minPlayers: 0 -# stations: -# Stellaris: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Межзвёздный {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Stellaris + # mapName: 'NT Stellaris' + # mapPath: /Maps/_NF/Shuttles/stellaris.yml + # minPlayers: 0 + # stations: + # Stellaris: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Stellaris {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Shipyard/stratos.yml b/Resources/Prototypes/_NF/Shipyard/stratos.yml deleted file mode 100644 index 83bfc19d36f..00000000000 --- a/Resources/Prototypes/_NF/Shipyard/stratos.yml +++ /dev/null @@ -1,41 +0,0 @@ -# # Author Info -# GitHub: https://github.com/GreaseMonk -# Discord: greasemonk -# -# Maintainer Info -# GitHub: https://github.com/GreaseMonk -# Discord: greasemonk -# -# Shuttle Notes: -# -# - type: vessel -# # id: Stratos -# # name: NR Стратег -# # description: Среднегабаритный исследовательский шаттл. Рекомендованный состав команды 2-6 человек. -# # price: 90000 -# # category: Medium -# # group: Shipyard -# # shuttlePath: /Maps/_NF/Shuttles/stratos.yml -# # guidebookPage: Null -# # class: -# # - Science -# -# - type: gameMap -# # id: Stratos -# # mapName: 'NR Стратег' -# # mapPath: /Maps/_NF/Shuttles/stratos.yml -# # minPlayers: 0 -# # stations: -# # Stratos: -# # stationProto: StandardFrontierVessel -# # components: -# # - type: StationNameSetup -# # mapNameTemplate: 'Стратег {1}' -# # nameGenerator: -# # !type:NanotrasenNameGenerator -# # prefixCreator: '14' -# # - type: StationJobs -# # availableJobs: -# # Contractor: [ 0, 0 ] -# # Pilot: [ 0, 0 ] -# # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/the_defector.yml b/Resources/Prototypes/_NF/Shipyard/the_defector.yml deleted file mode 100644 index e59d80fe3ee..00000000000 --- a/Resources/Prototypes/_NF/Shipyard/the_defector.yml +++ /dev/null @@ -1,28 +0,0 @@ -# taken from the official developers -# - type: vessel -# id: the_defector -# name: NSF Перебежчик -# description: Малогабаритный патрульный шаттл ДСБФ. Рекомендуемый состав команды 1-3 человек. -# price: 20500 -# category: Small -# group: Security -# access: Security -# mapchecker_group_override: Security # Treat this as a security vessel for mapchecker purposes -# shuttlePath: /Maps/Corvax/Shuttles/Nfsd/the_defector.yml -# -# - type: gameMap -# id: the_defector -# mapName: 'NSF Перебежчик' -# mapPath: /Maps/Corvax/Shuttles/Nfsd/the_defector.yml -# minPlayers: 0 -# stations: -# the_defector: -# stationProto: StandardFrontierSecurityVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Перебежчик {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: {} diff --git a/Resources/Prototypes/_NF/Shipyard/tyne.yml b/Resources/Prototypes/_NF/Shipyard/tyne.yml index e8ffacbc4c2..3c967ee68b5 100644 --- a/Resources/Prototypes/_NF/Shipyard/tyne.yml +++ b/Resources/Prototypes/_NF/Shipyard/tyne.yml @@ -1,40 +1,40 @@ -# Author Info -# GitHub: Tych0theSynth -# Discord: tych0 +# # Author Info +# # GitHub: Tych0theSynth +# # Discord: tych0 -# Maintainer Info -# GitHub: Tych0theSynth -# Discord: Tych0 +# # Maintainer Info +# # GitHub: Tych0theSynth +# # Discord: Tych0 -# Shuttle Notes: -# -- type: vessel - id: Tyne - name: SBB Тайна - description: Небольшой шаттл с внешней палубой и каютой для выживших, предназначенная для поисково-спасательных операций. - price: 18500 #~5% markup as it's a med ship. Grid values at 17372. - category: Small - group: Shipyard - shuttlePath: /Maps/_NF/Shuttles/tyne.yml - class: - - Medical +# # Shuttle Notes: +# # +# - type: vessel + # id: Tyne + # name: SBB Tyne + # description: A small, agile lifeboat with an exterior deck and survivor cabin for search and rescue operations. + # price: 19000 #~5-6% markup as it's a med ship. Grid values at 17372. + # category: Small + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/tyne.yml + # class: + # - Medical -- type: gameMap - id: Tyne - mapName: 'SBB Tyne' - mapPath: /Maps/_NF/Shuttles/tyne.yml - minPlayers: 0 - stations: - Tyne: - stationProto: StandardFrontierVessel - components: - - type: StationNameSetup - mapNameTemplate: 'Tyne {1}' - nameGenerator: - !type:NanotrasenNameGenerator - prefixCreator: '14' - - type: StationJobs - availableJobs: - Contractor: [ 0, 0 ] - Pilot: [ 0, 0 ] - Mercenary: [ 0, 0 ] \ No newline at end of file +# - type: gameMap + # id: Tyne + # mapName: 'SBB Tyne' + # mapPath: /Maps/_NF/Shuttles/tyne.yml + # minPlayers: 0 + # stations: + # Tyne: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Tyne {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Shipyard/vagabond.yml b/Resources/Prototypes/_NF/Shipyard/vagabond.yml index e7956b7b220..d6343a756cc 100644 --- a/Resources/Prototypes/_NF/Shipyard/vagabond.yml +++ b/Resources/Prototypes/_NF/Shipyard/vagabond.yml @@ -1,43 +1,44 @@ -# Author Info -# GitHub: https://github.com/DustScoundrel -# Discord: 691415110282903552 -# -# Maintainer Info -# GitHub: https://github.com/MoistBiscuits -# Discord: 159375107855351808 -# -# Shuttle Notes: -# -# +# # Author Info +# # GitHub: https://github.com/DustScoundrel +# # Discord: 691415110282903552 + +# # Maintainer Info +# # GitHub: https://github.com/MoistBiscuits +# # Discord: 159375107855351808 + +# # Shuttle Notes: +# # + # - type: vessel -# id: Vagabond -# name: NT Бродяга -# description: Среднегабаритный добывающий-грузовой шаттл. Рекомендуемый состав команды 3-6 человек. -# price: 60000 -# category: Medium -# group: Shipyard -# shuttlePath: /Maps/_NF/Shuttles/vagabond.yml -# guidebookPage: ShipyardVagabond -# class: -# - Salvage -# - Cargo -# + # id: Vagabond + # name: NT Vagabond + # description: A adaptable long-haul industrial freighter that pilots have adapted to many different purposes. + # price: 60000 + # category: Medium + # group: Shipyard + # shuttlePath: /Maps/_NF/Shuttles/vagabond.yml + # guidebookPage: ShipyardVagabond + # class: + # - Cargo + # engine: + # - Plasma + # - type: gameMap -# id: Vagabond -# mapName: 'NT Бродяга' -# mapPath: /Maps/_NF/Shuttles/vagabond.yml -# minPlayers: 0 -# stations: -# Vagabond: -# stationProto: StandardFrontierVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Бродяга {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: -# Contractor: [ 0, 0 ] -# Pilot: [ 0, 0 ] -# Mercenary: [ 0, 0 ] + # id: Vagabond + # mapName: 'NT Vagabond' + # mapPath: /Maps/_NF/Shuttles/vagabond.yml + # minPlayers: 0 + # stations: + # Vagabond: + # stationProto: StandardFrontierVessel + # components: + # - type: StationNameSetup + # mapNameTemplate: 'Vagabond {1}' + # nameGenerator: + # !type:NanotrasenNameGenerator + # prefixCreator: '14' + # - type: StationJobs + # availableJobs: + # Contractor: [ 0, 0 ] + # Pilot: [ 0, 0 ] + # Mercenary: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/warrior.yml b/Resources/Prototypes/_NF/Shipyard/warrior.yml deleted file mode 100644 index 989b56a9a1d..00000000000 --- a/Resources/Prototypes/_NF/Shipyard/warrior.yml +++ /dev/null @@ -1,27 +0,0 @@ -# - type: vessel -# id: Warrior -# name: NSF Вариор -# description: Шаттл перехватчик Вариор. Произведено частной военно-производственной компаний Vitezstvi по спец. заказу НТ. Рекомендуемый состав команды 1-2 человека. -# price: 32500 -# group: Security -# category: Small -# access: Security -# mapchecker_group_override: Security -# shuttlePath: /Maps/Corvax/Shuttles/Nfsd/warrior.yml -# -# - type: gameMap -# id: Warrior -# mapName: 'NSF Вариор' -# mapPath: /Maps/Corvax/Shuttles/Nfsd/warrior.yml -# minPlayers: 0 -# stations: -# Warrior: -# stationProto: StandardFrontierSecurityVessel -# components: -# - type: StationNameSetup -# mapNameTemplate: 'Вариор {1}' -# nameGenerator: -# !type:NanotrasenNameGenerator -# prefixCreator: '14' -# - type: StationJobs -# availableJobs: {} diff --git a/Resources/Prototypes/_NF/Shipyard/waveshot.yml b/Resources/Prototypes/_NF/Shipyard/waveshot.yml deleted file mode 100644 index 33fc050a3b0..00000000000 --- a/Resources/Prototypes/_NF/Shipyard/waveshot.yml +++ /dev/null @@ -1,41 +0,0 @@ -# Author Info -# GitHub: @Lokey82 (https://github.com/Lokey82) -# Discord: @lokey_71 -# -# Maintainer Info -# GitHub: ??? -# Discord: ??? -# -# Shuttle Notes: -# -# - type: vessel -# # id: WaveShot -# # name: NC Цунами -# # description: Малогабаритный новостной шаттл. Рекомендованный состав команды 1+ человек. -# # price: 37500 # 15% markup +4890 -# # category: Small -# # group: Shipyard -# # shuttlePath: /Maps/_NF/Shuttles/waveshot.yml -# # guidebookPage: Null -# # class: -# # - Civilian -# -# - type: gameMap -# # id: WaveShot -# # mapName: 'NC Цунами' -# # mapPath: /Maps/_NF/Shuttles/waveshot.yml -# # minPlayers: 0 -# # stations: -# # WaveShot: -# # stationProto: StandardFrontierVessel -# # components: -# # - type: StationNameSetup -# # mapNameTemplate: 'Цунами {1}' -# # nameGenerator: -# # !type:NanotrasenNameGenerator -# # prefixCreator: '14' -# # - type: StationJobs -# # availableJobs: -# # Contractor: [ 0, 0 ] -# # Pilot: [ 0, 0 ] -# # Mercenary: [ 0, 0 ] \ No newline at end of file