From 2f8f4d3078b46090cd5f9dfdc14ae19dce2f2048 Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Wed, 9 Oct 2024 23:13:15 +0300 Subject: [PATCH 01/76] base items --- Resources/Prototypes/Entities/Clothing/Back/backpacks.yml | 2 +- .../Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml | 2 +- Resources/Prototypes/Entities/Clothing/Ears/headsets.yml | 2 +- .../Prototypes/Entities/Clothing/Eyes/base_clothingeyes.yml | 2 +- .../Prototypes/Entities/Clothing/Hands/base_clothinghands.yml | 2 +- .../Prototypes/Entities/Clothing/Masks/base_clothingmask.yml | 2 +- .../Prototypes/Entities/Clothing/Neck/base_clothingneck.yml | 2 +- .../Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml | 2 +- .../Entities/Clothing/Uniforms/base_clothinguniforms.yml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index 0d97de0eebe..b8becee4007 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -1,5 +1,5 @@ - type: entity - parent: [Clothing, ContentsExplosionResistanceBase] + parent: [Clothing, ContentsExplosionResistanceBase, RecyclableItemClothBasic] # Frontier: added RecyclableItemClothBasic id: ClothingBackpack name: backpack description: You wear this on your back and put items into it. diff --git a/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml b/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml index 76af5067aea..39d5fcc05dd 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: Clothing + parent: [Clothing, RecyclableItemClothBasic] # Frontier: added RecyclableItemClothBasic id: ClothingBeltBase components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml index 7c69f23a0ef..afb206c6194 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: Clothing + parent: [Clothing, RecyclableItemClothDevice] # Frontier: added RecyclableItemClothDevice id: ClothingHeadset name: headset description: An updated, modular intercom that fits over the head. Takes encryption keys. diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/base_clothingeyes.yml b/Resources/Prototypes/Entities/Clothing/Eyes/base_clothingeyes.yml index b31f821629d..52aaa8d8726 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/base_clothingeyes.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/base_clothingeyes.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: Clothing + parent: [Clothing, RecyclableItemClothDevice] # Frontier: added RecyclableItemClothDevice id: ClothingEyesBase components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml index bb494ffda41..e4c892924cf 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: Clothing + parent: [Clothing, RecyclableItemClothSmall] # Frontier: added RecyclableItemClothSmall id: ClothingHandsBase components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml b/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml index ac8984a4196..b945c223179 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: Clothing + parent: [Clothing, RecyclableItemClothDevice] # Frontier: added RecyclableItemClothDevice id: ClothingMaskBase components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml b/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml index 608f061dd89..cd8fa87d087 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: Clothing + parent: [Clothing, RecyclableItemClothSmall] # Frontier: added RecyclableItemClothSmall id: ClothingNeckBase components: - type: Item diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml index e2733b2468b..e19a49a844c 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: Clothing + parent: [Clothing, RecyclableItemClothSmall] # Frontier: added RecyclableItemClothSmall id: ClothingShoesBase components: - type: Clothing diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml index 7ad3970abbd..87bcb30f4b6 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: Clothing + parent: [Clothing, RecyclableItemClothBasic] # Frontier: added RecyclableItemClothBasic id: UnsensoredClothingUniformBase components: - type: Sprite From 89c03e757d3ad47d81155444a7578ee61812e25d Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Wed, 9 Oct 2024 23:47:01 +0300 Subject: [PATCH 02/76] recyclable outer clothes --- .../Prototypes/Entities/Clothing/OuterClothing/armor.yml | 2 +- .../Entities/Clothing/OuterClothing/base_clothingouter.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index 7657812f78f..4c757ea4cad 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -3,7 +3,7 @@ #Basic armor vest - type: entity - parent: [ClothingOuterBaseMedium, AllowSuitStorageClothing, BaseC1Contraband] # Frontier: BaseRestrictedContraband Date: Thu, 10 Oct 2024 00:31:20 +0300 Subject: [PATCH 03/76] recycle books --- Resources/Prototypes/Entities/Objects/Misc/books.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Misc/books.yml b/Resources/Prototypes/Entities/Objects/Misc/books.yml index 5f005af2189..4f83a1c407c 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/books.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/books.yml @@ -4,6 +4,9 @@ id: BookBase description: A hardcover book. components: + - type: PhysicalComposition # Frontier + materialComposition: # Frontier + Paper: 50 # Frontier - type: Sprite sprite: Objects/Misc/books.rsi layers: From 7add0e62c41e29e45c212ec14df19bb45bc42d8e Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Thu, 10 Oct 2024 10:21:30 +0300 Subject: [PATCH 04/76] more random items --- .../Clothing/Head/base_clothinghead.yml | 2 +- .../Objects/Consumable/Drinks/drinks_fun.yml | 4 +- .../Objects/Devices/forensic_scanner.yml | 2 +- .../Objects/Devices/holoprojectors.yml | 2 +- .../Entities/Objects/Devices/mousetrap.yml | 2 +- .../Entities/Objects/Devices/pinpointer.yml | 2 +- .../Entities/Objects/Devices/station_map.yml | 2 +- .../Prototypes/Entities/Objects/Fun/dice.yml | 2 +- .../Entities/Objects/Fun/figurines.yml | 2 +- .../Entities/Objects/Misc/books.yml | 2 +- .../Entities/Objects/Misc/candles.yml | 2 +- .../Entities/Objects/Misc/machine_parts.yml | 2 +- .../Entities/Objects/Power/powercells.yml | 2 +- .../Objects/Specific/Hydroponics/seeds.yml | 2 +- .../Objects/Specific/Janitorial/janitor.yml | 6 +- .../Objects/Specific/Janitorial/soap.yml | 5 + .../Objects/Specific/Janitorial/spray.yml | 2 +- .../Objects/Specific/Janitorial/trashbag.yml | 2 +- .../Objects/Specific/Medical/disease.yml | 4 +- .../Specific/Medical/healthanalyzer.yml | 2 +- .../Objects/Specific/chemical-containers.yml | 2 +- .../Entities/Objects/Specific/chemistry.yml | 2 +- .../Entities/Objects/Tools/flare.yml | 2 +- .../Entities/Objects/Tools/flashlights.yml | 2 +- .../Entities/Objects/Tools/glowstick.yml | 2 +- .../Entities/Objects/Tools/hand_labeler.yml | 2 +- .../Objects/Tools/inflatable_wall.yml | 4 +- .../Entities/Objects/Tools/jaws_of_life.yml | 2 +- .../Entities/Objects/Tools/lantern.yml | 2 +- .../Entities/Objects/Tools/light_replacer.yml | 2 +- .../Entities/Objects/Tools/spray_painter.yml | 2 +- .../Entities/Objects/Tools/toolbox.yml | 2 +- .../Objects/base_recyclable_items.yml | 100 ++++++++++++++++++ 33 files changed, 141 insertions(+), 36 deletions(-) create mode 100644 Resources/Prototypes/_NF/Entities/Objects/base_recyclable_items.yml diff --git a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml index 46fe9ef09df..86c781ddb4d 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: Clothing + parent: [Clothing, RecyclableItemClothSmall] # Frontier: added RecyclableItemClothSmall id: ClothingHeadBase components: - type: Clothing diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml index ef6208b69d4..1dd619289fb 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml @@ -1,5 +1,5 @@ - type: entity - parent: DrinkBase + parent: [DrinkBase, RecyclableItemPlasticSmall] # Frontier: added RecyclableItemPlasticSmall id: DrinkSpaceGlue name: space glue tube description: High performance glue intended for maintenance of extremely complex mechanical equipment. DON'T DRINK! @@ -42,7 +42,7 @@ solution: drink - type: entity - parent: DrinkBase + parent: [DrinkBase, RecyclableItemPlasticSmall] # Frontier: added RecyclableItemPlasticSmall id: DrinkSpaceLube name: space lube tube description: High performance lubricant intended for maintenance of extremely complex mechanical equipment. diff --git a/Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml b/Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml index 2fcfc5217e7..863a002aa4d 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml @@ -1,6 +1,6 @@ - type: entity name: forensic scanner - parent: BaseItem + parent: [BaseItem, RecyclableItemDeviceSmall] # Frontier: added RecyclableItemDeviceSmall id: ForensicScanner description: A handheld device that can scan objects for fingerprints and fibers. components: diff --git a/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml b/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml index 0c8b539c590..7bf5f281496 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml @@ -1,5 +1,5 @@ - type: entity - parent: BaseItem + parent: [BaseItem, RecyclableItemDeviceSmall] # Frontier: added RecyclableItemDeviceSmall id: Holoprojector name: holographic sign projector description: A handy-dandy holographic projector that displays a janitorial sign. diff --git a/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml b/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml index cde95fda6bd..93e5cf9ffde 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml @@ -1,6 +1,6 @@ - type: entity name: mousetrap - parent: BaseItem + parent: [BaseItem, RecyclableItemPlasticSmall] # Frontier: added RecyclableItemPlasticSmall id: Mousetrap description: Useful for catching rodents sneaking into your kitchen. components: diff --git a/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml b/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml index 434ea973b0e..d5814fa47f6 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml @@ -1,7 +1,7 @@ - type: entity name: pinpointer description: A handheld tracking device. While typically far more capable, this one has been configured to lock onto certain signals. Keep upright to retain accuracy. - parent: BaseItem + parent: [BaseItem, RecyclableItemDeviceSmall] # Frontier: added RecyclableItemDeviceSmall id: PinpointerBase abstract: true components: diff --git a/Resources/Prototypes/Entities/Objects/Devices/station_map.yml b/Resources/Prototypes/Entities/Objects/Devices/station_map.yml index 54fc4a70c5a..ddcfd6c564e 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/station_map.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/station_map.yml @@ -1,5 +1,5 @@ - type: entity - parent: BaseItem + parent: [BaseItem, RecyclableItemDeviceSmall] # Frontier: added RecyclableItemDeviceSmall id: BaseHandheldStationMap name: station map description: Displays a readout of the current station. diff --git a/Resources/Prototypes/Entities/Objects/Fun/dice.yml b/Resources/Prototypes/Entities/Objects/Fun/dice.yml index 433a4ebac35..9b978156be2 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/dice.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/dice.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: BaseItem + parent: [BaseItem, RecyclableItemPlasticTiny] # Frontier: added RecyclableItemPlasticTiny id: BaseDice components: - type: Dice diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml index d14cc06a7c3..be251df1fe0 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml @@ -1,7 +1,7 @@ #HUMANOID FIGURINES - type: entity - parent: BaseItem + parent: [BaseItem, RecyclableItemPlasticTiny] # Frontier: added RecyclableItemPlasticTiny id: BaseFigurine name: figurine description: A small miniature. diff --git a/Resources/Prototypes/Entities/Objects/Misc/books.yml b/Resources/Prototypes/Entities/Objects/Misc/books.yml index 4f83a1c407c..a0ddee428e6 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/books.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/books.yml @@ -1,6 +1,6 @@ - type: entity name: book - parent: BaseItem + parent: [BaseItem, RecyclableItemPaper] # Frontier: added RecyclableItemPaper id: BookBase description: A hardcover book. components: diff --git a/Resources/Prototypes/Entities/Objects/Misc/candles.yml b/Resources/Prototypes/Entities/Objects/Misc/candles.yml index 55d3ecb9d35..652a4559312 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/candles.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/candles.yml @@ -1,6 +1,6 @@ - type: entity name: candle - parent: BaseItem + parent: [BaseItem, RecyclableItemOrganicTiny] # Frontier: added RecyclableItemOrganicTiny id: Candle description: A thin wick threaded through fat. components: diff --git a/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml b/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml index 2d8c5a4875f..aabcf50ff5e 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml @@ -1,7 +1,7 @@ - type: entity id: BaseStockPart name: stock part - parent: BaseItem + parent: [BaseItem, RecyclableItemDeviceTiny] # Frontier: added RecyclableItemDeviceTiny description: What? abstract: true components: diff --git a/Resources/Prototypes/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/Entities/Objects/Power/powercells.yml index 25125ee9b0a..870e28e5cc7 100644 --- a/Resources/Prototypes/Entities/Objects/Power/powercells.yml +++ b/Resources/Prototypes/Entities/Objects/Power/powercells.yml @@ -1,7 +1,7 @@ - type: entity id: BasePowerCell abstract: true - parent: BaseItem + parent: [BaseItem, RecyclableItemDeviceSmall] # Frontier: added RecyclableItemDeviceSmall components: - type: Item storedRotation: -90 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml index 542692aaf06..d4947b05f53 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -1,5 +1,5 @@ - type: entity - parent: BaseItem + parent: [BaseItem, RecyclableItemOrganicTiny] # Frontier: added RecyclableItemOrganicTiny id: SeedBase abstract: true components: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml index ccb79008105..d26813424b7 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml @@ -1,5 +1,5 @@ - type: entity - parent: BaseItem + parent: [BaseItem, RecyclableItemPlasticMedium] # Frontier: added RecyclableItemPlasticMedium name: mop id: MopItem description: A mop that can't be stopped, viscera cleanup detail awaits. @@ -193,7 +193,7 @@ - type: entity name: plunger id: Plunger - parent: BaseItem + parent: [BaseItem, RecyclableItemPlasticSmall] # Frontier: added RecyclableItemPlasticSmall description: A plunger with a red plastic suction-cup and a wooden handle. Used to unclog drains. components: - type: Tag @@ -290,7 +290,7 @@ MaintenanceToolSpawner: 5 - type: entity - parent: BaseItem + parent: [BaseItem, RecyclableItemClothSmall] # Frontier: added RecyclableItemClothSmall name: damp rag id: RagItem description: For cleaning up messes, you suppose. diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml index 3c938b5abbe..8f17467742f 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml @@ -50,6 +50,11 @@ reagents: - ReagentId: SoapReagent Quantity: 50 + - type: Extractable # Frontier + juiceSolution: # Frontier + reagents: # Frontier + - ReagentId: SoapReagent # Frontier + Quantity: 10 # Frontier - type: SolutionTransfer transferAmount: 10 minTransferAmount: 1 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml index 998d3ecf03e..0ce36c938f7 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml @@ -1,7 +1,7 @@ - type: entity name: spray bottle id: SprayBottle - parent: BaseItem + parent: [BaseItem, RecyclableItemPlasticSmall] # Frontier: added RecyclableItemPlasticSmall suffix: Empty description: A spray bottle with an unscrewable top. components: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml index 905cf2b690f..081f2266b14 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml @@ -1,7 +1,7 @@ - type: entity name: trash bag id: TrashBag - parent: BaseStorageItem + parent: [BaseStorageItem, RecyclableItemPlasticSmall] # Frontier: added RecyclableItemPlasticSmall components: - type: Sprite sprite: Objects/Specific/Janitorial/trashbag.rsi diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/disease.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/disease.yml index 7c90a82d7d6..77d0c0da64d 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/disease.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/disease.yml @@ -1,5 +1,5 @@ - type: entity - parent: BaseItem + parent: [BaseItem, RecyclableItemPlasticTiny] # Frontier: added RecyclableItemPlasticTiny id: DiseaseSwab name: sterile swab description: Used for taking and transferring samples. Sterile until open. Single use only. @@ -21,7 +21,7 @@ - Chemicals - type: entity - parent: BaseAmmoProvider # this is for cycling swabs out and not spawning 30 entities, trust + parent: [BaseAmmoProvider, RecyclableItemCardboard] # this is for cycling swabs out and not spawning 30 entities, trust # Frontier: added RecyclableItemCardboard id: BoxMouthSwab name: sterile swab dispenser description: Dispenses 30 sterile swabs, extremely useful for botany. diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml index febfc91110d..a5164064749 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml @@ -1,6 +1,6 @@ - type: entity id: HandheldHealthAnalyzerUnpowered - parent: BaseItem + parent: [BaseItem, RecyclableItemDeviceSmall] # Frontier: added RecyclableItemDeviceSmall name: health analyzer description: A hand-held body scanner capable of distinguishing vital signs of the subject. components: diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml index 949c7e9a195..d47d6899136 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml @@ -1,6 +1,6 @@ - type: entity name: jug - parent: BaseItem + parent: [BaseItem, RecyclableItemPlasticMedium] # Frontier: addded RecyclableItemPlasticMedium id: Jug description: Used to contain a very large amount of chemicals or solutions. Chugging is extremely ill-advised. components: diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml index 37571113059..b051c298dfb 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml @@ -510,7 +510,7 @@ - type: entity name: pill canister id: PillCanister - parent: BaseStorageItem + parent: [BaseStorageItem, RecyclableItemPlasticTiny] # Frontier: added RecyclableItemPlasticTiny description: Holds up to 10 pills. components: - type: Item diff --git a/Resources/Prototypes/Entities/Objects/Tools/flare.yml b/Resources/Prototypes/Entities/Objects/Tools/flare.yml index 8d5ccb263ab..c583b466e33 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/flare.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/flare.yml @@ -1,6 +1,6 @@ - type: entity name: emergency flare - parent: BaseItem + parent: [BaseItem, RecyclableItemSteelTiny] # Frontier: added RecyclableItemSteelTiny id: Flare description: A flare that produces a very bright light for a short while. Point the flame away from yourself. components: diff --git a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml index b15bfde344a..469b63850eb 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml @@ -1,6 +1,6 @@ - type: entity name: flashlight - parent: BaseItem + parent: [BaseItem, RecyclableItemDeviceSmall] # Frontier: added RecyclableItemDeviceSmall id: FlashlightLantern description: It lights the way to freedom. components: diff --git a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml index 3081f60989e..02ad5c4f2a0 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml @@ -1,6 +1,6 @@ - type: entity name: green glowstick - parent: BaseItem + parent: [BaseItem, RecyclableItemPlasticTiny] # Frontier: added RecyclableItemPlasticTiny id: GlowstickBase description: Useful for raves and emergencies. components: diff --git a/Resources/Prototypes/Entities/Objects/Tools/hand_labeler.yml b/Resources/Prototypes/Entities/Objects/Tools/hand_labeler.yml index 615408c9658..e499fb6dc67 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/hand_labeler.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/hand_labeler.yml @@ -1,5 +1,5 @@ - type: entity - parent: BaseItem + parent: [BaseItem, RecyclableItemPlasticSmall] # Frontier: added RecyclableItemPlasticSmall id: HandLabeler name: hand labeler description: A hand labeler, used to label items and objects. diff --git a/Resources/Prototypes/Entities/Objects/Tools/inflatable_wall.yml b/Resources/Prototypes/Entities/Objects/Tools/inflatable_wall.yml index 84ec5aef004..f9568bb0163 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/inflatable_wall.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/inflatable_wall.yml @@ -1,6 +1,6 @@ - type: entity id: InflatableWallStack - parent: BaseItem + parent: [BaseItem, RecyclableItemPlasticSmall] # Frontier: added RecyclableItemPlasticSmall name: inflatable barricade description: A folded membrane which rapidly expands into a large cubical shape on activation. suffix: Full @@ -29,7 +29,7 @@ - type: entity id: InflatableDoorStack - parent: BaseItem + parent: [BaseItem, RecyclableItemPlasticSmall] # Frontier: added RecyclableItemPlasticSmall name: inflatable door description: A folded membrane which rapidly expands into a large cubical shape on activation. suffix: Full diff --git a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml index e1d04dd92ba..5a436348b1d 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml @@ -1,6 +1,6 @@ - type: entity name: jaws of life - parent: BaseItem + parent: [BaseItem, RecyclableItemSteelMedium] # Frontier: added RecyclableItemSteelMedium id: JawsOfLife description: A set of jaws of life, compressed through the magic of science. components: diff --git a/Resources/Prototypes/Entities/Objects/Tools/lantern.yml b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml index 89101e34ff4..09f8607ef6d 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/lantern.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml @@ -1,6 +1,6 @@ - type: entity name: lantern - parent: BaseItem + parent: [BaseItem, RecyclableItemDeviceSmall] # Frontier: added RecyclableItemDeviceSmall id: Lantern description: The holy light guides the way. components: diff --git a/Resources/Prototypes/Entities/Objects/Tools/light_replacer.yml b/Resources/Prototypes/Entities/Objects/Tools/light_replacer.yml index 646f6a63784..0b9e34b9bef 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/light_replacer.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/light_replacer.yml @@ -1,5 +1,5 @@ - type: entity - parent: BaseItem + parent: [BaseItem, RecyclableItemDeviceSmall] # Frontier: added RecyclableItemDeviceSmall name: light replacer id: LightReplacer description: An item which uses magnets to easily replace broken lights. Refill By adding more lights into the replacer. diff --git a/Resources/Prototypes/Entities/Objects/Tools/spray_painter.yml b/Resources/Prototypes/Entities/Objects/Tools/spray_painter.yml index ad31a6ec02d..84dad791b43 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/spray_painter.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/spray_painter.yml @@ -1,5 +1,5 @@ - type: entity - parent: BaseItem + parent: [BaseItem, RecyclableItemDeviceSmall] # Frontier: added RecyclableItemDeviceSmall id: SprayPainter name: spray painter description: A spray painter for painting airlocks and pipes. diff --git a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml index 391c7837a06..06fcaebbdd8 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml @@ -1,6 +1,6 @@ - type: entity id: ToolboxBase - parent: BaseStorageItem + parent: [BaseStorageItem, RecyclableItemSteelMedium] # Frontier: added RecyclableItemSteelMedium abstract: true components: - type: Sprite diff --git a/Resources/Prototypes/_NF/Entities/Objects/base_recyclable_items.yml b/Resources/Prototypes/_NF/Entities/Objects/base_recyclable_items.yml new file mode 100644 index 00000000000..8666cb7abf8 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/base_recyclable_items.yml @@ -0,0 +1,100 @@ +# Mostly ignores crafting composition of items making recycling wildly inefficient +# and occasionally ignores item sizes too (eg toolbox is ginormous item, but is treated as RecyclableItemSteelMedium nonetheless) +# Item sizes: Tiny, Small, Medium, Large, Huge, Ginormous + +# Cardboard +- type: entity # Boxes + id: RecyclableItemCardboard + abstract: true + components: + - type: PhysicalComposition + materialComposition: + Cardboard: 100 + +# Paper +- type: entity # Books + id: RecyclableItemPaper + abstract: true + components: + - type: PhysicalComposition + materialComposition: + Paper: 50 + +# Steel +## Tiny +- type: entity # Flares idk + id: RecyclableItemSteelTiny + abstract: true + components: + - type: PhysicalComposition + materialComposition: + Steel: 10 + +## Medium +- type: entity # Jaws of life, toolboxes idk + id: RecyclableItemSteelMedium + abstract: true + components: + - type: PhysicalComposition + materialComposition: + Steel: 200 + +# Plastic +## Tiny +- type: entity # Pill canisters, swabs, dice, capacitors etc. + id: RecyclableItemPlasticTiny + abstract: true + components: + - type: PhysicalComposition + materialComposition: + Plastic: 10 + +## Small +- type: entity # Spray bottles, glue/lube tubes, plungers etc + id: RecyclableItemPlasticSmall + abstract: true + components: + - type: PhysicalComposition + materialComposition: + Plastic: 25 + +## Medium +- type: entity # Spray bottles, glue/lube tubes, plungers etc + id: RecyclableItemPlasticMedium + abstract: true + components: + - type: PhysicalComposition + materialComposition: + Plastic: 50 + +# Devices +## Tiny +- type: entity # Machine parts etc + id: RecyclableItemDeviceTiny + abstract: true + components: + - type: PhysicalComposition + materialComposition: + Plastic: 10 + Steel: 10 + +## Small +- type: entity # Light replacers, sign projectors, flashlights, power cells etc + id: RecyclableItemDeviceSmall + abstract: true + components: + - type: PhysicalComposition + materialComposition: + Plastic: 25 + Steel: 25 + Glass: 25 + +# Organic +## Tiny +- type: entity # Seeds, candles etc + id: RecyclableItemOrganicTiny + abstract: true + components: + - type: PhysicalComposition + materialComposition: + Biomass: 1 From cc765dae992764c678f881a20642df1377735f12 Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Thu, 10 Oct 2024 11:46:14 +0300 Subject: [PATCH 05/76] instruments and flags --- .../Objects/Fun/Instruments/base_instruments.yml | 2 +- .../Prototypes/Entities/Objects/Misc/bedsheets.yml | 2 +- .../Prototypes/Entities/Objects/Misc/handy_flags.yml | 10 +++++----- .../Entities/Objects/Specific/Janitorial/soap.yml | 7 +------ .../Entities/Objects/Specific/Medical/morgue.yml | 2 +- .../_NF/Entities/Objects/base_recyclable_items.yml | 10 ++++++++++ 6 files changed, 19 insertions(+), 14 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml index 5a3b967f989..1867bd388db 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml @@ -1,7 +1,7 @@ - type: entity abstract: true parent: BaseItem - id: BaseHandheldInstrument + id: [BaseHandheldInstrument, RecyclableItemWoodMedium] # Frontier: added RecyclableItemWoodMedium description: That's an instrument. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml index 4cb6a8bf1ed..98d4b008c66 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml @@ -1,5 +1,5 @@ - type: entity - parent: BaseItem + parent: [BaseItem, RecyclableItemClothBasic] # Frontier: added RecyclableItemClothBasic id: BedsheetBase name: BedsheetBase abstract: true diff --git a/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml b/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml index c75fa3d1d85..82a4d411f0e 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml @@ -1,5 +1,5 @@ - type: entity - parent: BaseItem + parent: [BaseItem, RecyclableItemClothSmall] # Frontier: added RecyclableItemClothSmall id: BlankHandyFlag name: blank handheld flag description: "Some piece of white cloth wound on a stick." @@ -11,7 +11,7 @@ sprite: Objects/Misc/Handy_Flags/blank_handy_flag.rsi - type: entity - parent: BaseItem + parent: [BaseItem, RecyclableItemClothSmall] # Frontier: added RecyclableItemClothSmall id: NTHandyFlag name: Nanotrasen handheld flag description: "Glory to NT! Wait, they really made a handheld flag for a corporation?" @@ -23,7 +23,7 @@ sprite: Objects/Misc/Handy_Flags/NT_handy_flag.rsi - type: entity - parent: [BaseItem, BaseC3SyndicateContraband] # Frontier: BaseSyndicateContraband Date: Thu, 10 Oct 2024 12:10:11 +0300 Subject: [PATCH 06/76] encryption keys, cartons --- .../Prototypes/Catalog/Fills/Boxes/general.yml | 2 +- .../Consumable/Drinks/drinks-cartons.yml | 2 +- .../Objects/Consumable/Food/ingredients.yml | 2 +- .../Entities/Objects/Decoration/lidsalami.yml | 2 +- .../Objects/Devices/encryption_keys.yml | 18 +++++++++--------- .../Entities/Objects/Devices/radio.yml | 2 +- .../Structures/Furniture/rollerbeds.yml | 2 +- .../Catalog/Fills/Paper/Shipyard/manuals.yml | 2 +- .../Entities/Objects/base_recyclable_items.yml | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml index f4052a3b4b3..a5b1f95d98c 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml @@ -1,6 +1,6 @@ - type: entity name: cardboard box - parent: BoxBase + parent: [BoxBase, RecyclableItemCardboard] # Frontier: added RecyclableItemCardboard id: BoxCardboard description: A cardboard box for storing things. components: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml index 9dd3cffbe69..972da6d72ee 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml @@ -1,5 +1,5 @@ - type: entity - parent: DrinkBase + parent: [DrinkBase, RecyclableItemCardboard] # Frontier: added RecyclableItemCardboard id: DrinkCartonBaseFull abstract: true suffix: Full diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml index 25c4468eff8..c9b8adac9e9 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml @@ -41,7 +41,7 @@ - type: entity abstract: true - parent: ReagentContainerBase + parent: [ReagentContainerBase, RecyclableItemCardboard] # Frontier: added RecyclableItemCardboard id: ReagentPacketBase components: - type: Openable diff --git a/Resources/Prototypes/Entities/Objects/Decoration/lidsalami.yml b/Resources/Prototypes/Entities/Objects/Decoration/lidsalami.yml index 1f0e3591922..df7477198b7 100644 --- a/Resources/Prototypes/Entities/Objects/Decoration/lidsalami.yml +++ b/Resources/Prototypes/Entities/Objects/Decoration/lidsalami.yml @@ -1,6 +1,6 @@ - type: entity id: LidSalami - parent: BaseItem + parent: [BaseItem, RecyclableItemPlasticMedium] # Frontier: added RecyclableItemPlasticMedium name: salami lid description: Ain't gon' fit, won't fit. components: diff --git a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml index 2f2f22b3cd1..66a08f9efe4 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml @@ -15,7 +15,7 @@ price: 2 - type: entity - parent: EncryptionKey + parent: [EncryptionKey, RecyclableItemDeviceTiny] # Frontier: added RecyclableItemDeviceTiny id: EncryptionKeyCommon name: common encryption key description: An encryption key used by anyone. @@ -30,7 +30,7 @@ - state: common_label - type: entity - parent: EncryptionKey # Frontier: removed BaseCargoContraband + parent: [EncryptionKey, RecyclableItemDeviceTiny] # Frontier: added RecyclableItemDeviceTiny, removed BaseCargoContraband id: EncryptionKeyCargo name: cargo encryption key suffix: DO NOT MAP # Frontier - Add DO NOT MAP suffix @@ -103,7 +103,7 @@ - state: com_label - type: entity - parent: EncryptionKey # Frontier: removed BaseEngineeringContraband + parent: [EncryptionKey, RecyclableItemDeviceTiny] # Frontier: added RecyclableItemDeviceTiny, removed BaseEngineeringContraband id: EncryptionKeyEngineering name: engineering encryption key suffix: DO NOT MAP # Frontier - Add DO NOT MAP suffix @@ -119,7 +119,7 @@ - state: eng_label - type: entity - parent: EncryptionKey # Frontier: removed BaseMedicalContraband + parent: [EncryptionKey, RecyclableItemDeviceTiny] # Frontier: added RecyclableItemDeviceTiny, removed BaseMedicalContraband id: EncryptionKeyMedical name: medical encryption key description: An encryption key used by those who save lives. @@ -134,7 +134,7 @@ - state: med_label - type: entity - parent: EncryptionKey # Frontier: removed BaseMedicalScienceContraband + parent: [EncryptionKey, RecyclableItemDeviceTiny] # Frontier: added RecyclableItemDeviceTiny, removed BaseMedicalScienceContraband id: EncryptionKeyMedicalScience name: med-sci encryption key suffix: DO NOT MAP # Frontier - Add DO NOT MAP suffix @@ -151,7 +151,7 @@ - state: medsci_label - type: entity - parent: EncryptionKey # Frontier: removed BaseScienceContraband + parent: [EncryptionKey, RecyclableItemDeviceTiny] # Frontier: added RecyclableItemDeviceTiny, removed BaseScienceContraband id: EncryptionKeyScience name: science encryption key suffix: DO NOT MAP # Frontier - Add DO NOT MAP suffix @@ -167,7 +167,7 @@ - state: sci_label - type: entity - parent: EncryptionKey # Frontier: removed BaseScienceContraband + parent: [EncryptionKey, RecyclableItemDeviceTiny] # Frontier: added RecyclableItemDeviceTiny, removed BaseScienceContraband id: EncryptionKeyRobo name: robotech encryption key suffix: DO NOT MAP # Frontier - Add DO NOT MAP suffix @@ -199,7 +199,7 @@ - state: sec_label - type: entity - parent: EncryptionKey # Frontier: removed BaseCivilianContraband + parent: [EncryptionKey, RecyclableItemDeviceTiny] # Frontier: added RecyclableItemDeviceTiny, removed BaseCivilianContraband id: EncryptionKeyService name: service encryption key suffix: DO NOT MAP # Frontier - Add DO NOT MAP suffix @@ -231,7 +231,7 @@ - state: synd_label - type: entity - parent: EncryptionKey # Frontier: removed BaseSiliconScienceContraband + parent: [EncryptionKey, RecyclableItemDeviceTiny] # Frontier: added RecyclableItemDeviceTiny, removed BaseSiliconScienceContraband id: EncryptionKeyBinary name: binary translator key suffix: DO NOT MAP # Frontier - Add DO NOT MAP suffix diff --git a/Resources/Prototypes/Entities/Objects/Devices/radio.yml b/Resources/Prototypes/Entities/Objects/Devices/radio.yml index 29b5600b489..43648a87563 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/radio.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/radio.yml @@ -1,7 +1,7 @@ - type: entity name: handheld radio description: A handy handheld radio. - parent: BaseItem + parent: [BaseItem, RecyclableItemDeviceSmall] # Frontier: added RecyclableItemDeviceSmall id: RadioHandheld components: - type: TelecomExempt diff --git a/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml b/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml index 9f3fbd7c455..92e64e0945c 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml @@ -73,7 +73,7 @@ price: 120 - type: entity - parent: RollerBed + parent: [RollerBed, RecyclableItemSteelMedium] # Frontier: added RecyclableItemSteelMedium id: RollerBedSpawnFolded suffix: folded components: diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Paper/Shipyard/manuals.yml b/Resources/Prototypes/_NF/Catalog/Fills/Paper/Shipyard/manuals.yml index a62b9db29a4..7b71ac87be3 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Paper/Shipyard/manuals.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Paper/Shipyard/manuals.yml @@ -1,5 +1,5 @@ - type: entity - parent: BaseItem + parent: [BaseItem, RecyclableItemCardboard] id: ShipyardInfoBase name: shuttle user manual description: The preflight checklist for a shuttle. Check it for power settings! diff --git a/Resources/Prototypes/_NF/Entities/Objects/base_recyclable_items.yml b/Resources/Prototypes/_NF/Entities/Objects/base_recyclable_items.yml index 59dba66f63d..3b4af1b15cc 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/base_recyclable_items.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/base_recyclable_items.yml @@ -69,7 +69,7 @@ # Devices ## Tiny -- type: entity # Machine parts etc +- type: entity # Machine parts, encryption keys etc id: RecyclableItemDeviceTiny abstract: true components: From 84f63e7733de110ef933e7e45d128591f9412169 Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Thu, 10 Oct 2024 12:36:56 +0300 Subject: [PATCH 07/76] fix --- .../Entities/Objects/Fun/Instruments/base_instruments.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml index 1867bd388db..0447563dacb 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml @@ -1,7 +1,7 @@ - type: entity abstract: true - parent: BaseItem - id: [BaseHandheldInstrument, RecyclableItemWoodMedium] # Frontier: added RecyclableItemWoodMedium + parent: [BaseItem, RecyclableItemWoodMedium] # Frontier: added RecyclableItemWoodMedium + id: BaseHandheldInstrument description: That's an instrument. components: - type: Sprite From d9791c0d03623bfc10dda9c300f41088bb0be6f8 Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Thu, 10 Oct 2024 20:37:07 +0300 Subject: [PATCH 08/76] ammo boxes --- .../Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml | 2 +- .../Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml | 2 +- .../Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml | 2 +- .../Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml | 2 +- .../Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml | 2 +- .../Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml | 2 +- .../Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml | 2 +- .../Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml | 2 +- ...ontraband_clothing_base.yml => base_contraband_clothing.yml} | 0 ...ecyclable_clothing_base.yml => base_recyclable_clothing.yml} | 0 10 files changed, 8 insertions(+), 8 deletions(-) rename Resources/Prototypes/_NF/Entities/Clothing/{contraband_clothing_base.yml => base_contraband_clothing.yml} (100%) rename Resources/Prototypes/_NF/Entities/Clothing/{recyclable_clothing_base.yml => base_recyclable_clothing.yml} (100%) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml index c54d9197768..b9d04ad53de 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: BaseItem + parent: [BaseItem, RecyclableItemCardboard] # Frontier: added RecyclableItemCardboard id: BaseMagazineBoxAntiMateriel name: ammunition box (.60 anti-materiel) components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml index 3fcfe75ee3e..266b4137cb4 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: BaseItem + parent: [BaseItem, RecyclableItemCardboard] # Frontier: added RecyclableItemCardboard id: BaseMagazineBoxCaselessRifle name: ammunition box (.25 caseless) components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml index 67c2399e736..36051043b8e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: BaseItem + parent: [BaseItem, RecyclableItemCardboard] # Frontier: added RecyclableItemCardboard id: BaseMagazineBoxLightRifle name: ammunition box (.30 rifle) components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml index 9376316d967..4f6d42481ac 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: BaseItem + parent: [BaseItem, RecyclableItemCardboard] # Frontier: added RecyclableItemCardboard id: BaseMagazineBoxMagnum components: - type: BallisticAmmoProvider diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml index 7ae0060e330..a40b2ca5dc1 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: BaseItem + parent: [BaseItem, RecyclableItemCardboard] # Frontier: added RecyclableItemCardboard id: BaseMagazineBoxPistol name: ammunition box (.35 auto) components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml index 8c7c34cb17f..34ef0282e3e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: BaseItem + parent: [BaseItem, RecyclableItemCardboard] # Frontier: added RecyclableItemCardboard id: BaseMagazineBoxRifle components: - type: BallisticAmmoProvider diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml index c5d6873cf18..806d4f7a0b1 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml @@ -12,7 +12,7 @@ sprite: Objects/Storage/boxes.rsi - type: entity - parent: BaseAmmoProvider + parent: [BaseAmmoProvider, RecyclableItemCardboard] # Frontier: added RecyclableItemCardboard id: AmmoProviderShotgunShell abstract: true components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml index f1546fac653..ddd55ddee67 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: BaseItem + parent: [BaseItem, RecyclableItemCardboard] # Frontier: added RecyclableItemCardboard id: BoxDonkSoftBase name: foamdart box components: diff --git a/Resources/Prototypes/_NF/Entities/Clothing/contraband_clothing_base.yml b/Resources/Prototypes/_NF/Entities/Clothing/base_contraband_clothing.yml similarity index 100% rename from Resources/Prototypes/_NF/Entities/Clothing/contraband_clothing_base.yml rename to Resources/Prototypes/_NF/Entities/Clothing/base_contraband_clothing.yml diff --git a/Resources/Prototypes/_NF/Entities/Clothing/recyclable_clothing_base.yml b/Resources/Prototypes/_NF/Entities/Clothing/base_recyclable_clothing.yml similarity index 100% rename from Resources/Prototypes/_NF/Entities/Clothing/recyclable_clothing_base.yml rename to Resources/Prototypes/_NF/Entities/Clothing/base_recyclable_clothing.yml From d89347ef1026470ead2ff95f7918fefe686589ac Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Thu, 10 Oct 2024 20:43:26 +0300 Subject: [PATCH 09/76] gun magazines --- .../Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml | 2 +- .../Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml | 2 +- .../Weapons/Guns/Ammunition/Magazines/light_rifle.yml | 2 +- .../Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml | 4 ++-- .../Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml | 4 ++-- .../Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml | 2 +- .../Weapons/Guns/Ammunition/Magazines/shotgun.yml | 2 +- .../_NF/Entities/Objects/base_recyclable_items.yml | 9 +++++++++ 8 files changed, 18 insertions(+), 9 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml index 0469795fdee..8ee14d39fba 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml @@ -1,7 +1,7 @@ - type: entity id: BaseMagazineCaselessRifle name: "magazine (.25 caseless)" - parent: [ BaseCartridge, BaseC3SyndicateContrabandNoValue ] # Frontier: BaseRestrictedContraband Date: Thu, 10 Oct 2024 20:47:47 +0300 Subject: [PATCH 10/76] nades --- .../Entities/Objects/Weapons/Throwable/clusterbang.yml | 2 +- .../Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml | 2 +- .../Prototypes/_NF/Entities/Objects/base_recyclable_items.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml index c2ace100c73..841f5cd1c09 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml @@ -1,5 +1,5 @@ - type: entity - parent: [BaseItem, BaseC2ContrabandUnredeemable] # Frontier: BaseRestrictedContraband Date: Thu, 10 Oct 2024 21:37:22 +0300 Subject: [PATCH 11/76] tabletop games, dropper, pickaxe --- .../Entities/Objects/Devices/base_handheld.yml | 2 +- .../Prototypes/Entities/Objects/Fun/Tabletop/base.yml | 7 +++++-- Resources/Prototypes/Entities/Objects/Fun/dice_bag.yml | 2 +- .../Prototypes/Entities/Objects/Specific/chemistry.yml | 2 +- .../Entities/Objects/Weapons/Melee/mining.yml | 2 +- .../_NF/Entities/Objects/base_recyclable_items.yml | 10 ++++++++++ 6 files changed, 19 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Devices/base_handheld.yml b/Resources/Prototypes/Entities/Objects/Devices/base_handheld.yml index c377519ddb4..2a38d7ddbda 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/base_handheld.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/base_handheld.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: [BaseItem, PowerCellSlotSmallItem] + parent: [BaseItem, PowerCellSlotSmallItem, RecyclableItemDeviceSmall] # Frontier: added RecyclableItemDeviceSmall id: BaseHandheldComputer components: - type: ActivatableUIRequiresPowerCell diff --git a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/base.yml b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/base.yml index f7d9e0973a3..4a8be20fc81 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/base.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/base.yml @@ -1,5 +1,5 @@ - type: entity - parent: BaseItem + parent: [BaseItem, RecyclableItemCardboard] # Frontier: added RecyclableItemCardboard id: BaseBoardEntity # Board item name: board abstract: true @@ -16,7 +16,7 @@ - type: entity id: BaseTabletopPiece # Board piece - parent: BaseItem + parent: [BaseItem, RecyclableItemPlasticTiny] # Frontier: added RecyclableItemPlasticTiny abstract: true components: - type: TabletopDraggable @@ -39,3 +39,6 @@ - type: Sprite noRot: false drawdepth: FloorTiles + - type: PhysicalComposition # Frontier + materialComposition: # Frontier + Cardboard: 100 # Frontier diff --git a/Resources/Prototypes/Entities/Objects/Fun/dice_bag.yml b/Resources/Prototypes/Entities/Objects/Fun/dice_bag.yml index 1a579572d97..e4aafe5d1c2 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/dice_bag.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/dice_bag.yml @@ -1,5 +1,5 @@ - type: entity - parent: BaseStorageItem + parent: [BaseStorageItem, RecyclableItemClothSmall] # Frontier: added RecyclableItemClothSmall id: DiceBag name: bag of dice description: Contains all the luck you'll ever need. diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml index b051c298dfb..594986c72d4 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml @@ -269,7 +269,7 @@ - type: entity name: dropper - parent: BaseItem + parent: [BaseItem, RecyclableItemGlassTiny] # Frontier: added RecyclableItemGlassTiny description: Used to transfer small amounts of chemical solution between containers. id: Dropper components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml index 5c0011e1120..49602090556 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml @@ -1,6 +1,6 @@ - type: entity name: pickaxe - parent: BaseItem + parent: [BaseItem, RecyclableItemWoodMedium] # Frontier: added RecyclableItemWoodMedium id: Pickaxe description: Notched to perfection, for jamming it into rocks. components: diff --git a/Resources/Prototypes/_NF/Entities/Objects/base_recyclable_items.yml b/Resources/Prototypes/_NF/Entities/Objects/base_recyclable_items.yml index c821ed70394..6ed73a8a3c1 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/base_recyclable_items.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/base_recyclable_items.yml @@ -20,6 +20,16 @@ materialComposition: Paper: 50 +# Glass +## Tiny +- type: entity # Dropper etc + id: RecyclableItemGlassTiny + abstract: true + components: + - type: PhysicalComposition + materialComposition: + Glass: 10 + # Steel ## Tiny - type: entity # Flares idk From bb43e153e735dc872db42b366cbe37d623aaec2f Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Thu, 10 Oct 2024 21:51:30 +0300 Subject: [PATCH 12/76] monkey cubes, pills, lighters --- Resources/Prototypes/Entities/Objects/Specific/chemistry.yml | 2 +- .../Prototypes/Entities/Objects/Specific/rehydrateable.yml | 2 +- Resources/Prototypes/Entities/Objects/Tools/lighters.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml index 594986c72d4..dbf545b8862 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml @@ -462,7 +462,7 @@ - type: entity name: pill - parent: BaseItem + parent: [BaseItem, RecyclableItemOrganicTiny] # Frontier: added RecyclableItemOrganicTiny id: Pill description: It's not a suppository. components: diff --git a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml index cd37265646d..cd8d3f0638c 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml @@ -1,5 +1,5 @@ - type: entity - parent: BaseItem + parent: [BaseItem, RecyclableItemOrganicTiny] # Frontier: added RecyclableItemOrganicTiny id: MonkeyCube name: monkey cube description: Just add water! diff --git a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml index 6aab51b168e..54439374e6e 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml @@ -1,6 +1,6 @@ - type: entity name: basic lighter - parent: BaseItem + parent: [BaseItem, RecyclableItemDeviceTiny] # Frontier: added ligters id: Lighter description: "A simple plastic cigarette lighter." components: From aa69491b2fbae353b68057b5eeb3c0bdba0cad50 Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Thu, 10 Oct 2024 22:03:01 +0300 Subject: [PATCH 13/76] traffic key (take that STC) --- .../Prototypes/_NF/Entities/Objects/Devices/encryption_keys.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/encryption_keys.yml index 332c67e058d..50a797d7657 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/encryption_keys.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/encryption_keys.yml @@ -1,5 +1,5 @@ - type: entity - parent: EncryptionKey + parent: [EncryptionKey, RecyclableItemDeviceTiny] id: EncryptionKeyTraffic name: traffic control encryption key description: An encryption key for the space traffic control channel. From de87e0f6b8a0fd577eb3c2ec9924a939d5375458 Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Sat, 12 Oct 2024 22:05:22 +0300 Subject: [PATCH 14/76] biomass from plants --- .../Entities/Objects/Consumable/Food/produce.yml | 2 +- .../Entities/Objects/Specific/Hydroponics/leaves.yml | 8 ++++---- .../_NF/Entities/Objects/Specific/Hydroponics/leaves.yml | 2 +- .../_NF/Entities/Objects/base_recyclable_items.yml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index c2fc1b0eb11..c3d7b4596ec 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -2,7 +2,7 @@ # For produce that can't be immediately eaten - type: entity - parent: BaseItem + parent: [BaseItem, RecyclableItemOrganicTiny] # Frontier: added RecyclableItemOrganicTiny id: ProduceBase abstract: true components: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml index 06f29743059..837b27f9674 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml @@ -21,7 +21,7 @@ - type: entity name: dried cannabis leaves - parent: BaseItem + parent: [BaseItem, RecyclableItemOrganicTiny] # Frontier: added RecyclableItemOrganicTiny id: LeavesCannabisDried description: "Dried cannabis leaves, ready to be ground." components: @@ -40,7 +40,7 @@ - type: entity name: ground cannabis - parent: BaseItem + parent: [BaseItem, RecyclableItemOrganicTiny] # Frontier: added RecyclableItemOrganicTiny id: GroundCannabis description: "Ground cannabis, ready to take you on a trip." components: @@ -207,7 +207,7 @@ - type: entity name: dried tobacco leaves - parent: BaseItem + parent: [BaseItem, RecyclableItemOrganicTiny] # Frontier: added RecyclableItemOrganicTiny id: LeavesTobaccoDried description: "Dried tobacco leaves, ready to be ground." components: @@ -226,7 +226,7 @@ - type: entity name: ground tobacco - parent: BaseItem + parent: [BaseItem, RecyclableItemOrganicTiny] # Frontier: added RecyclableItemOrganicTiny id: GroundTobacco description: "Ground tobacco, perfect for hand-rolled cigarettes." components: diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Hydroponics/leaves.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Hydroponics/leaves.yml index 2632d4b6f3c..59a11fd9341 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Specific/Hydroponics/leaves.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/Hydroponics/leaves.yml @@ -25,7 +25,7 @@ # Shrooms - type: entity name: dried shrooms - parent: BaseItem + parent: [BaseItem, RecyclableItemOrganicTiny] id: ShroomsDried description: "Dried shrooms, ready to be ground." components: diff --git a/Resources/Prototypes/_NF/Entities/Objects/base_recyclable_items.yml b/Resources/Prototypes/_NF/Entities/Objects/base_recyclable_items.yml index 6ed73a8a3c1..f16e2e2c9e7 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/base_recyclable_items.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/base_recyclable_items.yml @@ -110,7 +110,7 @@ # Organic ## Tiny -- type: entity # Seeds, candles etc +- type: entity # Soap, candles, seeds etc id: RecyclableItemOrganicTiny abstract: true components: From 67f42ddd9959c14d76e3ca162e579550bae0a5cf Mon Sep 17 00:00:00 2001 From: Dvir Date: Sun, 13 Oct 2024 18:33:28 +0300 Subject: [PATCH 15/76] Update build-test-debug.yml --- .github/workflows/build-test-debug.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-test-debug.yml b/.github/workflows/build-test-debug.yml index 2cfe5094402..d066fac91e1 100644 --- a/.github/workflows/build-test-debug.yml +++ b/.github/workflows/build-test-debug.yml @@ -50,11 +50,11 @@ jobs: - name: Run Content.Tests run: dotnet test --no-build --configuration DebugOpt Content.Tests/Content.Tests.csproj -- NUnit.ConsoleOut=0 - # - name: Run Content.IntegrationTests - # shell: pwsh - # run: | - # $env:DOTNET_gcServer=1 - # dotnet test --no-build --configuration DebugOpt Content.IntegrationTests/Content.IntegrationTests.csproj -- NUnit.ConsoleOut=0 NUnit.MapWarningTo=Failed + - name: Run Content.IntegrationTests + shell: pwsh + run: | + $env:DOTNET_gcServer=1 + dotnet test --no-build --configuration DebugOpt Content.IntegrationTests/Content.IntegrationTests.csproj -- NUnit.ConsoleOut=0 NUnit.MapWarningTo=Failed ci-success: name: Build & Test Debug needs: From 70f326e4304c732a4a0db4bdd0f0693534cf305d Mon Sep 17 00:00:00 2001 From: Dvir Date: Sun, 13 Oct 2024 19:30:04 +0300 Subject: [PATCH 16/76] Update PostMapInitTest.cs --- .../Tests/PostMapInitTest.cs | 26 +++++-------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs index f1d42c11e9b..68489df772f 100644 --- a/Content.IntegrationTests/Tests/PostMapInitTest.cs +++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs @@ -38,31 +38,17 @@ public sealed class PostMapInitTest private static readonly string[] Grids = { - "/Maps/centcomm.yml", - "/Maps/Shuttles/cargo.yml", - "/Maps/Shuttles/emergency.yml", - "/Maps/Shuttles/infiltrator.yml", + // Admin + "/Maps/_NF/Shuttles/Admin/fishbowl.yml", + // Bus + "/Maps/_NF/Shuttles/Bus/publicts.yml", }; private static readonly string[] GameMaps = { - "Dev", + "NFDev", "TestTeg", - "Fland", - "Meta", - "Packed", - "Omega", - "Bagel", - "CentComm", - "Box", - "Core", - "Marathon", - "MeteorArena", - "Saltern", - "Reach", - "Train", - "Oasis", - "Cog" + "Frontier", }; /// From 4778d704d81d1be0d5d2e066e183540cfe3768f8 Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Sun, 13 Oct 2024 21:58:46 +0300 Subject: [PATCH 17/76] flatpacks --- .../Entities/Objects/Devices/flatpack.yml | 2 +- .../Entities/Objects/base_recyclable_items.yml | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml index 5fb81aa6d48..8a6424ffcc7 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml @@ -1,5 +1,5 @@ - type: entity - parent: BaseItem + parent: [BaseItem, RecyclableItemDeviceComplexNormal] # Frontier: added RecyclableItemDeviceComplexNormal id: BaseFlatpack name: base flatpack description: A flatpack used for constructing something. diff --git a/Resources/Prototypes/_NF/Entities/Objects/base_recyclable_items.yml b/Resources/Prototypes/_NF/Entities/Objects/base_recyclable_items.yml index f16e2e2c9e7..0876593a39f 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/base_recyclable_items.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/base_recyclable_items.yml @@ -86,7 +86,7 @@ materialComposition: Plastic: 50 -# Devices +# Simple Devices ## Tiny - type: entity # Machine parts, encryption keys etc id: RecyclableItemDeviceTiny @@ -108,6 +108,19 @@ Steel: 25 Glass: 25 +# Complex Devices +## Normal +- type: entity # Flatpacks etc + id: RecyclableItemDeviceComplexNormal + abstract: true + components: + - type: PhysicalComposition + materialComposition: + Steel: 100 + Glass: 50 + Silver: 20 + Gold: 10 + # Organic ## Tiny - type: entity # Soap, candles, seeds etc From 5cf1e7498b6a92a54807fb3ff8d4ab22932ddd80 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 14 Oct 2024 09:29:15 +0300 Subject: [PATCH 18/76] Update PostMapInitTest.cs --- Content.IntegrationTests/Tests/PostMapInitTest.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs index 68489df772f..bdfb6457287 100644 --- a/Content.IntegrationTests/Tests/PostMapInitTest.cs +++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs @@ -47,7 +47,6 @@ public sealed class PostMapInitTest private static readonly string[] GameMaps = { "NFDev", - "TestTeg", "Frontier", }; From 5ed792234c72ecba3f21f0f36e839c64e81886f0 Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Mon, 14 Oct 2024 20:40:56 +0300 Subject: [PATCH 19/76] cards, bullets, ame jar --- .../Entities/Objects/Power/antimatter_jar.yml | 3 +++ .../Guns/Ammunition/Cartridges/base_cartridge.yml | 2 ++ .../Guns/Ammunition/Cartridges/caseless_rifle.yml | 2 ++ .../Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml | 2 ++ .../Weapons/Guns/Ammunition/Cartridges/light_rifle.yml | 2 ++ .../Weapons/Guns/Ammunition/Cartridges/magnum.yml | 2 ++ .../Weapons/Guns/Ammunition/Cartridges/pistol.yml | 2 ++ .../Weapons/Guns/Ammunition/Cartridges/rifle.yml | 2 ++ .../Weapons/Guns/Ammunition/Cartridges/shotgun.yml | 2 ++ .../Weapons/Guns/Ammunition/Magazines/pistol.yml | 4 ++-- .../EstacaoPirata/Entities/Objects/Misc/cards.yml | 4 ++-- .../_NF/Entities/Objects/base_recyclable_items.yml | 10 ++++++++++ 12 files changed, 33 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Power/antimatter_jar.yml b/Resources/Prototypes/Entities/Objects/Power/antimatter_jar.yml index 2aa4d2e178a..8ae7d94055d 100644 --- a/Resources/Prototypes/Entities/Objects/Power/antimatter_jar.yml +++ b/Resources/Prototypes/Entities/Objects/Power/antimatter_jar.yml @@ -18,4 +18,7 @@ vendPrice: 4000 # Frontier: FuelVend price - type: GuideHelp guides: [ AME, Power ] + - type: Tag # Frontier + tags: # Frontier + - Recyclable # Frontier # End of modified code diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml index 98f8c6402d7..ee6b136a773 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml @@ -30,6 +30,8 @@ - type: Tag tags: - Cartridge + - Trash # Frontier + - Recyclable # Frontier - type: Item size: Tiny - type: SpaceGarbage diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml index 58d2c612aa0..b42f3bc7d35 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml @@ -8,6 +8,8 @@ tags: - Cartridge - CartridgeCaselessRifle + - Trash # Frontier + - Recyclable # Frontier - type: CartridgeAmmo deleteOnSpawn: true - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml index 8845dde74b5..a4c5c957065 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml @@ -8,6 +8,8 @@ tags: - Cartridge - CartridgeHeavyRifle + - Trash # Frontier + - Recyclable # Frontier - type: CartridgeAmmo proto: BulletHeavyRifle - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml index 697ee5e5031..b4ba23a41de 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml @@ -8,6 +8,8 @@ tags: - Cartridge - CartridgeLightRifle + - Trash # Frontier + - Recyclable # Frontier - type: CartridgeAmmo proto: BulletLightRifle - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml index 858de8ae2f0..4ddc170fb1f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml @@ -8,6 +8,8 @@ tags: - Cartridge - CartridgeMagnum + - Trash # Frontier + - Recyclable # Frontier - type: CartridgeAmmo proto: BulletMagnum - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml index 895b277901d..716fd11e1bc 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml @@ -8,6 +8,8 @@ tags: - Cartridge - CartridgePistol + - Trash # Frontier + - Recyclable # Frontier - type: CartridgeAmmo proto: BulletPistol - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml index b26b2c115e7..9698171fa4e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml @@ -8,6 +8,8 @@ tags: - Cartridge - CartridgeRifle + - Trash # Frontier + - Recyclable # Frontier - type: CartridgeAmmo proto: BulletRifle - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml index f658e7c18e6..be18d06d750 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml @@ -8,6 +8,8 @@ tags: - Cartridge - ShellShotgun + - Trash # Frontier + - Recyclable # Frontier - type: CartridgeAmmo soundEject: collection: ShellEject diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml index 81d056f7b2d..f53f81f6027 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml @@ -67,7 +67,7 @@ - type: entity id: BaseMagazinePistolSubMachineGun # Yeah it's weird but it's pistol caliber name: SMG magazine (.35 auto) - parent: [ BaseItem, BaseC1Contraband ] # Frontier: BaseRestrictedContraband Date: Mon, 14 Oct 2024 22:23:12 +0300 Subject: [PATCH 20/76] reclaimer magnet radius, revert bullets --- .../Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml | 2 -- .../Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml | 2 -- .../Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml | 2 -- .../Weapons/Guns/Ammunition/Cartridges/light_rifle.yml | 2 -- .../Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml | 2 -- .../Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml | 2 -- .../Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml | 2 -- .../Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml | 2 -- .../Prototypes/_NF/Entities/Objects/base_recyclable_items.yml | 1 + .../_NF/Entities/Structures/Machines/material_reclaimer.yml | 4 +++- 10 files changed, 4 insertions(+), 17 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml index ee6b136a773..98f8c6402d7 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml @@ -30,8 +30,6 @@ - type: Tag tags: - Cartridge - - Trash # Frontier - - Recyclable # Frontier - type: Item size: Tiny - type: SpaceGarbage diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml index b42f3bc7d35..58d2c612aa0 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml @@ -8,8 +8,6 @@ tags: - Cartridge - CartridgeCaselessRifle - - Trash # Frontier - - Recyclable # Frontier - type: CartridgeAmmo deleteOnSpawn: true - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml index a4c5c957065..8845dde74b5 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml @@ -8,8 +8,6 @@ tags: - Cartridge - CartridgeHeavyRifle - - Trash # Frontier - - Recyclable # Frontier - type: CartridgeAmmo proto: BulletHeavyRifle - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml index b4ba23a41de..697ee5e5031 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml @@ -8,8 +8,6 @@ tags: - Cartridge - CartridgeLightRifle - - Trash # Frontier - - Recyclable # Frontier - type: CartridgeAmmo proto: BulletLightRifle - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml index 4ddc170fb1f..858de8ae2f0 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml @@ -8,8 +8,6 @@ tags: - Cartridge - CartridgeMagnum - - Trash # Frontier - - Recyclable # Frontier - type: CartridgeAmmo proto: BulletMagnum - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml index 716fd11e1bc..895b277901d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml @@ -8,8 +8,6 @@ tags: - Cartridge - CartridgePistol - - Trash # Frontier - - Recyclable # Frontier - type: CartridgeAmmo proto: BulletPistol - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml index 9698171fa4e..b26b2c115e7 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml @@ -8,8 +8,6 @@ tags: - Cartridge - CartridgeRifle - - Trash # Frontier - - Recyclable # Frontier - type: CartridgeAmmo proto: BulletRifle - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml index be18d06d750..f658e7c18e6 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml @@ -8,8 +8,6 @@ tags: - Cartridge - ShellShotgun - - Trash # Frontier - - Recyclable # Frontier - type: CartridgeAmmo soundEject: collection: ShellEject diff --git a/Resources/Prototypes/_NF/Entities/Objects/base_recyclable_items.yml b/Resources/Prototypes/_NF/Entities/Objects/base_recyclable_items.yml index 243bed1ba8a..782f4933f26 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/base_recyclable_items.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/base_recyclable_items.yml @@ -7,6 +7,7 @@ id: RecyclableItemNoMats abstract: true components: + - type: PhysicalComposition - type: Tag tags: - Trash diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/material_reclaimer.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/material_reclaimer.yml index 01a7ee47ce3..c1b3651838b 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/material_reclaimer.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/material_reclaimer.yml @@ -67,9 +67,11 @@ - PhysicalComposition - SpaceGarbage - Log # Frontier + - Cartridge # PDA app cartriges tags: - Trash - Recyclable + - Cartridge # Bullets blacklist: components: - Material @@ -107,5 +109,5 @@ - type: ApcPowerReceiver # Frontier powerLoad: 500 # Allows us to not use the 1000 baseline - type: MaterialReclaimerMagnetPickup # Frontier - range: 0.30 + range: 0.50 # 0.3<0.50 magnetEnabled: true From 177d09bd287e9d9254447b72633055278cdc9093 Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Mon, 14 Oct 2024 22:29:39 +0300 Subject: [PATCH 21/76] more tags for recycler --- .../_NF/Entities/Structures/Machines/material_reclaimer.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/material_reclaimer.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/material_reclaimer.yml index c1b3651838b..61552b03433 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/material_reclaimer.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/material_reclaimer.yml @@ -72,6 +72,9 @@ - Trash - Recyclable - Cartridge # Bullets + - Book + - Pen + - Handcuffs blacklist: components: - Material From 08ed4c112931686a19670f9ac7dc2b507392ec02 Mon Sep 17 00:00:00 2001 From: Dvir Date: Tue, 15 Oct 2024 00:48:23 +0300 Subject: [PATCH 22/76] Update AutoInternalsTests.cs --- .../Tests/Internals/AutoInternalsTests.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Content.IntegrationTests/Tests/Internals/AutoInternalsTests.cs b/Content.IntegrationTests/Tests/Internals/AutoInternalsTests.cs index 4455af19eee..a61cf1a0465 100644 --- a/Content.IntegrationTests/Tests/Internals/AutoInternalsTests.cs +++ b/Content.IntegrationTests/Tests/Internals/AutoInternalsTests.cs @@ -10,7 +10,7 @@ namespace Content.IntegrationTests.Tests.Internals; [TestOf(typeof(InternalsSystem))] public sealed class AutoInternalsTests { - [Test] + [Ignore("Not relevant for Frontier")] // Frontier public async Task TestInternalsAutoActivateInSpaceForStationSpawn() { await using var pair = await PoolManager.GetServerClient(); @@ -39,7 +39,7 @@ await server.WaitAssertion(() => await pair.CleanReturnAsync(); } - [Test] + [Ignore("Not relevant for Frontier")] // Frontier public async Task TestInternalsAutoActivateInSpaceForEntitySpawn() { await using var pair = await PoolManager.GetServerClient(); @@ -73,7 +73,6 @@ await server.WaitAssertion(() => equipment: mask: ClothingMaskBreath suitstorage: OxygenTankFilled - outerClothing: ClothingOuterVestTank # Frontier - type: job id: TestInternalsDummy From 0bd3349519736f79a4d7711f66dc14a8b2fb88bd Mon Sep 17 00:00:00 2001 From: Dvir Date: Tue, 15 Oct 2024 00:57:14 +0300 Subject: [PATCH 23/76] My pain is real --- Resources/Maps/_NF/POI/nfsd.yml | 2 +- Resources/Maps/_NF/Test/dev_map.yml | 2 +- Resources/Prototypes/_NF/Entities/Markers/Spawners/jobs.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Maps/_NF/POI/nfsd.yml b/Resources/Maps/_NF/POI/nfsd.yml index 7abfe836af6..7165780941c 100644 --- a/Resources/Maps/_NF/POI/nfsd.yml +++ b/Resources/Maps/_NF/POI/nfsd.yml @@ -14857,7 +14857,7 @@ entities: - type: Transform pos: -0.5,-3.5 parent: 1 -- proto: SpawnPointSeniorOfficer +- proto: NFSpawnPointSeniorOfficer entities: - uid: 2700 components: diff --git a/Resources/Maps/_NF/Test/dev_map.yml b/Resources/Maps/_NF/Test/dev_map.yml index 35f43e5070e..466dd4fbb61 100644 --- a/Resources/Maps/_NF/Test/dev_map.yml +++ b/Resources/Maps/_NF/Test/dev_map.yml @@ -6934,7 +6934,7 @@ entities: - type: Transform pos: -3.5,2.5 parent: 179 -- proto: SpawnPointSeniorOfficer +- proto: NFSpawnPointSeniorOfficer entities: - uid: 382 components: diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/jobs.yml index dce9dcb8850..1e5040bc507 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/jobs.yml @@ -129,7 +129,7 @@ job_id: Bailiff - type: entity - id: SpawnPointSeniorOfficer + id: NFSpawnPointSeniorOfficer parent: SpawnPointWarden name: sergeant components: From 94cff2cfcec1c13aae48ef0951fa58dc48724a49 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Mon, 14 Oct 2024 19:16:17 -0400 Subject: [PATCH 24/76] Workflow fixes, WIP --- .../Structures/Wallmounts/intercom.yml | 2 + .../Entities/Objects/Misc/cards.yml | 1 + .../Entities/Structures/Machines/lathe.yml | 16 ++++++++ .../Catalog/Fills/Lockers/wardrobe_job.yml | 13 ++++++- .../OuterClothing/goblin_outerclothing.yml | 9 ++++- .../Objects/Consumable/Drinks/drinks_keg.yml | 5 +++ .../Objects/Consumable/Food/ingredients.yml | 1 + .../Objects/Consumable/Food/meals.yml | 2 + .../Entities/Objects/Misc/mortuary_urn.yml | 11 +++++- .../Machines/Computers/computers.yml | 1 + .../Entities/Structures/Machines/lathe.yml | 14 +++++++ .../Machines/microwave_recipe_assemblers.yml | 39 ++++++++++++++++++- .../Shuttles/thrusters_security.yml | 1 + .../Storage/Closets/wall_lockers.yml | 10 +++++ .../_NF/Entities/Structures/atm.yml | 8 +++- 15 files changed, 128 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml index e6a00aaa74e..b8f0e3b3ea2 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml @@ -204,6 +204,8 @@ map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: WiresPanel open: false + - type: Physics # Frontier + canCollide: false # Frontier - type: entity id: BaseIntercomSecure diff --git a/Resources/Prototypes/EstacaoPirata/Entities/Objects/Misc/cards.yml b/Resources/Prototypes/EstacaoPirata/Entities/Objects/Misc/cards.yml index b90217a7053..04790cd914b 100644 --- a/Resources/Prototypes/EstacaoPirata/Entities/Objects/Misc/cards.yml +++ b/Resources/Prototypes/EstacaoPirata/Entities/Objects/Misc/cards.yml @@ -158,6 +158,7 @@ - CardScJokerBlack - type: StaticPrice # Frontier price: 0.01 # Frontier + - type: ContainerContainer # Frontier - type: entity parent: BaseItem diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml index aa924743276..6f4f4d77423 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml @@ -107,6 +107,22 @@ - Sheet - RawMaterial - Ingot + # Frontier + - type: ContainerContainer + containers: + machine_board: !type:Container + showEnts: False + occludes: True + ents: [] + machine_parts: !type:Container + showEnts: False + occludes: True + ents: [] + blueprint: !type:Container + showEnts: False + occludes: True + ents: [] + # End Frontier - type: entity parent: [ BaseLatheLube, BlueprintReceiverBase ] # Frontier: Protolathe Date: Mon, 14 Oct 2024 19:34:13 -0400 Subject: [PATCH 25/76] SectorServices: spawn in nullspace --- .../_NF/SectorServices/SectorServiceSystem.cs | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/Content.Server/_NF/SectorServices/SectorServiceSystem.cs b/Content.Server/_NF/SectorServices/SectorServiceSystem.cs index 8f1df78d0c8..147170ba60f 100644 --- a/Content.Server/_NF/SectorServices/SectorServiceSystem.cs +++ b/Content.Server/_NF/SectorServices/SectorServiceSystem.cs @@ -1,5 +1,7 @@ +using Content.Server.GameTicking; using Content.Shared._NF.SectorServices.Prototypes; using JetBrains.Annotations; +using Robust.Shared.Map.Components; using Robust.Shared.Prototypes; @@ -12,8 +14,9 @@ namespace Content.Server._NF.SectorServices; [PublicAPI] public sealed class SectorServiceSystem : EntitySystem { - [Robust.Shared.IoC.Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Robust.Shared.IoC.Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private readonly GameTicker _gameTicker = default!; [ViewVariables(VVAccess.ReadOnly)] private EntityUid _entity = EntityUid.Invalid; // The station entity that's storing our services. @@ -22,16 +25,18 @@ public override void Initialize() { base.Initialize(); - SubscribeLocalEvent(OnComponentStartup); - SubscribeLocalEvent(OnComponentShutdown); + //SubscribeLocalEvent(OnComponentStartup); + //SubscribeLocalEvent(OnComponentShutdown); + SubscribeLocalEvent(OnMapInit); + SubscribeLocalEvent(OnMapRemove); } - private void OnComponentStartup(EntityUid uid, StationSectorServiceHostComponent component, ComponentStartup args) + private void OnMapInit(EntityUid uid, MapComponent map, ComponentInit args) { - Log.Debug($"OnComponentStartup! Entity: {uid} internal: {_entity}"); - if (_entity == EntityUid.Invalid) + Log.Debug($"OnMapInit! Entity: {uid} internal: {_entity}"); + if (map.MapId == _gameTicker.DefaultMap) { - _entity = uid; + _entity = Spawn(); foreach (var servicePrototype in _prototypeManager.EnumeratePrototypes()) { @@ -41,16 +46,12 @@ private void OnComponentStartup(EntityUid uid, StationSectorServiceHostComponent } } - private void OnComponentShutdown(EntityUid uid, StationSectorServiceHostComponent component, ComponentShutdown args) + private void OnMapRemove(EntityUid uid, MapComponent map, ComponentRemove args) { - Log.Debug($"OnComponentShutdown! Entity: {_entity}"); - if (_entity != EntityUid.Invalid) + Log.Debug($"OnMapRemove! Entity: {_entity}"); + if (map.MapId == _gameTicker.DefaultMap) { - foreach (var servicePrototype in _prototypeManager.EnumeratePrototypes()) - { - Log.Debug($"Removing component for service {servicePrototype.ID}"); - _entityManager.RemoveComponents(_entity, servicePrototype.Components); - } + Del(_entity); _entity = EntityUid.Invalid; } } From cfbb5a235a49376d1b69b946d209ebb2cdac6551 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Mon, 14 Oct 2024 19:45:38 -0400 Subject: [PATCH 26/76] Check invalid entity --- .../_NF/SectorServices/SectorServiceSystem.cs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Content.Server/_NF/SectorServices/SectorServiceSystem.cs b/Content.Server/_NF/SectorServices/SectorServiceSystem.cs index 147170ba60f..891b20c6111 100644 --- a/Content.Server/_NF/SectorServices/SectorServiceSystem.cs +++ b/Content.Server/_NF/SectorServices/SectorServiceSystem.cs @@ -25,10 +25,10 @@ public override void Initialize() { base.Initialize(); - //SubscribeLocalEvent(OnComponentStartup); - //SubscribeLocalEvent(OnComponentShutdown); - SubscribeLocalEvent(OnMapInit); - SubscribeLocalEvent(OnMapRemove); + SubscribeLocalEvent(OnComponentStartup); + SubscribeLocalEvent(OnComponentShutdown); + //SubscribeLocalEvent(OnMapInit); + //SubscribeLocalEvent(OnMapRemove); } private void OnMapInit(EntityUid uid, MapComponent map, ComponentInit args) @@ -36,7 +36,10 @@ private void OnMapInit(EntityUid uid, MapComponent map, ComponentInit args) Log.Debug($"OnMapInit! Entity: {uid} internal: {_entity}"); if (map.MapId == _gameTicker.DefaultMap) { - _entity = Spawn(); + if (_entity != EntityUid.Invalid) + return; + + Spawn(); foreach (var servicePrototype in _prototypeManager.EnumeratePrototypes()) { From 15a55766b0fb5d6b01240a0c1c7dff45a4486676 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Mon, 14 Oct 2024 19:50:52 -0400 Subject: [PATCH 27/76] SectorService: init/remove --- .../_NF/SectorServices/SectorServiceSystem.cs | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/Content.Server/_NF/SectorServices/SectorServiceSystem.cs b/Content.Server/_NF/SectorServices/SectorServiceSystem.cs index 891b20c6111..fd2fc8665ac 100644 --- a/Content.Server/_NF/SectorServices/SectorServiceSystem.cs +++ b/Content.Server/_NF/SectorServices/SectorServiceSystem.cs @@ -25,34 +25,32 @@ public override void Initialize() { base.Initialize(); - SubscribeLocalEvent(OnComponentStartup); - SubscribeLocalEvent(OnComponentShutdown); + SubscribeLocalEvent(OnMapInit); + SubscribeLocalEvent(OnMapRemove); //SubscribeLocalEvent(OnMapInit); //SubscribeLocalEvent(OnMapRemove); } - private void OnMapInit(EntityUid uid, MapComponent map, ComponentInit args) + private void OnMapInit(EntityUid uid, StationSectorServiceHostComponent map, ComponentInit args) { Log.Debug($"OnMapInit! Entity: {uid} internal: {_entity}"); - if (map.MapId == _gameTicker.DefaultMap) - { - if (_entity != EntityUid.Invalid) - return; - Spawn(); + if (_entity != EntityUid.Invalid) + return; + + Spawn(); - foreach (var servicePrototype in _prototypeManager.EnumeratePrototypes()) - { - Log.Debug($"Adding components for service {servicePrototype.ID}"); - _entityManager.AddComponents(_entity, servicePrototype.Components, false); // removeExisting false - do not override existing components. - } + foreach (var servicePrototype in _prototypeManager.EnumeratePrototypes()) + { + Log.Debug($"Adding components for service {servicePrototype.ID}"); + _entityManager.AddComponents(_entity, servicePrototype.Components, false); // removeExisting false - do not override existing components. } } - private void OnMapRemove(EntityUid uid, MapComponent map, ComponentRemove args) + private void OnMapRemove(EntityUid uid, StationSectorServiceHostComponent map, ComponentRemove args) { Log.Debug($"OnMapRemove! Entity: {_entity}"); - if (map.MapId == _gameTicker.DefaultMap) + if (_entity != EntityUid.Invalid) { Del(_entity); _entity = EntityUid.Invalid; From 0e2968a46931ef05d4c572b9db5dc3a40350bb31 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Mon, 14 Oct 2024 19:59:33 -0400 Subject: [PATCH 28/76] wendigo entity fixes --- Resources/Maps/_NF/Shuttles/Nfsd/wendigo.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/wendigo.yml b/Resources/Maps/_NF/Shuttles/Nfsd/wendigo.yml index 17437bf125b..37e8521e108 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/wendigo.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/wendigo.yml @@ -2012,9 +2012,6 @@ entities: rot: 3.141592653589793 rad pos: 0.5,-2.5 parent: 1 - - type: DeviceNetwork - configurators: - - invalid - type: AtmosPipeColor color: '#AA0000FF' - uid: 327 From 5de8231d2f70d3591cb02144da55e81b64d29be7 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Mon, 14 Oct 2024 20:11:04 -0400 Subject: [PATCH 29/76] camper price fix, DeadDrop compromise --- Content.Server/_NF/Smuggling/DeadDropSystem.cs | 17 +++++++++++++---- Resources/Prototypes/_NF/Shipyard/camper.yml | 2 +- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Content.Server/_NF/Smuggling/DeadDropSystem.cs b/Content.Server/_NF/Smuggling/DeadDropSystem.cs index 6a05747fec8..4301ad35f04 100644 --- a/Content.Server/_NF/Smuggling/DeadDropSystem.cs +++ b/Content.Server/_NF/Smuggling/DeadDropSystem.cs @@ -195,12 +195,21 @@ private void OnStationShutdown(EntityUid stationUid, StationDeadDropComponent co public void CompromiseDeadDrop(EntityUid uid, DeadDropComponent _) { - //Get our station: FIXME - check lifecycle on entities before adding another drop. + // Remove the dead drop. + RemComp(uid); + + // Get our station: FIXME - check lifecycle on entities before adding another drop. var station = _station.GetOwningStation(uid); - //Remove the dead drop. - RemComp(uid); - //Find a new potential dead drop to spawn. + // If station is terminating, or if we aren't on one, nothing to do here. + if (station == null || + !station.Value.Valid || + MetaData(station.Value).EntityLifeStage >= EntityLifeStage.Terminating) + { + return; + } + + // Find a new potential dead drop to spawn. var deadDropQuery = EntityManager.EntityQueryEnumerator(); List<(EntityUid ent, PotentialDeadDropComponent comp)> potentialDeadDrops = new(); while (deadDropQuery.MoveNext(out var ent, out var potentialDeadDrop)) diff --git a/Resources/Prototypes/_NF/Shipyard/camper.yml b/Resources/Prototypes/_NF/Shipyard/camper.yml index 8c3d45770c1..14c16bd66ca 100644 --- a/Resources/Prototypes/_NF/Shipyard/camper.yml +++ b/Resources/Prototypes/_NF/Shipyard/camper.yml @@ -12,7 +12,7 @@ id: Camper name: SSS Camper description: A personal camper shuttle for those who prefer to live in emptiness of space. - price: 12000 + price: 17000 # Appraises at 15770, 10% markup to get tests passing - TODO: fix this category: Small group: Shipyard shuttlePath: /Maps/_NF/Shuttles/camper.yml From c7b7bc68164f2e4fcf0a965e430fb8e96364378b Mon Sep 17 00:00:00 2001 From: Whatstone Date: Tue, 15 Oct 2024 18:58:26 -0400 Subject: [PATCH 30/76] Exclude shipyard tests from build-test-debug job --- .github/workflows/build-test-debug.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test-debug.yml b/.github/workflows/build-test-debug.yml index d066fac91e1..03332736ead 100644 --- a/.github/workflows/build-test-debug.yml +++ b/.github/workflows/build-test-debug.yml @@ -54,7 +54,7 @@ jobs: shell: pwsh run: | $env:DOTNET_gcServer=1 - dotnet test --no-build --configuration DebugOpt Content.IntegrationTests/Content.IntegrationTests.csproj -- NUnit.ConsoleOut=0 NUnit.MapWarningTo=Failed + dotnet test --no-build --configuration DebugOpt Content.IntegrationTests/Content.IntegrationTests.csproj --filter FullyQualifiedName!~ShipyardTest -- NUnit.ConsoleOut=0 NUnit.MapWarningTo=Failed ci-success: name: Build & Test Debug needs: From 4ba46961ab40918dd28bbf6fac6fb414b3fda938 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Tue, 15 Oct 2024 19:43:57 -0400 Subject: [PATCH 31/76] Only use Frontier game maps --- .../Tests/Station/StationJobsTest.cs | 10 +++++++++- .../Tests/_NF/FrontierConstants.cs | 10 ++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 Content.IntegrationTests/Tests/_NF/FrontierConstants.cs diff --git a/Content.IntegrationTests/Tests/Station/StationJobsTest.cs b/Content.IntegrationTests/Tests/Station/StationJobsTest.cs index d68fdafb769..e57b35c2297 100644 --- a/Content.IntegrationTests/Tests/Station/StationJobsTest.cs +++ b/Content.IntegrationTests/Tests/Station/StationJobsTest.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.Linq; +using Content.IntegrationTests.Tests._NF; using Content.Server.Maps; using Content.Server.Station.Components; using Content.Server.Station.Systems; @@ -227,8 +228,15 @@ await server.WaitAssertion(() => Assert.Multiple(() => { - foreach (var gameMap in prototypeManager.EnumeratePrototypes()) + foreach (var mapProto in FrontierConstants.GameMapPrototypes) // Frontier: EnumeratePrototypes < FrontierConstants.GameMapPrototypes { + // Frontier: get prototype from proto ID + if (!prototypeManager.TryIndex(mapProto, out var gameMap)) + { + Assert.Fail($"Could not find GameMapPrototype with ID {mapProto}! Is FrontierConstants up to date?"); + } + // End Frontier + foreach (var (stationId, station) in gameMap.Stations) { if (!station.StationComponentOverrides.TryGetComponent(name, out var comp)) diff --git a/Content.IntegrationTests/Tests/_NF/FrontierConstants.cs b/Content.IntegrationTests/Tests/_NF/FrontierConstants.cs new file mode 100644 index 00000000000..9f8cf97fd87 --- /dev/null +++ b/Content.IntegrationTests/Tests/_NF/FrontierConstants.cs @@ -0,0 +1,10 @@ +namespace Content.IntegrationTests.Tests._NF; + +public sealed class FrontierConstants +{ + public static readonly string[] GameMapPrototypes = + { + "Frontier", + "NFDev" + }; +} \ No newline at end of file From 2cfca6bcad61684c7b9d6ff05f25e8a63661df46 Mon Sep 17 00:00:00 2001 From: Dvir Date: Wed, 16 Oct 2024 18:29:04 +0300 Subject: [PATCH 32/76] Update CargoTest.cs --- Content.IntegrationTests/Tests/CargoTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.IntegrationTests/Tests/CargoTest.cs b/Content.IntegrationTests/Tests/CargoTest.cs index 70ea3b2fbb2..e111b79b96a 100644 --- a/Content.IntegrationTests/Tests/CargoTest.cs +++ b/Content.IntegrationTests/Tests/CargoTest.cs @@ -5,7 +5,7 @@ using Content.Server.Cargo.Systems; using Content.Server.Nutrition.Components; using Content.Server.Nutrition.EntitySystems; -using Content.Shared.Cargo.Components; +using Content.Shared.Cargo.Components; // Frontier using Content.Shared.Cargo.Prototypes; using Content.Shared.IdentityManagement; using Content.Shared.Stacks; From 547e196571d41710ebb6d4f8e05f08f9b84232cf Mon Sep 17 00:00:00 2001 From: Whatstone Date: Wed, 16 Oct 2024 11:42:25 -0400 Subject: [PATCH 33/76] Log for tests --- Content.IntegrationTests/Tests/EntityTest.cs | 1 + Content.Shared/Cargo/Components/StackPriceComponent.cs | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Content.IntegrationTests/Tests/EntityTest.cs b/Content.IntegrationTests/Tests/EntityTest.cs index 7a57cb6b292..d0c4f67398b 100644 --- a/Content.IntegrationTests/Tests/EntityTest.cs +++ b/Content.IntegrationTests/Tests/EntityTest.cs @@ -104,6 +104,7 @@ await server.WaitPost(() => .ToList(); foreach (var protoId in protoIds) { + Logger.Info($"Spawning proto {protoId}"); entityMan.SpawnEntity(protoId, map.GridCoords); } }); diff --git a/Content.Shared/Cargo/Components/StackPriceComponent.cs b/Content.Shared/Cargo/Components/StackPriceComponent.cs index 4f36bafdf8c..a0af3c6d31b 100644 --- a/Content.Shared/Cargo/Components/StackPriceComponent.cs +++ b/Content.Shared/Cargo/Components/StackPriceComponent.cs @@ -11,8 +11,9 @@ public sealed partial class StackPriceComponent : Component /// [DataField("price", required: true)] public double Price; + /// - /// The price a full stack of this object sells for from a vendor. + /// Frontier: The price a full stack of this object sells for from a vendor. /// [DataField] public double VendPrice; From 9b1e0175181d7c7f8d6b7844d4fbb2bfbfe7d051 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Wed, 16 Oct 2024 15:30:03 -0400 Subject: [PATCH 34/76] EntityTest fixes, SectorService cleanup, welders --- Content.IntegrationTests/Tests/EntityTest.cs | 29 +++++++++++++++++-- .../_NF/SectorServices/SectorServiceSystem.cs | 11 +++++-- .../_NF/Entities/Objects/Tools/welders.yml | 16 +++------- .../Structures/Machines/crate_machine.yml | 6 +++- 4 files changed, 43 insertions(+), 19 deletions(-) diff --git a/Content.IntegrationTests/Tests/EntityTest.cs b/Content.IntegrationTests/Tests/EntityTest.cs index d0c4f67398b..051da50c95b 100644 --- a/Content.IntegrationTests/Tests/EntityTest.cs +++ b/Content.IntegrationTests/Tests/EntityTest.cs @@ -102,11 +102,21 @@ await server.WaitPost(() => .Where(p => !p.Components.ContainsKey("MapGrid")) // This will smash stuff otherwise. .Select(p => p.ID) .ToList(); + bool anyException = false; foreach (var protoId in protoIds) { Logger.Info($"Spawning proto {protoId}"); - entityMan.SpawnEntity(protoId, map.GridCoords); + try + { + entityMan.SpawnEntity(protoId, map.GridCoords); + } + catch (Exception e) + { + Logger.Info($"Exception while spawning proto {protoId}: \"{e.Message}\" {e.StackTrace}"); + anyException = true; + } } + Assert.That(anyException, Is.EqualTo(false), "One or more exceptions occurred during entity spawn."); }); await server.WaitRunTicks(15); await server.WaitPost(() => @@ -121,13 +131,26 @@ await server.WaitPost(() => } } + bool anyException = false; var entityMetas = Query(entityMan).ToList(); foreach (var (uid, meta) in entityMetas) { - if (!meta.EntityDeleted) - entityMan.DeleteEntity(uid); + Logger.Info($"Deleting entity {meta.EntityPrototype?.ID ?? "null"} ({uid})"); + try + { + if (!meta.EntityDeleted) + entityMan.DeleteEntity(uid); + } + catch (Exception e) + { + Logger.Info($"Exception while deleting entity {meta.EntityPrototype?.ID ?? "null"} ({uid}): \"{e.Message}\" {e.StackTrace}"); + anyException = true; + } } + Assert.That(anyException, Is.EqualTo(false), "One or more exceptions occurred during entity deletion."); + + Assert.That(entityMan.EntityCount, Is.Zero); }); diff --git a/Content.Server/_NF/SectorServices/SectorServiceSystem.cs b/Content.Server/_NF/SectorServices/SectorServiceSystem.cs index fd2fc8665ac..245c7461bb7 100644 --- a/Content.Server/_NF/SectorServices/SectorServiceSystem.cs +++ b/Content.Server/_NF/SectorServices/SectorServiceSystem.cs @@ -33,12 +33,17 @@ public override void Initialize() private void OnMapInit(EntityUid uid, StationSectorServiceHostComponent map, ComponentInit args) { - Log.Debug($"OnMapInit! Entity: {uid} internal: {_entity}"); + Log.Debug($"OnMapInit! Entity: {uid.Id} internal: {_entity.Id}"); if (_entity != EntityUid.Invalid) return; - Spawn(); + _entity = Spawn(); + if (!_entity.Valid) + { + Log.Error($"OnMapInit! Invalid host returned for Spawn."); + return; + } foreach (var servicePrototype in _prototypeManager.EnumeratePrototypes()) { @@ -49,7 +54,7 @@ private void OnMapInit(EntityUid uid, StationSectorServiceHostComponent map, Com private void OnMapRemove(EntityUid uid, StationSectorServiceHostComponent map, ComponentRemove args) { - Log.Debug($"OnMapRemove! Entity: {_entity}"); + Log.Debug($"OnMapRemove! Entity: {_entity.Id}"); if (_entity != EntityUid.Invalid) { Del(_entity); diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/welders.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/welders.yml index 4649781f006..8f858a1371b 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Tools/welders.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/welders.yml @@ -6,9 +6,7 @@ - type: SolutionContainerManager solutions: Welder: - reagents: - - ReagentId: WeldingFuel - Quantity: 0 + reagents: [] maxVol: 100 - type: entity @@ -19,9 +17,7 @@ - type: SolutionContainerManager solutions: Welder: - reagents: - - ReagentId: WeldingFuel - Quantity: 0 + reagents: [] maxVol: 250 - type: entity @@ -32,9 +28,7 @@ - type: SolutionContainerManager solutions: Welder: - reagents: - - ReagentId: WeldingFuel - Quantity: 0 + reagents: [] maxVol: 250 - type: entity @@ -45,7 +39,5 @@ - type: SolutionContainerManager solutions: Welder: - reagents: - - ReagentId: WeldingFuel - Quantity: 0 + reagents: [] maxVol: 1000 diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/crate_machine.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/crate_machine.yml index 67b0cd910bd..09ab2851862 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/crate_machine.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/crate_machine.yml @@ -7,8 +7,12 @@ components: - type: ItemPlacer whitelist: + # Should match crates. + requireAll: true components: - - CrateGenericSteel + - EntityStorage + - PaperLabel + - ContainerContainer - type: CrateMachine - type: Sprite sprite: _NF/Structures/Machines/crate_machine.rsi From 8ec6c6905a0fec9a59d1e9fdd1ea7ec9df4c19b4 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Wed, 16 Oct 2024 16:21:31 -0400 Subject: [PATCH 35/76] component init, salvage mob restrictions checks --- .../Salvage/SalvageMobRestrictionsSystem.cs | 4 +++ .../Entities/Structures/Machines/lathe.yml | 2 +- .../Entities/Objects/Misc/cards.yml | 28 +++++++++++++------ .../Entities/Structures/Machines/lathe.yml | 22 ++------------- .../Machines/Computers/computers.yml | 2 ++ .../Entities/Structures/Machines/lathe.yml | 6 ++-- .../Shuttles/thrusters_security.yml | 7 +++++ .../Storage/Closets/wall_lockers.yml | 7 +++-- .../_NF/Entities/Structures/atm.yml | 14 +++------- 9 files changed, 49 insertions(+), 43 deletions(-) diff --git a/Content.Server/_NF/Salvage/SalvageMobRestrictionsSystem.cs b/Content.Server/_NF/Salvage/SalvageMobRestrictionsSystem.cs index c4b3e5c7c71..be6efb31c9b 100644 --- a/Content.Server/_NF/Salvage/SalvageMobRestrictionsSystem.cs +++ b/Content.Server/_NF/Salvage/SalvageMobRestrictionsSystem.cs @@ -50,6 +50,10 @@ private void OnRemoveGrid(EntityUid uid, SalvageMobRestrictionsGridComponent com { foreach (EntityUid target in component.MobsToKill) { + // Don't destroy yourself, don't destroy things being destroyed. + if (uid == target || MetaData(target).EntityLifeStage >= EntityLifeStage.Terminating) + continue; + if (TryComp(target, out BodyComponent? body)) { // Creates a pool of blood on death, but remove the organs. diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index fa2023956fa..5d6863377a1 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -977,7 +977,7 @@ - type: entity id: MedicalTechFab - parent: [ BaseLatheLube, BlueprintReceiverBase ] # Frontier: added BlueprintReceiverBase + parent: [ BlueprintReceiverBase, BaseLatheLube ] # Frontier: added BlueprintReceiverBase name: medical techfab description: Prints equipment for use by the medbay. components: diff --git a/Resources/Prototypes/EstacaoPirata/Entities/Objects/Misc/cards.yml b/Resources/Prototypes/EstacaoPirata/Entities/Objects/Misc/cards.yml index 04790cd914b..5d5360329b8 100644 --- a/Resources/Prototypes/EstacaoPirata/Entities/Objects/Misc/cards.yml +++ b/Resources/Prototypes/EstacaoPirata/Entities/Objects/Misc/cards.yml @@ -31,16 +31,28 @@ - type: StaticPrice # Frontier price: 200 # Frontier +# Frontier: - type: entity parent: BaseItem + id: CardStackBase + name: stack of cards + abstract: true + components: + - type: Item + size: Small + - type: CardStack + - type: ContainerContainer # Frontier + containers: # Frontier + cardstack-container: !type:Container # Frontier +# End Frontier + +- type: entity + parent: CardStackBase # Frontier: BaseItem Date: Thu, 17 Oct 2024 11:57:11 -0400 Subject: [PATCH 36/76] Ammolathe Blueprints (for real), Hide Secfab (#2268) * Add ammolathe blueprints * hide secfab machine board --- .../Objects/Devices/Circuitboards/Machine/production.yml | 1 + Resources/Prototypes/Entities/Structures/Machines/lathe.yml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml index 03bad453f36..6a6f1eb08b4 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml @@ -80,6 +80,7 @@ id: SecurityTechFabCircuitboard parent: BaseMachineCircuitboard name: security techfab machine board + categories: [ HideSpawnMenu ] # Frontier description: A machine printed circuit board for a security techfab. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 5d6863377a1..a7158b0915b 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -788,6 +788,7 @@ id: SecurityTechFab parent: BaseLatheLube name: security techfab + categories: [ HideSpawnMenu ] # Frontier description: Prints equipment for use by security crew. components: - type: Sprite @@ -924,7 +925,7 @@ - type: entity id: AmmoTechFab - parent: BaseLatheLube + parent: [BlueprintReceiverBase, BaseLatheLube] # Frontier: added BlueprintReceiverBase name: ammo techfab description: Prints the bare minimum of bullets that any budget military or armory could need. Nothing fancy. components: From 3bbb3c75e26d43cc58fb7b50dea7bc9421149106 Mon Sep 17 00:00:00 2001 From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Date: Thu, 17 Oct 2024 20:03:16 +0300 Subject: [PATCH 37/76] Goblinbane Nerf (#2265) * Nerf * soap * corporeal mop, lover health across the board * nerf ghost health, edits to ghost role rules --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- .../_NF/ghost/roles/ghost-role-component.ftl | 2 +- .../Mobs/NPCs/mob_meme_goblinbane.yml | 8 ++++---- .../Mobs/NPCs/mob_meme_goblinbane_minions.yml | 20 +++++++++---------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl index 3e3aaf75ba4..bcc0ae9f745 100644 --- a/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl +++ b/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl @@ -60,7 +60,7 @@ ghost-role-information-goblinbane-name = The Goblinbane ghost-role-information-goblinbane-ghost-name = The Ghost of Goblinbane ghost-role-information-goblinbane-description = Hunt down those pesky-little-dirty-smelly goblins. And felinids. And also chaplains. ghost-role-information-goblinbane-rules = You are a [color=red][bold]Solo Antagonist[/bold][/color] capable of summoning minions. [color=yellow]Do note[/color], your minions will be hostile to everyone, except you. - Search and destroy goblins/felinids/chaplains. + Search and destroy goblins/felinids/chaplains. [color=yellow]Consider[/color] ignoring players dressed as janitors regardless of their species. Please note that [color=yellow]all server rules still apply.[/color]. Additionally: - [color=yellow]Reminder[/color] that Frontier Outpost (the station and 200m area around it) is a safe zone. - [color=red]DO NOT[/color] attack players on the Outpost. diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_meme_goblinbane.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_meme_goblinbane.yml index 044a1267788..86c0a210f0d 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_meme_goblinbane.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_meme_goblinbane.yml @@ -100,12 +100,12 @@ path: /Audio/Effects/bite.ogg damage: types: - Slash: 12 + Blunt: 4 Structural: 20 animation: WeaponArcBite - type: MeleeChemicalInjector solution: bloodstream - transferAmount: 4 + transferAmount: 0.5 - type: PointLight radius: 1.4 energy: 1.2 @@ -224,7 +224,7 @@ - type: MobThresholds thresholds: 0: Alive - 200: Dead + 140: Dead - type: Destructible thresholds: - trigger: @@ -259,7 +259,7 @@ path: /Audio/_NF/Effects/silence.ogg - type: MeleeChemicalInjector solution: bloodstream - transferAmount: 10 + transferAmount: 0.5 # Ghost role stuff - type: GhostRole allowMovement: true diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_meme_goblinbane_minions.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_meme_goblinbane_minions.yml index 644b03da42b..ac31e515fdb 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_meme_goblinbane_minions.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_meme_goblinbane_minions.yml @@ -2,7 +2,7 @@ - type: entity id: MobMemePossessedMop name: possessed mop - parent: [ MobIncorporealBase, BaseMobMemeGoblinbane, NFMobTimedDespawn120 ] + parent: [ BaseMobMemeGoblinbane, NFMobTimedDespawn120 ] categories: [ HideSpawnMenu ] components: - type: HTN @@ -38,7 +38,7 @@ - type: MobThresholds thresholds: 0: Alive - 50: Dead + 40: Dead - type: Destructible thresholds: - trigger: @@ -63,11 +63,11 @@ attackRate: 1 damage: types: - Blunt: 6 + Blunt: 3 Structural: 20 - type: MeleeChemicalInjector solution: bloodstream - transferAmount: 10 + transferAmount: 0.5 # Possessed Spray - type: entity @@ -109,7 +109,7 @@ - type: MobThresholds thresholds: 0: Alive - 50: Dead + 40: Dead - type: Destructible thresholds: - trigger: @@ -179,7 +179,7 @@ - type: MobThresholds thresholds: 0: Alive - 50: Dead + 40: Dead - type: Destructible thresholds: - trigger: @@ -194,7 +194,7 @@ MopBucket: min: 1 max: 1 - SoapNT: + RandomSoap: min: 1 max: 1 - !type:DoActsBehavior @@ -207,7 +207,7 @@ attackRate: 1 damage: types: - Blunt: 6 + Blunt: 3 Structural: 20 # Mop bucket dimention portal @@ -237,7 +237,7 @@ thresholds: - trigger: !type:DamageTrigger - damage: 90 + damage: 60 behaviors: - !type:PlaySoundBehavior sound: @@ -246,7 +246,7 @@ acts: [ "Destruction" ] - trigger: !type:DamageTrigger - damage: 90 + damage: 60 behaviors: - !type:DoActsBehavior acts: ["Destruction"] From 4eda96dff6334ff3551b50f98deb3c20a0b518a3 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Thu, 17 Oct 2024 17:03:49 +0000 Subject: [PATCH 38/76] Automatic Changelog (#2265) --- Resources/Changelog/Frontier.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 3fd652c00e1..ee9eeaf98c7 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4656,3 +4656,13 @@ Entries: message: Ammo techfab can now receive blueprints. id: 5416 time: '2024-10-17T15:25:48.0000000+00:00' +- author: erhardsteinhauer + changes: + - type: Tweak + message: >- + Severely nerfed Goblinbane damage output and liquid transfer with each + hit. The mob should now become a nuisance at best. Mob will ignore + players (even goblins and felinids) who wear janitor clothes, how it'll + play out with ghost-controlled entities - who knows. + id: 5417 + time: '2024-10-17T17:03:16.0000000+00:00' From 79626e3f4bd7e6cb012c37ddcb92a99baa6e49e6 Mon Sep 17 00:00:00 2001 From: "Alice \"Arimah\" Heurlin" <30327355+arimah@users.noreply.github.com> Date: Thu, 17 Oct 2024 19:24:36 +0200 Subject: [PATCH 39/76] Halloween: Cauldron to replace deep fryers (#2240) --- Content.Server/Holiday/HolidayPrototype.cs | 3 + Content.Server/Holiday/HolidaySystem.cs | 16 ++ .../Structures/Machines/deep_fryer.yml | 15 ++ .../Machines/microwave_recipe_assemblers.yml | 12 +- Resources/Prototypes/holidays.yml | 3 + .../Machines/cauldron.rsi/meta.json | 190 ++++++++++++++++++ .../Machines/cauldron.rsi/off-0.png | Bin 0 -> 527 bytes .../Machines/cauldron.rsi/off-1.png | Bin 0 -> 161 bytes .../Machines/cauldron.rsi/off-2.png | Bin 0 -> 161 bytes .../Machines/cauldron.rsi/off-3.png | Bin 0 -> 161 bytes .../Machines/cauldron.rsi/off-4.png | Bin 0 -> 161 bytes .../Machines/cauldron.rsi/off-5.png | Bin 0 -> 161 bytes .../Machines/cauldron.rsi/off-6.png | Bin 0 -> 161 bytes .../Machines/cauldron.rsi/off-7.png | Bin 0 -> 161 bytes .../Machines/cauldron.rsi/off-8.png | Bin 0 -> 161 bytes .../Structures/Machines/cauldron.rsi/on-1.png | Bin 0 -> 543 bytes .../Structures/Machines/cauldron.rsi/on-2.png | Bin 0 -> 543 bytes .../Structures/Machines/cauldron.rsi/on-3.png | Bin 0 -> 543 bytes .../Structures/Machines/cauldron.rsi/on-4.png | Bin 0 -> 543 bytes .../Structures/Machines/cauldron.rsi/on-5.png | Bin 0 -> 543 bytes .../Structures/Machines/cauldron.rsi/on-6.png | Bin 0 -> 543 bytes .../Structures/Machines/cauldron.rsi/on-7.png | Bin 0 -> 543 bytes .../Structures/Machines/cauldron.rsi/on-8.png | Bin 0 -> 543 bytes 23 files changed, 238 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/_NF/Structures/Machines/cauldron.rsi/meta.json create mode 100644 Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-0.png create mode 100644 Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-1.png create mode 100644 Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-2.png create mode 100644 Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-3.png create mode 100644 Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-4.png create mode 100644 Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-5.png create mode 100644 Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-6.png create mode 100644 Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-7.png create mode 100644 Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-8.png create mode 100644 Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-1.png create mode 100644 Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-2.png create mode 100644 Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-3.png create mode 100644 Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-4.png create mode 100644 Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-5.png create mode 100644 Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-6.png create mode 100644 Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-7.png create mode 100644 Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-8.png diff --git a/Content.Server/Holiday/HolidayPrototype.cs b/Content.Server/Holiday/HolidayPrototype.cs index 749423402b5..c5dc7d05597 100644 --- a/Content.Server/Holiday/HolidayPrototype.cs +++ b/Content.Server/Holiday/HolidayPrototype.cs @@ -41,6 +41,9 @@ public sealed partial class HolidayPrototype : IPrototype [DataField("celebrate")] private IHolidayCelebrate? _celebrate = null; + [DataField("entityReplacements")] // Frontier + public Dictionary? EntityReplacements = null; // Frontier + public bool ShouldCelebrate(DateTime date) { return _shouldCelebrate.ShouldCelebrate(date, this); diff --git a/Content.Server/Holiday/HolidaySystem.cs b/Content.Server/Holiday/HolidaySystem.cs index 001508593da..c9356d8af03 100644 --- a/Content.Server/Holiday/HolidaySystem.cs +++ b/Content.Server/Holiday/HolidaySystem.cs @@ -4,6 +4,7 @@ using Content.Shared.CCVar; using Content.Shared.Holiday; using Robust.Shared.Configuration; +using Robust.Shared.Map.Events; using Robust.Shared.Prototypes; namespace Content.Server.Holiday @@ -26,6 +27,7 @@ public override void Initialize() Subs.CVar(_configManager, CCVars.HolidaysEnabled, OnHolidaysEnableChange); SubscribeLocalEvent(OnRunLevelChanged); SubscribeLocalEvent(OnVisualsInit); + SubscribeLocalEvent(OnBeforeRead); } public void RefreshCurrentHolidays() @@ -115,6 +117,20 @@ private void OnVisualsInit(Entity ent, ref ComponentIni break; } } + + private void OnBeforeRead(BeforeEntityReadEvent ev) + { + foreach (var holiday in _currentHolidays) + { + if (holiday.EntityReplacements is { } replacements) + { + foreach (var (original, replacement) in replacements) + { + ev.RenamedPrototypes.TryAdd(original, replacement); + } + } + } + } } /// diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/deep_fryer.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/deep_fryer.yml index 022f39f25f8..5f24d9e29e8 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/deep_fryer.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/deep_fryer.yml @@ -170,3 +170,18 @@ machine_board: !type:Container machine_parts: !type:Container - type: PowerSwitch + +# Frontier: Halloween special +- type: entity + id: KitchenDeepFryerCauldron + parent: KitchenDeepFryer + name: cauldron + description: A mysterious and mystical cauldron, sputtering with magical energy. Or is that oil? + suffix: Holiday Special + components: + - type: Sprite + sprite: _NF/Structures/Machines/cauldron.rsi + snapCardinals: true + - type: SolutionContainerVisuals + maxFillLevels: 8 +# End Frontier diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/microwave_recipe_assemblers.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/microwave_recipe_assemblers.yml index 0f9cf3ce900..db38fd8417a 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/microwave_recipe_assemblers.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/microwave_recipe_assemblers.yml @@ -329,4 +329,14 @@ suffix: POI components: - type: Machine - board: Null \ No newline at end of file + board: Null + +- type: entity + id: KitchenDeepFryerCauldronPOI + parent: + - BaseStructureDisableToolUse + - KitchenDeepFryerCauldron + suffix: Holiday Special, POI + components: + - type: Machine + board: null diff --git a/Resources/Prototypes/holidays.yml b/Resources/Prototypes/holidays.yml index 47797bcb95c..dbe404e1967 100644 --- a/Resources/Prototypes/holidays.yml +++ b/Resources/Prototypes/holidays.yml @@ -329,6 +329,9 @@ greet: !type:Custom text: holiday-custom-halloween + entityReplacements: # Frontier + KitchenDeepFryer: KitchenDeepFryerCauldron # Frontier + KitchenDeepFryerPOI: KitchenDeepFryerCauldronPOI # Frontier - type: holiday id: VeganDay diff --git a/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/meta.json new file mode 100644 index 00000000000..529a0e70dc1 --- /dev/null +++ b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/meta.json @@ -0,0 +1,190 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Bing Guss (gentlebutter) for Frontier Station 14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "off-0" + }, + { + "name": "off-1" + }, + { + "name": "off-2" + }, + { + "name": "off-3" + }, + { + "name": "off-4" + }, + { + "name": "off-5" + }, + { + "name": "off-6" + }, + { + "name": "off-7" + }, + { + "name": "off-8" + }, + { + "name": "on-1", + "delays": [ + [ + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125 + ] + ] + }, + { + "name": "on-2", + "delays": [ + [ + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125 + ] + ] + }, + { + "name": "on-3", + "delays": [ + [ + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125 + ] + ] + }, + { + "name": "on-4", + "delays": [ + [ + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125 + ] + ] + }, + { + "name": "on-5", + "delays": [ + [ + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125 + ] + ] + }, + { + "name": "on-6", + "delays": [ + [ + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125 + ] + ] + }, + { + "name": "on-7", + "delays": [ + [ + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125 + ] + ] + }, + { + "name": "on-8", + "delays": [ + [ + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125, + 0.125 + ] + ] + } + ] +} diff --git a/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-0.png b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-0.png new file mode 100644 index 0000000000000000000000000000000000000000..c3aa39ecdb8c591095abd818f05abb3b45e7c74d GIT binary patch literal 527 zcmV+q0`UEbP)Px$$w@>(R9J=WR?BL`Fc6$HiDUwH2qh4xZ~6bPDglEjp$-&DA*2U)<(0g09QSc) z<|M53&S-Y^03LYYf&Y%#xG;U4mfqgXp9lyEv#c0RX-wn)q4AKQ=tE09pJ!Mu)o9W& zIG-IZ7t<5M1a#!TiCDyfPs+AU7uAuaIcD9&_6h)6w`59bA5_<`lLVCI9@aVlfO8fA zU~MbPm^yU8m?qh5Wx1auAO-HgVjvD$E58DcqS%V@O;g__*E$OXJV`;^{uGf!mJ-H6 zB_N1BAPLZV+P3_W9w3}fCqK^fd~i-G9p@r=0a;e~9YAWy30l3i2D{x00N{9h3zBX& z&j5g`I`kZL&O#{-=WMSBf`f>Q-~xCe60usXgSn57cU0BEmykCw7Z8`AC!k$%=6^_u zkRbJsOx{2|2`LG8ATEbe`sOYnVrd*B*oMY5UZr!^tLH+-Kyr?AaP)3Nz7zPde2;(_ zyky*dQ2>o3Ap~i4yw+)AKa&;^-&VXa??KpbU9Q-H-gTVkYZj!hbU>v#e+V6Un=8-P zU*Ef9TzHaE8A#>S_aGt86F$pEK1wBY4IA5f4+gK}AyByp+}1xsdxL(jM4zgg6hpwx R;hz8i002ovPDHLkV1lbc;hF#d literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-1.png b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-1.png new file mode 100644 index 0000000000000000000000000000000000000000..16e78f517cb48d18c46515a467f2eac2bb1ff651 GIT binary patch literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}(Vi}jArY;~ z2@}t#YlP>V5Ew=q^@SSC{6OZYBpV!@(_>`CDw}Gs{x{va!8F$FE zoHmMKI4gL=xgo+`kSU_ZhRf}s2Go#111>gM1_o&(ewKf8c*=m*FnGH9xvX}t#YlP>V5Ew=q^@SSC{6OZYBpV!@(_>`CDw}Gs{x{va!8F$FE zoHmMKI4gL=xgo+`kSU_ZhRf}s2Go#111>gM1_o&(ewKf8c*=m*FnGH9xvX}t#YlP>V5Ew=q^@SSC{6OZYBpV!@(_>`CDw}Gs{x{va!8F$FE zoHmMKI4gL=xgo+`kSU_ZhRf}s2Go#111>gM1_o&(ewKf8c*=m*FnGH9xvX}t#YlP>V5Ew=q^@SSC{6OZYBpV!@(_>`CDw}Gs{x{va!8F$FE zoHmMKI4gL=xgo+`kSU_ZhRf}s2Go#111>gM1_o&(ewKf8c*=m*FnGH9xvX}t#YlP>V5Ew=q^@SSC{6OZYBpV!@(_>`CDw}Gs{x{va!8F$FE zoHmMKI4gL=xgo+`kSU_ZhRf}s2Go#111>gM1_o&(ewKf8c*=m*FnGH9xvX}t#YlP>V5Ew=q^@SSC{6OZYBpV!@(_>`CDw}Gs{x{va!8F$FE zoHmMKI4gL=xgo+`kSU_ZhRf}s2Go#111>gM1_o&(ewKf8c*=m*FnGH9xvX}t#YlP>V5Ew=q^@SSC{6OZYBpV!@(_>`CDw}Gs{x{va!8F$FE zoHmMKI4gL=xgo+`kSU_ZhRf}s2Go#111>gM1_o&(ewKf8c*=m*FnGH9xvX}t#YlP>V5Ew=q^@SSC{6OZYBpV!@(_>`CDw}Gs{x{va!8F$FE zoHmMKI4gL=xgo+`kSU_ZhRf}s2Go#111>gM1_o&(ewKf8c*=m*FnGH9xvXD*!`T3L0zcBFa{$C%w>2~GL&%Ag3JAZn0x|rwwzh(P3+LxWb zw*AESUVD1U z*TVMC<;px$`%(|>TlN2hZDI33j z{GH5U|8MHq{OH8GUG@$qfBpCtQ+)k+|4ILym;Yq`W!x4df4@{?`W0S{{q+9E^)-QK8K2y{a6aqd_KBxw8KlP^Ey%EIm#Eu!_P2n^ z)*r>s`>x!VS4ds^mvP<1``ZrvDXDLmV)>hy=cND3UzXKBrC;+0Wbt}mf3825A7D*!`T3L0zcBFa{$C%w>2~GL&%Ag3JAZn0x|rwwzh(P3+LxWb zw*AESUVD1U z*TVMC<;px$`%(|>TlN2hZDI33j z{GH5U|8MHq{OH8GUG@$qfBpCtQ+)k+|4ILym;Yq`W!x4df4@{?`W0S{{q+9E^)-QK8K2y{a6aqd_KBxw8KlP^Ey%EIm#Eu!_P2n^ z)*r>s`>x!VS4ds^mvP<1``ZrvDXDLmV)>hy=cND3UzXKBrC;+0Wbt}mf3825A7D*!`T3L0zcBFa{$C%w>2~GL&%Ag3JAZn0x|rwwzh(P3+LxWb zw*AESUVD1U z*TVMC<;px$`%(|>TlN2hZDI33j z{GH5U|8MHq{OH8GUG@$qfBpCtQ+)k+|4ILym;Yq`W!x4df4@{?`W0S{{q+9E^)-QK8K2y{a6aqd_KBxw8KlP^Ey%EIm#Eu!_P2n^ z)*r>s`>x!VS4ds^mvP<1``ZrvDXDLmV)>hy=cND3UzXKBrC;+0Wbt}mf3825A7D*!`T3L0zcBFa{$C%w>2~GL&%Ag3JAZn0x|rwwzh(P3+LxWb zw*AESUVD1U z*TVMC<;px$`%(|>TlN2hZDI33j z{GH5U|8MHq{OH8GUG@$qfBpCtQ+)k+|4ILym;Yq`W!x4df4@{?`W0S{{q+9E^)-QK8K2y{a6aqd_KBxw8KlP^Ey%EIm#Eu!_P2n^ z)*r>s`>x!VS4ds^mvP<1``ZrvDXDLmV)>hy=cND3UzXKBrC;+0Wbt}mf3825A7D*!`T3L0zcBFa{$C%w>2~GL&%Ag3JAZn0x|rwwzh(P3+LxWb zw*AESUVD1U z*TVMC<;px$`%(|>TlN2hZDI33j z{GH5U|8MHq{OH8GUG@$qfBpCtQ+)k+|4ILym;Yq`W!x4df4@{?`W0S{{q+9E^)-QK8K2y{a6aqd_KBxw8KlP^Ey%EIm#Eu!_P2n^ z)*r>s`>x!VS4ds^mvP<1``ZrvDXDLmV)>hy=cND3UzXKBrC;+0Wbt}mf3825A7D*!`T3L0zcBFa{$C%w>2~GL&%Ag3JAZn0x|rwwzh(P3+LxWb zw*AESUVD1U z*TVMC<;px$`%(|>TlN2hZDI33j z{GH5U|8MHq{OH8GUG@$qfBpCtQ+)k+|4ILym;Yq`W!x4df4@{?`W0S{{q+9E^)-QK8K2y{a6aqd_KBxw8KlP^Ey%EIm#Eu!_P2n^ z)*r>s`>x!VS4ds^mvP<1``ZrvDXDLmV)>hy=cND3UzXKBrC;+0Wbt}mf3825A7D*!`T3L0zcBFa{$C%w>2~GL&%Ag3JAZn0x|rwwzh(P3+LxWb zw*AESUVD1U z*TVMC<;px$`%(|>TlN2hZDI33j z{GH5U|8MHq{OH8GUG@$qfBpCtQ+)k+|4ILym;Yq`W!x4df4@{?`W0S{{q+9E^)-QK8K2y{a6aqd_KBxw8KlP^Ey%EIm#Eu!_P2n^ z)*r>s`>x!VS4ds^mvP<1``ZrvDXDLmV)>hy=cND3UzXKBrC;+0Wbt}mf3825A7D*!`T3L0zcBFa{$C%w>2~GL&%Ag3JAZn0x|rwwzh(P3+LxWb zw*AESUVD1U z*TVMC<;px$`%(|>TlN2hZDI33j z{GH5U|8MHq{OH8GUG@$qfBpCtQ+)k+|4ILym;Yq`W!x4df4@{?`W0S{{q+9E^)-QK8K2y{a6aqd_KBxw8KlP^Ey%EIm#Eu!_P2n^ z)*r>s`>x!VS4ds^mvP<1``ZrvDXDLmV)>hy=cND3UzXKBrC;+0Wbt}mf3825A7 Date: Thu, 17 Oct 2024 14:41:38 -0400 Subject: [PATCH 40/76] Components & lathe speed balance pass (#2269) * Lathe speed balance pass * Indestructible POI kitchen machines --- .../ConstructionSystem.Machine.Upgrades.cs | 2 +- .../_NF/Construction/MachinePartSystem.cs | 0 .../Entities/Objects/Vehicles/buckleable.yml | 2 ++ .../Entities/Structures/Machines/lathe.yml | 8 +++--- .../Machines/microwave_recipe_assemblers.yml | 28 +++++-------------- 5 files changed, 14 insertions(+), 26 deletions(-) delete mode 100644 Content.Shared/_NF/Construction/MachinePartSystem.cs diff --git a/Content.Server/_NF/Construction/ConstructionSystem.Machine.Upgrades.cs b/Content.Server/_NF/Construction/ConstructionSystem.Machine.Upgrades.cs index 08dc8a4cb40..62abc709168 100644 --- a/Content.Server/_NF/Construction/ConstructionSystem.Machine.Upgrades.cs +++ b/Content.Server/_NF/Construction/ConstructionSystem.Machine.Upgrades.cs @@ -109,7 +109,7 @@ public Dictionary GetPartsRatings(List partStat amount += state.Quantity(); sumRating += state.Part.Rating * state.Quantity(); } - var rating = amount != 0 ? sumRating / amount : 0; + var rating = amount != 0 ? sumRating / amount : 1.0f; output.Add(type.ID, rating); } diff --git a/Content.Shared/_NF/Construction/MachinePartSystem.cs b/Content.Shared/_NF/Construction/MachinePartSystem.cs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/Resources/Prototypes/Entities/Objects/Vehicles/buckleable.yml b/Resources/Prototypes/Entities/Objects/Vehicles/buckleable.yml index 6a5d3c89b3d..c0dc2b5ba46 100644 --- a/Resources/Prototypes/Entities/Objects/Vehicles/buckleable.yml +++ b/Resources/Prototypes/Entities/Objects/Vehicles/buckleable.yml @@ -48,6 +48,7 @@ - type: Strap buckleOffset: "0.10, 0.36" # maxBuckleDistance: 1 # Umbra - buckling fix + unbuckleDistanceSquared: 0.09 # Frontier: (30 cm)^2 - type: InputMover - type: InteractionOutline - type: Vehicle @@ -190,6 +191,7 @@ - type: Strap buckleOffset: "0.15, -0.05" # maxBuckleDistance: 1 # Umbra - buckling fix + unbuckleDistanceSquared: 0.09 # Frontier: (30 cm)^2 - type: MovementSpeedModifier acceleration: 1 friction: 1 diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index a7158b0915b..1324d7c286d 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -50,7 +50,7 @@ - type: ResearchClient - type: TechnologyDatabase - type: MaterialStorageMagnetPickup # Frontier - range: 0.30 + range: 0.30 # Frontier # a lathe that can be sped up with space lube / slowed down with glue - type: entity @@ -61,7 +61,7 @@ - type: ReagentSpeed solution: lube modifiers: - SpaceLube: 0.25 + SpaceLube: 0.5 # Frontier: 0.25<0.5 (we double dip on time with lube and machine parts) SpaceGlue: 5 - type: SolutionContainerManager solutions: @@ -80,11 +80,11 @@ components: - type: Lathe materialUseMultiplier: 0.5 - timeMultiplier: 1.5 + timeMultiplier: 3 # Frontier: 1.5<3 (we double dip on time with lube and machine parts) - type: LatheHeatProducing - type: ReagentSpeed modifiers: - SpaceLube: 0.8 # being faster means less heat so lube needs to be nerfed + SpaceLube: 0.5 # Frontier: 0.8<0.5 SpaceGlue: 5 # no change from normal lathe, overheat!!! - type: entity diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/microwave_recipe_assemblers.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/microwave_recipe_assemblers.yml index db38fd8417a..765718c70af 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/microwave_recipe_assemblers.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/microwave_recipe_assemblers.yml @@ -274,69 +274,55 @@ id: KitchenMicrowavePOI parent: - BaseStructureDisableToolUse + - BaseStructureIndestructible - KitchenMicrowave suffix: POI - components: - - type: Machine - board: Null - type: entity id: KitchenElectricRangePOI parent: - BaseStructureDisableToolUse + - BaseStructureIndestructible - KitchenElectricRange suffix: POI - components: - - type: Machine - board: Null - type: entity id: KitchenAssemblerPOI parent: - BaseStructureDisableToolUse + - BaseStructureIndestructible - KitchenAssembler suffix: POI - components: - - type: Machine - board: Null - type: entity id: MedicalAssemblerPOI parent: - BaseStructureDisableToolUse + - BaseStructureIndestructible - MedicalAssembler suffix: POI - components: - - type: Machine - board: Null # TODO: move this - type: entity id: KitchenReagentGrinderPOI parent: - BaseStructureDisableToolUse + - BaseStructureIndestructible - KitchenReagentGrinder suffix: POI - components: - - type: Machine - board: Null - type: entity id: KitchenDeepFryerPOI parent: - BaseStructureDisableToolUse + - BaseStructureIndestructible - KitchenDeepFryer suffix: POI - components: - - type: Machine - board: Null - type: entity id: KitchenDeepFryerCauldronPOI parent: - BaseStructureDisableToolUse + - BaseStructureIndestructible - KitchenDeepFryerCauldron suffix: Holiday Special, POI - components: - - type: Machine - board: null From ba7e2d126c84e34e9c5df16e4bd662f9d62bcc7a Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Thu, 17 Oct 2024 18:42:13 +0000 Subject: [PATCH 41/76] Automatic Changelog (#2269) --- Resources/Changelog/Frontier.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index ee9eeaf98c7..426ed6d040a 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4666,3 +4666,15 @@ Entries: play out with ghost-controlled entities - who knows. id: 5417 time: '2024-10-17T17:03:16.0000000+00:00' +- author: whatston3 + changes: + - type: Fix + message: >- + Machines that are missing components (like hyperlathes) now act as + though they have base components. + - type: Tweak + message: Hyper convection lathes now have 3x typical print time by default. + - type: Tweak + message: Lubrication now affects base and hyper lathe print times at 0.5x rates. + id: 5418 + time: '2024-10-17T18:41:39.0000000+00:00' From 5e1fe8a01e8a4a553dbf779f46f6d2bcc08e0025 Mon Sep 17 00:00:00 2001 From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Date: Thu, 17 Oct 2024 23:59:15 +0300 Subject: [PATCH 42/76] Folding Plastic Table (#2191) * Folding Table * non climable * don't tread on me (folding table) * Add foldable fixture system * Unfolded/folded fixtures * Make item fixture soft by default for folding tbl * Remove comments, unneeded folded component --------- Co-authored-by: Whatstone --- .../_NF/Foldable/FoldableFixtureComponent.cs | 10 ++ .../_NF/Foldable/FoldableFixtureSystem.cs | 56 ++++++++ .../Entities/Structures/Furniture/tables.yml | 123 ++++++++++++++++++ .../Graphs/furniture/folding_table.yml | 31 +++++ .../_NF/Recipes/Construction/furniture.yml | 18 +++ .../Furniture/folding_table.rsi/folding.png | Bin 0 -> 553 bytes .../folding_table.rsi/folding_folded.png | Bin 0 -> 459 bytes .../folding_table.rsi/inhand-left.png | Bin 0 -> 760 bytes .../folding_table.rsi/inhand-right.png | Bin 0 -> 746 bytes .../Furniture/folding_table.rsi/meta.json | 25 ++++ 10 files changed, 263 insertions(+) create mode 100644 Content.Shared/_NF/Foldable/FoldableFixtureComponent.cs create mode 100644 Content.Shared/_NF/Foldable/FoldableFixtureSystem.cs create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Furniture/tables.yml create mode 100644 Resources/Prototypes/_NF/Recipes/Construction/Graphs/furniture/folding_table.yml create mode 100644 Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/folding.png create mode 100644 Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/folding_folded.png create mode 100644 Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/meta.json diff --git a/Content.Shared/_NF/Foldable/FoldableFixtureComponent.cs b/Content.Shared/_NF/Foldable/FoldableFixtureComponent.cs new file mode 100644 index 00000000000..a35cf433cb6 --- /dev/null +++ b/Content.Shared/_NF/Foldable/FoldableFixtureComponent.cs @@ -0,0 +1,10 @@ +namespace Content.Shared._NF.Foldable.Systems; + +[RegisterComponent] +public sealed partial class FoldableFixtureComponent : Component +{ + [DataField(required: true)] + public List FoldedFixtures; + [DataField(required: true)] + public List UnfoldedFixtures; +} diff --git a/Content.Shared/_NF/Foldable/FoldableFixtureSystem.cs b/Content.Shared/_NF/Foldable/FoldableFixtureSystem.cs new file mode 100644 index 00000000000..1ebbfcac260 --- /dev/null +++ b/Content.Shared/_NF/Foldable/FoldableFixtureSystem.cs @@ -0,0 +1,56 @@ +using Content.Shared.Foldable; +using Robust.Shared.Physics.Systems; + +namespace Content.Shared._NF.Foldable.Systems; + +public sealed class FoldableFixtureSystem : EntitySystem +{ + [Dependency] private readonly FixtureSystem _fixtures = default!; + [Dependency] private readonly SharedPhysicsSystem _physics = default!; + + public override void Initialize() + { + SubscribeLocalEvent(OnMapInit); + SubscribeLocalEvent(OnFolded); + } + + private void OnMapInit(EntityUid uid, FoldableFixtureComponent component, MapInitEvent args) + { + if (TryComp(uid, out var foldable)) + SetFoldedFixtures(uid, foldable.IsFolded, component); + } + + private void OnFolded(EntityUid uid, FoldableFixtureComponent? component, ref FoldedEvent args) + { + SetFoldedFixtures(uid, args.IsFolded, component); + } + + // Sets all relevant fixtures for the entity to an appropriate hard/soft state. + private void SetFoldedFixtures(EntityUid uid, bool isFolded, FoldableFixtureComponent? component) + { + if (!Resolve(uid, ref component)) + return; + + if (isFolded) + { + SetAllFixtureHardness(uid, component.FoldedFixtures, true); + SetAllFixtureHardness(uid, component.UnfoldedFixtures, false); + } + else + { + SetAllFixtureHardness(uid, component.FoldedFixtures, false); + SetAllFixtureHardness(uid, component.UnfoldedFixtures, true); + } + } + + // Sets all fixtures on an entity in a list to either be hard or soft. + void SetAllFixtureHardness(EntityUid uid, List fixtures, bool hard) + { + foreach (var fixName in fixtures) + { + var fixture = _fixtures.GetFixtureOrNull(uid, fixName); + if (fixture != null) + _physics.SetHard(uid, fixture, hard); + } + } +} diff --git a/Resources/Prototypes/_NF/Entities/Structures/Furniture/tables.yml b/Resources/Prototypes/_NF/Entities/Structures/Furniture/tables.yml new file mode 100644 index 00000000000..895c91fad28 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Structures/Furniture/tables.yml @@ -0,0 +1,123 @@ + +- type: entity + parent: BaseDeployFoldable + id: TableFolding + name: folding table + description: If you carry six of these you become the coolest kid at church. + components: + # Table bits + - type: SpriteFade + - type: Clickable + - type: InteractionOutline + - type: Climbable + - type: GlassTable + climberDamage: + types: + Blunt: 15 + tableDamage: + types: + Blunt: 25 + tableMassLimit: 60 + - type: PlaceableSurface + - type: Physics + bodyType: Dynamic + fixedRotation: true + - type: Pullable + - type: Fixtures + fixtures: + table: # For the unfolded table + shape: + !type:PhysShapeAabb + bounds: "-0.4,-0.4,0.4,0.4" + density: 55 + mask: + - TableMask + layer: + - TableLayer + hard: true + item: # For the folded, carriable table + shape: + !type:PhysShapeAabb + bounds: "-0.25,-0.25,0.25,0.25" + density: 20 + mask: + - ItemMask + restitution: 0.3 + friction: 0.2 + hard: false + - type: Bonkable + bonkDamage: + types: + Blunt: 4 + bonkSound: !type:SoundCollectionSpecifier + collection: TrayHit + - type: FootstepModifier + footstepSoundCollection: + collection: FootstepHull + # Item bits + - type: MovedByPressure + - type: Item + size: Huge + - type: Sprite + sprite: _NF/Structures/Furniture/folding_table.rsi + layers: + - state: folding + map: ["unfoldedLayer"] + - state: folding_folded + map: ["foldedLayer"] + visible: false + noRot: true + - type: Appearance + - type: MeleeWeapon + damage: + types: + Blunt: 8 + soundHit: + collection: MetalThud + - type: Damageable + damageContainer: StructuralInorganic + damageModifierSet: Metallic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 15 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - trigger: + !type:DamageTrigger + damage: 5 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - !type:SpawnEntitiesBehavior + spawn: + SheetPlastic1: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: StaticPrice + price: 20 + - type: Construction + graph: TableFoldingGraph + node: TableFolding + - type: DamageExaminable + - type: FoldableFixture + foldedFixtures: + - item + unfoldedFixtures: + - table + +- type: entity + parent: TableFolding + id: TableFoldingSpawnFolded + suffix: folded + components: + - type: Foldable + folded: true diff --git a/Resources/Prototypes/_NF/Recipes/Construction/Graphs/furniture/folding_table.yml b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/furniture/folding_table.yml new file mode 100644 index 00000000000..942dc82df93 --- /dev/null +++ b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/furniture/folding_table.yml @@ -0,0 +1,31 @@ +- type: constructionGraph + id: TableFoldingGraph + start: start + graph: + - node: start + actions: + - !type:DestroyEntity {} + edges: + + - to: TableFolding + steps: + - material: Plastic + amount: 4 + doAfter: 1 + - material: MetalRod + amount: 4 + + - node: TableFolding + entity: TableFolding + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetPlastic1 + amount: 4 + - !type:SpawnPrototype + prototype: PartRodMetal1 + amount: 4 + steps: + - tool: Screwing + doAfter: 2 diff --git a/Resources/Prototypes/_NF/Recipes/Construction/furniture.yml b/Resources/Prototypes/_NF/Recipes/Construction/furniture.yml index bd4dc5bce53..d4df40dd662 100644 --- a/Resources/Prototypes/_NF/Recipes/Construction/furniture.yml +++ b/Resources/Prototypes/_NF/Recipes/Construction/furniture.yml @@ -1126,3 +1126,21 @@ canBuildInImpassable: false conditions: - !type:TileNotBlocked + +# Folding table +- type: construction + id: TableFolding + name: folding table + description: A table, but foldable. + graph: TableFoldingGraph + startNode: start + targetNode: TableFolding + category: construction-category-furniture + icon: + sprite: _NF/Structures/Furniture/folding_table.rsi + state: folding + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked diff --git a/Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/folding.png b/Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/folding.png new file mode 100644 index 0000000000000000000000000000000000000000..8e13ff9a81b2838b1bc4f12a7c9baf9be5d7290e GIT binary patch literal 553 zcmV+^0@nSBP)004R> z004l5008;`004mK004C_008P=0026d000+od=L!8`ENm!A^I0&ey3`U#yQCW{lmD6>S&u`gtb1C0u^?Cz< zpfTML&Oj!gO3e5+yKbHX1di#381WtXL;7`q(XfF>Cl?e8hXAbR6tbE0U;!HE7p&&i zobkW`HaBw4Cd_W+!rJ`)9vA`)0fqpf0e1Han3jTRDeUeQLIZ>@M5&oH#liuAQxOLW zkj4h^TgAVTs2FiC<-;Mq?U67h&?cBy>SEruCig zA(D4Lzc@>!w2wBf(jJSufRd?cpi_*X(~<#PH7)@#?@S&aEJj}Lv7TEjudGu$J@b4D zo`pyf%j9qESI1Z$g)W?g-E&fJ?N=C!qjh<<+)Mfc2wjj&O;aiDbKAU8I(J#~TKcJs rh-%9x)~p5yG9s$)f5buieXHI9tCgSZUtHnN00000NkvXXu0mjf3)l0V literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/folding_folded.png b/Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/folding_folded.png new file mode 100644 index 0000000000000000000000000000000000000000..c1b3745a79387d7cdbb9a4c211d1a1b2f2546f07 GIT binary patch literal 459 zcmV;+0W|)JP)004R> z004l5008;`004mK004C_008P=0026d000+od=6It zT^c&YpQ&-RIJ()8*=-IDQT+!FF5>RsE-n2BE`dXXn^_S?C`3XnA*LmQQ4L1A1>Yv6 z>n`QM&3m@*`@WxhpIh#GU}9oovglZh22$ya0JyE!b^EoOYeUa8G@MFj#B;l&+q2o0 z0C?^94M|KLOeD6%@3XKjvlwi)LDH`SN z)51l$!olA5q~rIkaaJkQXxuRze&O*1R7s71B)O2~AP%Q{Qi~}T+N~!dyUNrzteuvL zDRKP1(4^*Yx{>7|0M+W1CZiG1BN7e~35RCR?avU@!)iD&XG{T8z!X?KfkL4;`!dRA zGh+PtoCnQjn@*>zS^lrUSYloRxm@1xkB`aX@B@&nXFJ4TjP3vc002ovPDHLkV1nx( B$8-Py literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/inhand-left.png b/Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..0549aafb46cbfd0536b47f850f4aac01df86bc31 GIT binary patch literal 760 zcmVEX>4Tx04R}tkv&MmKpe$i(@I4v4ptC#$WWauh>AE$6^me@v=v%)FuC+YXws0R zxHt-~1qVMCs}3&Cx;nTDg5U>;vxAeOi*kx9)Fhl#~v8_R9XN`^{2MI2F7jq-)8 z%L?Z$&T6^Jn)l={4CS@uG}mbkBaTHRkc0>sRcxRP3sG7%QcR?1Kjz^dbo@zj$>iDq zBgZ@{P$4;f@IUz7ty!3yaFaqYpyS21KSqGyF3_mi_V=-EH%pV2qvfWBLxYt`+oxsTHaAVXa(-2exN zz-W=O*F4_c+1}f~XPW)}07GtalnbDySpWb5E=fc|RCt{2*)ej1Fc3h|btdOXnjB-3 zHfO+YTE8YfP2|+!7K{dIF`9fYK8vZSx7Z&k^)|IaL`8 z000000000sFS^@mOw+}5XaA$4n^II?V7RCdRlROY$CeP?7f@BPww*oi@!_dANW?j} zYGOlEi5yng(hAJd7)i}9%2!pNs!mpzb8hz0U6g>2_qR?&vEX>4Tx04R}tkv&MmKpe$i(@I4v4ptC#$WWauh>AE$6^me@v=v%)FuC+YXws0R zxHt-~1qVMCs}3&Cx;nTDg5U>;vxAeOi*kx9)Fhl#~v8_R9XN`^{2MI2F7jq-)8 z%L?Z$&T6^Jn)l={4CS@uG}mbkBaTHRkc0>sRcxRP3sG7%QcR?1Kjz^dbo@zj$>iDq zBgZ@{P$4;f@IUz7ty!3yaFaqYpyS21KSqGyF3_mi_V=-EH%pV2qvfWBLxYt`+oxsTHaAVXa(-2exN zz-W=O*F4_c+1}f~XPW)}07GtalnbDySpWb5AW1|)RCt{2+A(s2Fc3h|C6jYFO^%_Y z%^9#8mmG;QO~M&yVUOV^xd^H7s7TlqVG!8=&A9Mbl2^MzFe5|&00000007*RV(Q1L zDu?)cT{n~Mw;(m<2W!C7@hqp~`JZ8}Dq{CM83W+?(sIg2drV2 z2^cHA1oINeO;tsloBz1WlJE6FpcLR34CYN&mjRV=kUBLBJHD};G cOdf#z0AD;~Pys-*-v9sr07*qoM6N<$f@E4-ApigX literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/meta.json b/Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/meta.json new file mode 100644 index 00000000000..077a74633aa --- /dev/null +++ b/Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Beestation at commit https://github.com/BeeStation/BeeStation-Hornet/commit/9a035f9365bcb74ac40fbe79c74c43c4c80cc1e4", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "folding" + }, + { + "name": "folding_folded" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From 1c83b5e91448813b125b7718cb912e174d4f3c6b Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Thu, 17 Oct 2024 20:59:40 +0000 Subject: [PATCH 43/76] Automatic Changelog (#2191) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 426ed6d040a..cda4642a3ac 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4678,3 +4678,9 @@ Entries: message: Lubrication now affects base and hyper lathe print times at 0.5x rates. id: 5418 time: '2024-10-17T18:41:39.0000000+00:00' +- author: erhardsteinhauer + changes: + - type: Add + message: Added foldable plastic table to compliment folding chairs. + id: 5419 + time: '2024-10-17T20:59:15.0000000+00:00' From 191c146d59b94f59505509e5bf7e7248d9ba99e4 Mon Sep 17 00:00:00 2001 From: dustylens <54123313+dustylens@users.noreply.github.com> Date: Thu, 17 Oct 2024 21:35:46 +0000 Subject: [PATCH 44/76] Adds Medical Assembler to FSB Stasis (#2207) * Adds Medical Assembler to FSB Stasis * Update stasis.yml * Fixups --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> Co-authored-by: Dvir --- Resources/Maps/_NF/Shuttles/stasis.yml | 453 ++++++++++--------- Resources/Prototypes/_NF/Shipyard/stasis.yml | 2 +- 2 files changed, 229 insertions(+), 226 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/stasis.yml b/Resources/Maps/_NF/Shuttles/stasis.yml index 9f2445f7b9c..4f2f0a55aa7 100644 --- a/Resources/Maps/_NF/Shuttles/stasis.yml +++ b/Resources/Maps/_NF/Shuttles/stasis.yml @@ -41,13 +41,13 @@ entities: - type: MetaData name: Stasis - type: Transform - pos: -0.546875,-0.53125 + pos: -0.5,-0.6875 parent: invalid - type: MapGrid chunks: 0,0: ind: 0,0 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAABgAAAAAABgAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAABgAAAAAABgAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAABgAAAAAABgAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAACgAAAAAAEQAAAAAAEQAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAACgAAAAAAEQAAAAAAEQAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAACgAAAAAAEQAAAAAAEQAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAAAwAAAAAADgAAAAAAAwAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAABgAAAAAABgAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAABgAAAAAABgAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAABgAAAAAABgAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAACgAAAAAAEQAAAAAAEQAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAACgAAAAAAEQAAAAAAEQAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAACgAAAAAAEQAAAAAAEQAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAADgAAAAAAAwAAAAAAAwAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAADgAAAAAAAwAAAAAAAwAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 0,-1: ind: 0,-1 @@ -86,8 +86,8 @@ entities: color: '#FFFFFFFF' id: Arrows decals: - 72: 12,10 - 73: 14,10 + 276: 13,10 + 277: 14,10 - node: color: '#FFFFFFFF' id: Bot @@ -418,10 +418,10 @@ entities: 24: 18,3 25: 18,-1 - node: - color: '#951710FF' + color: '#9C2020FF' id: BrickTileWhiteLineE decals: - 179: 14,10 + 274: 14,10 - node: color: '#B3B3B3FF' id: BrickTileWhiteLineE @@ -490,10 +490,10 @@ entities: 33: 16,3 34: 16,-1 - node: - color: '#951710FF' + color: '#9C2020FF' id: BrickTileWhiteLineW decals: - 178: 12,10 + 275: 13,10 - node: color: '#B3B3B3FF' id: BrickTileWhiteLineW @@ -735,11 +735,10 @@ entities: id: WarnLineN decals: 212: 13,-8 - 238: 12,9 239: 13,9 240: 14,9 241: 14,11 - 242: 12,11 + 264: 13,11 - node: color: '#B3B3B3FF' id: WarnLineS @@ -752,11 +751,10 @@ entities: id: WarnLineW decals: 211: 13,-8 - 243: 12,9 244: 13,9 245: 14,9 246: 14,11 - 247: 12,11 + 265: 13,11 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' @@ -780,7 +778,9 @@ entities: 3,1: 1: 32631 3,2: - 1: 22391 + 1: 26471 + 2,2: + 0: 32768 3,0: 1: 28398 3,-1: @@ -884,13 +884,17 @@ entities: - 409 - 145 - 599 - - 288 + - 166 - 519 - 345 - 226 - 8 - - 127 + - 618 - 218 + - 342 + - 400 + - 434 + - 348 - uid: 452 components: - type: Transform @@ -904,17 +908,6 @@ entities: - 536 - 609 - 603 - - uid: 556 - components: - - type: Transform - pos: 19.5,7.5 - parent: 1 - - type: DeviceList - devices: - - 434 - - 342 - - 400 - - 348 - proto: AirlockEngineering entities: - uid: 46 @@ -934,24 +927,19 @@ entities: - type: Transform pos: 14.5,9.5 parent: 1 - - uid: 383 - components: - - type: Transform - pos: 12.5,9.5 - parent: 1 - proto: AirlockGlassShuttle entities: - - uid: 156 + - uid: 55 components: - type: Transform rot: 3.141592653589793 rad - pos: 14.5,11.5 + pos: 13.5,11.5 parent: 1 - - uid: 166 + - uid: 186 components: - type: Transform rot: 3.141592653589793 rad - pos: 12.5,11.5 + pos: 14.5,11.5 parent: 1 - proto: AirlockMedicalGlass entities: @@ -1016,6 +1004,12 @@ entities: rot: -1.5707963267948966 rad pos: 11.5,7.5 parent: 1 + - uid: 88 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 13.5,11.5 + parent: 1 - uid: 110 components: - type: Transform @@ -1028,12 +1022,6 @@ entities: rot: 3.141592653589793 rad pos: 14.5,11.5 parent: 1 - - uid: 172 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 12.5,11.5 - parent: 1 - uid: 176 components: - type: Transform @@ -1062,6 +1050,11 @@ entities: - type: Transform pos: 24.5,-7.5 parent: 1 + - uid: 383 + components: + - type: Transform + pos: 11.5,11.5 + parent: 1 - uid: 526 components: - type: Transform @@ -1154,14 +1147,11 @@ entities: parent: 1 - proto: BannerMedical entities: - - uid: 550 + - uid: 172 components: - type: Transform - anchored: True - pos: 13.5,10.5 + pos: 12.5,10.5 parent: 1 - - type: Physics - bodyType: Static - proto: Bed entities: - uid: 44 @@ -1261,8 +1251,6 @@ entities: rot: 1.5707963267948966 rad pos: 20.5,5.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSofaCorpRight entities: - uid: 72 @@ -1271,8 +1259,6 @@ entities: rot: 1.5707963267948966 rad pos: 20.5,4.5 parent: 1 - - type: Physics - bodyType: Static - proto: BlastDoorOpen entities: - uid: 312 @@ -1295,8 +1281,7 @@ entities: - uid: 130 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 12.418333,-3.4793668 + pos: 11.500278,-4.509832 parent: 1 - proto: ButtonFrameCaution entities: @@ -1306,6 +1291,12 @@ entities: rot: -1.5707963267948966 rad pos: 15.5,4.5 parent: 1 + - uid: 307 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 22.5,8.5 + parent: 1 - uid: 602 components: - type: Transform @@ -1317,6 +1308,13 @@ entities: - type: Transform pos: 12.5,-7.5 parent: 1 +- proto: ButtonFrameCautionSecurity + entities: + - uid: 127 + components: + - type: Transform + pos: 15.5,3.5 + parent: 1 - proto: ButtonFrameGrey entities: - uid: 63 @@ -1895,13 +1893,13 @@ entities: rot: -1.5707963267948966 rad pos: 15.5,10.5 parent: 1 -- proto: ClothingBeltUtilityFilled +- proto: ClothingBeltUtilityEngineering entities: - - uid: 336 + - uid: 64 components: - type: Transform rot: -1.5707963267948966 rad - pos: 14.492705,-1.3393784 + pos: 14.387511,-1.4651437 parent: 1 - proto: ClothingCloakCmo entities: @@ -1924,22 +1922,6 @@ entities: - type: Transform pos: 22.3211,7.4096994 parent: 1 -- proto: ClothingNeckScarfStripedLightBlue - entities: - - uid: 567 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 18.504137,-4.582796 - parent: 1 -- proto: ClothingNeckScarfStripedRed - entities: - - uid: 566 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 16.504137,-4.520296 - parent: 1 - proto: ClothingOuterCoatLabCmo entities: - uid: 572 @@ -1972,24 +1954,12 @@ entities: parent: 1 - proto: ComputerWallmountWithdrawBankATM entities: - - uid: 173 + - uid: 567 components: - type: Transform - pos: 15.5,3.5 + rot: -1.5707963267948966 rad + pos: 15.5,7.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - proto: CrateChemistryD entities: - uid: 457 @@ -2036,13 +2006,6 @@ entities: - type: Transform pos: 22.5,-8.5 parent: 1 -- proto: CrateMaterials - entities: - - uid: 64 - components: - - type: Transform - pos: 11.5,-4.5 - parent: 1 - proto: CryoPod entities: - uid: 334 @@ -2106,11 +2069,11 @@ entities: parent: 1 - proto: DefibrillatorCabinetFilled entities: - - uid: 202 + - uid: 288 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 15.5,-4.5 + rot: 3.141592653589793 rad + pos: 16.5,-5.5 parent: 1 - uid: 418 components: @@ -2170,12 +2133,12 @@ entities: - type: Transform pos: 18.5,4.5 parent: 1 -- proto: EmergencyRollerBed +- proto: EmergencyRollerBedSpawnFolded entities: - uid: 568 components: - type: Transform - pos: 14.787477,5.497296 + pos: 14.443597,5.490514 parent: 1 - proto: ExtinguisherCabinetFilled entities: @@ -2379,13 +2342,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0FF0FCFF' - - uid: 584 - components: - - type: Transform - pos: 13.5,10.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - proto: GasPipeFourway entities: - uid: 388 @@ -2712,11 +2668,11 @@ entities: - uid: 464 components: - type: Transform - rot: -1.5707963267948966 rad + rot: 3.141592653589793 rad pos: 20.5,-6.5 parent: 1 - type: AtmosPipeColor - color: '#990000FF' + color: '#0055CCFF' - uid: 466 components: - type: Transform @@ -2901,6 +2857,14 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' + - uid: 614 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 20.5,-7.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 630 components: - type: Transform @@ -3152,6 +3116,16 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' +- proto: GasPressurePumpOnMax + entities: + - uid: 173 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 20.5,-6.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' - proto: GasThermoMachineFreezer entities: - uid: 483 @@ -3175,11 +3149,10 @@ entities: - 419 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 127 + - uid: 166 components: - type: Transform - rot: 3.141592653589793 rad - pos: 20.5,-6.5 + pos: 13.5,10.5 parent: 1 - type: DeviceNetwork deviceLists: @@ -3219,17 +3192,6 @@ entities: - 419 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 288 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 12.5,10.5 - parent: 1 - - type: DeviceNetwork - deviceLists: - - 419 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 342 components: - type: Transform @@ -3237,7 +3199,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 556 + - 419 - type: AtmosPipeColor color: '#0055CCFF' - uid: 345 @@ -3259,7 +3221,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 556 + - 419 - type: AtmosPipeColor color: '#0055CCFF' - uid: 519 @@ -3273,6 +3235,17 @@ entities: - 419 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 618 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 20.5,-8.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 419 + - type: AtmosPipeColor + color: '#0055CCFF' - proto: GasVentScrubber entities: - uid: 145 @@ -3305,7 +3278,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 556 + - 419 - type: AtmosPipeColor color: '#990000FF' - uid: 400 @@ -3315,7 +3288,7 @@ entities: parent: 1 - type: DeviceNetwork deviceLists: - - 556 + - 419 - type: AtmosPipeColor color: '#990000FF' - uid: 409 @@ -3408,12 +3381,6 @@ entities: rot: 1.5707963267948966 rad pos: 24.5,-2.5 parent: 1 - - uid: 155 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 13.5,11.5 - parent: 1 - uid: 159 components: - type: Transform @@ -3582,31 +3549,26 @@ entities: parent: 1 - type: Physics bodyType: Static -- proto: LockerWallChemistryFilled +- proto: LockerWallColorChemistryFilled entities: - - uid: 212 + - uid: 18 components: - type: Transform rot: 3.141592653589793 rad pos: 20.5,-5.5 parent: 1 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null -- proto: LockerWallEVAColorMedicalFilled +- proto: LockerWallColorMedicalDoctorFilled entities: - - uid: 307 + - uid: 212 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 15.5,7.5 + rot: 3.141592653589793 rad + pos: 19.5,5.5 + parent: 1 + - uid: 352 + components: + - type: Transform + pos: 19.5,7.5 parent: 1 - proto: LockerWallEVAColorParamedicFilled entities: @@ -3622,6 +3584,14 @@ entities: rot: 3.141592653589793 rad pos: 16.5,5.5 parent: 1 +- proto: LockerWallMaterialsBasicFilled + entities: + - uid: 336 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 10.5,-4.5 + parent: 1 - proto: LockerWallMaterialsFuelUraniumFilled entities: - uid: 605 @@ -3650,6 +3620,13 @@ entities: - type: Transform pos: 23.5,-1.5 parent: 1 +- proto: MedicalAssembler + entities: + - uid: 566 + components: + - type: Transform + pos: 21.5,-1.5 + parent: 1 - proto: MedicalBed entities: - uid: 67 @@ -3679,13 +3656,13 @@ entities: - type: Transform pos: 20.5,-3.5 parent: 1 -- proto: Multitool +- proto: NFPosterContrabandEmsCoords entities: - - uid: 578 + - uid: 287 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 14.544788,-1.8185453 + rot: 1.5707963267948966 rad + pos: 16.5,8.5 parent: 1 - proto: NFPosterContrabandFsbLogo entities: @@ -3703,17 +3680,45 @@ entities: parent: 1 - proto: NFSignDock entities: - - uid: 486 + - uid: 487 components: - type: Transform rot: 1.5707963267948966 rad - pos: 11.5,11.5 + pos: 15.5,11.5 parent: 1 - - uid: 487 +- proto: NFSignEms1 + entities: + - uid: 407 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 15.5,11.5 + rot: 3.141592653589793 rad + pos: 15.5,5.5 + parent: 1 +- proto: NFSignEms2 + entities: + - uid: 155 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 12.5,11.5 + parent: 1 + - uid: 486 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 24.5,-5.5 + parent: 1 + - uid: 556 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 10.5,-5.5 + parent: 1 + - uid: 560 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 11.5,4.5 parent: 1 - proto: NitrogenCanister entities: @@ -3759,9 +3764,7 @@ entities: pos: 12.5,-8.5 parent: 1 - type: FuelGenerator - on: False - - type: Physics - bodyType: Static + targetPower: 31000 - proto: PosterLegitAnatomyPoster entities: - uid: 208 @@ -3770,14 +3773,6 @@ entities: rot: 1.5707963267948966 rad pos: 21.5,3.5 parent: 1 -- proto: PosterLegitBlessThisSpess - entities: - - uid: 267 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 16.5,8.5 - parent: 1 - proto: PosterLegitPeriodicTable entities: - uid: 163 @@ -3979,14 +3974,6 @@ entities: - type: Transform pos: 10.5,-6.5 parent: 1 -- proto: RandomPainting - entities: - - uid: 287 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 23.5,7.5 - parent: 1 - proto: SeedExtractor entities: - uid: 227 @@ -4002,6 +3989,12 @@ entities: rot: 1.5707963267948966 rad pos: 19.5,-2.5 parent: 1 + - uid: 550 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.5,-5.5 + parent: 1 - proto: ShelfRMetal entities: - uid: 285 @@ -4126,12 +4119,6 @@ entities: rot: 3.141592653589793 rad pos: 20.5,11.5 parent: 1 - - uid: 33 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 13.5,11.5 - parent: 1 - uid: 78 components: - type: Transform @@ -4233,6 +4220,23 @@ entities: - Pressed: Toggle 312: - Pressed: Toggle + - uid: 584 + components: + - type: Transform + pos: 15.5,3.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 51: + - Pressed: DoorBolt + 462: + - Pressed: DoorBolt + 539: + - Pressed: DoorBolt + 28: + - Pressed: DoorBolt + 292: + - Pressed: DoorBolt - uid: 604 components: - type: Transform @@ -4300,14 +4304,34 @@ entities: - Pressed: Toggle 128: - Pressed: Toggle -- proto: SignBridge - entities: - - uid: 186 + - uid: 570 components: - type: Transform rot: 3.141592653589793 rad pos: 22.5,8.5 parent: 1 + - type: DeviceLinkSource + linkedPorts: + 68: + - Pressed: Toggle + 24: + - Pressed: Toggle + 121: + - Pressed: Toggle + 61: + - Pressed: Toggle + 284: + - Pressed: Toggle + 362: + - Pressed: Toggle + 327: + - Pressed: Toggle + 299: + - Pressed: Toggle + 495: + - Pressed: Toggle + 494: + - Pressed: Toggle - proto: SignChem entities: - uid: 500 @@ -4316,14 +4340,6 @@ entities: rot: 3.141592653589793 rad pos: 19.5,-0.5 parent: 1 -- proto: SignCryogenicsMed - entities: - - uid: 407 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 17.5,-5.5 - parent: 1 - proto: SignEngineering entities: - uid: 426 @@ -4347,32 +4363,8 @@ entities: rot: 3.141592653589793 rad pos: 22.5,-5.5 parent: 1 -- proto: SignMedical - entities: - - uid: 352 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 15.5,5.5 - parent: 1 - - uid: 560 - components: - - type: Transform - pos: 24.5,-5.5 - parent: 1 - - uid: 570 - components: - - type: Transform - pos: 10.5,-5.5 - parent: 1 - proto: SignSpace entities: - - uid: 18 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 11.5,4.5 - parent: 1 - uid: 482 components: - type: Transform @@ -4600,10 +4592,10 @@ entities: parent: 1 - proto: VendingMachineTankDispenserEVA entities: - - uid: 55 + - uid: 202 components: - type: Transform - pos: 12.5,4.5 + pos: 12.5,8.5 parent: 1 - proto: WallmountTelevision entities: @@ -4643,6 +4635,12 @@ entities: rot: 3.141592653589793 rad pos: 15.5,-7.5 parent: 1 + - uid: 33 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 12.5,9.5 + parent: 1 - uid: 34 components: - type: Transform @@ -4732,12 +4730,6 @@ entities: rot: 3.141592653589793 rad pos: 15.5,9.5 parent: 1 - - uid: 88 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 11.5,11.5 - parent: 1 - uid: 89 components: - type: Transform @@ -4824,7 +4816,7 @@ entities: components: - type: Transform rot: 3.141592653589793 rad - pos: 15.5,-4.5 + pos: 12.5,11.5 parent: 1 - uid: 125 components: @@ -4874,6 +4866,12 @@ entities: rot: -1.5707963267948966 rad pos: 19.5,4.5 parent: 1 + - uid: 156 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 15.5,-4.5 + parent: 1 - uid: 160 components: - type: Transform @@ -5171,6 +5169,11 @@ entities: rot: 3.141592653589793 rad pos: 23.5,3.5 parent: 1 + - uid: 267 + components: + - type: Transform + pos: 11.5,11.5 + parent: 1 - uid: 278 components: - type: Transform diff --git a/Resources/Prototypes/_NF/Shipyard/stasis.yml b/Resources/Prototypes/_NF/Shipyard/stasis.yml index d8163f2c046..c3c8e89ce0f 100644 --- a/Resources/Prototypes/_NF/Shipyard/stasis.yml +++ b/Resources/Prototypes/_NF/Shipyard/stasis.yml @@ -12,7 +12,7 @@ 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: 54000 #Appraise value 50196 with ~8% markup - TODO: fix this value, getting tests to pass - Whatstone + price: 55000 # TODO: fix this value, getting tests to pass - Whatstone category: Medium group: Shipyard shuttlePath: /Maps/_NF/Shuttles/stasis.yml From 6060339f0e5a7bcc20e7b4e3e7a5cda6a0fe1800 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Thu, 17 Oct 2024 21:36:11 +0000 Subject: [PATCH 45/76] Automatic Changelog (#2207) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index cda4642a3ac..cdfc202041c 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4684,3 +4684,9 @@ Entries: message: Added foldable plastic table to compliment folding chairs. id: 5419 time: '2024-10-17T20:59:15.0000000+00:00' +- author: dustylens + changes: + - type: Add + message: FSB Stasis now boasts a medical assembler. + id: 5420 + time: '2024-10-17T21:35:46.0000000+00:00' From d6ae4e51713d692c36912a050c4f157c2a5f738f Mon Sep 17 00:00:00 2001 From: Whatstone <166147148+whatston3@users.noreply.github.com> Date: Thu, 17 Oct 2024 17:55:25 -0400 Subject: [PATCH 46/76] Remove salvage magnet board recipes (#2272) * Remove station anchor, salv magnet board recipes * Restore station anchor --- Resources/Prototypes/Entities/Structures/Machines/lathe.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 1324d7c286d..1058cac7277 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -504,7 +504,7 @@ - SpaceHeaterMachineCircuitBoard - CutterMachineCircuitboard - StationAnchorCircuitboard - - SalvageMagnetMachineCircuitboard + # - SalvageMagnetMachineCircuitboard # Frontier - SalvageTechFabCircuitboardNF # Frontier - BlueprintLithographMachineCircuitboard # Frontier dynamicRecipes: @@ -1208,7 +1208,7 @@ - ClothingOuterWinterSci - ClothingOuterWinterRobo # - ClothingOuterWinterSec # Frontier - - ClothingOuterWinterCoatMail + - ClothingOuterWinterCoatMail # Frontier # Ties - ClothingNeckTieRed - ClothingNeckTieDet From f029ce4aaf5cb7373a9fbf079dfbdf6ee7bba0ff Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Thu, 17 Oct 2024 21:55:51 +0000 Subject: [PATCH 47/76] Automatic Changelog (#2272) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index cdfc202041c..97762b554de 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4690,3 +4690,9 @@ Entries: message: FSB Stasis now boasts a medical assembler. id: 5420 time: '2024-10-17T21:35:46.0000000+00:00' +- author: whatston3 + changes: + - type: Remove + message: The salvage magnet is no longer printable from the circuit imprinter. + id: 5421 + time: '2024-10-17T21:55:25.0000000+00:00' From d209f7e1474874ae0685504f9b237833841803ef Mon Sep 17 00:00:00 2001 From: chrome-cirrus <95361+chrome-cirrus@users.noreply.github.com> Date: Fri, 18 Oct 2024 00:46:06 +0200 Subject: [PATCH 48/76] Replace NSF Inquisitor tiny fans with directionals, fix up some other things (#2169) * Replace inquisitor tiny fans with directionals, fix up some other things * Just remove it --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Dvir --- .../Maps/_NF/Shuttles/Nfsd/inquisitor.yml | 3286 ----------------- .../_NF/Shipyard/Nfsd/inquisitor.yml | 29 - 2 files changed, 3315 deletions(-) delete mode 100644 Resources/Maps/_NF/Shuttles/Nfsd/inquisitor.yml delete mode 100644 Resources/Prototypes/_NF/Shipyard/Nfsd/inquisitor.yml diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/inquisitor.yml b/Resources/Maps/_NF/Shuttles/Nfsd/inquisitor.yml deleted file mode 100644 index a481672bafd..00000000000 --- a/Resources/Maps/_NF/Shuttles/Nfsd/inquisitor.yml +++ /dev/null @@ -1,3286 +0,0 @@ -meta: - format: 6 - postmapinit: false -tilemap: - 0: Space - 30: FloorDark - 33: FloorDarkHerringbone - 34: FloorDarkMini - 46: FloorGlass - 108: FloorTechMaint2 - 124: Lattice - 125: Plating -entities: -- proto: "" - entities: - - uid: 1 - components: - - type: MetaData - name: Inquisitor - - type: Transform - pos: 1.6817646,-5.3364935 - parent: invalid - - type: MapGrid - chunks: - 0,0: - ind: 0,0 - tiles: HgAAAAADHgAAAAADHgAAAAABHgAAAAADHgAAAAAAHgAAAAABHgAAAAAAfQAAAAAAIQAAAAADIQAAAAAAIQAAAAACfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACfQAAAAAAbAAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAHgAAAAADfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAIgAAAAADfQAAAAAAfAAAAAAAfQAAAAAAbAAAAAAAfQAAAAAAfAAAAAAAAAAAAAAALgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAIgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAbAAAAAAAbAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIgAAAAACIgAAAAAAfQAAAAAALgAAAAABfQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIgAAAAAAIgAAAAABfQAAAAAAAAAAAAAALgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAADfQAAAAAAfQAAAAAALgAAAAAAAAAAAAAAAAAAAAAALgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - version: 6 - 0,-1: - ind: 0,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAADfQAAAAAAfQAAAAAALgAAAAADAAAAAAAAAAAAAAAALgAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIgAAAAAAIgAAAAADfQAAAAAAAAAAAAAALgAAAAABfQAAAAAAHgAAAAADHgAAAAABHgAAAAABHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIgAAAAABIgAAAAADfQAAAAAALgAAAAACfQAAAAAAHgAAAAACHgAAAAACHgAAAAAAHgAAAAABHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAIgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHgAAAAACHgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAIgAAAAAAfQAAAAAAfAAAAAAAfQAAAAAAHgAAAAACfQAAAAAAfAAAAAAAAAAAAAAALgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADfQAAAAAAbAAAAAAAfQAAAAAAfQAAAAAAHgAAAAADHgAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAADHgAAAAADHgAAAAACHgAAAAABHgAAAAADHgAAAAACfQAAAAAAIQAAAAACIQAAAAADIQAAAAADfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAAAHgAAAAADHgAAAAACHgAAAAADHgAAAAABHgAAAAACbAAAAAAAIQAAAAABIQAAAAAAIQAAAAABfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - version: 6 - -1,-1: - ind: -1,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAADHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAHgAAAAABHgAAAAACfQAAAAAAHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAADfQAAAAAAfAAAAAAAfQAAAAAA - version: 6 - -1,0: - ind: -1,0 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAHgAAAAACHgAAAAABfQAAAAAAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAADHgAAAAADHgAAAAAAHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - version: 6 - - type: Broadphase - - type: Physics - bodyStatus: InAir - angularDamping: 0.05 - linearDamping: 0.05 - fixedRotation: False - bodyType: Dynamic - - type: Fixtures - fixtures: {} - - type: OccluderTree - - type: SpreaderGrid - updateAccumulator: 0.58426464 - - type: Shuttle - - type: GridPathfinding - - type: Gravity - gravityShakeSound: !type:SoundPathSpecifier - path: /Audio/Effects/alert.ogg - - type: DecalGrid - chunkCollection: - version: 2 - nodes: - - node: - color: '#FFFFFFFF' - id: Caution - decals: - 15: 2,0 - - node: - angle: 3.141592653589793 rad - color: '#FFFFFFFF' - id: Caution - decals: - 14: 2,-2 - - node: - color: '#FFFFFFFF' - id: CautionGreyscale - decals: - 16: 6,1 - - node: - angle: 3.141592653589793 rad - color: '#FFFFFFFF' - id: CautionGreyscale - decals: - 17: 6,-3 - - node: - angle: -3.141592653589793 rad - color: '#FFFFFFFF' - id: Dirt - decals: - 3: 1,-7 - 4: 2,-7 - - node: - angle: -1.5707963267948966 rad - color: '#FFFFFFFF' - id: Dirt - decals: - 2: 2,-6 - - node: - color: '#FFFFFFFF' - id: Dirt - decals: - 1: 2,-5 - 5: 2,2 - 10: 1,-6 - 13: 2,4 - - node: - angle: 1.5707963267948966 rad - color: '#FFFFFFFF' - id: Dirt - decals: - 0: 2,-4 - 6: 2,3 - - node: - angle: 4.71238898038469 rad - color: '#FFFFFFFF' - id: Dirt - decals: - 7: 2,5 - 8: 1,5 - - node: - angle: 6.283185307179586 rad - color: '#FFFFFFFF' - id: Dirt - decals: - 9: 1,4 - - node: - cleanable: True - color: '#FFFFFFFF' - id: DirtHeavy - decals: - 20: -1,1 - 21: 0,-1 - 22: 1,0 - 23: 2,-1 - 24: 4,-1 - 25: 5,-1 - 26: 5,0 - 27: 6,1 - 28: 6,3 - 29: 7,4 - 30: 8,4 - 31: 9,4 - 32: 9,-1 - 33: 8,-2 - 34: 9,-6 - 35: 8,-6 - 36: 7,-6 - 37: 6,-5 - 38: 6,-4 - 39: 6,-3 - 40: 5,-1 - 41: 2,-3 - 42: 2,-5 - 43: 0,-2 - 44: 0,-3 - 45: -1,-3 - 46: -3,-3 - 47: -4,-3 - 48: -4,-2 - 49: -4,-1 - 50: -4,0 - 51: -4,1 - 52: -3,1 - 53: -3,0 - 54: -3,-2 - 55: -1,-2 - 56: -1,0 - 57: 0,1 - 58: 0,0 - 59: 0,-1 - 60: 3,-1 - 61: 4,0 - 62: 0,-1 - 63: 2,-1 - 64: 3,-1 - 65: 5,-1 - 66: 1,-1 - 67: 1,-1 - 68: 2,0 - 69: 5,0 - 70: 6,1 - 71: 6,1 - 72: 6,3 - 73: 6,3 - 74: 6,4 - 75: 8,4 - 76: 9,4 - 77: 9,4 - 78: 6,2 - 79: 6,-4 - 80: 6,-1 - 81: 7,-1 - 82: 8,-1 - 83: 8,-1 - 84: 6,-1 - 85: 6,-1 - 86: 5,-2 - 87: 6,-2 - - node: - angle: 1.5707963267948966 rad - color: '#FFFFFFFF' - id: LoadingAreaGreyscale - decals: - 18: -4,-2 - 19: -4,0 - - node: - color: '#FFFFFFFF' - id: WarnLineW - decals: - 11: 2,0 - - node: - angle: 3.141592653589793 rad - color: '#FFFFFFFF' - id: WarnLineW - decals: - 12: 2,-2 - - type: GridAtmosphere - version: 2 - data: - tiles: - 0,0: - 0: 61439 - 1: 4096 - 0,-1: - 0: 65535 - -1,-1: - 0: 49151 - 1: 16384 - -1,0: - 0: 4095 - 0,1: - 0: 1791 - 1: 2304 - 1,0: - 0: 61183 - 1: 256 - 1,1: - 0: 2254 - 1: 1056 - 2,0: - 0: 28799 - 1: 33152 - 2,1: - 0: 2047 - 1: 2048 - 0,-2: - 1: 4105 - 0: 61430 - 1,-2: - 1: 36 - 0: 61128 - 1,-1: - 1: 1 - 0: 65534 - 2,-2: - 0: 32759 - 1: 32776 - 2,-1: - 1: 129 - 0: 65392 - -2,-1: - 1: 8 - 0: 34944 - -2,0: - 0: 136 - 1: 2048 - uniqueMixes: - - volume: 2500 - temperature: 293.15 - moles: - - 21.824879 - - 82.10312 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - volume: 2500 - temperature: 293.15 - moles: - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - chunkSize: 4 - - type: GasTileOverlay - - type: BecomesStation - id: Inquisitor - - type: RadiationGridResistance - - type: GravityShake - shakeTimes: 10 -- proto: AirAlarm - entities: - - uid: 2 - components: - - type: Transform - pos: 3.5,1.5 - parent: 1 - - type: DeviceNetwork - address: AIR-07EE-EDC5 - transmitFrequency: 1621 - receiveFrequency: 1621 - - type: DeviceList - devices: - - 163 - - 162 - - 158 - - 156 - - 164 - - 154 - - 160 - - 234 - - 227 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: - - 3 - - uid: 11 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,3.5 - parent: 1 - - type: DeviceList - devices: - - 229 - - 225 - - uid: 13 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,-4.5 - parent: 1 - - type: DeviceList - devices: - - 231 - - 226 - - uid: 18 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 5.5,-4.5 - parent: 1 - - type: DeviceList - devices: - - 224 - - 230 - - uid: 24 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 5.5,3.5 - parent: 1 - - type: DeviceList - devices: - - 232 - - 228 - - uid: 105 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 7.5,-1.5 - parent: 1 - - type: DeviceList - devices: - - 223 - - 233 -- proto: AirAlarmElectronics - entities: - - uid: 3 - components: - - type: Transform - parent: 2 - - type: Physics - canCollide: False -- proto: AirCanister - entities: - - uid: 25 - components: - - type: Transform - anchored: True - pos: 10.5,4.5 - parent: 1 - - type: Physics - bodyType: Static -- proto: AirlockGlassShuttle - entities: - - uid: 15 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -4.5,0.5 - parent: 1 - - uid: 16 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -4.5,-1.5 - parent: 1 -- proto: AirlockNfsdGlassLocked - entities: - - uid: 17 - components: - - type: Transform - pos: 2.5,1.5 - parent: 1 - - uid: 19 - components: - - type: Transform - pos: 7.5,-0.5 - parent: 1 - - uid: 20 - components: - - type: Transform - pos: -1.5,-2.5 - parent: 1 - - uid: 21 - components: - - type: Transform - pos: -1.5,1.5 - parent: 1 - - uid: 22 - components: - - type: Transform - pos: 2.5,-2.5 - parent: 1 - - uid: 23 - components: - - type: Transform - pos: 6.5,-3.5 - parent: 1 -- proto: AirlockNfsdLocked - entities: - - uid: 10 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 6.5,2.5 - parent: 1 -- proto: APCBasic - entities: - - uid: 30 - components: - - type: Transform - pos: 9.5,6.5 - parent: 1 - - type: Battery - startingCharge: 0 - - type: Apc - hasAccess: True - lastChargeState: Charging - - uid: 31 - components: - - type: Transform - pos: 8.5,1.5 - parent: 1 -- proto: AtmosDeviceFanTiny - entities: - - uid: 32 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -4.5,-1.5 - parent: 1 - - uid: 33 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -4.5,0.5 - parent: 1 -- proto: AtmosFixBlockerMarker - entities: - - uid: 4 - components: - - type: Transform - pos: 11.5,3.5 - parent: 1 - - uid: 5 - components: - - type: Transform - pos: 11.5,-7.5 - parent: 1 - - uid: 6 - components: - - type: Transform - pos: 11.5,1.5 - parent: 1 - - uid: 7 - components: - - type: Transform - pos: 11.5,-4.5 - parent: 1 - - uid: 8 - components: - - type: Transform - pos: 11.5,-2.5 - parent: 1 - - uid: 12 - components: - - type: Transform - pos: 3.5,-7.5 - parent: 1 - - uid: 14 - components: - - type: Transform - pos: 5.5,-6.5 - parent: 1 - - uid: 26 - components: - - type: Transform - pos: 0.5,6.5 - parent: 1 - - uid: 27 - components: - - type: Transform - pos: 6.5,6.5 - parent: 1 - - uid: 28 - components: - - type: Transform - pos: 11.5,6.5 - parent: 1 - - uid: 101 - components: - - type: Transform - pos: 3.5,6.5 - parent: 1 - - uid: 107 - components: - - type: Transform - pos: 5.5,5.5 - parent: 1 - - uid: 108 - components: - - type: Transform - pos: 6.5,-7.5 - parent: 1 - - uid: 359 - components: - - type: Transform - pos: 0.5,-7.5 - parent: 1 - - uid: 382 - components: - - type: Transform - pos: 10.5,-3.5 - parent: 1 - - uid: 388 - components: - - type: Transform - pos: 10.5,2.5 - parent: 1 - - uid: 393 - components: - - type: Transform - pos: 4.5,4.5 - parent: 1 - - uid: 400 - components: - - type: Transform - pos: 4.5,-5.5 - parent: 1 - - uid: 434 - components: - - type: Transform - pos: -4.5,2.5 - parent: 1 - - uid: 435 - components: - - type: Transform - pos: -4.5,-3.5 - parent: 1 - - uid: 436 - components: - - type: Transform - pos: -1.5,-0.5 - parent: 1 - - uid: 437 - components: - - type: Transform - pos: 4.5,2.5 - parent: 1 - - uid: 438 - components: - - type: Transform - pos: 4.5,-3.5 - parent: 1 - - uid: 439 - components: - - type: Transform - pos: 0.5,-4.5 - parent: 1 - - uid: 440 - components: - - type: Transform - pos: 0.5,3.5 - parent: 1 - - uid: 441 - components: - - type: Transform - pos: 8.5,-3.5 - parent: 1 - - uid: 442 - components: - - type: Transform - pos: 8.5,2.5 - parent: 1 -- proto: BarSign - entities: - - uid: 34 - components: - - type: MetaData - desc: Anteriormente ubicado en Spessmerica. - name: Zocalo - - type: Transform - pos: 9.5,-4.5 - parent: 1 - - type: BarSign - current: Zocalo -- proto: Bed - entities: - - uid: 35 - components: - - type: Transform - pos: 2.5,5.5 - parent: 1 - - uid: 36 - components: - - type: Transform - pos: 2.5,-6.5 - parent: 1 -- proto: BedsheetBlack - entities: - - uid: 37 - components: - - type: Transform - pos: 2.5,-6.5 - parent: 1 - - uid: 38 - components: - - type: Transform - pos: 2.5,5.5 - parent: 1 -- proto: CableApcExtension - entities: - - uid: 39 - components: - - type: Transform - pos: 2.5,-3.5 - parent: 1 - - uid: 40 - components: - - type: Transform - pos: 8.5,1.5 - parent: 1 - - uid: 41 - components: - - type: Transform - pos: 8.5,0.5 - parent: 1 - - uid: 42 - components: - - type: Transform - pos: 9.5,-0.5 - parent: 1 - - uid: 43 - components: - - type: Transform - pos: 5.5,-0.5 - parent: 1 - - uid: 44 - components: - - type: Transform - pos: -2.5,1.5 - parent: 1 - - uid: 45 - components: - - type: Transform - pos: -2.5,1.5 - parent: 1 - - uid: 46 - components: - - type: Transform - pos: -1.5,1.5 - parent: 1 - - type: Forensics - residues: [] - dnas: [] - fibers: - - black insulative fibers - fingerprints: [] - - uid: 47 - components: - - type: Transform - pos: 1.5,0.5 - parent: 1 - - uid: 48 - components: - - type: Transform - pos: 0.5,1.5 - parent: 1 - - uid: 49 - components: - - type: Transform - pos: -0.5,1.5 - parent: 1 - - uid: 50 - components: - - type: Transform - pos: 0.5,0.5 - parent: 1 - - uid: 51 - components: - - type: Transform - pos: 2.5,-5.5 - parent: 1 - - uid: 52 - components: - - type: Transform - pos: 9.5,6.5 - parent: 1 - - uid: 53 - components: - - type: Transform - pos: 9.5,5.5 - parent: 1 - - uid: 54 - components: - - type: Transform - pos: 9.5,4.5 - parent: 1 - - uid: 55 - components: - - type: Transform - pos: 8.5,4.5 - parent: 1 - - uid: 56 - components: - - type: Transform - pos: 7.5,4.5 - parent: 1 - - uid: 57 - components: - - type: Transform - pos: 6.5,-2.5 - parent: 1 - - uid: 58 - components: - - type: Transform - pos: 4.5,1.5 - parent: 1 - - uid: 59 - components: - - type: Transform - pos: 4.5,0.5 - parent: 1 - - uid: 60 - components: - - type: Transform - pos: 3.5,-0.5 - parent: 1 - - uid: 61 - components: - - type: Transform - pos: 2.5,-0.5 - parent: 1 - - uid: 62 - components: - - type: Transform - pos: 0.5,-1.5 - parent: 1 - - uid: 63 - components: - - type: Transform - pos: 1.5,-1.5 - parent: 1 - - uid: 64 - components: - - type: Transform - pos: -0.5,-2.5 - parent: 1 - - uid: 65 - components: - - type: Transform - pos: 0.5,-2.5 - parent: 1 - - uid: 66 - components: - - type: Transform - pos: -1.5,-2.5 - parent: 1 - - uid: 67 - components: - - type: Transform - pos: -2.5,-2.5 - parent: 1 - - uid: 68 - components: - - type: Transform - pos: -1.5,-2.5 - parent: 1 - - uid: 69 - components: - - type: Transform - pos: -2.5,-2.5 - parent: 1 - - uid: 70 - components: - - type: Transform - pos: 4.5,-0.5 - parent: 1 - - uid: 71 - components: - - type: Transform - pos: 7.5,-0.5 - parent: 1 - - uid: 72 - components: - - type: Transform - pos: 6.5,-0.5 - parent: 1 - - uid: 73 - components: - - type: Transform - pos: 6.5,-3.5 - parent: 1 - - uid: 74 - components: - - type: Transform - pos: 8.5,-0.5 - parent: 1 - - uid: 75 - components: - - type: Transform - pos: 6.5,-4.5 - parent: 1 - - uid: 76 - components: - - type: Transform - pos: 7.5,-5.5 - parent: 1 - - uid: 77 - components: - - type: Transform - pos: 8.5,-5.5 - parent: 1 - - uid: 78 - components: - - type: Transform - pos: 9.5,-5.5 - parent: 1 - - uid: 79 - components: - - type: Transform - pos: 10.5,-5.5 - parent: 1 - - uid: 80 - components: - - type: Transform - pos: 2.5,-1.5 - parent: 1 - - uid: 81 - components: - - type: Transform - pos: 2.5,-2.5 - parent: 1 - - uid: 82 - components: - - type: Transform - pos: 6.5,-5.5 - parent: 1 - - uid: 83 - components: - - type: Transform - pos: 2.5,-4.5 - parent: 1 - - uid: 84 - components: - - type: Transform - pos: 2.5,-6.5 - parent: 1 - - uid: 85 - components: - - type: Transform - pos: 2.5,0.5 - parent: 1 - - uid: 86 - components: - - type: Transform - pos: 2.5,1.5 - parent: 1 - - uid: 87 - components: - - type: Transform - pos: 2.5,2.5 - parent: 1 - - uid: 88 - components: - - type: Transform - pos: 2.5,3.5 - parent: 1 - - uid: 89 - components: - - type: Transform - pos: 2.5,3.5 - parent: 1 - - uid: 90 - components: - - type: Transform - pos: 2.5,4.5 - parent: 1 - - uid: 91 - components: - - type: Transform - pos: 2.5,5.5 - parent: 1 - - uid: 92 - components: - - type: Transform - pos: 6.5,-1.5 - parent: 1 -- proto: CableApcStack1 - entities: - - uid: 94 - components: - - type: Transform - parent: 93 - - type: Stack - count: 5 - - type: Item - size: 5 - - type: Physics - canCollide: False -- proto: CableHV - entities: - - uid: 98 - components: - - type: Transform - pos: 8.5,5.5 - parent: 1 - - uid: 103 - components: - - type: Transform - pos: 7.5,5.5 - parent: 1 - - uid: 106 - components: - - type: Transform - pos: 9.5,5.5 - parent: 1 -- proto: CableMV - entities: - - uid: 112 - components: - - type: Transform - pos: 7.5,3.5 - parent: 1 - - uid: 113 - components: - - type: Transform - pos: 7.5,1.5 - parent: 1 - - uid: 114 - components: - - type: Transform - pos: 8.5,1.5 - parent: 1 - - uid: 115 - components: - - type: Transform - pos: 7.5,2.5 - parent: 1 - - uid: 117 - components: - - type: Transform - pos: 9.5,4.5 - parent: 1 - - uid: 118 - components: - - type: Transform - pos: 9.5,5.5 - parent: 1 - - uid: 119 - components: - - type: Transform - pos: 9.5,6.5 - parent: 1 - - uid: 120 - components: - - type: Transform - pos: 9.5,4.5 - parent: 1 - - uid: 122 - components: - - type: Transform - pos: 9.5,4.5 - parent: 1 - - uid: 123 - components: - - type: Transform - pos: 8.5,4.5 - parent: 1 - - uid: 124 - components: - - type: Transform - pos: 7.5,4.5 - parent: 1 -- proto: CapacitorStockPart - entities: - - uid: 95 - components: - - type: Transform - parent: 93 - - type: Physics - canCollide: False - - uid: 96 - components: - - type: Transform - parent: 93 - - type: Physics - canCollide: False -- proto: Catwalk - entities: - - uid: 125 - components: - - type: Transform - pos: 7.5,5.5 - parent: 1 - - uid: 126 - components: - - type: Transform - pos: 9.5,5.5 - parent: 1 - - uid: 127 - components: - - type: Transform - pos: 10.5,5.5 - parent: 1 - - uid: 128 - components: - - type: Transform - pos: 8.5,5.5 - parent: 1 - - uid: 129 - components: - - type: Transform - pos: 10.5,4.5 - parent: 1 -- proto: CellRechargerCircuitboard - entities: - - uid: 97 - components: - - type: Transform - parent: 93 - - type: Physics - canCollide: False -- proto: ChairOfficeDark - entities: - - uid: 130 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 9.5,-0.5 - parent: 1 - - uid: 131 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 9.5,-5.5 - parent: 1 -- proto: ClosetWall - entities: - - uid: 132 - components: - - type: Transform - pos: 6.5,5.5 - parent: 1 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - 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: - - 133 - - 134 -- proto: ComputerPowerMonitoring - entities: - - uid: 29 - components: - - type: Transform - pos: 8.5,5.5 - parent: 1 -- proto: ComputerTabletopCrewMonitoring - entities: - - uid: 138 - components: - - type: Transform - pos: 9.5,0.5 - parent: 1 -- proto: ComputerTabletopCriminalRecords - entities: - - uid: 137 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 10.5,-5.5 - parent: 1 -- proto: ComputerTabletopShuttle - entities: - - uid: 136 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 10.5,-0.5 - parent: 1 -- proto: ComputerTabletopStationRecords - entities: - - uid: 139 - components: - - type: Transform - pos: 8.5,0.5 - parent: 1 -- proto: DoorElectronics - entities: - - uid: 141 - components: - - type: Transform - parent: 140 - - type: Physics - canCollide: False - - uid: 143 - components: - - type: Transform - parent: 142 - - type: Physics - canCollide: False - - uid: 145 - components: - - type: Transform - parent: 144 - - type: Physics - canCollide: False -- proto: EmergencyLight - entities: - - uid: 146 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,0.5 - parent: 1 - - uid: 147 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,-6.5 - parent: 1 - - type: PointLight - enabled: True - - type: Battery - startingCharge: 10198.422 - - type: ActiveEmergencyLight - - uid: 148 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 9.5,-6.5 - parent: 1 - - type: PointLight - enabled: True - - type: Battery - startingCharge: 5770.106 - - type: ActiveEmergencyLight - - uid: 149 - components: - - type: Transform - pos: 2.5,5.5 - parent: 1 - - type: PointLight - enabled: True - - type: Battery - startingCharge: 10316.518 - - type: ActiveEmergencyLight - - uid: 150 - components: - - type: Transform - pos: 9.5,5.5 - parent: 1 - - uid: 151 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 9.5,-1.5 - parent: 1 - - type: PointLight - enabled: True - - type: Battery - startingCharge: 5948.6265 - - type: ActiveEmergencyLight - - uid: 152 - components: - - type: Transform - pos: -3.5,1.5 - parent: 1 -- proto: FaxMachineShip - entities: - - uid: 153 - components: - - type: Transform - pos: 10.5,0.5 - parent: 1 -- proto: FirelockElectronics - entities: - - uid: 155 - components: - - type: Transform - parent: 154 - - type: Physics - canCollide: False - - uid: 157 - components: - - type: Transform - parent: 156 - - type: Physics - canCollide: False - - uid: 159 - components: - - type: Transform - parent: 158 - - type: Physics - canCollide: False - - uid: 161 - components: - - type: Transform - parent: 160 - - type: Physics - canCollide: False -- proto: FirelockGlass - entities: - - uid: 154 - components: - - type: Transform - pos: 7.5,-0.5 - parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: - - 155 - - type: DeviceNetwork - address: 2A2F-32C5 - receiveFrequency: 1621 - - uid: 156 - components: - - type: Transform - pos: 2.5,-2.5 - parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: - - 157 - - type: DeviceNetwork - address: 69E1-ED5D - receiveFrequency: 1621 - - uid: 158 - components: - - type: Transform - pos: 2.5,1.5 - parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: - - 159 - - type: DeviceNetwork - address: 4EBA-47B3 - receiveFrequency: 1621 - - uid: 160 - components: - - type: Transform - pos: 6.5,-3.5 - parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: - - 161 - - type: DeviceNetwork - address: 6D3F-5E6B - receiveFrequency: 1621 - - uid: 162 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -1.5,-2.5 - parent: 1 - - uid: 163 - components: - - type: Transform - pos: -1.5,1.5 - parent: 1 - - uid: 164 - components: - - type: Transform - pos: 6.5,2.5 - parent: 1 -- proto: GasPassiveVent - entities: - - uid: 165 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 4.5,2.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' -- proto: GasPipeBend - entities: - - uid: 166 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 6.5,4.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 167 - components: - - type: Transform - pos: 3.5,5.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 168 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,-6.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 169 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,2.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 170 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,0.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 171 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,0.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 172 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 5.5,3.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' -- proto: GasPipeFourway - entities: - - uid: 173 - components: - - type: Transform - pos: 7.5,-0.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 174 - components: - - type: Transform - pos: 3.5,-0.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' -- proto: GasPipeStraight - entities: - - uid: 102 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 9.5,4.5 - parent: 1 - - uid: 175 - components: - - type: Transform - pos: 7.5,-3.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 176 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 4.5,-1.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 177 - components: - - type: Transform - pos: 7.5,3.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 178 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 6.5,-0.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 179 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 6.5,-3.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 180 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 7.5,0.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 181 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 3.5,-1.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 182 - components: - - type: Transform - pos: 7.5,-2.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 183 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 5.5,-0.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 184 - components: - - type: Transform - pos: 7.5,2.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 185 - components: - - type: Transform - pos: 7.5,-1.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 186 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 6.5,-2.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 187 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 5.5,-1.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 188 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,1.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 189 - components: - - type: Transform - pos: 3.5,2.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 190 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 6.5,1.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 191 - components: - - type: Transform - pos: 3.5,-4.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 192 - components: - - type: Transform - pos: 7.5,-5.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 193 - components: - - type: Transform - pos: 3.5,-5.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 194 - components: - - type: Transform - pos: 7.5,-4.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 195 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,-4.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 196 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,2.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 197 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,3.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 198 - components: - - type: Transform - pos: 3.5,1.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 199 - components: - - type: Transform - pos: 3.5,-1.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 200 - components: - - type: Transform - pos: 3.5,3.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 201 - components: - - type: Transform - pos: 3.5,4.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 202 - components: - - type: Transform - pos: 3.5,0.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 203 - components: - - type: Transform - pos: 6.5,2.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 204 - components: - - type: Transform - pos: 7.5,1.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 205 - components: - - type: Transform - pos: 7.5,0.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 206 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,-3.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 207 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,-2.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 208 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 6.5,-0.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 209 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 4.5,-0.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 210 - components: - - type: Transform - pos: 1.5,-0.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 211 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 2.5,5.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 212 - components: - - type: Transform - pos: 3.5,-2.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 213 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 2.5,-6.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 214 - components: - - type: Transform - pos: 3.5,-3.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' -- proto: GasPipeTJunction - entities: - - uid: 215 - components: - - type: Transform - pos: 2.5,-1.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 216 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 7.5,4.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 217 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,3.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 218 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 6.5,0.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 219 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,-1.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 220 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,-1.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' -- proto: GasPort - entities: - - uid: 9 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 10.5,4.5 - parent: 1 -- proto: GasPressurePump - entities: - - uid: 222 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 8.5,4.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' -- proto: GasVentPump - entities: - - uid: 223 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 8.5,-0.5 - parent: 1 - - type: DeviceNetwork - deviceLists: - - 105 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 224 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 7.5,-6.5 - parent: 1 - - type: DeviceNetwork - deviceLists: - - 18 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 225 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,5.5 - parent: 1 - - type: DeviceNetwork - deviceLists: - - 11 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 226 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,-6.5 - parent: 1 - - type: DeviceNetwork - deviceLists: - - 13 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 227 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 2.5,-0.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 228 - components: - - type: Transform - pos: 7.5,5.5 - parent: 1 - - type: DeviceNetwork - deviceLists: - - 24 - - type: AtmosPipeColor - color: '#0055CCFF' -- proto: GasVentScrubber - entities: - - uid: 229 - components: - - type: Transform - pos: 2.5,4.5 - parent: 1 - - type: DeviceNetwork - deviceLists: - - 11 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 230 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 6.5,-4.5 - parent: 1 - - type: DeviceNetwork - deviceLists: - - 18 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 231 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,-5.5 - parent: 1 - - type: DeviceNetwork - deviceLists: - - 13 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 232 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 7.5,4.5 - parent: 1 - - type: DeviceNetwork - deviceLists: - - 24 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 233 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 8.5,0.5 - parent: 1 - - type: DeviceNetwork - deviceLists: - - 105 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 234 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 0.5,-1.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' -- proto: GravityGeneratorMini - entities: - - uid: 100 - components: - - type: Transform - pos: 10.5,5.5 - parent: 1 -- proto: Grille - entities: - - uid: 236 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -4.5,1.5 - parent: 1 - - uid: 237 - components: - - type: Transform - pos: -0.5,-3.5 - parent: 1 - - uid: 238 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -4.5,-2.5 - parent: 1 - - uid: 239 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -1.5,-1.5 - parent: 1 - - uid: 240 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -4.5,-0.5 - parent: 1 - - uid: 241 - components: - - type: Transform - pos: -1.5,0.5 - parent: 1 - - uid: 242 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,-0.5 - parent: 1 - - uid: 243 - components: - - type: Transform - pos: -0.5,2.5 - parent: 1 - - uid: 244 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,-0.5 - parent: 1 - - uid: 245 - components: - - type: Transform - pos: 11.5,-6.5 - parent: 1 - - uid: 246 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,-6.5 - parent: 1 - - uid: 247 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -2.5,-3.5 - parent: 1 - - uid: 248 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,5.5 - parent: 1 - - uid: 249 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 11.5,0.5 - parent: 1 - - uid: 250 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,-5.5 - parent: 1 - - uid: 251 - components: - - type: Transform - pos: 11.5,-5.5 - parent: 1 - - uid: 252 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 11.5,-0.5 - parent: 1 - - uid: 253 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,5.5 - parent: 1 - - uid: 254 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -2.5,2.5 - parent: 1 - - uid: 255 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,4.5 - parent: 1 - - uid: 256 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,-6.5 - parent: 1 - - uid: 257 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 11.5,-1.5 - parent: 1 -- proto: GyroscopeNfsd - entities: - - uid: 258 - components: - - type: Transform - pos: -1.5,-0.5 - parent: 1 - - type: Thruster - originalPowerLoad: 1500 -- proto: LockerNfsdSilverDetectiveFilled - entities: - - uid: 259 - components: - - type: Transform - pos: 8.5,-6.5 - parent: 1 -- proto: LockerNfsdEvidence - entities: - - uid: 260 - components: - - type: Transform - pos: 3.5,-1.5 - parent: 1 - - uid: 261 - components: - - type: Transform - pos: 3.5,0.5 - parent: 1 -- proto: LockerNfsdSilver - entities: - - uid: 262 - components: - - type: Transform - pos: 9.5,-1.5 - parent: 1 -- proto: PortableGeneratorPacmanShuttle - entities: - - uid: 99 - components: - - type: Transform - pos: 7.5,5.5 - parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static -- proto: PosterContrabandBorgFancy - entities: - - uid: 263 - components: - - type: Transform - pos: -1.5,-3.5 - parent: 1 -- proto: PosterContrabandDonutCorp - entities: - - uid: 264 - components: - - type: Transform - pos: 3.5,-3.5 - parent: 1 -- proto: PosterContrabandNuclearDeviceInformational - entities: - - uid: 265 - components: - - type: Transform - pos: 1.5,-7.5 - parent: 1 -- proto: PosterContrabandWehWatches - entities: - - uid: 266 - components: - - type: Transform - pos: 1.5,6.5 - parent: 1 -- proto: PosterLegit12Gauge - entities: - - uid: 267 - components: - - type: Transform - pos: -1.5,2.5 - parent: 1 -- proto: PosterLegitCarbonDioxide - entities: - - uid: 268 - components: - - type: Transform - pos: 10.5,1.5 - parent: 1 -- proto: PosterLegitEnlist - entities: - - uid: 269 - components: - - type: Transform - pos: 8.5,3.5 - parent: 1 -- proto: PosterLegitFruitBowl - entities: - - uid: 270 - components: - - type: Transform - pos: 7.5,-7.5 - parent: 1 -- proto: PosterLegitGetYourLEGS - entities: - - uid: 271 - components: - - type: Transform - pos: 3.5,2.5 - parent: 1 -- proto: PosterLegitLoveIan - entities: - - uid: 272 - components: - - type: Transform - pos: 6.5,-6.5 - parent: 1 -- proto: PosterLegitPeriodicTable - entities: - - uid: 273 - components: - - type: Transform - pos: 10.5,-2.5 - parent: 1 -- proto: PowerCellRecharger - entities: - - uid: 93 - components: - - type: Transform - pos: 9.5,-6.5 - parent: 1 - - type: ContainerContainer - containers: - charger_slot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - machine_board: !type:Container - showEnts: False - occludes: True - ents: - - 97 - machine_parts: !type:Container - showEnts: False - occludes: True - ents: - - 95 - - 96 - - 94 - - type: ApcPowerReceiver - powerLoad: 0 -- proto: Poweredlight - entities: - - uid: 274 - components: - - type: Transform - pos: 9.5,0.5 - parent: 1 - - uid: 275 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,-1.5 - parent: 1 - - uid: 276 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 6.5,4.5 - parent: 1 - - uid: 277 - components: - - type: Transform - pos: 1.5,0.5 - parent: 1 - - uid: 278 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -3.5,-2.5 - parent: 1 -- proto: PoweredlightColoredRed - entities: - - uid: 279 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 6.5,-5.5 - parent: 1 -- proto: PoweredSmallLight - entities: - - uid: 280 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,3.5 - parent: 1 - - uid: 281 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,-4.5 - parent: 1 -- proto: Railing - entities: - - uid: 366 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 10.5,2.5 - parent: 1 - - uid: 371 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 10.5,-3.5 - parent: 1 - - uid: 375 - components: - - type: Transform - pos: 4.5,-5.5 - parent: 1 - - uid: 379 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,4.5 - parent: 1 -- proto: SheetPlasma - entities: - - uid: 133 - components: - - type: Transform - parent: 132 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 134 - components: - - type: Transform - parent: 132 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: ShuttersNormalOpen - entities: - - uid: 140 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 11.5,-1.5 - parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: - - 141 - - type: DeviceNetwork - address: 4967-8FDB - receiveFrequency: 1280 - - type: DeviceLinkSink - links: - - 304 - - uid: 142 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 11.5,0.5 - parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: - - 143 - - type: DeviceNetwork - address: 7927-5FE5 - receiveFrequency: 1280 - - type: DeviceLinkSink - links: - - 304 - - uid: 144 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 11.5,-0.5 - parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: - - 145 - - type: DeviceNetwork - address: 2F67-D620 - receiveFrequency: 1280 - - type: DeviceLinkSink - links: - - 304 -- proto: ShuttleWindow - entities: - - uid: 282 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -4.5,1.5 - parent: 1 - - uid: 283 - components: - - type: Transform - pos: -2.5,-0.5 - parent: 1 - - uid: 284 - components: - - type: Transform - pos: -0.5,-3.5 - parent: 1 - - uid: 285 - components: - - type: Transform - pos: -0.5,2.5 - parent: 1 - - uid: 286 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -4.5,-0.5 - parent: 1 - - uid: 287 - components: - - type: Transform - pos: -1.5,0.5 - parent: 1 - - uid: 288 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -4.5,-2.5 - parent: 1 - - uid: 289 - components: - - type: Transform - pos: -2.5,-3.5 - parent: 1 - - uid: 290 - components: - - type: Transform - pos: -0.5,-0.5 - parent: 1 - - uid: 291 - components: - - type: Transform - pos: -1.5,-1.5 - parent: 1 - - uid: 292 - components: - - type: Transform - pos: 11.5,-6.5 - parent: 1 - - uid: 293 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 11.5,0.5 - parent: 1 - - uid: 294 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 11.5,-0.5 - parent: 1 - - uid: 295 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 11.5,-1.5 - parent: 1 - - uid: 296 - components: - - type: Transform - pos: 11.5,-5.5 - parent: 1 - - uid: 297 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,-5.5 - parent: 1 - - uid: 298 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,-6.5 - parent: 1 - - uid: 299 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,-6.5 - parent: 1 - - uid: 300 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,5.5 - parent: 1 - - uid: 301 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,5.5 - parent: 1 - - uid: 302 - components: - - type: Transform - pos: -2.5,2.5 - parent: 1 - - uid: 303 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,4.5 - parent: 1 -- proto: SignalButton - entities: - - uid: 304 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 7.5,0.5 - parent: 1 - - type: DeviceLinkSource - linkedPorts: - 142: - - Pressed: Toggle - 144: - - Pressed: Toggle - 140: - - Pressed: Toggle -- proto: SignBridge - entities: - - uid: 306 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 7.5,0.5 - parent: 1 -- proto: SignConspiracyBoard - entities: - - uid: 307 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 8.5,-7.5 - parent: 1 -- proto: SignDirectionalBrig - entities: - - uid: 308 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,1.5 - parent: 1 - - uid: 309 - components: - - type: Transform - pos: 1.5,-2.5 - parent: 1 -- proto: SignEngineering - entities: - - uid: 310 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 5.5,2.5 - parent: 1 - - uid: 311 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 7.5,2.5 - parent: 1 -- proto: SignFlammableMed - entities: - - uid: 312 - components: - - type: Transform - pos: 7.5,6.5 - parent: 1 -- proto: SignGravity - entities: - - uid: 313 - components: - - type: Transform - pos: 11.5,5.5 - parent: 1 -- proto: SignSec - entities: - - uid: 314 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 7.5,-3.5 - parent: 1 - - uid: 315 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 5.5,-3.5 - parent: 1 -- proto: SpawnPointLatejoin - entities: - - uid: 317 - components: - - type: Transform - pos: 2.5,-0.5 - parent: 1 -- proto: SubstationBasic - entities: - - uid: 104 - components: - - type: Transform - pos: 9.5,5.5 - parent: 1 -- proto: SuitStorageDeputy - entities: - - uid: 319 - components: - - type: Transform - pos: 7.5,-6.5 - parent: 1 - - uid: 320 - components: - - type: Transform - pos: 8.5,-1.5 - parent: 1 -- proto: SuitStorageWallmountEVAPrisoner - entities: - - uid: 321 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,2.5 - parent: 1 - - type: Physics - canCollide: False - - uid: 322 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,-3.5 - parent: 1 - - type: Physics - canCollide: False -- proto: TableWood - entities: - - uid: 323 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 10.5,0.5 - parent: 1 - - uid: 324 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 10.5,-0.5 - parent: 1 - - uid: 325 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 10.5,-1.5 - parent: 1 - - uid: 326 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 10.5,-6.5 - parent: 1 - - uid: 327 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 10.5,-5.5 - parent: 1 - - uid: 328 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 9.5,0.5 - parent: 1 - - uid: 329 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 8.5,0.5 - parent: 1 - - uid: 330 - components: - - type: Transform - pos: 9.5,-6.5 - parent: 1 -- proto: ThrusterNfsd - entities: - - uid: 331 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 8.5,-3.5 - parent: 1 - - type: Thruster - originalPowerLoad: 1500 - - uid: 332 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 8.5,2.5 - parent: 1 - - type: Thruster - originalPowerLoad: 1500 - - uid: 333 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 0.5,3.5 - parent: 1 - - type: Thruster - originalPowerLoad: 1500 - - uid: 334 - components: - - type: Transform - pos: 4.5,2.5 - parent: 1 - - type: Thruster - originalPowerLoad: 1500 - - uid: 335 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 0.5,-4.5 - parent: 1 - - type: Thruster - originalPowerLoad: 1500 - - uid: 336 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,-3.5 - parent: 1 - - type: Thruster - originalPowerLoad: 1500 -- proto: WallShuttle - entities: - - uid: 338 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -3.5,-3.5 - parent: 1 - - uid: 339 - components: - - type: Transform - pos: 3.5,-4.5 - parent: 1 - - uid: 340 - components: - - type: Transform - pos: 7.5,0.5 - parent: 1 - - uid: 341 - components: - - type: Transform - pos: 3.5,3.5 - parent: 1 - - uid: 342 - components: - - type: Transform - pos: 7.5,-1.5 - parent: 1 - - uid: 343 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -3.5,2.5 - parent: 1 - - uid: 344 - components: - - type: Transform - pos: 5.5,-5.5 - parent: 1 - - uid: 346 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,-7.5 - parent: 1 - - uid: 347 - components: - - type: Transform - pos: 4.5,1.5 - parent: 1 - - uid: 348 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 5.5,2.5 - parent: 1 - - uid: 349 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 5.5,3.5 - parent: 1 - - uid: 350 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 7.5,2.5 - parent: 1 - - uid: 351 - components: - - type: Transform - pos: 7.5,1.5 - parent: 1 - - uid: 352 - components: - - type: Transform - pos: 8.5,1.5 - parent: 1 - - uid: 353 - components: - - type: Transform - pos: 9.5,1.5 - parent: 1 - - uid: 354 - components: - - type: Transform - pos: 10.5,1.5 - parent: 1 - - uid: 356 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 10.5,-2.5 - parent: 1 - - uid: 357 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 9.5,-2.5 - parent: 1 - - uid: 358 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 8.5,-2.5 - parent: 1 - - uid: 360 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 7.5,-2.5 - parent: 1 - - uid: 361 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 7.5,-3.5 - parent: 1 - - uid: 362 - components: - - type: Transform - pos: 5.5,-4.5 - parent: 1 - - uid: 363 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 9.5,-4.5 - parent: 1 - - uid: 364 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 8.5,-4.5 - parent: 1 - - uid: 365 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 10.5,-4.5 - parent: 1 - - uid: 367 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 7.5,6.5 - parent: 1 - - uid: 368 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 8.5,6.5 - parent: 1 - - uid: 369 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 9.5,6.5 - parent: 1 - - uid: 370 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 10.5,6.5 - parent: 1 - - uid: 372 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 5.5,-3.5 - parent: 1 - - uid: 373 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-2.5 - parent: 1 - - uid: 374 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,-7.5 - parent: 1 - - uid: 376 - components: - - type: Transform - pos: 8.5,3.5 - parent: 1 - - uid: 377 - components: - - type: Transform - pos: 9.5,3.5 - parent: 1 - - uid: 378 - components: - - type: Transform - pos: 10.5,3.5 - parent: 1 - - uid: 380 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 9.5,-7.5 - parent: 1 - - uid: 381 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 10.5,-7.5 - parent: 1 - - uid: 383 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 11.5,5.5 - parent: 1 - - uid: 384 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 11.5,4.5 - parent: 1 - - uid: 385 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,5.5 - parent: 1 - - uid: 386 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 8.5,-7.5 - parent: 1 - - uid: 387 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 7.5,-7.5 - parent: 1 - - uid: 389 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,-6.5 - parent: 1 - - uid: 390 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,2.5 - parent: 1 - - uid: 391 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 0.5,2.5 - parent: 1 - - uid: 392 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,-3.5 - parent: 1 - - uid: 394 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 3.5,1.5 - parent: 1 - - uid: 395 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 3.5,2.5 - parent: 1 - - uid: 396 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,-4.5 - parent: 1 - - uid: 397 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,-2.5 - parent: 1 - - uid: 398 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,-3.5 - parent: 1 - - uid: 399 - components: - - type: Transform - pos: 1.5,-2.5 - parent: 1 - - uid: 401 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,-5.5 - parent: 1 - - uid: 402 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,1.5 - parent: 1 - - uid: 403 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,-3.5 - parent: 1 - - uid: 404 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 0.5,-3.5 - parent: 1 - - uid: 405 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,6.5 - parent: 1 - - uid: 406 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,6.5 - parent: 1 - - uid: 408 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 0.5,4.5 - parent: 1 - - uid: 409 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,3.5 - parent: 1 - - uid: 410 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,2.5 - parent: 1 - - uid: 412 - components: - - type: Transform - pos: 5.5,4.5 - parent: 1 -- proto: WallShuttleDiagonal - entities: - - uid: 109 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 3.5,-7.5 - parent: 1 - - uid: 110 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 0.5,-7.5 - parent: 1 - - uid: 111 - components: - - type: Transform - pos: 6.5,6.5 - parent: 1 - - uid: 116 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 5.5,-6.5 - parent: 1 - - uid: 121 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,6.5 - parent: 1 - - uid: 135 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 11.5,-2.5 - parent: 1 - - uid: 221 - components: - - type: Transform - pos: 0.5,6.5 - parent: 1 - - uid: 235 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 6.5,-7.5 - parent: 1 - - uid: 305 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 11.5,-7.5 - parent: 1 - - uid: 316 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 11.5,1.5 - parent: 1 - - uid: 318 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 11.5,6.5 - parent: 1 - - uid: 337 - components: - - type: Transform - pos: 5.5,5.5 - parent: 1 - - uid: 345 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 11.5,-4.5 - parent: 1 - - uid: 355 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 11.5,3.5 - parent: 1 - - uid: 414 - components: - - type: Transform - pos: -4.5,2.5 - parent: 1 - - uid: 415 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -4.5,-3.5 - parent: 1 - - uid: 416 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,-1.5 - parent: 1 - - uid: 417 - components: - - type: Transform - pos: -2.5,0.5 - parent: 1 - - uid: 418 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 5.5,1.5 - parent: 1 - - uid: 419 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 7.5,-3.5 - parent: 1 - - uid: 420 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,-2.5 - parent: 1 - - uid: 421 - components: - - type: Transform - pos: 7.5,3.5 - parent: 1 - - uid: 422 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,-1.5 - parent: 1 - - uid: 423 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,-5.5 - parent: 1 - - uid: 424 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,0.5 - parent: 1 - - uid: 425 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 7.5,-4.5 - parent: 1 - - uid: 426 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,4.5 - parent: 1 -- proto: WardrobePrisonFilled - entities: - - uid: 427 - components: - - type: Transform - pos: 4.5,-1.5 - parent: 1 - - uid: 428 - components: - - type: Transform - pos: 4.5,0.5 - parent: 1 -- proto: WarpPointShip - entities: - - uid: 429 - components: - - type: Transform - pos: 4.5,-0.5 - parent: 1 -- proto: WeaponCapacitorRecharger - entities: - - uid: 430 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 10.5,-6.5 - parent: 1 - - uid: 431 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 10.5,-1.5 - parent: 1 -- proto: WindoorSecureSecurityLocked - entities: - - uid: 432 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,3.5 - parent: 1 - - uid: 433 - components: - - type: Transform - pos: 2.5,-4.5 - parent: 1 -... diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/inquisitor.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/inquisitor.yml deleted file mode 100644 index 3f854549638..00000000000 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/inquisitor.yml +++ /dev/null @@ -1,29 +0,0 @@ -- type: vessel - id: Inquisitor - name: NSF Inquisitor - description: A small detective-oriented ship with two cells for holding prisoners - price: 30000 - category: Small - group: Security - access: Detective - shuttlePath: /Maps/_NF/Shuttles/Nfsd/inquisitor.yml - guidebookPage: Null - class: - - Detective - -- type: gameMap - id: Inquisitor - mapName: 'NSF Inquisitor' - mapPath: /Maps/_NF/Shuttles/Nfsd/inquisitor.yml - minPlayers: 0 - stations: - Inquisitor: - stationProto: StandardFrontierSecurityVessel - components: - - type: StationNameSetup - mapNameTemplate: 'Inquisitor {1}' - nameGenerator: - !type:NanotrasenNameGenerator - prefixCreator: '14' - - type: StationJobs - availableJobs: {} From 8056cdf1b7726b39420893a790240aafed87de68 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Thu, 17 Oct 2024 22:55:20 +0000 Subject: [PATCH 49/76] Automatic Changelog (#2169) --- Resources/Changelog/Frontier.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 97762b554de..4f9cf406f0e 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4696,3 +4696,11 @@ Entries: message: The salvage magnet is no longer printable from the circuit imprinter. id: 5421 time: '2024-10-17T21:55:25.0000000+00:00' +- author: dvir001 + changes: + - type: Remove + message: >- + Removed Inquisitor from the nfsd shipyard, as there are new ships to + replace it. + id: 5422 + time: '2024-10-17T22:46:06.0000000+00:00' From ce248f0748738d03c416018617feded674006511 Mon Sep 17 00:00:00 2001 From: Tych0 <151581207+Tych0theSynth@users.noreply.github.com> Date: Thu, 17 Oct 2024 23:55:57 +0100 Subject: [PATCH 50/76] updates the NSF Prowler (#2094) Co-authored-by: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- Resources/Maps/_NF/Shuttles/Nfsd/prowler.yml | 1864 +++++++++-------- .../Prototypes/_NF/Shipyard/Nfsd/prowler.yml | 4 +- 2 files changed, 978 insertions(+), 890 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/prowler.yml b/Resources/Maps/_NF/Shuttles/Nfsd/prowler.yml index 010aa61d5ae..de1a67fbcd8 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/prowler.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/prowler.yml @@ -4,10 +4,14 @@ meta: tilemap: 0: Space 30: FloorDark + 2: FloorDarkMono 56: FloorGym 57: FloorHull + 3: FloorHullReinforced + 1: FloorMetalDiamond 80: FloorRockVault 107: FloorTechMaint + 4: FloorTechMaint2 124: Lattice 125: Plating entities: @@ -24,19 +28,19 @@ entities: chunks: 0,0: ind: 0,0 - tiles: UAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAHgAAAAAAHgAAAAADHgAAAAADawAAAAAAHgAAAAADHgAAAAABUAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAADHgAAAAAAHgAAAAACHgAAAAACHgAAAAAAHgAAAAABHgAAAAABHgAAAAAAHgAAAAABUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAAAHgAAAAACUAAAAAAAawAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAADHgAAAAABUAAAAAAAUAAAAAAAUAAAAAAAOQAAAAAAOQAAAAAAUAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAADHgAAAAACUAAAAAAAUAAAAAAAawAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAHgAAAAADHgAAAAACUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAAAHgAAAAACHgAAAAAAHgAAAAABUAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAACHgAAAAAAHgAAAAACUAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAABHgAAAAADUAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAawAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHgAAAAABHgAAAAABHgAAAAADBAAAAAAABAAAAAAABAAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAAAHgAAAAACHgAAAAAAHgAAAAABHgAAAAACHgAAAAACHgAAAAABBAAAAAAABAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAAAHgAAAAABfQAAAAAAAgAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAAAHgAAAAAAfQAAAAAAAQAAAAAAUAAAAAAAAwAAAAAAAwAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAACHgAAAAAAfQAAAAAAAQAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAADHgAAAAABHgAAAAAAHgAAAAACfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAABHgAAAAABHgAAAAADfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAABHgAAAAACfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,0: ind: -1,0 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAUAAAAAAAHgAAAAACHgAAAAAAHgAAAAADHgAAAAACawAAAAAAHgAAAAACHgAAAAADUAAAAAAAawAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAHgAAAAADHgAAAAAAHgAAAAAAHgAAAAADHgAAAAABHgAAAAACHgAAAAABHgAAAAADHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAawAAAAAAUAAAAAAAHgAAAAAAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAUAAAAAAAOQAAAAAAOQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAHgAAAAAAHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAawAAAAAAUAAAAAAAUAAAAAAAHgAAAAAAHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAHgAAAAABHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAUAAAAAAAHgAAAAAAHgAAAAACHgAAAAADHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAUAAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAUAAAAAAAHgAAAAADHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAawAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAADHgAAAAADHgAAAAACHgAAAAACAgAAAAAAHgAAAAAAHgAAAAABfQAAAAAAAgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAABHgAAAAABHgAAAAACHgAAAAADfQAAAAAAHgAAAAABHgAAAAABHgAAAAACHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAgAAAAAAUAAAAAAAHgAAAAACHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAAwAAAAAAAwAAAAAAfQAAAAAAAQAAAAAAUAAAAAAAHgAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAQAAAAAAUAAAAAAAHgAAAAADHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAABHgAAAAACHgAAAAADHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAACHgAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAACHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,-1: ind: -1,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAUAAAAAAAawAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAUAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAUAAAAAAAUAAAAAAAHgAAAAADUAAAAAAAawAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAHgAAAAAAHgAAAAABHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAawAAAAAAUAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAUAAAAAAAHgAAAAACHgAAAAADUAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAUAAAAAAAHgAAAAACHgAAAAABUAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAUAAAAAAAHgAAAAADHgAAAAACUAAAAAAAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAawAAAAAAUAAAAAAAHgAAAAAC + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHgAAAAADHgAAAAAAHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAgAAAAACfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAAgAAAAACHgAAAAADHgAAAAABfQAAAAAAHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAfQAAAAAAHgAAAAADHgAAAAABfQAAAAAAHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAfQAAAAAAHgAAAAACHgAAAAAAfQAAAAAAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAUAAAAAAAAgAAAAAAfQAAAAAAHgAAAAAD version: 6 0,-1: ind: 0,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAawAAAAAAUAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAADUAAAAAAAUAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAawAAAAAAUAAAAAAAHgAAAAACUAAAAAAAUAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAUAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAADUAAAAAAAHgAAAAAAHgAAAAACUAAAAAAAUAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAHgAAAAABUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOAAAAAAAOAAAAAABOAAAAAAAUAAAAAAAHgAAAAABUAAAAAAAHgAAAAAAHgAAAAAAHgAAAAACHgAAAAAAHgAAAAABUAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOAAAAAADOAAAAAACOAAAAAACUAAAAAAAHgAAAAABUAAAAAAAHgAAAAABHgAAAAAAHgAAAAACHgAAAAADHgAAAAAAUAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAADHgAAAAABUAAAAAAAHgAAAAABawAAAAAAHgAAAAABHgAAAAAAHgAAAAADHgAAAAABHgAAAAADUAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAADHgAAAAABUAAAAAAAHgAAAAABUAAAAAAAUAAAAAAAHgAAAAADUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAQAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAAgAAAAACfQAAAAAAHgAAAAABfQAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAABfQAAAAAAHgAAAAADHgAAAAACfQAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHgAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOAAAAAABOAAAAAABOAAAAAACfQAAAAAAHgAAAAACfQAAAAAAHgAAAAADHgAAAAAAHgAAAAACHgAAAAAAHgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOAAAAAAAOAAAAAABOAAAAAADfQAAAAAAHgAAAAAAfQAAAAAAHgAAAAAAHgAAAAACHgAAAAACHgAAAAAAHgAAAAABfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAABHgAAAAADfQAAAAAAHgAAAAADAgAAAAABHgAAAAADHgAAAAACHgAAAAACHgAAAAABHgAAAAACfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAABHgAAAAAAfQAAAAAAHgAAAAADfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 - type: Broadphase - type: Physics @@ -59,21 +63,37 @@ entities: version: 2 nodes: - node: - color: '#4B653EF2' - id: Box + color: '#F1B223FF' + id: Bot decals: - 13: 0,3 - 14: 0,2 + 127: -2,2 - node: - color: '#4B653EFF' - id: Box + color: '#FFFFFFFF' + id: Bot + decals: + 128: -8,-4 + 129: -6,-3 + - node: + color: '#AF9369FF' + id: BotGreyscale + decals: + 135: 2,2 + - node: + color: '#FFFFFFFF' + id: BotGreyscale + decals: + 125: 0,2 + 126: 0,3 + - node: + color: '#0096FFFF' + id: BoxGreyscale decals: - 15: -2,4 - 16: -2,3 - 17: -2,2 - 18: 2,4 - 19: 2,3 - 20: 2,2 + 132: -7,-2 + - node: + color: '#FF0000FF' + id: BoxGreyscale + decals: + 133: -6,-2 - node: color: '#FFFFFFFF' id: BrickTileDarkLineN @@ -219,13 +239,13 @@ entities: 106: 2,-2 107: 2,-1 - node: - color: '#FF9F0033' + color: '#4B653ECC' id: CheckerNESW decals: - 0: 8,1 - 1: 8,0 - 2: 9,0 - 3: 9,1 + 143: -2,3 + 144: -2,4 + 145: 2,4 + 146: 2,3 - node: color: '#49392699' id: CheckerNWSE @@ -252,6 +272,14 @@ entities: 101: 0,-1 108: 2,-2 109: 2,-1 + - node: + color: '#493926CC' + id: CheckerNWSE + decals: + 139: -2,3 + 140: -2,4 + 141: 2,4 + 142: 2,3 - node: color: '#FFFFFFFF' id: Delivery @@ -275,6 +303,9 @@ entities: 87: 0,4 88: 4,1 89: -4,1 + 150: -3,-6 + 151: -3,-2 + 152: -1,-1 - node: color: '#493926CC' id: WarnLineGreyscaleS @@ -282,11 +313,26 @@ entities: 38: 0,6 90: -1,-6 91: 1,-6 + 153: -1,1 + 154: -3,0 + 155: -3,-4 + - node: + color: '#493926CC' + id: WarnLineGreyscaleW + decals: + 156: -4,0 - node: color: '#EFB34166' id: WarnLineGreyscaleW decals: 92: -4,-4 + - node: + color: '#FFFFFFFF' + id: WarnLineN + decals: + 147: -1,-8 + 148: 1,-8 + 149: 0,-8 - type: GridAtmosphere version: 2 data: @@ -303,59 +349,69 @@ entities: 0: 61197 0,2: 0: 7 + 1: 128 -1,2: 0: 12 + 1: 33 1,0: 0: 4479 - 1: 49152 + 2: 49152 1,1: 0: 259 - 1: 140 - 2: 1024 + 1: 9216 + 2: 140 + 1,2: + 1: 1 1,-1: 0: 8157 2,0: 0: 51 - 2: 8192 + 1: 9224 2,1: - 1: 1 + 2: 1 -3,0: + 1: 33794 0: 136 - 2: 32768 -2,0: 0: 127 - 1: 24576 + 2: 24576 -2,1: - 1: 39 + 2: 39 0: 8 - 2: 1024 + 1: 33792 -1,-1: 0: 43963 + -3,-2: + 1: 2113 -3,-1: 0: 3822 - -3,-2: - 2: 2112 + 1: 4096 -2,-2: - 2: 832 + 1: 832 -2,-1: 0: 1919 -1,-2: + 1: 1 0: 11912 -1,-3: - 2: 8192 + 1: 8192 0: 32768 0,-2: 0: 2979 0,-3: 0: 8192 - 2: 32768 + 1: 32768 1,-2: + 1: 2113 0: 4352 - 2: 2112 2,-2: - 2: 832 + 1: 832 2,-1: 0: 1911 + 3,-1: + 1: 4096 + 3,-2: + 1: 1 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -373,7 +429,7 @@ entities: - 0 - 0 - volume: 2500 - temperature: 293.15 + immutable: True moles: - 0 - 0 @@ -388,7 +444,7 @@ entities: - 0 - 0 - volume: 2500 - immutable: True + temperature: 293.15 moles: - 0 - 0 @@ -407,92 +463,94 @@ entities: - type: RadiationGridResistance - type: BecomesStation id: Prowler -- proto: AirlockEngineering +- proto: AirlockExternalGlassNfsdLocked entities: - - uid: 2 + - uid: 5 components: - type: Transform - pos: -4.5,-3.5 + pos: 1.5,-6.5 parent: 1 -- proto: AirlockGlassShuttle - entities: - - uid: 3 + - uid: 9 components: - type: Transform - pos: -0.5,-8.5 + pos: -4.5,4.5 parent: 1 - - uid: 4 + - uid: 12 components: - type: Transform - pos: 1.5,-8.5 + pos: -0.5,-6.5 parent: 1 -- proto: AirlockNfsdGlassLocked - entities: - - uid: 5 + - uid: 13 components: - type: Transform - pos: 1.5,-6.5 + pos: 5.5,4.5 parent: 1 - - uid: 6 +- proto: AirlockGlassShuttleNfsdLocked + entities: + - uid: 170 components: - type: Transform - pos: -0.5,-6.5 + pos: 1.5,-8.5 parent: 1 -- proto: AirlockNfsdLocked - entities: - - uid: 7 + - uid: 171 components: - type: Transform - pos: -2.5,-0.5 + pos: -0.5,-8.5 parent: 1 - - uid: 8 +- proto: AirlockMaintSecLocked + entities: + - uid: 14 components: - type: Transform - pos: 5.5,4.5 + pos: -4.5,-3.5 parent: 1 - - uid: 9 +- proto: AirlockNfsdGlassLocked + entities: + - uid: 7 components: - type: Transform - pos: -4.5,4.5 + pos: -0.5,0.5 parent: 1 - - uid: 10 + - uid: 15 components: - type: Transform - pos: -3.5,2.5 + pos: -2.5,-0.5 parent: 1 - - uid: 11 +- proto: AirlockNfsdLocked + entities: + - uid: 2 components: - type: Transform pos: 0.5,5.5 parent: 1 - - uid: 12 + - uid: 6 components: - type: Transform - pos: 4.5,2.5 + pos: -2.5,-4.5 parent: 1 - - uid: 13 + - uid: 8 components: - type: Transform - pos: -2.5,-4.5 + pos: -3.5,2.5 parent: 1 - - uid: 14 + - uid: 10 components: - type: Transform pos: -4.5,0.5 parent: 1 - - uid: 15 + - uid: 11 components: - type: Transform - pos: 5.5,-1.5 + pos: 4.5,2.5 parent: 1 - uid: 16 components: - type: Transform - pos: -0.5,0.5 + pos: 5.5,-1.5 parent: 1 - proto: AmeController entities: - - uid: 17 + - uid: 344 components: - type: Transform pos: -7.5,-2.5 @@ -501,36 +559,16 @@ entities: injecting: True - type: ContainerContainer containers: - AmeFuel: !type:ContainerSlot - showEnts: False - occludes: True - ent: 18 fuelSlot: !type:ContainerSlot showEnts: False occludes: True - ent: 57 + ent: 17 - proto: AmeJar entities: - - uid: 18 - components: - - type: Transform - parent: 17 - - type: Physics - canCollide: False - - uid: 19 - components: - - type: Transform - pos: -6.8893666,-2.805623 - parent: 1 - - uid: 20 - components: - - type: Transform - pos: -6.8893666,-2.352498 - parent: 1 - - uid: 57 + - uid: 17 components: - type: Transform - parent: 17 + parent: 344 - type: Physics canCollide: False - proto: AmeShielding @@ -590,41 +628,54 @@ entities: - type: Transform pos: 6.5,-0.5 parent: 1 - - uid: 31 + - uid: 32 components: - type: Transform - pos: -6.5,-0.5 + rot: 3.141592653589793 rad + pos: 3.5,5.5 parent: 1 - - uid: 32 + - uid: 70 components: - type: Transform rot: 3.141592653589793 rad - pos: 3.5,5.5 + pos: -5.5,-4.5 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - - uid: 33 + - uid: 34 components: - type: Transform - pos: -4.5,4.5 + pos: -0.5,-8.5 parent: 1 - - uid: 34 + - uid: 36 components: - type: Transform pos: 1.5,-8.5 parent: 1 - - uid: 35 + - uid: 605 components: - type: Transform - pos: 5.5,4.5 + rot: -1.5707963267948966 rad + pos: -4.5,4.5 parent: 1 - - uid: 36 + - uid: 606 components: - type: Transform - pos: -0.5,-8.5 + rot: 1.5707963267948966 rad + pos: 5.5,4.5 parent: 1 - proto: AtmosFixBlockerMarker entities: + - uid: 33 + components: + - type: Transform + pos: 10.5,2.5 + parent: 1 + - uid: 35 + components: + - type: Transform + pos: 5.5,7.5 + parent: 1 - uid: 37 components: - type: Transform @@ -705,6 +756,36 @@ entities: - type: Transform pos: 3.5,-8.5 parent: 1 + - uid: 98 + components: + - type: Transform + pos: 12.5,-0.5 + parent: 1 + - uid: 214 + components: + - type: Transform + pos: -10.5,0.5 + parent: 1 + - uid: 227 + components: + - type: Transform + pos: -9.5,2.5 + parent: 1 + - uid: 230 + components: + - type: Transform + pos: -11.5,-7.5 + parent: 1 + - uid: 231 + components: + - type: Transform + pos: -11.5,-0.5 + parent: 1 + - uid: 298 + components: + - type: Transform + pos: 11.5,0.5 + parent: 1 - uid: 409 components: - type: Transform @@ -715,6 +796,21 @@ entities: - type: Transform pos: -6.5,5.5 parent: 1 + - uid: 450 + components: + - type: Transform + pos: -3.5,-7.5 + parent: 1 + - uid: 572 + components: + - type: Transform + pos: 4.5,-7.5 + parent: 1 + - uid: 604 + components: + - type: Transform + pos: 12.5,-7.5 + parent: 1 - uid: 623 components: - type: Transform @@ -765,6 +861,31 @@ entities: - type: Transform pos: 7.5,3.5 parent: 1 + - uid: 637 + components: + - type: Transform + pos: 4.5,8.5 + parent: 1 + - uid: 638 + components: + - type: Transform + pos: 3.5,9.5 + parent: 1 + - uid: 639 + components: + - type: Transform + pos: -2.5,9.5 + parent: 1 + - uid: 640 + components: + - type: Transform + pos: -3.5,8.5 + parent: 1 + - uid: 641 + components: + - type: Transform + pos: -4.5,7.5 + parent: 1 - proto: Bed entities: - uid: 53 @@ -825,114 +946,50 @@ entities: bodyType: Static - proto: BlastDoorOpen entities: - - uid: 61 + - uid: 165 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,-7.5 + pos: -3.5,7.5 parent: 1 - - type: DeviceLinkSink - links: - - 398 - - uid: 62 + - uid: 226 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,-7.5 + pos: 0.5,9.5 parent: 1 - - type: DeviceLinkSink - links: - - 398 - - uid: 63 + - uid: 241 components: - type: Transform - rot: -1.5707963267948966 rad pos: -0.5,9.5 parent: 1 - - type: DeviceLinkSink - invokeCounter: 1 - links: - - 399 - - uid: 64 + - uid: 289 components: - type: Transform - rot: 3.141592653589793 rad - pos: -3.5,7.5 + pos: 1.5,9.5 parent: 1 - - type: DeviceLinkSink - invokeCounter: 1 - links: - - 399 - - uid: 65 + - uid: 415 components: - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,8.5 + pos: 4.5,7.5 parent: 1 - - type: DeviceLinkSink - invokeCounter: 1 - links: - - 399 - - uid: 66 +- proto: ButtonFrameCautionSecurity + entities: + - uid: 62 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,-7.5 + rot: 3.141592653589793 rad + pos: 2.5,5.5 parent: 1 - - type: DeviceLinkSink - links: - - 398 - - uid: 67 +- proto: CableApcExtension + entities: + - uid: 71 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,9.5 + pos: 0.5,6.5 parent: 1 - - type: DeviceLinkSink - invokeCounter: 1 - links: - - 399 - - uid: 68 + - uid: 72 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,9.5 - parent: 1 - - type: DeviceLinkSink - invokeCounter: 1 - links: - - 399 - - uid: 69 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -3.5,8.5 - parent: 1 - - type: DeviceLinkSink - invokeCounter: 1 - links: - - 399 - - uid: 70 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,7.5 - parent: 1 - - type: DeviceLinkSink - invokeCounter: 1 - links: - - 399 -- proto: CableApcExtension - entities: - - uid: 71 - components: - - type: Transform - pos: 0.5,6.5 - parent: 1 - - uid: 72 - components: - - type: Transform - pos: -0.5,6.5 + pos: -0.5,6.5 parent: 1 - uid: 73 components: @@ -974,11 +1031,6 @@ entities: - type: Transform pos: -3.5,-3.5 parent: 1 - - uid: 81 - components: - - type: Transform - pos: -6.5,-2.5 - parent: 1 - uid: 82 components: - type: Transform @@ -1059,11 +1111,6 @@ entities: - type: Transform pos: -1.5,3.5 parent: 1 - - uid: 98 - components: - - type: Transform - pos: -6.5,-0.5 - parent: 1 - uid: 99 components: - type: Transform @@ -1134,11 +1181,6 @@ entities: - type: Transform pos: 0.5,-5.5 parent: 1 - - uid: 113 - components: - - type: Transform - pos: -0.5,-6.5 - parent: 1 - uid: 114 components: - type: Transform @@ -1164,11 +1206,6 @@ entities: - type: Transform pos: -2.5,0.5 parent: 1 - - uid: 119 - components: - - type: Transform - pos: 1.5,-6.5 - parent: 1 - uid: 120 components: - type: Transform @@ -1179,11 +1216,6 @@ entities: - type: Transform pos: -7.5,1.5 parent: 1 - - uid: 122 - components: - - type: Transform - pos: -6.5,-1.5 - parent: 1 - uid: 123 components: - type: Transform @@ -1274,32 +1306,37 @@ entities: - type: Transform pos: -0.5,-1.5 parent: 1 + - uid: 308 + components: + - type: Transform + pos: -5.5,-4.5 + parent: 1 - proto: CableHV entities: - - uid: 141 + - uid: 31 components: - type: Transform - pos: -7.5,-1.5 + pos: -5.5,-0.5 parent: 1 - - uid: 142 + - uid: 81 components: - type: Transform - pos: -6.5,-2.5 + pos: -5.5,-3.5 parent: 1 - - uid: 143 + - uid: 141 components: - type: Transform - pos: -6.5,-1.5 + pos: -7.5,-1.5 parent: 1 - - uid: 144 + - uid: 143 components: - type: Transform - pos: -7.5,-2.5 + pos: -6.5,-1.5 parent: 1 - uid: 145 components: - type: Transform - pos: -5.5,-2.5 + pos: -3.5,-3.5 parent: 1 - uid: 146 components: @@ -1309,12 +1346,12 @@ entities: - uid: 147 components: - type: Transform - pos: -3.5,-2.5 + pos: -4.5,-3.5 parent: 1 - uid: 148 components: - type: Transform - pos: -4.5,-2.5 + pos: -5.5,-2.5 parent: 1 - uid: 149 components: @@ -1396,43 +1433,38 @@ entities: - type: Transform pos: -3.5,6.5 parent: 1 - - uid: 165 - components: - - type: Transform - pos: 1.5,1.5 - parent: 1 - - uid: 166 + - uid: 178 components: - type: Transform - pos: 2.5,1.5 + pos: -2.5,-3.5 parent: 1 - - uid: 167 + - uid: 182 components: - type: Transform - pos: 3.5,1.5 + pos: -7.5,-2.5 parent: 1 - - uid: 168 + - uid: 505 components: - type: Transform - pos: 4.5,1.5 + pos: -5.5,-1.5 parent: 1 - - uid: 169 +- proto: CableMV + entities: + - uid: 119 components: - type: Transform - pos: 5.5,1.5 + pos: -5.5,-1.5 parent: 1 - - uid: 170 + - uid: 142 components: - type: Transform - pos: 6.5,1.5 + pos: -5.5,-0.5 parent: 1 - - uid: 171 + - uid: 144 components: - type: Transform - pos: 7.5,1.5 + pos: -2.5,-3.5 parent: 1 -- proto: CableMV - entities: - uid: 172 components: - type: Transform @@ -1448,11 +1480,6 @@ entities: - type: Transform pos: 1.5,1.5 parent: 1 - - uid: 175 - components: - - type: Transform - pos: -3.5,-2.5 - parent: 1 - uid: 176 components: - type: Transform @@ -1461,17 +1488,7 @@ entities: - uid: 177 components: - type: Transform - pos: -6.5,-0.5 - parent: 1 - - uid: 178 - components: - - type: Transform - pos: -6.5,-2.5 - parent: 1 - - uid: 179 - components: - - type: Transform - pos: -6.5,-1.5 + pos: -5.5,-3.5 parent: 1 - uid: 180 components: @@ -1483,25 +1500,15 @@ entities: - type: Transform pos: -2.5,-0.5 parent: 1 - - uid: 182 - components: - - type: Transform - pos: -4.5,-2.5 - parent: 1 - uid: 183 components: - type: Transform - pos: -5.5,-2.5 + pos: 7.5,1.5 parent: 1 - uid: 184 components: - type: Transform - pos: 5.5,0.5 - parent: 1 - - uid: 185 - components: - - type: Transform - pos: 4.5,0.5 + pos: 6.5,1.5 parent: 1 - uid: 186 components: @@ -1588,13 +1595,38 @@ entities: - type: Transform pos: -2.5,0.5 parent: 1 + - uid: 203 + components: + - type: Transform + pos: -5.5,-2.5 + parent: 1 + - uid: 209 + components: + - type: Transform + pos: 5.5,1.5 + parent: 1 + - uid: 335 + components: + - type: Transform + pos: -4.5,-3.5 + parent: 1 + - uid: 399 + components: + - type: Transform + pos: -5.5,-4.5 + parent: 1 + - uid: 483 + components: + - type: Transform + pos: -3.5,-3.5 + parent: 1 - proto: CableTerminal entities: - - uid: 203 + - uid: 122 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -6.5,-1.5 + rot: 3.141592653589793 rad + pos: -7.5,-2.5 parent: 1 - proto: CarpetGreen entities: @@ -1618,6 +1650,68 @@ entities: - type: Transform pos: -8.5,0.5 parent: 1 +- proto: Catwalk + entities: + - uid: 61 + components: + - type: Transform + pos: 7.5,5.5 + parent: 1 + - uid: 423 + components: + - type: Transform + pos: -7.5,4.5 + parent: 1 + - uid: 424 + components: + - type: Transform + pos: -6.5,5.5 + parent: 1 + - uid: 427 + components: + - type: Transform + pos: 8.5,4.5 + parent: 1 + - uid: 642 + components: + - type: Transform + pos: 6.5,4.5 + parent: 1 + - uid: 643 + components: + - type: Transform + pos: 7.5,4.5 + parent: 1 + - uid: 644 + components: + - type: Transform + pos: 7.5,3.5 + parent: 1 + - uid: 645 + components: + - type: Transform + pos: 6.5,3.5 + parent: 1 + - uid: 646 + components: + - type: Transform + pos: -5.5,4.5 + parent: 1 + - uid: 647 + components: + - type: Transform + pos: -6.5,4.5 + parent: 1 + - uid: 648 + components: + - type: Transform + pos: -6.5,3.5 + parent: 1 + - uid: 649 + components: + - type: Transform + pos: -5.5,3.5 + parent: 1 - proto: ChairFolding entities: - uid: 208 @@ -1626,11 +1720,11 @@ entities: rot: 1.5707963267948966 rad pos: -6.5,1.5 parent: 1 - - uid: 209 + - uid: 254 components: - type: Transform rot: -1.5707963267948966 rad - pos: 2.5,-1.5 + pos: 2.4896135,-1.3288689 parent: 1 - proto: ChairPilotSeat entities: @@ -1658,26 +1752,18 @@ entities: rot: 3.141592653589793 rad pos: 1.5,7.5 parent: 1 -- proto: ClothingHeadHatNfsdBeretGreen - entities: - - uid: 214 - components: - - type: Transform - pos: 0.68947345,2.7193756 - parent: 1 -- proto: ClothingHeadHelmetNfsd - entities: - - uid: 215 + - uid: 411 components: - type: Transform - pos: 6.291652,-3.3226833 + rot: 3.141592653589793 rad + pos: 0.5,7.5 parent: 1 - proto: ComputerAdvancedRadar entities: - - uid: 217 + - uid: 244 components: - type: Transform - pos: 0.5,8.5 + pos: 3.5,7.5 parent: 1 - proto: ComputerCriminalRecords entities: @@ -1688,10 +1774,10 @@ entities: parent: 1 - proto: ComputerIFF entities: - - uid: 218 + - uid: 243 components: - type: Transform - pos: 3.5,7.5 + pos: 0.5,8.5 parent: 1 - proto: ComputerMedicalRecords entities: @@ -1752,17 +1838,11 @@ entities: - type: Transform pos: 0.5,-3.5 parent: 1 - - type: DeviceLinkSink - links: - - 447 - uid: 225 components: - type: Transform pos: 2.5,-3.5 parent: 1 - - type: DeviceLinkSink - links: - - 447 - proto: DefibrillatorCabinetFilled entities: - uid: 619 @@ -1771,14 +1851,6 @@ entities: rot: 1.5707963267948966 rad pos: -1.5,-2.5 parent: 1 -- proto: ExtinguisherCabinetFilled - entities: - - uid: 227 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -5.5,-4.5 - parent: 1 - proto: FaxMachineShip entities: - uid: 228 @@ -1795,31 +1867,23 @@ entities: pos: -6.5,-2.5 parent: 1 - type: GasMixer - inletTwoConcentration: 0.20999998 - inletOneConcentration: 0.79 + inletTwoConcentration: 0.78 + inletOneConcentration: 0.22 - type: AtmosPipeColor color: '#0055CCFF' - proto: GasPassiveVent entities: - - uid: 230 + - uid: 653 components: - type: Transform rot: 3.141592653589793 rad - pos: -2.5,-8.5 + pos: 8.5,-5.5 parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 231 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 3.5,-8.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' -- proto: GasPipeBend - entities: - - uid: 232 +- proto: GasPipeBend + entities: + - uid: 232 components: - type: Transform pos: -0.5,-3.5 @@ -1842,14 +1906,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 235 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,3.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - uid: 236 components: - type: Transform @@ -1872,64 +1928,63 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 239 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,4.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 240 + - uid: 242 components: - type: Transform rot: 1.5707963267948966 rad - pos: 1.5,6.5 + pos: 7.5,0.5 parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 241 + - uid: 296 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,6.5 + rot: 3.141592653589793 rad + pos: -2.5,-5.5 parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 242 + - uid: 510 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 7.5,0.5 + rot: 3.141592653589793 rad + pos: 1.5,-2.5 parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 243 + - uid: 650 components: - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,-2.5 + pos: 8.5,-2.5 parent: 1 - type: AtmosPipeColor color: '#990000FF' - proto: GasPipeFourway entities: - - uid: 244 + - uid: 312 components: - type: Transform - pos: -0.5,1.5 + pos: -2.5,-1.5 parent: 1 - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 312 + color: '#990000FF' + - uid: 325 components: - type: Transform - pos: -2.5,-1.5 + pos: 7.5,-2.5 parent: 1 - type: AtmosPipeColor color: '#990000FF' - proto: GasPipeStraight entities: + - uid: 113 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,-3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 245 components: - type: Transform @@ -1946,13 +2001,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 247 - components: - - type: Transform - pos: 2.5,1.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - uid: 248 components: - type: Transform @@ -1963,18 +2011,10 @@ entities: - uid: 249 components: - type: Transform - pos: -0.5,2.5 + pos: 0.5,2.5 parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 250 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,5.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - uid: 251 components: - type: Transform @@ -1997,43 +2037,10 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 254 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,1.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 255 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,4.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - uid: 256 components: - type: Transform - rot: 3.141592653589793 rad - pos: -2.5,-7.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 257 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -2.5,-6.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 258 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 3.5,-7.5 + pos: 1.5,5.5 parent: 1 - type: AtmosPipeColor color: '#990000FF' @@ -2139,13 +2146,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 272 - components: - - type: Transform - pos: -0.5,3.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 273 components: - type: Transform @@ -2219,13 +2219,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 283 - components: - - type: Transform - pos: 3.5,-6.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - uid: 284 components: - type: Transform @@ -2260,62 +2253,92 @@ entities: - uid: 288 components: - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,2.5 + pos: 1.5,3.5 parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 289 + - uid: 290 components: - type: Transform - pos: 2.5,0.5 + rot: -1.5707963267948966 rad + pos: 5.5,-2.5 parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 290 + - uid: 293 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,-2.5 + rot: 3.141592653589793 rad + pos: -2.5,-2.5 parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 291 + - uid: 294 components: - type: Transform rot: 3.141592653589793 rad - pos: 3.5,-5.5 + pos: -2.5,-4.5 parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 293 + - uid: 302 components: - type: Transform - rot: 3.141592653589793 rad - pos: -2.5,-2.5 + pos: 1.5,2.5 parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 294 + - uid: 322 components: - type: Transform rot: 3.141592653589793 rad - pos: -2.5,-4.5 + pos: 1.5,1.5 parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 295 + - uid: 347 components: - type: Transform - rot: 3.141592653589793 rad - pos: 3.5,-4.5 + pos: 0.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 348 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,4.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 349 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,-2.5 parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 296 + - uid: 451 components: - type: Transform - pos: 3.5,-3.5 + pos: 1.5,6.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 526 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-2.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 610 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,0.5 parent: 1 - type: AtmosPipeColor color: '#990000FF' @@ -2343,39 +2366,46 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 636 + - uid: 651 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,-1.5 + pos: 8.5,-3.5 parent: 1 - type: AtmosPipeColor color: '#990000FF' -- proto: GasPipeTJunction - entities: - - uid: 297 + - uid: 652 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 7.5,-2.5 + pos: 8.5,-4.5 parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 298 +- proto: GasPipeTJunction + entities: + - uid: 217 components: - type: Transform - pos: 3.5,-2.5 + rot: 1.5707963267948966 rad + pos: 1.5,-0.5 parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 299 + - uid: 255 components: - type: Transform rot: -1.5707963267948966 rad - pos: 2.5,-0.5 + pos: 0.5,4.5 parent: 1 - type: AtmosPipeColor - color: '#990000FF' + color: '#0055CCFF' + - uid: 297 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 300 components: - type: Transform @@ -2391,14 +2421,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 302 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,3.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - uid: 303 components: - type: Transform @@ -2414,13 +2436,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 305 - components: - - type: Transform - pos: -0.5,4.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 306 components: - type: Transform @@ -2436,43 +2451,42 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 308 + - uid: 326 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,-5.5 + rot: -1.5707963267948966 rad + pos: 1.5,-1.5 parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 309 + - uid: 350 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,-1.5 + rot: 1.5707963267948966 rad + pos: 1.5,4.5 parent: 1 - type: AtmosPipeColor color: '#990000FF' -- proto: GasPort - entities: - - uid: 310 + - uid: 465 components: - type: Transform - pos: -5.5,-1.5 + pos: -0.5,1.5 parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 311 +- proto: GasPort + entities: + - uid: 310 components: - type: Transform - pos: -6.5,-1.5 + pos: -5.5,-1.5 parent: 1 -- proto: GasPressurePumpOn - entities: - - uid: 408 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 311 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -5.5,-3.5 + pos: -6.5,-1.5 parent: 1 - type: AtmosPipeColor color: '#0055CCFF' @@ -2551,14 +2565,6 @@ entities: color: '#0055CCFF' - proto: GasVentScrubber entities: - - uid: 322 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,-0.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - uid: 323 components: - type: Transform @@ -2575,20 +2581,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 325 - components: - - type: Transform - pos: 2.5,4.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 326 - components: - - type: Transform - pos: 2.5,7.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - uid: 327 components: - type: Transform @@ -2621,20 +2613,38 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' + - uid: 352 + components: + - type: Transform + pos: 1.5,7.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 484 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 492 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,4.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' - proto: GravityGeneratorMini entities: - - uid: 331 + - uid: 175 components: - type: Transform pos: -7.5,-3.5 parent: 1 - proto: Grille entities: - - uid: 332 - components: - - type: Transform - pos: -3.5,8.5 - parent: 1 - uid: 333 components: - type: Transform @@ -2645,11 +2655,6 @@ entities: - type: Transform pos: 0.5,9.5 parent: 1 - - uid: 335 - components: - - type: Transform - pos: 4.5,8.5 - parent: 1 - uid: 336 components: - type: Transform @@ -2671,9 +2676,22 @@ entities: rot: 3.141592653589793 rad pos: 7.5,1.5 parent: 1 +- proto: GrilleDiagonal + entities: + - uid: 57 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,8.5 + parent: 1 + - uid: 331 + components: + - type: Transform + pos: -3.5,8.5 + parent: 1 - proto: GyroscopeNfsd entities: - - uid: 340 + - uid: 257 components: - type: Transform pos: -5.5,-2.5 @@ -2697,12 +2715,12 @@ entities: rot: -1.5707963267948966 rad pos: -8.5,1.5 parent: 1 -- proto: LockerNfsdBailiff +- proto: LockerNfsdCopper entities: - - uid: 345 + - uid: 367 components: - type: Transform - pos: 7.5,-3.5 + pos: 10.5,-3.5 parent: 1 - proto: LockerNfsdEvidence entities: @@ -2711,60 +2729,83 @@ entities: - type: Transform pos: 6.5,1.5 parent: 1 - - uid: 347 +- proto: LockerNfsdSergeant + entities: + - uid: 240 components: - type: Transform - pos: 8.5,-1.5 + pos: 7.5,-3.5 parent: 1 - proto: LockerNfsdSilver entities: - - uid: 348 + - uid: 366 components: - type: Transform - pos: 10.5,-3.5 + pos: 8.5,-3.5 parent: 1 - - uid: 349 + - uid: 368 components: - type: Transform - pos: 8.5,-3.5 + pos: 9.5,-3.5 parent: 1 - - uid: 350 +- proto: LockerWallEVAColorNfsdFilled + entities: + - uid: 408 components: - type: Transform - pos: 9.5,-3.5 + rot: -1.5707963267948966 rad + pos: 3.5,3.5 parent: 1 -- proto: Mirror + - uid: 609 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,4.5 + parent: 1 + - uid: 618 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,3.5 + parent: 1 + - uid: 636 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,4.5 + parent: 1 +- proto: LockerWallMaterialsFuelAmeJarFilled entities: - - uid: 351 + - uid: 362 components: - type: Transform - pos: 3.5,-4.5 + rot: 3.141592653589793 rad + pos: -6.5,-4.5 parent: 1 -- proto: NfsdWhistle +- proto: Mirror entities: - - uid: 352 + - uid: 351 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 0.39259845,2.5318756 + pos: 3.5,-4.5 parent: 1 - proto: NitrogenCanister entities: - - uid: 353 + - uid: 370 components: - type: Transform anchored: True - pos: -6.5,-1.5 + pos: -5.5,-1.5 parent: 1 - type: Physics bodyType: Static - proto: OxygenCanister entities: - - uid: 354 + - uid: 371 components: - type: Transform anchored: True - pos: -5.5,-1.5 + pos: -6.5,-1.5 parent: 1 - type: Physics bodyType: Static @@ -2782,11 +2823,6 @@ entities: - type: Transform pos: 0.5,9.5 parent: 1 - - uid: 357 - components: - - type: Transform - pos: -3.5,8.5 - parent: 1 - uid: 358 components: - type: Transform @@ -2807,81 +2843,41 @@ entities: - type: Transform pos: -3.5,7.5 parent: 1 - - uid: 362 +- proto: PlastitaniumWindowDiagonal + entities: + - uid: 68 components: - type: Transform + rot: -1.5707963267948966 rad pos: 4.5,8.5 parent: 1 -- proto: PowerCellRecharger - entities: - - uid: 363 + - uid: 353 components: - type: Transform - pos: 0.5,7.5 + pos: -3.5,8.5 parent: 1 - proto: Poweredlight entities: - - uid: 364 - components: - - type: Transform - pos: 8.5,-1.5 - parent: 1 - - uid: 365 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,-1.5 - parent: 1 - - uid: 366 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -6.5,-3.5 - parent: 1 - - uid: 367 + - uid: 167 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -3.5,-2.5 + pos: -1.5,4.5 parent: 1 - - uid: 368 + - uid: 364 components: - type: Transform - pos: -6.5,1.5 + pos: 8.5,-1.5 parent: 1 - uid: 369 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 4.5,-3.5 + pos: 1.5,-0.5 parent: 1 - - uid: 370 + - uid: 615 components: - type: Transform - rot: -1.5707963267948966 rad pos: 2.5,4.5 parent: 1 - - uid: 371 - components: - - type: Transform - pos: 1.5,-5.5 - parent: 1 - - uid: 372 - components: - - type: Transform - pos: -0.5,-5.5 - parent: 1 - - uid: 373 - components: - - type: Transform - pos: 5.5,1.5 - parent: 1 - - uid: 374 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -3.5,1.5 - parent: 1 - proto: PoweredlightColoredRed entities: - uid: 375 @@ -2910,6 +2906,18 @@ entities: parent: 1 - proto: PoweredSmallLight entities: + - uid: 372 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,-2.5 + parent: 1 + - uid: 374 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,-2.5 + parent: 1 - uid: 379 components: - type: Transform @@ -2928,24 +2936,49 @@ entities: rot: -1.5707963267948966 rad pos: -3.5,4.5 parent: 1 -- proto: Rack - entities: - uid: 382 components: - type: Transform - pos: 0.5,2.5 + pos: -6.5,1.5 parent: 1 - uid: 383 components: - type: Transform - pos: 0.5,3.5 + rot: 1.5707963267948966 rad + pos: 4.5,-2.5 parent: 1 + - uid: 388 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-7.5 + parent: 1 + - uid: 389 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-5.5 + parent: 1 + - uid: 398 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,0.5 + parent: 1 + - uid: 400 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,1.5 + parent: 1 +- proto: Rack + entities: - uid: 384 components: - type: Transform pos: -0.5,-3.5 parent: 1 - - uid: 385 + - uid: 613 components: - type: Transform pos: 6.5,-3.5 @@ -2962,18 +2995,6 @@ entities: - type: Transform pos: 0.5,-3.5 parent: 1 - - uid: 388 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -7.5,0.5 - parent: 1 - - uid: 389 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -7.5,1.5 - parent: 1 - proto: RailingCorner entities: - uid: 390 @@ -3019,6 +3040,23 @@ entities: - type: Transform pos: -5.5,1.5 parent: 1 +- proto: RandomPosterLegit + entities: + - uid: 168 + components: + - type: Transform + pos: 8.5,2.5 + parent: 1 + - uid: 169 + components: + - type: Transform + pos: -0.5,-4.5 + parent: 1 + - uid: 185 + components: + - type: Transform + pos: 3.5,-1.5 + parent: 1 - proto: ReinforcedPlasmaWindow entities: - uid: 397 @@ -3026,67 +3064,57 @@ entities: - type: Transform pos: 7.5,1.5 parent: 1 -- proto: SignalButton +- proto: ShelfMetal entities: - - uid: 398 + - uid: 239 components: - type: Transform - rot: 3.141592653589793 rad - pos: -3.5,-4.5 + rot: 1.5707963267948966 rad + pos: -1.5,-1.5 parent: 1 - - type: DeviceLinkSource - linkedPorts: - 66: - - Pressed: Toggle - 61: - - Pressed: Toggle - 62: - - Pressed: Toggle - - uid: 399 + - uid: 357 components: - type: Transform - pos: 0.5,7.5 + pos: 1.5,5.5 parent: 1 - - type: SignalSwitch - state: True - - type: DeviceLinkSource - linkedPorts: - 64: - - Pressed: Toggle - 69: - - Pressed: Toggle - 63: - - Pressed: Toggle - 67: - - Pressed: Toggle - 68: - - Pressed: Toggle - 65: - - Pressed: Toggle - 70: - - Pressed: Toggle -- proto: SignArmory - entities: - - uid: 400 + - uid: 373 components: - type: Transform - pos: 5.5,-2.5 + pos: -7.5,2.5 + parent: 1 + - uid: 428 + components: + - type: Transform + pos: -0.5,5.5 parent: 1 -- proto: SignConspiracyBoard +- proto: ShelfRMetal entities: - uid: 401 components: - type: Transform - pos: 1.5,5.5 + rot: -1.5707963267948966 rad + pos: 11.5,-2.5 parent: 1 -- proto: SignDirectionalBridge +- proto: SignalButtonDirectional entities: - - uid: 226 + - uid: 66 components: - type: Transform rot: 3.141592653589793 rad - pos: -0.5,5.5 + pos: 2.5,5.5 parent: 1 + - type: DeviceLinkSource + linkedPorts: + 415: + - Pressed: Toggle + 289: + - Pressed: Toggle + 226: + - Pressed: Toggle + 241: + - Pressed: Toggle + 165: + - Pressed: Toggle - proto: SignDirectionalDorms entities: - uid: 617 @@ -3095,6 +3123,14 @@ entities: rot: -1.5707963267948966 rad pos: -4.5,1.5 parent: 1 +- proto: SignDirectionalEng + entities: + - uid: 443 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,-2.5 + parent: 1 - proto: SignEVA entities: - uid: 402 @@ -3107,6 +3143,25 @@ entities: - type: Transform pos: 3.5,2.5 parent: 1 +- proto: SignNfsd + entities: + - uid: 19 + components: + - type: Transform + pos: -3.5,-0.5 + parent: 1 + - uid: 455 + components: + - type: Transform + pos: 0.5,-6.5 + parent: 1 +- proto: SignNfsdArmoury + entities: + - uid: 616 + components: + - type: Transform + pos: 5.5,-2.5 + parent: 1 - proto: SignPlaque entities: - uid: 404 @@ -3114,19 +3169,29 @@ entities: - type: Transform pos: -1.5,5.5 parent: 1 -- proto: SignSec +- proto: SignSecurearea entities: - - uid: 618 + - uid: 462 components: - type: Transform - pos: 0.5,-6.5 + pos: 0.5,-8.5 parent: 1 -- proto: SignSecurearea +- proto: SignSpace entities: - - uid: 405 + - uid: 3 components: - type: Transform - pos: 0.5,-8.5 + pos: 5.5,3.5 + parent: 1 + - uid: 4 + components: + - type: Transform + pos: -4.5,3.5 + parent: 1 + - uid: 20 + components: + - type: Transform + pos: -1.5,-7.5 parent: 1 - proto: SinkWide entities: @@ -3150,36 +3215,65 @@ entities: rot: 3.141592653589793 rad pos: 0.5,1.5 parent: 1 -- proto: SubstationWallBasic +- proto: SteelBench entities: - - uid: 411 + - uid: 215 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -4.5,-2.5 + rot: 1.5707963267948966 rad + pos: -1.5,4.5 parent: 1 -- proto: SuitStorageDeputy - entities: - - uid: 413 + - uid: 309 components: - type: Transform - pos: -1.5,2.5 + rot: -1.5707963267948966 rad + pos: 2.5,4.5 parent: 1 - - uid: 414 + - uid: 365 components: - type: Transform + rot: 1.5707963267948966 rad pos: -1.5,3.5 parent: 1 - - uid: 415 + - uid: 552 components: - type: Transform + rot: -1.5707963267948966 rad pos: 2.5,3.5 parent: 1 - - uid: 450 +- proto: SubstationWallBasic + entities: + - uid: 345 + components: + - type: Transform + pos: -5.5,-0.5 + parent: 1 +- proto: SuitStorageCadet + entities: + - uid: 414 components: - type: Transform pos: 2.5,2.5 parent: 1 +- proto: SuitStorageDeputy + entities: + - uid: 235 + components: + - type: Transform + pos: 0.5,3.5 + parent: 1 + - uid: 405 + components: + - type: Transform + pos: 0.5,2.5 + parent: 1 +- proto: SuitStorageSergeant + entities: + - uid: 218 + components: + - type: Transform + pos: -1.5,2.5 + parent: 1 - proto: SuitStorageWallmountEVAPrisoner entities: - uid: 416 @@ -3188,8 +3282,6 @@ entities: rot: 3.141592653589793 rad pos: 5.5,-0.5 parent: 1 - - type: Physics - canCollide: False - proto: SurveillanceCameraRouterSecurity entities: - uid: 417 @@ -3254,17 +3346,24 @@ entities: - SurveillanceCameraSecurity nameSet: True id: Port Airlock +- proto: Table + entities: + - uid: 523 + components: + - type: Transform + pos: -5.5,1.5 + parent: 1 - proto: TableReinforced entities: - - uid: 423 + - uid: 247 components: - type: Transform pos: 1.5,-0.5 parent: 1 - - uid: 424 + - uid: 299 components: - type: Transform - pos: 0.5,7.5 + pos: 2.5,-0.5 parent: 1 - uid: 425 components: @@ -3276,15 +3375,12 @@ entities: - type: Transform pos: 2.5,7.5 parent: 1 - - uid: 427 - components: - - type: Transform - pos: -5.5,1.5 - parent: 1 - - uid: 428 +- proto: TableReinforcedGlass + entities: + - uid: 250 components: - type: Transform - pos: 2.5,-0.5 + pos: 8.5,-1.5 parent: 1 - proto: ThrusterNfsd entities: @@ -3370,7 +3466,7 @@ entities: parent: 1 - proto: ToiletEmpty entities: - - uid: 443 + - uid: 413 components: - type: Transform rot: -1.5707963267948966 rad @@ -3413,29 +3509,91 @@ entities: - Left: Forward - Right: Reverse - Middle: Off -- proto: VendingMachineNfsdDrobe +- proto: WallmountTelevision entities: - - uid: 448 + - uid: 528 components: - type: Transform - pos: 2.5,4.5 + rot: 3.141592653589793 rad + pos: 1.5,-4.5 parent: 1 -- proto: VendingMachineNfsdTech +- proto: WallPlastitanium entities: - - uid: 449 + - uid: 18 components: - type: Transform - pos: -1.5,4.5 + pos: -4.5,-2.5 parent: 1 -- proto: WallmountTelevision - entities: - - uid: 451 + - uid: 64 components: - type: Transform - pos: 1.5,-4.5 + pos: -1.5,9.5 + parent: 1 + - uid: 65 + components: + - type: Transform + pos: 3.5,8.5 + parent: 1 + - uid: 67 + components: + - type: Transform + pos: -2.5,8.5 + parent: 1 + - uid: 69 + components: + - type: Transform + pos: 2.5,9.5 + parent: 1 + - uid: 179 + components: + - type: Transform + pos: -4.5,-1.5 + parent: 1 + - uid: 272 + components: + - type: Transform + pos: 1.5,5.5 + parent: 1 + - uid: 291 + components: + - type: Transform + pos: 3.5,-7.5 + parent: 1 + - uid: 295 + components: + - type: Transform + pos: -2.5,-7.5 + parent: 1 + - uid: 305 + components: + - type: Transform + pos: 3.5,-2.5 + parent: 1 + - uid: 340 + components: + - type: Transform + pos: 1.5,0.5 + parent: 1 + - uid: 363 + components: + - type: Transform + pos: 4.5,5.5 + parent: 1 + - uid: 385 + components: + - type: Transform + pos: 3.5,4.5 + parent: 1 + - uid: 448 + components: + - type: Transform + pos: -4.5,-4.5 + parent: 1 + - uid: 449 + components: + - type: Transform + pos: -5.5,-4.5 parent: 1 -- proto: WallPlastitanium - entities: - uid: 452 components: - type: Transform @@ -3451,11 +3609,6 @@ entities: - type: Transform pos: 5.5,-5.5 parent: 1 - - uid: 455 - components: - - type: Transform - pos: -5.5,-4.5 - parent: 1 - uid: 456 components: - type: Transform @@ -3474,7 +3627,7 @@ entities: - uid: 459 components: - type: Transform - pos: -5.5,-5.5 + pos: -4.5,-5.5 parent: 1 - uid: 460 components: @@ -3486,11 +3639,6 @@ entities: - type: Transform pos: 7.5,-4.5 parent: 1 - - uid: 462 - components: - - type: Transform - pos: -2.5,-6.5 - parent: 1 - uid: 463 components: - type: Transform @@ -3501,11 +3649,6 @@ entities: - type: Transform pos: 2.5,-5.5 parent: 1 - - uid: 465 - components: - - type: Transform - pos: 3.5,-7.5 - parent: 1 - uid: 466 components: - type: Transform @@ -3516,16 +3659,6 @@ entities: - type: Transform pos: 4.5,-6.5 parent: 1 - - uid: 468 - components: - - type: Transform - pos: -3.5,-5.5 - parent: 1 - - uid: 469 - components: - - type: Transform - pos: 11.5,0.5 - parent: 1 - uid: 470 components: - type: Transform @@ -3539,7 +3672,7 @@ entities: - uid: 472 components: - type: Transform - pos: 10.5,0.5 + pos: -6.5,-0.5 parent: 1 - uid: 473 components: @@ -3586,21 +3719,10 @@ entities: - type: Transform pos: -11.5,-3.5 parent: 1 - - uid: 482 - components: - - type: Transform - pos: 5.5,-6.5 - parent: 1 - - uid: 483 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 3.5,8.5 - parent: 1 - - uid: 484 + - uid: 482 components: - type: Transform - pos: 11.5,-2.5 + pos: 5.5,-6.5 parent: 1 - uid: 485 components: @@ -3625,7 +3747,7 @@ entities: - uid: 489 components: - type: Transform - pos: -11.5,-7.5 + pos: -4.5,-0.5 parent: 1 - uid: 490 components: @@ -3637,11 +3759,6 @@ entities: - type: Transform pos: 3.5,-0.5 parent: 1 - - uid: 492 - components: - - type: Transform - pos: -4.5,-0.5 - parent: 1 - uid: 493 components: - type: Transform @@ -3670,7 +3787,7 @@ entities: - uid: 498 components: - type: Transform - pos: -4.5,-2.5 + pos: -3.5,-6.5 parent: 1 - uid: 499 components: @@ -3680,7 +3797,7 @@ entities: - uid: 500 components: - type: Transform - pos: -4.5,-1.5 + pos: -3.5,-5.5 parent: 1 - uid: 501 components: @@ -3696,22 +3813,17 @@ entities: - uid: 503 components: - type: Transform - pos: -4.5,7.5 + pos: 2.5,0.5 parent: 1 - uid: 504 components: - type: Transform pos: -4.5,3.5 parent: 1 - - uid: 505 - components: - - type: Transform - pos: -4.5,-6.5 - parent: 1 - uid: 506 components: - type: Transform - pos: -4.5,-4.5 + pos: -4.5,-6.5 parent: 1 - uid: 507 components: @@ -3721,28 +3833,18 @@ entities: - uid: 508 components: - type: Transform - pos: 12.5,-0.5 + pos: -2.5,-6.5 parent: 1 - uid: 509 components: - type: Transform pos: -11.5,-2.5 parent: 1 - - uid: 510 - components: - - type: Transform - pos: -6.5,-0.5 - parent: 1 - uid: 511 components: - type: Transform pos: -7.5,-0.5 parent: 1 - - uid: 512 - components: - - type: Transform - pos: -3.5,-6.5 - parent: 1 - uid: 513 components: - type: Transform @@ -3791,12 +3893,7 @@ entities: - uid: 522 components: - type: Transform - pos: 3.5,-2.5 - parent: 1 - - uid: 523 - components: - - type: Transform - pos: 2.5,0.5 + pos: 10.5,1.5 parent: 1 - uid: 524 components: @@ -3808,22 +3905,11 @@ entities: - type: Transform pos: 2.5,5.5 parent: 1 - - uid: 526 - components: - - type: Transform - pos: 11.5,-3.5 - parent: 1 - uid: 527 components: - type: Transform pos: 11.5,-4.5 parent: 1 - - uid: 528 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -2.5,8.5 - parent: 1 - uid: 529 components: - type: Transform @@ -3843,7 +3929,7 @@ entities: - uid: 532 components: - type: Transform - pos: 5.5,7.5 + pos: 11.5,-2.5 parent: 1 - uid: 533 components: @@ -3860,11 +3946,6 @@ entities: - type: Transform pos: 8.5,3.5 parent: 1 - - uid: 536 - components: - - type: Transform - pos: -1.5,9.5 - parent: 1 - uid: 537 components: - type: Transform @@ -3875,11 +3956,6 @@ entities: - type: Transform pos: 12.5,-2.5 parent: 1 - - uid: 539 - components: - - type: Transform - pos: 10.5,1.5 - parent: 1 - uid: 540 components: - type: Transform @@ -3893,33 +3969,13 @@ entities: - uid: 542 components: - type: Transform - pos: 10.5,2.5 - parent: 1 - - uid: 543 - components: - - type: Transform - pos: -2.5,9.5 + pos: 10.5,0.5 parent: 1 - uid: 544 components: - type: Transform pos: 5.5,-2.5 parent: 1 - - uid: 545 - components: - - type: Transform - pos: 3.5,9.5 - parent: 1 - - uid: 546 - components: - - type: Transform - pos: 2.5,9.5 - parent: 1 - - uid: 547 - components: - - type: Transform - pos: 4.5,5.5 - parent: 1 - uid: 548 components: - type: Transform @@ -3940,11 +3996,6 @@ entities: - type: Transform pos: 1.5,-4.5 parent: 1 - - uid: 552 - components: - - type: Transform - pos: 1.5,5.5 - parent: 1 - uid: 553 components: - type: Transform @@ -3955,11 +4006,6 @@ entities: - type: Transform pos: -9.5,0.5 parent: 1 - - uid: 555 - components: - - type: Transform - pos: -9.5,2.5 - parent: 1 - uid: 556 components: - type: Transform @@ -3993,18 +4039,13 @@ entities: - uid: 562 components: - type: Transform - pos: -10.5,0.5 + pos: -5.5,-5.5 parent: 1 - uid: 563 components: - type: Transform pos: 12.5,-6.5 parent: 1 - - uid: 564 - components: - - type: Transform - pos: 12.5,-7.5 - parent: 1 - uid: 565 components: - type: Transform @@ -4028,7 +4069,7 @@ entities: - uid: 569 components: - type: Transform - pos: 11.5,-1.5 + pos: 11.5,-3.5 parent: 1 - uid: 570 components: @@ -4040,16 +4081,6 @@ entities: - type: Transform pos: -7.5,2.5 parent: 1 - - uid: 572 - components: - - type: Transform - pos: -11.5,-0.5 - parent: 1 - - uid: 573 - components: - - type: Transform - pos: -4.5,-5.5 - parent: 1 - uid: 574 components: - type: Transform @@ -4082,16 +4113,6 @@ entities: - type: Transform pos: -10.5,-6.5 parent: 1 - - uid: 580 - components: - - type: Transform - pos: -3.5,-7.5 - parent: 1 - - uid: 581 - components: - - type: Transform - pos: -2.5,-7.5 - parent: 1 - uid: 582 components: - type: Transform @@ -4102,11 +4123,6 @@ entities: - type: Transform pos: -3.5,-0.5 parent: 1 - - uid: 584 - components: - - type: Transform - pos: 4.5,-7.5 - parent: 1 - uid: 585 components: - type: Transform @@ -4147,11 +4163,6 @@ entities: - type: Transform pos: 3.5,5.5 parent: 1 - - uid: 593 - components: - - type: Transform - pos: 3.5,4.5 - parent: 1 - uid: 594 components: - type: Transform @@ -4200,27 +4211,116 @@ entities: - uid: 603 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,0.5 + pos: 11.5,-1.5 parent: 1 -- proto: WallWeaponCapacitorRecharger +- proto: WallPlastitaniumDiagonal entities: - - uid: 604 + - uid: 258 components: - type: Transform rot: 3.141592653589793 rad - pos: 2.5,0.5 + pos: 3.5,-8.5 parent: 1 - - uid: 605 + - uid: 283 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-8.5 + parent: 1 + - uid: 332 + components: + - type: Transform + pos: -2.5,9.5 + parent: 1 + - uid: 354 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,9.5 + parent: 1 + - uid: 468 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 11.5,0.5 + parent: 1 + - uid: 469 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,-7.5 + parent: 1 + - uid: 512 + components: + - type: Transform + pos: -4.5,7.5 + parent: 1 + - uid: 536 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,7.5 + parent: 1 + - uid: 539 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 12.5,-0.5 + parent: 1 + - uid: 543 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 10.5,2.5 + parent: 1 + - uid: 545 + components: + - type: Transform + pos: -11.5,-0.5 + parent: 1 + - uid: 546 + components: + - type: Transform + pos: -10.5,0.5 + parent: 1 + - uid: 547 components: - type: Transform rot: 3.141592653589793 rad - pos: 0.5,0.5 + pos: 4.5,-7.5 parent: 1 - - uid: 606 + - uid: 555 + components: + - type: Transform + pos: -9.5,2.5 + parent: 1 + - uid: 564 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -11.5,-7.5 + parent: 1 + - uid: 573 components: - type: Transform rot: 3.141592653589793 rad + pos: 12.5,-7.5 + parent: 1 +- proto: WallWeaponCapacitorRechargerOmnidirectional + entities: + - uid: 580 + components: + - type: Transform + pos: 0.5,0.5 + parent: 1 + - uid: 581 + components: + - type: Transform + pos: 2.5,0.5 + parent: 1 + - uid: 584 + components: + - type: Transform pos: 1.5,0.5 parent: 1 - proto: WardrobePrisonFilled @@ -4248,15 +4348,15 @@ entities: parent: 1 - proto: WeaponGrapplingGun entities: - - uid: 609 + - uid: 63 components: - type: Transform - pos: 0.5159931,3.674327 + pos: 6.4297323,-3.414895 parent: 1 - - uid: 610 + - uid: 166 components: - type: Transform - pos: 0.6566181,3.439952 + pos: 6.6953573,-3.539895 parent: 1 - proto: StructureGunRackNfsd entities: @@ -4270,12 +4370,12 @@ entities: - type: Transform pos: 10.5,-1.5 parent: 1 -- proto: StructurePistolRackWallmountedNfsd +- proto: StructurePistolRackNfsd entities: - - uid: 613 + - uid: 593 components: - type: Transform - pos: 11.5,-2.5 + pos: 8.5,-1.5 parent: 1 - proto: WindoorSecureBrigLocked entities: @@ -4285,16 +4385,4 @@ entities: rot: -1.5707963267948966 rad pos: 7.5,0.5 parent: 1 -- proto: Zipties - entities: - - uid: 615 - components: - - type: Transform - pos: 6.619777,-3.3851833 - parent: 1 - - uid: 616 - components: - - type: Transform - pos: 6.776027,-3.3851833 - parent: 1 -... +... \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/prowler.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/prowler.yml index 4f5ec7dac02..eb9f6457b82 100644 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/prowler.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/prowler.yml @@ -1,8 +1,8 @@ - type: vessel id: Prowler name: NSF Prowler - description: A medium-sized patrol craft, the prowler class is a dedicated deep space reconnaissance and enforcement vessel outfitted with ECM technology to avoid detection. - price: 49220 + 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 From 78cb36e6859bd02c9ee0c6ef3dc506d70cb93035 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Thu, 17 Oct 2024 22:58:49 +0000 Subject: [PATCH 51/76] Automatic Changelog (#2094) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 4f9cf406f0e..c098ac43f9d 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4704,3 +4704,9 @@ Entries: replace it. id: 5422 time: '2024-10-17T22:46:06.0000000+00:00' +- author: Tych0theSynth + changes: + - type: Tweak + message: Updated the NSF Prowler. + id: 5423 + time: '2024-10-17T22:55:57.0000000+00:00' From caf6fcda5e833c939e04fd0f927d18f2f58204ea Mon Sep 17 00:00:00 2001 From: dustylens <54123313+dustylens@users.noreply.github.com> Date: Thu, 17 Oct 2024 23:39:14 +0000 Subject: [PATCH 52/76] Replaces Spectre tiny fans with directional fans. (#2105) * Update spectre.yml * Remove phantom AME jar, recolour gas port * Update spectre.yml * Fix --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Whatstone Co-authored-by: Dvir --- .../Maps/_NF/Shuttles/Expedition/anchor.yml | 7 - Resources/Maps/_NF/Shuttles/crescent.yml | 17 - Resources/Maps/_NF/Shuttles/spectre.yml | 920 +++++++----------- 3 files changed, 328 insertions(+), 616 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml b/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml index fb22e288160..4faea90a58d 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml @@ -9206,13 +9206,6 @@ entities: rot: -1.5707963267948966 rad pos: -5.5,-26.5 parent: 1 -- proto: MachineCryoSleepPod - entities: - - uid: 797 - components: - - type: Transform - pos: 12.5,-24.5 - parent: 1 - proto: MaterialReclaimer entities: - uid: 1446 diff --git a/Resources/Maps/_NF/Shuttles/crescent.yml b/Resources/Maps/_NF/Shuttles/crescent.yml index 96bd6b9f386..13f7f6169ce 100644 --- a/Resources/Maps/_NF/Shuttles/crescent.yml +++ b/Resources/Maps/_NF/Shuttles/crescent.yml @@ -16773,23 +16773,6 @@ entities: - type: Transform pos: -17.5,10.5 parent: 1 -- proto: MachineCryoSleepPod - entities: - - uid: 2246 - components: - - type: Transform - pos: -23.5,33.5 - parent: 1 - - uid: 2247 - components: - - type: Transform - pos: -23.5,32.5 - parent: 1 - - uid: 2248 - components: - - type: Transform - pos: -23.5,31.5 - parent: 1 - proto: MachineElectrolysisUnit entities: - uid: 3691 diff --git a/Resources/Maps/_NF/Shuttles/spectre.yml b/Resources/Maps/_NF/Shuttles/spectre.yml index 88b51fa8bdf..7c72835dafb 100644 --- a/Resources/Maps/_NF/Shuttles/spectre.yml +++ b/Resources/Maps/_NF/Shuttles/spectre.yml @@ -38,7 +38,7 @@ entities: version: 6 -1,0: ind: -1,0 - tiles: fQAAAAAAfQAAAAAAbwAAAAABbwAAAAAAbwAAAAABbwAAAAAAbwAAAAACfQAAAAAAbwAAAAADbwAAAAABbwAAAAACbwAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAfQAAAAAAbwAAAAADbwAAAAAAbwAAAAACfQAAAAAAfQAAAAAAfQAAAAAAXgAAAAADXgAAAAACXgAAAAAAXgAAAAADfQAAAAAAHgAAAAABHgAAAAABHgAAAAABAAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAbwAAAAABfQAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAABHgAAAAABHgAAAAABHgAAAAACHgAAAAACAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAbwAAAAAAfQAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAACHgAAAAADHgAAAAAAfQAAAAAAHgAAAAABHgAAAAABHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAADfQAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAABHgAAAAACHgAAAAAAfQAAAAAAHgAAAAACHgAAAAADNwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAACfQAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAACHgAAAAAAHgAAAAAAfQAAAAAAHgAAAAABHgAAAAABHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAABHgAAAAAAHgAAAAACfQAAAAAAHgAAAAACHgAAAAABHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHgAAAAABHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAEgAAAAAAEgAAAAAAfQAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAEgAAAAAAEgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAEgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAEgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAANwAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHgAAAAAAHgAAAAAC + tiles: fQAAAAAAfQAAAAAAbwAAAAABbwAAAAAAbwAAAAABbwAAAAAAbwAAAAACfQAAAAAAbwAAAAADbwAAAAABbwAAAAACbwAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAfQAAAAAAbwAAAAADbwAAAAAAbwAAAAACfQAAAAAAfQAAAAAAfQAAAAAAXgAAAAADXgAAAAACXgAAAAAAXgAAAAADfQAAAAAAHgAAAAABHgAAAAABHgAAAAABAAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAbwAAAAABfQAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAABHgAAAAABHgAAAAABHgAAAAACHgAAAAACAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAbwAAAAAAfQAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAACHgAAAAADHgAAAAAAfQAAAAAAHgAAAAABHgAAAAABHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAADfQAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAABHgAAAAACHgAAAAAAfQAAAAAAHgAAAAACHgAAAAADNwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAACfQAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAACHgAAAAAAHgAAAAAAfQAAAAAAHgAAAAABHgAAAAABHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAABHgAAAAAAHgAAAAACfQAAAAAAHgAAAAACHgAAAAABHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHgAAAAABHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAEgAAAAAAEgAAAAAAfQAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAEgAAAAAAEgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAEgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAEgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAEgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHgAAAAAAHgAAAAAC version: 6 0,-1: ind: 0,-1 @@ -149,11 +149,6 @@ entities: id: BrickTileWhiteCornerNe decals: 513: 2,18 - - node: - color: '#5E7C16FF' - id: BrickTileWhiteCornerNe - decals: - 472: 7,9 - node: color: '#D381C9FF' id: BrickTileWhiteCornerNe @@ -177,11 +172,6 @@ entities: 64: -14,1 88: 10,0 108: -8,1 - - node: - color: '#5E7C16FF' - id: BrickTileWhiteCornerSe - decals: - 471: 7,8 - node: color: '#D381C9FF' id: BrickTileWhiteCornerSe @@ -315,6 +305,16 @@ entities: 59: 1,5 60: 2,3 61: 1,3 + - node: + color: '#1861D5FF' + id: DeliveryGreyscale + decals: + 542: -1,-6 + - node: + color: '#951710FF' + id: DeliveryGreyscale + decals: + 541: -1,-5 - node: cleanable: True color: '#FFFFFFFF' @@ -355,6 +355,9 @@ entities: 475: -6,-4 514: -1,17 515: -1,18 + 544: 7,8 + 545: 7,9 + 546: 6,6 - node: cleanable: True angle: 1.5707963267948966 rad @@ -370,7 +373,6 @@ entities: 280: 0,13 281: 0,14 284: 6,9 - 285: 7,9 323: 1,10 347: 0,6 348: 0,-1 @@ -418,8 +420,6 @@ entities: 268: 0,16 269: -1,15 270: -1,16 - 286: 7,9 - 287: 7,8 314: 0,11 318: 0,10 326: 1,11 @@ -432,8 +432,6 @@ entities: id: DirtHeavy decals: 282: 6,9 - 288: 7,8 - 289: 7,9 290: 6,10 296: 0,2 297: -1,2 @@ -728,6 +726,7 @@ entities: 466: 0,22 467: 12,2 520: -1,18 + 543: 6,8 - node: cleanable: True angle: 1.5707963267948966 rad @@ -780,7 +779,6 @@ entities: id: DirtMedium decals: 291: 6,11 - 292: 6,12 300: 1,2 301: -1,1 302: -2,2 @@ -832,11 +830,6 @@ entities: id: LoadingArea decals: 49: 1,-6 - - node: - color: '#FFFFFFFF' - id: WarnBox - decals: - 155: 6,12 - node: color: '#D381C996' id: WarnLineGreyscaleE @@ -859,11 +852,6 @@ entities: id: WarnLineGreyscaleN decals: 66: -12,1 - - node: - color: '#5E7C16FF' - id: WarnLineGreyscaleN - decals: - 470: 6,6 - node: color: '#9FED5896' id: WarnLineGreyscaleN @@ -890,11 +878,6 @@ entities: id: WarnLineGreyscaleS decals: 501: -12,3 - - node: - color: '#5E7C16FF' - id: WarnLineGreyscaleS - decals: - 469: 6,8 - node: color: '#9FED5896' id: WarnLineGreyscaleS @@ -976,15 +959,9 @@ entities: color: '#1D1D2172' id: splatter decals: + 487: -5.236245,-3.889092 539: -4.6765676,-2.645174 540: -6.1140676,-4.129549 - - node: - cleanable: True - angle: 3.141592653589793 rad - color: '#1D1D2172' - id: splatter - decals: - 487: -5.236245,-3.889092 - node: cleanable: True angle: 4.71238898038469 rad @@ -1032,192 +1009,160 @@ entities: data: tiles: 0,0: - 0: 65535 - -1,0: - 0: 65535 + 0: 65521 0,-1: 0: 65535 + -1,0: + 0: 61408 0,1: - 0: 65535 + 0: 32767 + -1,1: + 0: 52974 0,2: - 0: 65535 + 0: 30577 + -1,2: + 0: 52416 + 1: 1 0,3: - 0: 65535 + 0: 30583 + -1,3: + 0: 52428 + 0,4: + 0: 6007 1,0: - 0: 65535 - 1,1: - 0: 65535 + 0: 61422 1,2: 1: 1 + 0: 17612 + 1,1: + 0: 20206 + 1,-1: 0: 61166 1,3: - 0: 43758 + 0: 4 1: 1024 2,0: - 0: 39935 + 0: 29 1: 9216 - 2,1: - 0: 39321 - 1: 546 2,2: - 0: 2203 1: 256 + 2,-1: + 0: 64977 + 2,1: + 1: 546 3,0: - 0: 14335 + 0: 4471 1: 18432 3,1: - 0: 9011 + 0: 17 3,2: - 0: 50 1: 768 + 3,-1: + 0: 65527 + 4,0: + 1: 16 -4,0: - 0: 36079 1: 16912 - -4,1: - 0: 34952 + 0: 204 + -4,-1: + 0: 65532 -3,0: - 0: 15359 + 0: 4375 1: 33792 -3,1: - 0: 9011 + 0: 17 1: 2184 + -4,2: + 1: 2048 -3,2: - 0: 562 1: 256 + -3,-1: + 0: 63345 -2,0: + 0: 61183 + -2,-1: 0: 65535 -2,1: - 0: 65535 + 0: 20206 -2,2: - 0: 61183 + 0: 17510 1: 256 -2,3: - 0: 44782 - -1,1: - 0: 65535 - -1,2: - 1: 1 - 0: 61166 - -1,3: + 0: 4 + 1: 1024 + -1,-1: 0: 61166 + -1,4: + 0: 3276 0,-3: 1: 1792 - 0: 28672 + -1,-3: + 1: 3072 0,-2: - 0: 63351 + 0: 29491 1: 2048 - 1,-1: - 0: 65535 + -1,-2: + 0: 51336 + 1: 512 1,-3: - 0: 8736 1: 192 1,-2: - 0: 65262 + 0: 36032 2,-3: 1: 16 - 0: 43688 2,-2: - 0: 48059 - 2,-1: - 0: 65535 - 2,-4: - 0: 32768 + 0: 272 3,-4: - 1: 61440 + 1: 28672 + 2: 32768 3,-3: - 0: 65416 + 0: 28672 3,-2: - 0: 65535 - 3,-1: - 0: 65535 - 0,4: - 0: 65535 + 0: 29303 + 4,-2: + 1: 8448 + 4,-1: + 0: 13104 0,5: - 0: 65527 + 0: 12595 1: 8 + -1,5: + 0: 32904 + 1: 2 0,6: - 0: 30719 + 0: 819 + -1,6: + 0: 2184 0,7: - 0: 30519 1: 64 1,4: - 0: 46 1: 192 - -4,-4: - 1: 57344 - -4,-3: - 0: 60962 -4,-2: 1: 256 - 0: 65262 - -4,-1: - 0: 65535 + 0: 51404 + -5,-2: + 1: 32768 + -5,-1: + 0: 34944 + -4,-4: + 2: 8192 + 1: 49152 + -4,-3: + 0: 49152 -3,-4: 1: 4096 - 0: 8192 -3,-3: - 0: 48034 + 0: 4096 -3,-2: - 0: 48059 - -3,-1: - 0: 65535 + 0: 4113 -2,-3: 1: 112 - 0: 34944 -2,-2: - 0: 65535 - -2,-1: - 0: 65535 - -1,-1: - 0: 65535 - -1,-2: - 0: 64716 - 1: 512 - -1,-3: - 1: 3072 - 0: 49152 + 0: 10096 -2,4: - 0: 142 1: 96 - -1,4: - 0: 61166 - -1,5: - 1: 2 - 0: 61164 - -1,6: - 0: 52462 -1,7: - 0: 52364 1: 64 - -1,8: - 0: 52428 - -1,9: - 0: 52428 - -1,10: - 0: 1092 - 0,8: - 0: 30583 - 0,9: - 0: 30583 - 0,10: - 0: 1092 - -4,2: - 0: 136 - 1: 2048 - -5,-2: - 1: 32768 - -5,-1: - 0: 34952 - 4,-2: - 1: 8448 - 0: 4096 - 4,-1: - 0: 13107 - 4,0: - 0: 3 - 1: 16 - -5,0: - 0: 8 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -1234,6 +1179,21 @@ entities: - 0 - 0 - 0 + - volume: 2500 + immutable: True + moles: + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - volume: 2500 temperature: 293.15 moles: @@ -1264,16 +1224,11 @@ entities: parent: 3 - type: DeviceList devices: - - 908 - - 907 - - 909 - 1103 - 1101 - 969 - 967 - 978 - - type: AtmosDevice - joinedGrid: 3 - uid: 54 components: - type: Transform @@ -1288,8 +1243,6 @@ entities: - 992 - 964 - 682 - - type: AtmosDevice - joinedGrid: 3 - uid: 905 components: - type: Transform @@ -1304,15 +1257,11 @@ entities: - 1112 - 534 - 1114 - - type: AtmosDevice - joinedGrid: 3 - uid: 972 components: - type: Transform pos: 1.5,0.5 parent: 3 - - type: AtmosDevice - joinedGrid: 3 - uid: 989 components: - type: Transform @@ -1320,16 +1269,11 @@ entities: parent: 3 - type: DeviceList devices: - - 912 - - 911 - - 910 - 1090 - 1091 - 962 - 966 - 977 - - type: AtmosDevice - joinedGrid: 3 - uid: 990 components: - type: Transform @@ -1344,8 +1288,6 @@ entities: - 975 - 1092 - 1096 - - type: AtmosDevice - joinedGrid: 3 - uid: 991 components: - type: Transform @@ -1360,8 +1302,6 @@ entities: - 1104 - 1094 - 1097 - - type: AtmosDevice - joinedGrid: 3 - uid: 1045 components: - type: Transform @@ -1374,8 +1314,6 @@ entities: - 535 - 963 - 1110 - - type: AtmosDevice - joinedGrid: 3 - proto: AirCanister entities: - uid: 473 @@ -1383,8 +1321,6 @@ entities: - type: Transform pos: 0.5,-7.5 parent: 3 - - type: AtmosDevice - joinedGrid: 3 - proto: Airlock entities: - uid: 330 @@ -1501,16 +1437,13 @@ entities: - type: Transform pos: -11.5,2.5 parent: 3 -- proto: AirlockMercenaryGlass +- proto: AirlockScience entities: - - uid: 1007 + - uid: 62 components: - type: Transform - rot: 3.141592653589793 rad pos: 6.5,7.5 parent: 3 -- proto: AirlockScience - entities: - uid: 1018 components: - type: Transform @@ -1654,28 +1587,18 @@ entities: injecting: True - type: ContainerContainer containers: - AmeFuel: !type:ContainerSlot + fuelSlot: !type:ContainerSlot showEnts: False occludes: True - ent: 32 + ent: 201 - proto: AmeJar entities: - - uid: 32 + - uid: 201 components: - type: Transform parent: 202 - type: Physics canCollide: False - - uid: 1037 - components: - - type: Transform - pos: 0.7160515,-2.5026875 - parent: 3 - - uid: 1207 - components: - - type: Transform - pos: 0.30980158,-2.5026875 - parent: 3 - proto: AmeShielding entities: - uid: 14 @@ -1804,60 +1727,60 @@ entities: - type: Transform pos: 11.5,1.5 parent: 3 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: + - uid: 415 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -16.5,-1.5 + parent: 3 - uid: 416 components: - type: Transform - rot: 3.141592653589793 rad + rot: -1.5707963267948966 rad pos: -16.5,-0.5 parent: 3 - uid: 419 components: - type: Transform - rot: 3.141592653589793 rad - pos: -16.5,-2.5 + rot: 1.5707963267948966 rad + pos: 17.5,-0.5 parent: 3 - uid: 420 components: - type: Transform - rot: 3.141592653589793 rad + rot: 1.5707963267948966 rad pos: 17.5,-2.5 parent: 3 - - uid: 505 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 17.5,-0.5 - parent: 3 - - uid: 741 + - uid: 468 components: - type: Transform - rot: 3.141592653589793 rad + rot: 1.5707963267948966 rad pos: 17.5,-1.5 parent: 3 - - uid: 742 + - uid: 505 components: - type: Transform - rot: 3.141592653589793 rad - pos: -16.5,-1.5 + rot: -1.5707963267948966 rad + pos: -16.5,-2.5 parent: 3 - - uid: 1105 + - uid: 528 components: - type: Transform pos: -12.5,-5.5 parent: 3 - - uid: 1106 + - uid: 546 components: - type: Transform pos: -6.5,-4.5 parent: 3 - - uid: 1108 + - uid: 557 components: - type: Transform pos: 7.5,-4.5 parent: 3 - - uid: 1109 + - uid: 642 components: - type: Transform pos: 13.5,-5.5 @@ -1879,6 +1802,11 @@ entities: - type: Transform pos: 9.5,6.5 parent: 3 + - uid: 625 + components: + - type: Transform + pos: -5.5,14.5 + parent: 3 - uid: 1107 components: - type: Transform @@ -2178,6 +2106,14 @@ entities: - type: Transform pos: -9.5,0.5 parent: 3 +- proto: BaseAdvancedPen + entities: + - uid: 1032 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.2843938,24.057287 + parent: 3 - proto: Bed entities: - uid: 876 @@ -2211,7 +2147,6 @@ entities: parent: 3 - type: Physics canCollide: False - bodyType: Static - type: Fixtures fixtures: {} - proto: BenchSofaCorpLeft @@ -2222,8 +2157,6 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,16.5 parent: 3 - - type: Physics - bodyType: Static - proto: BenchSofaCorpMiddle entities: - uid: 637 @@ -2232,8 +2165,6 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,17.5 parent: 3 - - type: Physics - bodyType: Static - proto: BenchSofaCorpRight entities: - uid: 549 @@ -2241,8 +2172,6 @@ entities: - type: Transform pos: 1.5,18.5 parent: 3 - - type: Physics - bodyType: Static - proto: BlastDoor entities: - uid: 1026 @@ -2250,17 +2179,11 @@ entities: - type: Transform pos: 13.5,-9.5 parent: 3 - - type: DeviceLinkSink - links: - - 762 - uid: 1027 components: - type: Transform pos: 7.5,-7.5 parent: 3 - - type: DeviceLinkSink - links: - - 766 - uid: 1028 components: - type: Transform @@ -2268,16 +2191,11 @@ entities: parent: 3 - type: DeviceLinkSink invokeCounter: 4 - links: - - 767 - uid: 1029 components: - type: Transform pos: -12.5,-9.5 parent: 3 - - type: DeviceLinkSink - links: - - 765 - proto: BlockGameArcade entities: - uid: 98 @@ -3609,36 +3527,19 @@ entities: - type: Transform pos: 13.5,1.5 parent: 3 -- proto: ClosetWallMaintenanceFilledRandom - entities: - - uid: 427 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -1.5,-5.5 - parent: 3 - proto: ClothingBeltUtilityEngineering entities: - uid: 641 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,-0.5 + pos: 3.4289713,-0.46644413 parent: 3 - proto: ClothingEyesGlassesThermal entities: - uid: 996 components: - type: Transform - pos: 3.5,-0.5 - parent: 3 -- proto: ClothingHandsGlovesRobohands - entities: - - uid: 1086 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -4.5,-0.5 + pos: 3.6373043,-0.47686076 parent: 3 - proto: ClothingNeckTieSci entities: @@ -3711,11 +3612,11 @@ entities: rot: 1.5707963267948966 rad pos: 5.5,0.5 parent: 3 - - uid: 442 + - uid: 1016 components: - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,23.5 + rot: -1.5707963267948966 rad + pos: 1.5,24.5 parent: 3 - proto: ComputerTabletopShuttle entities: @@ -3740,34 +3641,23 @@ entities: parent: 3 - proto: ComputerWallmountWithdrawBankATM entities: - - uid: 533 + - uid: 427 components: - type: Transform - pos: -14.5,0.5 + pos: -15.5,0.5 parent: 3 - - type: Physics - canCollide: False - - type: ContainerContainer - containers: - board: !type:Container - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot {} - - type: ItemSlots - uid: 665 components: - type: Transform - pos: 15.5,0.5 + pos: 16.5,0.5 parent: 3 - - type: Physics - canCollide: False - - type: ContainerContainer - containers: - board: !type:Container - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot {} - - type: ItemSlots - proto: CrateArtifactContainer entities: + - uid: 553 + components: + - type: Transform + pos: -6.5,4.5 + parent: 3 - uid: 1039 components: - type: Transform @@ -4014,22 +3904,6 @@ entities: - type: Transform pos: 2.5,14.5 parent: 3 -- proto: EncryptionKeyCommon - entities: - - uid: 587 - components: - - type: Transform - parent: 998 - - type: Physics - canCollide: False -- proto: EncryptionKeyTraffic - entities: - - uid: 1000 - components: - - type: Transform - parent: 998 - - type: Physics - canCollide: False - proto: ExosuitFabricator entities: - uid: 735 @@ -4059,10 +3933,10 @@ entities: parent: 3 - proto: FaxMachineShip entities: - - uid: 655 + - uid: 32 components: - type: Transform - pos: 7.5,9.5 + pos: 1.5,23.5 parent: 3 - proto: filingCabinetRandom entities: @@ -4080,14 +3954,9 @@ entities: parent: 3 - type: DeviceList devices: - - 912 - - 911 - - 910 - 1090 - 1091 - 1035 - - type: AtmosDevice - joinedGrid: 3 - uid: 906 components: - type: Transform @@ -4095,14 +3964,9 @@ entities: parent: 3 - type: DeviceList devices: - - 908 - - 907 - - 909 - 1103 - 1101 - 1100 - - type: AtmosDevice - joinedGrid: 3 - proto: FireAxeCabinetFilled entities: - uid: 210 @@ -4111,62 +3975,46 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,15.5 parent: 3 -- proto: FirelockGlass +- proto: FirelockEdge entities: - - uid: 907 + - uid: 175 components: - type: Transform + rot: 3.141592653589793 rad pos: 13.5,-3.5 parent: 3 - - type: DeviceNetwork - deviceLists: - - 906 - - 17 - - uid: 908 + - uid: 566 components: - type: Transform - pos: 14.5,-3.5 + rot: 3.141592653589793 rad + pos: 12.5,-3.5 parent: 3 - - type: DeviceNetwork - deviceLists: - - 906 - - 17 - - uid: 909 + - uid: 732 components: - type: Transform - pos: 12.5,-3.5 + rot: 3.141592653589793 rad + pos: 14.5,-3.5 parent: 3 - - type: DeviceNetwork - deviceLists: - - 906 - - 17 - - uid: 910 + - uid: 907 components: - type: Transform - pos: -13.5,-3.5 + rot: 3.141592653589793 rad + pos: -11.5,-3.5 parent: 3 - - type: DeviceNetwork - deviceLists: - - 673 - - 989 - - uid: 911 + - uid: 908 components: - type: Transform + rot: 3.141592653589793 rad pos: -12.5,-3.5 parent: 3 - - type: DeviceNetwork - deviceLists: - - 673 - - 989 - - uid: 912 + - uid: 909 components: - type: Transform - pos: -11.5,-3.5 + rot: 3.141592653589793 rad + pos: -13.5,-3.5 parent: 3 - - type: DeviceNetwork - deviceLists: - - 673 - - 989 +- proto: FirelockGlass + entities: - uid: 1035 components: - type: Transform @@ -4331,16 +4179,17 @@ entities: - type: Transform pos: -4.5,-0.5 parent: 3 -- proto: GasMixer +- proto: GasMixerOn entities: - - uid: 455 + - uid: 459 components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,-4.5 parent: 3 - - type: AtmosDevice - joinedGrid: 3 + - type: GasMixer + inletTwoConcentration: 0.20999998 + inletOneConcentration: 0.79 - type: AtmosPipeColor color: '#0055CCFF' - proto: GasPassiveVent @@ -4350,8 +4199,6 @@ entities: - type: Transform pos: 6.5,14.5 parent: 3 - - type: AtmosDevice - joinedGrid: 3 - type: AtmosPipeColor color: '#990000FF' - uid: 1062 @@ -4360,32 +4207,24 @@ entities: rot: 3.141592653589793 rad pos: 14.5,-6.5 parent: 3 - - type: AtmosDevice - joinedGrid: 3 - uid: 1063 components: - type: Transform rot: 3.141592653589793 rad pos: 12.5,-6.5 parent: 3 - - type: AtmosDevice - joinedGrid: 3 - uid: 1064 components: - type: Transform rot: 3.141592653589793 rad pos: -11.5,-6.5 parent: 3 - - type: AtmosDevice - joinedGrid: 3 - uid: 1066 components: - type: Transform rot: 3.141592653589793 rad pos: -13.5,-6.5 parent: 3 - - type: AtmosDevice - joinedGrid: 3 - proto: GasPipeBend entities: - uid: 456 @@ -4394,6 +4233,8 @@ entities: rot: -1.5707963267948966 rad pos: 0.5,-5.5 parent: 3 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 457 components: - type: Transform @@ -4499,14 +4340,7 @@ entities: - uid: 19 components: - type: Transform - pos: 6.5,7.5 - parent: 3 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 77 - components: - - type: Transform - pos: 6.5,8.5 + pos: 6.5,7.5 parent: 3 - type: AtmosPipeColor color: '#990000FF' @@ -4526,13 +4360,6 @@ entities: parent: 3 - type: AtmosPipeColor color: '#990000FF' - - uid: 234 - components: - - type: Transform - pos: 6.5,9.5 - parent: 3 - - type: AtmosPipeColor - color: '#990000FF' - uid: 235 components: - type: Transform @@ -4689,6 +4516,14 @@ entities: parent: 3 - type: AtmosPipeColor color: '#990000FF' + - uid: 650 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-0.5 + parent: 3 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 680 components: - type: Transform @@ -5368,6 +5203,22 @@ entities: parent: 3 - proto: GasPipeTJunction entities: + - uid: 236 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,8.5 + parent: 3 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 451 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,9.5 + parent: 3 + - type: AtmosPipeColor + color: '#990000FF' - uid: 469 components: - type: Transform @@ -5472,30 +5323,36 @@ entities: color: '#0055CCFF' - proto: GasPort entities: + - uid: 450 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,8.5 + parent: 3 + - type: AtmosPipeColor + color: '#990000FF' - uid: 452 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,-4.5 parent: 3 - - type: AtmosDevice - joinedGrid: 3 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 453 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,-5.5 parent: 3 - - type: AtmosDevice - joinedGrid: 3 - - uid: 1031 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 655 components: - type: Transform - rot: 3.141592653589793 rad - pos: 6.5,12.5 + rot: -1.5707963267948966 rad + pos: 7.5,9.5 parent: 3 - - type: AtmosDevice - joinedGrid: 3 - type: AtmosPipeColor color: '#990000FF' - uid: 1054 @@ -5503,85 +5360,55 @@ entities: - type: Transform pos: 12.5,-2.5 parent: 3 - - type: AtmosDevice - joinedGrid: 3 - uid: 1055 components: - type: Transform pos: 14.5,-2.5 parent: 3 - - type: AtmosDevice - joinedGrid: 3 - uid: 1056 components: - type: Transform pos: -11.5,-2.5 parent: 3 - - type: AtmosDevice - joinedGrid: 3 - uid: 1057 components: - type: Transform pos: -13.5,-2.5 parent: 3 - - type: AtmosDevice - joinedGrid: 3 - proto: GasPressurePump entities: - - uid: 236 - components: - - type: MetaData - name: waste pump - - type: Transform - rot: 3.141592653589793 rad - pos: 6.5,11.5 - parent: 3 - - type: AtmosDevice - joinedGrid: 3 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 468 - components: - - type: MetaData - name: distro pump - - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,-0.5 - parent: 3 - - type: AtmosDevice - joinedGrid: 3 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 1058 components: - type: Transform pos: -11.5,-4.5 parent: 3 - - type: AtmosDevice - joinedGrid: 3 - uid: 1059 components: - type: Transform rot: 3.141592653589793 rad pos: -13.5,-4.5 parent: 3 - - type: AtmosDevice - joinedGrid: 3 - uid: 1060 components: - type: Transform rot: 3.141592653589793 rad pos: 14.5,-4.5 parent: 3 - - type: AtmosDevice - joinedGrid: 3 - uid: 1061 components: - type: Transform pos: 12.5,-4.5 parent: 3 - - type: AtmosDevice - joinedGrid: 3 +- proto: GasPressurePumpOnMax + entities: + - uid: 442 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,11.5 + parent: 3 + - type: AtmosPipeColor + color: '#990000FF' - proto: GasVentPump entities: - uid: 963 @@ -5593,8 +5420,6 @@ entities: - type: DeviceNetwork deviceLists: - 1045 - - type: AtmosDevice - joinedGrid: 3 - type: AtmosPipeColor color: '#0055CCFF' - uid: 964 @@ -5606,8 +5431,6 @@ entities: - type: DeviceNetwork deviceLists: - 54 - - type: AtmosDevice - joinedGrid: 3 - type: AtmosPipeColor color: '#0055CCFF' - uid: 965 @@ -5619,8 +5442,6 @@ entities: - type: DeviceNetwork deviceLists: - 990 - - type: AtmosDevice - joinedGrid: 3 - type: AtmosPipeColor color: '#0055CCFF' - uid: 966 @@ -5654,8 +5475,6 @@ entities: - type: DeviceNetwork deviceLists: - 991 - - type: AtmosDevice - joinedGrid: 3 - type: AtmosPipeColor color: '#0055CCFF' - uid: 973 @@ -5664,8 +5483,6 @@ entities: rot: 1.5707963267948966 rad pos: 1.5,-2.5 parent: 3 - - type: AtmosDevice - joinedGrid: 3 - type: AtmosPipeColor color: '#0055CCFF' - uid: 984 @@ -5673,8 +5490,6 @@ entities: - type: Transform pos: 12.5,3.5 parent: 3 - - type: AtmosDevice - joinedGrid: 3 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1114 @@ -5685,8 +5500,6 @@ entities: - type: DeviceNetwork deviceLists: - 905 - - type: AtmosDevice - joinedGrid: 3 - type: AtmosPipeColor color: '#0055CCFF' - proto: GasVentScrubber @@ -5699,8 +5512,6 @@ entities: - type: DeviceNetwork deviceLists: - 905 - - type: AtmosDevice - joinedGrid: 3 - type: AtmosPipeColor color: '#990000FF' - uid: 535 @@ -5712,8 +5523,6 @@ entities: - type: DeviceNetwork deviceLists: - 1045 - - type: AtmosDevice - joinedGrid: 3 - type: AtmosPipeColor color: '#990000FF' - uid: 682 @@ -5725,8 +5534,6 @@ entities: - type: DeviceNetwork deviceLists: - 54 - - type: AtmosDevice - joinedGrid: 3 - type: AtmosPipeColor color: '#990000FF' - uid: 958 @@ -5735,8 +5542,6 @@ entities: rot: 1.5707963267948966 rad pos: 1.5,-1.5 parent: 3 - - type: AtmosDevice - joinedGrid: 3 - type: AtmosPipeColor color: '#990000FF' - uid: 959 @@ -5748,8 +5553,6 @@ entities: - type: DeviceNetwork deviceLists: - 991 - - type: AtmosDevice - joinedGrid: 3 - type: AtmosPipeColor color: '#990000FF' - uid: 962 @@ -5761,8 +5564,6 @@ entities: - type: DeviceNetwork deviceLists: - 989 - - type: AtmosDevice - joinedGrid: 3 - type: AtmosPipeColor color: '#990000FF' - uid: 969 @@ -5774,8 +5575,6 @@ entities: - type: DeviceNetwork deviceLists: - 17 - - type: AtmosDevice - joinedGrid: 3 - type: AtmosPipeColor color: '#990000FF' - uid: 970 @@ -5787,8 +5586,6 @@ entities: - type: DeviceNetwork deviceLists: - 990 - - type: AtmosDevice - joinedGrid: 3 - type: AtmosPipeColor color: '#990000FF' - proto: GravityGeneratorMini @@ -5863,6 +5660,11 @@ entities: - type: Transform pos: -0.5,8.5 parent: 3 + - uid: 558 + components: + - type: Transform + pos: -5.5,13.5 + parent: 3 - uid: 562 components: - type: Transform @@ -5927,11 +5729,6 @@ entities: rot: 3.141592653589793 rad pos: 12.5,6.5 parent: 3 - - uid: 617 - components: - - type: Transform - pos: -5.5,14.5 - parent: 3 - uid: 618 components: - type: Transform @@ -6111,6 +5908,14 @@ entities: - type: Transform pos: 8.5,0.5 parent: 3 +- proto: LockerWallMaterialsFuelAmeJarFilled + entities: + - uid: 742 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-5.5 + parent: 3 - proto: MachineAnomalyGenerator entities: - uid: 400 @@ -6151,21 +5956,11 @@ entities: - type: Transform pos: -12.5,-7.5 parent: 3 - - type: DeviceLinkSink - links: - - 662 - uid: 1038 components: - type: Transform pos: 13.5,-7.5 parent: 3 -- proto: MachineCryoSleepPod - entities: - - uid: 732 - components: - - type: Transform - pos: -11.5,5.5 - parent: 3 - proto: MachineFrame entities: - uid: 80 @@ -6203,8 +5998,14 @@ entities: - type: Transform pos: -0.5,-7.5 parent: 3 - - type: AtmosDevice - joinedGrid: 3 + - uid: 741 + components: + - type: Transform + anchored: True + pos: -0.5,-4.5 + parent: 3 + - type: Physics + bodyType: Static - proto: OperatingTable entities: - uid: 405 @@ -6219,28 +6020,33 @@ entities: - type: Transform pos: -0.5,-6.5 parent: 3 - - type: AtmosDevice - joinedGrid: 3 -- proto: PaperBin10 - entities: - - uid: 994 + - uid: 651 components: - type: Transform - pos: 7.5,8.5 + anchored: True + pos: -0.5,-5.5 parent: 3 -- proto: PaperCaptainsThoughts + - type: Physics + bodyType: Static +- proto: PaperBin20 entities: - - uid: 1206 + - uid: 1031 components: - type: Transform - pos: -5.5,10.5 + rot: -1.5707963267948966 rad + pos: 1.7531438,23.885412 parent: 3 - proto: PortableScrubber entities: - - uid: 1032 + - uid: 77 components: - type: Transform - pos: 6.5,12.5 + pos: 7.5,9.5 + parent: 3 + - uid: 1037 + components: + - type: Transform + pos: 7.5,8.5 parent: 3 - proto: PosterContrabandAtmosiaDeclarationIndependence entities: @@ -6500,11 +6306,11 @@ entities: rot: 3.141592653589793 rad pos: 3.5,-0.5 parent: 3 - - uid: 201 + - uid: 455 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 0.5,-2.5 + rot: 3.141592653589793 rad + pos: 2.5,-4.5 parent: 3 - proto: RandomDrinkGlass entities: @@ -6776,11 +6582,6 @@ entities: rot: 1.5707963267948966 rad pos: 0.5,27.5 parent: 3 - - uid: 739 - components: - - type: Transform - pos: 5.5,11.5 - parent: 3 - uid: 895 components: - type: Transform @@ -6793,11 +6594,6 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,27.5 parent: 3 - - uid: 1044 - components: - - type: Transform - pos: -5.5,14.5 - parent: 3 - uid: 1067 components: - type: Transform @@ -6950,13 +6746,13 @@ entities: - type: Transform pos: 4.5,3.5 parent: 3 -- proto: SignAtmosMinsky +- proto: SignAtmos entities: - - uid: 459 + - uid: 1002 components: - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,-5.5 + rot: 1.5707963267948966 rad + pos: 2.5,-6.5 parent: 3 - proto: SignBar entities: @@ -7054,27 +6850,19 @@ entities: - type: Transform pos: -3.5,-0.5 parent: 3 -- proto: SignScience1 +- proto: SignScience entities: - - uid: 745 + - uid: 738 components: - type: Transform rot: -1.5707963267948966 rad - pos: -16.5,-3.5 - parent: 3 - - uid: 1227 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 3.5,19.5 + pos: 17.5,-3.5 parent: 3 -- proto: SignScience2 - entities: - - uid: 738 + - uid: 745 components: - type: Transform rot: -1.5707963267948966 rad - pos: 17.5,-3.5 + pos: -16.5,-3.5 parent: 3 - uid: 1226 components: @@ -7082,6 +6870,12 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,19.5 parent: 3 + - uid: 1227 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,19.5 + parent: 3 - proto: SignSurgery entities: - uid: 398 @@ -7113,20 +6907,6 @@ entities: - type: Transform pos: 3.5,-3.5 parent: 3 -- proto: SolidSecretDoor - entities: - - uid: 625 - components: - - type: Transform - pos: -5.5,12.5 - parent: 3 -- proto: SpawnMobSmile - entities: - - uid: 1211 - components: - - type: Transform - pos: 0.5,14.5 - parent: 3 - proto: SpawnPointLatejoin entities: - uid: 1339 @@ -7166,15 +6946,11 @@ entities: - type: Transform pos: 1.5,-7.5 parent: 3 - - type: AtmosDevice - joinedGrid: 3 - uid: 1213 components: - type: Transform pos: 1.5,-6.5 parent: 3 - - type: AtmosDevice - joinedGrid: 3 - proto: SubstationBasic entities: - uid: 341 @@ -7281,18 +7057,6 @@ entities: - type: Transform pos: 1.5,17.5 parent: 3 -- proto: TableCounterMetal - entities: - - uid: 450 - components: - - type: Transform - pos: 7.5,9.5 - parent: 3 - - uid: 451 - components: - - type: Transform - pos: 7.5,8.5 - parent: 3 - proto: TableReinforced entities: - uid: 6 @@ -7320,6 +7084,12 @@ entities: - type: Transform pos: 1.5,23.5 parent: 3 + - uid: 994 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,24.5 + parent: 3 - proto: TableWoodReinforced entities: - uid: 167 @@ -7347,35 +7117,18 @@ entities: - type: Transform pos: -0.5,12.5 parent: 3 - - uid: 553 + - uid: 617 components: - type: Transform - rot: 1.5707963267948966 rad pos: -0.5,14.5 parent: 3 - proto: TelecomServerFilledShuttle entities: - - uid: 998 + - uid: 587 components: - type: Transform - pos: -5.5,11.5 + pos: -5.5,12.5 parent: 3 - - type: ContainerContainer - containers: - key_slots: !type:Container - showEnts: False - occludes: True - ents: - - 1000 - - 587 - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - proto: Thruster entities: - uid: 21 @@ -7417,12 +7170,6 @@ entities: - type: Transform pos: 9.5,6.5 parent: 3 - - uid: 62 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -6.5,-10.5 - parent: 3 - uid: 64 components: - type: Transform @@ -7498,12 +7245,6 @@ entities: - type: Transform pos: -5.5,17.5 parent: 3 - - uid: 559 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 7.5,-10.5 - parent: 3 - uid: 560 components: - type: Transform @@ -7522,13 +7263,6 @@ entities: rot: 3.141592653589793 rad pos: 0.5,-9.5 parent: 3 -- proto: ToyAi - entities: - - uid: 1198 - components: - - type: Transform - pos: 0.5,3.5 - parent: 3 - proto: VendingMachineBooze entities: - uid: 552 @@ -7543,26 +7277,12 @@ entities: - type: Transform pos: 2.5,7.5 parent: 3 -- proto: VendingMachineGeneDrobe - entities: - - uid: 558 - components: - - type: Transform - pos: -5.5,13.5 - parent: 3 -- proto: VendingMachineRoboDrobe - entities: - - uid: 566 - components: - - type: Transform - pos: -7.5,-3.5 - parent: 3 - proto: VendingMachineRobotics entities: - - uid: 175 + - uid: 739 components: - type: Transform - pos: -7.5,-2.5 + pos: -7.5,-3.5 parent: 3 - proto: VendingMachineSciDrobe entities: @@ -9190,6 +8910,12 @@ entities: parent: 3 - proto: WarningWaste entities: + - uid: 234 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,7.5 + parent: 3 - uid: 997 components: - type: Transform @@ -9219,6 +8945,16 @@ entities: parent: 3 - proto: Window entities: + - uid: 533 + components: + - type: Transform + pos: 5.5,11.5 + parent: 3 + - uid: 559 + components: + - type: Transform + pos: -5.5,13.5 + parent: 3 - uid: 1204 components: - type: Transform From 284e846fdd42a8a802303fe4b84439f3b563d53b Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Thu, 17 Oct 2024 23:39:38 +0000 Subject: [PATCH 53/76] Automatic Changelog (#2105) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index c098ac43f9d..6be89a1e89d 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4710,3 +4710,9 @@ Entries: message: Updated the NSF Prowler. id: 5423 time: '2024-10-17T22:55:57.0000000+00:00' +- author: dustylens + changes: + - type: Tweak + message: Updated Spectre with directional fans. + id: 5424 + time: '2024-10-17T23:39:14.0000000+00:00' From aecb2f798adf9a0ed46bff28155f575cfda225fd Mon Sep 17 00:00:00 2001 From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Date: Fri, 18 Oct 2024 02:57:15 +0300 Subject: [PATCH 54/76] Lodge QoL Update (#2233) Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- Resources/Maps/_NF/POI/lodge.yml | 582 ++++++++++++++++--------------- 1 file changed, 295 insertions(+), 287 deletions(-) diff --git a/Resources/Maps/_NF/POI/lodge.yml b/Resources/Maps/_NF/POI/lodge.yml index a877d7a6d5f..a30e9ff9775 100644 --- a/Resources/Maps/_NF/POI/lodge.yml +++ b/Resources/Maps/_NF/POI/lodge.yml @@ -4962,7 +4962,6 @@ entities: parent: 1 - type: Physics canCollide: False - bodyType: Static - type: Fixtures fixtures: {} - uid: 1930 @@ -4973,7 +4972,6 @@ entities: parent: 1 - type: Physics canCollide: False - bodyType: Static - type: Fixtures fixtures: {} - uid: 2134 @@ -4984,7 +4982,6 @@ entities: parent: 1 - type: Physics canCollide: False - bodyType: Static - type: Fixtures fixtures: {} - uid: 2220 @@ -4995,7 +4992,6 @@ entities: parent: 1 - type: Physics canCollide: False - bodyType: Static - type: Fixtures fixtures: {} - proto: BenchSofaLeft @@ -5006,24 +5002,18 @@ entities: rot: 3.141592653589793 rad pos: 7.5,5.5 parent: 1 - - type: Physics - bodyType: Static - uid: 2133 components: - type: Transform rot: 1.5707963267948966 rad pos: -8.5,6.5 parent: 1 - - type: Physics - bodyType: Static - uid: 2221 components: - type: Transform rot: 1.5707963267948966 rad pos: -1.5,6.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSofaMiddle entities: - uid: 369 @@ -5032,40 +5022,30 @@ entities: rot: 3.141592653589793 rad pos: 0.5,5.5 parent: 1 - - type: Physics - bodyType: Static - uid: 370 components: - type: Transform rot: 3.141592653589793 rad pos: 1.5,5.5 parent: 1 - - type: Physics - bodyType: Static - uid: 1078 components: - type: Transform rot: 3.141592653589793 rad pos: 8.5,5.5 parent: 1 - - type: Physics - bodyType: Static - uid: 2135 components: - type: Transform rot: 3.141592653589793 rad pos: -7.5,5.5 parent: 1 - - type: Physics - bodyType: Static - uid: 2219 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,5.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSofaRight entities: - uid: 371 @@ -5074,24 +5054,18 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,6.5 parent: 1 - - type: Physics - bodyType: Static - uid: 1077 components: - type: Transform rot: -1.5707963267948966 rad pos: 9.5,6.5 parent: 1 - - type: Physics - bodyType: Static - uid: 2136 components: - type: Transform rot: 3.141592653589793 rad pos: -6.5,5.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSteelLeft entities: - uid: 884 @@ -5099,107 +5073,79 @@ entities: - type: Transform pos: 15.5,2.5 parent: 1 - - type: Physics - bodyType: Static - uid: 885 components: - type: Transform pos: -16.5,2.5 parent: 1 - - type: Physics - bodyType: Static - uid: 2059 components: - type: Transform rot: 3.141592653589793 rad pos: -11.5,19.5 parent: 1 - - type: Physics - bodyType: Static - uid: 2065 components: - type: Transform rot: 3.141592653589793 rad pos: 14.5,19.5 parent: 1 - - type: Physics - bodyType: Static - uid: 2120 components: - type: Transform pos: -8.5,3.5 parent: 1 - - type: Physics - bodyType: Static - uid: 2124 components: - type: Transform pos: 7.5,3.5 parent: 1 - - type: Physics - bodyType: Static - uid: 2523 components: - type: Transform rot: 3.141592653589793 rad pos: 1.5,20.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSteelMiddle entities: - - uid: 868 + - uid: 886 components: - type: Transform - pos: 16.5,2.5 + pos: -15.5,2.5 parent: 1 - - type: Physics - bodyType: Static - - uid: 886 + - uid: 1891 components: - type: Transform - pos: -15.5,2.5 + pos: 16.5,2.5 parent: 1 - - type: Physics - bodyType: Static - uid: 2067 components: - type: Transform rot: 3.141592653589793 rad pos: 13.5,19.5 parent: 1 - - type: Physics - bodyType: Static - uid: 2070 components: - type: Transform rot: 3.141592653589793 rad pos: -12.5,19.5 parent: 1 - - type: Physics - bodyType: Static - uid: 2121 components: - type: Transform pos: -7.5,3.5 parent: 1 - - type: Physics - bodyType: Static - uid: 2123 components: - type: Transform pos: 8.5,3.5 parent: 1 - - type: Physics - bodyType: Static - uid: 2525 components: - type: Transform rot: 3.141592653589793 rad pos: 0.5,20.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSteelRight entities: - uid: 883 @@ -5207,53 +5153,39 @@ entities: - type: Transform pos: 17.5,2.5 parent: 1 - - type: Physics - bodyType: Static - uid: 887 components: - type: Transform pos: -14.5,2.5 parent: 1 - - type: Physics - bodyType: Static - uid: 2066 components: - type: Transform rot: 3.141592653589793 rad pos: 12.5,19.5 parent: 1 - - type: Physics - bodyType: Static - uid: 2074 components: - type: Transform rot: 3.141592653589793 rad pos: -13.5,19.5 parent: 1 - - type: Physics - bodyType: Static - uid: 2119 components: - type: Transform pos: -6.5,3.5 parent: 1 - - type: Physics - bodyType: Static - uid: 2122 components: - type: Transform pos: 9.5,3.5 parent: 1 - - type: Physics - bodyType: Static - uid: 2524 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,20.5 parent: 1 - - type: Physics - bodyType: Static - proto: BodyBagFolded entities: - uid: 1495 @@ -7816,31 +7748,11 @@ entities: - type: Transform pos: 15.5,11.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: 2164 components: - type: Transform pos: 13.5,11.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: ComputerTabletopStationRecords entities: - uid: 264 @@ -7867,8 +7779,6 @@ entities: showEnts: False occludes: True ent: null - - type: Physics - canCollide: False - type: ItemSlots - uid: 2518 components: @@ -7886,8 +7796,6 @@ entities: showEnts: False occludes: True ent: null - - type: Physics - canCollide: False - type: ItemSlots - uid: 2519 components: @@ -7905,8 +7813,6 @@ entities: showEnts: False occludes: True ent: null - - type: Physics - canCollide: False - type: ItemSlots - uid: 2520 components: @@ -7924,8 +7830,6 @@ entities: showEnts: False occludes: True ent: null - - type: Physics - canCollide: False - type: ItemSlots - uid: 2521 components: @@ -7943,8 +7847,6 @@ entities: showEnts: False occludes: True ent: null - - type: Physics - canCollide: False - type: ItemSlots - uid: 2522 components: @@ -7962,8 +7864,6 @@ entities: showEnts: False occludes: True ent: null - - type: Physics - canCollide: False - type: ItemSlots - proto: ConveyorBelt entities: @@ -14303,6 +14203,13 @@ entities: - type: Transform pos: 0.5,11.5 parent: 1 +- proto: LessLethalVendingMachinePOI + entities: + - uid: 2530 + components: + - type: Transform + pos: 16.5,11.5 + parent: 1 - proto: MachineCryoSleepPod entities: - uid: 2100 @@ -14400,6 +14307,128 @@ entities: - type: Transform pos: 6.535731,10.07715 parent: 1 +- proto: NFSignDock + entities: + - uid: 360 + components: + - type: Transform + pos: 29.5,4.5 + parent: 1 + - uid: 507 + components: + - type: Transform + pos: -28.5,4.5 + parent: 1 + - uid: 508 + components: + - type: Transform + pos: -18.5,26.5 + parent: 1 + - uid: 509 + components: + - type: Transform + pos: 25.5,20.5 + parent: 1 + - uid: 510 + components: + - type: Transform + pos: -1.5,26.5 + parent: 1 + - uid: 521 + components: + - type: Transform + pos: 2.5,26.5 + parent: 1 + - uid: 522 + components: + - type: Transform + pos: -24.5,24.5 + parent: 1 + - uid: 523 + components: + - type: Transform + pos: -24.5,20.5 + parent: 1 + - uid: 524 + components: + - type: Transform + pos: -22.5,26.5 + parent: 1 + - uid: 562 + components: + - type: Transform + pos: -28.5,-3.5 + parent: 1 + - uid: 576 + components: + - type: Transform + pos: 25.5,24.5 + parent: 1 + - uid: 577 + components: + - type: Transform + pos: 29.5,-3.5 + parent: 1 + - uid: 853 + components: + - type: Transform + pos: 19.5,26.5 + parent: 1 + - uid: 855 + components: + - type: Transform + pos: 23.5,26.5 + parent: 1 + - uid: 1513 + components: + - type: Transform + pos: 33.5,4.5 + parent: 1 + - uid: 1514 + components: + - type: Transform + pos: 35.5,2.5 + parent: 1 + - uid: 1515 + components: + - type: Transform + pos: 35.5,-1.5 + parent: 1 + - uid: 1516 + components: + - type: Transform + pos: 33.5,-3.5 + parent: 1 + - uid: 1517 + components: + - type: Transform + pos: 2.5,-3.5 + parent: 1 + - uid: 1518 + components: + - type: Transform + pos: -1.5,-3.5 + parent: 1 + - uid: 1519 + components: + - type: Transform + pos: -32.5,-3.5 + parent: 1 + - uid: 1520 + components: + - type: Transform + pos: -34.5,-1.5 + parent: 1 + - uid: 1521 + components: + - type: Transform + pos: -34.5,2.5 + parent: 1 + - uid: 1522 + components: + - type: Transform + pos: -32.5,4.5 + parent: 1 - proto: NonLethalVendingMachine entities: - uid: 1768 @@ -15708,152 +15737,30 @@ entities: - type: Transform pos: -1.5,24.5 parent: 1 -- proto: NFSignDock +- proto: Sink entities: - - uid: 360 + - uid: 1001 components: - type: Transform - pos: 29.5,4.5 + rot: 1.5707963267948966 rad + pos: -17.5,17.5 parent: 1 - - uid: 507 + - uid: 1852 components: - type: Transform - pos: -28.5,4.5 + rot: -1.5707963267948966 rad + pos: -13.5,17.5 parent: 1 - - uid: 508 +- proto: SinkWide + entities: + - uid: 848 components: - type: Transform - pos: -18.5,26.5 + pos: -6.5,17.5 parent: 1 - - uid: 509 - components: - - type: Transform - pos: 25.5,20.5 - parent: 1 - - uid: 510 - components: - - type: Transform - pos: -1.5,26.5 - parent: 1 - - uid: 521 - components: - - type: Transform - pos: 2.5,26.5 - parent: 1 - - uid: 522 - components: - - type: Transform - pos: -24.5,24.5 - parent: 1 - - uid: 523 - components: - - type: Transform - pos: -24.5,20.5 - parent: 1 - - uid: 524 - components: - - type: Transform - pos: -22.5,26.5 - parent: 1 - - uid: 562 - components: - - type: Transform - pos: -28.5,-3.5 - parent: 1 - - uid: 576 - components: - - type: Transform - pos: 25.5,24.5 - parent: 1 - - uid: 577 - components: - - type: Transform - pos: 29.5,-3.5 - parent: 1 - - uid: 853 - components: - - type: Transform - pos: 19.5,26.5 - parent: 1 - - uid: 855 - components: - - type: Transform - pos: 23.5,26.5 - parent: 1 - - uid: 1513 - components: - - type: Transform - pos: 33.5,4.5 - parent: 1 - - uid: 1514 - components: - - type: Transform - pos: 35.5,2.5 - parent: 1 - - uid: 1515 - components: - - type: Transform - pos: 35.5,-1.5 - parent: 1 - - uid: 1516 - components: - - type: Transform - pos: 33.5,-3.5 - parent: 1 - - uid: 1517 - components: - - type: Transform - pos: 2.5,-3.5 - parent: 1 - - uid: 1518 - components: - - type: Transform - pos: -1.5,-3.5 - parent: 1 - - uid: 1519 - components: - - type: Transform - pos: -32.5,-3.5 - parent: 1 - - uid: 1520 - components: - - type: Transform - pos: -34.5,-1.5 - parent: 1 - - uid: 1521 - components: - - type: Transform - pos: -34.5,2.5 - parent: 1 - - uid: 1522 - components: - - type: Transform - pos: -32.5,4.5 - parent: 1 -- proto: Sink - entities: - - uid: 1001 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -17.5,17.5 - parent: 1 - - uid: 1852 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -13.5,17.5 - parent: 1 -- proto: SinkWide - entities: - - uid: 848 - components: - - type: Transform - pos: -6.5,17.5 - parent: 1 -- proto: SMESBasic - entities: - - uid: 20 +- proto: SMESBasic + entities: + - uid: 20 components: - type: Transform pos: 1.5,13.5 @@ -16005,11 +15912,6 @@ entities: parent: 1 - proto: SpawnPointLatejoin entities: - - uid: 1891 - components: - - type: Transform - pos: -13.5,17.5 - parent: 1 - uid: 2084 components: - type: Transform @@ -16020,69 +15922,174 @@ entities: - type: Transform pos: -11.5,13.5 parent: 1 - - uid: 2086 +- proto: SpawnPointMercenary + entities: + - uid: 878 components: - type: Transform - pos: -17.5,17.5 + pos: 13.5,19.5 parent: 1 -- proto: SpawnPointMercenary - entities: - - uid: 906 + - uid: 2068 components: - type: Transform - pos: 0.5,20.5 + pos: 14.5,19.5 parent: 1 - - uid: 2056 + - uid: 2557 components: - type: Transform - pos: -15.5,2.5 + pos: -8.5,10.5 parent: 1 - - uid: 2057 + - uid: 2558 components: - type: Transform - pos: 16.5,2.5 + pos: -2.5,8.5 parent: 1 - - uid: 2068 + - uid: 2559 components: - type: Transform - pos: 9.5,3.5 + pos: 3.5,8.5 parent: 1 - - uid: 2072 + - uid: 2560 + components: + - type: Transform + pos: -0.5,8.5 + parent: 1 + - uid: 2561 + components: + - type: Transform + pos: -3.5,10.5 + parent: 1 + - uid: 2568 + components: + - type: Transform + pos: 12.5,19.5 + parent: 1 + - uid: 2569 + components: + - type: Transform + pos: 1.5,20.5 + parent: 1 + - uid: 2570 + components: + - type: Transform + pos: 0.5,20.5 + parent: 1 + - uid: 2571 + components: + - type: Transform + pos: -0.5,20.5 + parent: 1 + - uid: 2572 + components: + - type: Transform + pos: -11.5,19.5 + parent: 1 + - uid: 2573 components: - type: Transform pos: -12.5,19.5 parent: 1 - - uid: 2532 + - uid: 2574 components: - type: Transform - pos: -8.5,3.5 + pos: -13.5,19.5 + parent: 1 + - uid: 2575 + components: + - type: Transform + pos: -7.5,9.5 parent: 1 - proto: SpawnPointPilot entities: - - uid: 878 + - uid: 868 components: - type: Transform - pos: 13.5,19.5 + pos: 16.5,2.5 parent: 1 - - uid: 2060 + - uid: 906 components: - type: Transform pos: -16.5,2.5 parent: 1 + - uid: 1055 + components: + - type: Transform + pos: -15.5,2.5 + parent: 1 + - uid: 1162 + components: + - type: Transform + pos: -7.5,3.5 + parent: 1 + - uid: 2056 + components: + - type: Transform + pos: 15.5,2.5 + parent: 1 + - uid: 2057 + components: + - type: Transform + pos: -14.5,2.5 + parent: 1 + - uid: 2060 + components: + - type: Transform + pos: 7.5,3.5 + parent: 1 - uid: 2061 components: - type: Transform pos: 17.5,2.5 parent: 1 - - uid: 2530 + - uid: 2072 + components: + - type: Transform + pos: -6.5,3.5 + parent: 1 + - uid: 2086 + components: + - type: Transform + pos: 9.5,3.5 + parent: 1 + - uid: 2103 components: - type: Transform pos: 8.5,3.5 parent: 1 - - uid: 2531 + - uid: 2555 components: - type: Transform - pos: -7.5,3.5 + pos: -8.5,3.5 + parent: 1 + - uid: 2562 + components: + - type: Transform + pos: -6.5,10.5 + parent: 1 + - uid: 2563 + components: + - type: Transform + pos: -3.5,9.5 + parent: 1 + - uid: 2564 + components: + - type: Transform + pos: -1.5,8.5 + parent: 1 + - uid: 2565 + components: + - type: Transform + pos: 0.5,8.5 + parent: 1 + - uid: 2566 + components: + - type: Transform + pos: 1.5,8.5 + parent: 1 + - uid: 2567 + components: + - type: Transform + pos: 2.5,8.5 parent: 1 - proto: StairDark entities: @@ -16588,11 +16595,6 @@ entities: - type: Transform pos: -10.5,4.5 parent: 1 - - uid: 2188 - components: - - type: Transform - pos: -5.5,23.5 - parent: 1 - proto: VendingMachineBooze entities: - uid: 935 @@ -16621,32 +16623,29 @@ entities: - type: Transform pos: -11.5,17.5 parent: 1 -- proto: VendingMachineExpeditionaryFlatpackVend +- proto: VendingMachineEngivendPOI entities: - - uid: 1169 + - uid: 2531 components: - type: Transform - pos: -12.5,4.5 + pos: -5.5,19.5 parent: 1 - - uid: 2103 +- proto: VendingMachineExpeditionaryFlatpackVend + entities: + - uid: 1169 components: - type: Transform - pos: -5.5,19.5 + pos: -12.5,4.5 parent: 1 - proto: VendingMachineFuelVend entities: - - uid: 2187 + - uid: 2532 components: - type: Transform - pos: 16.5,11.5 + pos: 6.5,23.5 parent: 1 - proto: VendingMachineSalvagePOI entities: - - uid: 1162 - components: - - type: Transform - pos: 6.5,19.5 - parent: 1 - uid: 2051 components: - type: Transform @@ -16659,15 +16658,24 @@ entities: - type: Transform pos: -1.5,3.5 parent: 1 - - uid: 1055 + - uid: 2146 components: - type: Transform - pos: 6.5,23.5 + pos: 2.5,3.5 parent: 1 - - uid: 2146 +- proto: VendingMachineVendomatPOI + entities: + - uid: 2188 components: - type: Transform - pos: 2.5,3.5 + pos: 6.5,19.5 + parent: 1 +- proto: VendingMachineYouToolPOI + entities: + - uid: 2187 + components: + - type: Transform + pos: -5.5,23.5 parent: 1 - proto: WallmountTelevision entities: From 6582c253ef3eeec2ec50bd28ad3246a3d6c8f1eb Mon Sep 17 00:00:00 2001 From: AF-Buyrcsp2 Date: Fri, 18 Oct 2024 07:57:32 +0800 Subject: [PATCH 55/76] SSS Camper (UPDATE) (#2115) * Update camper.yml * Fixes the unconnected HV Cable * Update camper.yml --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> Co-authored-by: Dvir --- Resources/Maps/_NF/Shuttles/camper.yml | 510 ++++++++++++------------- 1 file changed, 252 insertions(+), 258 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/camper.yml b/Resources/Maps/_NF/Shuttles/camper.yml index 92589e3ca38..8c2a04a808a 100644 --- a/Resources/Maps/_NF/Shuttles/camper.yml +++ b/Resources/Maps/_NF/Shuttles/camper.yml @@ -19,17 +19,16 @@ entities: - type: MetaData name: Camper - type: Transform - pos: -9.170037,-0.1471653 parent: invalid - type: MapGrid chunks: 0,0: ind: 0,0 - tiles: ggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: ggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,0: ind: -1,0 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAgAAAAAAAgAAAAAAYQAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAggAAAAAAYQAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAABAAAAAAABAAAAAAAYQAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAggAAAAAAAgAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAgAAAAAAAgAAAAAAYQAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAggAAAAAAYQAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAABAAAAAAABAAAAAAAYQAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAggAAAAAAAgAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 0,-1: ind: 0,-1 @@ -116,6 +115,7 @@ entities: id: Delivery decals: 16: -1,2 + 27: 0,2 - node: angle: 3.141592653589793 rad color: '#FFFFFFFF' @@ -233,19 +233,9 @@ entities: rot: 3.141592653589793 rad pos: -1.5,-5.5 parent: 1 -- proto: AirCanister - entities: - - uid: 3 - components: - - type: Transform - anchored: True - pos: -0.5,2.5 - parent: 1 - - type: Physics - bodyType: Static - proto: AirlockExternal entities: - - uid: 4 + - uid: 3 components: - type: Transform rot: 1.5707963267948966 rad @@ -253,7 +243,7 @@ entities: parent: 1 - proto: AirlockGlassShuttle entities: - - uid: 5 + - uid: 4 components: - type: Transform rot: 1.5707963267948966 rad @@ -261,7 +251,7 @@ entities: parent: 1 - proto: AirSensor entities: - - uid: 6 + - uid: 5 components: - type: Transform rot: 3.141592653589793 rad @@ -269,85 +259,86 @@ entities: parent: 1 - proto: APCBasic entities: - - uid: 7 + - uid: 6 components: - type: Transform rot: 1.5707963267948966 rad pos: -2.5,1.5 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - - uid: 8 + - uid: 7 components: - type: Transform + rot: 1.5707963267948966 rad pos: 1.5,-1.5 parent: 1 - proto: AtmosFixBlockerMarker entities: - - uid: 9 + - uid: 8 components: - type: Transform rot: 3.141592653589793 rad pos: 1.5,4.5 parent: 1 - - uid: 10 + - uid: 9 components: - type: Transform rot: 3.141592653589793 rad pos: -3.5,-6.5 parent: 1 - - uid: 11 + - uid: 10 components: - type: Transform rot: 3.141592653589793 rad pos: -3.5,-5.5 parent: 1 - - uid: 12 + - uid: 11 components: - type: Transform pos: 0.5,-5.5 parent: 1 - - uid: 13 + - uid: 12 components: - type: Transform rot: 3.141592653589793 rad pos: -3.5,6.5 parent: 1 - - uid: 14 + - uid: 13 components: - type: Transform pos: 0.5,-6.5 parent: 1 - - uid: 15 + - uid: 14 components: - type: Transform pos: 0.5,6.5 parent: 1 - - uid: 16 + - uid: 15 components: - type: Transform rot: 3.141592653589793 rad pos: -2.5,-6.5 parent: 1 - - uid: 17 + - uid: 16 components: - type: Transform rot: 3.141592653589793 rad pos: -4.5,-3.5 parent: 1 - - uid: 18 + - uid: 17 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,-6.5 parent: 1 - - uid: 19 + - uid: 18 components: - type: Transform rot: 3.141592653589793 rad pos: 1.5,-3.5 parent: 1 - - uid: 20 + - uid: 19 components: - type: Transform rot: 3.141592653589793 rad @@ -355,14 +346,14 @@ entities: parent: 1 - proto: Bed entities: - - uid: 21 + - uid: 20 components: - type: Transform pos: -1.5,-4.5 parent: 1 - proto: BedsheetBlue entities: - - uid: 22 + - uid: 21 components: - type: Transform rot: 3.141592653589793 rad @@ -370,162 +361,167 @@ entities: parent: 1 - proto: BoxPaper entities: - - uid: 23 + - uid: 22 components: - type: Transform pos: -1.4186039,5.4487333 parent: 1 - proto: Bucket entities: - - uid: 24 + - uid: 23 components: - type: Transform pos: -3.1369505,2.8069963 parent: 1 - proto: CableApcExtension entities: - - uid: 25 + - uid: 24 components: - type: Transform pos: -1.5,-0.5 parent: 1 - - uid: 26 + - uid: 25 components: - type: Transform pos: -1.5,4.5 parent: 1 - - uid: 27 + - uid: 26 components: - type: Transform pos: -1.5,3.5 parent: 1 - - uid: 28 + - uid: 27 components: - type: Transform pos: -1.5,2.5 parent: 1 - - uid: 29 + - uid: 28 components: - type: Transform pos: -1.5,-0.5 parent: 1 - - uid: 30 + - uid: 29 components: - type: Transform pos: -1.5,0.5 parent: 1 - - uid: 31 + - uid: 30 components: - type: Transform pos: -1.5,1.5 parent: 1 - - uid: 32 + - uid: 31 components: - type: Transform pos: -1.5,-2.5 parent: 1 - - uid: 33 + - uid: 32 components: - type: Transform pos: -1.5,-3.5 parent: 1 - - uid: 34 + - uid: 33 components: - type: Transform pos: -1.5,-1.5 parent: 1 - - uid: 35 + - uid: 34 components: - type: Transform pos: -2.5,1.5 parent: 1 - - uid: 36 + - uid: 35 components: - type: Transform pos: -1.5,-4.5 parent: 1 - - uid: 37 + - uid: 36 components: - type: Transform pos: -1.5,5.5 parent: 1 - proto: CableHV entities: - - uid: 38 + - uid: 37 components: - type: Transform pos: 0.5,-0.5 parent: 1 - - uid: 39 + - uid: 38 components: - type: Transform pos: 0.5,0.5 parent: 1 + - uid: 191 + components: + - type: Transform + pos: -0.5,0.5 + parent: 1 - proto: CableMV entities: - - uid: 40 + - uid: 39 components: - type: Transform pos: -0.5,1.5 parent: 1 - - uid: 41 + - uid: 40 components: - type: Transform pos: 0.5,-0.5 parent: 1 - - uid: 42 + - uid: 41 components: - type: Transform pos: 0.5,0.5 parent: 1 - - uid: 43 + - uid: 42 components: - type: Transform pos: -0.5,0.5 parent: 1 - - uid: 44 + - uid: 43 components: - type: Transform pos: -2.5,1.5 parent: 1 - - uid: 45 + - uid: 44 components: - type: Transform pos: -1.5,1.5 parent: 1 - proto: CarpetBlue entities: - - uid: 46 + - uid: 45 components: - type: Transform rot: -1.5707963267948966 rad pos: -2.5,-3.5 parent: 1 - - uid: 47 + - uid: 46 components: - type: Transform rot: -1.5707963267948966 rad pos: -2.5,-4.5 parent: 1 - - uid: 48 + - uid: 47 components: - type: Transform rot: -1.5707963267948966 rad pos: -1.5,-4.5 parent: 1 - - uid: 49 + - uid: 48 components: - type: Transform rot: -1.5707963267948966 rad pos: -1.5,-3.5 parent: 1 - - uid: 50 + - uid: 49 components: - type: Transform rot: -1.5707963267948966 rad pos: -0.5,-4.5 parent: 1 - - uid: 51 + - uid: 50 components: - type: Transform rot: -1.5707963267948966 rad @@ -533,35 +529,24 @@ entities: parent: 1 - proto: Catwalk entities: - - uid: 52 - components: - - type: Transform - pos: 0.5,2.5 - parent: 1 - - uid: 53 + - uid: 51 components: - type: Transform pos: -0.5,0.5 parent: 1 - - uid: 54 + - uid: 52 components: - type: Transform pos: 0.5,0.5 parent: 1 - - uid: 55 + - uid: 53 components: - type: Transform pos: 0.5,1.5 parent: 1 - - uid: 56 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,1.5 - parent: 1 - proto: ChairFolding entities: - - uid: 57 + - uid: 54 components: - type: Transform rot: 3.141592653589793 rad @@ -569,50 +554,42 @@ entities: parent: 1 - proto: ChairPilotSeat entities: - - uid: 58 + - uid: 55 components: - type: Transform rot: 3.141592653589793 rad pos: -2.5,4.5 parent: 1 - - uid: 59 + - uid: 56 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,4.5 parent: 1 -- proto: ClosetWallMaintenanceFilledRandom - entities: - - uid: 60 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,-0.5 - parent: 1 - proto: ComfyChair entities: - - uid: 61 + - uid: 57 components: - type: Transform pos: -2.5,-3.5 parent: 1 - proto: ComputerTabletopShuttle entities: - - uid: 62 + - uid: 58 components: - type: Transform pos: -2.5,5.5 parent: 1 - proto: ComputerTabletopStationRecords entities: - - uid: 63 + - uid: 59 components: - type: Transform pos: -0.5,5.5 parent: 1 - proto: ComputerTelevision entities: - - uid: 64 + - uid: 60 components: - type: Transform rot: 3.141592653589793 rad @@ -620,14 +597,14 @@ entities: parent: 1 - proto: CrateFreezer entities: - - uid: 65 + - uid: 61 components: - type: Transform pos: -3.5,0.5 parent: 1 - proto: CurtainsBlackOpen entities: - - uid: 66 + - uid: 62 components: - type: Transform rot: 3.141592653589793 rad @@ -635,7 +612,7 @@ entities: parent: 1 - proto: CurtainsBlueOpen entities: - - uid: 67 + - uid: 63 components: - type: Transform rot: 3.141592653589793 rad @@ -643,7 +620,7 @@ entities: parent: 1 - proto: CurtainsWhiteOpen entities: - - uid: 68 + - uid: 64 components: - type: Transform rot: -1.5707963267948966 rad @@ -651,7 +628,7 @@ entities: parent: 1 - proto: DefibrillatorCabinetFilled entities: - - uid: 69 + - uid: 65 components: - type: Transform rot: 1.5707963267948966 rad @@ -659,27 +636,27 @@ entities: parent: 1 - proto: DresserFilled entities: - - uid: 70 + - uid: 66 components: - type: Transform pos: -0.5,-4.5 parent: 1 - proto: DrinkBeerBottleFull entities: - - uid: 71 + - uid: 67 components: - type: Transform pos: -1.9612398,5.593486 parent: 1 - proto: DrinkGlass entities: - - uid: 72 + - uid: 68 components: - type: Transform rot: 3.141592653589793 rad pos: -3.8106375,-0.12930775 parent: 1 - - uid: 73 + - uid: 69 components: - type: Transform rot: 3.141592653589793 rad @@ -687,7 +664,7 @@ entities: parent: 1 - proto: EmergencyLight entities: - - uid: 74 + - uid: 70 components: - type: Transform rot: 1.5707963267948966 rad @@ -695,7 +672,7 @@ entities: parent: 1 - proto: ExtinguisherCabinetFilled entities: - - uid: 75 + - uid: 71 components: - type: Transform rot: 3.141592653589793 rad @@ -703,14 +680,27 @@ entities: parent: 1 - proto: FaxMachineShip entities: - - uid: 76 + - uid: 72 components: - type: Transform pos: -1.5,5.5 parent: 1 +- proto: GasMixerOn + entities: + - uid: 73 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,1.5 + parent: 1 + - type: GasMixer + inletTwoConcentration: 0.79 + inletOneConcentration: 0.21 + - type: AtmosPipeColor + color: '#0055CCFF' - proto: GasPassiveVent entities: - - uid: 77 + - uid: 74 components: - type: Transform rot: -1.5707963267948966 rad @@ -720,7 +710,15 @@ entities: color: '#CC1111FF' - proto: GasPipeBend entities: - - uid: 78 + - uid: 75 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 76 components: - type: Transform rot: 3.141592653589793 rad @@ -728,7 +726,7 @@ entities: parent: 1 - type: AtmosPipeColor color: '#CC1111FF' - - uid: 79 + - uid: 77 components: - type: Transform rot: 3.141592653589793 rad @@ -736,22 +734,14 @@ entities: parent: 1 - type: AtmosPipeColor color: '#CC1111FF' - - uid: 80 + - uid: 78 components: - type: Transform pos: -1.5,-1.5 parent: 1 - type: AtmosPipeColor color: '#CC1111FF' - - uid: 81 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,1.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 82 + - uid: 79 components: - type: Transform rot: 3.141592653589793 rad @@ -761,14 +751,14 @@ entities: color: '#0055CCFF' - proto: GasPipeStraight entities: - - uid: 83 + - uid: 80 components: - type: Transform pos: -1.5,-2.5 parent: 1 - type: AtmosPipeColor color: '#CC1111FF' - - uid: 84 + - uid: 81 components: - type: Transform rot: -1.5707963267948966 rad @@ -776,7 +766,7 @@ entities: parent: 1 - type: AtmosPipeColor color: '#CC1111FF' - - uid: 85 + - uid: 82 components: - type: Transform rot: -1.5707963267948966 rad @@ -784,28 +774,33 @@ entities: parent: 1 - type: AtmosPipeColor color: '#CC1111FF' + - uid: 83 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' - proto: GasPort entities: - - uid: 86 + - uid: 84 components: - type: Transform - pos: -0.5,2.5 + pos: 0.5,2.5 parent: 1 - type: AtmosPipeColor color: '#0055CCFF' -- proto: GasPressurePumpOn - entities: - - uid: 87 + - uid: 85 components: - type: Transform - rot: 3.141592653589793 rad - pos: -1.5,2.5 + pos: -0.5,2.5 parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - proto: GasValve entities: - - uid: 88 + - uid: 86 components: - type: Transform pos: -2.5,-0.5 @@ -814,7 +809,7 @@ entities: color: '#CC1111FF' - proto: GasVentPump entities: - - uid: 89 + - uid: 87 components: - type: Transform pos: -1.5,3.5 @@ -823,7 +818,7 @@ entities: color: '#0055CCFF' - proto: GasVentScrubber entities: - - uid: 90 + - uid: 88 components: - type: Transform pos: -2.5,0.5 @@ -832,86 +827,86 @@ entities: color: '#CC1111FF' - proto: GravityGeneratorMini entities: - - uid: 91 + - uid: 89 components: - type: Transform - pos: 0.5,2.5 + pos: 0.5,0.5 parent: 1 - proto: Grille entities: - - uid: 92 + - uid: 90 components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,1.5 parent: 1 - - uid: 93 + - uid: 91 components: - type: Transform rot: 1.5707963267948966 rad pos: -4.5,-0.5 parent: 1 - - uid: 94 + - uid: 92 components: - type: Transform rot: -1.5707963267948966 rad pos: -3.5,-3.5 parent: 1 - - uid: 95 + - uid: 93 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,4.5 parent: 1 - - uid: 96 + - uid: 94 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,-4.5 parent: 1 - - uid: 97 + - uid: 95 components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,-3.5 parent: 1 - - uid: 98 + - uid: 96 components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,4.5 parent: 1 - - uid: 99 + - uid: 97 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,5.5 parent: 1 - - uid: 100 + - uid: 98 components: - type: Transform rot: -1.5707963267948966 rad pos: -0.5,6.5 parent: 1 - - uid: 101 + - uid: 99 components: - type: Transform rot: -1.5707963267948966 rad pos: -1.5,6.5 parent: 1 - - uid: 102 + - uid: 100 components: - type: Transform rot: -1.5707963267948966 rad pos: -2.5,6.5 parent: 1 - - uid: 103 + - uid: 101 components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,5.5 parent: 1 - - uid: 104 + - uid: 102 components: - type: Transform rot: 1.5707963267948966 rad @@ -919,14 +914,22 @@ entities: parent: 1 - proto: KitchenKnife entities: - - uid: 105 + - uid: 103 components: - type: Transform pos: -3.4543009,-0.5313598 parent: 1 +- proto: LockerWallMaterialsFuelPlasmaFilled + entities: + - uid: 104 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-0.5 + parent: 1 - proto: LockerWoodenGeneric entities: - - uid: 106 + - uid: 105 components: - type: Transform pos: -0.5,-3.5 @@ -949,27 +952,43 @@ entities: - 0 - 0 - 0 -- proto: Plunger +- proto: NitrogenCanister + entities: + - uid: 106 + components: + - type: Transform + anchored: True + pos: -0.5,2.5 + parent: 1 + - type: Physics + bodyType: Static +- proto: OxygenCanister entities: - uid: 107 + components: + - type: Transform + anchored: True + pos: 0.5,2.5 + parent: 1 + - type: Physics + bodyType: Static +- proto: Plunger + entities: + - uid: 108 components: - type: Transform pos: -3.9147282,2.3184562 parent: 1 - proto: PortableGeneratorPacmanShuttle entities: - - uid: 108 + - uid: 109 components: - type: Transform - pos: 0.5,0.5 + pos: -0.5,0.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PosterContrabandEAT entities: - - uid: 109 + - uid: 110 components: - type: Transform rot: 1.5707963267948966 rad @@ -977,14 +996,14 @@ entities: parent: 1 - proto: PosterContrabandTools entities: - - uid: 110 + - uid: 111 components: - type: Transform pos: 0.5,3.5 parent: 1 - proto: PosterLegitEatMeat entities: - - uid: 111 + - uid: 112 components: - type: Transform rot: 1.5707963267948966 rad @@ -992,7 +1011,7 @@ entities: parent: 1 - proto: PosterLegitNoERP entities: - - uid: 112 + - uid: 113 components: - type: Transform rot: 3.141592653589793 rad @@ -1000,13 +1019,13 @@ entities: parent: 1 - proto: PoweredLightPostSmallRed entities: - - uid: 113 + - uid: 114 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,-6.5 parent: 1 - - uid: 114 + - uid: 115 components: - type: Transform rot: 1.5707963267948966 rad @@ -1014,40 +1033,32 @@ entities: parent: 1 - proto: PoweredSmallLight entities: - - uid: 115 + - uid: 116 components: - type: Transform pos: -0.5,-3.5 parent: 1 - - uid: 116 + - uid: 117 components: - type: Transform rot: 3.141592653589793 rad pos: -2.5,4.5 parent: 1 - - uid: 117 + - uid: 118 components: - type: Transform pos: -3.5,0.5 parent: 1 - - uid: 118 + - uid: 119 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,2.5 parent: 1 - - uid: 119 - components: - - type: Transform - pos: 0.5,-1.5 - parent: 1 -- proto: Rack - entities: - uid: 120 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,0.5 + pos: 0.5,-1.5 parent: 1 - proto: RandomPosterAny entities: @@ -1068,96 +1079,81 @@ entities: - type: Transform pos: -3.562829,-0.3866073 parent: 1 -- proto: SheetPlasma - entities: - - uid: 124 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -0.4961233,0.41857672 - parent: 1 -- proto: ShipyardCamperInfo - entities: - - uid: 125 - components: - - type: Transform - pos: 0.43701267,0.44958544 - parent: 1 - proto: ShuttleWindow entities: - - uid: 126 + - uid: 124 components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,1.5 parent: 1 - - uid: 127 + - uid: 125 components: - type: Transform rot: 1.5707963267948966 rad pos: -4.5,-0.5 parent: 1 - - uid: 128 + - uid: 126 components: - type: Transform rot: -1.5707963267948966 rad pos: -3.5,-3.5 parent: 1 - - uid: 129 + - uid: 127 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,4.5 parent: 1 - - uid: 130 + - uid: 128 components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,5.5 parent: 1 - - uid: 131 + - uid: 129 components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,-3.5 parent: 1 - - uid: 132 + - uid: 130 components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,4.5 parent: 1 - - uid: 133 + - uid: 131 components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,-4.5 parent: 1 - - uid: 134 + - uid: 132 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,-4.5 parent: 1 - - uid: 135 + - uid: 133 components: - type: Transform rot: -1.5707963267948966 rad pos: -2.5,6.5 parent: 1 - - uid: 136 + - uid: 134 components: - type: Transform rot: -1.5707963267948966 rad pos: -1.5,6.5 parent: 1 - - uid: 137 + - uid: 135 components: - type: Transform rot: -1.5707963267948966 rad pos: -0.5,6.5 parent: 1 - - uid: 138 + - uid: 136 components: - type: Transform rot: 1.5707963267948966 rad @@ -1165,15 +1161,15 @@ entities: parent: 1 - proto: SignFire entities: - - uid: 139 + - uid: 137 components: - type: Transform - rot: -1.5707963267948966 rad + rot: 3.141592653589793 rad pos: 1.5,0.5 parent: 1 - proto: SignNosmoking entities: - - uid: 140 + - uid: 138 components: - type: Transform rot: -1.5707963267948966 rad @@ -1181,7 +1177,7 @@ entities: parent: 1 - proto: SignSpace entities: - - uid: 141 + - uid: 139 components: - type: Transform rot: 3.141592653589793 rad @@ -1189,64 +1185,64 @@ entities: parent: 1 - proto: Sink entities: - - uid: 142 + - uid: 140 components: - type: Transform pos: -2.5,0.5 parent: 1 - proto: SmallGyroscope entities: - - uid: 143 + - uid: 141 components: - type: Transform pos: 0.5,1.5 parent: 1 - proto: SmallThruster entities: - - uid: 144 + - uid: 142 components: - type: Transform rot: -1.5707963267948966 rad pos: 1.5,-3.5 parent: 1 - - uid: 145 + - uid: 143 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,-6.5 parent: 1 - - uid: 146 + - uid: 144 components: - type: Transform pos: -4.5,4.5 parent: 1 - - uid: 147 + - uid: 145 components: - type: Transform rot: 1.5707963267948966 rad pos: -4.5,-3.5 parent: 1 - - uid: 148 + - uid: 146 components: - type: Transform rot: 3.141592653589793 rad pos: -2.5,-6.5 parent: 1 - - uid: 149 + - uid: 147 components: - type: Transform pos: 1.5,4.5 parent: 1 - proto: Soap entities: - - uid: 150 + - uid: 148 components: - type: Transform pos: -3.5809164,2.197432 parent: 1 - proto: SpawnPointLatejoin entities: - - uid: 151 + - uid: 149 components: - type: Transform rot: 3.141592653589793 rad @@ -1254,7 +1250,7 @@ entities: parent: 1 - proto: SubstationWallBasic entities: - - uid: 152 + - uid: 150 components: - type: Transform rot: 3.141592653589793 rad @@ -1262,23 +1258,21 @@ entities: parent: 1 - proto: SuitStorageWallmountBasic entities: - - uid: 153 + - uid: 151 components: - type: Transform rot: -1.5707963267948966 rad pos: -0.5,3.5 parent: 1 - - type: Physics - canCollide: False - proto: TableCounterMetal entities: - - uid: 154 + - uid: 152 components: - type: Transform rot: -1.5707963267948966 rad pos: -3.5,-1.5 parent: 1 - - uid: 155 + - uid: 153 components: - type: Transform rot: -1.5707963267948966 rad @@ -1286,18 +1280,18 @@ entities: parent: 1 - proto: TableReinforced entities: - - uid: 156 + - uid: 154 components: - type: Transform pos: -2.5,5.5 parent: 1 - - uid: 157 + - uid: 155 components: - type: Transform rot: -1.5707963267948966 rad pos: -0.5,5.5 parent: 1 - - uid: 158 + - uid: 156 components: - type: Transform rot: -1.5707963267948966 rad @@ -1305,7 +1299,7 @@ entities: parent: 1 - proto: ToiletEmpty entities: - - uid: 159 + - uid: 157 components: - type: Transform rot: 1.5707963267948966 rad @@ -1313,131 +1307,131 @@ entities: parent: 1 - proto: TrashBag entities: - - uid: 160 + - uid: 158 components: - type: Transform pos: -2.4956446,0.6085676 parent: 1 - proto: WallShuttle entities: - - uid: 161 + - uid: 159 components: - type: Transform pos: 1.5,0.5 parent: 1 - - uid: 162 + - uid: 160 components: - type: Transform pos: -4.5,1.5 parent: 1 - - uid: 163 + - uid: 161 components: - type: Transform pos: -4.5,3.5 parent: 1 - - uid: 164 + - uid: 162 components: - type: Transform pos: 1.5,2.5 parent: 1 - - uid: 165 + - uid: 163 components: - type: Transform pos: -4.5,-1.5 parent: 1 - - uid: 166 + - uid: 164 components: - type: Transform rot: -1.5707963267948966 rad pos: 1.5,3.5 parent: 1 - - uid: 167 + - uid: 165 components: - type: Transform rot: -1.5707963267948966 rad pos: 0.5,3.5 parent: 1 - - uid: 168 + - uid: 166 components: - type: Transform pos: -4.5,-2.5 parent: 1 - - uid: 169 + - uid: 167 components: - type: Transform rot: -1.5707963267948966 rad pos: 0.5,-2.5 parent: 1 - - uid: 170 + - uid: 168 components: - type: Transform rot: -1.5707963267948966 rad pos: -0.5,-5.5 parent: 1 - - uid: 171 + - uid: 169 components: - type: Transform rot: -1.5707963267948966 rad pos: -1.5,-5.5 parent: 1 - - uid: 172 + - uid: 170 components: - type: Transform rot: -1.5707963267948966 rad pos: -2.5,-5.5 parent: 1 - - uid: 173 + - uid: 171 components: - type: Transform pos: -4.5,2.5 parent: 1 - - uid: 174 + - uid: 172 components: - type: Transform rot: -1.5707963267948966 rad pos: -3.5,-2.5 parent: 1 - - uid: 175 + - uid: 173 components: - type: Transform pos: 1.5,-2.5 parent: 1 - - uid: 176 + - uid: 174 components: - type: Transform rot: -1.5707963267948966 rad pos: -3.5,3.5 parent: 1 - - uid: 177 + - uid: 175 components: - type: Transform pos: -4.5,0.5 parent: 1 - - uid: 178 + - uid: 176 components: - type: Transform pos: 1.5,-0.5 parent: 1 - proto: WallShuttleDiagonal entities: - - uid: 179 + - uid: 177 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,-5.5 parent: 1 - - uid: 180 + - uid: 178 components: - type: Transform rot: 3.141592653589793 rad pos: 0.5,-5.5 parent: 1 - - uid: 181 + - uid: 179 components: - type: Transform pos: -3.5,6.5 parent: 1 - - uid: 182 + - uid: 180 components: - type: Transform rot: -1.5707963267948966 rad @@ -1445,65 +1439,65 @@ entities: parent: 1 - proto: WallShuttleInterior entities: - - uid: 183 + - uid: 181 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,-0.5 parent: 1 - - uid: 184 + - uid: 182 components: - type: Transform rot: -1.5707963267948966 rad pos: 0.5,-0.5 parent: 1 - - uid: 185 + - uid: 183 components: - type: Transform rot: -1.5707963267948966 rad pos: -3.5,1.5 parent: 1 - - uid: 186 + - uid: 184 components: - type: Transform rot: -1.5707963267948966 rad pos: -2.5,1.5 parent: 1 - - uid: 187 + - uid: 185 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,-2.5 parent: 1 - - uid: 188 + - uid: 186 components: - type: Transform rot: -1.5707963267948966 rad pos: -2.5,3.5 parent: 1 - - uid: 189 + - uid: 187 components: - type: Transform rot: -1.5707963267948966 rad pos: -0.5,3.5 parent: 1 - - uid: 190 + - uid: 188 components: - type: Transform pos: -2.5,-2.5 parent: 1 - proto: WarpPointShip entities: - - uid: 191 + - uid: 189 components: - type: Transform pos: -1.5,0.5 parent: 1 - proto: Wrench entities: - - uid: 192 + - uid: 190 components: - type: Transform - pos: -0.5,0.5 + pos: -0.5,1.5 parent: 1 ... From 8f94b6436c8ded5eb3c132ce82ba1072cb537ce1 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Thu, 17 Oct 2024 23:57:39 +0000 Subject: [PATCH 56/76] Automatic Changelog (#2233) --- Resources/Changelog/Frontier.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 6be89a1e89d..594cd9f81bb 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4716,3 +4716,12 @@ Entries: message: Updated Spectre with directional fans. id: 5424 time: '2024-10-17T23:39:14.0000000+00:00' +- author: erhardsteinhauer + changes: + - type: Tweak + message: >- + Replaced vendomats on the Lodge' northern lobby with YouTool, EngiVend + and Vandomat, moved FuelVend to the northern lobby, mapped + LessLethalVend by BountyVend. + id: 5425 + time: '2024-10-17T23:57:16.0000000+00:00' From 6692ef510b21352b24bab297399c99b811b11912 Mon Sep 17 00:00:00 2001 From: chrome-cirrus <95361+chrome-cirrus@users.noreply.github.com> Date: Fri, 18 Oct 2024 10:37:57 +0200 Subject: [PATCH 57/76] Fix up the NSF Templar (#2186) * Fix up the Templar * Replace generator with APUs, switch up recharger setup * Add some firelocks (also to Watchdog) * Moved waste vent * Remove stray fan * Add atmos fill helper markers * Add a prisoner EVA suit, random mug in the cockpit, and some decals * Add some NFSD insignia to the ship's exterior * Fixups * Locker Fixup --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Dvir --- Resources/Maps/_NF/Shuttles/Nfsd/templar.yml | 1256 ++++++++++------- Resources/Maps/_NF/Shuttles/Sr/watchdog.yml | 51 +- .../_NF/Catalog/Fills/Lockers/security.yml | 14 +- .../Storage/Closets/Lockers/lockers.yml | 42 +- 4 files changed, 771 insertions(+), 592 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/templar.yml b/Resources/Maps/_NF/Shuttles/Nfsd/templar.yml index e7d1d35e4db..f5204d7fe40 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/templar.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/templar.yml @@ -7,9 +7,11 @@ tilemap: 46: FloorGlass 57: FloorHull 65: FloorMetalDiamond + 1: FloorSteel 99: FloorSteelDirty 107: FloorTechMaint 124: Lattice + 2: Plating entities: - proto: "" entities: @@ -24,19 +26,19 @@ entities: chunks: 0,0: ind: 0,0 - tiles: QQAAAAAAQQAAAAAAQQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAHgAAAAACOQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAOQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAADOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAACOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAALgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: HgAAAAAAHgAAAAAAHgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAHgAAAAACOQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAOQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAgAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAALgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 0,-1: ind: 0,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAACLgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAHgAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAHgAAAAACfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAawAAAAAAHgAAAAABOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAACfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAHgAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAHgAAAAACfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAawAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,0: ind: -1,0 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAQQAAAAAAQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAOQAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAOQAAAAAAHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAHgAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAOQAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAOQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,-1: ind: -1,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHgAAAAABYwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHgAAAAADYwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAHgAAAAAAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAQQAAAAAAQQAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHgAAAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHgAAAAADAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHgAAAAAAHgAAAAAA version: 6 - type: Broadphase - type: Physics @@ -59,88 +61,107 @@ entities: version: 2 nodes: - node: - color: '#49392696' - id: CheckerNWSE + color: '#4B653E96' + id: BrickTileSteelCornerNe decals: - 6: -1,4 - 7: 0,4 - 8: 1,4 - 9: 1,3 - 10: 0,3 - 11: -1,3 - 12: -1,2 - 13: 0,2 - 14: 1,2 - 15: 0,-3 - 16: 1,-3 - 17: 1,-4 - 18: 0,-4 + 24: 0,0 + 37: 1,3 + - node: + color: '#4B653E96' + id: BrickTileSteelCornerNw + decals: + 21: -2,0 + 38: 0,3 + - node: + color: '#4B653E96' + id: BrickTileSteelCornerSe + decals: + 22: 0,-1 + 40: 1,2 + - node: + color: '#4B653E96' + id: BrickTileSteelCornerSw + decals: + 23: -2,-1 + 39: 0,2 + - node: + color: '#4B653E96' + id: BrickTileSteelLineN + decals: + 25: -1,0 + - node: + color: '#4B653E96' + id: BrickTileSteelLineS + decals: + 26: -1,-1 + - node: + color: '#4D9BE6FF' + id: DeliveryGreyscale + decals: + 19: 1,0 + - node: + color: '#B33831FF' + id: DeliveryGreyscale + decals: + 20: 2,0 - node: - angle: -1.5707963267948966 rad color: '#FFFFFFFF' - id: StandClear + id: DirtHeavy decals: - 2: -2,0 + 44: 2,0 - node: - angle: 1.5707963267948966 rad color: '#FFFFFFFF' - id: StandClear + id: DirtHeavyMonotile decals: - 3: 2,0 + 42: 0,-4 + 43: -2,0 + 48: -2,-2 - node: color: '#FFFFFFFF' - id: WarnLineE + id: DirtLight decals: - 1: 2,0 - 5: 2,-1 + 45: 1,0 + 46: -1,-2 + 47: 2,-2 - node: color: '#FFFFFFFF' - id: WarnLineS + id: DirtMedium + decals: + 41: -1,-3 + - node: + color: '#FF9821FF' + id: HalfTileOverlayGreyscale decals: - 0: -2,0 - 4: -2,-1 + 33: -1,-3 + 35: 1,-3 + 36: 0,-3 - type: GridAtmosphere version: 2 data: tiles: 0,0: - 0: 15 - 1: 32240 - 2: 512 - 0,1: - 1: 119 + 0: 13079 + 1: 34944 0,-1: - 1: 2031 - 3: 16 - 0: 63488 - 0,-2: - 1: 28672 + 0: 32563 + 1: 32904 -1,0: - 0: 14 - 1: 52960 + 0: 34828 + 1: 8736 + 0,1: + 0: 3 + 2: 64 -1,1: - 1: 204 + 0: 8 + 2: 64 -1,-1: - 1: 3310 - 0: 57856 - -1,-2: + 0: 52872 + 1: 8226 + 0,-2: 1: 49152 + -1,-2: + 1: 24576 uniqueMixes: - - volume: 2500 - temperature: 293.15 - moles: - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - volume: 2500 temperature: 293.15 moles: @@ -157,10 +178,10 @@ entities: - 0 - 0 - volume: 2500 - temperature: 293.14996 + immutable: True moles: - - 20.078888 - - 75.53487 + - 0 + - 0 - 0 - 0 - 0 @@ -172,10 +193,10 @@ entities: - 0 - 0 - volume: 2500 - temperature: 293.1499 + temperature: 293.15 moles: - - 20.078888 - - 75.53487 + - 0 + - 0 - 0 - 0 - 0 @@ -191,825 +212,1031 @@ entities: - type: RadiationGridResistance - type: BecomesStation id: Hospitaller -- proto: AirlockGlassShuttle +- proto: AirlockGlassShuttleNfsd entities: - - uid: 2 + - uid: 45 components: - type: Transform rot: -1.5707963267948966 rad pos: -2.5,-1.5 parent: 1 - - uid: 3 + - uid: 48 components: - type: Transform rot: 1.5707963267948966 rad pos: 3.5,-1.5 parent: 1 -- proto: AirlockNfsd +- proto: AirlockNfsdGlassLocked entities: - - uid: 4 - components: - - type: Transform - pos: 1.5,-1.5 - parent: 1 - uid: 5 components: - type: Transform + rot: 1.5707963267948966 rad pos: 0.5,1.5 parent: 1 - proto: APCBasic entities: - - uid: 6 + - uid: 37 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -1.5,2.5 + rot: -1.5707963267948966 rad + pos: 2.5,2.5 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - - uid: 7 + - uid: 2 components: - type: Transform - pos: 0.5,1.5 + rot: 1.5707963267948966 rad + pos: 3.5,-1.5 parent: 1 - - uid: 8 + - uid: 3 components: - type: Transform - pos: 1.5,-1.5 + rot: -1.5707963267948966 rad + pos: -2.5,-1.5 parent: 1 -- proto: Bed +- proto: AtmosFixBlockerMarker entities: - - uid: 9 + - uid: 7 components: - type: Transform - pos: -0.5,-2.5 + pos: -2.5,3.5 parent: 1 -- proto: BedsheetOrange - entities: - - uid: 10 + - uid: 96 components: - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,-2.5 + pos: -2.5,2.5 parent: 1 -- proto: CableApcExtension - entities: - - uid: 11 + - uid: 161 components: - type: Transform - pos: -1.5,2.5 + pos: 3.5,3.5 parent: 1 - - uid: 12 + - uid: 162 components: - type: Transform - pos: -0.5,2.5 + pos: 3.5,2.5 parent: 1 - - uid: 13 + - uid: 163 components: - type: Transform - pos: 0.5,2.5 + pos: 3.5,-3.5 parent: 1 - - uid: 14 + - uid: 164 components: - type: Transform - pos: 0.5,1.5 + pos: 3.5,-4.5 parent: 1 - - uid: 15 + - uid: 165 components: - type: Transform - pos: 0.5,0.5 + pos: 2.5,-4.5 parent: 1 - - uid: 16 + - uid: 166 components: - type: Transform - pos: 0.5,-0.5 + pos: -2.5,-4.5 parent: 1 - - uid: 17 + - uid: 167 components: - type: Transform - pos: 0.5,-1.5 + pos: -1.5,-4.5 parent: 1 - - uid: 18 + - uid: 168 components: - type: Transform - pos: 0.5,-2.5 + pos: -2.5,-3.5 parent: 1 - - uid: 19 + - uid: 169 components: - type: Transform - pos: 0.5,-3.5 + pos: 2.5,5.5 parent: 1 - - uid: 20 + - uid: 170 components: - type: Transform - pos: 0.5,3.5 + pos: -1.5,5.5 parent: 1 - - uid: 21 +- proto: Bed + entities: + - uid: 66 components: - type: Transform - pos: 0.5,4.5 + pos: 1.5,-3.5 parent: 1 - - uid: 22 +- proto: BedsheetOrange + entities: + - uid: 58 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-3.5 + parent: 1 +- proto: CableApcExtension + entities: + - uid: 27 components: - type: Transform pos: -0.5,-0.5 parent: 1 - - uid: 23 + - uid: 138 components: - type: Transform - pos: -1.5,-0.5 + pos: 2.5,2.5 parent: 1 - - uid: 24 + - uid: 139 components: - type: Transform - pos: 1.5,-0.5 + pos: 1.5,2.5 parent: 1 - - uid: 25 + - uid: 140 components: - type: Transform - pos: 2.5,-0.5 + pos: 0.5,2.5 parent: 1 - - uid: 26 + - uid: 141 components: - type: Transform - pos: 1.5,-3.5 + pos: 0.5,3.5 parent: 1 - - uid: 27 + - uid: 142 components: - type: Transform - pos: 2.5,-3.5 + pos: 0.5,1.5 parent: 1 - - uid: 28 + - uid: 143 components: - type: Transform - pos: -0.5,-3.5 + pos: 0.5,0.5 parent: 1 - - uid: 29 + - uid: 144 components: - type: Transform - pos: -1.5,-3.5 + pos: 0.5,-0.5 parent: 1 -- proto: CableHV - entities: - - uid: 30 + - uid: 145 components: - type: Transform - pos: 2.5,1.5 + pos: 0.5,-1.5 parent: 1 - - uid: 31 + - uid: 146 components: - type: Transform - pos: 1.5,1.5 + pos: 0.5,-2.5 parent: 1 - - uid: 32 + - uid: 147 components: - type: Transform - pos: 0.5,1.5 + pos: -0.5,-2.5 parent: 1 - - uid: 33 + - uid: 148 components: - type: Transform - pos: 2.5,2.5 + pos: 1.5,-2.5 parent: 1 - - uid: 34 + - uid: 149 components: - type: Transform - pos: -1.5,1.5 + pos: 1.5,-3.5 parent: 1 - - uid: 35 + - uid: 150 + components: + - type: Transform + pos: -0.5,-3.5 + parent: 1 + - uid: 151 + components: + - type: Transform + pos: 1.5,-0.5 + parent: 1 +- proto: CableHV + entities: + - uid: 12 components: - type: Transform pos: -0.5,1.5 parent: 1 - - uid: 145 + - uid: 41 components: - type: Transform - pos: 0.5,0.5 + pos: -1.5,1.5 parent: 1 - - uid: 146 + - uid: 42 components: - type: Transform - pos: 0.5,-0.5 + pos: -1.5,2.5 parent: 1 - - uid: 147 + - uid: 154 components: - type: Transform - pos: 0.5,-1.5 + pos: 0.5,1.5 parent: 1 -- proto: CableMV - entities: - - uid: 36 + - uid: 155 components: - type: Transform - pos: 2.5,2.5 + pos: 1.5,1.5 parent: 1 - - uid: 37 + - uid: 156 components: - type: Transform - pos: 1.5,2.5 + pos: 2.5,1.5 parent: 1 - - uid: 38 +- proto: CableMV + entities: + - uid: 6 components: - type: Transform pos: 0.5,2.5 parent: 1 - - uid: 39 + - uid: 57 components: - type: Transform pos: -0.5,2.5 parent: 1 - - uid: 40 + - uid: 102 components: - type: Transform pos: -1.5,2.5 parent: 1 -- proto: Catwalk - entities: - - uid: 41 + - uid: 136 components: - type: Transform - pos: 3.5,0.5 + pos: 1.5,2.5 parent: 1 - - uid: 42 + - uid: 137 components: - type: Transform - pos: -2.5,-1.5 + pos: 2.5,2.5 parent: 1 - - uid: 43 +- proto: Catwalk + entities: + - uid: 16 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,0.5 + pos: -1.5,-1.5 parent: 1 - - uid: 44 + - uid: 17 components: - type: Transform - pos: -2.5,-0.5 + pos: -0.5,-1.5 parent: 1 - - uid: 45 + - uid: 18 components: - type: Transform - pos: 3.5,-1.5 + pos: 0.5,-1.5 parent: 1 - - uid: 46 + - uid: 53 components: - type: Transform - pos: 3.5,-0.5 + pos: 1.5,-1.5 + parent: 1 + - uid: 126 + components: + - type: Transform + pos: 2.5,-1.5 parent: 1 - proto: ChairPilotSeat entities: - - uid: 47 + - uid: 13 components: - type: Transform rot: 3.141592653589793 rad - pos: 1.5,3.5 + pos: 0.5,3.5 parent: 1 - - uid: 48 + - uid: 84 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,-3.5 - parent: 1 - - uid: 49 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 0.5,3.5 + rot: 1.5707963267948966 rad + pos: -1.5,0.5 parent: 1 -- proto: ClothingMaskBreath +- proto: ClosetWallOrangeFilled entities: - - uid: 51 + - uid: 60 components: - type: Transform - parent: 50 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 52 + rot: 1.5707963267948966 rad + pos: -1.5,-2.5 + parent: 1 +- proto: ComputerTabletopIFF + entities: + - uid: 34 components: - type: Transform - parent: 50 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: ClothingOuterHardsuitEVAPrisoner + rot: 1.5707963267948966 rad + pos: -0.5,2.5 + parent: 1 +- proto: ComputerTabletopShuttle entities: - - uid: 53 + - uid: 35 components: - type: Transform - parent: 50 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 54 + pos: 0.5,4.5 + parent: 1 +- proto: ComputerTabletopStationRecords + entities: + - uid: 71 components: - type: Transform - parent: 50 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: ClothingShoesColorOrange + rot: 1.5707963267948966 rad + pos: -0.5,3.5 + parent: 1 +- proto: CurtainsOrangeOpen entities: - - uid: 55 + - uid: 52 components: - type: Transform - parent: 50 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 56 + pos: -0.5,-3.5 + parent: 1 +- proto: DefibrillatorCabinetFilled + entities: + - uid: 94 components: - type: Transform - parent: 50 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: ClothingUniformJumpskirtPrisoner + rot: 3.141592653589793 rad + pos: 2.5,-2.5 + parent: 1 +- proto: ExtinguisherCabinetFilled entities: - - uid: 57 + - uid: 50 components: - type: Transform - parent: 50 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 58 + rot: 3.141592653589793 rad + pos: -0.5,1.5 + parent: 1 +- proto: FaxMachineShip + entities: + - uid: 20 components: - type: Transform - parent: 50 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: ClothingUniformJumpsuitPrisoner + pos: -0.5,4.5 + parent: 1 +- proto: FirelockEdge entities: - - uid: 59 + - uid: 160 components: - type: Transform - parent: 50 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 60 + pos: 0.5,-1.5 + parent: 1 +- proto: FirelockGlass + entities: + - uid: 159 components: - type: Transform - parent: 50 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: ComputerIFF + rot: 1.5707963267948966 rad + pos: 0.5,1.5 + parent: 1 +- proto: FloorDrain entities: - uid: 63 components: - type: Transform - pos: -0.5,4.5 + rot: 3.141592653589793 rad + pos: 0.5,-3.5 parent: 1 -- proto: ComputerShuttle + - type: Fixtures + fixtures: {} +- proto: GasMixerOn entities: - - uid: 64 + - uid: 62 components: - type: Transform - pos: 1.5,4.5 + rot: -1.5707963267948966 rad + pos: 1.5,-0.5 parent: 1 -- proto: ComputerStationRecords + - type: GasMixer + inletTwoConcentration: 0.20999998 + inletOneConcentration: 0.79 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasPassiveVent entities: - - uid: 65 + - uid: 38 components: - type: Transform - pos: 0.5,4.5 + rot: 1.5707963267948966 rad + pos: -2.5,-3.5 parent: 1 -- proto: EmergencyNitrogenTankFilled + - type: AtmosPipeColor + color: '#990000FF' +- proto: GasPipeBend entities: - - uid: 61 + - uid: 9 components: - type: Transform - parent: 50 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: EmergencyOxygenTankFilled + rot: -1.5707963267948966 rad + pos: 2.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 36 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasPipeFourway entities: - - uid: 62 + - uid: 171 components: - type: Transform - parent: 50 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: FaxMachineShip + pos: 0.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasPipeStraight entities: - - uid: 66 + - uid: 30 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 31 + components: + - type: Transform + pos: 0.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 33 components: - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 44 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 47 + components: + - type: Transform + rot: 3.141592653589793 rad pos: -0.5,2.5 parent: 1 -- proto: GasPassiveVent + - type: AtmosPipeColor + color: '#990000FF' + - uid: 55 + components: + - type: Transform + pos: -0.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 65 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-2.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 68 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 70 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 81 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 82 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 97 + components: + - type: Transform + pos: -0.5,1.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' +- proto: GasPipeTJunction entities: + - uid: 46 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,0.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' - uid: 67 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' +- proto: GasPort + entities: + - uid: 19 + components: + - type: Transform + pos: 2.5,0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 133 + components: + - type: Transform + pos: 1.5,0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasVentPump + entities: + - uid: 49 + components: + - type: Transform + pos: 0.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 64 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 158 components: - type: Transform rot: 1.5707963267948966 rad pos: -1.5,-0.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - - uid: 68 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasVentScrubber + entities: + - uid: 21 components: - type: Transform rot: -1.5707963267948966 rad - pos: 2.5,-0.5 + pos: 1.5,-3.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 -- proto: GasPipeFourway - entities: + - type: AtmosPipeColor + color: '#990000FF' + - uid: 61 + components: + - type: Transform + pos: -0.5,3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' - uid: 69 components: - type: Transform - pos: 1.5,-0.5 + rot: 1.5707963267948966 rad + pos: -1.5,0.5 parent: 1 -- proto: GasPipeStraight + - type: AtmosPipeColor + color: '#990000FF' +- proto: GeneratorWallmountAPU entities: - - uid: 70 + - uid: 40 components: - type: Transform - pos: 1.5,-1.5 + pos: -1.5,1.5 parent: 1 - - uid: 71 + - uid: 72 components: - type: Transform - pos: 1.5,0.5 + pos: 2.5,1.5 parent: 1 - - uid: 72 +- proto: GravityGeneratorMini + entities: + - uid: 10 + components: + - type: Transform + pos: -1.5,-0.5 + parent: 1 +- proto: Grille + entities: + - uid: 26 components: - type: Transform rot: -1.5707963267948966 rad - pos: 0.5,-0.5 + pos: -2.5,0.5 parent: 1 - - uid: 73 + - uid: 51 components: - type: Transform - pos: 1.5,1.5 + rot: -1.5707963267948966 rad + pos: -0.5,5.5 parent: 1 - - uid: 74 + - uid: 59 components: - type: Transform - pos: -0.5,-1.5 + rot: -1.5707963267948966 rad + pos: 3.5,0.5 parent: 1 -- proto: GasPipeTJunction - entities: - uid: 75 components: - type: Transform - pos: -0.5,-0.5 + rot: -1.5707963267948966 rad + pos: 0.5,5.5 parent: 1 -- proto: GasVentScrubber - entities: - uid: 76 components: - type: Transform - pos: 1.5,2.5 + rot: 3.141592653589793 rad + pos: -1.5,3.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - - uid: 77 + - uid: 83 components: - type: Transform rot: 3.141592653589793 rad - pos: 1.5,-2.5 + pos: 2.5,4.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - - uid: 78 + - uid: 87 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,5.5 + parent: 1 + - uid: 112 components: - type: Transform rot: 3.141592653589793 rad - pos: -0.5,-2.5 + pos: -1.5,4.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 -- proto: GeneratorWallmountAPU + - uid: 116 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,3.5 + parent: 1 +- proto: GrilleDiagonal entities: - - uid: 79 + - uid: 109 components: - type: Transform - pos: 2.5,1.5 + pos: -1.5,5.5 parent: 1 - - uid: 80 + - uid: 110 components: - type: Transform - pos: -1.5,1.5 + rot: -1.5707963267948966 rad + pos: 2.5,5.5 parent: 1 - - uid: 144 +- proto: LockerNfsdCopper + entities: + - uid: 119 components: - type: Transform - pos: 0.5,-1.5 + pos: 1.5,3.5 parent: 1 -- proto: GravityGeneratorMini +- proto: LockerNfsdEvidence entities: - - uid: 81 + - uid: 93 components: - type: Transform - pos: -0.5,3.5 + pos: 2.5,-0.5 parent: 1 -- proto: Grille +- proto: NitrogenCanister entities: - - uid: 82 + - uid: 54 components: - type: Transform - pos: 2.5,3.5 + anchored: True + pos: 2.5,0.5 parent: 1 - - uid: 83 + - type: Physics + bodyType: Static +- proto: OxygenCanister + entities: + - uid: 56 components: - type: Transform - pos: -0.5,5.5 + anchored: True + pos: 1.5,0.5 parent: 1 - - uid: 84 + - type: Physics + bodyType: Static +- proto: Paper + entities: + - uid: 99 + components: + - type: Transform + pos: -0.3125,4.6643505 + parent: 1 + - uid: 101 components: - type: Transform + pos: -0.34375,4.4975677 + parent: 1 +- proto: PlastitaniumWindow + entities: + - uid: 74 + components: + - type: Transform + rot: -1.5707963267948966 rad pos: 0.5,5.5 parent: 1 + - uid: 77 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,3.5 + parent: 1 + - uid: 80 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,0.5 + parent: 1 - uid: 85 components: - type: Transform + rot: -1.5707963267948966 rad pos: 1.5,5.5 parent: 1 - uid: 86 components: - type: Transform - pos: 2.5,-2.5 + rot: 3.141592653589793 rad + pos: -1.5,4.5 parent: 1 - - uid: 87 + - uid: 88 components: - type: Transform - pos: -1.5,-2.5 + rot: -1.5707963267948966 rad + pos: 3.5,0.5 + parent: 1 + - uid: 89 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,5.5 + parent: 1 + - uid: 111 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,4.5 + parent: 1 + - uid: 115 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,3.5 parent: 1 - - uid: 88 +- proto: PlastitaniumWindowDiagonal + entities: + - uid: 105 components: - type: Transform - pos: -1.5,3.5 + pos: -1.5,5.5 parent: 1 -- proto: GyroscopeNfsd - entities: - - uid: 89 + - uid: 108 components: - type: Transform - pos: 1.5,0.5 + rot: -1.5707963267948966 rad + pos: 2.5,5.5 parent: 1 -- proto: IntercomMedical +- proto: PoweredlightColoredRed entities: - - uid: 90 + - uid: 28 components: - type: Transform rot: -1.5707963267948966 rad - pos: 2.5,4.5 + pos: 2.5,-0.5 parent: 1 - - uid: 91 + - uid: 29 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,-3.5 + rot: 1.5707963267948966 rad + pos: -1.5,-0.5 parent: 1 -- proto: LockerNfsdEvidence +- proto: PoweredSmallLight entities: - - uid: 50 + - uid: 4 components: - type: Transform - pos: 0.5,-2.5 + rot: -1.5707963267948966 rad + pos: 1.5,-2.5 parent: 1 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14914 - 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: - - 62 - - 61 - - 59 - - 60 - - 57 - - 53 - - 51 - - 52 - - 55 - - 54 - - 58 - - 56 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null -- proto: LockerNfsdSilver - entities: - - uid: 92 + - uid: 95 components: - type: Transform - pos: 1.5,2.5 + rot: 1.5707963267948966 rad + pos: -0.5,2.5 parent: 1 -- proto: PlastitaniumWindow +- proto: SignNfsd entities: - - uid: 93 + - uid: 173 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,5.5 + pos: -2.5,1.5 parent: 1 - - uid: 94 + - uid: 174 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,5.5 + pos: 3.5,1.5 parent: 1 - - uid: 95 + - uid: 175 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,5.5 + pos: 0.5,-4.5 parent: 1 - - uid: 96 +- proto: SinkStemlessWater + entities: + - uid: 92 components: - type: Transform - pos: -1.5,3.5 + rot: 3.141592653589793 rad + pos: 0.5,-3.5 parent: 1 - - uid: 97 +- proto: SmallGyroscopeNfsd + entities: + - uid: 157 components: - type: Transform - pos: 2.5,3.5 + rot: 3.141592653589793 rad + pos: 1.5,4.5 parent: 1 - - uid: 98 +- proto: SpawnPointLatejoin + entities: + - uid: 153 components: - type: Transform - pos: -1.5,-2.5 + rot: 1.5707963267948966 rad + pos: 0.5,3.5 parent: 1 - - uid: 99 +- proto: SubstationWallBasic + entities: + - uid: 125 components: - type: Transform - pos: 2.5,-2.5 + rot: 1.5707963267948966 rad + pos: -1.5,2.5 parent: 1 -- proto: PoweredlightColoredRed +- proto: SuitStorageWallmountCadet entities: - - uid: 100 + - uid: 152 components: - type: Transform rot: 3.141592653589793 rad - pos: 0.5,-3.5 + pos: 1.5,1.5 parent: 1 - - uid: 101 +- proto: TableReinforced + entities: + - uid: 14 components: - type: Transform - pos: -1.5,0.5 + rot: 1.5707963267948966 rad + pos: -0.5,4.5 parent: 1 - - uid: 102 + - uid: 15 components: - type: Transform - pos: 2.5,0.5 + rot: 1.5707963267948966 rad + pos: -0.5,3.5 parent: 1 - - uid: 103 + - uid: 22 components: - type: Transform rot: 1.5707963267948966 rad - pos: -0.5,4.5 + pos: -0.5,2.5 parent: 1 -- proto: ShuttersWindowOpen - entities: - - uid: 104 + - uid: 32 components: - type: Transform rot: 1.5707963267948966 rad - pos: 3.5,0.5 + pos: 0.5,4.5 parent: 1 - - type: DeviceLinkSink - links: - - 108 - - uid: 105 +- proto: ThrusterNfsd + entities: + - uid: 8 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -2.5,-0.5 + rot: 3.141592653589793 rad + pos: -2.5,-4.5 parent: 1 - - type: DeviceLinkSink - links: - - 108 - - uid: 106 + - uid: 24 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -2.5,0.5 + pos: -2.5,3.5 parent: 1 - - type: DeviceLinkSink - links: - - 108 - - uid: 107 + - uid: 25 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 3.5,-0.5 + rot: 3.141592653589793 rad + pos: 3.5,-4.5 parent: 1 - - type: DeviceLinkSink - links: - - 108 -- proto: SignalButton - entities: - - uid: 108 + - uid: 100 components: - type: Transform - pos: -0.5,1.5 + pos: 3.5,3.5 parent: 1 - - type: DeviceLinkSource - linkedPorts: - 106: - - Pressed: Toggle - 105: - - Pressed: Toggle - 104: - - Pressed: Toggle - 107: - - Pressed: Toggle -- proto: SubstationWallBasic - entities: - - uid: 109 + - uid: 103 components: - type: Transform rot: -1.5707963267948966 rad - pos: 2.5,2.5 + pos: 3.5,-3.5 parent: 1 -- proto: TableReinforced + - uid: 104 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-3.5 + parent: 1 +- proto: ToiletEmpty entities: - - uid: 110 + - uid: 23 components: - type: Transform - pos: -0.5,2.5 + rot: 1.5707963267948966 rad + pos: -0.5,-3.5 parent: 1 -- proto: ThrusterNfsd +- proto: ToolboxMechanicalFilled entities: - - uid: 111 + - uid: 73 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,-2.5 + pos: -0.5289452,0.5080383 parent: 1 - - uid: 112 +- proto: WallPlastitanium + entities: + - uid: 78 components: - type: Transform - rot: 3.141592653589793 rad - pos: 3.5,-3.5 + rot: 1.5707963267948966 rad + pos: 2.5,-2.5 parent: 1 - - uid: 113 + - uid: 79 components: - type: Transform - rot: 3.141592653589793 rad - pos: -2.5,-3.5 + rot: 1.5707963267948966 rad + pos: -1.5,-2.5 parent: 1 - - uid: 114 + - uid: 90 components: - type: Transform - pos: 3.5,2.5 + rot: 1.5707963267948966 rad + pos: -2.5,-2.5 parent: 1 - - uid: 115 + - uid: 91 components: - type: Transform - pos: -2.5,2.5 + rot: 1.5707963267948966 rad + pos: 3.5,-2.5 parent: 1 - - uid: 116 + - uid: 113 components: - type: Transform rot: 1.5707963267948966 rad - pos: -2.5,-2.5 + pos: 3.5,-0.5 parent: 1 -- proto: WallPlastitanium - entities: - - uid: 117 + - uid: 114 components: - type: Transform - pos: -0.5,-1.5 + rot: 1.5707963267948966 rad + pos: -2.5,-0.5 parent: 1 - - uid: 118 + - uid: 117 components: - type: Transform - pos: 0.5,-1.5 + pos: 3.5,1.5 parent: 1 - - uid: 119 + - uid: 118 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,4.5 + pos: -2.5,1.5 parent: 1 - uid: 120 components: @@ -1041,18 +1268,6 @@ entities: rot: -1.5707963267948966 rad pos: -1.5,1.5 parent: 1 - - uid: 125 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,4.5 - parent: 1 - - uid: 126 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,-1.5 - parent: 1 - uid: 127 components: - type: Transform @@ -1086,14 +1301,19 @@ entities: - type: Transform pos: 0.5,-4.5 parent: 1 - - uid: 133 +- proto: WallPlastitaniumDiagonal + entities: + - uid: 106 components: - type: Transform rot: -1.5707963267948966 rad - pos: 2.5,-1.5 + pos: 3.5,2.5 + parent: 1 + - uid: 107 + components: + - type: Transform + pos: -2.5,2.5 parent: 1 -- proto: WallPlastitaniumDiagonal - entities: - uid: 134 components: - type: Transform @@ -1106,58 +1326,34 @@ entities: rot: 3.141592653589793 rad pos: 2.5,-4.5 parent: 1 - - uid: 136 - components: - - type: Transform - pos: -1.5,5.5 - parent: 1 - - uid: 137 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,5.5 - parent: 1 - - uid: 138 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,1.5 - parent: 1 - - uid: 139 - components: - - type: Transform - pos: -2.5,1.5 - parent: 1 -- proto: WallWeaponCapacitorRecharger - entities: - - uid: 140 - components: - - type: Transform - pos: 1.5,1.5 - parent: 1 - proto: WarpPointShip entities: - - uid: 141 + - uid: 98 components: - type: Transform + rot: 3.141592653589793 rad pos: 0.5,0.5 parent: 1 - - type: WarpPoint - location: Hospitaller - proto: WindoorSecureSecurityLocked entities: - - uid: 142 + - uid: 39 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,-3.5 + rot: 3.141592653589793 rad + pos: 0.5,-2.5 parent: 1 - proto: WindowReinforcedDirectional entities: - - uid: 143 + - uid: 11 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,-2.5 + rot: 3.141592653589793 rad + pos: -0.5,-2.5 + parent: 1 + - uid: 43 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-2.5 parent: 1 ... diff --git a/Resources/Maps/_NF/Shuttles/Sr/watchdog.yml b/Resources/Maps/_NF/Shuttles/Sr/watchdog.yml index cec4e63a330..f5d638cb100 100644 --- a/Resources/Maps/_NF/Shuttles/Sr/watchdog.yml +++ b/Resources/Maps/_NF/Shuttles/Sr/watchdog.yml @@ -294,13 +294,13 @@ entities: tiles: 0,0: 0: 13079 - 1: 34944 + 1: 34816 0,-1: 0: 32563 - 1: 136 + 1: 8 -1,0: 0: 34828 - 1: 8736 + 1: 8704 0,1: 0: 3 1: 64 @@ -309,7 +309,7 @@ entities: 1: 64 -1,-1: 0: 52872 - 1: 34 + 1: 2 0,-2: 1: 49152 -1,-2: @@ -644,19 +644,6 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,-0.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - proto: CurtainsOrangeOpen entities: - uid: 146 @@ -688,6 +675,20 @@ entities: - type: Transform pos: -0.5,4.5 parent: 1 +- proto: FirelockEdge + entities: + - uid: 162 + components: + - type: Transform + pos: 0.5,-1.5 + parent: 1 +- proto: FirelockGlass + entities: + - uid: 161 + components: + - type: Transform + pos: 0.5,1.5 + parent: 1 - proto: FloorDrain entities: - uid: 103 @@ -992,19 +993,19 @@ entities: - type: Transform pos: -1.5,5.5 parent: 1 -- proto: NFLockerSecurityFilled +- proto: LockerWallMaterialsFuelPlasmaFilled entities: - - uid: 114 + - uid: 105 components: - type: Transform - pos: 1.5,3.5 + pos: -1.5,1.5 parent: 1 -- proto: LockerWallMaterialsFuelPlasmaFilled +- proto: NFLockerSecurityFilled entities: - - uid: 105 + - uid: 114 components: - type: Transform - pos: -1.5,1.5 + pos: 1.5,3.5 parent: 1 - proto: NitrogenCanister entities: @@ -1045,12 +1046,8 @@ entities: - type: Transform pos: -1.5,0.5 parent: 1 - - type: FuelGenerator - on: False - type: MaterialStorageMagnetPickup magnetEnabled: True - - type: Physics - bodyType: Static - proto: PoweredSmallLight entities: - uid: 73 diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/security.yml index e3d5c0b0732..72ffd911a7a 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/security.yml @@ -12,7 +12,7 @@ - type: entity id: LockerNfsdSilverDetectiveFilled - suffix: Filled + suffix: Detective, Filled parent: LockerNfsdSilver components: - type: StorageFill @@ -21,6 +21,8 @@ - id: DrinkDetFlask - id: BoxEvidenceMarkers - id: HandLabeler + - type: AccessReader + access: [["Detective"]] - type: entity id: NFLockerSecurityFilled @@ -49,8 +51,6 @@ name: turret safe suffix: NFSD, Filled components: - - type: AccessReader - access: [["Security"]] - type: StorageFill contents: - id: WeaponCaseHeavyCdet @@ -59,6 +59,8 @@ amount: 1 - id: WeaponCaseHeavyAsmgt amount: 1 + - type: AccessReader + access: [["Security"]] - type: entity parent: GunSafe @@ -66,9 +68,9 @@ name: turret safe suffix: CDET, Filled components: - - type: AccessReader - access: [["Security"]] - type: StorageFill contents: - id: WeaponCaseHeavyCdet - amount: 1 \ No newline at end of file + amount: 1 + - type: AccessReader + access: [["Security"]] \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml index 45a58ea473f..ca031c10abf 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -153,7 +153,8 @@ - type: entity id: LockerNfsdCopper parent: LockerBaseSecure - name: nfsd cadet locker + name: nfsd locker + suffix: Copper components: - type: Appearance - type: EntityStorageVisuals @@ -181,7 +182,8 @@ - type: entity id: LockerNfsdSilver parent: LockerBaseSecure - name: nfsd deputy locker + name: nfsd locker + suffix: Silver components: - type: Appearance - type: EntityStorageVisuals @@ -209,7 +211,8 @@ - type: entity id: LockerNfsdBrigmedic parent: LockerBaseSecure - name: nfsd brigmedic locker + name: nfsd locker + suffix: Brigmedic components: - type: Appearance - type: EntityStorageVisuals @@ -237,7 +240,8 @@ - type: entity id: LockerNfsdSergeant parent: LockerBaseSecure - name: nfsd sergeant locker + name: nfsd locker + suffix: Sergeant components: - type: Appearance - type: EntityStorageVisuals @@ -264,36 +268,16 @@ # NFSD Gold - Bailiff - type: entity id: LockerNfsdBailiff - parent: LockerBaseSecure - name: nfsd bailiff locker - components: - - type: Appearance - - type: EntityStorageVisuals - stateBaseClosed: nfsd_gold - stateDoorOpen: nfsd_gold_open - stateDoorClosed: nfsd_gold_door - - type: Sprite - sprite: _NF/Structures/Storage/closet.rsi - noRot: true - layers: - - state: generic - map: ["enum.StorageVisualLayers.Base"] - - state: generic_door - map: ["enum.StorageVisualLayers.Door"] - - state: locked - map: ["enum.LockVisualLayers.Lock"] - shader: unshaded - - state: welded - visible: false - map: ["enum.WeldableLayers.BaseWelded"] - - type: AccessReader - access: [["Security"]] + parent: LockerNfsdSergeant + name: nfsd locker + suffix: Bailiff # NFSD Sheriff - type: entity id: LockerNfsdSheriff parent: LockerBaseSecure - name: nfsd sheriff's locker + name: nfsd locker + suffix: Sheriff components: - type: Appearance - type: EntityStorageVisuals From 9f2ba058e51370295a76ae9025eee36e49044ead Mon Sep 17 00:00:00 2001 From: chrome-cirrus <95361+chrome-cirrus@users.noreply.github.com> Date: Fri, 18 Oct 2024 14:05:18 +0200 Subject: [PATCH 58/76] Fix up the NSF mini-shuttles (#2243) * Fix up the NSF mini-shuttles * Fixup * Floors * Replace ship gun --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Dvir --- Resources/Maps/_NF/Shuttles/Nfsd/cleric.yml | 88 +++++++++++-------- Resources/Maps/_NF/Shuttles/Nfsd/fighter.yml | 59 ++++++++++--- Resources/Maps/_NF/Shuttles/Nfsd/rogue.yml | 75 ++++++++++++---- .../Entities/Structures/Shuttles/cannons.yml | 2 +- .../Entities/Structures/Shuttles/cannons.yml | 7 ++ 5 files changed, 163 insertions(+), 68 deletions(-) create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Shuttles/cannons.yml diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/cleric.yml b/Resources/Maps/_NF/Shuttles/Nfsd/cleric.yml index dadc6e434f9..1bfcb75265d 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/cleric.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/cleric.yml @@ -32,7 +32,7 @@ entities: version: 6 -1,-1: ind: -1,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAWAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAWAAAAAAAWAAAAAAAWAAAAAAA version: 6 - type: Broadphase - type: Physics @@ -116,20 +116,17 @@ entities: data: tiles: 0,0: - 0: 4095 - 1,0: - 0: 273 - -1,0: - 0: 3311 - 1: 784 + 0: 255 0,-1: - 0: 62208 + 0: 4096 1: 3072 + -1,0: + 0: 140 + 1: 784 + -1,-1: + 0: 61440 1,-1: 1: 256 - 0: 4096 - -1,-1: - 0: 65280 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -147,7 +144,7 @@ entities: - 0 - 0 - volume: 2500 - temperature: 293.15 + immutable: True moles: - 0 - 0 @@ -164,7 +161,7 @@ entities: chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance -- proto: AirlockGlassShuttle +- proto: AirlockGlassShuttleNfsdLocked entities: - uid: 43 components: @@ -180,7 +177,7 @@ entities: rot: 3.141592653589793 rad pos: 1.5,-0.5 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 44 components: @@ -234,6 +231,13 @@ entities: rot: -1.5707963267948966 rad pos: 0.5,-0.5 parent: 1 +- proto: BoxBodyBag + entities: + - uid: 51 + components: + - type: Transform + pos: -0.8229167,0.52664566 + parent: 1 - proto: CableApcExtension entities: - uid: 82 @@ -445,13 +449,6 @@ entities: - type: Transform pos: 3.5,1.5 parent: 1 -- proto: CrateMedicalSupplies - entities: - - uid: 51 - components: - - type: Transform - pos: -1.5,0.5 - parent: 1 - proto: DefibrillatorCabinetFilled entities: - uid: 49 @@ -465,7 +462,7 @@ entities: - uid: 56 components: - type: Transform - pos: 1.4651704,1.6325955 + pos: -0.49972308,1.5314707 parent: 1 - proto: GeneratorWallmountAPU entities: @@ -543,13 +540,6 @@ entities: - type: Transform pos: -0.5,2.5 parent: 1 -- proto: LockerParamedicFilledHardsuit - entities: - - uid: 52 - components: - - type: Transform - pos: -0.5,1.5 - parent: 1 - proto: MedicalBed entities: - uid: 45 @@ -562,12 +552,19 @@ entities: - type: Transform pos: 0.5,-0.5 parent: 1 -- proto: MedkitCombatFilled +- proto: MedkitFilled + entities: + - uid: 52 + components: + - type: Transform + pos: 1.531527,1.5206747 + parent: 1 +- proto: Morgue entities: - uid: 57 components: - type: Transform - pos: 1.5068371,1.5180122 + pos: -1.5,0.5 parent: 1 - proto: PlastitaniumWindow entities: @@ -664,6 +661,20 @@ entities: - type: Transform pos: -2.5,-0.5 parent: 1 +- proto: SignNfsd + entities: + - uid: 111 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,0.5 + parent: 1 + - uid: 112 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,2.5 + parent: 1 - proto: SmallGyroscopeNfsd entities: - uid: 29 @@ -672,6 +683,14 @@ entities: rot: 3.141592653589793 rad pos: -2.5,2.5 parent: 1 +- proto: SpawnPointLatejoin + entities: + - uid: 50 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,0.5 + parent: 1 - proto: SubstationWallBasic entities: - uid: 70 @@ -721,13 +740,6 @@ entities: rot: 3.141592653589793 rad pos: 3.5,-1.5 parent: 1 -- proto: VendingMachineWallMedical - entities: - - uid: 50 - components: - - type: Transform - pos: -1.5,1.5 - parent: 1 - proto: WallPlastitanium entities: - uid: 2 diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/fighter.yml b/Resources/Maps/_NF/Shuttles/Nfsd/fighter.yml index adbf57a660b..7d08d8aa038 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/fighter.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/fighter.yml @@ -28,7 +28,7 @@ entities: version: 6 -1,0: ind: -1,0 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,-1: ind: -1,-1 @@ -112,19 +112,17 @@ entities: data: tiles: 0,0: - 0: 30583 - 0,1: - 0: 1 - 1: 6 + 0: 819 0,-1: - 0: 30583 + 0: 12592 -1,0: - 0: 52428 + 0: 34952 + 0,1: + 1: 6 -1,1: - 0: 12 + 0: 8 -1,-1: 1: 17476 - 0: 34952 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -142,7 +140,7 @@ entities: - 0 - 0 - volume: 2500 - temperature: 293.15 + immutable: True moles: - 0 - 0 @@ -159,7 +157,7 @@ entities: chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance -- proto: AirlockGlassShuttle +- proto: AirlockGlassShuttleNfsdLocked entities: - uid: 28 components: @@ -181,7 +179,7 @@ entities: - type: Transform pos: 0.5,3.5 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 29 components: @@ -434,6 +432,21 @@ entities: - type: Transform pos: 1.5,2.5 parent: 1 +- proto: ExtinguisherCabinet + entities: + - uid: 104 + components: + - type: Transform + pos: -1.5,3.5 + parent: 1 +- proto: FirelockGlass + entities: + - uid: 105 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-1.5 + parent: 1 - proto: GeneratorWallmountAPU entities: - uid: 48 @@ -600,6 +613,20 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,3.5 parent: 1 +- proto: SignNfsd + entities: + - uid: 102 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,4.5 + parent: 1 + - uid: 103 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-3.5 + parent: 1 - proto: SmallGyroscopeNfsd entities: - uid: 32 @@ -607,6 +634,14 @@ entities: - type: Transform pos: -1.5,-1.5 parent: 1 +- proto: SpawnPointLatejoin + entities: + - uid: 106 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,0.5 + parent: 1 - proto: Stool entities: - uid: 46 diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/rogue.yml b/Resources/Maps/_NF/Shuttles/Nfsd/rogue.yml index db735edb977..d5193795948 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/rogue.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/rogue.yml @@ -87,19 +87,21 @@ entities: data: tiles: 0,0: - 0: 1911 - 1: 28672 - 0,1: - 1: 7 - 0,-1: - 0: 30583 + 0: 34 + 1: 4096 + 2: 24576 -1,0: - 1: 52428 + 2: 52428 + 0,1: + 1: 1 + 2: 6 -1,1: - 1: 12 + 2: 12 + 0,-1: + 0: 8994 -1,-1: - 1: 12 - 0: 52416 + 2: 12 + 0: 34816 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -131,17 +133,32 @@ entities: - 0 - 0 - 0 + - volume: 2500 + immutable: True + moles: + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance -- proto: AirlockExternalGlassLocked +- proto: AirlockExternalGlassNfsdLocked entities: - uid: 19 components: - type: Transform pos: -0.5,-0.5 parent: 1 -- proto: AirlockGlassShuttle +- proto: AirlockGlassShuttleNfsdLocked entities: - uid: 23 components: @@ -164,11 +181,12 @@ entities: rot: 1.5707963267948966 rad pos: 0.5,-0.5 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 24 components: - type: Transform + rot: 3.141592653589793 rad pos: -0.5,-0.5 parent: 1 - uid: 25 @@ -527,6 +545,13 @@ entities: - type: Transform pos: 1.5,1.5 parent: 1 +- proto: ExtinguisherCabinetFilled + entities: + - uid: 124 + components: + - type: Transform + pos: 0.5,-2.5 + parent: 1 - proto: GeneratorWallmountAPU entities: - uid: 62 @@ -697,7 +722,7 @@ entities: rot: 1.5707963267948966 rad pos: 0.5,3.5 parent: 1 -- proto: ShuttleGunFriendship +- proto: ShuttleGunFriendshipNfsd entities: - uid: 54 components: @@ -725,9 +750,18 @@ entities: entities: - 67 - 68 - - type: DeviceLinkSink - links: - - 121 +- proto: SignNfsd + entities: + - uid: 125 + components: + - type: Transform + pos: 0.5,-3.5 + parent: 1 + - uid: 126 + components: + - type: Transform + pos: 0.5,2.5 + parent: 1 - proto: SmallGyroscopeNfsd entities: - uid: 50 @@ -736,6 +770,13 @@ entities: rot: -1.5707963267948966 rad pos: 1.5,4.5 parent: 1 +- proto: SpawnPointLatejoin + entities: + - uid: 127 + components: + - type: Transform + pos: 1.5,-0.5 + parent: 1 - proto: SubstationWallBasic entities: - uid: 64 diff --git a/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml b/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml index 26b42265ff0..d73f68a73d6 100644 --- a/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml +++ b/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml @@ -174,7 +174,7 @@ - type: entity id: ShuttleGunFriendship - parent: [ShuttleGunBase, ConstructibleMachine] + parent: [ShuttleGunBase] # Frontier: Removed ConstructibleMachine name: EXP-320g "Friendship" description: A small stationary grenade launcher that holds 2 grenades. suffix: DO NOT MAP diff --git a/Resources/Prototypes/_NF/Entities/Structures/Shuttles/cannons.yml b/Resources/Prototypes/_NF/Entities/Structures/Shuttles/cannons.yml new file mode 100644 index 00000000000..66662b1d8c1 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Structures/Shuttles/cannons.yml @@ -0,0 +1,7 @@ +- type: entity + id: ShuttleGunFriendshipNfsd + parent: [BaseStructureDisableToolUse, ShuttleGunFriendship] + suffix: NFSD + components: + - type: Machine + board: Null \ No newline at end of file From f66b210be7c78b4a09d044c414d30adb16fd84b8 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Fri, 18 Oct 2024 12:05:44 +0000 Subject: [PATCH 59/76] Automatic Changelog (#2243) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 594cd9f81bb..3b5505c70b2 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4725,3 +4725,9 @@ Entries: LessLethalVend by BountyVend. id: 5425 time: '2024-10-17T23:57:16.0000000+00:00' +- author: chrome-cirrus + changes: + - type: Tweak + message: Updated NSF mini-shuttles to use directional fans + a few minor tweaks + id: 5426 + time: '2024-10-18T12:05:18.0000000+00:00' From f0739a9ba0278be65db2178b61489cc69bf5c4a5 Mon Sep 17 00:00:00 2001 From: chrome-cirrus <95361+chrome-cirrus@users.noreply.github.com> Date: Fri, 18 Oct 2024 14:38:08 +0200 Subject: [PATCH 60/76] Interceptor (Update Shuttle) (#2199) * Update NSF Interceptor * Replace sec signs with NFSD * Modify atmos waste vent location for a cleaner look, remove dupe scrubber * Update interceptor.yml --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Dvir --- .../Maps/_NF/Shuttles/Nfsd/interceptor.yml | 462 +++++++++--------- 1 file changed, 219 insertions(+), 243 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/interceptor.yml b/Resources/Maps/_NF/Shuttles/Nfsd/interceptor.yml index 4b833a586da..d4d70be3993 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/interceptor.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/interceptor.yml @@ -23,7 +23,7 @@ entities: chunks: -1,-1: ind: -1,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAHgAAAAACfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAHgAAAAADHgAAAAABHgAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAIwAAAAACfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAHgAAAAACHgAAAAAAHgAAAAADfQAAAAAAeQAAAAABeQAAAAAAeQAAAAACeQAAAAABeQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAACHgAAAAACHgAAAAAAeQAAAAABeQAAAAABeQAAAAACeQAAAAADeQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAAAHgAAAAACHgAAAAABHgAAAAACHgAAAAAAfQAAAAAAeQAAAAADeQAAAAABeQAAAAAAeQAAAAAAeQAAAAAB + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAfQAAAAAAHgAAAAACfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAHgAAAAADHgAAAAABHgAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAIwAAAAACfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAHgAAAAACHgAAAAAAHgAAAAADfQAAAAAAeQAAAAABeQAAAAAAeQAAAAACeQAAAAABeQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAACHgAAAAACHgAAAAAAeQAAAAABeQAAAAABeQAAAAACeQAAAAADeQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAAAHgAAAAACHgAAAAABHgAAAAACHgAAAAAAfQAAAAAAeQAAAAADeQAAAAABeQAAAAAAeQAAAAAAeQAAAAAB version: 6 0,-1: ind: 0,-1 @@ -185,44 +185,35 @@ entities: version: 2 data: tiles: - -1,-1: - 0: 65535 - 0,-1: - 0: 30579 - -3,-2: - 0: 54272 -3,-1: - 1: 1 - 0: 65534 - -2,-2: - 0: 29696 - 1: 32768 + 0: 1 + 1: 61128 + -3,-2: + 0: 8192 -2,-1: - 0: 65535 + 1: 49075 + -2,-2: + 0: 32768 + -1,-1: + 1: 65524 -1,-2: - 0: 61184 - 1: 4096 + 1: 17408 + -1,0: + 1: 61162 0,-2: - 0: 14080 - -3,0: - 0: 207 + 1: 4352 + 0,-1: + 1: 4369 -2,0: - 0: 31 - 1: 128 - -1,0: - 0: 65535 - -1,1: - 0: 239 + 0: 128 0,0: - 0: 30579 - 0,1: - 0: 19 + 1: 4368 uniqueMixes: - volume: 2500 - temperature: 293.15 + immutable: True moles: - - 21.824879 - - 82.10312 + - 0 + - 0 - 0 - 0 - 0 @@ -236,8 +227,8 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 0 - - 0 + - 21.824879 + - 82.10312 - 0 - 0 - 0 @@ -254,27 +245,25 @@ entities: - type: BecomesStation id: Interceptor - type: SpreaderGrid -- proto: AirCanister +- proto: ActionToggleLight entities: - - uid: 106 + - uid: 131 components: - type: Transform - anchored: True - pos: -8.5,-0.5 - parent: 1 - - type: Physics - bodyType: Static -- proto: AirlockGlassShuttle + parent: 120 + - type: InstantAction + container: 120 +- proto: AirlockGlassShuttleNfsdLocked entities: - - uid: 6 + - uid: 7 components: - type: Transform - pos: 0.5,-5.5 + pos: -1.5,-5.5 parent: 1 - - uid: 7 + - uid: 17 components: - type: Transform - pos: -1.5,-5.5 + pos: 0.5,-5.5 parent: 1 - proto: AirlockNfsdGlassLocked entities: @@ -308,17 +297,17 @@ entities: rot: -1.5707963267948966 rad pos: -5.5,-0.5 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 10 components: - type: Transform - pos: -1.5,-5.5 + pos: 0.5,-5.5 parent: 1 - uid: 11 components: - type: Transform - pos: 0.5,-5.5 + pos: -1.5,-5.5 parent: 1 - proto: AtmosFixBlockerMarker entities: @@ -327,11 +316,6 @@ entities: - type: Transform pos: -4.5,1.5 parent: 1 - - uid: 23 - components: - - type: Transform - pos: -3.5,-4.5 - parent: 1 - uid: 117 components: - type: Transform @@ -378,14 +362,7 @@ entities: - uid: 16 components: - type: Transform - pos: -3.376185,-1.4098043 - parent: 1 -- proto: BoxForensicPad - entities: - - uid: 17 - components: - - type: Transform - pos: -3.6799874,-1.4031521 + pos: -3.62612,-1.2769039 parent: 1 - proto: CableApcExtension entities: @@ -563,11 +540,6 @@ entities: - type: Transform pos: -4.5,-0.5 parent: 1 - - uid: 260 - components: - - type: Transform - pos: -5.5,-0.5 - parent: 1 - uid: 261 components: - type: Transform @@ -652,11 +624,6 @@ entities: parent: 1 - proto: ChairOfficeDark entities: - - uid: 73 - components: - - type: Transform - pos: -8.5,-2.5 - parent: 1 - uid: 75 components: - type: Transform @@ -669,28 +636,26 @@ entities: rot: 3.141592653589793 rad pos: -7.5,-1.5 parent: 1 -- proto: ComputerIFF +- proto: ComputerTabletopIFF entities: - - uid: 78 + - uid: 82 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -9.5,-2.5 + pos: -8.5,-0.5 parent: 1 -- proto: ComputerShuttle +- proto: ComputerTabletopShuttle entities: - - uid: 220 + - uid: 73 components: - type: Transform pos: -7.5,-0.5 parent: 1 -- proto: ComputerStationRecords +- proto: ComputerTabletopStationRecords entities: - - uid: 131 + - uid: 164 components: - type: Transform - rot: 3.141592653589793 rad - pos: -8.5,-3.5 + pos: -6.5,-0.5 parent: 1 - proto: DefibrillatorCabinetFilled entities: @@ -702,10 +667,32 @@ entities: parent: 1 - proto: FaxMachineShip entities: - - uid: 26 + - uid: 6 components: - type: Transform - pos: -6.5,-3.5 + pos: -9.5,-0.5 + parent: 1 +- proto: FirelockEdge + entities: + - uid: 269 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,-0.5 + parent: 1 +- proto: FirelockGlass + entities: + - uid: 260 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,-1.5 + parent: 1 + - uid: 268 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,0.5 parent: 1 - proto: Fireplace entities: @@ -714,20 +701,25 @@ entities: - type: Transform pos: 0.5,3.5 parent: 1 -- proto: ForensicScanner +- proto: GasMixerOnFlipped entities: - - uid: 84 + - uid: 167 components: - type: Transform - pos: -3.0549874,-1.2281519 + pos: -7.5,-2.5 parent: 1 + - type: GasMixer + inletTwoConcentration: 0.79 + inletOneConcentration: 0.21 + - type: AtmosPipeColor + color: '#0055CCFF' - proto: GasPassiveVent entities: - - uid: 129 + - uid: 163 components: - type: Transform rot: 3.141592653589793 rad - pos: -3.5,-4.5 + pos: -4.5,-4.5 parent: 1 - type: AtmosPipeColor color: '#990000FF' @@ -757,11 +749,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 178 + - uid: 220 components: - type: Transform - rot: 3.141592653589793 rad - pos: -8.5,-1.5 + rot: 1.5707963267948966 rad + pos: -8.5,-2.5 parent: 1 - type: AtmosPipeColor color: '#0055CCFF' @@ -791,13 +783,6 @@ entities: color: '#0055CCFF' - proto: GasPipeFourway entities: - - uid: 163 - components: - - type: Transform - pos: -3.5,-2.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - uid: 234 components: - type: Transform @@ -822,19 +807,18 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 162 + - uid: 129 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -5.5,-2.5 + pos: -4.5,-3.5 parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 164 + - uid: 162 components: - type: Transform rot: 1.5707963267948966 rad - pos: -4.5,-2.5 + pos: -5.5,-2.5 parent: 1 - type: AtmosPipeColor color: '#990000FF' @@ -854,13 +838,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 167 - components: - - type: Transform - pos: -3.5,-3.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - uid: 168 components: - type: Transform @@ -926,6 +903,29 @@ entities: color: '#0055CCFF' - proto: GasPipeTJunction entities: + - uid: 23 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-2.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 67 + components: + - type: Transform + pos: -4.5,-2.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 84 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,-1.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 170 components: - type: Transform @@ -934,20 +934,21 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 177 +- proto: GasPort + entities: + - uid: 21 components: - type: Transform rot: 3.141592653589793 rad - pos: -7.5,-1.5 + pos: -8.5,-3.5 parent: 1 - type: AtmosPipeColor color: '#0055CCFF' -- proto: GasPort - entities: - - uid: 120 + - uid: 78 components: - type: Transform - pos: -8.5,-0.5 + rot: 3.141592653589793 rad + pos: -7.5,-3.5 parent: 1 - type: AtmosPipeColor color: '#0055CCFF' @@ -999,12 +1000,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 67 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -3.5,-1.5 - parent: 1 - uid: 125 components: - type: Transform @@ -1150,34 +1145,56 @@ entities: parent: 1 - proto: GyroscopeNfsd entities: - - uid: 21 + - uid: 26 components: - type: Transform - pos: -9.5,-0.5 + rot: 3.141592653589793 rad + pos: -9.5,-2.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 -- proto: LampGold +- proto: LampInterrogator entities: - - uid: 119 + - uid: 120 components: - type: Transform - rot: 3.141592653589793 rad - pos: -2.4816613,-1.1827465 + pos: -3.0243516,-1.0670333 + parent: 1 + - type: HandheldLight + toggleActionEntity: 131 + - type: ContainerContainer + containers: + cell_slot: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + actions: !type:Container + showEnts: False + occludes: True + ents: + - 131 + - type: Physics + canCollide: True + - type: ActionsContainer +- proto: LockerNfsdEvidence + entities: + - uid: 77 + components: + - type: Transform + pos: 0.5,-0.5 parent: 1 - proto: LockerNfsdSilverDetectiveFilled entities: - - uid: 76 + - uid: 178 components: - type: Transform - pos: -6.5,-0.5 + pos: -6.5,-3.5 parent: 1 -- proto: LockerNfsdEvidence +- proto: LockerWallMaterialsFuelPlasmaFilled entities: - - uid: 77 + - uid: 266 components: - type: Transform - pos: 0.5,-0.5 + rot: 3.141592653589793 rad + pos: -10.5,-2.5 parent: 1 - proto: Matchbox entities: @@ -1186,52 +1203,58 @@ entities: - type: Transform pos: -2.4866343,-1.9206845 parent: 1 -- proto: PaperBin10 +- proto: NitrogenCanister entities: - - uid: 74 + - uid: 177 components: - type: Transform - rot: 3.141592653589793 rad - pos: -7.5,-3.5 + anchored: True + pos: -8.5,-3.5 parent: 1 -- proto: Pen + - type: Physics + bodyType: Static +- proto: OxygenCanister entities: - - uid: 122 + - uid: 182 components: - type: Transform - pos: -3.1632028,-1.4523776 + anchored: True + pos: -7.5,-3.5 parent: 1 -- proto: PinpointerUniversal + - type: Physics + bodyType: Static +- proto: Paper entities: - - uid: 123 + - uid: 74 components: - type: Transform - pos: -8.56982,-2.4906285 + pos: -9.234102,-0.380448 parent: 1 -- proto: PortableGeneratorPacmanShuttle + - uid: 76 + components: + - type: Transform + pos: -9.202852,-0.30748048 + parent: 1 +- proto: Pen entities: - - uid: 124 + - uid: 122 components: - type: Transform - pos: -10.5,-1.5 + pos: -3.5115366,-1.527078 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static -- proto: PosterLegit12Gauge +- proto: PinpointerUniversal entities: - - uid: 265 + - uid: 123 components: - type: Transform - pos: 1.5,1.5 + pos: -2.4514349,-1.5361089 parent: 1 -- proto: PosterLegitDickGumshue +- proto: PortableGeneratorPacmanShuttle entities: - - uid: 266 + - uid: 124 components: - type: Transform - pos: 1.5,-4.5 + pos: -10.5,-1.5 parent: 1 - proto: PosterLegitObey entities: @@ -1300,6 +1323,20 @@ entities: rot: 3.141592653589793 rad pos: -0.5,-2.5 parent: 1 +- proto: RandomPosterAny + entities: + - uid: 116 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,1.5 + parent: 1 + - uid: 225 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-4.5 + parent: 1 - proto: ReinforcedWindow entities: - uid: 135 @@ -1408,15 +1445,6 @@ entities: rot: 3.141592653589793 rad pos: -4.5,-3.5 parent: 1 -- proto: SheetPlasma - entities: - - uid: 225 - components: - - type: Transform - pos: -10.5,-1.5 - parent: 1 - - type: Stack - count: 15 - proto: ShuttersNormalOpen entities: - uid: 104 @@ -1424,159 +1452,105 @@ entities: - type: Transform pos: -1.5,0.5 parent: 1 - - type: DeviceLinkSink - links: - - 251 - uid: 145 components: - type: Transform rot: 3.141592653589793 rad pos: -7.5,-4.5 parent: 1 - - type: DeviceLinkSink - links: - - 252 - uid: 148 components: - type: Transform rot: 3.141592653589793 rad pos: -6.5,-4.5 parent: 1 - - type: DeviceLinkSink - links: - - 252 - uid: 241 components: - type: Transform rot: 3.141592653589793 rad pos: -8.5,-4.5 parent: 1 - - type: DeviceLinkSink - links: - - 252 - uid: 242 components: - type: Transform rot: 1.5707963267948966 rad pos: -11.5,-1.5 parent: 1 - - type: DeviceLinkSink - links: - - 252 - uid: 243 components: - type: Transform rot: 1.5707963267948966 rad pos: -11.5,-0.5 parent: 1 - - type: DeviceLinkSink - links: - - 252 - uid: 244 components: - type: Transform pos: -8.5,0.5 parent: 1 - - type: DeviceLinkSink - links: - - 252 - uid: 245 components: - type: Transform pos: -7.5,0.5 parent: 1 - - type: DeviceLinkSink - links: - - 252 - uid: 246 components: - type: Transform pos: -6.5,0.5 parent: 1 - - type: DeviceLinkSink - links: - - 252 - uid: 247 components: - type: Transform rot: 3.141592653589793 rad pos: -3.5,-3.5 parent: 1 - - type: DeviceLinkSink - links: - - 259 - uid: 248 components: - type: Transform rot: 3.141592653589793 rad pos: -4.5,-3.5 parent: 1 - - type: DeviceLinkSink - links: - - 259 - uid: 249 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,3.5 parent: 1 - - type: DeviceLinkSink - links: - - 251 - uid: 250 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,2.5 parent: 1 - - type: DeviceLinkSink - links: - - 251 - uid: 253 components: - type: Transform rot: -1.5707963267948966 rad pos: 1.5,-0.5 parent: 1 - - type: DeviceLinkSink - links: - - 259 - uid: 254 components: - type: Transform rot: -1.5707963267948966 rad pos: 1.5,-1.5 parent: 1 - - type: DeviceLinkSink - links: - - 259 - uid: 255 components: - type: Transform rot: -1.5707963267948966 rad pos: 1.5,-2.5 parent: 1 - - type: DeviceLinkSink - links: - - 259 - uid: 256 components: - type: Transform rot: -1.5707963267948966 rad pos: 1.5,2.5 parent: 1 - - type: DeviceLinkSink - links: - - 259 - uid: 257 components: - type: Transform rot: -1.5707963267948966 rad pos: 1.5,3.5 parent: 1 - - type: DeviceLinkSink - links: - - 259 - proto: ShuttersWindowOpen entities: - uid: 151 @@ -1584,9 +1558,6 @@ entities: - type: Transform pos: -2.5,0.5 parent: 1 - - type: DeviceLinkSink - links: - - 251 - proto: SignalButtonDirectional entities: - uid: 251 @@ -1662,7 +1633,7 @@ entities: rot: 3.141592653589793 rad pos: -3.5,0.5 parent: 1 -- proto: SignSec +- proto: SignNfsd entities: - uid: 89 components: @@ -1677,13 +1648,11 @@ entities: - uid: 172 components: - type: Transform - rot: 3.141592653589793 rad pos: -2.5,-5.5 parent: 1 - uid: 173 components: - type: Transform - rot: 3.141592653589793 rad pos: 1.5,-5.5 parent: 1 - proto: SmokingPipeFilledTobacco @@ -1693,6 +1662,14 @@ entities: - type: Transform pos: -2.586734,-2.0767865 parent: 1 +- proto: SpawnPointLatejoin + entities: + - uid: 265 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-1.5 + parent: 1 - proto: SubstationWallBasic entities: - uid: 179 @@ -1714,20 +1691,27 @@ entities: - type: Transform pos: -4.5,0.5 parent: 1 - - type: Physics - canCollide: False - proto: TableReinforced entities: - - uid: 82 + - uid: 106 components: - type: Transform - rot: 3.141592653589793 rad - pos: -6.5,-3.5 + pos: -9.5,-0.5 parent: 1 - - uid: 182 + - uid: 119 components: - type: Transform - pos: -7.5,-3.5 + pos: -8.5,-0.5 + parent: 1 + - uid: 270 + components: + - type: Transform + pos: -7.5,-0.5 + parent: 1 + - uid: 271 + components: + - type: Transform + pos: -6.5,-0.5 parent: 1 - proto: TableWood entities: @@ -1757,31 +1741,23 @@ entities: rot: 3.141592653589793 rad pos: -10.5,-4.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 187 components: - type: Transform rot: -1.5707963267948966 rad pos: -4.5,-4.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 188 components: - type: Transform rot: 1.5707963267948966 rad pos: -11.5,-3.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 189 components: - type: Transform pos: -4.5,1.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - proto: TintedWindow entities: - uid: 191 @@ -1982,11 +1958,11 @@ entities: parent: 1 - proto: WallWeaponCapacitorRecharger entities: - - uid: 116 + - uid: 272 components: - type: Transform rot: -1.5707963267948966 rad - pos: -5.5,-2.5 + pos: -5.5,-3.5 parent: 1 - proto: WardrobePrisonFilled entities: From 4ff44da34c8f717ad8e5e27661dc91ae264503dc Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Fri, 18 Oct 2024 12:38:36 +0000 Subject: [PATCH 61/76] Automatic Changelog (#2199) --- Resources/Changelog/Frontier.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 3b5505c70b2..d097e06437f 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4731,3 +4731,7 @@ Entries: message: Updated NSF mini-shuttles to use directional fans + a few minor tweaks id: 5426 time: '2024-10-18T12:05:18.0000000+00:00' +- author: chrome-cirrus + changes: [] + id: 5427 + time: '2024-10-18T12:38:08.0000000+00:00' From 1eaae603fda977d45abf6c8d2a54e6a096ccd419 Mon Sep 17 00:00:00 2001 From: chrome-cirrus <95361+chrome-cirrus@users.noreply.github.com> Date: Fri, 18 Oct 2024 15:07:14 +0200 Subject: [PATCH 62/76] Hospitaller (Update Shuttle) (#2194) * Modernize the Hospitaller a bunch. * Rejig main bay seating/medical bed configuration, add a firelock for the cockpit * Add some NFSD insignia to the ship's exterior * Update hospitaller.yml --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Dvir --- .../Maps/_NF/Shuttles/Nfsd/hospitaller.yml | 790 +++++++++++------- 1 file changed, 472 insertions(+), 318 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/hospitaller.yml b/Resources/Maps/_NF/Shuttles/Nfsd/hospitaller.yml index 16502755d2e..d991dda3e0e 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/hospitaller.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/hospitaller.yml @@ -6,6 +6,7 @@ tilemap: 30: FloorDark 57: FloorHull 65: FloorMetalDiamond + 1: FloorSteel 107: FloorTechMaint 111: FloorWhite 124: Lattice @@ -24,19 +25,19 @@ entities: chunks: 0,0: ind: 0,0 - tiles: bwAAAAAAbwAAAAAAbwAAAAAAQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAADfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAACfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: bwAAAAAAbwAAAAAAbwAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 0,-1: ind: 0,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAawAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,0: ind: -1,0 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQAAAAAAbwAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAbwAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,-1: ind: -1,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAbwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAbwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAbwAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQAAAAAAbwAAAAAAbwAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAbwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAbwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAbwAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAbwAAAAAAbwAAAAAA version: 6 - type: Broadphase - type: Physics @@ -59,43 +60,69 @@ entities: version: 2 nodes: - node: - color: '#49392696' - id: CheckerNWSE + color: '#4B653E96' + id: BrickTileWhiteCornerNe + decals: + 52: 1,3 + - node: + color: '#52B4E996' + id: BrickTileWhiteCornerNe + decals: + 41: 2,-1 + - node: + color: '#4B653E96' + id: BrickTileWhiteCornerNw + decals: + 49: 0,3 + - node: + color: '#52B4E996' + id: BrickTileWhiteCornerNw decals: - 4: -1,4 - 5: 0,4 - 6: 1,4 - 7: 1,3 - 8: 0,3 - 9: -1,3 - 10: -1,2 - 11: 0,2 - 12: 1,2 + 42: -2,-1 - node: color: '#4B653E96' - id: CheckerNWSE + id: BrickTileWhiteCornerSe + decals: + 50: 1,2 + - node: + color: '#52B4E996' + id: BrickTileWhiteCornerSe + decals: + 40: 2,-2 + - node: + color: '#4B653E96' + id: BrickTileWhiteCornerSw + decals: + 51: 0,2 + - node: + color: '#52B4E996' + id: BrickTileWhiteCornerSw + decals: + 39: -2,-2 + - node: + color: '#52B4E996' + id: BrickTileWhiteLineN + decals: + 46: 1,-1 + 47: -1,-1 + 48: 0,-1 + - node: + color: '#52B4E996' + id: BrickTileWhiteLineS + decals: + 43: -1,-2 + 44: 0,-2 + 45: 1,-2 + - node: + color: '#4D9BE6FF' + id: DeliveryGreyscale + decals: + 34: 0,-5 + - node: + color: '#B33831FF' + id: DeliveryGreyscale decals: - 13: -2,-2 - 14: -2,-1 - 15: -2,0 - 16: -1,0 - 17: -1,-1 - 18: -1,-2 - 19: -1,-3 - 20: -1,-4 - 21: 0,-4 - 22: 0,-3 - 23: 0,-2 - 24: 0,-1 - 25: 0,0 - 26: 1,0 - 27: 1,-1 - 28: 1,-2 - 29: 1,-3 - 30: 1,-4 - 31: 2,-2 - 32: 2,-1 - 33: 2,0 + 35: 1,-5 - node: color: '#FFFFFFFF' id: WarnLineN @@ -113,29 +140,29 @@ entities: data: tiles: 0,0: - 0: 30719 - 1: 34816 - 0,1: - 0: 55 - 1: 72 + 0: 13079 + 1: 34944 0,-1: - 0: 65527 - 1: 8 - 0,-2: - 0: 12288 - 1: 49152 + 0: 32563 + 1: 136 -1,0: - 0: 52462 - 1: 8704 + 0: 34828 + 1: 8736 + 0,1: + 0: 3 + 1: 64 -1,1: - 0: 140 - 1: 66 - -1,-1: - 1: 2 - 0: 61164 + 0: 8 + 1: 64 + 0,-2: + 0: 13312 + 1: 34816 -1,-2: - 1: 24576 - 0: 32768 + 0: 33792 + 1: 8704 + -1,-1: + 0: 52872 + 1: 34 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -153,7 +180,7 @@ entities: - 0 - 0 - volume: 2500 - temperature: 293.15 + immutable: True moles: - 0 - 0 @@ -172,71 +199,52 @@ entities: - type: RadiationGridResistance - type: BecomesStation id: Hospitaller -- proto: AirCanister +- proto: AirlockGlassShuttleNfsd entities: - - uid: 2 + - uid: 4 components: - type: Transform - anchored: True - pos: 1.5,3.5 + rot: 1.5707963267948966 rad + pos: 3.5,-1.5 parent: 1 - - type: Physics - bodyType: Static - - type: AtmosDevice - joinedGrid: 1 -- proto: AirlockGlassShuttle - entities: - - uid: 3 + - uid: 8 components: - type: Transform rot: -1.5707963267948966 rad pos: -2.5,-1.5 parent: 1 - - uid: 4 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 3.5,-1.5 - parent: 1 -- proto: AirlockNfsdLocked +- proto: AirlockNfsdGlassLocked entities: - uid: 5 components: - type: Transform + rot: 1.5707963267948966 rad pos: 0.5,1.5 parent: 1 - proto: APCBasic entities: - - uid: 6 + - uid: 41 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -1.5,2.5 + rot: -1.5707963267948966 rad + pos: 2.5,2.5 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - - uid: 7 + - uid: 3 components: - type: Transform - pos: -2.5,-1.5 + rot: 1.5707963267948966 rad + pos: 3.5,-1.5 parent: 1 - - uid: 8 + - uid: 7 components: - type: Transform - pos: 3.5,-1.5 + rot: -1.5707963267948966 rad + pos: -2.5,-1.5 parent: 1 - proto: AtmosFixBlockerMarker entities: - - uid: 9 - components: - - type: Transform - pos: 3.5,4.5 - parent: 1 - - uid: 10 - components: - - type: Transform - pos: -2.5,4.5 - parent: 1 - uid: 11 components: - type: Transform @@ -255,12 +263,12 @@ entities: - uid: 14 components: - type: Transform - pos: -1.5,-4.5 + pos: -1.5,-5.5 parent: 1 - uid: 15 components: - type: Transform - pos: 2.5,-4.5 + pos: -2.5,-5.5 parent: 1 - uid: 16 components: @@ -297,25 +305,32 @@ entities: - type: Transform pos: -2.5,-4.5 parent: 1 -- proto: BedsheetNfsdBrigmedic - entities: - - uid: 23 + - uid: 174 components: - type: Transform - pos: 0.5,-1.5 + pos: 2.5,-5.5 parent: 1 -- proto: CableApcExtension + - uid: 175 + components: + - type: Transform + pos: 3.5,-5.5 + parent: 1 +- proto: BedsheetNfsdBrigmedic entities: - - uid: 24 + - uid: 176 components: - type: Transform - pos: -1.5,2.5 + rot: -1.5707963267948966 rad + pos: 1.5,0.5 parent: 1 - - uid: 25 + - uid: 177 components: - type: Transform - pos: -0.5,2.5 + rot: -1.5707963267948966 rad + pos: 1.5,-2.5 parent: 1 +- proto: CableApcExtension + entities: - uid: 26 components: - type: Transform @@ -361,11 +376,6 @@ entities: - type: Transform pos: 1.5,-0.5 parent: 1 - - uid: 35 - components: - - type: Transform - pos: 1.5,2.5 - parent: 1 - uid: 36 components: - type: Transform @@ -381,27 +391,47 @@ entities: - type: Transform pos: 1.5,-3.5 parent: 1 -- proto: CableHV - entities: - uid: 39 components: - type: Transform - pos: 2.5,1.5 + pos: 2.5,2.5 parent: 1 - - uid: 40 + - uid: 46 components: - type: Transform - pos: 1.5,1.5 + pos: -0.5,2.5 parent: 1 - - uid: 41 + - uid: 47 components: - type: Transform - pos: 0.5,1.5 + pos: 1.5,2.5 + parent: 1 + - uid: 169 + components: + - type: Transform + pos: -1.5,-0.5 + parent: 1 + - uid: 170 + components: + - type: Transform + pos: 2.5,-0.5 + parent: 1 + - uid: 171 + components: + - type: Transform + pos: 1.5,-4.5 + parent: 1 + - uid: 172 + components: + - type: Transform + pos: -0.5,-4.5 parent: 1 +- proto: CableHV + entities: - uid: 42 components: - type: Transform - pos: 2.5,2.5 + pos: 1.5,1.5 parent: 1 - uid: 43 components: @@ -413,32 +443,32 @@ entities: - type: Transform pos: -0.5,1.5 parent: 1 -- proto: CableMV - entities: - uid: 45 components: - type: Transform - pos: 2.5,2.5 + pos: 0.5,1.5 parent: 1 - - uid: 46 + - uid: 54 components: - type: Transform - pos: 1.5,2.5 + pos: -2.5,1.5 parent: 1 - - uid: 47 + - uid: 80 components: - type: Transform - pos: 0.5,2.5 + pos: 2.5,1.5 parent: 1 - - uid: 48 +- proto: CableMV + entities: + - uid: 6 components: - type: Transform - pos: -0.5,2.5 + pos: 2.5,1.5 parent: 1 - - uid: 49 + - uid: 24 components: - type: Transform - pos: -1.5,2.5 + pos: 2.5,2.5 parent: 1 - proto: ChairPilotSeat entities: @@ -448,30 +478,34 @@ entities: rot: 3.141592653589793 rad pos: 0.5,3.5 parent: 1 - - uid: 51 + - uid: 53 components: - type: Transform - pos: -0.5,0.5 + rot: -1.5707963267948966 rad + pos: 1.5,-3.5 parent: 1 - - uid: 52 +- proto: ClosetWallO2N2FilledRandom + entities: + - uid: 56 components: - type: Transform - pos: 1.5,0.5 + rot: 3.141592653589793 rad + pos: -1.5,-2.5 parent: 1 - proto: ClothingBackpackDuffelSurgeryFilled entities: - - uid: 53 + - uid: 9 components: - type: Transform - pos: 0.5574491,-3.3398647 + pos: -0.54252744,-2.4372983 parent: 1 - proto: ComputerTabletopCrewMonitoring entities: - - uid: 54 + - uid: 40 components: - type: Transform rot: 1.5707963267948966 rad - pos: -0.5,2.5 + pos: -0.5,3.5 parent: 1 - proto: ComputerTabletopShuttle entities: @@ -482,11 +516,11 @@ entities: parent: 1 - proto: ComputerTabletopStationRecords entities: - - uid: 56 + - uid: 83 components: - type: Transform rot: 1.5707963267948966 rad - pos: -0.5,3.5 + pos: -0.5,2.5 parent: 1 - proto: DefibrillatorCabinetFilled entities: @@ -510,11 +544,11 @@ entities: parent: 1 - proto: ExtinguisherCabinetFilled entities: - - uid: 143 + - uid: 70 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -1.5,-2.5 + rot: -1.5707963267948966 rad + pos: 2.5,-3.5 parent: 1 - proto: FaxMachineShip entities: @@ -523,166 +557,176 @@ entities: - type: Transform pos: -0.5,4.5 parent: 1 -- proto: GasPassiveVent +- proto: FirelockGlass entities: - - uid: 62 + - uid: 51 components: - type: Transform rot: 1.5707963267948966 rad - pos: -2.5,4.5 + pos: 0.5,1.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - - uid: 63 +- proto: GasMixerOn + entities: + - uid: 99 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,4.5 + rot: 3.141592653589793 rad + pos: 0.5,-3.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 -- proto: GasPipeStraight + - type: GasMixer + inletTwoConcentration: 0.79 + inletOneConcentration: 0.21 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasPassiveVent entities: - - uid: 64 + - uid: 77 components: - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,-0.5 + rot: 1.5707963267948966 rad + pos: -2.5,3.5 parent: 1 - - uid: 65 + - type: AtmosPipeColor + color: '#990000FF' +- proto: GasPipeBend + entities: + - uid: 62 components: - type: Transform - pos: 0.5,1.5 + pos: 0.5,2.5 parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 66 + - uid: 82 components: - type: Transform - pos: 0.5,2.5 + pos: 1.5,-3.5 parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 67 +- proto: GasPipeStraight + entities: + - uid: 71 components: - type: Transform - pos: 1.5,-1.5 + rot: 3.141592653589793 rad + pos: -0.5,1.5 parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 68 + - uid: 73 components: - type: Transform - pos: 1.5,0.5 + rot: -1.5707963267948966 rad + pos: -1.5,3.5 parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 69 + - uid: 74 components: - type: Transform - pos: 1.5,1.5 + rot: 3.141592653589793 rad + pos: -0.5,2.5 parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 70 + - uid: 120 components: - type: Transform - pos: 1.5,2.5 + pos: 0.5,1.5 parent: 1 - - uid: 71 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 124 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,4.5 + pos: 0.5,-0.5 parent: 1 - - uid: 72 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 167 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,4.5 + pos: 0.5,-1.5 parent: 1 - - uid: 73 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 168 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,4.5 - parent: 1 - - uid: 74 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,4.5 - parent: 1 - - uid: 75 - components: - - type: Transform - pos: 1.5,3.5 + pos: 0.5,-2.5 parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' - proto: GasPipeTJunction entities: - - uid: 76 + - uid: 63 components: - type: Transform - pos: 1.5,4.5 + rot: -1.5707963267948966 rad + pos: -0.5,3.5 parent: 1 - - uid: 77 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 72 components: - type: Transform - pos: 0.5,3.5 + rot: 1.5707963267948966 rad + pos: 0.5,0.5 parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - proto: GasPort entities: - - uid: 78 + - uid: 10 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,3.5 + rot: 3.141592653589793 rad + pos: 1.5,-4.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' -- proto: GasVentPump - entities: - - uid: 79 + - uid: 100 components: - type: Transform rot: 3.141592653589793 rad - pos: 0.5,0.5 + pos: 0.5,-4.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - - uid: 80 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasVentPump + entities: + - uid: 64 components: - type: Transform rot: 1.5707963267948966 rad - pos: -0.5,3.5 + pos: -0.5,2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 106 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,0.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0055CCFF' - proto: GasVentScrubber entities: - - uid: 81 + - uid: 35 components: - type: Transform - pos: 1.5,2.5 + pos: -0.5,4.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 82 + - uid: 78 components: - type: Transform rot: 3.141592653589793 rad - pos: 1.5,-2.5 + pos: -0.5,0.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#990000FF' - proto: GeneratorWallmountAPU @@ -692,10 +736,10 @@ entities: - type: Transform pos: -0.5,1.5 parent: 1 - - uid: 83 + - uid: 79 components: - type: Transform - pos: 2.5,1.5 + pos: -2.5,1.5 parent: 1 - uid: 84 components: @@ -711,11 +755,6 @@ entities: parent: 1 - proto: Grille entities: - - uid: 86 - components: - - type: Transform - pos: -2.5,0.5 - parent: 1 - uid: 87 components: - type: Transform @@ -734,22 +773,18 @@ entities: - uid: 90 components: - type: Transform - pos: 0.5,-4.5 + rot: 1.5707963267948966 rad + pos: -0.5,-5.5 parent: 1 - uid: 91 components: - type: Transform pos: 2.5,3.5 parent: 1 - - uid: 92 - components: - - type: Transform - pos: -0.5,5.5 - parent: 1 - uid: 93 components: - type: Transform - pos: 0.5,5.5 + pos: -0.5,5.5 parent: 1 - uid: 94 components: @@ -761,6 +796,28 @@ entities: - type: Transform pos: -1.5,3.5 parent: 1 + - uid: 109 + components: + - type: Transform + pos: -2.5,0.5 + parent: 1 + - uid: 113 + components: + - type: Transform + pos: 0.5,5.5 + parent: 1 + - uid: 115 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-5.5 + parent: 1 + - uid: 162 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-5.5 + parent: 1 - proto: GrilleDiagonal entities: - uid: 96 @@ -774,27 +831,60 @@ entities: - type: Transform pos: -1.5,5.5 parent: 1 -- proto: LockerNfsdBrigmedic +- proto: LockerNfsdEvidence entities: - - uid: 98 + - uid: 48 components: - type: Transform - pos: 1.5,2.5 + pos: 1.5,3.5 + parent: 1 +- proto: LockerWallEVAColorNfsdFilled + entities: + - uid: 49 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,1.5 parent: 1 - proto: MedicalBed entities: - - uid: 99 + - uid: 23 components: - type: Transform - pos: 0.5,-1.5 + pos: 1.5,0.5 parent: 1 -- proto: MedkitAdvancedFilled + - uid: 52 + components: + - type: Transform + pos: 1.5,-2.5 + parent: 1 +- proto: MedkitFilled entities: - - uid: 100 + - uid: 76 components: - type: Transform - pos: 1.5215306,-3.481596 + pos: -0.5030305,-3.2284198 parent: 1 +- proto: NitrogenCanister + entities: + - uid: 69 + components: + - type: Transform + anchored: True + pos: 1.5,-4.5 + parent: 1 + - type: Physics + bodyType: Static +- proto: OxygenCanister + entities: + - uid: 81 + components: + - type: Transform + anchored: True + pos: 0.5,-4.5 + parent: 1 + - type: Physics + bodyType: Static - proto: Paper entities: - uid: 101 @@ -807,47 +897,64 @@ entities: - type: Transform pos: -0.35719717,4.51526 parent: 1 -- proto: PoweredlightColoredRed +- proto: PowerCellRecharger entities: - - uid: 103 + - uid: 158 components: - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,-3.5 + rot: 1.5707963267948966 rad + pos: -0.5,-4.5 parent: 1 - - uid: 104 +- proto: Poweredlight + entities: + - uid: 2 components: - type: Transform - pos: -1.5,0.5 + rot: 1.5707963267948966 rad + pos: -1.5,-0.5 + parent: 1 + - uid: 66 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-0.5 parent: 1 - uid: 105 components: - type: Transform - pos: 2.5,0.5 + rot: -1.5707963267948966 rad + pos: 1.5,2.5 parent: 1 - - uid: 106 +- proto: PoweredlightColoredRed + entities: + - uid: 123 components: - type: Transform rot: 1.5707963267948966 rad - pos: -0.5,4.5 + pos: -0.5,-3.5 parent: 1 - proto: ShuttleWindow entities: - - uid: 107 + - uid: 86 components: - type: Transform - pos: 3.5,0.5 + pos: -2.5,0.5 parent: 1 - - uid: 108 + - uid: 92 components: - type: Transform - pos: -1.5,3.5 + pos: -0.5,5.5 parent: 1 - - uid: 109 + - uid: 107 components: - type: Transform pos: -1.5,4.5 parent: 1 + - uid: 108 + components: + - type: Transform + pos: -1.5,3.5 + parent: 1 - uid: 110 components: - type: Transform @@ -856,32 +963,40 @@ entities: - uid: 111 components: - type: Transform - pos: -0.5,5.5 + pos: 1.5,5.5 parent: 1 - uid: 112 components: - type: Transform pos: 0.5,5.5 parent: 1 - - uid: 113 + - uid: 114 components: - type: Transform - pos: 1.5,5.5 + pos: 2.5,3.5 parent: 1 - - uid: 114 + - uid: 116 components: - type: Transform - pos: 2.5,3.5 + pos: 3.5,0.5 parent: 1 - - uid: 115 + - uid: 161 components: - type: Transform - pos: 0.5,-4.5 + rot: 1.5707963267948966 rad + pos: 1.5,-5.5 parent: 1 - - uid: 116 + - uid: 163 components: - type: Transform - pos: -2.5,0.5 + rot: 1.5707963267948966 rad + pos: 0.5,-5.5 + parent: 1 + - uid: 164 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-5.5 parent: 1 - proto: ShuttleWindowDiagonal entities: @@ -896,49 +1011,69 @@ entities: - type: Transform pos: -1.5,5.5 parent: 1 +- proto: SignNfsd + entities: + - uid: 178 + components: + - type: Transform + pos: 3.5,-2.5 + parent: 1 + - uid: 179 + components: + - type: Transform + pos: -2.5,-2.5 + parent: 1 - proto: SmallGyroscopeNfsd entities: - - uid: 119 + - uid: 98 components: - type: Transform pos: 1.5,4.5 parent: 1 -- proto: StasisBed +- proto: SpawnPointLatejoin entities: - - uid: 120 + - uid: 25 components: - type: Transform - pos: 0.5,-2.5 + rot: 3.141592653589793 rad + pos: 0.5,-1.5 parent: 1 -- proto: SubstationWallBasic - entities: - - uid: 121 + - uid: 173 components: - type: Transform rot: -1.5707963267948966 rad - pos: 2.5,2.5 + pos: 0.5,3.5 parent: 1 -- proto: TableReinforced +- proto: StasisBed entities: - - uid: 122 + - uid: 67 components: - type: Transform - pos: -0.5,-3.5 + pos: -0.5,0.5 parent: 1 - - uid: 123 +- proto: SubstationWallBasic + entities: + - uid: 119 components: - type: Transform - pos: 1.5,-3.5 + pos: 2.5,1.5 parent: 1 - - uid: 124 +- proto: TableReinforced + entities: + - uid: 103 components: - type: Transform - pos: 0.5,-3.5 + pos: -0.5,2.5 parent: 1 - - uid: 125 + - uid: 104 components: - type: Transform - pos: -0.5,2.5 + pos: -0.5,3.5 + parent: 1 + - uid: 122 + components: + - type: Transform + pos: -0.5,-3.5 parent: 1 - uid: 126 components: @@ -946,24 +1081,36 @@ entities: rot: 1.5707963267948966 rad pos: 0.5,4.5 parent: 1 - - uid: 127 + - uid: 128 + components: + - type: Transform + pos: -0.5,4.5 + parent: 1 + - uid: 165 components: - type: Transform rot: 1.5707963267948966 rad - pos: -0.5,3.5 + pos: -0.5,-2.5 parent: 1 - - uid: 128 + - uid: 166 components: - type: Transform - pos: -0.5,4.5 + rot: 1.5707963267948966 rad + pos: -0.5,-4.5 parent: 1 - proto: ThrusterNfsd entities: - - uid: 129 + - uid: 65 components: - type: Transform rot: 3.141592653589793 rad - pos: -2.5,-4.5 + pos: -2.5,-5.5 + parent: 1 + - uid: 68 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-5.5 parent: 1 - uid: 130 components: @@ -978,20 +1125,14 @@ entities: - uid: 132 components: - type: Transform - rot: 3.141592653589793 rad + rot: -1.5707963267948966 rad pos: 3.5,-4.5 parent: 1 - - uid: 133 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,-3.5 - parent: 1 - uid: 134 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,-3.5 + rot: 1.5707963267948966 rad + pos: -2.5,-4.5 parent: 1 - proto: VendingMachineMedical entities: @@ -1062,16 +1203,6 @@ entities: - type: Transform pos: 3.5,-0.5 parent: 1 - - uid: 149 - components: - - type: Transform - pos: -0.5,-4.5 - parent: 1 - - uid: 150 - components: - - type: Transform - pos: 1.5,-4.5 - parent: 1 - uid: 151 components: - type: Transform @@ -1087,6 +1218,18 @@ entities: - type: Transform pos: 2.5,-3.5 parent: 1 + - uid: 155 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-4.5 + parent: 1 + - uid: 157 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-4.5 + parent: 1 - uid: 160 components: - type: Transform @@ -1094,43 +1237,54 @@ entities: parent: 1 - proto: WallShuttleDiagonal entities: - - uid: 154 + - uid: 129 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,2.5 + rot: 1.5707963267948966 rad + pos: -2.5,-3.5 parent: 1 - - uid: 155 + - uid: 133 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -1.5,-4.5 + rot: 3.141592653589793 rad + pos: 3.5,-3.5 parent: 1 - - uid: 156 + - uid: 149 components: - type: Transform - pos: -2.5,2.5 + rot: 1.5707963267948966 rad + pos: -1.5,-5.5 parent: 1 - - uid: 157 + - uid: 150 components: - type: Transform rot: 3.141592653589793 rad - pos: 2.5,-4.5 + pos: 2.5,-5.5 parent: 1 -- proto: WallWeaponCapacitorRecharger - entities: - - uid: 158 + - uid: 154 components: - type: Transform - pos: 1.5,1.5 + rot: -1.5707963267948966 rad + pos: 3.5,2.5 + parent: 1 + - uid: 156 + components: + - type: Transform + pos: -2.5,2.5 parent: 1 - proto: WarpPointShip entities: - uid: 159 components: - type: Transform - pos: 0.5,0.5 + rot: -1.5707963267948966 rad + pos: 0.5,-1.5 + parent: 1 +- proto: Wrench + entities: + - uid: 75 + components: + - type: Transform + pos: -0.54011965,-3.8666306 parent: 1 - - type: WarpPoint - location: Hospitaller ... From 83156899b501f328b3a6bdbc2c6a48e4668911d3 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Fri, 18 Oct 2024 13:07:40 +0000 Subject: [PATCH 63/76] Automatic Changelog (#2194) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index d097e06437f..fb5693ccf32 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4735,3 +4735,9 @@ Entries: changes: [] id: 5427 time: '2024-10-18T12:38:08.0000000+00:00' +- author: chrome-cirrus + changes: + - type: Tweak + message: Modernize the Hospitaller + id: 5428 + time: '2024-10-18T13:07:14.0000000+00:00' From c692530824701a4170be7f76befa50dcd15c244f Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Fri, 18 Oct 2024 18:18:56 +0300 Subject: [PATCH 64/76] Add EMP Blast effect shader (#2262) --- Content.Client/Entry/EntryPoint.cs | 2 + .../_NF/Emp/Overlays/EmpBlastOverlay.cs | 145 ++++++++++++++++++ Content.Server/Emp/EmpSystem.cs | 18 ++- .../_NF/Emp/Components/EmpBlastComponent.cs | 30 ++++ .../_NF/Emp/Systems/EmpBlastSystem.cs | 27 ++++ .../Prototypes/_NF/Entities/Effects/emp.yml | 16 ++ Resources/Prototypes/_NF/Shaders/shaders.yml | 7 + Resources/Textures/_NF/Shaders/emp.swsl | 99 ++++++++++++ 8 files changed, 342 insertions(+), 2 deletions(-) create mode 100644 Content.Client/_NF/Emp/Overlays/EmpBlastOverlay.cs create mode 100644 Content.Shared/_NF/Emp/Components/EmpBlastComponent.cs create mode 100644 Content.Shared/_NF/Emp/Systems/EmpBlastSystem.cs create mode 100644 Resources/Prototypes/_NF/Entities/Effects/emp.yml create mode 100644 Resources/Prototypes/_NF/Shaders/shaders.yml create mode 100644 Resources/Textures/_NF/Shaders/emp.swsl diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs index 1c2d70c8db6..56d1a04c4ef 100644 --- a/Content.Client/Entry/EntryPoint.cs +++ b/Content.Client/Entry/EntryPoint.cs @@ -35,6 +35,7 @@ using Robust.Shared.Prototypes; using Robust.Shared.Replays; using Robust.Shared.Timing; +using Content.Client._NF.Emp.Overlays; // Frontier namespace Content.Client.Entry { @@ -154,6 +155,7 @@ public override void PostInit() _overlayManager.AddOverlay(new SingularityOverlay()); _overlayManager.AddOverlay(new RadiationPulseOverlay()); + _overlayManager.AddOverlay(new EmpBlastOverlay()); // Frontier _chatManager.Initialize(); _clientPreferencesManager.Initialize(); _euiManager.Initialize(); diff --git a/Content.Client/_NF/Emp/Overlays/EmpBlastOverlay.cs b/Content.Client/_NF/Emp/Overlays/EmpBlastOverlay.cs new file mode 100644 index 00000000000..89e4e6fdefb --- /dev/null +++ b/Content.Client/_NF/Emp/Overlays/EmpBlastOverlay.cs @@ -0,0 +1,145 @@ +using System.Numerics; +using Content.Shared._NF.Emp.Components; +using Robust.Client.GameObjects; +using Robust.Client.Graphics; +using Robust.Shared.Enums; +using Robust.Shared.Graphics; +using Robust.Shared.Map; +using Robust.Shared.Prototypes; +using Robust.Shared.Timing; + +namespace Content.Client._NF.Emp.Overlays +{ + public sealed class EmpBlastOverlay : Overlay + { + [Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private readonly IGameTiming _gameTiming = default!; + private TransformSystem? _transform; + + private const float PvsDist = 25.0f; + + public override OverlaySpace Space => OverlaySpace.WorldSpace; + public override bool RequestScreenTexture => true; + + private readonly ShaderInstance _baseShader; + private readonly Dictionary _blasts = new(); + + public EmpBlastOverlay() + { + IoCManager.InjectDependencies(this); + _baseShader = _prototypeManager.Index("Emp").Instance().Duplicate(); + } + + protected override bool BeforeDraw(in OverlayDrawArgs args) + { + EmpQuery(args.Viewport.Eye); + return _blasts.Count > 0; + } + + protected override void Draw(in OverlayDrawArgs args) + { + if (ScreenTexture == null) + return; + + var worldHandle = args.WorldHandle; + var viewport = args.Viewport; + + foreach ((var shd, var instance) in _blasts.Values) + { + if (instance.CurrentMapCoords.MapId != args.MapId) + continue; + + // To be clear, this needs to use "inside-viewport" pixels. + // In other words, specifically NOT IViewportControl.WorldToScreen (which uses outer coordinates). + var tempCoords = viewport.WorldToLocal(instance.CurrentMapCoords.Position); + tempCoords.Y = viewport.Size.Y - tempCoords.Y; + shd?.SetParameter("renderScale", viewport.RenderScale); + shd?.SetParameter("positionInput", tempCoords); + shd?.SetParameter("range", instance.Range); + var life = (_gameTiming.RealTime - instance.Start).TotalSeconds / instance.Duration; + shd?.SetParameter("life", (float)life); + + // There's probably a very good reason not to do this. + // Oh well! + shd?.SetParameter("SCREEN_TEXTURE", viewport.RenderTarget.Texture); + + worldHandle.UseShader(shd); + worldHandle.DrawRect(Box2.CenteredAround(instance.CurrentMapCoords.Position, new Vector2(instance.Range, instance.Range) * 2f), Color.White); + } + + worldHandle.UseShader(null); + } + + //Queries all blasts on the map and either adds or removes them from the list of rendered blasts based on whether they should be drawn (in range? on the same z-level/map? blast entity still exists?) + private void EmpQuery(IEye? currentEye) + { + _transform ??= _entityManager.System(); + + if (currentEye == null) + { + _blasts.Clear(); + return; + } + + var currentEyeLoc = currentEye.Position; + + var blasts = _entityManager.EntityQueryEnumerator(); + //Add all blasts that are not added yet but qualify + while (blasts.MoveNext(out var blastEntity, out var blast)) + { + if (!_blasts.ContainsKey(blastEntity) && BlastQualifies(blastEntity, currentEyeLoc, blast)) + { + _blasts.Add( + blastEntity, + ( + _baseShader.Duplicate(), + new EmpShaderInstance( + _transform.GetMapCoordinates(blastEntity), + blast.VisualRange, + blast.StartTime, + blast.VisualDuration + ) + ) + ); + } + } + + var activeShaderIds = _blasts.Keys; + foreach (var blastEntity in activeShaderIds) //Remove all blasts that are added and no longer qualify + { + if (_entityManager.EntityExists(blastEntity) && + _entityManager.TryGetComponent(blastEntity, out EmpBlastComponent? blast) && + BlastQualifies(blastEntity, currentEyeLoc, blast)) + { + var shaderInstance = _blasts[blastEntity]; + shaderInstance.instance.CurrentMapCoords = _transform.GetMapCoordinates(blastEntity); + shaderInstance.instance.Range = blast.VisualRange; + } + else + { + _blasts[blastEntity].shd.Dispose(); + _blasts.Remove(blastEntity); + } + } + + } + + private bool BlastQualifies(EntityUid blastEntity, MapCoordinates currentEyeLoc, EmpBlastComponent blast) + { + var transformComponent = _entityManager.GetComponent(blastEntity); + var transformSystem = _entityManager.System(); + return transformComponent.MapID == currentEyeLoc.MapId + && transformSystem.InRange(transformComponent.Coordinates, transformSystem.ToCoordinates(transformComponent.ParentUid, currentEyeLoc), PvsDist + blast.VisualRange); + } + + private sealed record EmpShaderInstance(MapCoordinates CurrentMapCoords, float Range, TimeSpan Start, float Duration) + { + public MapCoordinates CurrentMapCoords = CurrentMapCoords; + public float Range = Range; + public TimeSpan Start = Start; + public float Duration = Duration; + }; + } +} + diff --git a/Content.Server/Emp/EmpSystem.cs b/Content.Server/Emp/EmpSystem.cs index ff6fe45b14c..538a9521561 100644 --- a/Content.Server/Emp/EmpSystem.cs +++ b/Content.Server/Emp/EmpSystem.cs @@ -10,6 +10,10 @@ using Content.Shared.Tiles; // Frontier using Robust.Server.GameObjects; using Robust.Shared.Map; +using Content.Shared._NF.Emp.Components; // Frontier +using Robust.Server.GameStates; // Frontier: EMP Blast PVS +using Robust.Shared.Configuration; // Frontier: EMP Blast PVS +using Robust.Shared; // Frontier: EMP Blast PVS namespace Content.Server.Emp; @@ -17,8 +21,10 @@ public sealed class EmpSystem : SharedEmpSystem { [Dependency] private readonly EntityLookupSystem _lookup = default!; [Dependency] private readonly TransformSystem _transform = default!; + [Dependency] private readonly PvsOverrideSystem _pvs = default!; // Frontier: EMP Blast PVS + [Dependency] private readonly IConfigurationManager _cfg = default!; // Frontier: EMP Blast PVS - public const string EmpPulseEffectPrototype = "EffectEmpPulse"; + public const string EmpPulseEffectPrototype = "EffectEmpBlast"; // Frontier: EffectEmpPulse public override void Initialize() { @@ -54,7 +60,15 @@ public void EmpPulse(MapCoordinates coordinates, float range, float energyConsum TryEmpEffects(uid, energyConsumption, duration); } - Spawn(EmpPulseEffectPrototype, coordinates); + + var empBlast = Spawn(EmpPulseEffectPrototype, coordinates); // Frontier: Added visual effect + EnsureComp(empBlast, out var empBlastComp); // Frontier + empBlastComp.VisualRange = range; // Frontier + + if (range > _cfg.GetCVar(CVars.NetMaxUpdateRange)) // Frontier + _pvs.AddGlobalOverride(empBlast); // Frontier + + Dirty(empBlast, empBlastComp); // Frontier } /// diff --git a/Content.Shared/_NF/Emp/Components/EmpBlastComponent.cs b/Content.Shared/_NF/Emp/Components/EmpBlastComponent.cs new file mode 100644 index 00000000000..ea58235bd61 --- /dev/null +++ b/Content.Shared/_NF/Emp/Components/EmpBlastComponent.cs @@ -0,0 +1,30 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared._NF.Emp.Components; + +/// +/// Create circle pulse animation of emp around object. +/// Drawn on client after creation only once per component lifetime. +/// +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState] +public sealed partial class EmpBlastComponent : Component +{ + /// + /// Timestamp when component was assigned to this entity. + /// + [AutoNetworkedField] + public TimeSpan StartTime; + + /// + /// How long will animation play in seconds. + /// Can be overridden by . + /// + [DataField, AutoNetworkedField] + public float VisualDuration = 1f; + + /// + /// The range of animation. + /// + [DataField, AutoNetworkedField] + public float VisualRange = 5f; +} diff --git a/Content.Shared/_NF/Emp/Systems/EmpBlastSystem.cs b/Content.Shared/_NF/Emp/Systems/EmpBlastSystem.cs new file mode 100644 index 00000000000..e5476ab693b --- /dev/null +++ b/Content.Shared/_NF/Emp/Systems/EmpBlastSystem.cs @@ -0,0 +1,27 @@ +using Content.Shared._NF.Emp.Components; +using Robust.Shared.Spawners; +using Robust.Shared.Timing; + +namespace Content.Shared._NF.Emp.Systems; + +public sealed class EmpBlastSystem : EntitySystem +{ + [Dependency] private readonly IGameTiming _timing = default!; + + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(OnStartup); + } + + private void OnStartup(EntityUid uid, EmpBlastComponent component, ComponentStartup args) + { + component.StartTime = _timing.RealTime; + + // try to get despawn time or keep default duration time + if (TryComp(uid, out var despawn)) + { + component.VisualDuration = despawn.Lifetime; + } + } +} diff --git a/Resources/Prototypes/_NF/Entities/Effects/emp.yml b/Resources/Prototypes/_NF/Entities/Effects/emp.yml new file mode 100644 index 00000000000..cf0eb140c94 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Effects/emp.yml @@ -0,0 +1,16 @@ +- type: entity + name: emp blast + id: EffectEmpBlast + description: Looking at this anomaly makes you feel an electric tingling all over your body. + categories: [ HideSpawnMenu ] + components: + - type: EmpBlast + - type: TimedDespawn + lifetime: 1 + - type: Tag + tags: + - HideContextMenu + - type: EmitSoundOnSpawn + sound: + path: /Audio/Effects/Lightning/lightningbolt.ogg + - type: AnimationPlayer \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Shaders/shaders.yml b/Resources/Prototypes/_NF/Shaders/shaders.yml new file mode 100644 index 00000000000..828a6a6d604 --- /dev/null +++ b/Resources/Prototypes/_NF/Shaders/shaders.yml @@ -0,0 +1,7 @@ +- type: shader + id: Emp + kind: source + path: "/Textures/_NF/Shaders/emp.swsl" + params: + positionInput: 0,0 + life: 0 \ No newline at end of file diff --git a/Resources/Textures/_NF/Shaders/emp.swsl b/Resources/Textures/_NF/Shaders/emp.swsl new file mode 100644 index 00000000000..12f177b99e8 --- /dev/null +++ b/Resources/Textures/_NF/Shaders/emp.swsl @@ -0,0 +1,99 @@ +// From https://godotshaders.com/snippet/2d-noise/ + +uniform sampler2D SCREEN_TEXTURE; +uniform highp vec2 positionInput; +uniform highp vec2 renderScale; +uniform highp float life; +uniform highp float range; + +highp vec2 random(highp vec2 uv){ + uv = vec2( dot(uv, vec2(127.1,311.7) ), + dot(uv, vec2(269.5,183.3) ) ); + return -1.0 + 2.0 * fract(sin(uv) * 43758.5453123); +} + +highp float noise(highp vec2 uv) { + highp vec2 uv_index = floor(uv); + highp vec2 uv_fract = fract(uv); + + highp vec2 blur = smoothstep(0.0, 1.0, uv_fract); + + return mix( mix( dot( random(uv_index + vec2(0.0,0.0) ), uv_fract - vec2(0.0,0.0) ), + dot( random(uv_index + vec2(1.0,0.0) ), uv_fract - vec2(1.0,0.0) ), blur.x), + mix( dot( random(uv_index + vec2(0.0,1.0) ), uv_fract - vec2(0.0,1.0) ), + dot( random(uv_index + vec2(1.0,1.0) ), uv_fract - vec2(1.0,1.0) ), blur.x), blur.y) * 0.5 + 0.5; +} + +highp float fbm(highp vec2 uv) { + const int octaves = 6; + highp float amplitude = 0.5; + highp float frequency = 3.0; + highp float value = 0.0; + + for(int i = 0; i < octaves; i++) { + value += amplitude * noise(frequency * uv); + amplitude *= 0.5; + frequency *= 2.0; + } + return value; +} + +void fragment() { + highp vec2 finalCoords = (FRAGCOORD.xy - positionInput) / (renderScale * 32.0); + highp float distanceToCenter = length(finalCoords); + highp float nlife = pow(sin(clamp(life, 0.0, 1.0) * 3.141592), 0.5); + highp float on = ((range - distanceToCenter) / range); + highp float n = on; + highp vec2 fcOffset = vec2(fbm(finalCoords.xy + life / 2.0),fbm(finalCoords.yx + life / 2.0)); + n *= fbm((finalCoords + fcOffset) / (nlife / (n * 1.5))) * 1.1; + n *= clamp(nlife, 0.0, 1.0); + highp float a = 0.0; // Alpha + highp float p = 0.0; // Position between L and R stops + lowp vec3 lCol = vec3(0.0); // Left stop color + lowp vec3 rCol = vec3(0.0); // Right stop color + + if (n <= 0.05) { + p = 0.0; + a = 0.0; + lCol = vec3(0.0); + rCol = vec3(0.0); + } else if (n < 0.132) { + p = (n - 0.05) / (0.132 - 0.05); + a = p; + lCol = vec3(0.0); + rCol = vec3(0.098, 0.112, 0.406); + } else if (n < 0.186) { + p = (n - 0.132) / (0.186 - 0.132); + a = 1.0; + lCol = vec3(0.098, 0.112, 0.406); + rCol = vec3(0.168, 0.288, 1.000); + } else if (n < 0.388) { + p = (n - 0.186) / (0.388 - 0.186); + a = 1.0; + lCol = vec3(0.168, 0.288, 1.000); + rCol = vec3(0.583, 0.640, 1.000); + } else if (n >= 0.388) { + p = (n - 0.388) / 0.5; + a = 1.0; + lCol = vec3(0.583, 0.640, 1.000); + rCol = vec3(1.000, 1.000, 1.000); + } + + p = clamp(p, 0.0, 1.0); + + highp vec4 warped = zTextureSpec(SCREEN_TEXTURE, (FRAGCOORD.xy*SCREEN_PIXEL_SIZE)+clamp(on*nlife*(fcOffset/8.0), 0.0, 1.0)); + + // Extremely hacky way to detect FoV cones + highp float osum = warped.r + warped.g + warped.b; + highp float osr = osum > 0.1 ? 1.0 : 10.0 * osum; + + // Apply overlay + // FYI: If you want a smoother mix, swap lCol and rCol. + warped += mix( + vec4(0.0), + vec4(mix(rCol, lCol, vec3(p)), a), + osr + ); + + COLOR = warped; +} \ No newline at end of file From 4ee1a0c899def66bee521f1c6f71285972b3cedb Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Fri, 18 Oct 2024 15:19:22 +0000 Subject: [PATCH 65/76] Automatic Changelog (#2262) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index fb5693ccf32..1bbafd2ab9c 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4741,3 +4741,9 @@ Entries: message: Modernize the Hospitaller id: 5428 time: '2024-10-18T13:07:14.0000000+00:00' +- author: dvir001 + changes: + - type: Tweak + message: EMP Pulse got a new visual look. + id: 5429 + time: '2024-10-18T15:18:56.0000000+00:00' From 25c6538b089eeaecd5481f705a1040df50cdc277 Mon Sep 17 00:00:00 2001 From: Whatstone <166147148+whatston3@users.noreply.github.com> Date: Fri, 18 Oct 2024 11:30:53 -0400 Subject: [PATCH 66/76] End of Round Cash Summary Revision (#2276) --- Content.Server/_NF/Bank/BankSystem.cs | 32 ++++- .../_NF/GameRule/NfAdventureRuleSystem.cs | 129 +++++++++++++++--- .../Locale/en-US/_NF/adventure/adventure.ftl | 12 +- .../round-end/round-end-summary-window.ftl | 5 +- 4 files changed, 152 insertions(+), 26 deletions(-) diff --git a/Content.Server/_NF/Bank/BankSystem.cs b/Content.Server/_NF/Bank/BankSystem.cs index 18c7670e181..7bcc1421225 100644 --- a/Content.Server/_NF/Bank/BankSystem.cs +++ b/Content.Server/_NF/Bank/BankSystem.cs @@ -208,11 +208,11 @@ public bool TryBankDeposit(ICommonSession session, PlayerPreferences prefs, Huma } /// - /// Attempts to add money to a character's bank account. This should always be used instead of attempting to modify the bankaccountcomponent directly + /// Retrieves a character's balance via its in-game entity, if it has one. /// /// The UID that the bank account is connected to, typically the player controlled mob - /// The amount of spesos to add into the bank account - /// true if the transaction was successful, false if it was not + /// When successful, contains the account balance in spesos. Otherwise, set to 0. + /// true if the account was successfully queried. public bool TryGetBalance(EntityUid ent, out int balance) { if (!_playerManager.TryGetSessionByEntity(ent, out var session) || @@ -234,6 +234,32 @@ public bool TryGetBalance(EntityUid ent, out int balance) return true; } + /// + /// Retrieves a character's balance via a player's session. + /// + /// The session of the player character to query. + /// When successful, contains the account balance in spesos. Otherwise, set to 0. + /// true if the account was successfully queried. + public bool TryGetBalance(ICommonSession session, out int balance) + { + if (!_prefsManager.TryGetCachedPreferences(session.UserId, out var prefs)) + { + _log.Info($"{session.UserId} has no cached prefs"); + balance = 0; + return false; + } + + if (prefs.SelectedCharacter is not HumanoidCharacterProfile profile) + { + _log.Info($"{session.UserId} has the wrong prefs type"); + balance = 0; + return false; + } + + balance = profile.BankBalance; + return true; + } + /// /// Update the bank balance to the character's current account balance. /// diff --git a/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs b/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs index c6b88987d95..475fe794447 100644 --- a/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs +++ b/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs @@ -7,7 +7,6 @@ using System.Threading.Tasks; using Content.Shared._NF.GameRule; using Content.Server.Procedural; -using Content.Shared.Bank.Components; using Content.Server._NF.GameTicking.Events; using Content.Shared.Procedural; using Robust.Server.GameObjects; @@ -30,9 +29,16 @@ using Robust.Shared.Configuration; using Robust.Shared.Physics.Components; using Content.Server.Shuttles.Components; +using Content.Shared._NF.Bank; using Content.Shared.Tiles; using Content.Server._NF.PublicTransit.Components; using Content.Server._NF.GameRule.Components; +using Content.Server.Bank; +using Robust.Shared.Player; +using Robust.Shared.Network; +using Content.Shared.GameTicking; +using Robust.Shared.Enums; +using Robust.Server.Player; namespace Content.Server._NF.GameRule; @@ -44,6 +50,7 @@ public sealed class NfAdventureRuleSystem : GameRuleSystem _players = new(); + private Dictionary _players = new(); private float _distanceOffset = 1f; private List _stationCoords = new(); @@ -67,23 +97,40 @@ public override void Initialize() { base.Initialize(); SubscribeLocalEvent(OnPlayerSpawningEvent); + SubscribeLocalEvent(OnPlayerDetachedEvent); + SubscribeLocalEvent(OnRoundRestart); + _playerManager.PlayerStatusChanged += PlayerManagerOnPlayerStatusChanged; } protected override void AppendRoundEndText(EntityUid uid, AdventureRuleComponent component, GameRuleComponent gameRule, ref RoundEndTextAppendEvent ev) { - var profitText = Loc.GetString($"adventure-mode-profit-text"); - var lossText = Loc.GetString($"adventure-mode-loss-text"); ev.AddLine(Loc.GetString("adventure-list-start")); var allScore = new List>(); - foreach (var player in _players) + foreach (var (player, playerInfo) in _players) { - if (!TryComp(player.Item1, out var bank) || !TryComp(player.Item1, out var meta)) + var endBalance = playerInfo.EndBalance; + if (_bank.TryGetBalance(player, out var bankBalance)) + { + endBalance = bankBalance; + } + + // Check if endBalance is valid (non-negative) + if (endBalance < 0) continue; - var profit = bank.Balance - player.Item2; - ev.AddLine($"- {meta.EntityName} {profitText} {profit} Spesos"); - allScore.Add(new Tuple(meta.EntityName, profit)); + var profit = endBalance - playerInfo.StartBalance; + string summaryText; + if (profit < 0) + { + summaryText = Loc.GetString("adventure-mode-list-loss", ("amount", BankSystemExtensions.ToSpesoString(-profit))); + } + else + { + summaryText = Loc.GetString("adventure-mode-list-profit", ("amount", BankSystemExtensions.ToSpesoString(profit))); + } + ev.AddLine($"- {playerInfo.Name} {summaryText}"); + allScore.Add(new Tuple(playerInfo.Name, profit)); } if (!(allScore.Count >= 1)) @@ -93,20 +140,27 @@ protected override void AppendRoundEndText(EntityUid uid, AdventureRuleComponent relayText += '\n'; var highScore = allScore.OrderByDescending(h => h.Item2).ToList(); - for (var i = 0; i < 10 && i < highScore.Count; i++) + for (var i = 0; i < 10 && highScore.Count > 0; i++) { - relayText += $"{highScore.First().Item1} {profitText} {highScore.First().Item2} Spesos"; + if (highScore.First().Item2 < 0) + break; + var profitText = Loc.GetString("adventure-mode-top-profit", ("amount", BankSystemExtensions.ToSpesoString(highScore.First().Item2))); + relayText += $"{highScore.First().Item1} {profitText}"; relayText += '\n'; - highScore.Remove(highScore.First()); + highScore.RemoveAt(0); } + relayText += '\n'; // Extra line separating the relayText += Loc.GetString("adventure-list-low"); relayText += '\n'; highScore.Reverse(); - for (var i = 0; i < 10 && i < highScore.Count; i++) + for (var i = 0; i < 10 && highScore.Count > 0; i++) { - relayText += $"{highScore.First().Item1} {lossText} {highScore.First().Item2} Spesos"; + if (highScore.First().Item2 > 0) + break; + var lossText = Loc.GetString("adventure-mode-top-loss", ("amount", BankSystemExtensions.ToSpesoString(-highScore.First().Item2))); + relayText += $"{highScore.First().Item1} {lossText}"; relayText += '\n'; - highScore.Remove(highScore.First()); + highScore.RemoveAt(0); } ReportRound(relayText); } @@ -115,11 +169,52 @@ private void OnPlayerSpawningEvent(PlayerSpawnCompleteEvent ev) { if (ev.Player.AttachedEntity is { Valid: true } mobUid) { - _players.Add((mobUid, ev.Profile.BankBalance)); EnsureComp(mobUid); + + // Store player info with the bank balance - we have it directly, and BankSystem won't have a cache yet. + if (!_players.ContainsKey(mobUid)) + _players[mobUid] = new PlayerRoundBankInformation(ev.Profile.BankBalance, MetaData(mobUid).EntityName, ev.Player.UserId); } } + private void OnPlayerDetachedEvent(PlayerDetachedEvent ev) + { + if (ev.Entity is not { Valid: true } mobUid) + return; + + if (_players.ContainsKey(mobUid)) + { + if (_players[mobUid].UserId == ev.Player.UserId && + _bank.TryGetBalance(ev.Player, out var bankBalance)) + { + _players[mobUid].EndBalance = bankBalance; + } + } + } + + private void PlayerManagerOnPlayerStatusChanged(object? _, SessionStatusEventArgs e) + { + // Treat all disconnections as being possibly final. + if (e.NewStatus != SessionStatus.Disconnected || + e.Session.AttachedEntity == null) + return; + + var mobUid = e.Session.AttachedEntity.Value; + if (_players.ContainsKey(mobUid)) + { + if (_players[mobUid].UserId == e.Session.UserId && + _bank.TryGetBalance(e.Session, out var bankBalance)) + { + _players[mobUid].EndBalance = bankBalance; + } + } + } + + private void OnRoundRestart(RoundRestartCleanupEvent ev) + { + _players.Clear(); + } + protected override void Started(EntityUid uid, AdventureRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args) { _mapId = GameTicker.DefaultMap; @@ -439,7 +534,7 @@ private void AddStationCoordsToSet(Vector2 coords) _stationCoords.Add(coords); } - private async Task ReportRound(String message, int color = 0x77DDE7) + private async Task ReportRound(String message, int color = 0x77DDE7) { Logger.InfoS("discord", message); String webhookUrl = _configurationManager.GetCVar(CCVars.DiscordLeaderboardWebhook); diff --git a/Resources/Locale/en-US/_NF/adventure/adventure.ftl b/Resources/Locale/en-US/_NF/adventure/adventure.ftl index c65acd137c1..4930e8675b3 100644 --- a/Resources/Locale/en-US/_NF/adventure/adventure.ftl +++ b/Resources/Locale/en-US/_NF/adventure/adventure.ftl @@ -1,9 +1,11 @@ ## UI -adventure-list-start = NT Galactic Bank -adventure-mode-profit-text = made a total profit of: {" "} -adventure-mode-loss-text = lost a total of: {" "} -adventure-list-high = Today's Top Earners: -adventure-list-low = Today's Biggest Spenders: +adventure-list-start = [color=gold]NT Galactic Bank[/color] +adventure-mode-list-profit = made a total profit of [color=#d19e5e]{$amount}[/color]. +adventure-mode-list-loss = lost a total of [color=#659cc9]{$amount}[/color]. +adventure-mode-top-profit = made a total profit of {$amount}. +adventure-mode-top-loss = lost a total of {$amount}. +adventure-list-high = This Shift's Top Earners: +adventure-list-low = This Shift's Biggest Spenders: adventure-title = New Frontier Adventure Mode adventure-description = Join a ship crew or buy your own and explore, research, salvage, or haul your way to riches! currency = Spesos diff --git a/Resources/Locale/en-US/round-end/round-end-summary-window.ftl b/Resources/Locale/en-US/round-end/round-end-summary-window.ftl index 58d26319b32..11f88052265 100644 --- a/Resources/Locale/en-US/round-end/round-end-summary-window.ftl +++ b/Resources/Locale/en-US/round-end/round-end-summary-window.ftl @@ -2,7 +2,10 @@ round-end-summary-window-title = Round End Summary round-end-summary-window-round-end-summary-tab-title = Round Information round-end-summary-window-player-manifest-tab-title = Player Manifest round-end-summary-window-round-id-label = Round [color=white]#{$roundId}[/color] has ended. -round-end-summary-window-gamemode-name-label = The game mode was [color=white]{$gamemode}[/color]. +# Frontier +round-end-summary-window-gamemode-name-label = {""} +# round-end-summary-window-gamemode-name-label = The game mode was [color=white]{$gamemode}[/color]. +# End Frontier round-end-summary-window-duration-label = It lasted for [color=yellow]{$hours} hours, {$minutes} minutes, and {$seconds} seconds. round-end-summary-window-player-info-if-observer-text = [color=gray]{$playerOOCName}[/color] was [color=lightblue]{$playerICName}[/color], an observer. round-end-summary-window-player-info-if-not-observer-text = [color=gray]{$playerOOCName}[/color] was [color={$icNameColor}]{$playerICName}[/color] playing role of [color=orange]{$playerRole}[/color]. From f71965e1d97e907273559a308562c45579995255 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Fri, 18 Oct 2024 15:31:22 +0000 Subject: [PATCH 67/76] Automatic Changelog (#2276) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 1bbafd2ab9c..8db832daa3d 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4747,3 +4747,9 @@ Entries: message: EMP Pulse got a new visual look. id: 5429 time: '2024-10-18T15:18:56.0000000+00:00' +- author: whatston3 + changes: + - type: Fix + message: Values reported in the end of round screen are accurate again. + id: 5430 + time: '2024-10-18T15:30:54.0000000+00:00' From d71b576b1872335235e191e0e2c661b680b0b822 Mon Sep 17 00:00:00 2001 From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Date: Fri, 18 Oct 2024 19:47:21 +0300 Subject: [PATCH 68/76] Wall freezers (#2190) * wall freezers * construction * clean up yml, more sprites * small fixes * Update storage.yml --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Dvir --- .../Fills/Lockers/locker_wallmount.yml | 22 +++++ .../StorageFillTemplates/safety_gear.yml | 44 +++++++++ .../Storage/Closets/wall_lockers.yml | 92 +++++++++++++++++- .../Entities/Structures/Wallmounts/shelfs.yml | 80 +++++++++++++++ .../Construction/Graphs/furniture/shelfs.yml | 92 ++++++++++++++++++ .../_NF/Recipes/Construction/storage.yml | 35 +++++++ .../Service/wall_fridge.rsi/base.png | Bin 0 -> 362 bytes .../Service/wall_fridge.rsi/closed.png | Bin 0 -> 362 bytes .../Service/wall_fridge.rsi/food-0.png | Bin 0 -> 108 bytes .../Service/wall_fridge.rsi/food-1.png | Bin 0 -> 228 bytes .../Service/wall_fridge.rsi/food-2.png | Bin 0 -> 336 bytes .../Service/wall_fridge.rsi/food-3.png | Bin 0 -> 397 bytes .../Service/wall_fridge.rsi/food-4.png | Bin 0 -> 455 bytes .../Service/wall_fridge.rsi/food-5.png | Bin 0 -> 517 bytes .../Service/wall_fridge.rsi/food-6.png | Bin 0 -> 581 bytes .../Service/wall_fridge.rsi/food-7.png | Bin 0 -> 610 bytes .../Service/wall_fridge.rsi/food-8.png | Bin 0 -> 645 bytes .../Service/wall_fridge.rsi/food-9.png | Bin 0 -> 688 bytes .../Service/wall_fridge.rsi/locked.png | Bin 0 -> 126 bytes .../Service/wall_fridge.rsi/meta.json | 56 +++++++++++ .../Service/wall_fridge.rsi/open.png | Bin 0 -> 405 bytes .../Service/wall_fridge.rsi/unlocked.png | Bin 0 -> 135 bytes .../door-decal-l1-fire.png | Bin 0 -> 173 bytes .../door-decal-l2-rad.png | Bin 0 -> 196 bytes .../door-decal-l3-bio.png | Bin 0 -> 210 bytes .../door-decal-l4-expl.png | Bin 0 -> 131 bytes .../Storage/wall_locker_color.rsi/meta.json | 12 +++ 27 files changed, 432 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/_NF/Catalog/Fills/StorageFillTemplates/safety_gear.yml create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Wallmounts/shelfs.yml create mode 100644 Resources/Prototypes/_NF/Recipes/Construction/Graphs/furniture/shelfs.yml create mode 100644 Resources/Prototypes/_NF/Recipes/Construction/storage.yml create mode 100644 Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/base.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/closed.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-0.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-1.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-2.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-3.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-4.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-5.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-6.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-7.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-8.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-9.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/locked.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/meta.json create mode 100644 Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/open.png create mode 100644 Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/unlocked.png create mode 100644 Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-l1-fire.png create mode 100644 Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-l2-rad.png create mode 100644 Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-l3-bio.png create mode 100644 Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-l4-expl.png diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/locker_wallmount.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/locker_wallmount.yml index 40cf1b55762..3443361ac59 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/locker_wallmount.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/locker_wallmount.yml @@ -203,6 +203,28 @@ suffix: Filled, Random # endregion +# region Safety gear +- type: entity + parent: [ LockerWallColorL1Fire, StorageFillL1FireSuit ] + id: LockerWallColorL1FireFilled + suffix: Frontier, Filled + +- type: entity + parent: [ LockerWallColorL2Radiation, StorageFillL2RadiationSuit ] + id: LockerWallColorL2RadiationFilled + suffix: Frontier, Filled + +- type: entity + parent: [ LockerWallColorL3Biohazard, StorageFillL3BiohazardSuit ] + id: LockerWallColorL3BiohazardFilled + suffix: Frontier, Filled + +- type: entity + parent: [ LockerWallColorL4Bomb, StorageFillL4BombSuit ] + id: LockerWallColorL4BombFilled + suffix: Frontier, Filled +# endregion + # region Medical - type: entity id: LockerWallColorMedicalDoctorFilled diff --git a/Resources/Prototypes/_NF/Catalog/Fills/StorageFillTemplates/safety_gear.yml b/Resources/Prototypes/_NF/Catalog/Fills/StorageFillTemplates/safety_gear.yml new file mode 100644 index 00000000000..7064984813a --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/Fills/StorageFillTemplates/safety_gear.yml @@ -0,0 +1,44 @@ + +- type: entity + abstract: true + id: StorageFillL1FireSuit + components: + - type: StorageFill + contents: + - id: ClothingOuterSuitFire + - id: ClothingHeadHelmetFire + - id: FireExtinguisher + - id: ClothingMaskGas + - id: CrowbarRed + - id: DoubleEmergencyAirTankFilled + +- type: entity + abstract: true + id: StorageFillL2RadiationSuit + components: + - type: StorageFill + contents: + - id: ClothingOuterSuitRad + - id: GeigerCounter + +- type: entity + abstract: true + id: StorageFillL3BiohazardSuit + components: + - type: StorageFill + contents: + - id: ClothingOuterBioGeneral + - id: ClothingHeadHatHoodBioGeneral + - id: DoubleEmergencyAirTankFilled + +- type: entity + abstract: true + id: StorageFillL4BombSuit + components: + - type: StorageFill + contents: + - id: ClothingOuterSuitBomb + - id: ClothingHeadHelmetBombSuit + - id: Multitool + - id: Screwdriver + - id: Wirecutter diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/wall_lockers.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/wall_lockers.yml index 1a4fc2f4700..d4294207472 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/wall_lockers.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/wall_lockers.yml @@ -182,6 +182,96 @@ - state: locked map: ["enum.LockVisualLayers.Lock"] +# Safety equipment: radiation protection, boihazard etc. +- type: entity + categories: [ HideSpawnMenu ] # debloat spawn menu + id: LockerWallColorL1Fire + parent: LockerWallColorBase + name: L1 fire suit wall locker + components: + - type: Sprite + layers: + - state: base + map: ["enum.StorageVisualLayers.Base"] + color: "#c82d2d" + - state: door + map: ["enum.StorageVisualLayers.Door"] + color: "#c82d2d" + - state: door-decal-l1-fire + map: [ decal1 ] + - state: welded + visible: false + map: ["enum.WeldableLayers.BaseWelded"] + - state: locked + map: ["enum.LockVisualLayers.Lock"] + +- type: entity + categories: [ HideSpawnMenu ] # debloat spawn menu + id: LockerWallColorL2Radiation + parent: LockerWallColorBase + name: L2 radiation suit wall locker + components: + - type: Sprite + layers: + - state: base + map: ["enum.StorageVisualLayers.Base"] + color: "#ead152" + - state: door + map: ["enum.StorageVisualLayers.Door"] + color: "#ead152" + - state: door-decal-l2-rad + map: [ decal1 ] + color: "#202020" + - state: welded + visible: false + map: ["enum.WeldableLayers.BaseWelded"] + - state: locked + map: ["enum.LockVisualLayers.Lock"] + +- type: entity + categories: [ HideSpawnMenu ] # debloat spawn menu + id: LockerWallColorL3Biohazard + parent: LockerWallColorBase + name: L3 biohazard suit wall locker + components: + - type: Sprite + layers: + - state: base + map: ["enum.StorageVisualLayers.Base"] + color: "#7c2900" + - state: door + map: ["enum.StorageVisualLayers.Door"] + color: "#7c2900" + - state: door-decal-l3-bio + map: [ decal1 ] + - state: welded + visible: false + map: ["enum.WeldableLayers.BaseWelded"] + - state: locked + map: ["enum.LockVisualLayers.Lock"] + +- type: entity + categories: [ HideSpawnMenu ] # debloat spawn menu + id: LockerWallColorL4Bomb + parent: LockerWallColorBase + name: L4 bomb suit wall locker + components: + - type: Sprite + layers: + - state: base + map: ["enum.StorageVisualLayers.Base"] + color: "#3a493e" + - state: door + map: ["enum.StorageVisualLayers.Door"] + color: "#3a493e" + - state: door-decal-l4-expl + map: [ decal1 ] + - state: welded + visible: false + map: ["enum.WeldableLayers.BaseWelded"] + - state: locked + map: ["enum.LockVisualLayers.Lock"] + # Other: Chemistry wall locker - type: entity id: LockerWallChemistry @@ -223,4 +313,4 @@ - type: EntityStorageVisuals stateBaseClosed: o2n2 stateDoorOpen: o2n2_open - stateDoorClosed: o2n2_door \ No newline at end of file + stateDoorClosed: o2n2_door diff --git a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/shelfs.yml b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/shelfs.yml new file mode 100644 index 00000000000..b5a434776fe --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/shelfs.yml @@ -0,0 +1,80 @@ +# Wall freezers +- type: entity + id: ShelfWallFreezerWhite + parent: ShelfBaseReinforced + name: wall freezer + description: A convenient place to store perishables. + suffix: Frontier, White + components: + - type: ExplosionResistance + damageCoefficient: 0.50 + - type: AntiRottingContainer + - type: Sprite + sprite: _NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi + layers: + - state: base + map: ["enum.StorageVisualLayers.Base"] + - state: food-0 + map: ["enum.StorageFillLayers.Fill"] + - state: closed + map: ["enum.StorageVisualLayers.Door"] + - state: locked + map: ["enum.LockVisualLayers.Lock"] + shader: unshaded + - type: StorageFillVisualizer + maxFillLevels: 10 + fillBaseName: food + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 330 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - !type:SpawnEntitiesBehavior + spawn: + SheetPlasteel1: + min: 0 + max: 3 + SheetPlastic1: + min: 0 + max: 3 + ShardGlass: + min: 0 + max: 3 + - !type:DoActsBehavior + acts: ["Destruction"] + - type: Storage + grid: + - 0,0,5,1 + - 0,3,5,4 + - 0,6,5,6 + maxItemSize: Normal + - type: Construction + graph: WallFreezer + node: ShelfWallFreezerWhite + +- type: entity + id: ShelfWallFreezerDark + parent: ShelfWallFreezerWhite + name: wall freezer + suffix: Frontier, Dark + components: + - type: Sprite + layers: + - state: base + map: ["enum.StorageVisualLayers.Base"] + color: "#909090" + - state: food-0 + map: ["enum.StorageFillLayers.Fill"] + - state: closed + map: ["enum.StorageVisualLayers.Door"] + color: "#909090" + - state: locked + map: ["enum.LockVisualLayers.Lock"] + shader: unshaded + - type: Construction + graph: WallFreezer + node: ShelfWallFreezerDark diff --git a/Resources/Prototypes/_NF/Recipes/Construction/Graphs/furniture/shelfs.yml b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/furniture/shelfs.yml new file mode 100644 index 00000000000..683cd44bb83 --- /dev/null +++ b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/furniture/shelfs.yml @@ -0,0 +1,92 @@ +- type: constructionGraph + id: WallFreezer + start: start + graph: + - node: start + actions: + - !type:DeleteEntity {} + edges: + +# White wall freezer + - to: ShelfWallFreezerWhite + completed: + - !type:SnapToGrid + steps: + - material: Plasteel + amount: 5 + doAfter: 3 + - material: Glass + amount: 5 + doAfter: 2 + - material: Plastic + amount: 5 + doAfter: 2 + - material: Cable + amount: 3 + doAfter: 1 +# White wall freezer deconstructs + - node: ShelfWallFreezerWhite + entity: ShelfWallFreezerWhite + edges: + - to: start + completed: + - !type:EmptyAllContainers + - !type:SpawnPrototype + prototype: SheetPlasteel1 + amount: 5 + - !type:SpawnPrototype + prototype: SheetPlastic1 + amount: 5 + - !type:SpawnPrototype + prototype: SheetGlass1 + amount: 5 + - !type:SpawnPrototype + prototype: CableApcStack1 + amount: 3 + steps: + - tool: Screwing + doAfter: 2 + - tool: Welding + doAfter: 5 + +# Dark wall freezer + - to: ShelfWallFreezerDark + completed: + - !type:SnapToGrid + steps: + - material: Plasteel + amount: 5 + doAfter: 3 + - material: Glass + amount: 5 + doAfter: 2 + - material: Plastic + amount: 5 + doAfter: 2 + - material: Cable + amount: 3 + doAfter: 1 +# Dark wall freezer deconstructs + - node: ShelfWallFreezerDark + entity: ShelfWallFreezerDark + edges: + - to: start + completed: + - !type:EmptyAllContainers + - !type:SpawnPrototype + prototype: SheetPlasteel1 + amount: 5 + - !type:SpawnPrototype + prototype: SheetPlastic1 + amount: 5 + - !type:SpawnPrototype + prototype: SheetGlass1 + amount: 5 + - !type:SpawnPrototype + prototype: CableApcStack1 + amount: 3 + steps: + - tool: Screwing + doAfter: 2 + - tool: Welding + doAfter: 5 diff --git a/Resources/Prototypes/_NF/Recipes/Construction/storage.yml b/Resources/Prototypes/_NF/Recipes/Construction/storage.yml new file mode 100644 index 00000000000..c16120819d8 --- /dev/null +++ b/Resources/Prototypes/_NF/Recipes/Construction/storage.yml @@ -0,0 +1,35 @@ +# Shelfs +## Wall freezers +- type: construction + id: ShelfWallFreezerWhite + name: wall freezer (white) + description: A convenient place to store perishables. + hide: true # TODO: Need freezer board added + graph: WallFreezer + startNode: start + targetNode: ShelfWallFreezerWhite + icon: + sprite: _NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi + state: base + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: true + conditions: + - !type:WallmountCondition + +- type: construction + id: ShelfWallFreezerDark + name: wall freezer (dark) + description: A convenient place to store perishables. + hide: true # TODO: Need freezer board added + graph: WallFreezer + startNode: start + targetNode: ShelfWallFreezerDark + icon: + sprite: _NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi + state: base + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: true + conditions: + - !type:WallmountCondition diff --git a/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/base.png b/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..7d22a147f227247630c38264b3c17ee7b13a6e18 GIT binary patch literal 362 zcmV-w0hRuVP)Px$BuPX;R9J=WmO*NSFcgOW7D3!NigO9Kf@kmq9>Y!N9Mg@bn7Z^Bu3QO%H!zT7 zElgL!Oy{LZ)3GA;-1}QKvtf~rvbEN>F{{x30K%VEy^-2K%5S(LV4348N zo9DO?4|CHreTUZz%p0U>ss&MLnnqjmYDIoxRu|B=000Eh-#-=bJZ~|9ZL}bcV=H*u zw)O(Iw_MkCRst03Yqrq>uDOmE7jRv7F@bHgAW0G{c;ENW5g3NSO28zmp8+F*Fbvlf zsOx$ifkO~z0VYo}Yk@4wv;w~kDKIjIkITgf@RMixo;_4P0js-Mu6aj|D*ylh07*qo IM6N<$f`USlmjD0& literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/closed.png b/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/closed.png new file mode 100644 index 0000000000000000000000000000000000000000..40dfdbea23ad20e6547927ba590fae160290524f GIT binary patch literal 362 zcmV-w0hRuVP)Px$BuPX;R9J=Wl|71uFdW2(Ww({shaA95tW~aIAF#I(-r^l>y^4JfkPDNQ%Cem5x}JPc7KAlZC~!Is)8}bC18v>W#CW(j4?3AUbJNgjl zkb$o2004d8JMGp4(llLZwcq@Gs=6k_mn^>bP0l+XkK DN_QQ_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-1.png b/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-1.png new file mode 100644 index 0000000000000000000000000000000000000000..571f875b97915ecd2913f4ff21661ecd4f604b9d GIT binary patch literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}^E_P~Ln2y} z6C_v{Cy4Zv9Pn6kD1GwUf1f!%7~Aas-{H9Toz}%)9E@s7BCIP<{rmstpYq}9{PGWL zvMd`~C0rHl)=QYp7fjjl^_TVG+2->l^i&EA4MKvCGrF`MSj)YMXP@GC$!|Yuk}EE1 z92MC9T)#9&UF=P~`RDoxt8`@E$D2>i3Unw*a@uyqP-AXZXMsphQ=kEt+d&Pma~K#( X>I^SzRS@z6x|G4w)z4*}Q$iB}0{K;P literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-2.png b/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-2.png new file mode 100644 index 0000000000000000000000000000000000000000..bb07b32c137bf0293248169a0a96df95d890f62f GIT binary patch literal 336 zcmV-W0k8gvP)Px$3Q0skR9J=W(y>YdK@fo9e?<@_8nqJRfg-`qROCxwX?9b6C^%^)uGRD zAeIKM@S1>;G-)CdP@+K(B?b~KbgZH%g3~)6OtG`Gv%|7rjQQ`Jw(#z7QBtF6?&~+q z?N`<3{?e~0^0S__pIhJ7;nl4JD9n#YW_B2W(s_g91ScXmr<+kVKtA`t>BShe$1X|o zLS<_R_TXqeBaQ1e6X^i}b~dM(I(w4J?hGhjw@*`4t9Y#B>lAYxng^3?6yE?S#T{0c z$7!}+DPJbU^)3Zi^0(b@ i`Ja2n7-NhvM&kowBW8lfA~`ew0000Px$M@d9MR9J=W)4fZ=K^({N_b-Gl(4C6!|=EDcIt5RJwrQd&9wT z7pdC{mQ^6RWQR4_nsZ6^yhyLJ6@Zn+0s2FCl3X1G#n)|7DM}^XO#9P>y=8J6eJq4) z0K}qYW~REy036w8vi(_{khZK9+9UD^#JgL3^bAnyQEqLTdjwOLW;5ZQuDrHBlRHKhj%#K rOArc|K85o;O?v_T8#GPRwBLFG4&{b#5sQl600000NkvXXu0mjfgeSHu literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-4.png b/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-4.png new file mode 100644 index 0000000000000000000000000000000000000000..2dbeaa9ecbae892eca4c98a71f54b3bea4507df5 GIT binary patch literal 455 zcmV;&0XY7NP)Px$fk{L`R9J=Wlg}%|VI0R_U(~YvzW6aK63d07QVtGogyp7ib8sRzrTG^)EnFOw z(n?OU+QCu^?IM{_0W{RR^glmCvPn|LwP zDg`CQT%MfbnB3F8_Y-+KNzQt^+~0*i>^+BP27s%nNNjb50BmiXGp8^_1jEqlQLBNz z&TCe;O9|dQqEv*ykQF9iw$~=-NB2||TL2gttf6}SRs!R-pgG+foupvEPFLRv-p&WE zrm7h5#sS#!KhWJ###Q)Sn(^JvikTuZgJMzlgsCEOX9r8C=gf6`|^3* zA|l$gwZ)Wp6rkNXY@|E?9QzYw)NM8`sU^Zx5|)gH!pVIicCb_~@_ei>05X`s;;2O~ zjvNGUa#2bV7_xFaabTQzZ4!$?Uc8)8BuI0AGPx$zez+vR9J=Wlg&$;K@f+ZSB12x*6KxV4A>S8MbO>^L5c?v!J-ClLYrF;1qJaS z2%`Q09uy0~Dx#-?1k{rl$iW~8RbB-tNl~F?|LrpF_u@jb-6~Uz=czDiKQ0b)AC*bpnyV#ks zfX^#Qf1{BpJrx%g@OecN@05J zY;=W;Ex$ufPa)$hkNtR<@|MKi$*{lGM*8kBA6v61s2X75YZRsaNNwb0dukBvCF9Ia zE;Hv(TpP~Y(5muP?br%X2CSO1p7NU%aevfcVPRomao79?NKU?WXKNhy00000NkvXX Hu0mjfBxmn# literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-6.png b/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-6.png new file mode 100644 index 0000000000000000000000000000000000000000..84d226da6fe59976881184e603875a66bccc5077 GIT binary patch literal 581 zcmV-L0=oT)P)Px$|4BqaR9J=Wl}$)gQ5462PmQTbeHnz+G+>Dh5oo(Wh-eWJ7}nq}sM)m$9EgZY z5NlD;A}}c!tcY3#F;K0ylWbd+MfXFM{Rnq;Tx0^s8LI`;IB zOZ@U)(CBcPj(}v`%c-_Bk(Md4H+FL_vS7ysVpFsp-%i$=WpGFl8=QtM-+38RI;Hi9 zhC||S@Y*XH4$0EkX`@oQ4lk}~I3yynR!JLeGc7&znE!&YT5P5GzribCnSIMlPqP%B zos`7QgL-{l11%E*bk;ov7Duu;VcGkiIf>`BBJ;z)B}(gC9c{fY*34F1oAU(sT_uz9 zk<68&lp-E*Gu)9dMj{@Wn}dplS|$ofn$8xrYHM}iZo7-}v0fguSF!8JJ>GuGqf}|k z9v!%3o6x=gDSa=7=#LbCG3IJ$sXTPz$$Ov?_z>?4G_5odf9)h_sl0tBB<804vS-$O z4cD&x`7N~z1h02Xy;*X8$};J`72J>(YyFG>(x0Px%97#k$R9J=Wl~G7jQ5eU6SBxVGZAc+C$)jU=U&r zNvxNshk~SFSQ7OV#GrZ-2YYA)Ldq?O+Cm43Yq*Q^ZgaD%c6u0H6*oOWFV+3Qc{um` z?sxv@yZ?_178Vx&JBn;#VxUD-Z+G%7{uNK(N9p%Aqe>>p+vpbAw7zB^{4!;V=x?eO zt^+jyjJ}!Xk%l6KKv6c=DJ7u2b%xjP>WHNZXj%r<=YZZ~Z19{*OiyIl<+K6Nd9i`L zBeO#7-UkvLu85>;b1_lj-6GiMgP&26%Gc35MrZ}CemhFedq~qhf*$9D*kWq%2Q$9GBMC1 zGS5zn=*`1&eck{m69V)#3;`=6nVZwi{jZ$p^Lil`Cx1(n)VDg`_CV+h+puj-b9w(Y z5)&R`sY*0WL-jeB?2Rf@A(t==s9LUPE)%2qd`_yiR0r;M*{GZuaef5)I|KXlOUz?)}4TGZb`3s zrZ3jv?^%D#p?lXwVZor&fBVmQz~9rML{oN_41*=ZAeyq5JRBgK$rMFjy(HxUsh<%* w{Bsh0XDtA;sbtx_e10DC^Ri_vEG#Ve2~(cw94dCpl>h($07*qoM6N<$g5>8G0RR91 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-8.png b/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-8.png new file mode 100644 index 0000000000000000000000000000000000000000..51c250940abdc05a669e8eb40a73ab06d69aec9b GIT binary patch literal 645 zcmV;00($+4P)Px%KS@MER9J=Wl}$(#VHn4MqlUTpkwIu}3s%??fp#hoB059_h9%yD+C$($P>`@T zNvuOrhr*;_u_Wpg#6oov7xvH+7%E#3wHqoVZi_SSI=edB==OG48kPKbgD%zl;61$W z^UU-9=b8V*fQ^mK|BfP?80)SPgHX=_ZslL)B(n)>A-v4>r646;z zES!6b02p{Z!9xv22!Wz(tW!!rL+vE521|*mb7)$Mu*U)I*;vmRrS*14q0et2e{+(S zJ(r1%xQVK{XqraY<6yKsqKpTe!ZaZ-Q^s^EO7+v# literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-9.png b/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-9.png new file mode 100644 index 0000000000000000000000000000000000000000..5a9003d4c51c3fd0b9f04fac9f4cf8cb1195a857 GIT binary patch literal 688 zcmV;h0#E&kP)Px%YDq*vR9J=Wl}kueQ5eU6H;rjb#|J&kNzlS10&NjlK}2mr$O>sAflUz1Vn9K{ z8X}VxSuJ|fW3WVO8&b9?QE-t2#S~K%H3K@5_`rLeaYkp<>*#4Q_#(|CxG1Zj|}7FdLJdkO#_-u3cCLlHutD9Y*xICX50*Y0$D>KK|9#$!vOWIBS$TE)bh zM*w7|ngDQ|$zf}2KzPpQ0xYXQN`TLkP1#vL#XVVM=4Me|KSbaDGU)Ed-x0-8o`Jh- zg5J&%x--mRp5|4DCX-r@_9mAo&C8x0?M*H*KXy_{7PUolqrJ%`gpg~E1vBl#5G}20&^Vf*u-f0EmmP}4drQiRH{F?8I&0Z(=YzpHZw9x2suITC4$Zo93 zX#nOdIXWDgod?u-ap#dch{>)MoeNTG51n`*LgVW(tqW4Q?IL}h`S{cXG)==}OQP$N zSLtc93SEc9sm%Bx7pL3RkKZ)wBs2q zFFw=SHu^_nE`^lJ-A5b000qETPm8T^F-QEjPLNVrchebWJ>aaiD_+%1OxKC&I$qUG?^`=2YZalPC_z;vG!zA3 zBpi;5zHm;e2c-T50REo?gf?0L2&e-T?Q_u6-A_QZ;Ko8gjTeqaBM^; WXBW7AI-EQJ0000Px$Pf0{UR9J=WRFX2P@68Hr~SsBTU)Qqe^*i0w8 zARx3dkV@qyqce9W`y@Z$z=8h`BT153QV7wV&u2r&AdcgX5HiqkU01EioUst1qm=4+ z0{|$cN^goE1n3)6N)d&jc7P}hA@!z$n9^9Ll|KOhwQcPH)V7u0<$6U~mIL1Go6C)F zrxU8GLff|50i+%P1VI4b_lE(bc@PBfJZ}}l-(a$Yd%~O}(lp&Az~l+s@*IxifOD>G zkY(9ZesBV}JO}Vy!ZpA-SGtPy_@jE#mIlMrG=Vc0Ro zM#k^1t2GZwjgKVh`rmzC4W)CN`UB*F16$w=Q(>p#(HABI00000NkvXXu0mjfzYMIQ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/unlocked.png b/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/unlocked.png new file mode 100644 index 0000000000000000000000000000000000000000..41aca59c4e12fa71c33d5cdc1235fa6c46ea7058 GIT binary patch literal 135 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}j-D=#ArY-_ z&mH7sP~dUCC?j(y_La=L3*O)NU$JUd==gBoQe`3o!w=6T(MxV`X5JezG0xojwr7Q& hy!mlP1_qT(W(Fp1*0f(`8-Ru}c)I$ztaD0e0ss!;Dpvpi literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-l1-fire.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-l1-fire.png new file mode 100644 index 0000000000000000000000000000000000000000..5ab962f68c8dac1b6ee1abe7a9ccf61d1d166481 GIT binary patch literal 173 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}>7Fi*ArY-_ zuR3xaFyLTu2>vzY@Bi*^`Y%^1oLssnf!TUHOH(#qmYR}~Ls8w%?j1(`n~z>*WazoZ zAnGLhL!aH?T5+nu#QN0|4(mV2tk98jEBeLocJU6SBX=VC>hS<-q t{4za*X~Ry=8AmLO7>cuZ3Oo{*xqT_{%k04Rtw5JBc)I$ztaD0e0stc|M^pd+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-l3-bio.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-l3-bio.png new file mode 100644 index 0000000000000000000000000000000000000000..ff2387db1b9413d416c04cc897a606c1733b35fe GIT binary patch literal 210 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}J)SO(ArY-_ zr+RZ8P~dS%ei``eANvQLgR5`23N{5~{kfv|Y^})(B6G#tQ>IC5xZzX1dD{;D6~?lr8~3ttDBj-5U^*#f^V#`Rq=4>X@O1Ta JS?83{1OV{bQxX6G literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-l4-expl.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-l4-expl.png new file mode 100644 index 0000000000000000000000000000000000000000..7fbf33e4050efec3dc0a396f6366d5613b24a61b GIT binary patch literal 131 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}ww^AIArY-_ zFK*;zFyLTzobuQGi{27 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/meta.json b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/meta.json index 95b67b2cbda..acccdbc8c54 100644 --- a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/meta.json +++ b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/meta.json @@ -76,6 +76,18 @@ { "name": "door-decal-fuel-ame" }, + { + "name": "door-decal-l1-fire" + }, + { + "name": "door-decal-l2-rad" + }, + { + "name": "door-decal-l3-bio" + }, + { + "name": "door-decal-l4-expl" + }, { "name": "door-decal-null" } From ee8517718c764d4dcec16eed71795b5848e3d02e Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Fri, 18 Oct 2024 16:47:57 +0000 Subject: [PATCH 69/76] Automatic Changelog (#2190) --- Resources/Changelog/Frontier.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 8db832daa3d..82e4fa91c4c 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4753,3 +4753,13 @@ Entries: message: Values reported in the end of round screen are accurate again. id: 5430 time: '2024-10-18T15:30:54.0000000+00:00' +- author: erhardsteinhauer + changes: + - type: Add + message: Added wall freezers. + - type: Add + message: >- + Added wall lockers with safety gear (fire suits/radiation suits/biohaz + suits/bomb suits). + id: 5431 + time: '2024-10-18T16:47:22.0000000+00:00' From 6f9845a4f98b91997b2077bf1d3501ff553e1190 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Sat, 19 Oct 2024 01:47:58 +0300 Subject: [PATCH 70/76] Lathe Cleanup and allow printing boxes in service (#2278) * Cleanup * Added boxes --- Resources/Locale/en-US/_NF/lathe/recipes.ftl | 12 + .../Consumable/Food/Containers/box.yml | 2 +- .../Entities/Structures/Machines/lathe.yml | 5 + .../Entities/Structures/Machines/lathe.yml | 441 ----------- Resources/Prototypes/Recipes/Lathes/sheet.yml | 2 + .../Consumable/Food/Containers/box.yml | 78 +- .../Entities/Structures/Machines/lathe.yml | 696 ++++++++++++++---- .../Prototypes/_NF/Recipes/Lathes/service.yml | 4 +- .../Prototypes/_NF/Recipes/Lathes/sheet.yml | 9 + .../Prototypes/_NF/Recipes/Lathes/storage.yml | 100 +++ 10 files changed, 755 insertions(+), 594 deletions(-) delete mode 100644 Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml diff --git a/Resources/Locale/en-US/_NF/lathe/recipes.ftl b/Resources/Locale/en-US/_NF/lathe/recipes.ftl index 87a786e1450..bf08e3ef3b3 100644 --- a/Resources/Locale/en-US/_NF/lathe/recipes.ftl +++ b/Resources/Locale/en-US/_NF/lathe/recipes.ftl @@ -10,3 +10,15 @@ lathe-recipe-WeaponCaseLong-name = weapon case (empty) lathe-recipe-WeaponCaseHeavy-name = weapon case (heavy, empty) lathe-recipe-WeaponCaseShortAmmo-name = ammo case (small, empty) lathe-recipe-WeaponCaseShortExplosives-name = explosives case (small, empty) + +# Cardboard +lathe-recipe-NFHappyHonkMimeEmpty-name = happy honk meal (empty) +lathe-recipe-NFHappyHonkEmpty-name = happy honk meal (empty) +lathe-recipe-NFHappyHonkMcCargoEmpty-name = mccargo meal (empty) +lathe-recipe-NFHappyHonkCluwneEmpty-name = woeful cluwne meal (empty) +lathe-recipe-NFHappyHonkNukieEmpty-name = robust nukie meal (empty) +lathe-recipe-NFFoodBoxPizza-name = pizza box (empty) +lathe-recipe-NFFoodBoxDonutEmpty-name = donut box (empty) +lathe-recipe-NFFoodBoxNuggetEmpty-name = chicken nuggets (empty) +lathe-recipe-NFFoodContainerEggEmpty-name = egg carton (empty) +lathe-recipe-NFBoxMREEmpty-name = M.R.E. (empty) \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml index ed4060c8281..cdfd894e5a4 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml @@ -578,7 +578,7 @@ - type: entity id: HappyHonkNukie - parent: [HappyHonk, BaseC3SyndicateContraband] # Frontier: BaseSyndicateContraband Date: Fri, 18 Oct 2024 22:48:22 +0000 Subject: [PATCH 71/76] Automatic Changelog (#2278) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 82e4fa91c4c..059381f799f 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4763,3 +4763,9 @@ Entries: suits/bomb suits). id: 5431 time: '2024-10-18T16:47:22.0000000+00:00' +- author: dvir001 + changes: + - type: Add + message: 'You can now print some empty cardboard boxes in service techfab. ' + id: 5432 + time: '2024-10-18T22:47:58.0000000+00:00' From 89a1aa527d871f4b45d12eb4128fe1d860ed2fa1 Mon Sep 17 00:00:00 2001 From: dustylens <54123313+dustylens@users.noreply.github.com> Date: Sat, 19 Oct 2024 13:11:46 +0000 Subject: [PATCH 72/76] Adds some spookuary cheer from Bing and Ghost Prince. (#2256) Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Whatstone --- Content.Server/Holiday/HolidaySystem.cs | 2 + .../Markers/Spawners/Random/paintings.yml | 34 +++++++++ .../Structures/Wallmounts/Signs/paintings.yml | 20 +++++ .../Signs/paintings_directional.yml | 43 ++++++++++- .../wallmount_decorations_graphs.yml | 71 ++++++++++++++++++ .../Construction/wallmount_decorations.yml | 45 +++++++++++ Resources/Prototypes/holidays.yml | 1 + .../Wallmounts/paintings.rsi/meta.json | 53 ++++++++++++- .../Wallmounts/paintings.rsi/painting1.png | Bin 0 -> 3177 bytes .../Wallmounts/paintings.rsi/painting2.png | Bin 0 -> 1691 bytes .../paintings_directional.rsi/meta.json | 43 ++++++----- .../painting_bat.png | Bin 0 -> 973 bytes .../painting_ghost.png | Bin 0 -> 1021 bytes .../painting_pumpkin.png | Bin 0 -> 1378 bytes 14 files changed, 285 insertions(+), 27 deletions(-) create mode 100644 Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/paintings.yml create mode 100644 Resources/Prototypes/_NF/Recipes/Construction/Graphs/furniture/wallmount_decorations_graphs.yml create mode 100644 Resources/Prototypes/_NF/Recipes/Construction/wallmount_decorations.yml create mode 100644 Resources/Textures/_NF/Structures/Wallmounts/paintings.rsi/painting1.png create mode 100644 Resources/Textures/_NF/Structures/Wallmounts/paintings.rsi/painting2.png create mode 100644 Resources/Textures/_NF/Structures/Wallmounts/paintings_directional.rsi/painting_bat.png create mode 100644 Resources/Textures/_NF/Structures/Wallmounts/paintings_directional.rsi/painting_ghost.png create mode 100644 Resources/Textures/_NF/Structures/Wallmounts/paintings_directional.rsi/painting_pumpkin.png diff --git a/Content.Server/Holiday/HolidaySystem.cs b/Content.Server/Holiday/HolidaySystem.cs index c9356d8af03..1f8bfd72487 100644 --- a/Content.Server/Holiday/HolidaySystem.cs +++ b/Content.Server/Holiday/HolidaySystem.cs @@ -118,6 +118,7 @@ private void OnVisualsInit(Entity ent, ref ComponentIni } } + // Frontier: holiday-themed entity replacement private void OnBeforeRead(BeforeEntityReadEvent ev) { foreach (var holiday in _currentHolidays) @@ -131,6 +132,7 @@ private void OnBeforeRead(BeforeEntityReadEvent ev) } } } + // End Frontier } /// diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/paintings.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/paintings.yml new file mode 100644 index 00000000000..ec4eb76f09d --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/paintings.yml @@ -0,0 +1,34 @@ +- type: entity + parent: RandomPainting + id: RandomPaintingHalloween + suffix: Halloween + components: + - type: RandomSpawner + offset: 0 + prototypes: + - PaintingPersistenceOfMemory + - PaintingTheSonOfMan + - PaintingTheKiss + - PaintingTheScream + - PaintingTheGreatWave + - PaintingCafeTerraceAtNight + - PaintingNightHawks + - PaintingSkeletonCigarette + - PaintingPrayerHands + - PaintingOldGuitarist + - PaintingOlympia + - PaintingSaturn + - PaintingSleepingGypsy + - PaintingRedBlueYellow + - PaintingHelloWorld + - PaintingNightOfThePostGoblin + # Special halloween posters + - PaintingSpookyIan + - PaintingSpookyLady + chance: 1 + rarePrototypes: + - PaintingSkeletonBoof + - PaintingEmpty + - PaintingMoony + - PaintingAmogusTriptych + rareChance: 0.01 diff --git a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/paintings.yml b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/paintings.yml index 648ab10f9b2..0e42a96231e 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/paintings.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/paintings.yml @@ -7,3 +7,23 @@ - type: Sprite sprite: _NF/Structures/Wallmounts/paintings.rsi state: painting0 + +- type: entity + parent: PaintingBase + id: PaintingSpookyIan + name: Duty Without End + description: Their vigil is eternal. + components: + - type: Sprite + sprite: _NF/Structures/Wallmounts/paintings.rsi + state: painting1 + +- type: entity + parent: PaintingBase + id: PaintingSpookyLady + name: The Lady and the Banners + description: A woman stands invitingly before a castle of ominous portent. How the windows beckon! How your gaze is arrested! + components: + - type: Sprite + sprite: _NF/Structures/Wallmounts/paintings.rsi + state: painting2 diff --git a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/paintings_directional.yml b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/paintings_directional.yml index 213de41cf6a..8cd022d60ab 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/paintings_directional.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/paintings_directional.yml @@ -10,7 +10,46 @@ parent: PaintingDirectionalBase id: PaintingFireaxeCabinet name: The Fireaxe Cabinet - description: "Painting is a masterfully designed image of a fireaxe cabinet. The artwork relates to the loss of the masterwork ☼fireaxe☼ in the early winter of 2523. Oil. Canvas. Tears." + description: "This painting is a masterfully designed image of a fireaxe cabinet. The artwork relates to the loss of the masterwork ☼fireaxe☼ in the early winter of 2523. Oil. Canvas. Tears." components: - type: Sprite - state: painting_fireaxe \ No newline at end of file + state: painting_fireaxe + +- type: entity + parent: PaintingDirectionalBase + id: PaintingGhostHanging + name: festive ghost streamers + description: "Decorative wall streamers! They look like the people you've lost to the void!" + components: + - type: Sprite + drawdepth: Overdoors + state: painting_ghost + - type: Construction + graph: PaintingGhostHangingGraph + node: PaintingGhostHangingNode + +- type: entity + parent: PaintingDirectionalBase + id: PaintingBatHanging + name: festive bat streamers + description: "Decorative wall streamers! Bats are scary and also important pollinators!" + components: + - type: Sprite + drawdepth: Overdoors + state: painting_bat + - type: Construction + graph: PaintingBatHangingGraph + node: PaintingBatHangingNode + +- type: entity + parent: PaintingDirectionalBase + id: PaintingPumpkinHanging + name: festive pumpkin streamers + description: "Decorative wall streamers! It's decorative gourd season!" + components: + - type: Sprite + drawdepth: Overdoors + state: painting_pumpkin + - type: Construction + graph: PaintingPumpkinHangingGraph + node: PaintingPumpkinHangingNode diff --git a/Resources/Prototypes/_NF/Recipes/Construction/Graphs/furniture/wallmount_decorations_graphs.yml b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/furniture/wallmount_decorations_graphs.yml new file mode 100644 index 00000000000..744e8f406df --- /dev/null +++ b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/furniture/wallmount_decorations_graphs.yml @@ -0,0 +1,71 @@ +- type: constructionGraph + id: PaintingGhostHangingGraph + start: start + graph: + - node: start + actions: + - !type:DestroyEntity { } + edges: + - to: PaintingGhostHangingNode + completed: + - !type:SnapToGrid { } + steps: + - material: Paper + amount: 1 + doAfter: 2 + + - node: PaintingGhostHangingNode + entity: PaintingGhostHanging + edges: + - to: start + steps: + - tool: Cutting + doAfter: 2 + +- type: constructionGraph + id: PaintingBatHangingGraph + start: start + graph: + - node: start + actions: + - !type:DestroyEntity { } + edges: + - to: PaintingBatHangingNode + completed: + - !type:SnapToGrid { } + steps: + - material: Paper + amount: 1 + doAfter: 2 + + - node: PaintingBatHangingNode + entity: PaintingBatHanging + edges: + - to: start + steps: + - tool: Cutting + doAfter: 2 + +- type: constructionGraph + id: PaintingPumpkinHangingGraph + start: start + graph: + - node: start + actions: + - !type:DestroyEntity { } + edges: + - to: PaintingPumpkinHangingNode + completed: + - !type:SnapToGrid { } + steps: + - material: Paper + amount: 1 + doAfter: 2 + + - node: PaintingPumpkinHangingNode + entity: PaintingPumpkinHanging + edges: + - to: start + steps: + - tool: Cutting + doAfter: 2 diff --git a/Resources/Prototypes/_NF/Recipes/Construction/wallmount_decorations.yml b/Resources/Prototypes/_NF/Recipes/Construction/wallmount_decorations.yml new file mode 100644 index 00000000000..b9af2a1b090 --- /dev/null +++ b/Resources/Prototypes/_NF/Recipes/Construction/wallmount_decorations.yml @@ -0,0 +1,45 @@ +- type: construction + name: festive ghost streamers + id: PaintingGhostHangingConstruction + graph: PaintingGhostHangingGraph + startNode: start + targetNode: PaintingGhostHangingNode + category: construction-category-misc + description: Decorative wall streamers! They look like the people you've lost to the void! + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: true + icon: + sprite: _NF/Structures/Wallmounts/paintings_directional.rsi + state: painting_ghost + +- type: construction + name: festive bat streamers + id: PaintingBatHangingConstruction + graph: PaintingBatHangingGraph + startNode: start + targetNode: PaintingBatHangingNode + category: construction-category-misc + description: Decorative wall streamers! Bats are scary and also important pollinators! + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: true + icon: + sprite: _NF/Structures/Wallmounts/paintings_directional.rsi + state: painting_bat + +- type: construction + name: festive pumpkin streamers + id: PaintingPumpkinHangingConstruction + graph: PaintingPumpkinHangingGraph + startNode: start + targetNode: PaintingPumpkinHangingNode + category: construction-category-misc + description: Decorative wall streamers! It's decorative gourd season! + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: true + icon: + sprite: _NF/Structures/Wallmounts/paintings_directional.rsi + state: painting_pumpkin + diff --git a/Resources/Prototypes/holidays.yml b/Resources/Prototypes/holidays.yml index dbe404e1967..a7a01536bc5 100644 --- a/Resources/Prototypes/holidays.yml +++ b/Resources/Prototypes/holidays.yml @@ -332,6 +332,7 @@ entityReplacements: # Frontier KitchenDeepFryer: KitchenDeepFryerCauldron # Frontier KitchenDeepFryerPOI: KitchenDeepFryerCauldronPOI # Frontier + RandomPainting: RandomPaintingHalloween # Frontier - type: holiday id: VeganDay diff --git a/Resources/Textures/_NF/Structures/Wallmounts/paintings.rsi/meta.json b/Resources/Textures/_NF/Structures/Wallmounts/paintings.rsi/meta.json index 7133af24636..c76a5af5577 100644 --- a/Resources/Textures/_NF/Structures/Wallmounts/paintings.rsi/meta.json +++ b/Resources/Textures/_NF/Structures/Wallmounts/paintings.rsi/meta.json @@ -1,12 +1,59 @@ { "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Created by erhardsteinhauer, gentlebutter & ghostprince", + "license": "CC-BY-NC-SA-4.0", + "copyright": "Created by erhardsteinhauer, gentlebutter & ghostprince, painting1 by gentlebutter, painting2 by ghostprince", "size": { "x": 32, "y": 32 }, "states": [ - { "name": "painting0" } + { "name": "painting0" }, + { + "name": "painting1", + "delays": [ + [ + 300.0, + 0.1, + 0.1, + 0.1, + 0.15, + 0.35, + 0.1, + 0.1 + ] + ] + }, + { + "name": "painting2", + "delays": [ + [ + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 1.00, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25, + 1.00, + 0.25, + 0.25, + 0.25, + 0.25, + 0.25 + ] + ] + } ] } diff --git a/Resources/Textures/_NF/Structures/Wallmounts/paintings.rsi/painting1.png b/Resources/Textures/_NF/Structures/Wallmounts/paintings.rsi/painting1.png new file mode 100644 index 0000000000000000000000000000000000000000..a080ec08b174e27e1e57ba81ad6b6cfe4fc4dfde GIT binary patch literal 3177 zcmV-v43_hWP)Px>2}wjjRCt{2oqKQ<)g8w__vQfvg3$y*(nwxt2pAzGJTw)80!2##0@5O*G}RQa zt$#=>*xDJj4B$V`bm}Obj6MNZ-0n|3?g5`|U9NuJ@;2Y*+x*D#eU9Aa>ZjE)RlU(I{uvZ{G(j7(YXEq$ zKF{!kZX0&i@Ozst@*CabHNO)Cx90YekD|~_A0)v*Un7!BOzlF5ghU%GJPm@v;fDR6v z&@ZFizH2K|_0Jg$T%Z?$UWUgw<&)T$ecI9q*nExSnlzt)8v!>lQQ|FK*4TJTlP^V_ zA8MI3f3Gvzl=-d7toi$#(eyc^85S*G|4FF{+&4LRekALkW&kh?mNaJ0!^9Vq%Il#p zfz3DKtBn_*Tg33p0(m_YLBI-M-Y)dZOE{%xe3v6iUcxEK_>vOx7ZR5{TV4-E5HM0G z>!0NSpad&5dD;v>j6zmV!sc7yYqz**8QFlC1wi({W*FVz%z&q+ldT!zwmfTkaz^w93@=1g$9k%%rU%S;^mfAw$+4hY_@K8U7XQ{?2SM@lG|n9k~rTgXX_;=#N`9?VN*^$f90 zD9j(O`seo-)r&aKO+2GoZ`=E#X1R^or`d8k4G_CCjJiQ=z7}8Gbjwm(RO?-zzN=ZT zH2D&HE+vMXZ)#t!AP@*Yn0tKhAdnmYU#rC*fxx3h>SOC&{}nSF{N-p=!2EF6Kf?^b zAAD)yc$OB9SHW*fj+Z}6>But^8jUbEUzcxe{^?m`n4UF8W&X3VSsd<6;BaSxd^@ms zod51OD|{m@E=*%qMjW#;;sRnS6^QvuN@g;(Fq5f;nL+clT70GX&0hc2(+30MN231e z{=#P9W+a~kjlAFLzaP}*OML(4mvp!{g-chiisv=&P5}P4zmmh92{1f?yGD1gm^PXQ zZ!*PpM#VBX*kycviq?H`VHz#h`FBqd`=Z}I@Sz+8j-2bk85Io}_meB-&-}{Py`*F& z4b80pEG(J@K*g@TauE36G5_N)yrne1GKE)~-;AW|4{f~PYMvjd`ltGpr4&IAE(m>= z;7Z+^I1>E)05)IbJE8;}8okDX;3jDV%*{;!U|&x$@iYdOH`FkDFfbgBFf2MORLFnW8+$K|HZ%dBn z%a&`VPtN9>;k)@+rsoRo>q)1fxrGgnuTqu!^4vw$`qFvD0PO$h5bf##ZhoZ<0($0G z8bAAcV;OL{0OY^r%N7Grv3rj-xR>Yu3qAVnVVM4yb8YH`Ggqt4E*HJ4fjDx2@Q9hjS&!oHq#0MZTs!CaL763n4a=#B>Pl575+x#H5@@l?*hEbR|nSBR8 zw8WKKf3f8k^})SfGD^S9k2> z)g3#1_6@exRq`cC=8qI#&-{z-E%xx=+{vqNYVd<-^}WsS-THr5>Yrf-piDco?mMIi z6fW6(G3`&7vXILi9rAYBe4sL3#qK?F$_;R#snutjRX)JeOQuDXKLUYX9J2X;`shL~ zx3_!v_ZEBj3gcJo+AF900Oy-pe70GUGVKrc`k(pA`dENS)Ia@R0HKer?rzo}yGb*} zh(y{mwE1o}J#r77*Sfjf(Lr*OnA%Uz6Ni`$xLmyW+8e5UHazx-YW?@WEC-;v&ia6) z8_mZN#mk%5aJ8e8qo>Z0oFw*oOutj&_p#NBztM}o>B;N-+Imaq5eW1;qN$4=&H7{7 z*V@YUuWhs54H&8Vrx^ewxTMT&U(xxG%|7My1|I|~oA0Klua~DP_Q~6(j`^A`zxoB> zx!3OM@!T6qW(yS`;Mq5-}YvCnCl;m`9s0?CsPjrwcr4Wr5jA0#HFu{yMJuHzJ9)NGKY@Wu=EFWeIBxz zF+TSvQtnHjlqo9%1durS$iDy2tXe)7bNe=T&8E>U{^iRM*y%nQ}`|=Md=i zm(1VR9o!p};jDkU0pRuZKa|H98_DcRSk+MHKfkI7VGw5KPhrvAIfhTz^`tc4`Q{db zlG=KD$+R2F|LxN&nLoRT)ytNs%&(`s>@?MSRdtPQ{x8lqSYqGk>mMn;DgbCrArwj3 zd=J01twZ&&&7X`~TC?U;^2>^|n3+H2#_`MMF@Lsy14yc>uF?I@togr5*FRD+>;`=2 zz#&ryNi5yqvn><@A%;3%l3wduU3Xeuymh|0MP2}oe|GX)%hzlDtEy|{#amyTZ;%&& z%8!m(<_2^9-#gi%Q8IG;pa%jyv8|F<))t#Oh<6GSipoFK`2a_2PLO}QXNo7K(T>#^ z%su6$3r(#&m_Eq~htEEDFImmC4}!W*AD zmWvmyKZuj~TX%iJoI6HQsbhLc0s|rC&wuFGeE;5wys-IoW-QF5O2_n)x^Z%A%2=OK zfa$5pG+wkeLCU5rZvpV^Gb??r|L?X+1CZ1fdh)ITPByd=mphxDQ|h75-^BW7svGc$ zZIyoC4VPXPiJ34<-lm+V?9xHsp_*njRQcO0#aBP~*LGhwJ5+xDu{QtutG3Z;dEA+i zL_tOp?;Jj%YKg5HP{|kQr}Fc5-Lit>Ro~Yt#Vlb#PEv6E?fU`v@4+u{IijfgSDkKI zx5G*Q^}%+3eeY8MiVD(HnSj**AZgQVC!E{0YDFa^z&NzbK_ZS11PH7tfMSHJFmN45Dj-{wb_ z@6!tqiT_Y)B%5#ZZGPnV{|7_zF^w;YZ8HD>01jnXNoGw=04e|g00;m8000000Mb*F P00000NkvXXu0mjf+c$9h literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Wallmounts/paintings.rsi/painting2.png b/Resources/Textures/_NF/Structures/Wallmounts/paintings.rsi/painting2.png new file mode 100644 index 0000000000000000000000000000000000000000..ec7fb14acdc30db2823452801574aaa48c5b9bc4 GIT binary patch literal 1691 zcmb7CX;70_6ip05)rqlAW!F@lnifz%6jU@33sO`FA|M!%S|u5k1VmZo<3k+*u>!S- zqC!ByurH#7WguWI6osHHVG#&>2qYwgkU*9%4LYO#U|RcT-nnJS!=>poG`nVfxG5%HteRQS9evaS(vx=Cg(k2 zN#Cu|%4|RQ#QXcKq%*oXxA_$kR<|8d>=#0$hK>W=>RA>S!7NK?wWV@JdAuTAzZwY* zh#jlo+`}^ew^zd43UBvofx?9}>%rfu7sULd)qAgWth74jc|Uc#Rar1W+8fDBACr>l z@j?QH6Vmm{{~~k6~bt%EhQ;SdsENOVHalSEuMa-$O~a^|xtV52+D4+pSA4JWTZl z_{k+uZ#FKE5dCE|&pRCWD2j&MH4!dlr|TJx(peyp9;MDc4M}oWT`fJPy{{D;#q}eB zPFOypfAG)IB<*lAD@{ z8(D``idkCr;>ESR&?+a9+T?-Ez8n(vvd}(^cc+xYf|!L1ZKgh0wt=!~j;`7_I3d4X zk2*0tzT>YA+QD1p9gqI?|H$7lU$inOGY>`Lzi*2ShhrHnwpn7r{Tt&2zb--U7=28;=mAhB? z^?lcWidq!gcudn#$O1U{socdPPs;-@&UXTPgVC-6R6FVNG@_w1_R?IwB5V?y(ThG# zeYfyag*STI4LZWyWK!!3IyjVJ2W059iFk%LTGXav1q=nSN&F7ZMRcI@jm&U7v=N0dTkqH!bZ1o?C1~Uf6!shk1{yUJ;pzLHI#YUA~9onqR8yO0HGJ+lKK2F`y yEF@AXNBS^*CE=#fYUO9ozb-Q;;67;IKdRKR$s=TFJFjqFB%B;v?28WkdhH)FKb2qr literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Wallmounts/paintings_directional.rsi/meta.json b/Resources/Textures/_NF/Structures/Wallmounts/paintings_directional.rsi/meta.json index 62935ecab49..96f9158f39e 100644 --- a/Resources/Textures/_NF/Structures/Wallmounts/paintings_directional.rsi/meta.json +++ b/Resources/Textures/_NF/Structures/Wallmounts/paintings_directional.rsi/meta.json @@ -1,29 +1,28 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Created by erhardsteinhauer (discord) for NF in commemoration of removal fireaxe cabinet [filled] from NT Liquidator class service ship", + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-NC-SA-4.0", + "copyright": "Created by erhardsteinhauer (discord) for NF in commemoration of removal fireaxe cabinet [filled] from NT Liquidator class service ship, ghost, bat and pumpkin decorations by ghostprince", "states": [ { "name": "painting_fireaxe", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 + }, + { + "name": "painting_ghost", + "directions": 4 + }, + { + "name": "painting_bat", + "directions": 4 + }, + { + "name": "painting_pumpkin", + "directions": 4 } ] } + diff --git a/Resources/Textures/_NF/Structures/Wallmounts/paintings_directional.rsi/painting_bat.png b/Resources/Textures/_NF/Structures/Wallmounts/paintings_directional.rsi/painting_bat.png new file mode 100644 index 0000000000000000000000000000000000000000..e8725e24088f5db499f98c5b4d813e4ea96cb0bb GIT binary patch literal 973 zcmV;;12X)HP)EX>4Tx04R}tkv&MmKp2MKrj?3R94sQ@kfDl$1yK=4sbUcO$^z3+Xw`wkEq6{ebj2|(2> zBNdN{+1#oad_@QWngbY?i5< zwiY=8`nG|K>$WEE0hc?#;FB&Hk|X(P355dien#Jv1Nv`)o;9~`t#h0{02%7l@(pls z2#gjfd)?#R-JN~=x2DyqZ5>CtFnT3`q8WlpLTGjzG$n)B%p z&Zk4TTyG66%Z<4vFCzH26B9}69QPdn01V@#zGtq^TI~1-C~i(9{d^dwq0^Rmh1Z&+OQHD^MPoS!9oEolPnxoPs1YMquUJUW{DyHdZyxEpHqZ=^ z<_a7!8R9qAFfekBl6inc1JE7-V88nVyldnhvZ?j>ORHP#0W})uq&%oLL~7{zoFbaH z&;wKfYHWz2x@&8MU(s7jBjoB#4uXs4(G}5XSB;by2v1B((|zFm^6r5{v)t zl!*O9wRm95Y>SwpK?YyhhZo*aBr6nsEX>4Tx04R}tkv&MmKp2MKrj?3R94sQ@kfDl$1yK=4sbUcO$^z3+Xw`wkEq6{ebj2|(2> zBNdN{+1#oad_@QWngbY?i5< zwiY=8`nG|K>$WEE0hc?#;FB&Hk|X(P355dien#Jv1Nv`)o;9~`t#h0{02%7l@(pls z2#gjfd)?#R-JN~=x2DyfBb zoYd*=3$8;yKL3y?TZV{y03BLKh(H2?9OmFjw?sLxjctqxK&4Wtl#G;8mN++oBnToR z06-_kS*VZGE5?|_G^RQy3rNWG^&&el%JcOi)#qHsjLp0PP2bA5m(${fVG{85{<&+V zju(OBqizofTFp0%Wh=}qZde(_i(ocV1H<)Qm)~Jf<3a-VqZY0++Q(|?; zrf($xEMhezu5DwcWVaxk3$!${1xA0LZf@h%R$ZM(~j}`-_pg!Z9Zt67#MT(xit@xI&Dq?;HYpWf<#r zHWXc!t;$cwxvJw@8HUQ`l?2tQYM4ZFgt4=Wl|BNgTUC zITS;_GS))Kl^j-|DEb^gxXQfxfdnNz7PqLLAR^ND0YTd}=WTC`+7yM_6rHI}(Y$wY!UGT&00000NkvXXu0mjfzUtmb literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Wallmounts/paintings_directional.rsi/painting_pumpkin.png b/Resources/Textures/_NF/Structures/Wallmounts/paintings_directional.rsi/painting_pumpkin.png new file mode 100644 index 0000000000000000000000000000000000000000..eba45843a580ae56ec7407c877ff473a9c0d520d GIT binary patch literal 1378 zcmV-o1)chdP)EX>4Tx04R}tkv&MmKp2MKrj?3R94sQ@kfDl$1yK=4sbUcO$^z3+Xw`wkEq6{ebj2|(2> zBNdN{+1#oad_@QWngbY?i5< zwiY=8`nG|K>$WEE0hc?#;FB&Hk|X(P355dien#Jv1Nv`)o;9~`t#h0{02%7l@(pls z2#gjfd)?#R-JN~=x2DyyYX-%VW%IEhz6~ZvjAo=O&CdZkbm-9G zH{;uU82LS&4UB8-xv*v1bGHU6a!un2&Jm08iVwE&Iy$ogGxD(vs$hnku=l z8@JRF$EAO7N85VnRS&Uu?{Z_$Mb5w$kCVOoZOnbH4nYiX;a0oNo!;o} z|2Z!+76@>IZ9^I~NuR*GMS2z<0oPa`&SJnNVJq)D*L1;okfsVZ+(dp946v2k=q-4z z7kh<`-ky9WYN}|k&JKzpd)e43`B5x@4>~(28nW0cXBL^LsR|u?^1Dka+Z1Ja!bWca z1<%?E&`7R<-dIH3gbCX6!AFldkZoE zes@W(E6R50(4j+gc*NV$Ws^7KVo99!d;mc?cAH?5!)T8ou`65j8Y9cxc^x0Yg@!hu zmt(_?k|D1z>T}iu7&J)3kKg00>K+>|;(5RG<`JdIko>{R=dKVYv#1zB{irXKAYWUr zlmT+J*w?#92CRn1?9#=6%CpRSfP!P`=(xZ-AQ^CW)_2b?@nX8mbag%NN7?nEUUk#m zV0zd`Atraoq9=eL*C!Fw9_KTwt@5&o0rK|er59RPsO$?!7h*FY7RU`*p&kQjQCLQX zvCyC3y;R5eMu^=jTwOm-5Q{g^%W=^iZen~Rs@S(~TgSmpewqY6wVR{qY+xqoD2mY7 z4t;fYgN-QO8x+)Q6Y?nD?EJ@ytKR{S=msA)6b8cje?gZZBf-U9VTJZDKO3@8BaIK~ zCaL=yK1(!|#0MN#tUrRCxLjV8(07*qoM6N<$f}Z4-LjV8( literal 0 HcmV?d00001 From 8295e91e28f4c63c3a6a99359b66a3296a8d4608 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Sat, 19 Oct 2024 13:12:17 +0000 Subject: [PATCH 73/76] Automatic Changelog (#2256) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 059381f799f..bd13811abc5 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4769,3 +4769,9 @@ Entries: message: 'You can now print some empty cardboard boxes in service techfab. ' id: 5432 time: '2024-10-18T22:47:58.0000000+00:00' +- author: dustylens + changes: + - type: Add + message: Seasonal decorations. What fun. + id: 5433 + time: '2024-10-19T13:11:46.0000000+00:00' From 4c861d79a224cdd7053bddda5b80f365b025ae95 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Sat, 19 Oct 2024 16:23:30 +0300 Subject: [PATCH 74/76] Gatfruit again (#2286) * Actual waste of my time making this PR yet again, holy shit * Update CartridgeLoaderSystem.cs --- .../Entities/Objects/Consumable/Food/produce.yml | 14 ++++++++------ .../Objects/Specific/Hydroponics/seeds.yml | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index c2fc1b0eb11..08a3200db26 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -1764,10 +1764,10 @@ food: maxVol: 10 reagents: - - ReagentId: Nutriment - Quantity: 5 +# - ReagentId: Nutriment # Frontier +# Quantity: 5 # Frontier - ReagentId: Sulfur - Quantity: 5 + Quantity: 10 # Frontier: 5<10 - type: Sprite sprite: Objects/Specific/Hydroponics/gatfruit.rsi - type: Produce @@ -1782,6 +1782,7 @@ entries: Taco: Gatfruit Burger: GatfruitBurger + - type: BadFood # Frontier: Nope - type: entity name: capfruit @@ -1797,10 +1798,10 @@ food: maxVol: 10 reagents: - - ReagentId: Nutriment - Quantity: 5 +# - ReagentId: Nutriment # Frontier +# Quantity: 5 # Frontier - ReagentId: Sulfur - Quantity: 5 + Quantity: 10 # Frontier: 5<10 - type: Sprite sprite: Objects/Specific/Hydroponics/capfruit.rsi - type: Produce @@ -1815,6 +1816,7 @@ entries: Taco: Capfruit Burger: CapfruitBurger + - type: BadFood # Frontier: Nope - type: entity name: capfruit diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml index 542692aaf06..398e234b66a 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -502,7 +502,7 @@ sprite: Objects/Specific/Hydroponics/fly_amanita.rsi - type: entity - parent: [SeedBase, BaseC3SyndicateContraband] # Frontier: BaseSyndicateContraband Date: Sat, 19 Oct 2024 17:17:57 +0300 Subject: [PATCH 75/76] fix cards.yml --- .../Prototypes/EstacaoPirata/Entities/Objects/Misc/cards.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Resources/Prototypes/EstacaoPirata/Entities/Objects/Misc/cards.yml b/Resources/Prototypes/EstacaoPirata/Entities/Objects/Misc/cards.yml index 884fbd655aa..6e7ebbfe6d0 100644 --- a/Resources/Prototypes/EstacaoPirata/Entities/Objects/Misc/cards.yml +++ b/Resources/Prototypes/EstacaoPirata/Entities/Objects/Misc/cards.yml @@ -34,7 +34,6 @@ # Frontier: base stack for card stack component - type: entity parent: [BaseItem, RecyclableItemNoMats] # Frontier: added RecyclableItemNoMats - parent: BaseItem id: CardStackBase name: stack of cards abstract: true @@ -786,4 +785,4 @@ sprite: EstacaoPirata/Objects/Misc/cards.rsi state: black_joker -# endregion Black Deck \ No newline at end of file +# endregion Black Deck From c5a088d360cf028ed57ab1d7a379f9a137606516 Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Sat, 19 Oct 2024 18:46:46 +0300 Subject: [PATCH 76/76] more fixes --- .../_NF/Entities/Clothing/base_contraband_clothing.yml | 6 ------ ...{faction_clothing_base.yml => base_faction_clothing.yml} | 0 2 files changed, 6 deletions(-) delete mode 100644 Resources/Prototypes/_NF/Entities/Clothing/base_contraband_clothing.yml rename Resources/Prototypes/_NF/Entities/Clothing/{faction_clothing_base.yml => base_faction_clothing.yml} (100%) diff --git a/Resources/Prototypes/_NF/Entities/Clothing/base_contraband_clothing.yml b/Resources/Prototypes/_NF/Entities/Clothing/base_contraband_clothing.yml deleted file mode 100644 index 06f26324753..00000000000 --- a/Resources/Prototypes/_NF/Entities/Clothing/base_contraband_clothing.yml +++ /dev/null @@ -1,6 +0,0 @@ -- type: entity - id: ContrabandClothing - abstract: true - components: - - type: FactionClothing - faction: ContrabandClothing diff --git a/Resources/Prototypes/_NF/Entities/Clothing/faction_clothing_base.yml b/Resources/Prototypes/_NF/Entities/Clothing/base_faction_clothing.yml similarity index 100% rename from Resources/Prototypes/_NF/Entities/Clothing/faction_clothing_base.yml rename to Resources/Prototypes/_NF/Entities/Clothing/base_faction_clothing.yml