From e298aacd250cf48d03de4021abe62afe6ac2bcf4 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Fri, 3 Jan 2025 00:06:53 +0200 Subject: [PATCH 01/41] Bluespace fire extinguisher (DeltaV #2171) (#2444) * bluespace fire extinguisher (#2171) 5 minute coding adventure * How Its Made * Update industrial.yml --------- Co-authored-by: Milon --- .../Objects/Misc/fire_extinguisher.yml | 32 +++++++++++++++ .../DeltaV/Recipes/Lathes/tools.yml | 10 +++++ .../Entities/Structures/Machines/lathe.yml | 5 ++- Resources/Prototypes/Research/industrial.yml | 1 + .../Entities/Structures/Machines/lathe.yml | 4 +- .../fire_extinguisher_closed.png | Bin 0 -> 422 bytes .../fire_extinguisher_open.png | Bin 0 -> 475 bytes .../inhand-left.png | Bin 0 -> 467 bytes .../inhand-right.png | Bin 0 -> 453 bytes .../fire_extinguisher_bluespace.rsi/meta.json | 37 ++++++++++++++++++ 10 files changed, 86 insertions(+), 3 deletions(-) create mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Misc/fire_extinguisher.yml create mode 100644 Resources/Prototypes/DeltaV/Recipes/Lathes/tools.yml create mode 100644 Resources/Textures/DeltaV/Objects/Misc/fire_extinguisher_bluespace.rsi/fire_extinguisher_closed.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/fire_extinguisher_bluespace.rsi/fire_extinguisher_open.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/fire_extinguisher_bluespace.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/fire_extinguisher_bluespace.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/fire_extinguisher_bluespace.rsi/meta.json diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/fire_extinguisher.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/fire_extinguisher.yml new file mode 100644 index 00000000000..34891b04514 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/fire_extinguisher.yml @@ -0,0 +1,32 @@ +- type: entity + name: bluespace fire extinguisher + parent: FireExtinguisher + id: FireExtinguisherBluespace + description: An experimental fire extinguisher that uses bluespace technology to gradually refill itself. The faint blue glow is only slightly disconcerting. + components: + - type: Sprite + sprite: DeltaV/Objects/Misc/fire_extinguisher_bluespace.rsi + layers: + - state: fire_extinguisher_closed + map: [ "enum.ToggleVisuals.Layer" ] + - type: Item + sprite: DeltaV/Objects/Misc/fire_extinguisher_bluespace.rsi + size: Normal + - type: SolutionContainerManager + solutions: + spray: + maxVol: 200 + reagents: + - ReagentId: Water + Quantity: 200 + - type: PhysicalComposition + materialComposition: + Steel: 80 + Bluespace: 20 + - type: SolutionRegeneration + solution: spray + generated: + reagents: + - ReagentId: Water + Quantity: 10 + duration: 10 diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/tools.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/tools.yml new file mode 100644 index 00000000000..ada299c1f06 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Recipes/Lathes/tools.yml @@ -0,0 +1,10 @@ +- type: latheRecipe + parent: BaseToolRecipe + id: FireExtinguisherBluespace + result: FireExtinguisherBluespace + completetime: 6 + materials: + Steel: 1000 + Silver: 250 + Plasma: 500 + Bluespace: 200 diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index b88f4904de5..07a8fe14503 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -382,9 +382,10 @@ - FauxTileAstroIce - FauxTileAstroSnow - OreBagOfHolding - - PlantBagOfHolding #DeltaV - DeviceQuantumSpinInverter - - UtilityBeltChiefEngineer + - PlantBagOfHolding # DeltaV + - FireExtinguisherBluespace # DeltaV + - UtilityBeltChiefEngineer # Frontier - JetpackVoid # Frontier - ClothingShoesBootsMagAdv # Frontier - ClothingOuterHardsuitAtmos # Frontier diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml index c1b61e7576e..83be4896270 100644 --- a/Resources/Prototypes/Research/industrial.yml +++ b/Resources/Prototypes/Research/industrial.yml @@ -154,6 +154,7 @@ - HellfireFreezerMachineCircuitBoard - PortableScrubberMachineCircuitBoard - HolofanProjector +# - FireExtinguisherBluespace # DeltaV technologyPrerequisites: - AtmosphericTech diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml index b3f1f62616b..d98eb7e6fad 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml @@ -177,6 +177,7 @@ - PlantBagOfHolding - PlantAnalyzer - JanicartFlatpack + - FireExtinguisherBluespace # DeltaV - type: EmagLatheRecipes emagStaticRecipes: - NFHappyHonkNukieEmpty @@ -254,6 +255,7 @@ - WelderIndustrial - WelderIndustrialAdvanced - HolofanProjector + - FireExtinguisher ## Parts - MicroManipulatorStockPart - MatterBinStockPart @@ -328,7 +330,6 @@ - MiningDrill - MiningDrillDiamond - SprayBottle - - FireExtinguisher - ShipyardRCD - ShipyardRCDAmmo - SignallerAdvanced @@ -337,6 +338,7 @@ - ClothingOuterHardsuitEngineering - ClothingOuterHardsuitEngineeringWhite - ConstructionBagOfHolding + - FireExtinguisherBluespace # DeltaV - type: entity parent: [ BlueprintReceiverBase, BaseLatheLube ] diff --git a/Resources/Textures/DeltaV/Objects/Misc/fire_extinguisher_bluespace.rsi/fire_extinguisher_closed.png b/Resources/Textures/DeltaV/Objects/Misc/fire_extinguisher_bluespace.rsi/fire_extinguisher_closed.png new file mode 100644 index 0000000000000000000000000000000000000000..c9058deca567c8fc170ffe3d33a8548bf36a7744 GIT binary patch literal 422 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3-p)I`?e@QjEnx?oJHr&dIz4ay$ZjLR?=l zGsnfn1q1}_Vr8|mvXYaNb8>R>3`>g4D68n6H*MYV6?@K~J9lpB(xs0cJ^J+NlahH| z%acEQ_Uy583tT>r;p!=dPtSp7F>JHSF#=K&B|(0{|FHvxv%-3>fNEZNx;Tb-biSQ> zP^?Koz;&uZ%LEa_|Ns4!Zy%X08B_9VOUKghh0k9)zTIXX{$0GrAwcg-ZME~!%;t6B zZzr0nGnHoD7cKJ0&OPUKQdDC->#dyGTR&B_l^<9uJ7>j%3RQz;3H2YF6CV6n{lM^m zWxUXyhNmtM_*qUk8oU#ZnZPn-u|kW)`a%)b7U6>??GjQ=m8*WPJ}|}M5JQnn1Fr`| zNn{1`odSG9T;t;60s;c8tgPhZxreK69O3^gUgLRT&jzEob7sA#!Y!J_nU;S0K0U@KJD1Pvs`ivQ+*>*~=6+^k zDbO=$v5pRBILC5J;9Y-hxS@g`>$Pttf#M=_I9Dis+{N&5ZA09}4Q~=+_Z?>5DPr;b z?@9ijeEd(O8_hl+`1xp0bJG$1^mFr>tdzb?Y!BqK`ShTuS!af!oJXW(#)Jol5}D6A zHj6%Ho72pu-S^R|XYuF9rux(0e17ijllgMR&3j>dLXVsTE_rfSMlN}>$&n**m+x0L z*6B@sTDNZ9@7N)5!TH=t?g>ra2XFtZbnGdwJTWVao literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Misc/fire_extinguisher_bluespace.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Misc/fire_extinguisher_bluespace.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..e519ac830833f287f7d58df518d55bbb84157aa2 GIT binary patch literal 467 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zdp%toLn`LH zy|vNHDN*9s$NjTBSXlL(nmrsJ2s{$7*z)p`Lb@>fa^`!^-!G`L`0+kf<8yi6E$&b9VD`D%q-Pj-_lZ?$O@!yw~+rFZ- zaL&_DB}?aZ-oM3Yo&8=q;TOl9a&{fQgUSq5cO9QpZ9Qzv@NBc?&Zs`1v zjhu7i+E*6@cv9azN!~!V*H(4%IR$ZnX`XclN=(dZYZiX{S$8_dAwv6SW9DMlL^H;M z*?#?J$_|{({k=OrVKPu=nXhTK!_pZ`r+5dRTAESy^r`nX>jYJMfi;nuY1gmwroKP^ zxcWZBX6Fw-OY^32bDUPPPxw~z@2X7vPsWKJb_|mZ8!E4t-<=DLB?eDdKbLh*2~7a9 CWY38J literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Misc/fire_extinguisher_bluespace.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Misc/fire_extinguisher_bluespace.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..0fc254604682031894c0071994234622a16186b7 GIT binary patch literal 453 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z>pfi@Ln`LH zy=Callqhrj?C8CI!E}KyLQLxI1;Xr#1;xcD zSDrk&(fp&yiO!d{x90laD%{V%%Ldh-mog%jvr~<(MwK{c`=@ z=CaMR?f?Dz%qidzwHM}YAniF}%S^`E5f>w_@Z4*>x#m!{-TRWYCr*0K;i+@>-ptis zZhr1sp=4i_@eke>v#&3gzRa0B^?33s5&e3k3Z=LCKWN!Yi?mGVkv)}jt Date: Fri, 3 Jan 2025 01:21:06 +0000 Subject: [PATCH 02/41] fix certain donuts being unable to fit inside a donut box (#2649) --- .../Entities/Objects/Consumable/Food/Baked/donut.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml index 87157834f7c..208c5807c78 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml @@ -111,6 +111,7 @@ - type: Tag tags: - Meat + - Donut # Frontier # Tastes like meat. - type: entity @@ -315,6 +316,7 @@ - type: Tag tags: - Fruit + - Donut # Frontier # Tastes like jelly-donut, green apples. - type: entity @@ -381,6 +383,7 @@ - type: Tag tags: - Fruit + - Donut # Frontier # Tastes like jelly-donut, blue pumpkin. - type: entity @@ -403,6 +406,7 @@ - type: Tag tags: - Fruit # Apparently this is a fruit. Huh. + - Donut # Frontier # Tastes like jelly-donut, tropical sweetness. - type: entity From 46f0ea0336df84890d5c0825698f6f7f811988b5 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Fri, 3 Jan 2025 01:21:29 +0000 Subject: [PATCH 03/41] Automatic Changelog (#2649) --- Resources/Changelog/Frontier.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 1790a1c5398..89664e6d8d6 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -6186,3 +6186,11 @@ Entries: message: Converted the mini kegs into casks id: 5623 time: '2024-12-29T14:11:46.0000000+00:00' +- author: KieueCaprie + changes: + - type: Fix + message: >- + Fixed certain jelly-filled donuts, and a particularly meaty one, being + unable to fit inside a donut box. + id: 5624 + time: '2025-01-03T01:21:06.0000000+00:00' From 8a899d04393ed2c6dd5e80625a884093a07cb351 Mon Sep 17 00:00:00 2001 From: dustylens <54123313+dustylens@users.noreply.github.com> Date: Fri, 3 Jan 2025 12:49:10 +0000 Subject: [PATCH 04/41] Adds ATM (withdraw only) flatpack to the flatpack vend. (#2643) * Adds atm flatpack * Updates with unique version to prevent trolling * Board + Build mod * Fix --------- Co-authored-by: Dvir Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- .../VendingMachines/Inventories/flatpackvend.yml | 1 + .../Objects/Devices/Circuitboards/computer.yml | 15 ++++++++++++++- .../_NF/Entities/Objects/Devices/flatpacks.yml | 9 +++++++++ .../Prototypes/_NF/Entities/Structures/atm.yml | 12 ++++++++---- 4 files changed, 32 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/flatpackvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/flatpackvend.yml index b0732457042..6b8d06ac24f 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/flatpackvend.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/flatpackvend.yml @@ -27,3 +27,4 @@ AirlockGlassFlatpack: 4294967295 # Infinite AirlockShuttleFlatpack: 4294967295 # Infinite AirlockGlassShuttleFlatpack: 4294967295 # Infinite + ComputerWithdrawBankATMFlatpack: 4294967295 # Infinite diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/Circuitboards/computer.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/Circuitboards/computer.yml index e36935485e2..9a558c9288a 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/Circuitboards/computer.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/Circuitboards/computer.yml @@ -36,4 +36,17 @@ # - type: ComputerBoard # prototype: ComputerShipyard # - type: ComputerTabletopBoard # Frontier - # prototype: ComputerTabletopShipyard # Frontier \ No newline at end of file + # prototype: ComputerTabletopShipyard # Frontier + +- type: entity + parent: BaseComputerCircuitboard + id: ComputerWithdrawBankATMComputerCircuitboard + name: withdraw only atm computer board + description: A computer printed circuit board for a withdraw only atm computer. + components: + - type: Sprite + state: cpu_command + - type: ComputerBoard + prototype: ComputerWithdrawBankATM + - type: ComputerWallmountBoard # Frontier + prototype: ComputerWallmountWithdrawBankATM # Frontier diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml index be4b998bb04..1d75e730f27 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml @@ -386,6 +386,15 @@ layers: - state: soil +- type: entity + parent: UniformPrinterFlatpack + id: ComputerWithdrawBankATMFlatpack + name: withdraw only atm flatpack + description: A flatpack used for constructing an atm. Best not to think about it. + components: + - type: Flatpack + entity: ComputerWithdrawBankATM + # Medical - type: entity parent: BaseNFFlatpack diff --git a/Resources/Prototypes/_NF/Entities/Structures/atm.yml b/Resources/Prototypes/_NF/Entities/Structures/atm.yml index cdc07f36138..b3bad1e968b 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/atm.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/atm.yml @@ -75,7 +75,7 @@ state: unshaded - type: entity - parent: [BaseStructureDisableToolUse, BaseStructureIndestructible, ComputerBankATMWithdraw] + parent: ComputerBankATMWithdraw id: ComputerWithdrawBankATM components: - type: Sprite @@ -87,10 +87,12 @@ state: icon - map: ["computerLayerScreen"] state: unshaded + - type: Computer + board: ComputerWithdrawBankATMComputerCircuitboard - type: entity suffix: Wallmount - parent: [BaseStructureDisableToolUse, BaseStructureIndestructible, BaseStructureWallmount, ComputerBankATMDeposit] + parent: [BaseStructureDisableToolUse, BaseStructureIndestructible, BaseStructureComputerWallmount, ComputerBankATMDeposit] id: ComputerWallmountBankATM components: - type: Sprite @@ -104,7 +106,7 @@ - type: entity suffix: Wallmount - parent: [BaseStructureDisableToolUse, BaseStructureIndestructible, BaseStructureWallmount, ComputerBankATMWithdraw] + parent: [BaseStructureComputerWallmount, ComputerBankATMWithdraw] id: ComputerWallmountWithdrawBankATM components: - type: Sprite @@ -115,6 +117,8 @@ state: icon - map: ["computerLayerScreen"] state: unshaded + - type: Computer + board: ComputerWithdrawBankATMComputerCircuitboard - type: entity suffix: BlackMarket @@ -143,7 +147,7 @@ - type: entity suffix: Wallmount, BlackMarket - parent: [BaseStructureDisableToolUse, BaseStructureDestructible, BaseStructureWallmount, ComputerBankATMDeposit] + parent: [BaseStructureDisableToolUse, BaseStructureDestructible, BaseStructureComputerWallmount, ComputerBankATMDeposit] id: ComputerWallmountBlackMarketBankATM description: Has some sketchy looking modifications and a sticker that says DEPOSIT FEE 30% components: From 16b7d487a2dc37b9d5001b18b1972cf22a93015d Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Fri, 3 Jan 2025 12:49:37 +0000 Subject: [PATCH 05/41] Automatic Changelog (#2643) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 89664e6d8d6..2060d20edbd 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -6194,3 +6194,9 @@ Entries: unable to fit inside a donut box. id: 5624 time: '2025-01-03T01:21:06.0000000+00:00' +- author: dustylens + changes: + - type: Add + message: ATM flatpack to flatpack vend. + id: 5625 + time: '2025-01-03T12:49:10.0000000+00:00' From 1ff0aced61156c82961733477b56f7248ea089a4 Mon Sep 17 00:00:00 2001 From: dustylens <54123313+dustylens@users.noreply.github.com> Date: Fri, 3 Jan 2025 13:22:59 +0000 Subject: [PATCH 06/41] Adds an on/off toggle to moon boots. (#2645) * Adds toggle to moon boots. * Update misc.yml * Dev Sprite Moment * Create moonboots-component.ftl * Update misc.yml * Update misc.yml * Update misc.yml * Fixup * Update misc.yml * Alert * Update alerts.ftl * Stupid fucking shoes and this stupid fucking code * New lines * Update moonboots.yml * The moon --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Dvir --- .../Components/NFMoonBootsComponent.cs | 23 +++++ .../EmitsSoundOnMoveSystem.cs | 2 +- .../EntitySystems/NFMoonBootsSystem.cs | 81 ++++++++++++++++++ Resources/Locale/en-US/_NF/alerts/alerts.ftl | 3 + .../components/moonboots-component.ftl | 2 + .../Entities/Clothing/Shoes/misc.yml | 1 + .../Entities/Structures/Machines/lathe.yml | 2 +- .../Prototypes/Research/experimental.yml | 2 +- Resources/Prototypes/_NF/Alerts/moonboots.yml | 7 ++ .../_NF/Entities/Clothing/Shoes/misc.yml | 38 ++++++++ .../Prototypes/_NF/Recipes/Lathes/misc.yml | 7 ++ .../Boots/moonboots.rsi/equipped-FEET-vox.png | Bin 0 -> 436 bytes .../Boots/moonboots.rsi/equipped-FEET.png | Bin 0 -> 326 bytes .../Shoes/Boots/moonboots.rsi/icon-on.png | Bin 0 -> 379 bytes .../Shoes/Boots/moonboots.rsi/icon.png | Bin 0 -> 376 bytes .../Shoes/Boots/moonboots.rsi/inhand-left.png | Bin 0 -> 323 bytes .../Boots/moonboots.rsi/inhand-right.png | Bin 0 -> 340 bytes .../Shoes/Boots/moonboots.rsi/meta.json | 50 +++++++++++ .../moonboots.rsi/on-equipped-FEET-vox.png | Bin 0 -> 435 bytes .../Boots/moonboots.rsi/on-equipped-FEET.png | Bin 0 -> 326 bytes .../Boots/moonboots.rsi/on-inhand-left.png | Bin 0 -> 323 bytes .../Boots/moonboots.rsi/on-inhand-right.png | Bin 0 -> 340 bytes 22 files changed, 215 insertions(+), 3 deletions(-) create mode 100644 Content.Shared/_NF/Clothing/Components/NFMoonBootsComponent.cs rename Content.Shared/_NF/Clothing/{Systems => EntitySystems}/EmitsSoundOnMoveSystem.cs (98%) create mode 100644 Content.Shared/_NF/Clothing/EntitySystems/NFMoonBootsSystem.cs create mode 100644 Resources/Locale/en-US/_NF/clothing/components/moonboots-component.ftl create mode 100644 Resources/Prototypes/_NF/Alerts/moonboots.yml create mode 100644 Resources/Prototypes/_NF/Entities/Clothing/Shoes/misc.yml create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/equipped-FEET-vox.png create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/equipped-FEET.png create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/icon-on.png create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/on-equipped-FEET-vox.png create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/on-equipped-FEET.png create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/on-inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/on-inhand-right.png diff --git a/Content.Shared/_NF/Clothing/Components/NFMoonBootsComponent.cs b/Content.Shared/_NF/Clothing/Components/NFMoonBootsComponent.cs new file mode 100644 index 00000000000..fe284b696d5 --- /dev/null +++ b/Content.Shared/_NF/Clothing/Components/NFMoonBootsComponent.cs @@ -0,0 +1,23 @@ +using Content.Shared.Alert; +using Robust.Shared.GameStates; +using Robust.Shared.Prototypes; +using Content.Shared._NF.Clothing.EntitySystems; + +namespace Content.Shared._NF.Clothing.Components; + +/// +/// This is used for clothing that makes an entity weightless when worn. +/// +[RegisterComponent, NetworkedComponent] +[Access(typeof(SharedNFMoonBootsSystem))] +public sealed partial class NFMoonBootsComponent : Component +{ + [DataField] + public ProtoId MoonBootsAlert = "MoonBoots"; + + /// + /// Slot the clothing has to be worn in to work. + /// + [DataField] + public string Slot = "shoes"; +} diff --git a/Content.Shared/_NF/Clothing/Systems/EmitsSoundOnMoveSystem.cs b/Content.Shared/_NF/Clothing/EntitySystems/EmitsSoundOnMoveSystem.cs similarity index 98% rename from Content.Shared/_NF/Clothing/Systems/EmitsSoundOnMoveSystem.cs rename to Content.Shared/_NF/Clothing/EntitySystems/EmitsSoundOnMoveSystem.cs index 555805c83d2..49935370565 100644 --- a/Content.Shared/_NF/Clothing/Systems/EmitsSoundOnMoveSystem.cs +++ b/Content.Shared/_NF/Clothing/EntitySystems/EmitsSoundOnMoveSystem.cs @@ -10,7 +10,7 @@ using Robust.Shared.Physics.Components; using Robust.Shared.Timing; -namespace Content.Shared._NF.Clothing.Systems; +namespace Content.Shared._NF.Clothing.EntitySystems; public sealed class EmitsSoundOnMoveSystem : EntitySystem { diff --git a/Content.Shared/_NF/Clothing/EntitySystems/NFMoonBootsSystem.cs b/Content.Shared/_NF/Clothing/EntitySystems/NFMoonBootsSystem.cs new file mode 100644 index 00000000000..06a89cb77f4 --- /dev/null +++ b/Content.Shared/_NF/Clothing/EntitySystems/NFMoonBootsSystem.cs @@ -0,0 +1,81 @@ +using Content.Shared.Gravity; +using Content.Shared.Inventory; +using Content.Shared.Item.ItemToggle.Components; +using Content.Shared.Alert; +using Content.Shared.Item; +using Content.Shared.Item.ItemToggle; +using Robust.Shared.Containers; +using Content.Shared.Clothing.EntitySystems; +using Content.Shared._NF.Clothing.Components; +using Content.Shared.Clothing; + +namespace Content.Shared._NF.Clothing.EntitySystems; + +public sealed class SharedNFMoonBootsSystem : EntitySystem +{ + [Dependency] private readonly AlertsSystem _alerts = default!; + [Dependency] private readonly ClothingSystem _clothing = default!; + [Dependency] private readonly InventorySystem _inventory = default!; + [Dependency] private readonly ItemToggleSystem _toggle = default!; + [Dependency] private readonly SharedContainerSystem _container = default!; + [Dependency] private readonly SharedItemSystem _item = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnToggled); + SubscribeLocalEvent(OnGotEquipped); + SubscribeLocalEvent(OnGotUnequipped); + SubscribeLocalEvent(OnIsWeightless); + SubscribeLocalEvent>(OnIsWeightless); + } + + private void OnToggled(Entity ent, ref ItemToggledEvent args) + { + var (uid, comp) = ent; + // only works if being worn in the correct slot + if (_container.TryGetContainingContainer((uid, null, null), out var container) && + _inventory.TryGetSlotEntity(container.Owner, comp.Slot, out var worn) + && uid == worn) + { + UpdateMoonbootEffects(container.Owner, ent, args.Activated); + } + + var prefix = args.Activated ? "on" : null; + _item.SetHeldPrefix(ent, prefix); + _clothing.SetEquippedPrefix(ent, prefix); + } + + private void OnGotUnequipped(Entity ent, ref ClothingGotUnequippedEvent args) + { + UpdateMoonbootEffects(args.Wearer, ent, false); + } + + private void OnGotEquipped(Entity ent, ref ClothingGotEquippedEvent args) + { + UpdateMoonbootEffects(args.Wearer, ent, _toggle.IsActivated(ent.Owner)); + } + + public void UpdateMoonbootEffects(EntityUid user, Entity ent, bool state) + { + if (state) + _alerts.ShowAlert(user, ent.Comp.MoonBootsAlert); + else + _alerts.ClearAlert(user, ent.Comp.MoonBootsAlert); + } + + private void OnIsWeightless(Entity ent, ref IsWeightlessEvent args) + { + if (args.Handled || !_toggle.IsActivated(ent.Owner)) + return; + + args.Handled = true; + args.IsWeightless = true; + } + + private void OnIsWeightless(Entity ent, ref InventoryRelayedEvent args) + { + OnIsWeightless(ent, ref args.Args); + } +} diff --git a/Resources/Locale/en-US/_NF/alerts/alerts.ftl b/Resources/Locale/en-US/_NF/alerts/alerts.ftl index 61fa886596b..cfda909a7d0 100644 --- a/Resources/Locale/en-US/_NF/alerts/alerts.ftl +++ b/Resources/Locale/en-US/_NF/alerts/alerts.ftl @@ -1,2 +1,5 @@ alerts-pacified-zone-name = [color=royalblue]Pacified Zone[/color] alerts-pacified-zone-desc = You're in a pacified zone, you need to leave before harming living things. + +alerts-moon-boots-name = Moon Boots +alerts-moon-boots-desc = Gravity? What's that? \ No newline at end of file diff --git a/Resources/Locale/en-US/_NF/clothing/components/moonboots-component.ftl b/Resources/Locale/en-US/_NF/clothing/components/moonboots-component.ftl new file mode 100644 index 00000000000..51fd3327f2a --- /dev/null +++ b/Resources/Locale/en-US/_NF/clothing/components/moonboots-component.ftl @@ -0,0 +1,2 @@ +# Toggle Moon Boots Verb +toggle-moon-boots-verb-get-data-text = Toggle Moon Boots diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml index 300f9c6916f..5f039d309ee 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml @@ -136,6 +136,7 @@ id: ClothingShoesBootsMoon name: moon boots description: Special anti-gravity boots developed with a speciality blend of lunar rock gel. Shipped from the Netherlands. + categories: [ HideSpawnMenu ] # Frontier components: - type: Sprite sprite: Clothing/Shoes/Boots/moonboots.rsi diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 07a8fe14503..3399f2646b6 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -354,7 +354,7 @@ - SynthesizerInstrument - RPED - ClothingShoesBootsMagSci - - ClothingShoesBootsMoon + - NFClothingShoesBootsMoon # Frontier ClothingShoesBootsMoon*#1E3PH%FEptP%{V?u&spUu>xbCXo{*5-Jv zi28f~o6ha`NBuV4U=TzGKV6R4J>MxRsI9auGkg30t$+GAGRJi>ohW8FkR6yXZP~h7 zbs_86EwPci=Dhv0d(#`+?a{eQL(-Q{4VoMK()j<pH{Z>1EUVZ6?Uxb@AS*-Pj6 zEuTB}?)&fakF|c;c`g6Bx)K5``mgZo$BJ5p%pS=fAJ=m24(H{+t}<__X4tVB$?u*n zZ%#>+>(pt!+sg32sY(96^Y5S|OD){4NHZ{8efS}_#((&6sCYhqX+Fz-VCbboFyt=akR{03h+bbN~PV literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/equipped-FEET.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/equipped-FEET.png new file mode 100644 index 0000000000000000000000000000000000000000..e0d3cabc8a8979a0ee8381aecbf381881cef0958 GIT binary patch literal 326 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`7zFr)xE?rg zfR~ro%ECfWP*7G@*38UIMMWhjC`d(FSw=>txv|m5$EP4SHzp?LKLbMr14F^(J0Keb zN`m}?8UCY!0|DL6K)Ds3E{-7)t#7BD<~wY_!4fHbBKqh5{kmmKyr%kSZJjPt#`i5z zAhO6%sYSr)M6e+0fhdEP)Px$HAzH4R9J=Wl)Y|)Fcd~lt4s_eLY|PAkjfNguGj2&jgD1cjTh)tcDfi`|&v-t>gziVF`3yhWTPaMa&>2=JW0U<;urM&92sw(Qb zX1Cjoe4gjpIassypCA`w%ct7Af+S>L#nC*V72-lrJsHZla9diyl%7E za6X@D+ZF)Vbvd0**tUJ;Ez9b6z;PVnI3~-o<+os1JP3mRjI%6b=r5FIiBbyR_owux z4=}g*h4p%kQtJN!nx>&?8l;pYNdiFIw!iuzLI{KqBuRp0S=s>F8JP3r>bUhB8w`f~ Z<_j62tg%-1%UA#a002ovPDHLkV1j#2tI7ZX literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/icon.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..177c3a546efffc96525f95f27a643559a0186385 GIT binary patch literal 376 zcmV-;0f+vHP)Px$GD$>1R9J=Wl(A}qKp4k=EkZ#`6uF@UGC4T;0)|fRzChohZ`BvbE0nlr6yo9# z3VKdOjUDU|B5BiJ)OO4Lw)=6%_y0cb4m28#Msw}lOgSWk=!Whsib7e#m{L57qJEv{ zIos`)s;UUX@XQ09D#Yjj07X$Cr5x;4+)fGb^!~=
6Q2ae-h^eQGz;N|`Sxm@zP z2lnMfuVT^!;yA|hyt6KU^ZypW_x%na2m)5C6=iwo(l8E#{O*S^=ou~+i_W%f+P0-> z8UW_=IlJAC*=+X3o2J=Mz;PTln+;i(O@9Ta#XZmKZ+VtwocbeDO42mNb=@JosRN8H ze#EjY(lq^hfV!@!>zW`4NRkAArfGikrwAbsLXad0rfDhzDDS|SFIUB-?^vVJTsNOg Wa-(pN|GuOE0000I$f@PVL01S#5KR6_@~B8%R?PTznI>+OyP??wOI4i|Lq%X9=10=+$;$+2M8Ke z@9fRf{O&9H>|N>oZKqD`uD!i3sA&yD`Fc%N>yo)zpJqE>kM#14Yg*Fq^W^3SYy!(3R zd)*@$mgz4aojoG&Sjw5LUuXI*ZmM;{+IR)98$iUil$TdLtfXt&mKvWpD=v@}Q<9c& zne|NfKa06_dxgt>-TqZQe|qQ5S4--~J<)#0dDO3&e78sm}`&b`8=^x+yjj^}? zMJTV|WX534=lm(PMP@DMfwJ7{-8~Ae^3A4)*{%t>c6Be$tM?*f_W>FVdQ&MBb@0M3k$`v3p{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/meta.json b/Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/meta.json new file mode 100644 index 00000000000..6fe97d10536 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/meta.json @@ -0,0 +1,50 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Tau Ceti Station at commit https://github.com/TauCetiStation/TauCetiClassic/blob/HEAD/icons/obj/clothing/shoes.dmi", + "copyright": "Added on/off version edited by dvir001", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-FEET", + "directions": 4 + }, + { + "name": "on-equipped-FEET", + "directions": 4 + }, + { + "name": "equipped-FEET-vox", + "directions": 4 + }, + { + "name": "on-equipped-FEET-vox", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "icon-on" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/on-equipped-FEET-vox.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/on-equipped-FEET-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..73febb15c0da0e29532fc782a9eb961a5b258530 GIT binary patch literal 435 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zb3I)gLn`LH zy=9np$Uubc!TeQ=E(bGlbK5zxYg`DicAT74<)-?FLyPD)?k%(a;7r^_(MPkl-%XR^=L zaF;g;1`hl0voqwF&3;hmeD-wu;g< zo$9OKDuVB1G5%v@wXbV=?JVe9*z6HH$EasozYL@HU^nd10(k44ofy`glX(f`7zFr)xE?rg zfR~ro%ECfWP*7G@*38UIMMWhjC`d(FSw=>txv|m5$EP4SHzp>g0;pw`Tzm40CLlwg zB*-tA;Xf)k5YX)mlw0BH;usRq`gYoBzQYC_ERoVDqJRG1uUodnYpRdd*6A{3eBTlU zB8v=_S_GU<1RFB57^R5Xjz=DZT@8IxG$b% zl|yXt{xFBH>lkZh=bZnNcUdg@MC_q|zvO4y?fNJ4kagY~X5)Dhhq!@mX7F_Nb6Mw< G&;$TpxQ6!t literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/on-inhand-left.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/on-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..03bdacf9fb56813399ffd95046919fd81774980a GIT binary patch literal 323 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVC3?2aSW-L^Y)fuUbBJ3(U1LF zpUtD>I$f@PVL01S#5KR6_@~B8%R?PTznI>+OyP??wOI4i|Lq%X9=10=+$;$+2M8Ke z@9fRf{O&9H>|N>oZKqD`uD!i3sA&yD`Fc%N>yo)zpJqE>kM#14Yg*Fq^W^3SYy!(3R zd)*@$mgz4aojoG&Sjw5LUuXI*ZmM;{+IR)98$iUil$TdLtfXt&mKvWpD=v@}Q<9c& zne|NfKa06_dxgt>-TqZQe|qQ5S4--~J<)#0dDO3&e78sm}`&b`8=^x+yjj^}? zMJTV|WX534=lm(PMP@DMfwJ7{-8~Ae^3A4)*{%t>c6Be$tM?*f_W>FVdQ&MBb@0M3k$`v3p{ literal 0 HcmV?d00001 From 25845a554b5ba505aa147b7f9c6cb26def3c3de2 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Fri, 3 Jan 2025 13:23:25 +0000 Subject: [PATCH 07/41] Automatic Changelog (#2645) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 2060d20edbd..a1756d8c078 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -6200,3 +6200,9 @@ Entries: message: ATM flatpack to flatpack vend. id: 5625 time: '2025-01-03T12:49:10.0000000+00:00' +- author: dustylens + changes: + - type: Tweak + message: Add toggle feature to moon boots. + id: 5626 + time: '2025-01-03T13:22:59.0000000+00:00' From 0f1e2dac4b7ade7dcfab3faea68ea22f12af22d4 Mon Sep 17 00:00:00 2001 From: "Alice \"Arimah\" Heurlin" <30327355+arimah@users.noreply.github.com> Date: Fri, 3 Jan 2025 14:13:19 +0000 Subject: [PATCH 08/41] Make ghosts worthless (#2651) --- Content.Server/Ghost/GhostSystem.cs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Content.Server/Ghost/GhostSystem.cs b/Content.Server/Ghost/GhostSystem.cs index 9ea9fa40f59..7ae906583b4 100644 --- a/Content.Server/Ghost/GhostSystem.cs +++ b/Content.Server/Ghost/GhostSystem.cs @@ -1,5 +1,6 @@ using Content.Server.Administration.Logs; using Content.Server.Administration.Managers; // Frontier +using Content.Server.Cargo.Systems; // Frontier using Content.Server.Chat.Managers; using Content.Server.GameTicking; using Content.Server.Ghost.Components; @@ -93,6 +94,7 @@ public override void Initialize() SubscribeLocalEvent(OnActionPerform); SubscribeLocalEvent(OnGhostHearingAction); SubscribeLocalEvent(OnEntityStorageInsertAttempt); + SubscribeLocalEvent(OnPriceCalculation); // Frontier SubscribeLocalEvent(_ => MakeVisible(true)); SubscribeLocalEvent(OnToggleGhostVisibilityToAll); @@ -592,6 +594,14 @@ public bool OnGhostAttempt(EntityUid mindId, bool canReturnGlobal, bool viaComma return true; } + + // Frontier: worthless ghosts + private void OnPriceCalculation(Entity ent, ref PriceCalculationEvent args) + { + args.Price = 0; + args.Handled = true; + } + // End Frontier } public sealed class GhostAttemptHandleEvent(MindComponent mind, bool canReturnGlobal) : HandledEntityEventArgs From 4d61eac761fc79220b5afb2fdc617d66c63cef34 Mon Sep 17 00:00:00 2001 From: blackknight954 <40075385+blackknight954@users.noreply.github.com> Date: Fri, 3 Jan 2025 09:16:56 -0600 Subject: [PATCH 09/41] Guidebook changes for new players (#2607) * Adjusted Distro and AME storage for compliance * Revert "Automatic Changelog (#2310)" This reverts commit ed0a313c6108eb4250f6e4f23f56505241a578d1. * Reapply "Automatic Changelog (#2310)" This reverts commit c1af081d94aa01235ba485faf7bc19482ffffd34. * Revert "Adjusted Distro and AME storage for compliance" This reverts commit 8239073c1ab7aca002779a0c8006e1829da4ce7e. * Additional quality of life for new players to Frontier. * Update GuidebookUIController.cs * Update Resources/ServerInfo/_NF/Guidebook/StartingGear.xml Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * Update Resources/ServerInfo/_NF/Guidebook/StartingGear.xml Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * Update Resources/ServerInfo/_NF/Guidebook/StartingGear.xml Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * Update Resources/ServerInfo/_NF/Guidebook/StartingGear.xml Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * Update Resources/ServerInfo/_NF/Guidebook/StartingGear.xml Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> --- .../Guidebook/GuidebookUIController.cs | 2 +- .../Locale/en-US/_NF/guidebook/guides.ftl | 1 + .../Prototypes/_NF/Guidebook/StartingGear.yml | 5 +++ Resources/Prototypes/_NF/Guidebook/nf14.yml | 1 + .../ServerInfo/_NF/Guidebook/StartingGear.xml | 36 +++++++++++++++++++ 5 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/_NF/Guidebook/StartingGear.yml create mode 100644 Resources/ServerInfo/_NF/Guidebook/StartingGear.xml diff --git a/Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs b/Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs index 0c38696f628..422938bb4c4 100644 --- a/Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs +++ b/Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs @@ -26,7 +26,7 @@ public sealed class GuidebookUIController : UIController, IOnStateEntered UIManager.GetActiveUIWidgetOrNull()?.GuidebookButton; diff --git a/Resources/Locale/en-US/_NF/guidebook/guides.ftl b/Resources/Locale/en-US/_NF/guidebook/guides.ftl index 5a008481981..fce01946477 100644 --- a/Resources/Locale/en-US/_NF/guidebook/guides.ftl +++ b/Resources/Locale/en-US/_NF/guidebook/guides.ftl @@ -2,6 +2,7 @@ guide-entry-nf14 = Frontier Guide guide-entry-bank = NT Galactic Bank guide-entry-piloting = Piloting +guide-entry-startinggear = Starting Equipment guide-entry-hiring = Hiring Crew guide-entry-expeditions = Expeditions guide-entry-shipyard = Shipyard diff --git a/Resources/Prototypes/_NF/Guidebook/StartingGear.yml b/Resources/Prototypes/_NF/Guidebook/StartingGear.yml new file mode 100644 index 00000000000..8390c4592b1 --- /dev/null +++ b/Resources/Prototypes/_NF/Guidebook/StartingGear.yml @@ -0,0 +1,5 @@ +- type: guideEntry + id: StartingGear + name: guide-entry-startinggear + text: "/ServerInfo/_NF/Guidebook/StartingGear.xml" + priority: 1 diff --git a/Resources/Prototypes/_NF/Guidebook/nf14.yml b/Resources/Prototypes/_NF/Guidebook/nf14.yml index 32bf719d14a..6144ff59beb 100644 --- a/Resources/Prototypes/_NF/Guidebook/nf14.yml +++ b/Resources/Prototypes/_NF/Guidebook/nf14.yml @@ -10,3 +10,4 @@ - Survival # Moved out from Station and Shifts section - Expeditions - Shipyard + - StartingGear diff --git a/Resources/ServerInfo/_NF/Guidebook/StartingGear.xml b/Resources/ServerInfo/_NF/Guidebook/StartingGear.xml new file mode 100644 index 00000000000..be6e1dc8f56 --- /dev/null +++ b/Resources/ServerInfo/_NF/Guidebook/StartingGear.xml @@ -0,0 +1,36 @@ + + # Starting Equipment + + + + In the bag on your person you will find the following equipment: + + -A [color=#028ed9]survival box[/color], containing equipment to help you survive emergency scenarios + -A [color=#CC6633]traffic control key[/color], which can be slotted into your radio headset to utilize the traffic control radio channel + -A [color=#33bbff]medical implant[/color]. If you inject it, when you get incapacitated, it'll tell your location to medics. Click the implanter to equip it in your hand, and click it again to inject it into your body. + + Find your headset by opening your inventory (backpack icon, bottom left corner). + +# Suit Sensors + + + + Suit sensors give your vital status and position to anyone with a [color=#55bbff]crew monitoring console[/color], typically used by medical personnel. + + The sensor options are the following: + + -Off: Disables tracking - you will not be listed + -Binary: Shows you as Alive or Dead with no position + -Vitals: Shows your vital status (Good, Okay, Poor, Bad, Critical) with no position + -Coordinates: Shows your vital status and current position on a crew monitor + + To change your suit sensors: + + -Right-click your jumpsuit + -Hover over "Sensor >" + -Left-click your new setting + + In general, set your sensors to Coordinates if you'd like medics to come get you in a crisis. + + + From 894172628e5c50cb05e15708964f6e6c22d249a6 Mon Sep 17 00:00:00 2001 From: Carolyn3114 <136143032+Carolyn3114@users.noreply.github.com> Date: Fri, 3 Jan 2025 10:09:12 -0600 Subject: [PATCH 10/41] Tide cleanup (#2593) * Update tide.yml * svtide * asd * Update meta.json * Update svtide.png * I made it 121x96 * Cleanup * Restore to grid * Update tide.yml --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Dvir --- .../Locale/en-US/_NF/guidebook/guides.ftl | 1 + Resources/Maps/_NF/Shuttles/Scrap/tide.yml | 2393 +++++++---------- .../Prototypes/_NF/Guidebook/shipyard.yml | 6 + .../Prototypes/_NF/Guidebook/shuttle_maps.yml | 12 + .../Prototypes/_NF/Shipyard/Scrap/tide.yml | 2 +- .../_NF/Guidebook/Shipyard/Tide.xml | 73 + .../shuttle_maps/128x96.rsi/meta.json | 3 + .../shuttle_maps/128x96.rsi/tide.png | Bin 0 -> 1191 bytes 8 files changed, 1111 insertions(+), 1379 deletions(-) create mode 100644 Resources/ServerInfo/_NF/Guidebook/Shipyard/Tide.xml create mode 100644 Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/tide.png diff --git a/Resources/Locale/en-US/_NF/guidebook/guides.ftl b/Resources/Locale/en-US/_NF/guidebook/guides.ftl index fce01946477..4bb723f2702 100644 --- a/Resources/Locale/en-US/_NF/guidebook/guides.ftl +++ b/Resources/Locale/en-US/_NF/guidebook/guides.ftl @@ -73,6 +73,7 @@ guide-entry-shipyard-sparrow = Sparrow guide-entry-shipyard-skipper = Skipper guide-entry-shipyard-spirit = Spirit guide-entry-shipyard-stasis = Stasis +guide-entry-shipyard-tide = Tide guide-entry-shipyard-vagabond = Vagabond # Rules entries diff --git a/Resources/Maps/_NF/Shuttles/Scrap/tide.yml b/Resources/Maps/_NF/Shuttles/Scrap/tide.yml index 08262021883..9f46292a949 100644 --- a/Resources/Maps/_NF/Shuttles/Scrap/tide.yml +++ b/Resources/Maps/_NF/Shuttles/Scrap/tide.yml @@ -13,17 +13,18 @@ tilemap: entities: - proto: "" entities: - - uid: 1 + - uid: 2 components: - type: MetaData name: Tide - - pos: -2.3024244,-6.0853996 + - type: Transform + pos: -2.3024244,-6.0853996 parent: invalid - type: Transform - - chunks: + - type: MapGrid + chunks: 0,0: ind: 0,0 - tiles: cAAAAAAASwAAAAAASwAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAASwAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAYQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAYQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAYQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAGAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: cAAAAAAASwAAAAAASwAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAYQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAYQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAYQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAGAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,0: ind: -1,0 @@ -37,524 +38,199 @@ entities: ind: 0,-1 tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAbwAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 - type: MapGrid - type: Broadphase - - bodyStatus: InAir + - type: Physics + bodyStatus: InAir angularDamping: 0.05 linearDamping: 0.05 fixedRotation: False bodyType: Dynamic - type: Physics - - fixtures: {} - type: Fixtures + - type: Fixtures + fixtures: {} - type: OccluderTree - type: SpreaderGrid - type: Shuttle - type: GridPathfinding - - gravityShakeSound: !type:SoundPathSpecifier + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg - type: Gravity - - chunkCollection: + - type: DecalGrid + chunkCollection: version: 2 nodes: - - node: - color: '#334E6DFF' - id: BrickTileWhiteCornerNe - decals: - 329: 1,10 - - node: - color: '#334E6DFF' - id: BrickTileWhiteCornerNw - decals: - 328: -1,10 - - node: - color: '#334E6DFF' - id: BrickTileWhiteCornerSw - decals: - 327: -1,9 - - node: - color: '#334E6DFF' - id: BrickTileWhiteLineN - decals: - 330: 0,10 - - node: - color: '#334E6DFF' - id: BrickTileWhiteLineS - decals: - 331: 0,9 - - node: - color: '#FFFFFFAB' - id: Damaged - decals: - 203: -3,1 - 204: 4,4 - 205: -2,6 - - node: - color: '#FFFFFFFF' - id: Damaged - decals: - 332: -1,9 - 333: -1,10 - 334: 0,10 - 364: -1,9 - 365: 1,8 - node: color: '#FFFFFF46' id: Dirt decals: 78: 0,4 79: 0,4 - 80: -1,4 - 81: -2,6 - 82: -3,6 - 83: -3,6 - 84: -2,7 - 85: 0,7 - 86: 0,6 - 87: 0,6 - 88: 1,7 - - node: - color: '#FFFFFFAB' - id: Dirt - decals: - 213: -2,6 - 214: -2,6 - node: color: '#FFFFFFB7' id: Dirt decals: 289: 0,4 - 290: -1,4 291: 0,4 292: 0,4 - node: color: '#FFFFFFFF' id: Dirt decals: - 14: -3,1 - 15: -2,1 16: 3,4 - 17: 0,6 18: 0,8 - 19: -1,7 - 20: -2,7 - 21: -3,6 22: 0,5 - 23: -1,4 24: 4,3 - 25: 5,4 - 26: 5,5 - 27: 5,4 28: 4,3 - 29: 6,2 30: 5,7 - 31: 4,5 32: 4,3 - 33: 3,2 - 34: 5,4 - 35: 4,5 - 36: 5,5 - 37: 4,6 - 38: 4,4 39: 4,3 40: 3,5 - 41: 3,9 - 42: 3,9 - 43: 3,9 - 96: 6,7 - 144: -2,1 - 145: -3,1 - 146: 0,1 147: 1,1 - 148: 3,1 - 149: 2,0 150: 1,0 - 201: -3,7 - 202: -3,7 - 227: 2,2 - 250: 1,6 - 251: 2,6 - 252: 2,7 - 253: 2,5 - 254: 2,5 - 255: 2,4 - 256: 1,8 - 257: 1,8 - 277: -1,3 - 278: -1,3 - 279: -1,3 - 280: -2,4 - 281: -2,3 - 282: 0,3 283: 0,4 - 316: -4,4 - 317: -4,4 - 323: -4,10 - 324: 7,7 - 325: 4,8 - 326: 6,-1 - 335: -1,9 - 336: -1,10 - 337: 0,10 - 338: 1,10 - 339: 0,9 - 340: 1,9 - 375: -1,7 - - node: - color: '#FFFFFFAB' - id: DirtHeavy - decals: - 206: -3,6 - 207: -2,6 - 208: -2,6 - 209: -2,6 - 210: -2,6 - 211: -2,6 - 212: -2,6 + 376: -3,1 + 377: -1,1 + 379: 2,6 + 380: 1,8 + 381: 1,9 + 382: -1,9 + 383: -2,7 + 385: -2,3 + 386: -1,3 + 387: 0,3 + 388: -4,4 + 398: -3,7 + 399: 4,8 + 400: 7,7 + 401: -4,10 + 402: -4,8 + 403: 6,-1 - node: color: '#FFFFFFFF' id: DirtHeavy decals: 44: -2,2 - 45: -2,1 - 46: -2,1 - 47: -1,1 - 48: 1,2 - 49: 1,2 - 50: 1,4 - 51: -1,4 - 52: 1,4 53: 4,3 - 54: 4,4 55: 3,5 56: 1,5 - 57: -1,7 - 58: 0,6 - 59: 0,7 - 60: -1,7 - 61: -3,6 - 62: -2,6 - 63: -2,7 - 64: -1,8 - 65: 2,8 - 66: 1,7 - 67: 0,7 - 68: 1,7 - 69: 3,2 - 70: 5,3 - 71: 5,5 - 72: 5,5 - 73: 4,4 - 74: 4,2 - 75: -1,1 - 89: 0,6 - 90: 0,6 - 91: 0,7 - 92: 0,6 - 93: 0,7 - 97: 2,3 - 98: 2,3 - 99: 2,1 - 100: 2,0 - 101: 2,0 - 102: 2,0 - 103: 2,1 104: 1,0 105: 1,1 - 106: 2,1 - 107: 0,1 - 108: 0,1 109: 1,1 - 110: 2,3 - 237: 1,6 - 238: 2,6 - 239: 2,7 - 240: 2,5 - 241: 2,4 - 242: 2,4 - 243: 2,6 - 244: 2,6 - 245: 1,6 - 246: 2,7 - 247: 2,6 - 248: 2,5 - 249: 2,4 - 258: 1,8 - 259: 1,8 - 260: 1,6 - 261: 1,6 262: 0,4 263: 0,4 - 264: -2,3 - 265: -1,3 - 266: 0,3 267: 0,4 - 268: -1,4 - 269: -2,3 - 270: -1,3 271: 0,4 - 272: -1,4 - 273: -1,4 - 274: 0,3 275: 0,4 - 276: -2,4 293: 0,4 - 294: -4,10 - 295: -4,10 - 296: -4,10 - 297: -3,9 - 298: -3,9 - 299: 4,8 - 300: 4,8 - 301: 4,8 - 302: 4,8 - 303: 4,8 - 304: 6,-1 - 305: 6,-1 - 306: 6,-1 - 307: 6,-1 - 308: 6,-1 - 309: 6,-1 - 310: 7,7 - 311: 7,7 - 312: 7,7 - 313: 7,7 - 314: 7,7 - 315: 7,7 - 318: -4,4 - 319: -4,4 - 320: -4,4 - 321: -4,4 - 322: -4,10 - 341: 1,9 - 342: 1,9 - 343: 1,9 - 344: 0,9 - 345: 0,9 - 346: -1,9 - 347: -1,10 - 348: 0,10 - 349: 1,10 - 350: 1,10 - 351: 1,9 - 352: -1,9 - 353: -1,9 - 354: 0,10 - 355: 1,10 - 356: 1,9 - 357: 0,9 - 358: 0,9 - 359: 1,10 - 366: -1,7 - 367: -1,7 - 368: -1,7 - 369: -1,7 - 370: -1,7 - 371: -1,7 - - node: - color: '#FFFFFFAB' - id: DirtHeavyMonotile - decals: - 215: -2,6 - 216: -2,6 - 217: -2,6 - 218: -2,6 + 412: 2,3 + 413: 2,2 + 414: 4,4 + 415: 5,4 + 416: 5,5 + 417: 1,7 + 418: 0,7 + 419: 2,0 + 420: 2,1 + 422: -3,6 - node: color: '#FFFFFFFF' id: DirtHeavyMonotile decals: 76: -1,5 - 77: -1,7 - 111: 0,1 112: 1,1 113: 1,1 114: 1,0 115: 1,0 116: 1,1 - 117: 0,1 - 118: -1,1 - 119: -2,1 - 120: -2,1 - 121: -2,1 - 122: -1,1 123: 1,1 - 124: 2,1 - 125: 2,0 - 126: 2,0 127: 1,0 128: 1,0 - 129: 2,3 - 130: 2,3 - 131: -1,4 132: 0,4 + 389: 2,3 + 390: 2,2 + 391: 1,7 + 392: 0,7 + 393: -1,9 + 423: -2,6 - node: color: '#FFFFFFFF' id: DirtLight decals: - 133: 2,3 - 134: 2,3 - 135: 2,1 - 136: 2,1 - 137: 2,0 138: 1,0 139: 1,1 - 140: 0,1 - 141: 0,1 - 142: -3,1 - 143: -3,1 - 360: -1,9 - 361: 0,9 - 362: -1,10 - 363: -1,10 - 372: -1,7 - 373: -1,7 - 374: -1,7 - - node: - color: '#FFFFFFAB' - id: Rust - decals: - 219: -2,6 - 220: -2,6 - 221: -2,6 - 222: -2,6 - 223: -2,6 + 394: 0,9 + 395: 0,10 + 396: -1,10 + 397: 1,10 + 404: 2,0 + 405: 2,1 + 406: 4,4 + 407: 5,4 + 408: 5,5 + 409: 4,5 + 410: 4,3 + 411: 4,2 - node: color: '#FFFFFFFF' id: Rust decals: 0: 4,3 - 1: 4,2 - 2: 4,4 - 3: 6,4 - 4: 1,7 - 5: 1,7 - 6: -1,6 - 7: -2,7 - 8: -2,7 - 9: -3,6 - 10: 1,4 - 11: -1,4 - 12: -2,1 - 13: -3,1 - 151: -3,1 - 152: -2,1 - 153: 0,1 154: 1,1 155: 1,0 - 156: 2,0 - 157: 2,1 - 158: 2,3 - 159: 0,6 - 160: 0,7 - 161: 6,0 - 162: 5,0 - 163: 4,0 - 164: 3,-1 - 165: 3,-1 - 166: 3,0 - 167: 2,-1 - 168: 1,-1 - 169: 1,-1 170: 0,0 - 171: -1,0 - 172: -1,0 173: -3,0 - 174: -4,0 175: -4,2 176: -3,2 177: -2,2 - 178: -1,2 - 179: 1,2 - 180: 3,2 - 181: 3,2 - 182: 5,2 - 183: 5,3 184: 4,3 185: 3,3 186: 3,4 - 187: 3,6 - 188: 3,6 189: 1,5 190: 0,5 191: -1,5 192: -2,5 193: -3,5 194: -3,5 - 195: -4,6 - 196: -4,7 - 197: -3,6 - 198: -2,7 - 199: -2,7 - 200: -3,7 - 225: 2,2 - 226: 2,2 - 228: 0,-1 - 229: 1,-1 - 230: 6,7 - 231: 6,7 - 232: -4,7 - 233: -4,7 - 234: -4,8 - 235: 2,3 - 236: 2,2 - 284: 0,3 - - node: - color: '#FFFFFFFF' - id: StairsRS - decals: - 224: 2,2 - node: color: '#FFFFFFB7' id: WarnFull decals: 288: 0,4 - - node: - color: '#FFFFFF8E' - id: WarnLineE - decals: - 285: 5,3 - 286: 5,4 - 287: 5,5 - - node: - color: '#FFFFFFFF' - id: body - decals: - 95: -2,7 - - node: - color: '#760000FF' - id: splatter - decals: - 94: -2,7 - type: DecalGrid - - version: 2 + - type: GridAtmosphere + version: 2 data: tiles: 0,0: - 0: 65535 - 1,0: - 0: 65399 + 0: 29942 + 0,-1: + 0: 36864 + 1: 3072 + -1,0: + 0: 49328 0,1: - 0: 65535 + 0: 30541 + -1,1: + 0: 58893 0,2: - 0: 14335 + 0: 947 + -1,2: + 0: 2464 + 1: 528 0,3: - 0: 2 + 1: 2 + 1,0: + 0: 29447 + 1: 34816 1,1: - 0: 65535 + 0: 33587 + 1: 2184 1,2: - 0: 21 - -1,0: - 0: 61439 - -1,1: - 0: 65535 - -1,2: - 0: 36863 - -1,-1: - 0: 16384 - 0,-1: - 0: 64512 + 0: 1 + 1: 20 1,-1: - 0: 24576 + 1: 8192 + 0: 16384 + -1,-1: + 1: 16384 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -571,1410 +247,1371 @@ entities: - 0 - 0 - 0 + - volume: 2500 + immutable: True + moles: + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 chunkSize: 4 - type: GridAtmosphere - type: GasTileOverlay - type: RadiationGridResistance - type: BecomesStation id: Tide -- proto: Airlock +- proto: AirlockAssemblyMaintenance entities: - - uid: 2 + - uid: 84 components: - - pos: -0.5,7.5 - parent: 1 - type: Transform + - type: Transform + pos: 0.5,8.5 + parent: 2 - proto: AirlockGlassShuttle entities: - - uid: 3 + - uid: 4 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: -3.5,1.5 - parent: 1 - type: Transform + parent: 2 - proto: AirlockMaint entities: - - uid: 4 + - uid: 3 + components: + - type: Transform + pos: -0.5,7.5 + parent: 2 + - uid: 5 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: 1.5,3.5 - parent: 1 - type: Transform + parent: 2 + - uid: 126 + components: + - type: Transform + pos: 3.5,4.5 + parent: 2 + - uid: 135 + components: + - type: Transform + pos: 2.5,2.5 + parent: 2 - proto: APCBasic entities: - - uid: 5 + - uid: 6 components: - - rot: 3.141592653589793 rad + - type: Transform + rot: 3.141592653589793 rad pos: 2.5,-0.5 - parent: 1 - type: Transform -- proto: Barricade + parent: 2 +- proto: CableApcExtension entities: - - uid: 6 - components: - - pos: -3.5,7.5 - parent: 1 - type: Transform - - uid: 7 - components: - - pos: 0.5,11.5 - parent: 1 - type: Transform - uid: 8 components: - - pos: 1.5,11.5 - parent: 1 - type: Transform + - type: Transform + pos: -3.5,1.5 + parent: 2 - uid: 9 components: - - pos: 6.5,3.5 - parent: 1 - type: Transform -- proto: CableApcExtension - entities: + - type: Transform + pos: -2.5,1.5 + parent: 2 - uid: 10 components: - - pos: -3.5,1.5 - parent: 1 - type: Transform - + - type: Transform + pos: -1.5,1.5 + parent: 2 - uid: 11 components: - - pos: -2.5,1.5 - parent: 1 - type: Transform - + - type: Transform + pos: -0.5,1.5 + parent: 2 - uid: 12 components: - - pos: -1.5,1.5 - parent: 1 - type: Transform - + - type: Transform + pos: 0.5,1.5 + parent: 2 - uid: 13 components: - - pos: -0.5,1.5 - parent: 1 - type: Transform - + - type: Transform + pos: 1.5,1.5 + parent: 2 - uid: 14 components: - - pos: 0.5,1.5 - parent: 1 - type: Transform - + - type: Transform + pos: 2.5,1.5 + parent: 2 - uid: 15 components: - - pos: 1.5,1.5 - parent: 1 - type: Transform - + - type: Transform + pos: 2.5,0.5 + parent: 2 - uid: 16 components: - - pos: 2.5,1.5 - parent: 1 - type: Transform + - type: Transform + pos: 2.5,-0.5 + parent: 2 - uid: 17 components: - - pos: 2.5,0.5 - parent: 1 - type: Transform + - type: Transform + pos: 1.5,-0.5 + parent: 2 - uid: 18 components: - - pos: 2.5,-0.5 - parent: 1 - type: Transform - + - type: Transform + pos: 0.5,-0.5 + parent: 2 - uid: 19 components: - - pos: 1.5,-0.5 - parent: 1 - type: Transform - + - type: Transform + pos: 2.5,2.5 + parent: 2 - uid: 20 components: - - pos: 0.5,-0.5 - parent: 1 - type: Transform - + - type: Transform + pos: 2.5,3.5 + parent: 2 - uid: 21 components: - - pos: 2.5,2.5 - parent: 1 - type: Transform + - type: Transform + pos: 1.5,3.5 + parent: 2 - uid: 22 components: - - pos: 2.5,3.5 - parent: 1 - type: Transform + - type: Transform + pos: 0.5,3.5 + parent: 2 - uid: 23 components: - - pos: 1.5,3.5 - parent: 1 - type: Transform - + - type: Transform + pos: -0.5,3.5 + parent: 2 - uid: 24 components: - - pos: 0.5,3.5 - parent: 1 - type: Transform - + - type: Transform + pos: -1.5,3.5 + parent: 2 - uid: 25 components: - - pos: -0.5,3.5 - parent: 1 - type: Transform - + - type: Transform + pos: 1.5,6.5 + parent: 2 - uid: 26 components: - - pos: -1.5,3.5 - parent: 1 - type: Transform - + - type: Transform + pos: 0.5,7.5 + parent: 2 - uid: 27 components: - - pos: 1.5,6.5 - parent: 1 - type: Transform - + - type: Transform + pos: -1.5,6.5 + parent: 2 - uid: 28 components: - - pos: 0.5,7.5 - parent: 1 - type: Transform + - type: Transform + pos: -2.5,6.5 + parent: 2 - uid: 29 components: - - pos: -1.5,6.5 - parent: 1 - type: Transform + - type: Transform + pos: -0.5,7.5 + parent: 2 - uid: 30 components: - - pos: -2.5,6.5 - parent: 1 - type: Transform + - type: Transform + pos: -1.5,7.5 + parent: 2 - uid: 31 components: - - pos: -0.5,7.5 - parent: 1 - type: Transform - + - type: Transform + pos: 1.5,7.5 + parent: 2 - uid: 32 components: - - pos: -1.5,7.5 - parent: 1 - type: Transform + - type: Transform + pos: 1.5,8.5 + parent: 2 - uid: 33 components: - - pos: 1.5,7.5 - parent: 1 - type: Transform + - type: Transform + pos: 1.5,9.5 + parent: 2 - uid: 34 components: - - pos: 1.5,8.5 - parent: 1 - type: Transform - + - type: Transform + pos: 1.5,10.5 + parent: 2 - uid: 35 components: - - pos: 1.5,9.5 - parent: 1 - type: Transform - + - type: Transform + pos: 5.5,4.5 + parent: 2 - uid: 36 components: - - pos: 1.5,10.5 - parent: 1 - type: Transform + - type: Transform + pos: 6.5,4.5 + parent: 2 - uid: 37 components: - - pos: 5.5,4.5 - parent: 1 - type: Transform - + - type: Transform + pos: 7.5,4.5 + parent: 2 - uid: 38 components: - - pos: 6.5,4.5 - parent: 1 - type: Transform - + - type: Transform + pos: 5.5,5.5 + parent: 2 - uid: 39 components: - - pos: 7.5,4.5 - parent: 1 - type: Transform - + - type: Transform + pos: 5.5,6.5 + parent: 2 - uid: 40 components: - - pos: 5.5,5.5 - parent: 1 - type: Transform - + - type: Transform + pos: 5.5,7.5 + parent: 2 - uid: 41 components: - - pos: 5.5,6.5 - parent: 1 - type: Transform - + - type: Transform + pos: 5.5,3.5 + parent: 2 - uid: 42 components: - - pos: 5.5,7.5 - parent: 1 - type: Transform - + - type: Transform + pos: 5.5,2.5 + parent: 2 - uid: 43 components: - - pos: 5.5,3.5 - parent: 1 - type: Transform - + - type: Transform + pos: 5.5,1.5 + parent: 2 - uid: 44 components: - - pos: 5.5,2.5 - parent: 1 - type: Transform - + - type: Transform + pos: 5.5,0.5 + parent: 2 - uid: 45 components: - - pos: 5.5,1.5 - parent: 1 - type: Transform - + - type: Transform + pos: 4.5,6.5 + parent: 2 - uid: 46 components: - - pos: 5.5,0.5 - parent: 1 - type: Transform - + - type: Transform + pos: 2.5,4.5 + parent: 2 - uid: 47 components: - - pos: 4.5,6.5 - parent: 1 - type: Transform - + - type: Transform + pos: 3.5,4.5 + parent: 2 - uid: 48 components: - - pos: 2.5,4.5 - parent: 1 - type: Transform - + - type: Transform + pos: 4.5,4.5 + parent: 2 - uid: 49 components: - - pos: 3.5,4.5 - parent: 1 - type: Transform - + - type: Transform + pos: 2.5,6.5 + parent: 2 +- proto: CableApcStack1 + entities: - uid: 50 components: - - pos: 4.5,4.5 - parent: 1 - type: Transform - + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.2841935,4.753075 + parent: 2 - uid: 51 components: - - pos: 2.5,6.5 - parent: 1 - type: Transform - -- proto: CableApcStack1 - entities: + - type: Transform + pos: 1.2873576,9.791525 + parent: 2 - uid: 52 components: - - rot: 1.5707963267948966 rad - pos: 2.2841935,4.753075 - parent: 1 - type: Transform + - type: Transform + pos: 1.5862179,1.5903597 + parent: 2 - uid: 53 components: - - pos: 1.2873576,9.791525 - parent: 1 - type: Transform + - type: Transform + pos: 2.7530308,6.615054 + parent: 2 +- proto: CableHV + entities: - uid: 54 components: - - pos: 1.5862179,1.5903597 - parent: 1 - type: Transform + - type: Transform + pos: 0.5,4.5 + parent: 2 - uid: 55 components: - - pos: 2.7530308,6.615054 - parent: 1 - type: Transform -- proto: CableHV + - type: Transform + pos: -0.5,4.5 + parent: 2 +- proto: CableMV entities: - uid: 56 components: - - pos: 0.5,4.5 - parent: 1 - type: Transform - + - type: Transform + pos: 2.5,3.5 + parent: 2 - uid: 57 components: - - pos: -0.5,4.5 - parent: 1 - type: Transform - -- proto: CableMV - entities: + - type: Transform + pos: -0.5,4.5 + parent: 2 - uid: 58 components: - - pos: 2.5,3.5 - parent: 1 - type: Transform + - type: Transform + pos: -0.5,3.5 + parent: 2 - uid: 59 components: - - pos: -0.5,4.5 - parent: 1 - type: Transform - + - type: Transform + pos: 0.5,3.5 + parent: 2 - uid: 60 components: - - pos: -0.5,3.5 - parent: 1 - type: Transform - + - type: Transform + pos: 2.5,1.5 + parent: 2 - uid: 61 components: - - pos: 0.5,3.5 - parent: 1 - type: Transform - + - type: Transform + pos: 2.5,2.5 + parent: 2 - uid: 62 components: - - pos: 2.5,1.5 - parent: 1 - type: Transform + - type: Transform + pos: 1.5,3.5 + parent: 2 - uid: 63 components: - - pos: 2.5,2.5 - parent: 1 - type: Transform + - type: Transform + pos: 2.5,0.5 + parent: 2 - uid: 64 components: - - pos: 1.5,3.5 - parent: 1 - type: Transform - + - type: Transform + pos: 2.5,-0.5 + parent: 2 +- proto: Catwalk + entities: - uid: 65 components: - - pos: 2.5,0.5 - parent: 1 - type: Transform + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,2.5 + parent: 2 - uid: 66 components: - - pos: 2.5,-0.5 - parent: 1 - type: Transform - -- proto: Catwalk - entities: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,3.5 + parent: 2 - uid: 67 components: - - rot: -1.5707963267948966 rad - pos: 4.5,2.5 - parent: 1 - type: Transform + - type: Transform + pos: 7.5,3.5 + parent: 2 - uid: 68 components: - - rot: -1.5707963267948966 rad - pos: 4.5,3.5 - parent: 1 - type: Transform + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,5.5 + parent: 2 - uid: 69 components: - - pos: 7.5,3.5 - parent: 1 - type: Transform + - type: Transform + pos: 7.5,4.5 + parent: 2 - uid: 70 components: - - rot: -1.5707963267948966 rad - pos: 4.5,5.5 - parent: 1 - type: Transform + - type: Transform + pos: 7.5,5.5 + parent: 2 - uid: 71 components: - - pos: 7.5,4.5 - parent: 1 - type: Transform - - uid: 72 - components: - - pos: 7.5,5.5 - parent: 1 - type: Transform - - uid: 73 - components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: 5.5,6.5 - parent: 1 - type: Transform - - uid: 74 + parent: 2 + - uid: 72 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: 4.5,6.5 - parent: 1 - type: Transform + parent: 2 + - uid: 103 + components: + - type: Transform + pos: 5.5,2.5 + parent: 2 - proto: Chair entities: - - uid: 75 + - uid: 73 components: - - rot: 3.141592653589793 rad + - type: Transform + rot: 3.141592653589793 rad pos: 0.5,9.5 - parent: 1 - type: Transform + parent: 2 - proto: ChairFolding entities: - - uid: 76 + - uid: 74 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: 1.2483454,6.5219746 - parent: 1 - type: Transform + parent: 2 - proto: ChairPilotSeat entities: - - uid: 77 + - uid: 75 components: - - rot: 1.5707963267948966 rad + - type: Transform + rot: 1.5707963267948966 rad pos: 1.5,0.5 - parent: 1 - type: Transform - - uid: 78 + parent: 2 + - uid: 76 components: - - rot: 1.5707963267948966 rad + - type: Transform + rot: 1.5707963267948966 rad pos: 2.5,0.5 - parent: 1 - type: Transform + parent: 2 - proto: ComputerBroken entities: - - uid: 79 + - uid: 77 components: - - pos: -0.5,10.5 - parent: 1 - type: Transform + - type: Transform + pos: -0.5,10.5 + parent: 2 - proto: ComputerShuttle entities: - - uid: 80 + - uid: 78 components: - - pos: 0.5,10.5 - parent: 1 - type: Transform + - type: Transform + pos: 0.5,10.5 + parent: 2 - proto: ComputerStationRecords entities: - - uid: 81 + - uid: 79 components: - - pos: 1.5,10.5 - parent: 1 - type: Transform + - type: Transform + pos: 1.5,10.5 + parent: 2 - proto: CrateEmptySpawner entities: - - uid: 82 + - uid: 80 components: - - pos: 4.5,2.5 - parent: 1 - type: Transform + - type: Transform + pos: 4.5,2.5 + parent: 2 - proto: Crowbar entities: - - uid: 83 + - uid: 81 components: - - pos: -0.5,1.5 - parent: 1 - type: Transform + - type: Transform + pos: -0.5,1.5 + parent: 2 - proto: Firelock entities: - - uid: 84 - components: - - pos: 3.5,4.5 - parent: 1 - type: Transform - - uid: 85 + - uid: 82 components: - - pos: 2.5,2.5 - parent: 1 - type: Transform -- proto: FirelockFrame + - type: Transform + pos: 3.5,4.5 + parent: 2 +- proto: FuelPlasma entities: - - uid: 86 + - uid: 83 components: - - pos: 0.5,8.5 - parent: 1 - type: Transform + - type: Transform + pos: -1.4788256,4.4430637 + parent: 2 - proto: GasPassiveVent entities: - - uid: 87 + - uid: 85 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: 5.5,4.5 - parent: 1 - type: Transform + parent: 2 + - uid: 193 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,1.5 + parent: 2 - proto: GasPipeBend entities: - - uid: 88 + - uid: 86 components: - - anchored: False + - type: Transform + anchored: False rot: -0.12514226137072493 rad pos: 2.5779724,6.4750323 - parent: 1 - type: Transform - - canCollide: True + parent: 2 + - type: Physics + canCollide: True bodyType: Dynamic - type: Physics - - - uid: 89 + - uid: 87 components: - - rot: 3.141592653589793 rad + - type: Transform + rot: 3.141592653589793 rad pos: 0.5,6.5 - parent: 1 - type: Transform + parent: 2 - proto: GasPipeStraight entities: - - uid: 90 + - uid: 88 components: - - anchored: False - rot: -2.0017326374881614 rad - pos: 2.4778514,5.5419455 - parent: 1 - type: Transform - - canCollide: True - bodyType: Dynamic - type: Physics - - - uid: 91 + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,5.5 + parent: 2 + - uid: 89 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: -0.5,3.5 - parent: 1 - type: Transform - - - uid: 92 + parent: 2 + - uid: 90 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: 0.5,3.5 - parent: 1 - type: Transform - - - uid: 93 + parent: 2 + - uid: 91 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: 1.5,3.5 - parent: 1 - type: Transform - - - uid: 94 + parent: 2 + - uid: 92 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: 3.5,4.5 - parent: 1 - type: Transform - - - uid: 95 + parent: 2 + - uid: 94 components: - - rot: -1.5707963267948966 rad - pos: 4.5,4.5 - parent: 1 - type: Transform - - - uid: 96 + - type: Transform + pos: 2.5,2.5 + parent: 2 + - uid: 95 components: - - pos: 2.5,2.5 - parent: 1 - type: Transform + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,6.5 + parent: 2 - uid: 97 components: - - rot: -1.5707963267948966 rad - pos: 1.5,6.5 - parent: 1 - type: Transform - - - uid: 98 + - type: Transform + pos: 0.5,8.5 + parent: 2 + - uid: 225 components: - - pos: 0.5,7.5 - parent: 1 - type: Transform - - uid: 99 + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,1.5 + parent: 2 + - uid: 226 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,1.5 + parent: 2 + - uid: 227 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,1.5 + parent: 2 + - uid: 228 components: - - pos: 0.5,8.5 - parent: 1 - type: Transform + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,7.5 + parent: 2 - proto: GasPipeTJunction entities: - - uid: 100 + - uid: 96 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,7.5 + parent: 2 + - uid: 98 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: 2.5,3.5 - parent: 1 - type: Transform - - uid: 101 + parent: 2 + - uid: 99 components: - - rot: 1.5707963267948966 rad + - type: Transform + rot: 1.5707963267948966 rad pos: 2.5,4.5 - parent: 1 - type: Transform - + parent: 2 + - uid: 101 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,1.5 + parent: 2 - proto: GasPort entities: - - uid: 102 + - uid: 100 components: - - rot: 1.5707963267948966 rad + - type: Transform + rot: 1.5707963267948966 rad pos: -1.5,3.5 - parent: 1 - type: Transform -- proto: GasVentPump + parent: 2 +- proto: GasPressurePump entities: - - uid: 103 + - uid: 93 components: - - rot: 3.141592653589793 rad - pos: 2.5,1.5 - parent: 1 - type: Transform - - enabled: False - type: AmbientSound - - uid: 104 + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,4.5 + parent: 2 + - uid: 125 components: - - pos: 0.5,9.5 - parent: 1 - type: Transform - - enabled: False - type: AmbientSound -- proto: Girder + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,1.5 + parent: 2 +- proto: GasVentPump entities: - - uid: 105 - components: - - pos: 4.5,1.5 - parent: 1 - type: Transform - - uid: 106 - components: - - pos: -3.5,0.5 - parent: 1 - type: Transform - - uid: 107 - components: - - pos: 3.5,3.5 - parent: 1 - type: Transform - - uid: 108 + - uid: 102 components: - - pos: -0.5,5.5 - parent: 1 - type: Transform - - uid: 109 + - type: Transform + pos: 0.5,9.5 + parent: 2 + - uid: 105 components: - - pos: 3.5,8.5 - parent: 1 - type: Transform - - uid: 110 + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,0.5 + parent: 2 + - uid: 229 components: - - pos: -3.5,2.5 - parent: 1 - type: Transform + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,7.5 + parent: 2 - proto: Grille entities: - - uid: 111 + - uid: 121 components: - - pos: 6.5,7.5 - parent: 1 - type: Transform - - uid: 112 + - type: Transform + pos: -3.5,7.5 + parent: 2 + - uid: 123 components: - - pos: -1.5,5.5 - parent: 1 - type: Transform - - uid: 113 + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,5.5 + parent: 2 + - uid: 222 components: - - pos: -1.5,8.5 - parent: 1 - type: Transform - - uid: 114 + - type: Transform + pos: 0.5,11.5 + parent: 2 + - uid: 223 + components: + - type: Transform + pos: 1.5,11.5 + parent: 2 + - uid: 224 components: - - pos: -3.5,5.5 - parent: 1 - type: Transform + - type: Transform + pos: 3.5,0.5 + parent: 2 - proto: GrilleBroken entities: + - uid: 114 + components: + - type: Transform + pos: 1.5,8.5 + parent: 2 - uid: 115 components: - - pos: 1.5,8.5 - parent: 1 - type: Transform + - type: Transform + pos: 1.5,0.5 + parent: 2 - uid: 116 components: - - rot: 3.141592653589793 rad - pos: 1.5,8.5 - parent: 1 - type: Transform + - type: Transform + pos: 1.5,1.5 + parent: 2 - uid: 117 components: - - pos: 1.5,0.5 - parent: 1 - type: Transform + - type: Transform + pos: 5.5,4.5 + parent: 2 - uid: 118 components: - - pos: 1.5,1.5 - parent: 1 - type: Transform + - type: Transform + pos: 0.5,4.5 + parent: 2 - uid: 119 components: - - pos: 5.5,4.5 - parent: 1 - type: Transform - - uid: 120 - components: - - pos: 0.5,4.5 - parent: 1 - type: Transform - - uid: 121 - components: - - pos: -2.5,7.5 - parent: 1 - type: Transform -- proto: GrilleSpawner - entities: - - uid: 122 - components: - - pos: 3.5,6.5 - parent: 1 - type: Transform - - uid: 123 - components: - - pos: 0.5,11.5 - parent: 1 - type: Transform - - uid: 124 - components: - - pos: 1.5,11.5 - parent: 1 - type: Transform - - uid: 125 - components: - - pos: 2.5,5.5 - parent: 1 - type: Transform + - type: Transform + pos: -2.5,7.5 + parent: 2 - proto: Gyroscope entities: - - uid: 126 + - uid: 124 components: - - pos: -2.5,9.5 - parent: 1 - type: Transform + - type: Transform + pos: -2.5,9.5 + parent: 2 - proto: InflatableDoor entities: - uid: 127 components: - - pos: 0.5,1.5 - parent: 1 - type: Transform - - uid: 128 - components: - - pos: 3.5,4.5 - parent: 1 - type: Transform - - uid: 129 - components: - - pos: -1.5,1.5 - parent: 1 - type: Transform + - type: Transform + pos: -1.5,1.5 + parent: 2 - proto: InflatableDoorStack1 entities: - - uid: 130 + - uid: 128 components: - - pos: -1.5,4.5 - parent: 1 - type: Transform + - type: Transform + pos: -1.5,4.5 + parent: 2 - proto: InflatableWall entities: - - uid: 131 + - uid: 7 components: - - pos: -0.5,11.5 - parent: 1 - type: Transform - - uid: 132 + - type: Transform + pos: 7.5,5.5 + parent: 2 + - uid: 122 components: - - pos: 5.5,2.5 - parent: 1 - type: Transform - - uid: 133 + - type: Transform + pos: -0.5,11.5 + parent: 2 + - uid: 129 components: - - pos: 5.5,3.5 - parent: 1 - type: Transform -- proto: InflatableWallStack5 - entities: - - uid: 134 + - type: Transform + pos: 7.5,3.5 + parent: 2 + - uid: 156 components: - - pos: -1.5,4.5 - parent: 1 - type: Transform -- proto: MaintenanceWeaponSpawner + - type: Transform + pos: 7.5,4.5 + parent: 2 +- proto: InflatableWallStack5 entities: - - uid: 135 + - uid: 131 components: - - pos: 0.5,4.5 - parent: 1 - type: Transform + - type: Transform + pos: -1.5,4.5 + parent: 2 - proto: Mattress entities: - - uid: 136 + - uid: 133 components: - - pos: -2.5,7.5 - parent: 1 - type: Transform + - type: Transform + pos: -2.5,7.5 + parent: 2 - proto: OreBag entities: - - uid: 137 + - uid: 134 components: - - pos: 5.5351467,6.5488915 - parent: 1 - type: Transform + - type: Transform + pos: 5.5351467,6.5488915 + parent: 2 - proto: PartRodMetal1 entities: - - uid: 138 - components: - - rot: 3.141592653589793 rad - pos: -2.3108153,7.444821 - parent: 1 - type: Transform - - uid: 139 + - uid: 136 components: - - rot: 1.5707963267948966 rad + - type: Transform + rot: 1.5707963267948966 rad pos: -1.9982572,1.738504 - parent: 1 - type: Transform - - uid: 140 + parent: 2 + - uid: 142 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,7.5 + parent: 2 + - uid: 143 components: - - pos: 2.540806,4.403475 - parent: 1 - type: Transform + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,3.5 + parent: 2 - proto: Pickaxe entities: - - uid: 141 + - uid: 138 components: - - pos: 4.5,6.5 - parent: 1 - type: Transform + - type: Transform + pos: 4.5,6.5 + parent: 2 - proto: PortableGeneratorPacman entities: - - uid: 142 + - uid: 1 components: - - pos: -0.5,3.5 - parent: 1 - type: Transform + - type: Transform + pos: 0.5,4.5 + parent: 2 - proto: PosterContrabandGreyTide entities: - - uid: 143 + - uid: 140 components: - - pos: 3.5,2.5 - parent: 1 - type: Transform + - type: Transform + pos: 3.5,2.5 + parent: 2 - proto: PoweredSmallLight entities: - - uid: 144 + - uid: 130 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,6.5 + parent: 2 + - uid: 141 components: - - rot: 1.5707963267948966 rad + - type: Transform + rot: 1.5707963267948966 rad pos: -2.5,6.5 - parent: 1 - type: Transform + parent: 2 + - uid: 144 + components: + - type: Transform + pos: 5.5,6.5 + parent: 2 - uid: 145 components: - - rot: -1.5707963267948966 rad - pos: 1.5,10.5 - parent: 1 - type: Transform + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,0.5 + parent: 2 +- proto: Rack + entities: - uid: 146 components: - - rot: 3.141592653589793 rad - pos: 6.5,8.5 - parent: 1 - type: Transform + - type: Transform + pos: -1.5,4.5 + parent: 2 - uid: 147 components: - - pos: -1.5,-0.5 - parent: 1 - type: Transform + - type: Transform + pos: 4.5,6.5 + parent: 2 - uid: 148 components: - - pos: 5.5,6.5 - parent: 1 - type: Transform + - type: Transform + pos: 5.5,6.5 + parent: 2 +- proto: Railing + entities: - uid: 149 components: - - rot: 3.141592653589793 rad - pos: 2.5,0.5 - parent: 1 - type: Transform + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,2.5 + parent: 2 - uid: 150 components: - - rot: -1.5707963267948966 rad - pos: -3.5,4.5 - parent: 1 - type: Transform -- proto: Rack + - type: Transform + pos: 7.5,6.5 + parent: 2 +- proto: ShardGlass entities: - uid: 151 components: - - pos: -1.5,4.5 - parent: 1 - type: Transform + - type: Transform + pos: 2.5409737,3.4604747 + parent: 2 - uid: 152 components: - - pos: 4.5,6.5 - parent: 1 - type: Transform + - type: Transform + pos: -2.5126061,7.633571 + parent: 2 - uid: 153 components: - - pos: 5.5,6.5 - parent: 1 - type: Transform -- proto: Railing - entities: + - type: Transform + pos: -1.7702793,6.5593524 + parent: 2 - uid: 154 components: - - rot: 3.141592653589793 rad - pos: 7.5,2.5 - parent: 1 - type: Transform + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,8.5 + parent: 2 - uid: 155 components: - - pos: 7.5,6.5 - parent: 1 - type: Transform -- proto: ShardGlass - entities: - - uid: 162 - components: - - pos: 2.5409737,3.4604747 - parent: 1 - type: Transform - - uid: 163 - components: - - pos: -2.5126061,7.633571 - parent: 1 - type: Transform - - uid: 164 - components: - - pos: -1.7702793,6.5593524 - parent: 1 - type: Transform - - uid: 165 - components: - - pos: 1.4725108,9.157009 - parent: 1 - type: Transform - - uid: 166 - components: - - pos: -0.4028381,10.563259 - parent: 1 - type: Transform - - uid: 167 - components: - - pos: 7.5285015,3.3042417 - parent: 1 - type: Transform -- proto: SheetPlasma1 - entities: - - uid: 168 - components: - - pos: -1.472928,4.493269 - parent: 1 - type: Transform - - count: 6 - type: Stack - - size: 6 - type: Item + - type: Transform + pos: -0.4028381,10.563259 + parent: 2 - proto: SheetSteel1 entities: - - uid: 169 + - uid: 158 components: - - pos: 4.4873247,3.5939727 - parent: 1 - type: Transform + - type: Transform + pos: 4.5407724,3.3561268 + parent: 2 - proto: ShuttersFrame entities: - - uid: 170 + - uid: 159 components: - - anchored: True + - type: Transform + anchored: True pos: 6.5,3.5 - parent: 1 - type: Transform - - bodyType: Static - type: Physics + parent: 2 + - type: Physics + bodyType: Static - proto: ShuttersWindow entities: - - uid: 171 + - uid: 160 components: - - pos: 6.5,4.5 - parent: 1 - type: Transform - - links: - - 174 - type: DeviceLinkSink - - uid: 172 + - type: Transform + pos: 6.5,4.5 + parent: 2 + - uid: 161 components: - - pos: 6.5,5.5 - parent: 1 - type: Transform - - links: - - 174 - type: DeviceLinkSink + - type: Transform + pos: 6.5,5.5 + parent: 2 - proto: ShuttleWindow entities: - - uid: 173 + - uid: 162 components: - - pos: 3.5,0.5 - parent: 1 - type: Transform + - type: Transform + pos: 3.5,0.5 + parent: 2 - proto: SignalButton entities: - - uid: 174 + - uid: 163 components: - - rot: 3.141592653589793 rad + - type: Transform + rot: 3.141592653589793 rad pos: 6.5,2.5 - parent: 1 - type: Transform - - linkedPorts: - 171: + parent: 2 + - type: DeviceLinkSource + linkedPorts: + 160: - Pressed: Toggle - 172: + 161: - Pressed: Toggle - type: DeviceLinkSource - proto: SignDirectionalEvac entities: - - uid: 175 + - uid: 164 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: 1.5,2.5 - parent: 1 - type: Transform + parent: 2 - proto: SignEVA entities: - - uid: 176 + - uid: 165 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: -0.5,2.5 - parent: 1 - type: Transform - - uid: 177 + parent: 2 + - uid: 166 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: 6.5,6.5 - parent: 1 - type: Transform + parent: 2 - proto: SignToolStorage entities: - - uid: 178 + - uid: 167 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: 1.5,4.5 - parent: 1 - type: Transform + parent: 2 - proto: Spaceshroom entities: - - uid: 179 + - uid: 168 components: - - pos: 1.5,1.5 - parent: 1 - type: Transform - - uid: 180 + - type: Transform + pos: 1.5,1.5 + parent: 2 + - uid: 169 components: - - pos: 0.5,7.5 - parent: 1 - type: Transform + - type: Transform + pos: 0.5,7.5 + parent: 2 - proto: Stool entities: - - uid: 181 + - uid: 170 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: -1.3014435,6.6570086 - parent: 1 - type: Transform + parent: 2 - proto: SubstationBasic entities: - - uid: 182 + - uid: 171 components: - - pos: -0.5,4.5 - parent: 1 - type: Transform + - type: Transform + pos: -0.5,4.5 + parent: 2 - proto: Table entities: - - uid: 183 + - uid: 172 components: - - pos: 0.5,6.5 - parent: 1 - type: Transform + - type: Transform + pos: 0.5,6.5 + parent: 2 - proto: Thruster entities: - - uid: 184 - components: - - rot: 1.5707963267948966 rad - pos: 0.5,-0.5 - parent: 1 - type: Transform - - uid: 185 + - uid: 132 components: - - rot: 3.141592653589793 rad + - type: Transform + rot: 3.141592653589793 rad pos: 5.5,0.5 - parent: 1 - type: Transform - - uid: 186 + parent: 2 + - uid: 173 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-0.5 + parent: 2 + - uid: 175 + components: + - type: Transform + rot: -1.5707963267948966 rad pos: 6.5,0.5 - parent: 1 - type: Transform - - uid: 187 + parent: 2 + - uid: 176 components: - - pos: 3.5,9.5 - parent: 1 - type: Transform + - type: Transform + pos: 3.5,9.5 + parent: 2 - proto: ToolboxMechanical entities: - - uid: 188 + - uid: 177 components: - - pos: -2.5,6.5 - parent: 1 - type: Transform + - type: Transform + pos: -2.5,6.5 + parent: 2 - proto: ToyFigurineGreytider entities: - - uid: 189 + - uid: 178 components: - - pos: 0.5,6.5 - parent: 1 - type: Transform + - type: Transform + pos: 0.5,6.5 + parent: 2 - proto: WallShuttle entities: + - uid: 179 + components: + - type: Transform + pos: 2.5,9.5 + parent: 2 + - uid: 182 + components: + - type: Transform + pos: 2.5,-0.5 + parent: 2 + - uid: 183 + components: + - type: Transform + pos: 1.5,-0.5 + parent: 2 + - uid: 184 + components: + - type: Transform + pos: -1.5,10.5 + parent: 2 +- proto: WallShuttleDiagonal + entities: + - uid: 189 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-0.5 + parent: 2 - uid: 190 components: - - pos: 2.5,9.5 - parent: 1 - type: Transform + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,1.5 + parent: 2 +- proto: WallSolid + entities: + - uid: 104 + components: + - type: Transform + pos: -3.5,2.5 + parent: 2 + - uid: 106 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,5.5 + parent: 2 + - uid: 107 + components: + - type: Transform + pos: 3.5,8.5 + parent: 2 + - uid: 108 + components: + - type: Transform + pos: -3.5,0.5 + parent: 2 + - uid: 109 + components: + - type: Transform + pos: 6.5,7.5 + parent: 2 + - uid: 111 + components: + - type: Transform + pos: -1.5,8.5 + parent: 2 + - uid: 112 + components: + - type: Transform + pos: -3.5,5.5 + parent: 2 + - uid: 113 + components: + - type: Transform + pos: -2.5,0.5 + parent: 2 + - uid: 120 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,3.5 + parent: 2 + - uid: 180 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,8.5 + parent: 2 + - uid: 181 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,7.5 + parent: 2 + - uid: 185 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,2.5 + parent: 2 + - uid: 186 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,1.5 + parent: 2 + - uid: 187 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,5.5 + parent: 2 + - uid: 188 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,2.5 + parent: 2 - uid: 191 components: - - pos: 5.5,7.5 - parent: 1 - type: Transform + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,1.5 + parent: 2 - uid: 192 components: - - pos: 6.5,1.5 - parent: 1 - type: Transform - - uid: 193 - components: - - pos: 2.5,-0.5 - parent: 1 - type: Transform + - type: Transform + pos: 6.5,6.5 + parent: 2 - uid: 194 components: - - pos: 1.5,-0.5 - parent: 1 - type: Transform - - uid: 195 - components: - - pos: -1.5,10.5 - parent: 1 - type: Transform + - type: Transform + pos: -3.5,6.5 + parent: 2 - uid: 196 components: - - pos: -2.5,0.5 - parent: 1 - type: Transform + - type: Transform + pos: -2.5,4.5 + parent: 2 - uid: 197 components: - - pos: 1.5,5.5 - parent: 1 - type: Transform + - type: Transform + pos: -2.5,3.5 + parent: 2 - uid: 198 components: - - rot: 1.5707963267948966 rad - pos: 0.5,2.5 - parent: 1 - type: Transform + - type: Transform + pos: -0.5,6.5 + parent: 2 - uid: 199 components: - - rot: 1.5707963267948966 rad - pos: 3.5,5.5 - parent: 1 - type: Transform + - type: Transform + pos: -0.5,2.5 + parent: 2 - uid: 200 components: - - rot: -1.5707963267948966 rad - pos: 6.5,2.5 - parent: 1 - type: Transform -- proto: WallShuttleDiagonal - entities: + - type: Transform + pos: 1.5,2.5 + parent: 2 - uid: 201 components: - - rot: 3.141592653589793 rad - pos: 3.5,-0.5 - parent: 1 - type: Transform - - uid: 202 + - type: Transform + pos: 3.5,2.5 + parent: 2 + - uid: 230 components: - - rot: -1.5707963267948966 rad - pos: 3.5,1.5 - parent: 1 - type: Transform -- proto: WallSolid + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,6.5 + parent: 2 + - uid: 231 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,5.5 + parent: 2 +- proto: WallSolidRust entities: + - uid: 110 + components: + - type: Transform + pos: -1.5,5.5 + parent: 2 + - uid: 195 + components: + - type: Transform + pos: -2.5,5.5 + parent: 2 + - uid: 202 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,10.5 + parent: 2 - uid: 203 components: - - rot: 1.5707963267948966 rad - pos: 5.5,1.5 - parent: 1 - type: Transform + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,7.5 + parent: 2 - uid: 204 components: - - pos: 6.5,6.5 - parent: 1 - type: Transform + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,0.5 + parent: 2 - uid: 205 components: - - pos: 4.5,0.5 - parent: 1 - type: Transform + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,2.5 + parent: 2 - uid: 206 components: - - pos: -3.5,6.5 - parent: 1 - type: Transform + - type: Transform + pos: 0.5,5.5 + parent: 2 - uid: 207 components: - - pos: -2.5,5.5 - parent: 1 - type: Transform + - type: Transform + pos: 3.5,7.5 + parent: 2 - uid: 208 components: - - pos: -2.5,4.5 - parent: 1 - type: Transform + - type: Transform + pos: 2.5,8.5 + parent: 2 - uid: 209 components: - - pos: -2.5,3.5 - parent: 1 - type: Transform + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,0.5 + parent: 2 - uid: 210 components: - - pos: -0.5,6.5 - parent: 1 - type: Transform + - type: Transform + pos: -1.5,0.5 + parent: 2 - uid: 211 components: - - pos: -0.5,2.5 - parent: 1 - type: Transform + - type: Transform + pos: -1.5,9.5 + parent: 2 - uid: 212 components: - - pos: 1.5,2.5 - parent: 1 - type: Transform + - type: Transform + pos: -0.5,8.5 + parent: 2 - uid: 213 components: - - pos: 3.5,2.5 - parent: 1 - type: Transform -- proto: WallSolidRust - entities: + - type: Transform + pos: -2.5,8.5 + parent: 2 - uid: 214 components: - - rot: 1.5707963267948966 rad - pos: 2.5,10.5 - parent: 1 - type: Transform + - type: Transform + pos: -2.5,2.5 + parent: 2 - uid: 215 components: - - rot: 1.5707963267948966 rad - pos: 4.5,7.5 - parent: 1 - type: Transform - - uid: 216 - components: - - rot: 1.5707963267948966 rad - pos: 0.5,0.5 - parent: 1 - type: Transform - - uid: 217 - components: - - rot: 1.5707963267948966 rad - pos: -1.5,2.5 - parent: 1 - type: Transform - - uid: 218 - components: - - pos: 0.5,5.5 - parent: 1 - type: Transform - - uid: 219 - components: - - pos: 3.5,7.5 - parent: 1 - type: Transform - - uid: 220 - components: - - pos: 2.5,8.5 - parent: 1 - type: Transform + - type: Transform + pos: 1.5,4.5 + parent: 2 - uid: 221 components: - - rot: 1.5707963267948966 rad - pos: -0.5,0.5 - parent: 1 - type: Transform - - uid: 222 - components: - - pos: -1.5,0.5 - parent: 1 - type: Transform - - uid: 223 - components: - - pos: -1.5,9.5 - parent: 1 - type: Transform - - uid: 224 - components: - - pos: -0.5,8.5 - parent: 1 - type: Transform - - uid: 225 - components: - - pos: -2.5,8.5 - parent: 1 - type: Transform - - uid: 226 - components: - - pos: -2.5,2.5 - parent: 1 - type: Transform - - uid: 227 - components: - - pos: 1.5,4.5 - parent: 1 - type: Transform -- proto: WarpPointShip + - type: Transform + pos: 4.5,1.5 + parent: 2 +- proto: WarpPoint entities: - - uid: 228 + - uid: 216 components: - - pos: 2.5,4.5 - parent: 1 - type: Transform - - location: Sv-Tide - type: WarpPoint + - type: Transform + pos: 2.5,4.5 + parent: 2 + - type: WarpPoint + location: Sv-Tide - proto: Window entities: - - uid: 229 + - uid: 217 components: - - pos: 1.5,11.5 - parent: 1 - type: Transform - - uid: 230 + - type: Transform + pos: 1.5,11.5 + parent: 2 + - uid: 218 components: - - pos: 0.5,11.5 - parent: 1 - type: Transform - - uid: 231 + - type: Transform + pos: 0.5,11.5 + parent: 2 + - uid: 219 components: - - pos: -3.5,7.5 - parent: 1 - type: Transform + - type: Transform + pos: -3.5,7.5 + parent: 2 - proto: Wrench entities: - - uid: 232 + - uid: 220 components: - - pos: -1.5,4.5 - parent: 1 - type: Transform + - type: Transform + pos: -1.5,4.5 + parent: 2 ... diff --git a/Resources/Prototypes/_NF/Guidebook/shipyard.yml b/Resources/Prototypes/_NF/Guidebook/shipyard.yml index 5dec78ace72..70553a21489 100644 --- a/Resources/Prototypes/_NF/Guidebook/shipyard.yml +++ b/Resources/Prototypes/_NF/Guidebook/shipyard.yml @@ -46,6 +46,7 @@ - ShipyardSkipper - ShipyardSpirit - ShipyardStasis + - ShipyardTide - ShipyardVagabond - type: guideEntry @@ -262,3 +263,8 @@ id: ShipyardVagabond name: guide-entry-shipyard-vagabond text: "/ServerInfo/_NF/Guidebook/Shipyard/Vagabond.xml" + +- type: guideEntry + id: ShipyardTide + name: guide-entry-shipyard-tide + text: "/ServerInfo/_NF/Guidebook/Shipyard/Tide.xml" diff --git a/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml b/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml index 16092d133df..646383bf9f4 100644 --- a/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml +++ b/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml @@ -418,6 +418,18 @@ state: stasis scale: 1.2, 1.2 +- type: entity + parent: PosterBase + id: ShuttleMapTide + name: "Tide" + description: "Detailed map of a Tide shuttle." + categories: [ HideSpawnMenu ] + components: + - type: Sprite + sprite: _NF/Guidebook/shuttle_maps/128x96.rsi + state: tide + scale: 1.2, 1.2 + - type: entity parent: PosterBase id: ShuttleMapVagabond diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/tide.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/tide.yml index aceda3a808b..31e169ffb67 100644 --- a/Resources/Prototypes/_NF/Shipyard/Scrap/tide.yml +++ b/Resources/Prototypes/_NF/Shipyard/Scrap/tide.yml @@ -7,7 +7,7 @@ category: Small group: Scrap shuttlePath: /Maps/_NF/Shuttles/Scrap/tide.yml - guidebookPage: Null + guidebookPage: ShipyardTide class: - Scrapyard - Civilian diff --git a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Tide.xml b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Tide.xml new file mode 100644 index 00000000000..a8e6fc906a8 --- /dev/null +++ b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Tide.xml @@ -0,0 +1,73 @@ + + # TIDE-CLASS GENERAL SHUTTLE + + + + + + + + [color=#a4885c]Ship Size:[/color] Small + + [color=#a4885c]Recommended Crew:[/color] 1-3 + + [color=#a4885c]Power Gen Type:[/color] Plasma + + [color=#a4885c]Expeditions:[/color] None + + [color=#a4885c]IFF Console:[/color] None + + "A flying pile of scrap for the seasoned assistant." + + # PREFLIGHT CHECKLIST + + ## 1. Power supply + + ## 1.1. Battery units + + + + + + - Check to see if the substation is working. + - Check that the APC unit's Main Breaker is toggled on. + - Check the APC unit's current Load* (W). + + ## 1.2. P.A.C.M.A.N. generator unit + + + + + + - Check that the P.A.C.M.A.N. generator unit is anchored, fueled, and on top of Heavy Voltage cable. + + ## 2. Atmospherics + + ## 2.1. Distribution Loop + + + + + + + - Acquire an air canister if wanted. + - After acquiring an air canister, attach it to the connector. + - Check that the pipeline is intact. + + ## 3. Other checks + + + + + + - Check that the gyroscope is anchored, powered, and enabled. + - Ensure the wiring is in order. + + ## Sidenotes + + * - The Tide requires around 8 kilowatts of power to be in working order. + + ** - The Tide has no tiny fans, in return, there are pumps in the airlocks so you may vent the gases into the air pipes. + + *** - There is no gravity generator, and there is minor damage to the interior and exterior. + diff --git a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/meta.json b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/meta.json index 14145fba669..3a1728a35fe 100644 --- a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/meta.json +++ b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/meta.json @@ -115,6 +115,9 @@ { "name": "stasis" }, + { + "name": "tide" + }, { "name": "vagabond" } diff --git a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/tide.png b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/tide.png new file mode 100644 index 0000000000000000000000000000000000000000..e9a7d279ec2a24e7e97c7081e4c5d923f40c123b GIT binary patch literal 1191 zcmV;Y1X%ltP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGizW@LZzX3P}QzQTY1UyMZK~#8N?b^L^ z)G!bSa32(*BMlXk2cb)zfF5Y+LQlavK#>kg@&I`PjyGV2nu?*KfRYq&cyD&kI(cQw z`iN!g|C`ZR^5?}`$$P#u000000000000000006K?8(yy3`T6;ds|VZdwu--f%spO0 zr4Rs>LjX*$J8kxl5_2iVTrbS+Qg~A_5CD-jzncveZuZEwp?x46ji}HvnLU!VHZ6s{ z-rimU%m5SFBYA8FC>;VI5{+teWZUi1E&aI^bEEN0ZXp0X?H~{Psj?P}Dpa7tbH#=Y2vd(u2^PAKWIYxOK3_Wjm zuej#+v-#0HY94c|b93>PYtyN38zcB8kaL>{U5_sGEXxPE$epR0qO-+bpIaz!SAcfpaM^*&3R1P0$DEir5@Ckdpla#CDvT8g3l%r=x` z^bugcuJwI=YrpEnYu_@B27u3~)%LMRJk=2deR7}VUTJMw3VXfm>)W<@%>W@CXCFs( z*N3Q`cCWbV#ok{#pX;217orX`4>UWF)@vPVua~yD1R zt)nG@FCTv6S{gn{;LttQ?wNfrUHiMXbM;_w2CxsHwiLVVS}$#L2_5r3iK+K#Y=7+< zLJa_ln%spiRXv~kVeUg6N%f&lx6fxDZ&L$6A||Gcoo9a`IJ!sDwwLC1qSei%6s>I= zO#&f38If}p{up~|RHQ%`az&ko-gFg{1ZplmJmFeLOFplko^fruRBr+!@8zJZGk_U& z6AK-CRGP~+lQ#<_ku3nsXHP((Ia8 zApj~@Yyf=vl6*P_1!jQCIg^y#Y4?VXUPDq_mc06CJ+D%a<7V$Xe4LsDw%cj{B(yhj z8Z8O*JyuiNTR+X<48R@K<61B5?bIGS2Iess0Osg58KXBy?D3FJ@C@Jz4j-|{Lpn*4 zK Date: Fri, 3 Jan 2025 11:44:49 -0500 Subject: [PATCH 11/41] Bocakillo Directional Fans + tweaks (#2469) * Directional fans, other tweaks * Update bocakillo.yml --------- Co-authored-by: Checkraze <71046427+Cheackraze@users.noreply.github.com> Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Dvir --- .../_NF/Shuttles/BlackMarket/bocakillo.yml | 212 +++++------------- 1 file changed, 50 insertions(+), 162 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/bocakillo.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/bocakillo.yml index fd01f53615d..f92644803d4 100644 --- a/Resources/Maps/_NF/Shuttles/BlackMarket/bocakillo.yml +++ b/Resources/Maps/_NF/Shuttles/BlackMarket/bocakillo.yml @@ -19,11 +19,11 @@ entities: components: - type: MetaData name: Bocakillo - - type: BecomesStation - id: Bocakillo - type: Transform pos: -0.4375,-1.703125 parent: invalid + - type: BecomesStation + id: Bocakillo - type: MapGrid chunks: 0,0: @@ -231,11 +231,11 @@ entities: - type: RadiationGridResistance - proto: AirCanister entities: - - uid: 126 + - uid: 24 components: - type: Transform anchored: True - pos: -0.5,0.5 + pos: 0.5,0.5 parent: 2 - type: Physics bodyType: Static @@ -251,12 +251,6 @@ entities: - type: Transform pos: 1.5,-0.5 parent: 2 - - type: Door - secondsUntilStateChange: -239.95091 - state: Opening - - type: DeviceLinkSource - lastSignals: - DoorStatus: True - uid: 59 components: - type: Transform @@ -299,30 +293,27 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,9.5 parent: 2 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 162 components: - type: Transform - rot: -1.5707963267948966 rad pos: 0.5,-3.5 parent: 2 - - uid: 218 + - uid: 164 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,-3.5 + pos: 1.5,-3.5 parent: 2 - - uid: 247 + - uid: 197 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,-3.5 + pos: -0.5,-3.5 parent: 2 - - uid: 248 + - uid: 198 components: - type: Transform - rot: -1.5707963267948966 rad + rot: 3.141592653589793 rad pos: 2.5,4.5 parent: 2 - proto: AtmosFixBlockerMarker @@ -434,58 +425,31 @@ entities: - type: Transform pos: -0.5,12.5 parent: 2 - - type: DeviceLinkSink - links: - - 186 - uid: 171 components: - type: Transform pos: 1.5,6.5 parent: 2 - - type: DeviceLinkSink - links: - - 186 - uid: 184 components: - type: Transform pos: 1.5,12.5 parent: 2 - - type: DeviceLinkSink - links: - - 186 - uid: 212 components: - type: Transform pos: -0.5,8.5 parent: 2 - - type: DeviceLinkSink - links: - - 186 - uid: 219 components: - type: Transform pos: 0.5,12.5 parent: 2 - - type: DeviceLinkSink - links: - - 186 - uid: 220 components: - type: Transform pos: -2.5,0.5 parent: 2 - - type: DeviceLinkSink - links: - - 186 -- proto: BoxBodyBag - entities: - - uid: 192 - components: - - type: Transform - parent: 191 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: ButtonFrameCaution entities: - uid: 213 @@ -837,39 +801,6 @@ entities: - type: Transform pos: -0.5,12.5 parent: 2 -- proto: ClosetWall - entities: - - uid: 191 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,1.5 - parent: 2 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14923 - moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 192 - proto: ComputerIFF entities: - uid: 195 @@ -993,7 +924,7 @@ entities: pos: -0.5,10.5 parent: 2 - type: AtmosPipeColor - color: '#0088FFFF' + color: '#0055CCFF' - uid: 111 components: - type: Transform @@ -1019,14 +950,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#FF1111FF' - - uid: 26 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,0.5 - parent: 2 - - type: AtmosPipeColor - color: '#0088FFFF' - uid: 28 components: - type: Transform @@ -1034,7 +957,7 @@ entities: pos: -0.5,8.5 parent: 2 - type: AtmosPipeColor - color: '#0088FFFF' + color: '#0055CCFF' - uid: 36 components: - type: Transform @@ -1072,7 +995,7 @@ entities: pos: -0.5,3.5 parent: 2 - type: AtmosPipeColor - color: '#0088FFFF' + color: '#0055CCFF' - uid: 91 components: - type: Transform @@ -1088,7 +1011,7 @@ entities: pos: -0.5,9.5 parent: 2 - type: AtmosPipeColor - color: '#0088FFFF' + color: '#0055CCFF' - uid: 108 components: - type: Transform @@ -1104,7 +1027,7 @@ entities: pos: -0.5,4.5 parent: 2 - type: AtmosPipeColor - color: '#0088FFFF' + color: '#0055CCFF' - uid: 113 components: - type: Transform @@ -1112,7 +1035,7 @@ entities: pos: -0.5,5.5 parent: 2 - type: AtmosPipeColor - color: '#0088FFFF' + color: '#0055CCFF' - uid: 114 components: - type: Transform @@ -1120,7 +1043,7 @@ entities: pos: -0.5,7.5 parent: 2 - type: AtmosPipeColor - color: '#0088FFFF' + color: '#0055CCFF' - uid: 117 components: - type: Transform @@ -1144,7 +1067,7 @@ entities: pos: -0.5,1.5 parent: 2 - type: AtmosPipeColor - color: '#0088FFFF' + color: '#0055CCFF' - uid: 130 components: - type: Transform @@ -1152,9 +1075,17 @@ entities: pos: -0.5,-0.5 parent: 2 - type: AtmosPipeColor - color: '#0088FFFF' + color: '#0055CCFF' - proto: GasPipeTJunction entities: + - uid: 26 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,0.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 34 components: - type: Transform @@ -1162,7 +1093,7 @@ entities: pos: -0.5,6.5 parent: 2 - type: AtmosPipeColor - color: '#0088FFFF' + color: '#0055CCFF' - uid: 41 components: - type: Transform @@ -1178,7 +1109,7 @@ entities: pos: -0.5,2.5 parent: 2 - type: AtmosPipeColor - color: '#0088FFFF' + color: '#0055CCFF' - uid: 49 components: - type: Transform @@ -1197,14 +1128,14 @@ entities: color: '#FF1111FF' - proto: GasPort entities: - - uid: 131 + - uid: 126 components: - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,0.5 + rot: -1.5707963267948966 rad + pos: 0.5,0.5 parent: 2 - type: AtmosPipeColor - color: '#0088FFFF' + color: '#0055CCFF' - proto: GasVentPump entities: - uid: 23 @@ -1214,7 +1145,7 @@ entities: pos: -0.5,-1.5 parent: 2 - type: AtmosPipeColor - color: '#0088FFFF' + color: '#0055CCFF' - uid: 132 components: - type: Transform @@ -1222,7 +1153,7 @@ entities: pos: 0.5,10.5 parent: 2 - type: AtmosPipeColor - color: '#0088FFFF' + color: '#0055CCFF' - uid: 141 components: - type: Transform @@ -1230,7 +1161,7 @@ entities: pos: 0.5,2.5 parent: 2 - type: AtmosPipeColor - color: '#0088FFFF' + color: '#0055CCFF' - uid: 142 components: - type: Transform @@ -1238,7 +1169,7 @@ entities: pos: 0.5,6.5 parent: 2 - type: AtmosPipeColor - color: '#0088FFFF' + color: '#0055CCFF' - proto: GasVentScrubber entities: - uid: 33 @@ -1286,34 +1217,22 @@ entities: - type: Transform pos: -0.5,5.5 parent: 2 - - type: Thruster - originalPowerLoad: 1500 -- proto: LockerWallMedicalFilled +- proto: LockerWallMaterialsFuelPlasmaFilled entities: - - uid: 216 + - uid: 191 components: - type: Transform rot: -1.5707963267948966 rad pos: 1.5,5.5 parent: 2 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14923 - moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 +- proto: LockerWallMedicalFilled + entities: + - uid: 188 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,1.5 + parent: 2 - proto: PirateFlag entities: - uid: 79 @@ -1383,15 +1302,11 @@ entities: parent: 2 - proto: PortableGeneratorPacmanShuttle entities: - - uid: 24 + - uid: 131 components: - type: Transform pos: -0.5,6.5 parent: 2 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PowerCellRecharger entities: - uid: 157 @@ -1470,13 +1385,6 @@ entities: - type: Transform pos: 3.5,-2.5 parent: 2 -- proto: SheetPlasma - entities: - - uid: 188 - components: - - type: Transform - pos: -0.5,6.5 - parent: 2 - proto: ShuttleGunPirateCannon entities: - uid: 75 @@ -1485,18 +1393,12 @@ entities: rot: 1.5707963267948966 rad pos: 3.5,5.5 parent: 2 - - type: DeviceLinkSink - links: - - 226 - uid: 86 components: - type: Transform rot: 1.5707963267948966 rad pos: 3.5,7.5 parent: 2 - - type: DeviceLinkSink - links: - - 226 - proto: SignalButtonDirectional entities: - uid: 186 @@ -1594,54 +1496,40 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,-0.5 parent: 2 - - type: Thruster - originalPowerLoad: 1500 - uid: 13 components: - type: Transform rot: 3.141592653589793 rad pos: 3.5,-1.5 parent: 2 - - type: Thruster - originalPowerLoad: 1500 - uid: 15 components: - type: Transform rot: 3.141592653589793 rad pos: -3.5,-0.5 parent: 2 - - type: Thruster - originalPowerLoad: 1500 - uid: 182 components: - type: Transform pos: -2.5,4.5 parent: 2 - - type: Thruster - originalPowerLoad: 1500 - uid: 187 components: - type: Transform rot: 3.141592653589793 rad pos: -2.5,-0.5 parent: 2 - - type: Thruster - originalPowerLoad: 1500 - uid: 225 components: - type: Transform pos: -3.5,4.5 parent: 2 - - type: Thruster - originalPowerLoad: 1500 - uid: 236 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,3.5 parent: 2 - - type: Thruster - originalPowerLoad: 1500 - proto: WallPlastitanium entities: - uid: 18 @@ -1888,7 +1776,7 @@ entities: rot: -1.5707963267948966 rad pos: 1.5,7.5 parent: 2 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 93 components: From eec40e03e57176db1411267b05cf3a512e586302 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Fri, 3 Jan 2025 16:45:13 +0000 Subject: [PATCH 12/41] Automatic Changelog (#2469) --- Resources/Changelog/Frontier.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index a1756d8c078..d0287445d2e 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -6206,3 +6206,13 @@ Entries: message: Add toggle feature to moon boots. id: 5626 time: '2025-01-03T13:22:59.0000000+00:00' +- author: PeccNeck + changes: + - type: Tweak + message: Bocakillo now uses directional fans + - type: Tweak + message: Moved Bocakillo plasma into wall locker + - type: Fix + message: Fixed loose piping on Bocakillo + id: 5627 + time: '2025-01-03T16:44:50.0000000+00:00' From 70bc1a5600fe52d6b42459ec0e83c2fc04e35ad7 Mon Sep 17 00:00:00 2001 From: chrome-cirrus <95361+chrome-cirrus@users.noreply.github.com> Date: Fri, 3 Jan 2025 18:32:24 +0100 Subject: [PATCH 13/41] Fix up Charon + add some features (#2597) * Fix up Charon + add some features * Update charon.yml * Update charon.yml --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Dvir --- .../Maps/_NF/Shuttles/Expedition/charon.yml | 592 ++++++++++++++---- 1 file changed, 459 insertions(+), 133 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/Expedition/charon.yml b/Resources/Maps/_NF/Shuttles/Expedition/charon.yml index 10dd44ef769..a99fbffc6dc 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/charon.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/charon.yml @@ -27,19 +27,19 @@ entities: chunks: 0,0: ind: 0,0 - tiles: gwAAAAAAIQAAAAADcQAAAAAAIQAAAAADgwAAAAAAgwAAAAAAgwAAAAAABAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAACIQAAAAADgwAAAAAAIQAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAABIQAAAAACgwAAAAAAIQAAAAABcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAIQAAAAABcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAACgwAAAAAAIQAAAAACgwAAAAAAgwAAAAAAgwAAAAAABAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAgwAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAgwAAAAAAgwAAAAAAIQAAAAABgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAADgwAAAAAAIQAAAAADgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAADgwAAAAAAIQAAAAABgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAIQAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAABIQAAAAABIQAAAAACgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAIQAAAAACIQAAAAACgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAIQAAAAAAIQAAAAADgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAACcQAAAAAAgwAAAAAAcQAAAAAABAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: gwAAAAAAgwAAAAAAcQAAAAAAIQAAAAADgwAAAAAAgwAAAAAAgwAAAAAABAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAACIQAAAAADgwAAAAAAIQAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAABIQAAAAACgwAAAAAAIQAAAAABcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAIQAAAAABcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAACgwAAAAAAIQAAAAACgwAAAAAAgwAAAAAAgwAAAAAABAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAgwAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAgwAAAAAAgwAAAAAAIQAAAAABgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAADgwAAAAAAIQAAAAADgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAADgwAAAAAAIQAAAAABgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAIQAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAABIQAAAAABIQAAAAACgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAIQAAAAACIQAAAAACgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAIQAAAAAAIQAAAAADgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAACcQAAAAAAgwAAAAAAcQAAAAAABAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,0: ind: -1,0 - tiles: BAAAAAADgwAAAAAAgwAAAAAAgwAAAAAAIQAAAAAAcQAAAAAAIQAAAAAAgwAAAAAAIQAAAAACIQAAAAABgwAAAAAAIQAAAAACIQAAAAABIQAAAAAAIQAAAAABIQAAAAABcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAIQAAAAACgwAAAAAAIQAAAAAAIQAAAAADgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAIQAAAAABgwAAAAAAIQAAAAACIQAAAAACIQAAAAAAIQAAAAACgwAAAAAAIQAAAAACIQAAAAACIQAAAAABIQAAAAACIQAAAAADcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAIQAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAABAAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAABIQAAAAADIQAAAAACAgAAAAABAgAAAAACIQAAAAACAgAAAAADIQAAAAACAgAAAAADIQAAAAABAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAAgAAAAABAgAAAAABIQAAAAABAgAAAAAAIQAAAAADAgAAAAADIQAAAAACAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAIQAAAAABIQAAAAAAcQAAAAAAIQAAAAABIQAAAAADcQAAAAAAIQAAAAADcQAAAAAAIQAAAAADAQAAAAAAAQAAAAAAAAAAAAAABAAAAAABgwAAAAAAIQAAAAABIQAAAAACIQAAAAADIQAAAAACIQAAAAADIQAAAAACIQAAAAADIQAAAAABIQAAAAAAIQAAAAABIQAAAAACIQAAAAADIQAAAAACAAAAAAAAgwAAAAAAIQAAAAADIQAAAAAAIQAAAAABIQAAAAABIQAAAAABIQAAAAAAIQAAAAACIQAAAAACcQAAAAAAIQAAAAADAQAAAAAAAQAAAAAAIQAAAAAAIQAAAAADAAAAAAAAgwAAAAAAIQAAAAAAIQAAAAAAIQAAAAADIQAAAAACIQAAAAABIQAAAAABAwAAAAAAAwAAAAAAAwAAAAAAIQAAAAAAAQAAAAAAAQAAAAAAIQAAAAAAIQAAAAABAAAAAAAAgwAAAAAAIQAAAAACIQAAAAABIQAAAAACIQAAAAACIQAAAAABgwAAAAAAgwAAAAAAgwAAAAAAAwAAAAAAIQAAAAACAQAAAAAAAQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAgwAAAAAAIQAAAAABIQAAAAABIQAAAAABIQAAAAADgwAAAAAAAAAAAAAAAAAAAAAABAAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAABAAAAAADAAAAAAAAAAAAAAAABAAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAABAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: BAAAAAADgwAAAAAAgwAAAAAAgwAAAAAAIQAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAIQAAAAACIQAAAAABgwAAAAAAIQAAAAACIQAAAAABgwAAAAAAIQAAAAABIQAAAAABcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAIQAAAAACgwAAAAAAIQAAAAAAIQAAAAADgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAIQAAAAABgwAAAAAAIQAAAAACIQAAAAACIQAAAAAAIQAAAAACgwAAAAAAIQAAAAACIQAAAAACIQAAAAABIQAAAAACIQAAAAADcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAIQAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAABAAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAABIQAAAAADgwAAAAAAAgAAAAABAgAAAAACgwAAAAAAAgAAAAADgwAAAAAAAgAAAAADgwAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAAAIQAAAAAAgwAAAAAAAgAAAAABAgAAAAABgwAAAAAAAgAAAAAAgwAAAAAAAgAAAAADgwAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAIQAAAAABgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAAQAAAAAAAQAAAAAAAAAAAAAABAAAAAABgwAAAAAAIQAAAAABIQAAAAACIQAAAAADIQAAAAACIQAAAAADIQAAAAACIQAAAAADIQAAAAABIQAAAAAAIQAAAAABIQAAAAACIQAAAAADIQAAAAACAAAAAAAAgwAAAAAAIQAAAAADIQAAAAAAIQAAAAABIQAAAAABIQAAAAABgwAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAAQAAAAAAAQAAAAAAIQAAAAAAIQAAAAADAAAAAAAAgwAAAAAAIQAAAAAAIQAAAAAAIQAAAAADIQAAAAACIQAAAAABgwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAQAAAAAAAQAAAAAAIQAAAAAAIQAAAAABAAAAAAAAgwAAAAAAIQAAAAACIQAAAAABIQAAAAACIQAAAAACIQAAAAABgwAAAAAAgwAAAAAAgwAAAAAAAwAAAAAAgwAAAAAAAQAAAAAAAQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAgwAAAAAAIQAAAAABIQAAAAABIQAAAAABIQAAAAADgwAAAAAAAAAAAAAAAAAAAAAABAAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAABAAAAAADAAAAAAAAAAAAAAAABAAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAABAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,-1: ind: -1,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAIQAAAAACgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAIQAAAAABIQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAADIQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAABIQAAAAAAIQAAAAABgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAgwAAAAAAIQAAAAADIQAAAAADIQAAAAACIQAAAAADgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAIQAAAAADIQAAAAADIQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAIQAAAAACIQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAABAAAAAAAgwAAAAAAgwAAAAAAIQAAAAACIQAAAAADgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAAAIQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAABgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAADgwAAAAAAIQAAAAAAIQAAAAADIQAAAAACgwAAAAAAgwAAAAAAgwAAAAAAIQAAAAAAIQAAAAADgwAAAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAIQAAAAABIQAAAAABIQAAAAADIQAAAAABIQAAAAACIQAAAAACIQAAAAAAIQAAAAABIQAAAAAAIQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAADgwAAAAAAIQAAAAADIQAAAAACIQAAAAABIQAAAAACIQAAAAABIQAAAAAAIQAAAAABIQAAAAACIQAAAAAAIQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAADgwAAAAAAIQAAAAAAgwAAAAAAIQAAAAABIQAAAAADIQAAAAACIQAAAAACIQAAAAACIQAAAAABIQAAAAACIQAAAAACAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAIQAAAAACgwAAAAAAIQAAAAADIQAAAAACIQAAAAACIQAAAAADIQAAAAADIQAAAAABIQAAAAADIQAAAAAC + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAADIQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAggAAAAAAgwAAAAAAgwAAAAAAIQAAAAAAIQAAAAABgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAgwAAAAAAIQAAAAADgwAAAAAAIQAAAAACIQAAAAADgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAIQAAAAADIQAAAAADIQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAIQAAAAACIQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAABAAAAAAAgwAAAAAAgwAAAAAAIQAAAAACIQAAAAADgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAAAIQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAABgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAADgwAAAAAAIQAAAAAAIQAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAIQAAAAABgwAAAAAAIQAAAAADIQAAAAABIQAAAAACIQAAAAACIQAAAAAAgwAAAAAAIQAAAAAAIQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAADgwAAAAAAIQAAAAADgwAAAAAAIQAAAAABIQAAAAACIQAAAAABIQAAAAAAIQAAAAABgwAAAAAAIQAAAAAAIQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAADgwAAAAAAIQAAAAAAgwAAAAAAIQAAAAABIQAAAAADIQAAAAACIQAAAAACIQAAAAACgwAAAAAAIQAAAAACIQAAAAACAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAIQAAAAACgwAAAAAAIQAAAAADIQAAAAACIQAAAAACIQAAAAADIQAAAAADgwAAAAAAIQAAAAADIQAAAAAC version: 6 0,-1: ind: 0,-1 - tiles: cQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAADggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAADIQAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAAAIQAAAAADgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAABIQAAAAADIQAAAAADgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAACIQAAAAADIQAAAAAAIQAAAAACgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAABIQAAAAADIQAAAAAAIQAAAAADgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAAAIQAAAAACgwAAAAAAIQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAADIQAAAAABgwAAAAAAgwAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAADIQAAAAABgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAADIQAAAAABgwAAAAAAIQAAAAACgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAABIQAAAAAAgwAAAAAAIQAAAAABgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAACgwAAAAAAIQAAAAADgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAACgwAAAAAAIQAAAAABgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: cQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAADgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAAAIQAAAAADgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAABIQAAAAADgwAAAAAAgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAACIQAAAAADgwAAAAAAIQAAAAACgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAABIQAAAAADIQAAAAAAIQAAAAADgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAAAIQAAAAACgwAAAAAAIQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAADIQAAAAABgwAAAAAAgwAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAADIQAAAAABgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAADIQAAAAABgwAAAAAAIQAAAAACgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAIQAAAAABgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAACgwAAAAAAIQAAAAADgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAACgwAAAAAAIQAAAAABgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 0,-2: ind: 0,-2 @@ -548,40 +548,41 @@ entities: 0,1: 0: 60894 -1,1: - 0: 56784 + 0: 56528 + 1: 256 0,2: 0: 44798 -1,2: 0: 16383 0,3: 0: 2798 - 1: 256 + 2: 256 0,-1: 0: 61166 1,0: 0: 65376 - 1: 8 + 2: 8 1,3: - 1: 256 + 2: 256 1,1: - 2: 544 - 1: 8 + 3: 544 + 2: 8 1,-1: - 2: 8192 + 3: 8192 -4,0: - 1: 1 + 2: 1 0: 65376 -4,1: - 1: 1 - 2: 1088 + 2: 1 + 3: 1088 -4,2: - 1: 2 + 2: 2 0: 52424 -4,3: - 1: 32 + 2: 32 0: 12 -4,-1: - 2: 16384 + 3: 16384 -3,0: 0: 65522 -3,1: @@ -590,7 +591,7 @@ entities: 0: 30591 -3,3: 0: 3 - 1: 64 + 2: 64 -3,-1: 0: 30583 -2,0: @@ -602,30 +603,30 @@ entities: -2,-1: 0: 65535 -2,3: - 1: 2 - 2: 192 + 2: 2 + 3: 192 -1,3: - 2: 48 - 1: 4 + 3: 48 + 2: 4 -1,-1: 0: 56797 -4,-3: - 2: 2 + 3: 2 0: 19520 -4,-2: 0: 2 - 2: 1088 + 3: 1088 -4,-4: - 2: 18432 + 3: 18432 -3,-4: 0: 65228 - 2: 16 + 3: 16 -3,-3: 0: 65535 -3,-2: 0: 65535 -3,-5: - 1: 11264 + 2: 11264 -2,-4: 0: 65535 -2,-3: @@ -640,25 +641,25 @@ entities: 0: 4095 0,-4: 0: 63283 - 2: 128 + 3: 128 0,-3: 0: 65535 0,-2: 0: 65535 0,-5: - 1: 17152 + 2: 17152 1,-4: - 2: 8448 + 3: 8448 1,-3: 0: 8992 - 2: 4 + 3: 4 1,-2: - 2: 544 + 3: 544 0: 4 -1,-5: - 1: 3840 + 2: 3840 -2,-5: - 1: 3840 + 2: 3840 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -675,6 +676,21 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.14996 + moles: + - 20.078888 + - 75.53487 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - volume: 2500 temperature: 293.15 moles: @@ -1508,6 +1524,51 @@ entities: rot: 1.5707963267948966 rad pos: 0.5,-3.5 parent: 1 +- proto: ButtonFrameCautionSecurity + entities: + - uid: 1145 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,4.5 + parent: 1 + - uid: 1152 + components: + - type: Transform + pos: -11.5,4.5 + parent: 1 + - uid: 1153 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,10.5 + parent: 1 +- proto: ButtonFrameGrey + entities: + - uid: 1131 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -12.5,-1.5 + parent: 1 + - uid: 1132 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -12.5,7.5 + parent: 1 + - uid: 1133 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-1.5 + parent: 1 + - uid: 1151 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,7.5 + parent: 1 - proto: CableApcExtension entities: - uid: 327 @@ -3550,13 +3611,6 @@ entities: rot: -1.5707963267948966 rad pos: -9.5,5.5 parent: 1 -- proto: ClosetWallMaintenanceFilledRandom - entities: - - uid: 497 - components: - - type: Transform - pos: -6.5,11.5 - parent: 1 - proto: ClosetWallO2N2FilledRandom entities: - uid: 135 @@ -3565,12 +3619,6 @@ entities: rot: 1.5707963267948966 rad pos: 0.5,10.5 parent: 1 - - uid: 136 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-7.5 - parent: 1 - uid: 140 components: - type: Transform @@ -3582,6 +3630,12 @@ entities: - type: Transform pos: -7.5,4.5 parent: 1 + - uid: 1134 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-8.5 + parent: 1 - proto: ComputerPowerMonitoring entities: - uid: 470 @@ -3600,11 +3654,11 @@ entities: parent: 1 - proto: ComputerTabletopRadar entities: - - uid: 679 + - uid: 945 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -13.5,9.5 + rot: -1.5707963267948966 rad + pos: -9.5,-2.5 parent: 1 - proto: ComputerTabletopSalvageExpedition entities: @@ -3622,14 +3676,36 @@ entities: parent: 1 - proto: ComputerTabletopStationRecords entities: - - uid: 418 + - uid: 981 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -13.5,9.5 + parent: 1 +- proto: ComputerTabletopSurveillanceCameraMonitor + entities: + - uid: 263 components: - type: Transform rot: 1.5707963267948966 rad pos: -13.5,10.5 parent: 1 +- proto: ComputerTelevision + entities: + - uid: 691 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,10.5 + parent: 1 - proto: ComputerWallmountWithdrawBankATM entities: + - uid: 876 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-14.5 + parent: 1 - uid: 1023 components: - type: Transform @@ -3784,9 +3860,9 @@ entities: - type: Transform pos: 3.5,-6.5 parent: 1 -- proto: CrateMaterials +- proto: CrateEmptySpawner entities: - - uid: 816 + - uid: 497 components: - type: Transform pos: 3.5,-2.5 @@ -3843,11 +3919,22 @@ entities: parent: 1 - proto: DefibrillatorCabinetFilled entities: - - uid: 142 + - uid: 894 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -12.5,7.5 + pos: -6.5,4.5 + parent: 1 +- proto: DrinkMugMetal + entities: + - uid: 968 + components: + - type: Transform + pos: 0.514734,5.5936146 + parent: 1 + - uid: 989 + components: + - type: Transform + pos: -13.586125,12.227859 parent: 1 - proto: EmergencyLight entities: @@ -3900,10 +3987,11 @@ entities: - type: Transform pos: -12.5,-8.5 parent: 1 - - uid: 452 + - uid: 458 components: - type: Transform - pos: 4.5,-8.5 + rot: -1.5707963267948966 rad + pos: 4.5,-7.5 parent: 1 - proto: FaxMachineShip entities: @@ -3966,10 +4054,10 @@ entities: - 1002 - proto: FlashlightLantern entities: - - uid: 1035 + - uid: 979 components: - type: Transform - pos: -9.327917,-2.2779932 + pos: 1.620919,-2.118234 parent: 1 - proto: FloorDrain entities: @@ -3981,19 +4069,26 @@ entities: parent: 1 - type: Fixtures fixtures: {} +- proto: FoodPlateSmall + entities: + - uid: 816 + components: + - type: Transform + pos: -0.48450565,5.718701 + parent: 1 - proto: FoodShakerPepper entities: - uid: 793 components: - type: Transform - pos: 0.031318903,5.7154756 + pos: 0.11334777,5.708277 parent: 1 - proto: FoodShakerSalt entities: - uid: 792 components: - type: Transform - pos: -0.1718061,5.5434813 + pos: -0.0012357235,5.520647 parent: 1 - proto: GasFilterOxygenOnFlipped entities: @@ -5718,14 +5813,21 @@ entities: rot: -1.5707963267948966 rad pos: -2.5,6.5 parent: 1 -- proto: LockerWallEVAColorSalvageFilled +- proto: LockerWallColorGenericBlack entities: - - uid: 263 + - uid: 452 components: - type: Transform rot: 1.5707963267948966 rad pos: -10.5,-14.5 parent: 1 +- proto: LockerWallColorGenericBlue + entities: + - uid: 136 + components: + - type: Transform + pos: -6.5,11.5 + parent: 1 - proto: LockerWallMaterialsFuelAmeJarFilled entities: - uid: 1019 @@ -5736,10 +5838,10 @@ entities: parent: 1 - proto: MicroManipulatorStockPart entities: - - uid: 945 + - uid: 988 components: - type: Transform - pos: 1.5528102,-2.126207 + pos: 1.662586,-1.492799 parent: 1 - proto: MopItem entities: @@ -5816,11 +5918,11 @@ entities: rot: -1.5707963267948966 rad pos: -11.5,5.5 parent: 1 - - uid: 1036 + - uid: 1179 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -9.5,-2.5 + rot: 3.141592653589793 rad + pos: 1.5,-2.5 parent: 1 - proto: PoweredLEDLightPostSmall entities: @@ -6134,13 +6236,6 @@ entities: - type: Transform pos: 1.5,-17.5 parent: 1 -- proto: RandomArcade - entities: - - uid: 894 - components: - - type: Transform - pos: -1.5,10.5 - parent: 1 - proto: RandomBook entities: - uid: 101 @@ -6169,10 +6264,11 @@ entities: - type: Transform pos: -7.5,9.5 parent: 1 - - uid: 876 + - uid: 985 components: - type: Transform - pos: 2.5,-14.5 + rot: 3.141592653589793 rad + pos: 4.5,-11.5 parent: 1 - uid: 1007 components: @@ -6356,20 +6452,160 @@ entities: parent: 1 - proto: Screwdriver entities: - - uid: 979 + - uid: 1035 components: - type: Transform - pos: 1.4590602,-2.470196 + pos: 1.527169,-1.8055165 parent: 1 - proto: ShipyardCharonInfo entities: - - uid: 1133 + - uid: 1074 + components: + - type: Transform + pos: -13.304875,12.49888 + parent: 1 +- proto: ShuttersNormalOpen + entities: + - uid: 986 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -9.5,12.5 + parent: 1 + - uid: 987 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,13.5 + parent: 1 + - uid: 994 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,13.5 + parent: 1 + - uid: 998 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.5,13.5 + parent: 1 + - uid: 999 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -13.5,13.5 + parent: 1 + - uid: 1022 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,12.5 + parent: 1 + - uid: 1026 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,11.5 + parent: 1 + - uid: 1027 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,10.5 + parent: 1 + - uid: 1030 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,9.5 + parent: 1 + - uid: 1031 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,-2.5 + parent: 1 + - uid: 1040 components: - type: Transform - pos: -13.227627,12.695766 + rot: -1.5707963267948966 rad + pos: -12.5,-3.5 + parent: 1 + - uid: 1041 + components: + - type: Transform + pos: -13.5,8.5 + parent: 1 + - uid: 1042 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -12.5,-2.5 + parent: 1 + - uid: 1122 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,-3.5 + parent: 1 + - uid: 1123 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,9.5 + parent: 1 + - uid: 1130 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,8.5 parent: 1 - proto: SignalButton entities: + - uid: 418 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -12.5,7.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 1041: + - Pressed: Toggle + 1030: + - Pressed: Toggle + 1027: + - Pressed: Toggle + 1026: + - Pressed: Toggle + 1022: + - Pressed: Toggle + 999: + - Pressed: Toggle + 998: + - Pressed: Toggle + 994: + - Pressed: Toggle + 987: + - Pressed: Toggle + 986: + - Pressed: Toggle + - uid: 962 + components: + - type: Transform + pos: -11.5,4.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 44: + - Pressed: DoorBolt + 35: + - Pressed: DoorBolt + 487: + - Pressed: DoorBolt + 41: + - Pressed: DoorBolt - uid: 996 components: - type: Transform @@ -6434,6 +6670,76 @@ entities: - Pressed: Toggle 276: - Pressed: Toggle + - uid: 1075 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-1.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 1031: + - Pressed: Toggle + 1122: + - Pressed: Toggle + - uid: 1076 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,4.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 731: + - Pressed: DoorBolt + 486: + - Pressed: DoorBolt + 38: + - Pressed: DoorBolt + 489: + - Pressed: DoorBolt + - uid: 1077 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -12.5,-1.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 1042: + - Pressed: Toggle + 1040: + - Pressed: Toggle + - uid: 1078 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,7.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 1123: + - Pressed: Toggle + 1130: + - Pressed: Toggle + - uid: 1090 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,10.5 + parent: 1 + - type: SignalSwitch + state: True + - type: DeviceLinkSource + linkedPorts: + 42: + - Pressed: DoorBolt + 40: + - Pressed: DoorBolt + 73: + - Pressed: DoorBolt + 46: + - Pressed: DoorBolt - uid: 1118 components: - type: Transform @@ -6471,11 +6777,11 @@ entities: parent: 1 - proto: SignDirectionalBridge entities: - - uid: 962 + - uid: 1079 components: - type: Transform rot: 3.141592653589793 rad - pos: -11.5,4.5 + pos: -9.5,4.5 parent: 1 - proto: SignDirectionalCB1 entities: @@ -6552,42 +6858,6 @@ entities: - type: Transform pos: -3.5,-1.5 parent: 1 -- proto: SpawnDungeonLootCutlery - entities: - - uid: 989 - components: - - type: Transform - pos: -3.456415,11.434776 - parent: 1 - - uid: 1014 - components: - - type: Transform - pos: -0.5656798,5.6530457 - parent: 1 - - uid: 1135 - components: - - type: Transform - pos: -3.456415,11.163755 - parent: 1 -- proto: SpawnDungeonLootMugs - entities: - - uid: 968 - components: - - type: Transform - pos: 0.52348495,5.589697 - parent: 1 - - uid: 1134 - components: - - type: Transform - pos: -13.602627,12.195419 - parent: 1 -- proto: SpawnDungeonVendomatsClothes - entities: - - uid: 458 - components: - - type: Transform - pos: 1.5,8.5 - parent: 1 - proto: SpawnerHoloGraffitiRandom entities: - uid: 165 @@ -6644,6 +6914,53 @@ entities: - type: Transform pos: -9.5,-0.5 parent: 1 +- proto: SurveillanceCameraAssembly + entities: + - uid: 1173 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -13.5,-0.5 + parent: 1 + - uid: 1175 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -13.5,-0.5 + parent: 1 +- proto: SurveillanceCameraGeneral + entities: + - uid: 1036 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,3.5 + parent: 1 + - uid: 1176 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,-17.5 + parent: 1 + - uid: 1181 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -14.5,3.5 + parent: 1 + - uid: 1182 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,12.5 + parent: 1 +- proto: SurveillanceCameraRouterGeneral + entities: + - uid: 983 + components: + - type: Transform + pos: -4.5,-3.5 + parent: 1 - proto: Table entities: - uid: 258 @@ -6662,18 +6979,20 @@ entities: - type: Transform pos: 1.5,-1.5 parent: 1 - - uid: 988 + - uid: 1178 components: - type: Transform - pos: -9.5,-2.5 + rot: 3.141592653589793 rad + pos: -5.5,-0.5 parent: 1 - - uid: 1130 +- proto: TableCounterMetal + entities: + - uid: 142 components: - type: Transform - pos: -4.5,-3.5 + rot: 1.5707963267948966 rad + pos: -13.5,9.5 parent: 1 -- proto: TableCounterMetal - entities: - uid: 631 components: - type: Transform @@ -6692,11 +7011,11 @@ entities: rot: 1.5707963267948966 rad pos: -13.5,11.5 parent: 1 - - uid: 691 + - uid: 679 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -13.5,9.5 + rot: -1.5707963267948966 rad + pos: -9.5,-2.5 parent: 1 - uid: 693 components: @@ -6746,9 +7065,9 @@ entities: - type: Transform pos: -7.5,5.5 parent: 1 -- proto: TelecomServerFilledCommon +- proto: TelecomServerFilledShuttle entities: - - uid: 1030 + - uid: 982 components: - type: Transform pos: -3.5,-3.5 @@ -6893,10 +7212,10 @@ entities: parent: 1 - proto: ToolboxElectricalFilled entities: - - uid: 1027 + - uid: 980 components: - type: Transform - pos: -4.56157,-3.2981017 + pos: -5.4728174,-0.3558907 parent: 1 - proto: TrashBag entities: @@ -7025,6 +7344,13 @@ entities: - Left: Reverse - Right: Forward - Middle: Off +- proto: VendingMachineCargoDrobe + entities: + - uid: 1014 + components: + - type: Transform + pos: 1.5,8.5 + parent: 1 - proto: VendingMachineEngiDrobe entities: - uid: 993 From 872a511ab4e0940143d9cd38b234ae65d58dd535 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Fri, 3 Jan 2025 17:32:50 +0000 Subject: [PATCH 14/41] Automatic Changelog (#2597) --- Resources/Changelog/Frontier.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index d0287445d2e..6e0b7fb40c3 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -6216,3 +6216,11 @@ Entries: message: Fixed loose piping on Bocakillo id: 5627 time: '2025-01-03T16:44:50.0000000+00:00' +- author: chrome-cirrus + changes: + - type: Add + message: Charon gets shutters and some cameras. + - type: Tweak + message: Charon had a bunch of small fixes and additions made. + id: 5628 + time: '2025-01-03T17:32:24.0000000+00:00' From 919009ee9238637a141cfde0f920484137a75f5f Mon Sep 17 00:00:00 2001 From: Bonaout Date: Fri, 3 Jan 2025 19:26:44 +0100 Subject: [PATCH 15/41] Commander's Beret 1.0 (#2634) --- Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml | 6 ++++++ Resources/Prototypes/_NF/Loadouts/Jobs/Mercenary/head.yml | 6 ++++++ .../Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml | 1 + 3 files changed, 13 insertions(+) diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml index 1ac6b3a7264..f8c976c40a4 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml @@ -262,3 +262,9 @@ - type: Clothing sprite: _NF/Clothing/Head/Hats/stc_cap.rsi - type: HamsterWearable + +- type: entity + parent: ClothingHeadHatBeretHoS + id: ClothingHeadHatBeretCommander + name: commander's beret + description: A black beret with a commander's rank emblem. \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Mercenary/head.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Mercenary/head.yml index 656f7b11fbf..72255806c63 100644 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Mercenary/head.yml +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Mercenary/head.yml @@ -21,3 +21,9 @@ price: 0 equipment: head: ClothingHeadHatBeretMercenary + +- type: loadout + id: MercenaryClothingHeadHatBeretCommander + price: 500 + equipment: + head: ClothingHeadHatBeretCommander \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml index b69126348b3..edbb864dd70 100644 --- a/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml +++ b/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml @@ -75,6 +75,7 @@ - MercenaryClothingHeadHelmetMercenaryBlack - MercenaryClothingHeadBandMercenary - MercenaryClothingHeadHatBeretMercenary + - MercenaryClothingHeadHatBeretCommander - SecurityHelmet - SecurityBeret subgroups: From 0924e9f9fb95804ef100affcb5751f04d057deb9 Mon Sep 17 00:00:00 2001 From: dustylens <54123313+dustylens@users.noreply.github.com> Date: Sat, 4 Jan 2025 16:53:52 +0000 Subject: [PATCH 16/41] Adds clear condiment bottle. (#2654) * Adds clear condiment bottle. * Update meta.json * Update condiments.yml * Update lathe.yml * Cleanup * Fixup * Inv change --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Dvir --- .../Containers/CondimentKetchupComponent.cs | 11 +++++ .../Containers/CondimentMustardComponent.cs | 11 +++++ .../Inventories/condiments.yml | 13 ++--- .../Entities/Structures/Machines/lathe.yml | 1 + .../Consumable/Food/Containers/condiments.yml | 45 ++++++++++++------ .../Entities/Structures/Machines/lathe.yml | 1 + .../Recipes/Crafting/Graphs/shoes_graphs.yml | 8 ++-- .../Prototypes/_NF/Recipes/Lathes/service.yml | 8 ++++ Resources/Prototypes/_NF/tags.yml | 3 -- .../Consumable/Food/condiments.rsi/meta.json | 23 ++++++++- .../condiments.rsi/squeeze-bottle-clear.png | Bin 0 -> 349 bytes .../condiments.rsi/squeeze-bottle-clear1.png | Bin 0 -> 144 bytes .../condiments.rsi/squeeze-bottle-clear2.png | Bin 0 -> 162 bytes .../condiments.rsi/squeeze-bottle-clear3.png | Bin 0 -> 175 bytes .../condiments.rsi/squeeze-bottle-clear4.png | Bin 0 -> 177 bytes .../condiments.rsi/squeeze-bottle-clear5.png | Bin 0 -> 186 bytes .../condiments.rsi/squeeze-bottle-clear6.png | Bin 0 -> 194 bytes 17 files changed, 95 insertions(+), 29 deletions(-) create mode 100644 Content.Shared/_NF/Containers/CondimentKetchupComponent.cs create mode 100644 Content.Shared/_NF/Containers/CondimentMustardComponent.cs create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear1.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear2.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear3.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear4.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear5.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear6.png diff --git a/Content.Shared/_NF/Containers/CondimentKetchupComponent.cs b/Content.Shared/_NF/Containers/CondimentKetchupComponent.cs new file mode 100644 index 00000000000..27571ed0c65 --- /dev/null +++ b/Content.Shared/_NF/Containers/CondimentKetchupComponent.cs @@ -0,0 +1,11 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared._NF.Containers.Components; +/// +/// CondimentKetchup empty component +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class CondimentKetchupComponent : Component +{ + +} diff --git a/Content.Shared/_NF/Containers/CondimentMustardComponent.cs b/Content.Shared/_NF/Containers/CondimentMustardComponent.cs new file mode 100644 index 00000000000..8d242809760 --- /dev/null +++ b/Content.Shared/_NF/Containers/CondimentMustardComponent.cs @@ -0,0 +1,11 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared._NF.Containers.Components; +/// +/// CondimentMustard empty component +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class CondimentMustardComponent : Component +{ + +} diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml index a4dddd0e5d8..f3dd5b58959 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml @@ -15,12 +15,13 @@ FoodCondimentPacketSoy: 5 FoodCondimentPacketSugar: 5 FoodCondimentPacketCornoil: 5 - FoodCondimentBottleBBQ: 2 # Frontier - FoodCondimentBottleColdsauce: 2 # Frontier - FoodCondimentBottleHotsauce: 2 # Frontier - FoodCondimentBottleKetchup: 2 # Frontier - FoodCondimentSqueezeBottleKetchup: 4 # Frontier - FoodCondimentSqueezeBottleMustard: 4 # Frontier + FoodCondimentBottleBBQ: 1 # Frontier + FoodCondimentBottleColdsauce: 1 # Frontier + FoodCondimentBottleHotsauce: 1 # Frontier + FoodCondimentBottleKetchup: 1 # Frontier + FoodCondimentSqueezeBottleClear: 2 # Frontier + FoodCondimentSqueezeBottleKetchup: 1 # Frontier + FoodCondimentSqueezeBottleMustard: 1 # Frontier ForkPlastic: 10 SpoonPlastic: 10 KnifePlastic: 10 diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 3399f2646b6..45e157b6e91 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -211,6 +211,7 @@ - FreezerElectronics - BoxDispenserFlare # Frontier - Durathread # Frontier + - FoodCondimentSqueezeBottleClear # Frontier - type: EmagLatheRecipes emagStaticRecipes: - BoxLethalshot diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/condiments.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/condiments.yml index 0ee74d535de..a6ab68876f6 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/condiments.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/condiments.yml @@ -2,7 +2,7 @@ parent: BaseFoodCondiment id: BaseFoodCondimentSqueezeBottle abstract: true - name: condiment squeeze bottle + name: squeeze bottle description: A thin plastic container used to store condiments. components: - type: Drink @@ -10,7 +10,7 @@ - type: SolutionContainerManager solutions: food: - maxVol: 30 + maxVol: 50 - type: RefillableSolution solution: food - type: Spillable @@ -19,7 +19,7 @@ playTransferSound: true canChangeTransferAmount: true minTransferAmount: 5 - maxTransferAmount: 30 + maxTransferAmount: 50 - type: Appearance - type: PhysicalComposition materialComposition: @@ -42,39 +42,54 @@ - type: entity parent: BaseFoodCondimentSqueezeBottle id: FoodCondimentSqueezeBottleKetchup - name: ketchup squeeze bottle - description: You feel more American already. components: - type: SolutionContainerManager solutions: food: reagents: - ReagentId: Ketchup - Quantity: 30 - - type: Tag - tags: - - Ketchup + Quantity: 50 - type: Sprite state: squeeze-bottle-ketchup - type: Icon state: squeeze-bottle-ketchup + - type: Label + currentLabel: reagent-name-ketchup + - type: CondimentKetchup - type: entity parent: BaseFoodCondimentSqueezeBottle id: FoodCondimentSqueezeBottleMustard - name: mustard squeeze bottle - description: You feel more American already. components: - type: SolutionContainerManager solutions: food: reagents: - ReagentId: Mustard - Quantity: 30 - - type: Tag - tags: - - Mustard + Quantity: 50 - type: Sprite state: squeeze-bottle-mustard - type: Icon state: squeeze-bottle-mustard + - type: Label + currentLabel: reagent-name-mustard + - type: CondimentMustard + +- type: entity + parent: BaseFoodCondimentSqueezeBottle + id: FoodCondimentSqueezeBottleClear + description: When it comes to squeeze bottles this is the clear choice. + components: + - type: Sprite + layers: + - state: squeeze-bottle-clear + - state: squeeze-bottle-clear1 + map: [ "enum.SolutionContainerLayers.Fill" ] + visible: false + state: squeeze-bottle-clear + - type: Icon + state: squeeze-bottle-clear + - type: Appearance + - type: SolutionContainerVisuals + maxFillLevels: 6 + fillBaseName: squeeze-bottle-clear diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml index d98eb7e6fad..ae15f942792 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml @@ -134,6 +134,7 @@ - FoodPlateSmallPlastic - NapkinDrum - Napkin + - FoodCondimentSqueezeBottleClear ## EVA - ClothingOuterEVASuitHydro - ClothingOuterEVASuitJanitor diff --git a/Resources/Prototypes/_NF/Recipes/Crafting/Graphs/shoes_graphs.yml b/Resources/Prototypes/_NF/Recipes/Crafting/Graphs/shoes_graphs.yml index e25448f6693..d5feb45e858 100644 --- a/Resources/Prototypes/_NF/Recipes/Crafting/Graphs/shoes_graphs.yml +++ b/Resources/Prototypes/_NF/Recipes/Crafting/Graphs/shoes_graphs.yml @@ -41,7 +41,7 @@ sprite: Clothing/Shoes/Specific/clown.rsi state: icon doAfter: 1 - - tag: Ketchup + - component: CondimentKetchup name: squeeze bottle icon: sprite: _NF/Objects/Consumable/Food/condiments.rsi @@ -64,13 +64,13 @@ sprite: Clothing/Shoes/Specific/clown.rsi state: icon doAfter: 1 - - tag: Ketchup + - component: CondimentKetchup name: ketchup icon: sprite: _NF/Objects/Consumable/Food/condiments.rsi state: squeeze-bottle-ketchup doAfter: 1 - - tag: Mustard + - component: CondimentMustard name: mustard icon: sprite: _NF/Objects/Consumable/Food/condiments.rsi @@ -93,7 +93,7 @@ sprite: Clothing/Shoes/Specific/clown.rsi state: icon doAfter: 1 - - tag: Ketchup + - component: CondimentKetchup name: squeeze bottle icon: sprite: _NF/Objects/Consumable/Food/condiments.rsi diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/service.yml b/Resources/Prototypes/_NF/Recipes/Lathes/service.yml index 738e97e152d..853acc01279 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/service.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/service.yml @@ -57,3 +57,11 @@ Glass: 200 Plastic: 100 Steel: 100 + +- type: latheRecipe + id: FoodCondimentSqueezeBottleClear + result: FoodCondimentSqueezeBottleClear + parent: BaseServiceItemsRecipe + applyMaterialDiscount: false + materials: + Plastic: 50 diff --git a/Resources/Prototypes/_NF/tags.yml b/Resources/Prototypes/_NF/tags.yml index aee1f4b7654..e22609d87a2 100644 --- a/Resources/Prototypes/_NF/tags.yml +++ b/Resources/Prototypes/_NF/tags.yml @@ -91,9 +91,6 @@ - type: Tag id: WhoopieCushion -- type: Tag - id: Mustard - - type: Tag id: PrizeTicket diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/meta.json index 0ff13deaa74..cd6fb5554dc 100644 --- a/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "bingus", + "copyright": "gentlebutter, clear edited by dustylens(github)", "size": { "x": 32, "y": 32 @@ -12,6 +12,27 @@ }, { "name": "squeeze-bottle-mustard" + }, + { + "name": "squeeze-bottle-clear" + }, + { + "name": "squeeze-bottle-clear1" + }, + { + "name": "squeeze-bottle-clear2" + }, + { + "name": "squeeze-bottle-clear3" + }, + { + "name": "squeeze-bottle-clear4" + }, + { + "name": "squeeze-bottle-clear5" + }, + { + "name": "squeeze-bottle-clear6" } ] } diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear.png b/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear.png new file mode 100644 index 0000000000000000000000000000000000000000..12a9b1945ba69f7a04e91f43216363492bf7b3e7 GIT binary patch literal 349 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T<;+`&!ArY;~ z2@yQt*-&yOT0LEh&w=Us zi>C~}C5-;EcE&|KN;etn>*|*7`Lgf`;|~VQzQtuy3X(kX>^b{Cy%e#PZ3q;&s4M<} z=?fp@D#le72V!TJ3+@Gq3OO~h?v-&cbttNCXl!gexGLp5*x6xW*PidM|357y0SNwl l?{2)Z?SO^^YcmrAgW@AU8^>D{UjxI7!PC{xWt~$(695TKh&TWM literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear1.png b/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear1.png new file mode 100644 index 0000000000000000000000000000000000000000..7e77c9045d296b0ef60f680bf396ad72f3d5a6b4 GIT binary patch literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}UY;(FArY-_ z&utWJVBm1RSaDo$&4DDJgGo9EY@#w#otGZ1PkqNR5vY>kLGtl$3dZL{@O1TaS?83{1OPNLGTs0H literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear2.png b/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear2.png new file mode 100644 index 0000000000000000000000000000000000000000..6d934936d01d1078cd332b63aa6d1812aab7c8e6 GIT binary patch literal 162 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}F`h1tArY-_ zFCFA;aNu#d7-^lE|IdW5c(!0D)Q&O#RP*19zfLx?(1G{y!ZRryR5Zy zKb;A2$><5ZwKI(S%#52)Z@P2c`B>HXiQnV6{FzU${x*^*>Dd_bFV|pHpcd VD6R6L;}+0T22WQ%mvv4FO#qDHJ}CeI literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear4.png b/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear4.png new file mode 100644 index 0000000000000000000000000000000000000000..1e2605cedf05fd87e75cefe95ea9809f4a12d6b8 GIT binary patch literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}*`6+rArY-_ zuWaOPFyL{y$XqEd9;wh>*>&c@MjL*S5D$|!54VE#TSQ)Kw=yazDgD~5`uo6{ZTGB0 zzM6;&?yx>4v2t#bkBQJAw#qFP z={RBVey?-r#i-)DJFA)JJ(;uooG$l_qYeLAW<=&V{Lts9Z;bS23i8^>nBT&_W4d60 i?vmX*%LN5%4{@q}5>XEmofZqUpTX1B&t;ucLK6UkMMGr( literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear6.png b/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear6.png new file mode 100644 index 0000000000000000000000000000000000000000..b8f4b7296a553fb3833d5e12e65d5bcd42125099 GIT binary patch literal 194 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}HJ&bxArY-_ zuN~w(pup4m@cN`!n;i|^maW}89kvPHa$dMRZc*cuZ?(r8J}GlBc69v9+bp+YtK3qN zB~#wb>~ILZSnZyDw&Zyp?}ukX2FE&hBOZ!PDDLB(akSw*%ZjWVhadVJ^^K8wj7mb% r8 Date: Sat, 4 Jan 2025 16:54:16 +0000 Subject: [PATCH 17/41] Automatic Changelog (#2654) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 6e0b7fb40c3..e936661ccc9 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -6224,3 +6224,9 @@ Entries: message: Charon had a bunch of small fixes and additions made. id: 5628 time: '2025-01-03T17:32:24.0000000+00:00' +- author: dustylens + changes: + - type: Add + message: Adds clear condiment bottle and lathe recipe. + id: 5629 + time: '2025-01-04T16:53:52.0000000+00:00' From 6d82a7becc3d40937c83b98c25cf85042811fe95 Mon Sep 17 00:00:00 2001 From: dustylens <54123313+dustylens@users.noreply.github.com> Date: Sat, 4 Jan 2025 20:32:57 +0000 Subject: [PATCH 18/41] Adds a new condiment station (#2637) * Adds a new condiment station * Update soda.yml * Update service.yml * Update soda.yml * Moves condiment cup to _NF * Changes + cleanup Converted tag to empty comp Removed StaticPrice to match the rest of the machines Rebase CondimentCup to DrinkWaterCup added on head sprite Added label to jugs * Condiment cups are now at 10, small copyright adjustment. Feel free to review. * Update service.yml * My sins (CondimentSqueezeBottle) --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Dvir --- .../_NF/Containers/CondimentCupComponent.cs | 11 ++ .../CondimentSqueezeBottleComponent.cs | 11 ++ .../meta/consumable/food/condiments.ftl | 2 + .../Entities/Structures/Machines/lathe.yml | 1 + .../Catalog/ReagentDispensers/condiments.yml | 11 ++ .../Consumable/Drinks/condiments_bottles.yml | 135 ++++++++++++++++++ .../Objects/Consumable/Drinks/drinks.yml | 17 +++ .../Consumable/Food/Containers/condiments.yml | 13 +- .../Entities/Objects/Devices/production.yml | 19 +++ .../Objects/Specific/Service/condimentcup.yml | 43 ++++++ .../Structures/Dispensers/condiments.yml | 36 +++++ .../Entities/Structures/Machines/lathe.yml | 2 + .../_NF/Recipes/Lathes/electronics.yml | 10 +- .../Prototypes/_NF/Recipes/Lathes/service.yml | 15 ++ Resources/Prototypes/_NF/tags.yml | 2 +- .../condiment_cup.rsi/equipped-HELMET.png | Bin 0 -> 324 bytes .../Head/Hats/condiment_cup.rsi/icon.png | Bin 0 -> 229 bytes .../Head/Hats/condiment_cup.rsi/meta.json | 18 +++ .../Drinks/condiment_cup.rsi/icon-0.png | Bin 0 -> 261 bytes .../Drinks/condiment_cup.rsi/icon-1.png | Bin 0 -> 127 bytes .../Drinks/condiment_cup.rsi/meta.json | 17 +++ .../dispenser0.png | Bin 0 -> 303 bytes .../dispenser1.png | Bin 0 -> 334 bytes .../condiment_cup_dispenser.rsi/meta.json | 17 +++ .../Structures/smalldispensers.rsi/icon.png | Bin 0 -> 804 bytes .../Structures/smalldispensers.rsi/meta.json | 14 ++ 26 files changed, 382 insertions(+), 12 deletions(-) create mode 100644 Content.Shared/_NF/Containers/CondimentCupComponent.cs create mode 100644 Content.Shared/_NF/Containers/CondimentSqueezeBottleComponent.cs create mode 100644 Resources/Locale/en-US/_NF/reagents/meta/consumable/food/condiments.ftl create mode 100644 Resources/Prototypes/_NF/Catalog/ReagentDispensers/condiments.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/condiments_bottles.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Specific/Service/condimentcup.yml create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Dispensers/condiments.yml create mode 100644 Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/icon-0.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/icon-1.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/dispenser0.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/dispenser1.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/meta.json create mode 100644 Resources/Textures/_NF/Structures/smalldispensers.rsi/icon.png create mode 100644 Resources/Textures/_NF/Structures/smalldispensers.rsi/meta.json diff --git a/Content.Shared/_NF/Containers/CondimentCupComponent.cs b/Content.Shared/_NF/Containers/CondimentCupComponent.cs new file mode 100644 index 00000000000..01ef61f9ed0 --- /dev/null +++ b/Content.Shared/_NF/Containers/CondimentCupComponent.cs @@ -0,0 +1,11 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared._NF.Containers.Components; +/// +/// CondimentCup empty component +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class CondimentCupComponent : Component +{ + +} diff --git a/Content.Shared/_NF/Containers/CondimentSqueezeBottleComponent.cs b/Content.Shared/_NF/Containers/CondimentSqueezeBottleComponent.cs new file mode 100644 index 00000000000..7d7711f1a3b --- /dev/null +++ b/Content.Shared/_NF/Containers/CondimentSqueezeBottleComponent.cs @@ -0,0 +1,11 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared._NF.Containers.Components; +/// +/// CondimentSqueezeBottle empty component +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class CondimentSqueezeBottleComponent : Component +{ + +} diff --git a/Resources/Locale/en-US/_NF/reagents/meta/consumable/food/condiments.ftl b/Resources/Locale/en-US/_NF/reagents/meta/consumable/food/condiments.ftl new file mode 100644 index 00000000000..f89397fcb53 --- /dev/null +++ b/Resources/Locale/en-US/_NF/reagents/meta/consumable/food/condiments.ftl @@ -0,0 +1,2 @@ +reagent-name-coldsauce = coldsauce +reagent-desc-coldsauce = Coldsauce. Leaves the tongue numb in its passage. diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 45e157b6e91..8af06f49954 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -517,6 +517,7 @@ - SalvageTechFabCircuitboardNF # Frontier - NFScrapProcessorCircuitboard # Frontier - BlueprintLithographMachineCircuitboard # Frontier + - CondimentDispenserCircuitboard # Frontier dynamicRecipes: - ThermomachineFreezerMachineCircuitBoard - HellfireFreezerMachineCircuitBoard diff --git a/Resources/Prototypes/_NF/Catalog/ReagentDispensers/condiments.yml b/Resources/Prototypes/_NF/Catalog/ReagentDispensers/condiments.yml new file mode 100644 index 00000000000..366a7b6c185 --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/ReagentDispensers/condiments.yml @@ -0,0 +1,11 @@ +- type: reagentDispenserInventory + id: CondimentDispenserInventory + inventory: + - DrinkAstrotameJug + - DrinkBbqSauceJug + - DrinkColdsauceJug + - DrinkHorseradishSauceJug + - DrinkHotsauceJug + - DrinkKetchupJug + - DrinkMustardJug + - DrinkSoysauceJug diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/condiments_bottles.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/condiments_bottles.yml new file mode 100644 index 00000000000..aea59ed3e51 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/condiments_bottles.yml @@ -0,0 +1,135 @@ +- type: entity + parent: DrinkBottlePlasticBaseFull + id: DrinkAstrotameJug + name: astrotame jug + description: The sweetness of a thousand sugars but none of the calories. Put it in your coffee. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 150 + reagents: + - ReagentId: Astrotame + Quantity: 150 + - type: Drink + - type: Label + currentLabel: reagent-name-astrotame + +- type: entity + parent: DrinkBottlePlasticBaseFull + id: DrinkBbqSauceJug + name: bbq sauce jug + description: Finally, ketchup for grownups. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 150 + reagents: + - ReagentId: BbqSauce + Quantity: 150 + - type: Drink + - type: Label + currentLabel: reagent-name-bbq-sauce + +- type: entity + parent: DrinkBottlePlasticBaseFull + id: DrinkColdsauceJug + name: coldsauce jug + description: Something to make every meal a little cooler. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 150 + reagents: + - ReagentId: Frostoil + Quantity: 150 + - type: Drink + - type: Label + currentLabel: reagent-name-coldsauce + +- type: entity + parent: DrinkBottlePlasticBaseFull + id: DrinkHorseradishSauceJug + name: horseradish sauce jug + description: Now with 50% more horse. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 150 + reagents: + - ReagentId: HorseradishSauce + Quantity: 150 + - type: Drink + - type: Label + currentLabel: reagent-name-horseradish-sauce + +- type: entity + parent: DrinkBottlePlasticBaseFull + id: DrinkHotsauceJug + name: hotsauce jug + description: The antithesis of no more tears shampoo. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 150 + reagents: + - ReagentId: Hotsauce + Quantity: 150 + - type: Drink + - type: Label + currentLabel: reagent-name-hotsauce + +- type: entity + parent: DrinkBottlePlasticBaseFull + id: DrinkKetchupJug + name: ketchup jug + description: Someone filled a tomato with sugar until it burst. Delicious. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 150 + reagents: + - ReagentId: Ketchup + Quantity: 150 + - type: Drink + - type: Label + currentLabel: reagent-name-ketchup + +- type: entity + parent: DrinkBottlePlasticBaseFull + id: DrinkMustardJug + name: mustard jug + description: All of the implications of real mustard with none of the flavor. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 150 + reagents: + - ReagentId: Mustard + Quantity: 150 + - type: Drink + - type: Label + currentLabel: reagent-name-mustard + +- type: entity + parent: DrinkBottlePlasticBaseFull + id: DrinkSoysauceJug + name: soy sauce jug + description: You can only dream of putting some of this on a bowl of rice. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 150 + reagents: + - ReagentId: Soysauce + Quantity: 150 + - type: Drink + - type: Label + currentLabel: reagent-name-soysauce diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks.yml index 761d49039ee..61a58dbf889 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks.yml @@ -95,3 +95,20 @@ - type: Icon sprite: _NF/Objects/Consumable/Drinks/beesknees.rsi state: icon + +# condiment cup +- type: entity + parent: DrinkWaterCup + id: CondimentCup + name: condiment cup + description: A flimsy cup that can be filled with condiments. Warranty void if filled with other things. + components: + - type: Sprite + sprite: _NF/Objects/Consumable/Drinks/condiment_cup.rsi + - type: Clothing + sprite: _NF/Clothing/Head/Hats/condiment_cup.rsi + - type: CondimentCup + - type: SolutionContainerManager + solutions: + drink: + maxVol: 10 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/condiments.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/condiments.yml index a6ab68876f6..6b43a731960 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/condiments.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/condiments.yml @@ -28,16 +28,9 @@ sprite: _NF/Objects/Consumable/Food/condiments.rsi - type: Icon sprite: _NF/Objects/Consumable/Food/condiments.rsi - # - type: EmitSoundOnActivate - # sound: - # collection: squeezeBottleUseSounds - # params: - # variation: 0.125 - # - type: EmitSoundOnLand - # sound: - # collection: squeezeBottleUseSounds - # params: - # variation: 0.125 + - type: CondimentSqueezeBottle + - type: FitsInDispenser + solution: food - type: entity parent: BaseFoodCondimentSqueezeBottle diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml index bfd5c43d1db..182d5c2add6 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml @@ -348,3 +348,22 @@ stackRequirements: Steel: 5 Plastic: 5 + +- type: entity + id: CondimentDispenserCircuitboard + parent: BaseMachineCircuitboard + name: condiment dispenser machine board + description: A machine printed circuit board for a condiment dispenser. + components: + - type: Sprite + state: service + - type: MachineBoard + prototype: CondimentDispenserEmpty + requirements: # Frontier + MatterBin: 1 # Frontier + stackRequirements: + Steel: 5 + tagRequirements: + GlassBeaker: + amount: 1 + defaultPrototype: Beaker diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/condimentcup.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/condimentcup.yml new file mode 100644 index 00000000000..5d236032593 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/condimentcup.yml @@ -0,0 +1,43 @@ +- type: entity + name: condiment cup dispenser + description: It holds little condiment cups. They claim to be recyled. + id: CondimentCupDispenser + parent: [BaseItem, PaperBin] + components: + - type: Sprite + sprite: _NF/Objects/Specific/Service/condiment_cup_dispenser.rsi + state: dispenser0 + - type: ItemMapper + sprite: _NF/Objects/Specific/Service/condiment_cup_dispenser.rsi + mapLayers: + dispenser1: + whitelist: + components: + - CondimentCup + - type: Bin + whitelist: + components: + - CondimentCup + +- type: entity + name: condiment cup dispenser + suffix: 10 + description: It holds little condiment cups. They claim to be recyled. + id: CondimentCupDispenser10 + parent: CondimentCupDispenser + components: + - type: Bin + initialContents: + - CondimentCup + - CondimentCup + - CondimentCup + - CondimentCup + - CondimentCup + - CondimentCup + - CondimentCup + - CondimentCup + - CondimentCup + - CondimentCup + whitelist: + components: + - CondimentCup diff --git a/Resources/Prototypes/_NF/Entities/Structures/Dispensers/condiments.yml b/Resources/Prototypes/_NF/Entities/Structures/Dispensers/condiments.yml new file mode 100644 index 00000000000..f0b25439ebb --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Structures/Dispensers/condiments.yml @@ -0,0 +1,36 @@ +- type: entity + parent: ReagentDispenserBase + id: CondimentDispenser + name: condiment dispenser + suffix: Filled + description: A condiment dispenser with a single slot for a condiment cup. + components: + - type: Rotatable + - type: Sprite + sprite: _NF/Structures/smalldispensers.rsi + drawdepth: SmallObjects + state: icon + - type: ReagentDispenser + storageWhitelist: + tags: + - DrinkBottle + pack: CondimentDispenserInventory + - type: Transform + noRot: false + - type: Machine + board: CondimentDispenserCircuitboard + - type: GuideHelp + guides: + - Bartender + - Drinks + +- type: entity + id: CondimentDispenserEmpty + suffix: Empty + parent: CondimentDispenser + components: + - type: ReagentDispenser + storageWhitelist: + tags: + - DrinkBottle + pack: EmptyInventory diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml index ae15f942792..9a8a5e67723 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml @@ -134,6 +134,8 @@ - FoodPlateSmallPlastic - NapkinDrum - Napkin + - CondimentCupDispenser + - CondimentCup - FoodCondimentSqueezeBottleClear ## EVA - ClothingOuterEVASuitHydro diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml b/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml index 96cd0950d1c..4de8b2c445e 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml @@ -46,6 +46,14 @@ Steel: 800 Glass: 900 +- type: latheRecipe + parent: BaseCircuitboardRecipe + id: CondimentDispenserCircuitboard + result: CondimentDispenserCircuitboard + materials: + Steel: 100 + Glass: 500 + # Thrusters - type: latheRecipe id: ThrusterSecurityMachineCircuitboard @@ -105,4 +113,4 @@ result: PortableGeneratorHyperPacmanMachineCircuitboard materials: Steel: 350 - Glass: 350 \ No newline at end of file + Glass: 350 diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/service.yml b/Resources/Prototypes/_NF/Recipes/Lathes/service.yml index 853acc01279..0d693561ceb 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/service.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/service.yml @@ -58,6 +58,21 @@ Plastic: 100 Steel: 100 +- type: latheRecipe + id: CondimentCupDispenser + result: CondimentCupDispenser + parent: BaseServiceItemsRecipe + applyMaterialDiscount: false + +- type: latheRecipe + id: CondimentCup + result: CondimentCup + parent: BaseServiceItemsRecipe + completetime: 0.1 + applyMaterialDiscount: false + materials: + Steel: 10 + - type: latheRecipe id: FoodCondimentSqueezeBottleClear result: FoodCondimentSqueezeBottleClear diff --git a/Resources/Prototypes/_NF/tags.yml b/Resources/Prototypes/_NF/tags.yml index e22609d87a2..1a7e9b6ff15 100644 --- a/Resources/Prototypes/_NF/tags.yml +++ b/Resources/Prototypes/_NF/tags.yml @@ -152,4 +152,4 @@ id: NFVGRoidInterior - type: Tag - id: NFFoamRPG \ No newline at end of file + id: NFFoamRPG diff --git a/Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..c2b156524af5f99df7b26f5b5fb37680fb51b66c GIT binary patch literal 324 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|{&~7MhE&XX zd+TCvvw?u?Mf26V3_FFz9XJDYN*bgWF+Wdc4O*l!X>XX?0o(Z=GmclZu=KQKZ=N;z z*S_#UiX5^aB-Uhndn6y!Cncv|F5-M?4ZZsyq?TOr`|)+p48 zqs#E#(-on27;nE@KIL2ScG;QBR<2s?)$@49(*1qaXSV2cPc3sOd~n?Cx65t&&sxrz zj6mlxFocJEwfb|`?wjii9gT)^hJ29&)(z%d4`dHWvwq-vuyzMS`tOe)UdukPkIHe| z{Ps(Qdq!ZxX?tcqb9sfm^940xUr+eV7_?im@$gx8kN4>;S-Zfdf{7gs(jHPl0yp2T Q`wQZGy85}Sb4q9e0OUx900000 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/icon.png b/Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..0d9a9acb6928f0ee5e7b3c62ce250ba596729525 GIT binary patch literal 229 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}^F3W0Ln2z= zUOvcsSV4g0fbSHh3#J7^vH=XL0lKXL%)AO#1#%Z%Tb?}pYHqF{edEn5mWJYUJL}7n z>rYt9f0J?g5w(76P<4=e^bXc;4hDzNi`B;^n)M3Pxn@|ZGwfmR6-}Cxx2vx%^|FU% z?5snNa~flNK0e;NwJcM9)d9I(LV_!_V%w}*mQG===>09uoyMnF%X?kP`Wu(k^Et%~ aA6Qg5^(DEI4u1eTmBG{1&t;ucLK6VH08&%{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/meta.json new file mode 100644 index 00000000000..e53406df8f1 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "equipped-HELMET, icon by wallflowerghost(discord), edited by dvir001 (GitHub)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/icon-0.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/icon-0.png new file mode 100644 index 0000000000000000000000000000000000000000..e570dc439c889d8892ffb5f6b86bacbae278885f GIT binary patch literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4&D_gC^*;C z#W5tJ_3h+?yv&L`Earh+4kiw~B9F2(8<}1(oa9xodJy-lcsj>#>GRwRkM7=P@W7() z@gHmb)5=Ow{@<61lyY_+{d?{>XeFTA1O0nTSdNhhsEXLn80|unV{L yJ_g#taDa8q8`DR3COo|ibSPhHglC$sFM}444RSaLTne5HqC8#wT-G@yGywpPH(wF} literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/icon-1.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/icon-1.png new file mode 100644 index 0000000000000000000000000000000000000000..589dcf55b36c1f8c89a815c203c86ba7c0b0b9bb GIT binary patch literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}mYyz-ArY-_ zFKlFFFyLTvyiuRAsXFVdQ&MBb@0NIlwz5oCK literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/meta.json new file mode 100644 index 00000000000..90542ff7b90 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "icon-0/1 by wallflowerghost(discord)", + "states": [ + { + "name": "icon-0" + }, + { + "name": "icon-1" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/dispenser0.png b/Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/dispenser0.png new file mode 100644 index 0000000000000000000000000000000000000000..c6d594488b7a9bb33c39fb1da076394b11b35c28 GIT binary patch literal 303 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}FFjoxLn2y} z6C_v{Cy4Zv9Pn6oY`6ctzwz5s^_hXdc|yN&^QInw$h3(|Gf)0v{(n9HPM1_`Z+&OFH@$BEXNAV`3j>_wVgoGPAi`AXOy;TqIb6ze10(0J+k$83{{?GyieRp|w10Z;F zv%KTs9aoPD|9^jOj!E|DXUb|0WS{V+;mZyNH)-u+osCJF&r@4ve{@mo@`c(9#kb#+*`S85j zc8PPbdyX9df)76N-7(1?{Y~rR?Ix?bo3a}K!Jogs*^h1liWnRG`|sQr_{5zNr0>4{ zlgKU}55C4lYa-lAMO}Fc%gXrLfSgI*&YQX)9Xpq)(dt)QDRwihw<*wo%k7|s#7zc< YKFy%}bJ^#m0|SV`)78&qol`;+0IeU2)&Kwi literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/meta.json b/Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/meta.json new file mode 100644 index 00000000000..6c27c69df8f --- /dev/null +++ b/Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by dustylens", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dispenser0" + }, + { + "name": "dispenser1" + } + ] +} diff --git a/Resources/Textures/_NF/Structures/smalldispensers.rsi/icon.png b/Resources/Textures/_NF/Structures/smalldispensers.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..de1dfe52b9ceb79092390a7dfa90ef0cbed31e98 GIT binary patch literal 804 zcmV+<1Ka$GP)Px%-bqA3R9J=Wlut+$VHn1LV?rn%I)t`p6m<$ef?Rg`b5bfRq&;+yh~17B9+ob3 z5MuS>K`-G=K}dJOTZf_TP(~wo5XVErhKF32z}9t?Fqa&Z*y%8ToN;%dV6)3U@G(2T zeZG00nR(xVnriyblFC8TG)>naNm8}BS9KMWRoGB1{zvlO!N1^8;T1UhD)_3!D+joF zuEC64Jqv)Y>%7hE@^00TIy*bf-rio9tE!5ss?s2s@kqqloJ=wV41#q1(Npum^AX#> z#q9V9@5e`dHA{M6U|_&atn2z;agxaj{w*JOR>>1cBob!Cxf3AixnQ-pqvhpghKGlx zvQyA~z7c@@^b_V^^fMjr1E8y`3xG@}!|d!VlarGG4B3qyiAHIQM#)5@0Ni-|41l%v z+sqkFyqy2U*w`2V>2w-^`opPYS*C8U2*AqseE@d$ipa7|v1svZHVZ(ZP(YStF4_B4 z`v zS=>+*rkb0XYHnr}$O1wLesr{vGPg;Y+r-T@4HugbLLh`7oldj9zFt0nD^KG%@5_3= zAIfs?WO(@^Yd-ER4xTAUBoY{BE6<`(E4uxp!3DFtv2Oz61@^x;B-IPWw7W0L112~2qsQM84%>!((lc*d-j?4lnShc2LI~%F%TD_2<+ Date: Sat, 4 Jan 2025 20:33:23 +0000 Subject: [PATCH 19/41] Automatic Changelog (#2637) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index e936661ccc9..8a37c6bfa0b 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -6230,3 +6230,9 @@ Entries: message: Adds clear condiment bottle and lathe recipe. id: 5629 time: '2025-01-04T16:53:52.0000000+00:00' +- author: dustylens + changes: + - type: Add + message: Condiment dispenser. + id: 5630 + time: '2025-01-04T20:32:57.0000000+00:00' From de59bb6b6de8831f0972c838c779f9f08420a162 Mon Sep 17 00:00:00 2001 From: dustylens <54123313+dustylens@users.noreply.github.com> Date: Sat, 4 Jan 2025 23:23:37 +0000 Subject: [PATCH 20/41] Adds colored light bulbs (#2636) * Adds colored light bulbs * Strobes with fills update. * It turns out I didn't need this. Whoops. * Un mess * My bad * Line cuts * Migration * Update general.yml * Update migration.yml * Update migration.yml * Fix * Cleanup * Update lathe.yml --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Dvir --- .../Spawners/Random/Salvage/tables_loot.yml | 2 + .../Entities/Structures/Machines/lathe.yml | 2 + .../Catalog/Fills/Boxes/general.yml | 29 ---- .../Catalog/Fills/Cargo/cargo_service.yml | 9 - .../Catalog/Fills/Crates/service.yml | 9 - .../Entities/Objects/Power/lights.yml | 50 ------ .../Objects/Specific/Power/lights.yml | 17 -- .../Structures/Lighting/base_lighting.yml | 8 - .../Structures/Lighting/colored_lighting.yml | 42 ----- .../_NF/Catalog/Cargo/cargo_service.yml | 10 ++ .../_NF/Catalog/Fills/Boxes/general.yml | 65 ++++++++ .../_NF/Catalog/Fills/Crates/service.yml | 10 ++ .../_NF/Entities/Objects/Power/lights.yml | 155 ++++++++++++++++++ .../Structures/Lighting/base_lighting.yml | 7 + .../Structures/Lighting/ground_lighting.yml | 11 ++ .../Structures/Lighting/strobe_lighting.yml | 113 +++++++++++++ .../Entities/Structures/Machines/lathe.yml | 14 +- .../Graphs/utilities/lighting.yml | 120 ++++++++++++++ .../_NF/Recipes/Construction/lighting.yml | 65 ++++++++ .../Prototypes/_NF/Recipes/Lathes/misc.yml | 16 +- .../Prototypes/_NF/Recipes/Lathes/service.yml | 18 ++ Resources/_NF/migration.yml | 10 ++ 22 files changed, 601 insertions(+), 181 deletions(-) delete mode 100644 Resources/Prototypes/Nyanotrasen/Catalog/Fills/Boxes/general.yml delete mode 100644 Resources/Prototypes/Nyanotrasen/Catalog/Fills/Cargo/cargo_service.yml delete mode 100644 Resources/Prototypes/Nyanotrasen/Catalog/Fills/Crates/service.yml delete mode 100644 Resources/Prototypes/Nyanotrasen/Entities/Objects/Power/lights.yml delete mode 100644 Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Power/lights.yml delete mode 100644 Resources/Prototypes/Nyanotrasen/Entities/Structures/Lighting/base_lighting.yml delete mode 100644 Resources/Prototypes/Nyanotrasen/Entities/Structures/Lighting/colored_lighting.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Power/lights.yml create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Lighting/base_lighting.yml create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Lighting/ground_lighting.yml create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Lighting/strobe_lighting.yml create mode 100644 Resources/Prototypes/_NF/Recipes/Construction/Graphs/utilities/lighting.yml create mode 100644 Resources/Prototypes/_NF/Recipes/Construction/lighting.yml diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml index 71eda92b8e4..89376c39294 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml @@ -196,6 +196,8 @@ - id: BoxInflatable # Frontier - id: BoxLighttube # Frontier - id: BoxLightbulb # Frontier + - id: BoxColoredLighttube # Frontier + - id: BoxColoredLightbulb # Frontier - type: entityTable id: SalvageEquipmentUncommon diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 8af06f49954..4d2afe193da 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -157,6 +157,8 @@ - ExteriorLightTube - LightBulb - LedLightBulb + - SodiumLightBulb # Frontier + - ExteriorLightBulb #Frontier - Bucket - DrinkMug - DrinkMugMetal diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Boxes/general.yml deleted file mode 100644 index 15b74b7451d..00000000000 --- a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Boxes/general.yml +++ /dev/null @@ -1,29 +0,0 @@ -- type: entity - name: colored lighttube box - parent: BoxCardboard - id: BoxColoredLighttube - description: This box is shaped on the inside so that only light tubes and bulbs fit. - components: - - type: StorageFill - contents: - - id: ColoredLightTubeRed - amount: 4 - - id: ColoredLightTubeFrostyBlue - amount: 4 - - id: ColoredLightTubeBlackLight - amount: 4 - - type: Sprite - layers: - - state: box - - state: lighttube - - type: Storage - maxItemSize: Small - grid: - - 0,0,5,3 - whitelist: - components: - - LightBulb - - type: Tag - tags: - - DroneUsable - \ No newline at end of file diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Cargo/cargo_service.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Cargo/cargo_service.yml deleted file mode 100644 index 55c28222bd7..00000000000 --- a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Cargo/cargo_service.yml +++ /dev/null @@ -1,9 +0,0 @@ -- type: cargoProduct - id: ServiceColoredLightsReplacement - icon: - sprite: Objects/Power/light_bulb.rsi - state: normal - product: CrateServiceReplacementColoredLights - cost: 600 - category: Service - group: market diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Crates/service.yml deleted file mode 100644 index eda100a8755..00000000000 --- a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Crates/service.yml +++ /dev/null @@ -1,9 +0,0 @@ -- type: entity - id: CrateServiceReplacementColoredLights - name: Colored Lights Crate - parent: CrateGenericSteel - components: - - type: StorageFill - contents: - - id: BoxColoredLighttube - amount: 2 diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Power/lights.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Power/lights.yml deleted file mode 100644 index a5910a81c80..00000000000 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Power/lights.yml +++ /dev/null @@ -1,50 +0,0 @@ -- type: entity - parent: BaseLightbulb - name: red light tube - description: A colorful light tube. These emit a red hue. - id: ColoredLightTubeRed - components: - - type: LightBulb - bulb: Tube - color: "#FF6666" - lightEnergy: 0.8 - lightRadius: 10 - lightSoftness: 0.5 - PowerUse: 25 - - type: Sprite - sprite: Objects/Power/light_tube.rsi - state: normal - -- type: entity - parent: BaseLightbulb - name: blue light tube - description: A colorful light tube. These emit a frosty blue hue. - id: ColoredLightTubeFrostyBlue - components: - - type: LightBulb - bulb: Tube - color: "#00FFFF" - lightEnergy: 0.8 - lightRadius: 10 - lightSoftness: 1 - PowerUse: 25 - - type: Sprite - sprite: Objects/Power/light_tube.rsi - state: normal - -- type: entity - parent: BaseLightbulb - name: black light tube - description: A colorful light tube. These emit "black light". - id: ColoredLightTubeBlackLight - components: - - type: LightBulb - bulb: Tube - color: "#5D0CED" - lightEnergy: 0.8 - lightRadius: 10 - lightSoftness: 1 - PowerUse: 25 - - type: Sprite - sprite: Objects/Power/light_tube.rsi - state: normal diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Power/lights.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Power/lights.yml deleted file mode 100644 index e984f148e55..00000000000 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Power/lights.yml +++ /dev/null @@ -1,17 +0,0 @@ -- type: entity - parent: BaseLightbulb - name: blue light tube - description: A medium power high energy bulb that reminds you of space. May contain mercury. - id: BlueLightTube - components: - - type: LightBulb - bulb: Tube - color: "#B4FCF0" - lightEnergy: 3 - lightRadius: 12 - lightSoftness: 0.5 - BurningTemperature: 350 - PowerUse: 75 - - type: Sprite - sprite: Objects/Power/light_tube.rsi - state: normal diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Lighting/base_lighting.yml deleted file mode 100644 index 3b9627cede8..00000000000 --- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Lighting/base_lighting.yml +++ /dev/null @@ -1,8 +0,0 @@ -- type: entity - parent: PoweredlightExterior - id: PoweredlightBlueInterior - suffix: Blue Interior - description: "A light fixture. Draws power and produces light when equipped with a light tube." - components: - - type: PoweredLight - hasLampOnSpawn: BlueLightTube diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Lighting/colored_lighting.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Lighting/colored_lighting.yml deleted file mode 100644 index 95d2e02204a..00000000000 --- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Lighting/colored_lighting.yml +++ /dev/null @@ -1,42 +0,0 @@ -#Colored lights - -- type: entity - id: PoweredlightColoredRed - description: "A light fixture. Draws power and produces light when equipped with a light tube." - suffix: Red - parent: Poweredlight - components: - - type: PoweredLight - hasLampOnSpawn: ColoredLightTubeRed - -- type: entity - id: PoweredlightColoredFrostyBlue - description: "A light fixture. Draws power and produces light when equipped with a light tube." - suffix: Frosty - parent: Poweredlight - components: - - type: PoweredLight - hasLampOnSpawn: ColoredLightTubeFrostyBlue - -- type: entity - id: PoweredlightColoredBlack - description: "A light fixture. Draws power and produces light when equipped with a light tube." - suffix: Black - parent: Poweredlight - components: - - type: PoweredLight - hasLampOnSpawn: ColoredLightTubeBlackLight - -- type: entity - id: PoweredLightPostSmallRed - name: post light - description: "A light fixture. Draws power and produces light when equipped with a light tube." - suffix: Red - parent: PoweredLightPostSmallEmpty - components: - - type: Sprite - layers: - - state: base - map: [ "enum.PoweredLightLayers.Base" ] - - type: PoweredLight - hasLampOnSpawn: ColoredLightTubeRed diff --git a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_service.yml b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_service.yml index d471a927a03..0dbecc70f0e 100644 --- a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_service.yml +++ b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_service.yml @@ -28,3 +28,13 @@ cost: 1500 category: cargoproduct-category-name-service group: market + +- type: cargoProduct + id: ServiceColoredLightsReplacement + icon: + sprite: Objects/Power/light_bulb.rsi + state: normal + product: CrateServiceReplacementColoredLights + cost: 600 + category: Service + group: market diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml index d738dec2d9e..2a0d10e04cb 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml @@ -142,3 +142,68 @@ whitelist: components: - LightBulb + +- type: entity + name: colored lighttube box + parent: BoxCardboard + id: BoxColoredLighttube + description: This box is shaped on the inside so that only light tubes and bulbs fit. + components: + - type: StorageFill + contents: + - id: LightTubeCrystalCyan + amount: 2 + - id: LightTubeCrystalBlue + amount: 2 + - id: LightTubeCrystalPink + amount: 2 + - id: LightTubeCrystalOrange + amount: 2 + - id: LightTubeCrystalRed + amount: 2 + - id: LightTubeCrystalGreen + amount: 2 + - type: Sprite + layers: + - state: box + - state: lighttube + - type: Storage + maxItemSize: Small + grid: + - 0,0,5,3 + whitelist: + components: + - LightBulb + +- type: entity + name: colored bulbs box + parent: BoxLightbulb + id: BoxColoredLightbulb + description: This box is shaped on the inside so that only light tubes and bulbs fit. It's full of neat colored light bulbs! + components: + - type: StorageFill + contents: + - id: LightBulbCrystalCyan + amount: 2 + - id: LightBulbCrystalBlue + amount: 2 + - id: LightBulbCrystalPink + amount: 2 + - id: LightBulbCrystalOrange + amount: 2 + - id: LightBulbCrystalRed + amount: 2 + - id: LightBulbCrystalGreen + amount: 2 + - type: Sprite + layers: + - state: box + - state: light + color: "cyan" + - type: Storage + maxItemSize: Small + grid: + - 0,0,5,3 + whitelist: + components: + - LightBulb diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/service.yml index 51c472147f9..b083029342c 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/service.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/service.yml @@ -22,3 +22,13 @@ contents: - id: NFVehicleJanicart - id: VehicleKeyJanicart + +- type: entity + id: CrateServiceReplacementColoredLights + name: colored lights crate + parent: CrateGenericSteel + components: + - type: StorageFill + contents: + - id: BoxColoredLighttube + - id: BoxColoredLightbulb diff --git a/Resources/Prototypes/_NF/Entities/Objects/Power/lights.yml b/Resources/Prototypes/_NF/Entities/Objects/Power/lights.yml new file mode 100644 index 00000000000..af3222d17b5 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Power/lights.yml @@ -0,0 +1,155 @@ +- type: entity + parent: BaseLightTube + name: black crystal light tube + id: LightTubeCrystalBlack + description: A high power high energy bulb which has a small colored crystal inside. + components: + - type: LightBulb + color: "#5D0CED" + lightEnergy: 3 + lightRadius: 8 + lightSoftness: 0.5 + BurningTemperature: 350 + PowerUse: 60 + - type: ToolRefinable + refineResult: + - id: SheetGlass1 +# - id: ShardCrystalBlack + +- type: entity + parent: LightBulb + name: cyan crystal light bulb + id: LightBulbCrystalCyan + description: A colorful light bulb with a small colored crystal inside. + components: + - type: LightBulb + color: "#47f8ff" + lightEnergy: 1.0 + lightRadius: 6 + lightSoftness: 1.1 + - type: Construction + graph: CyanLight + node: icon + - type: ToolRefinable + refineResult: + - id: SheetGlass1 + - id: ShardCrystalCyan + +- type: entity + parent: LightBulb + name: blue crystal light bulb + id: LightBulbCrystalBlue + description: A colorful light bulb with a small colored crystal inside. + components: + - type: LightBulb + color: "#39a1ff" + lightEnergy: 1.0 + lightRadius: 6 + lightSoftness: 1.1 + - type: Construction + graph: BlueLight + node: icon + - type: ToolRefinable + refineResult: + - id: SheetGlass1 + - id: ShardCrystalBlue + +- type: entity + parent: LightBulb + name: pink crystal light bulb + id: LightBulbCrystalPink + description: A colorful light bulb with a small colored crystal inside. + components: + - type: LightBulb + color: "#ff66cc" + lightEnergy: 1.0 + lightRadius: 6 + lightSoftness: 1.1 + - type: Construction + graph: PinkLight + node: icon + - type: ToolRefinable + refineResult: + - id: SheetGlass1 + - id: ShardCrystalPink + +- type: entity + parent: LightBulb + name: orange crystal light bulb + id: LightBulbCrystalOrange + description: A colorful light bulb with a small colored crystal inside. + components: + - type: LightBulb + color: "#ff8227" + lightEnergy: 1.0 + lightRadius: 6 + lightSoftness: 1.1 + - type: Construction + graph: OrangeLight + node: icon + - type: ToolRefinable + refineResult: + - id: SheetGlass1 + - id: ShardCrystalOrange + +- type: entity + parent: LightBulb + name: red crystal light bulb + id: LightBulbCrystalRed + description: A colorful light bulb with a small colored crystal inside. + components: + - type: LightBulb + color: "#fb4747" + lightEnergy: 1.0 + lightRadius: 6 + lightSoftness: 1.1 + - type: Construction + graph: RedLight + node: icon + - type: ToolRefinable + refineResult: + - id: SheetGlass1 + - id: ShardCrystalRed + +- type: entity + parent: LightBulb + name: green crystal light bulb + id: LightBulbCrystalGreen + description: A colorful light bulb with a small colored crystal inside. + components: + - type: LightBulb + color: "#52ff39" + lightEnergy: 1.0 + lightRadius: 6 + lightSoftness: 1.1 + - type: Construction + graph: GreenLight + node: icon + - type: ToolRefinable + refineResult: + - id: SheetGlass1 + - id: ShardCrystalGreen + +- type: entity + parent: LightBulb + name: sodium light bulb + id: SodiumLightBulb + description: A harsh lightbulb that both alarms and depresses you. + components: + - type: LightBulb + color: "#FFAF38" + lightEnergy: 4 + lightRadius: 8 + lightSoftness: 0.7 + +- type: entity + parent: LightBulb + name: exterior light bulb + id: ExteriorLightBulb + description: A colorful light bulb with a small colored crystal inside. + components: + - type: LightBulb + color: "#B4FCF0" + lightEnergy: 4.5 + lightRadius: 8 + lightSoftness: 0.7 diff --git a/Resources/Prototypes/_NF/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/_NF/Entities/Structures/Lighting/base_lighting.yml new file mode 100644 index 00000000000..83a448b9683 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Structures/Lighting/base_lighting.yml @@ -0,0 +1,7 @@ +- type: entity + id: PoweredlightBlack + suffix: Black + parent: Poweredlight + components: + - type: PoweredLight + hasLampOnSpawn: LightTubeCrystalBlack diff --git a/Resources/Prototypes/_NF/Entities/Structures/Lighting/ground_lighting.yml b/Resources/Prototypes/_NF/Entities/Structures/Lighting/ground_lighting.yml new file mode 100644 index 00000000000..cdf5befc804 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Structures/Lighting/ground_lighting.yml @@ -0,0 +1,11 @@ +- type: entity + id: PoweredLightPostSmallRed + suffix: Red + parent: PoweredLightPostSmall + components: + - type: Sprite + layers: + - state: base + map: [ "enum.PoweredLightLayers.Base" ] + - type: PoweredLight + hasLampOnSpawn: PoweredlightRed diff --git a/Resources/Prototypes/_NF/Entities/Structures/Lighting/strobe_lighting.yml b/Resources/Prototypes/_NF/Entities/Structures/Lighting/strobe_lighting.yml new file mode 100644 index 00000000000..b1cbfb866df --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Structures/Lighting/strobe_lighting.yml @@ -0,0 +1,113 @@ +- type: entity + parent: PoweredStrobeLightEmpty + id: PoweredStrobeIncandescent + suffix: Incandescent + components: + - type: PointLight + enabled: true + color: "#FFD1A3" # 4000K color temp + energy: 1.0 + radius: 6 + softness: 1.1 + - type: PoweredLight + hasLampOnSpawn: LightBulb + +- type: entity + parent: PoweredStrobeLightEmpty + id: PoweredStrobeLed + suffix: LED + components: + - type: PointLight + enabled: true + - type: PoweredLight + hasLampOnSpawn: LedLightBulb + +- type: entity + parent: PoweredStrobeLightEmpty + id: PoweredStrobeService + suffix: Service + components: + - type: PointLight + enabled: true + - type: PoweredLight + hasLampOnSpawn: ServiceLightBulb + +- type: entity + parent: PoweredStrobeLightEmpty + id: PoweredStrobeSodium + suffix: Sodium + components: + - type: PointLight + enabled: true + - type: PoweredLight + hasLampOnSpawn: SodiumLightBulb + +- type: entity + parent: PoweredStrobeLightEmpty + id: PoweredStrobeExterior + suffix: Exterior + components: + - type: PointLight + enabled: true + - type: PoweredLight + hasLampOnSpawn: ExteriorLightBulb + +- type: entity + parent: PoweredStrobeLightEmpty + id: PoweredStrobeCyan + suffix: Cyan + components: + - type: PointLight + enabled: true + - type: PoweredLight + hasLampOnSpawn: LightBulbCrystalCyan + +- type: entity + parent: PoweredStrobeLightEmpty + id: PoweredStrobeBlue + suffix: Blue + components: + - type: PointLight + enabled: true + - type: PoweredLight + hasLampOnSpawn: LightBulbCrystalBlue + +- type: entity + parent: PoweredStrobeLightEmpty + id: PoweredStrobePink + suffix: Pink + components: + - type: PointLight + enabled: true + - type: PoweredLight + hasLampOnSpawn: LightBulbCrystalPink + +- type: entity + parent: PoweredStrobeLightEmpty + id: PoweredStrobeOrange + suffix: Orange + components: + - type: PointLight + enabled: true + - type: PoweredLight + hasLampOnSpawn: LightBulbCrystalOrange + +- type: entity + parent: PoweredStrobeLightEmpty + id: PoweredStrobeRed + suffix: Red + components: + - type: PointLight + enabled: true + - type: PoweredLight + hasLampOnSpawn: LightBulbCrystalRed + +- type: entity + parent: PoweredStrobeLightEmpty + id: PoweredStrobeGreen + suffix: Green + components: + - type: PointLight + enabled: true + - type: PoweredLight + hasLampOnSpawn: LightBulbCrystalGreen diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml index 9a8a5e67723..1bdfeedf63a 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml @@ -76,6 +76,8 @@ - ExteriorLightTube - LightBulb - LedLightBulb + - SodiumLightBulb + - ExteriorLightBulb - ConveyorBeltAssembly - PowerCellSmall - PowerCellMedium @@ -238,6 +240,8 @@ - ExteriorLightTube - LightBulb - LedLightBulb + - SodiumLightBulb + - ExteriorLightBulb - ConveyorBeltAssembly - PowerCellSmall - PowerCellMedium @@ -395,6 +399,8 @@ - ExteriorLightTube - LightBulb - LedLightBulb + - SodiumLightBulb + - ExteriorLightBulb - ConveyorBeltAssembly - PowerCellSmall - PowerCellMedium @@ -646,6 +652,8 @@ - ExteriorLightTube - LightBulb - LedLightBulb + - SodiumLightBulb + - ExteriorLightBulb - ConveyorBeltAssembly - PowerCellSmall - PowerCellMedium @@ -863,6 +871,8 @@ - ExteriorLightTube - LightBulb - LedLightBulb + - SodiumLightBulb + - ExteriorLightBulb - ConveyorBeltAssembly - PowerCellSmall - PowerCellMedium @@ -873,10 +883,6 @@ - WeaponCapacitorRechargerCircuitboard - AirTank # Mercenary techfab - ## Utility - - ColoredLightTubeRedNF - - ColoredLightTubeBlackLightNF - - ColoredLightTubeFrostyBlueNF ## Clothing / Armor - RiotShield - ClothingHandsMercenaryGlovesCombat diff --git a/Resources/Prototypes/_NF/Recipes/Construction/Graphs/utilities/lighting.yml b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/utilities/lighting.yml new file mode 100644 index 00000000000..8deb0b4871f --- /dev/null +++ b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/utilities/lighting.yml @@ -0,0 +1,120 @@ +- type: constructionGraph + id: CyanLightBulb + start: start + graph: + - node: start + edges: + - to: icon + steps: + - material: Glass + amount: 1 + doAfter: 1 + - tag: CrystalCyan + name: cyan crystal shard + icon: + sprite: Objects/Materials/Shards/crystal.rsi + state: shard1 + color: #52ff39 + doAfter: 1 + - node: icon + entity: LightBulbCrystalCyan + +- type: constructionGraph + id: BlueLightBulb + start: start + graph: + - node: start + edges: + - to: icon + steps: + - material: Glass + amount: 2 + doAfter: 1 + - tag: CrystalBlue + name: blue crystal shard + icon: + sprite: Objects/Materials/Shards/crystal.rsi + state: shard1 + doAfter: 1 + - node: icon + entity: LightBulbCrystalBlue + +- type: constructionGraph + id: PinkLightBulb + start: start + graph: + - node: start + edges: + - to: icon + steps: + - material: Glass + amount: 2 + doAfter: 1 + - tag: CrystalPink + name: pink crystal shard + icon: + sprite: Objects/Materials/Shards/crystal.rsi + state: shard1 + doAfter: 1 + - node: icon + entity: LightBulbCrystalPink + +- type: constructionGraph + id: OrangeLightBulb + start: start + graph: + - node: start + edges: + - to: icon + steps: + - material: Glass + amount: 2 + doAfter: 1 + - tag: CrystalOrange + name: orange crystal shard + icon: + sprite: Objects/Materials/Shards/crystal.rsi + state: shard1 + doAfter: 1 + - node: icon + entity: LightBulbCrystalOrange + +- type: constructionGraph + id: RedLightBulb + start: start + graph: + - node: start + edges: + - to: icon + steps: + - material: Glass + amount: 2 + doAfter: 1 + - tag: CrystalRed + name: red crystal shard + icon: + sprite: Objects/Materials/Shards/crystal.rsi + state: shard1 + doAfter: 1 + - node: icon + entity: LightBulbCrystalRed + +- type: constructionGraph + id: GreenLightBulb + start: start + graph: + - node: start + edges: + - to: icon + steps: + - material: Glass + amount: 2 + doAfter: 1 + - tag: CrystalGreen + name: green crystal shard + icon: + sprite: Objects/Materials/Shards/crystal.rsi + state: shard1 + doAfter: 1 + - node: icon + entity: LightBulbCrystalGreen diff --git a/Resources/Prototypes/_NF/Recipes/Construction/lighting.yml b/Resources/Prototypes/_NF/Recipes/Construction/lighting.yml new file mode 100644 index 00000000000..74d4c74f130 --- /dev/null +++ b/Resources/Prototypes/_NF/Recipes/Construction/lighting.yml @@ -0,0 +1,65 @@ +- type: construction + name: cyan light bulb + id: CyanLightBulb + graph: CyanLightBulb + startNode: start + targetNode: icon + category: construction-category-utilities + description: A high powered light tube containing a cyan crystal + icon: { sprite: Objects/Power/light_bulb.rsi, state: normal } + objectType: Item + +- type: construction + name: blue light bulb + id: BlueLightBulb + graph: BlueLightBulb + startNode: start + targetNode: icon + category: construction-category-utilities + description: A high powered light tube containing a blue crystal + icon: { sprite: Objects/Power/light_bulb.rsi, state: normal } + objectType: Item + +- type: construction + name: pink light bulb + id: PinkLightBulb + graph: PinkLightBulb + startNode: start + targetNode: icon + category: construction-category-utilities + description: A high powered light tube containing a pink crystal + icon: { sprite: Objects/Power/light_bulb.rsi, state: normal } + objectType: Item + +- type: construction + name: orange light bulb + id: OrangeLightBulb + graph: OrangeLightBulb + startNode: start + targetNode: icon + category: construction-category-utilities + description: A high powered light tube containing an orange crystal + icon: { sprite: Objects/Power/light_bulb.rsi, state: normal } + objectType: Item + +- type: construction + name: red light bulb + id: RedLightBulb + graph: RedLightBulb + startNode: start + targetNode: icon + category: construction-category-utilities + description: A high powered light tube containing a red crystal + icon: { sprite: Objects/Power/light_bulb.rsi, state: normal } + objectType: Item + +- type: construction + name: green light bulb + id: GreenLightBulb + graph: GreenLightBulb + startNode: start + targetNode: icon + category: construction-category-utilities + description: A high powered light tube containing a green crystal + icon: { sprite: Objects/Power/light_bulb.rsi, state: normal } + objectType: Item diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml b/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml index ab7e9f825a5..8aeedcd6908 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml @@ -132,19 +132,9 @@ result: ClothingNeckIFFPurple parent: NFWearableIFFRecipe -- type: latheRecipe - id: ColoredLightTubeRedNF - result: ColoredLightTubeRed - parent: NFBaseLightTubeRecipe - -- type: latheRecipe - id: ColoredLightTubeBlackLightNF - result: ColoredLightTubeBlackLight - parent: NFBaseLightTubeRecipe - -- type: latheRecipe - id: ColoredLightTubeFrostyBlueNF - result: ColoredLightTubeFrostyBlue +- type: latheRecipe # Remove this ones we have a black crystal + id: LightTubeCrystalBlack + result: LightTubeCrystalBlack parent: NFBaseLightTubeRecipe - type: latheRecipe diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/service.yml b/Resources/Prototypes/_NF/Recipes/Lathes/service.yml index 0d693561ceb..16738728adf 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/service.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/service.yml @@ -80,3 +80,21 @@ applyMaterialDiscount: false materials: Plastic: 50 + +- type: latheRecipe + id: SodiumLightBulb + result: SodiumLightBulb + category: Lights + completetime: 2 + materials: + Steel: 50 + Glass: 50 + +- type: latheRecipe + id: ExteriorLightBulb + result: ExteriorLightBulb + category: Lights + completetime: 2 + materials: + Steel: 50 + Glass: 50 diff --git a/Resources/_NF/migration.yml b/Resources/_NF/migration.yml index b64ad3579c4..f17c5ceb6af 100644 --- a/Resources/_NF/migration.yml +++ b/Resources/_NF/migration.yml @@ -181,3 +181,13 @@ CrateSpaceCleaner: ChemicalBarrelSpaceCleaner ScienceTechFab: UnfinishedMachineFrame ScienceTechFabCircuitboard: ProtolatheMachineCircuitboard ScienceTechFabFlatpack: ProtolatheFlatpack + +# 2025-01-05 Lights +ColoredLightTubeRed: LightTubeCrystalRed +ColoredBlueLightTube: LightTubeCrystalBlue +ColoredLightTubeCyan: LightTubeCrystalCyan +ColoredLightTubeBlackLight: PoweredlightBlack +PoweredlightColoredRed: PoweredlightRed +PoweredlightBlueInterior: PoweredlightBlue +PoweredlightColoredFrostyBlue: PoweredlightCyan +PoweredlightColoredBlack: LightTubeCrystalBlack From 78a49332c1f5fbae4c4c4c30a4511439daa03612 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Sat, 4 Jan 2025 23:24:07 +0000 Subject: [PATCH 21/41] Automatic Changelog (#2636) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 8a37c6bfa0b..3f2423429e8 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -6236,3 +6236,9 @@ Entries: message: Condiment dispenser. id: 5630 time: '2025-01-04T20:32:57.0000000+00:00' +- author: dustylens + changes: + - type: Add + message: Colored craftable lightbulbs and prefilled light strobes.! + id: 5631 + time: '2025-01-04T23:23:37.0000000+00:00' From 027c1a984cbdf55b2ae1bf68efaa1223a0cad3cc Mon Sep 17 00:00:00 2001 From: dustylens <54123313+dustylens@users.noreply.github.com> Date: Sun, 5 Jan 2025 01:40:12 +0000 Subject: [PATCH 22/41] Adds ice sink (#2635) * Adds ice sink * buckets of fun * Making sure the recipe isn't a steel * Update service.yml * Update drinks_special.yml * Update drinks_special.yml * Update service.yml --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- .../Consumable/Drinks/drinks_special.yml | 17 ++++++++ .../Entities/Structures/Furniture/icebox.yml | 39 ++++++++++++++++++ .../Entities/Structures/Machines/lathe.yml | 1 + .../Prototypes/_NF/Recipes/Lathes/service.yml | 8 ++++ .../Furniture/icebox.rsi/icebox.png | Bin 0 -> 1623 bytes .../Furniture/icebox.rsi/icebox_fill-1.png | Bin 0 -> 585 bytes .../Structures/Furniture/icebox.rsi/meta.json | 19 +++++++++ 7 files changed, 84 insertions(+) create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_special.yml create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Furniture/icebox.yml create mode 100644 Resources/Textures/_NF/Structures/Furniture/icebox.rsi/icebox.png create mode 100644 Resources/Textures/_NF/Structures/Furniture/icebox.rsi/icebox_fill-1.png create mode 100644 Resources/Textures/_NF/Structures/Furniture/icebox.rsi/meta.json diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_special.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_special.yml new file mode 100644 index 00000000000..540220d33a0 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_special.yml @@ -0,0 +1,17 @@ +- type: entity + parent: [BaseItem, BartenderMixer] + id: DrinkIceBucketEmpty + name: ice bucket + suffix: empty + description: A special bucket that was specifically designed to hold ice. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 200 + - type: Sprite + sprite: Objects/Consumable/Drinks/icebucket.rsi + state: icon + - type: PhysicalComposition + materialComposition: + Steel: 50 diff --git a/Resources/Prototypes/_NF/Entities/Structures/Furniture/icebox.yml b/Resources/Prototypes/_NF/Entities/Structures/Furniture/icebox.yml new file mode 100644 index 00000000000..7cecd0fd444 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Structures/Furniture/icebox.yml @@ -0,0 +1,39 @@ +- type: entity + name: ice box + description: This delightful machine is slowly filling with ice! + id: IceboxEmpty + parent: SinkEmpty + components: + - type: Sprite + sprite: _NF/Structures/Furniture/icebox.rsi + layers: + - state: icebox + - map: [ "enum.SolutionContainerLayers.Fill" ] + state: icebox_fill-1 + visible: false + - type: Appearance + - type: SolutionContainerVisuals + maxFillLevels: 1 + fillBaseName: icebox_fill- + solutionName: drainBuffer + - type: SolutionRegeneration + solution: tank + generated: + reagents: + - ReagentId: Ice + Quantity: 1 + +- type: entity + name: ice box + id: Icebox + parent: IceboxEmpty + suffix: Ice + components: + - type: SolutionContainerManager + solutions: + drainBuffer: + maxVol: 100 + tank: + reagents: + - ReagentId: Ice + Quantity: 500 diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml index 1bdfeedf63a..b0536262c3b 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml @@ -117,6 +117,7 @@ - DrinkMug - DrinkMugMetal - DrinkGlass + - DrinkIceBucketEmpty - KitchenKnife - ButchCleaver - ServiceRollingPin diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/service.yml b/Resources/Prototypes/_NF/Recipes/Lathes/service.yml index 16738728adf..9c9d221e705 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/service.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/service.yml @@ -98,3 +98,11 @@ materials: Steel: 50 Glass: 50 + +- type: latheRecipe + id: DrinkIceBucketEmpty + result: DrinkIceBucketEmpty + parent: BaseServiceItemsRecipe + completetime: 2 + materials: + Steel: 100 diff --git a/Resources/Textures/_NF/Structures/Furniture/icebox.rsi/icebox.png b/Resources/Textures/_NF/Structures/Furniture/icebox.rsi/icebox.png new file mode 100644 index 0000000000000000000000000000000000000000..0fdbd26947583c21a2ecb342a67bc210586f1182 GIT binary patch literal 1623 zcmV-d2B`UoP)Px*5lKWrRCt{2nq6oVR}{y8v(9FAlB~(b+S)?tRxnC^Fa#o6sYUu^LG&eIZ7H<{ zrBG2945c9bq92Gtx}|+6LTQC!Y9DG4^r=WHB*j$vQXdqeOY}hr$t2k%vmfK$KHQ!C zh&!`uSLu;y=VRk6%gr*2$bB30Q*=GAe7u5h2p;o0wH@bc=n7^ z#;j+cx?PO)Ma0o)w1j^plsHBK5MuD`pl6-n=zvIHMD$0GaO;J&jHxXE^jHf34Eb8v zot4MwY!-md+i^|~4CMdcm@xqO^3%^iK@9%lO(*!AFDW1t#?%%zr4#g63!FP12Vkd_ zU|49Rvsp$JohF|&W11$WX#z4@LhT`GN_dhx;Nk!U0ZQppS3caxk474RX1~hSwA>F1 z4FEHh1Yj}e1ep_{y20~g;5Y>A8@EFokYOKcVpwQ2%_rCz@bUM3i)OzxqX5ZN5={%_ z6QSZ^^57By6Y+6C;lhatE~-I{DT8655mq(c_QT#*ov^Br%sp)z0WE+6ghCzpH-@z3 zO*lq?9lpm7w7^tcHqOjG&~HD0IRz_&#EO!jjrq9*-pv4RLqLH;hY#{i?Aw}t;LzcN zc-aHa^8f+c_w-5vHQ=>3-{tq8f2hgE+x?#`69>un(xXASV{Rkf{Y4|;hT;64OEI>AP;Jw#&0pzUGXJp3kfnFy7_CiP$1 zJRAVd4k!-WTF5W8DtV>K!Cg zNd#aR)A@-;lh4PfqLa>M85SBlEx8gscRWsywZNuyBJT({c-{d4EkHmE(5&l-qLekJ zwy@GC9nq9B8C7I-?D-(fkWUidlunejSq#q(0UO21O`-6;0U&9bgj;pOt#*sXPZ=<# z3@)w;A-=js_W}1P@T>zS;^P=|vp6NecP8WVptL5-`}V=qEF5UTn45Ji%6irT07I89 zvwO!YHQR85ryY>->kM7GOvbO{&zKKftEMfyZasgv{DxCA8dTz?+MW8NQ70Ro*7&%g z!g5*+o*h(FTL^XHYx!y0Tr5l^lBuNB_|%~jZ1VqvRs-afEgSxv1jsLw3o}6h#>_OD zCKn&6oZO|}k3!K zyJd+N+k=d$lB#;&LhN`}>Y6BWz?o;l1auv1g=|{PSZoz0>u<;Z|2uw!=)4`Lv)qN1 zQoEpbtdiMLZ4F`}i37ZW)8CAHYV03EABg$U?H5|1k>K)yHMX!CTv zq$=3bT|21@pu?8%QZxhx&);Olu1>BQl`E#qqD0$}kAT#Ln<&7wEpjN>@6F`^`^ysKB)mmX0n%jI`;r{{%-zZD#K(yZ#7L7ZyTt}#o)$YhVIn@xsqar=%*~eFY+forxT~AkK&-5x za94L-IsoA5&J7iLsQ~Iz&k^n_?O;n^GyeKr6J-24;jZqIwxzsOfHuYAu7mWoSSea> zSSs~h%In_bT;VNX6D=owtw-FOlv%tIuaecElK`^b;l|51a%If5Q)0%z?o&?~zjYmO z=QV!ox{QE_k-pXws^R4Wl=pgfJ9g^dzYprOLRJ;8Vq#8<-+ClpjOEI!fd(E0{srlT Vxd6d&xRn3^002ovPDHLkV1iSP4lw`# literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Furniture/icebox.rsi/icebox_fill-1.png b/Resources/Textures/_NF/Structures/Furniture/icebox.rsi/icebox_fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..2cab252864c7eb49a268231eae3aee846607fde8 GIT binary patch literal 585 zcmV-P0=E5$P)Kp*j1NPt9;zQR=b!qRq#{`52?Cg z36BX+EL*z6o5Ia%I=(1;EF3W8g2LC1o^bie;griC4jZvZ7`zR_O6nIUezBT1vcmFm z+OwI0`g0%WCH`b?Ix1_M%vMYyj1od&oMFNQ>19xSkS_Y@mK|mCd%p9h$V;v&UZ;q` z5-HMH1Vk-J^`xwt=t&tFicbIk_SMw-``qgO5L7Q~|9yrdj}tUG0fZnraEw)cL#K3i*@ddAuA=>Ta8NC!x(F8}}l0O)h+h2_le7p?Uh zAqAuZ0000H$5{Dp?3}s&KR(~8ABGf=4v Date: Sun, 5 Jan 2025 01:40:39 +0000 Subject: [PATCH 23/41] Automatic Changelog (#2635) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 3f2423429e8..c2c9ccefce8 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -6242,3 +6242,9 @@ Entries: message: Colored craftable lightbulbs and prefilled light strobes.! id: 5631 time: '2025-01-04T23:23:37.0000000+00:00' +- author: dustylens + changes: + - type: Add + message: mappable ice box for bars and restaurants! + id: 5632 + time: '2025-01-05T01:40:13.0000000+00:00' From 0ad2d80783632d6619cb52611370c562c2ba4884 Mon Sep 17 00:00:00 2001 From: dustylens <54123313+dustylens@users.noreply.github.com> Date: Sun, 5 Jan 2025 17:56:20 +0000 Subject: [PATCH 24/41] Quick black light fix. (#2656) --- Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml index b0536262c3b..eee26763396 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml @@ -74,6 +74,7 @@ - LedLightTube - SodiumLightTube - ExteriorLightTube + - LightTubeCrystalBlack - LightBulb - LedLightBulb - SodiumLightBulb From b4f1becbf7a4c0410f3a141666ee2129c5c2eb2e Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Sun, 5 Jan 2025 17:56:43 +0000 Subject: [PATCH 25/41] Automatic Changelog (#2656) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index c2c9ccefce8..8b21990d074 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -6248,3 +6248,9 @@ Entries: message: mappable ice box for bars and restaurants! id: 5632 time: '2025-01-05T01:40:13.0000000+00:00' +- author: dustylens + changes: + - type: Add + message: Black light to service lathe. + id: 5633 + time: '2025-01-05T17:56:21.0000000+00:00' From 4d56d80f4470b56f20d9b9f2272d30b2d73458e7 Mon Sep 17 00:00:00 2001 From: dustylens <54123313+dustylens@users.noreply.github.com> Date: Sun, 5 Jan 2025 17:57:46 +0000 Subject: [PATCH 26/41] Handheld crew health monitor added to medical techfab. (#2655) * Adds handheld crew monitor to medical techfab * Updated to requested values. --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- .../Prototypes/Entities/Structures/Machines/lathe.yml | 1 + Resources/Prototypes/_NF/Recipes/Lathes/medical.yml | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 Resources/Prototypes/_NF/Recipes/Lathes/medical.yml diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 4d2afe193da..d58917ff8a2 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -1041,6 +1041,7 @@ - PowerCellSmall # Frontier - BlankMediPen # Frontier - MedicalAppraisalTool # Frontier + - HandheldCrewMonitor # Frontier dynamicRecipes: - ChemicalPayload - CryostasisBeaker diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/medical.yml b/Resources/Prototypes/_NF/Recipes/Lathes/medical.yml new file mode 100644 index 00000000000..cd6e76be1e5 --- /dev/null +++ b/Resources/Prototypes/_NF/Recipes/Lathes/medical.yml @@ -0,0 +1,9 @@ +- type: latheRecipe + id: HandheldCrewMonitor + result: HandheldCrewMonitor + category: Tools + completetime: 4 + materials: + Glass: 1200 + Steel: 1000 + Plastic: 1400 From cdcc0dd0df82c661d478b17f2af382d64a144b3b Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Sun, 5 Jan 2025 17:58:11 +0000 Subject: [PATCH 27/41] Automatic Changelog (#2655) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 8b21990d074..7d744f379e5 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -6254,3 +6254,9 @@ Entries: message: Black light to service lathe. id: 5633 time: '2025-01-05T17:56:21.0000000+00:00' +- author: dustylens + changes: + - type: Add + message: Handheld crew health monitor added to medical techfab. + id: 5634 + time: '2025-01-05T17:57:46.0000000+00:00' From 25f00957ba9041a7260cc38255500a6e93c94eb0 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 6 Jan 2025 23:21:18 +0200 Subject: [PATCH 28/41] Update lathe.yml (#2653) --- Resources/Prototypes/Entities/Structures/Machines/lathe.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index d58917ff8a2..88dd3896b60 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -1406,6 +1406,8 @@ - MaterialBananium1 - MaterialDiamond - BluespaceCrystal #Nyano - Summary: Bluespace Crystals can be created here. + - type: PlaceableSurface # DeltaV: Allow ore bags to dump into it directly + isPlaceable: false # but not place on it if you just click it with a random item - type: entity parent: OreProcessor From 7184b6c1f0dd8cfa2eb2f252f8d83a656a2c2ddb Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Mon, 6 Jan 2025 21:21:46 +0000 Subject: [PATCH 29/41] Automatic Changelog (#2653) --- Resources/Changelog/Frontier.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 7d744f379e5..9a0d35f6241 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -6260,3 +6260,11 @@ Entries: message: Handheld crew health monitor added to medical techfab. id: 5634 time: '2025-01-05T17:57:46.0000000+00:00' +- author: dvir001 + changes: + - type: Tweak + message: >- + You can now directly dump ore bags into ore processors by clicking on + them. + id: 5635 + time: '2025-01-06T21:21:18.0000000+00:00' From 58ad044b6ad729e45a38409a92255f042716fbaa Mon Sep 17 00:00:00 2001 From: Tych0 <151581207+Tych0theSynth@users.noreply.github.com> Date: Tue, 7 Jan 2025 15:34:05 +0000 Subject: [PATCH 30/41] SBB Tyne 1.1 (#2428) * Update the Tyne * Update tyne.yml * Update tyne.yml --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> Co-authored-by: Alice "Arimah" Heurlin <30327355+arimah@users.noreply.github.com> --- Resources/Maps/_NF/Shuttles/tyne.yml | 443 +++++++++++++-------- Resources/Prototypes/_NF/Shipyard/tyne.yml | 4 +- 2 files changed, 274 insertions(+), 173 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/tyne.yml b/Resources/Maps/_NF/Shuttles/tyne.yml index ceee0ecaba2..78688103579 100644 --- a/Resources/Maps/_NF/Shuttles/tyne.yml +++ b/Resources/Maps/_NF/Shuttles/tyne.yml @@ -36,11 +36,11 @@ entities: version: 6 0,-1: ind: 0,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAARQAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAARQAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAARQAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAAAdAAAAAABggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAADdAAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAADdAAAAAACggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAACdAAAAAACggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAAggAAAAAAggAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAARQAAAAAARQAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAARQAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAARQAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAARQAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAAAdAAAAAABggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAdAAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAdAAAAAACggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAACdAAAAAACggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAAggAAAAAAggAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAARQAAAAAARQAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,-1: ind: -1,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAdAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAARQAAAAAARQAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAdAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAARQAAAAAARQAAAAAA version: 6 - type: Broadphase - type: Physics @@ -75,6 +75,11 @@ entities: id: BotGreyscale decals: 62: -1,2 + - node: + color: '#96DAFFFF' + id: BotGreyscale + decals: + 70: -1,-4 - node: cleanable: True color: '#96DAFFFF' @@ -87,6 +92,11 @@ entities: id: BotGreyscale decals: 63: -1,3 + - node: + color: '#FFFFFFFF' + id: Box + decals: + 68: -1,-8 - node: color: '#4B709C7F' id: BrickTileWhiteCornerNe @@ -192,8 +202,6 @@ entities: color: '#FFFFFFFF' id: DirtHeavyMonotile decals: - 38: -1,-8 - 39: 1,-8 40: -1,-7 41: 1,-7 44: 0,-1 @@ -236,9 +244,8 @@ entities: color: '#FFFFFFFF' id: StandClear decals: - 4: -1,-8 - 5: 1,-8 27: 0,-1 + 64: 0,-8 - node: color: '#FFFFFFFF' id: WarnCornerNE @@ -274,8 +281,8 @@ entities: color: '#FFFFFFFF' id: WarnLineN decals: - 2: -1,-8 - 3: 1,-8 + 65: 0,-8 + 69: 1,-8 - node: color: '#FFFFFFFF' id: WarnLineS @@ -310,17 +317,16 @@ entities: 0: 49288 2: 34 0,-3: - 0: 8192 + 0: 12288 2: 32768 - -1,-3: - 0: 32768 - 2: 8192 0,-2: - 0: 13090 + 0: 13107 2: 34952 -1,-2: - 0: 34952 + 0: 34824 2: 8738 + -1,-3: + 2: 8192 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -381,8 +387,6 @@ entities: parent: 2 - type: DeviceList devices: - - 136 - - 138 - 114 - 113 - 135 @@ -411,22 +415,22 @@ entities: - type: Transform pos: 1.5,-6.5 parent: 2 - - uid: 8 + - uid: 213 components: - type: Transform - pos: -0.5,-6.5 + pos: 0.5,-6.5 parent: 2 - proto: AirlockGlassShuttle entities: - - uid: 9 + - uid: 10 components: - type: Transform - pos: -0.5,-8.5 + pos: 1.5,-8.5 parent: 2 - - uid: 10 + - uid: 14 components: - type: Transform - pos: 1.5,-8.5 + pos: 0.5,-8.5 parent: 2 - proto: AirlockMedicalGlass entities: @@ -445,10 +449,10 @@ entities: parent: 2 - proto: AtmosDeviceFanDirectional entities: - - uid: 14 + - uid: 9 components: - type: Transform - pos: -0.5,-8.5 + pos: 0.5,-8.5 parent: 2 - uid: 15 components: @@ -621,17 +625,17 @@ entities: parent: 2 - proto: BoxBodyBag entities: - - uid: 47 + - uid: 165 components: - type: Transform - pos: -0.671875,-2.1547117 + pos: -0.6532581,-2.1312675 parent: 2 - proto: BoxPaper entities: - - uid: 13 + - uid: 111 components: - type: Transform - pos: 1.7410264,4.3407273 + pos: 1.4625001,4.3004127 parent: 2 - proto: CableApcExtension entities: @@ -695,32 +699,12 @@ entities: - type: Transform pos: 0.5,-5.5 parent: 2 - - uid: 61 - components: - - type: Transform - pos: -0.5,-5.5 - parent: 2 - - uid: 62 - components: - - type: Transform - pos: -0.5,-6.5 - parent: 2 - uid: 63 - components: - - type: Transform - pos: 1.5,-5.5 - parent: 2 - - uid: 64 - components: - - type: Transform - pos: 1.5,-6.5 - parent: 2 - - uid: 65 components: - type: Transform pos: 1.5,-7.5 parent: 2 - - uid: 66 + - uid: 64 components: - type: Transform pos: -0.5,-7.5 @@ -730,34 +714,32 @@ entities: - type: Transform pos: 0.5,-1.5 parent: 2 - - uid: 68 + - uid: 119 components: - type: Transform - pos: 0.5,5.5 + pos: 0.5,-7.5 + parent: 2 + - uid: 162 + components: + - type: Transform + pos: 0.5,-6.5 parent: 2 - proto: CableHV entities: - uid: 69 components: - type: Transform - pos: -0.5,0.5 + pos: 0.5,3.5 parent: 2 - uid: 70 components: - type: Transform pos: -0.5,1.5 parent: 2 -- proto: CableMV - entities: - - uid: 71 - components: - - type: Transform - pos: 0.5,2.5 - parent: 2 - uid: 72 components: - type: Transform - pos: -0.5,0.5 + pos: 0.5,4.5 parent: 2 - uid: 73 components: @@ -767,7 +749,24 @@ entities: - uid: 74 components: - type: Transform - pos: -0.5,1.5 + pos: 0.5,2.5 + parent: 2 + - uid: 200 + components: + - type: Transform + pos: 2.5,4.5 + parent: 2 + - uid: 202 + components: + - type: Transform + pos: 1.5,4.5 + parent: 2 +- proto: CableMV + entities: + - uid: 71 + components: + - type: Transform + pos: 2.5,4.5 parent: 2 - uid: 75 components: @@ -779,15 +778,15 @@ entities: - type: Transform pos: 0.5,4.5 parent: 2 - - uid: 77 + - uid: 78 components: - type: Transform - pos: 0.5,3.5 + pos: -1.5,4.5 parent: 2 - - uid: 78 + - uid: 157 components: - type: Transform - pos: -1.5,4.5 + pos: 1.5,4.5 parent: 2 - proto: Catwalk entities: @@ -881,11 +880,10 @@ entities: parent: 2 - proto: ClosetWallO2N2FilledRandom entities: - - uid: 1 + - uid: 68 components: - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,-1.5 + pos: -0.5,-6.5 parent: 2 - proto: ComputerCrewMonitoring entities: @@ -908,16 +906,36 @@ entities: - type: Transform pos: -0.5,5.5 parent: 2 +- proto: ComputerWallmountWithdrawBankATM + entities: + - uid: 61 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-7.5 + parent: 2 - proto: DefibrillatorCabinetFilled entities: - - uid: 102 + - uid: 47 components: - type: Transform - rot: 3.141592653589793 rad - pos: 0.5,-6.5 + rot: 1.5707963267948966 rad + pos: -1.5,-4.5 parent: 2 - proto: EmergencyLight entities: + - uid: 13 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,1.5 + parent: 2 + - uid: 65 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-7.5 + parent: 2 - uid: 103 components: - type: Transform @@ -941,36 +959,24 @@ entities: rot: -1.5707963267948966 rad pos: -2.5,0.5 parent: 2 +- proto: EmergencyRollerBed + entities: - uid: 107 components: - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,1.5 - parent: 2 - - uid: 108 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,-7.5 + pos: -0.5,-3.5 parent: 2 -- proto: EmergencyRollerBed - entities: - uid: 109 components: - type: Transform pos: 1.5,-3.5 parent: 2 - - uid: 110 - components: - - type: Transform - pos: 1.5,-4.5 - parent: 2 - proto: ExtinguisherCabinetFilled entities: - - uid: 95 + - uid: 181 components: - type: Transform - pos: -1.5,-5.5 + pos: 1.5,-1.5 parent: 2 - proto: FaxMachineShip entities: @@ -1036,11 +1042,19 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 119 + - uid: 242 components: - type: Transform rot: -1.5707963267948966 rad - pos: 1.5,-4.5 + pos: 0.5,-7.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 248 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-3.5 parent: 2 - type: AtmosPipeColor color: '#0055CCFF' @@ -1123,15 +1137,68 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 130 + - uid: 136 components: - type: Transform - pos: 1.5,-3.5 + rot: 3.141592653589793 rad + pos: 1.5,-4.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 138 + components: + - type: Transform + pos: 0.5,-5.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 155 + components: + - type: Transform + pos: 1.5,-5.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 240 + components: + - type: Transform + pos: 0.5,-6.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 241 + components: + - type: Transform + pos: 1.5,-6.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 246 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-3.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 247 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-3.5 parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - proto: GasPipeTJunction entities: + - uid: 130 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-4.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' - uid: 131 components: - type: Transform @@ -1148,6 +1215,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' + - uid: 245 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-3.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' - proto: GasPort entities: - uid: 133 @@ -1178,15 +1253,20 @@ entities: - 3 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 136 + - uid: 244 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 0.5,-4.5 + rot: 3.141592653589793 rad + pos: 1.5,-7.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 250 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-4.5 parent: 2 - - type: DeviceNetwork - deviceLists: - - 3 - type: AtmosPipeColor color: '#0055CCFF' - proto: GasVentScrubber @@ -1202,15 +1282,20 @@ entities: - 3 - type: AtmosPipeColor color: '#990000FF' - - uid: 138 + - uid: 243 components: - type: Transform - rot: 3.141592653589793 rad - pos: 0.5,-3.5 + rot: 1.5707963267948966 rad + pos: -0.5,-7.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 249 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-4.5 parent: 2 - - type: DeviceNetwork - deviceLists: - - 3 - type: AtmosPipeColor color: '#990000FF' - proto: GravityGeneratorMini @@ -1300,6 +1385,13 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,6.5 parent: 2 +- proto: Gyroscope + entities: + - uid: 197 + components: + - type: Transform + pos: 1.5,2.5 + parent: 2 - proto: LockerParamedicFilled entities: - uid: 156 @@ -1314,27 +1406,49 @@ entities: - type: Transform pos: 1.5,0.5 parent: 2 +- proto: LockerWallMaterialsBasic10Filled + entities: + - uid: 102 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-5.5 + parent: 2 - proto: LockerWallMaterialsFuelPlasmaFilled entities: - - uid: 166 + - uid: 77 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,4.5 + rot: 3.141592653589793 rad + pos: -0.5,0.5 + parent: 2 +- proto: MedicalTechFab + entities: + - uid: 66 + components: + - type: Transform + pos: -0.5,-5.5 parent: 2 - proto: MedkitOxygenFilled entities: - - uid: 157 + - uid: 95 components: - type: Transform - pos: -0.3125,-2.3422117 + pos: -0.3407581,-2.3656425 parent: 2 -- proto: NFSignDock +- proto: NFPosterContrabandEmsCoords entities: - - uid: 169 + - uid: 8 components: - type: Transform - pos: 0.5,-8.5 + pos: -1.5,-3.5 + parent: 2 +- proto: NFSignEms1 + entities: + - uid: 234 + components: + - type: Transform + pos: -0.5,-8.5 parent: 2 - proto: NitrogenCanister entities: @@ -1363,17 +1477,6 @@ entities: - type: Transform pos: -0.5,1.5 parent: 2 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static -- proto: PosterLegitHelpOthers - entities: - - uid: 162 - components: - - type: Transform - pos: -1.5,-3.5 - parent: 2 - proto: PosterLegitSMEpi entities: - uid: 163 @@ -1383,18 +1486,24 @@ entities: parent: 2 - proto: PowerCellMedium entities: - - uid: 164 + - uid: 231 components: - type: Transform - pos: -0.671875,-2.5140867 + pos: -0.7001331,-2.5687675 parent: 2 - proto: PoweredLEDSmallLight entities: - - uid: 161 + - uid: 108 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-7.5 + parent: 2 + - uid: 203 components: - type: Transform rot: 3.141592653589793 rad - pos: 1.5,-0.5 + pos: -0.5,-0.5 parent: 2 - proto: PoweredlightGreen entities: @@ -1412,11 +1521,11 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,-3.5 parent: 2 - - uid: 111 + - uid: 110 components: - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,1.5 + rot: -1.5707963267948966 rad + pos: 1.5,4.5 parent: 2 - proto: PoweredlightRed entities: @@ -1426,13 +1535,6 @@ entities: rot: -1.5707963267948966 rad pos: -2.5,-5.5 parent: 2 -- proto: PoweredSmallLight - entities: - - uid: 234 - components: - - type: Transform - pos: 0.5,-7.5 - parent: 2 - proto: Railing entities: - uid: 170 @@ -1496,12 +1598,12 @@ entities: rot: 3.141592653589793 rad pos: 3.5,1.5 parent: 2 -- proto: RandomPosterAny +- proto: RandomPosterLegit entities: - - uid: 165 + - uid: 232 components: - type: Transform - pos: 1.5,-1.5 + pos: -1.5,-7.5 parent: 2 - proto: ShuttleWindow entities: @@ -1595,31 +1697,23 @@ entities: - type: Transform pos: 2.5,0.5 parent: 2 -- proto: SmallGyroscope +- proto: SpawnPointLatejoin entities: - - uid: 155 + - uid: 251 components: - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,2.5 + pos: 0.5,-4.5 parent: 2 -- proto: SpawnPointLatejoin +- proto: StasisBed entities: - - uid: 200 + - uid: 1 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,-5.5 + pos: 1.5,-4.5 parent: 2 - proto: SteelBench entities: - - uid: 201 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,-3.5 - parent: 2 - - uid: 202 + - uid: 164 components: - type: Transform rot: 1.5707963267948966 rad @@ -1627,10 +1721,10 @@ entities: parent: 2 - proto: SubstationWallBasic entities: - - uid: 203 + - uid: 204 components: - type: Transform - pos: -0.5,0.5 + pos: 2.5,4.5 parent: 2 - proto: Table entities: @@ -1689,14 +1783,23 @@ entities: parent: 2 - proto: VendingMachineWallMedical entities: - - uid: 213 + - uid: 161 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,-5.5 + pos: -0.5,-1.5 parent: 2 - proto: WallShuttle entities: + - uid: 62 + components: + - type: Transform + pos: -0.5,-8.5 + parent: 2 + - uid: 169 + components: + - type: Transform + pos: -0.5,-6.5 + parent: 2 - uid: 214 components: - type: Transform @@ -1782,16 +1885,6 @@ entities: - type: Transform pos: 2.5,-1.5 parent: 2 - - uid: 231 - components: - - type: Transform - pos: 0.5,-8.5 - parent: 2 - - uid: 232 - components: - - type: Transform - pos: 0.5,-6.5 - parent: 2 - uid: 233 components: - type: Transform @@ -1817,7 +1910,15 @@ entities: - type: Transform pos: -1.5,-4.5 parent: 2 -- proto: WarpPointShip +- proto: WallWeaponCapacitorRechargerOmnidirectional + entities: + - uid: 166 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,-5.5 + parent: 2 +- proto: WarpPoint entities: - uid: 239 components: diff --git a/Resources/Prototypes/_NF/Shipyard/tyne.yml b/Resources/Prototypes/_NF/Shipyard/tyne.yml index e4f615d1d0a..f8be91c4700 100644 --- a/Resources/Prototypes/_NF/Shipyard/tyne.yml +++ b/Resources/Prototypes/_NF/Shipyard/tyne.yml @@ -7,13 +7,13 @@ # Discord: Tych0 # Shuttle Notes: -# +# Inspired by the Tyne-Class lifeboat: https://en.wikipedia.org/wiki/Tyne-class_lifeboat - type: vessel id: Tyne parent: BaseVessel name: SBB Tyne description: A small, agile lifeboat with an exterior deck and survivor cabin for search and rescue operations. - price: 20750 #~6% markup as it's a med ship. Appraises at ~19350. + price: 22250 #~5% markup as it's a med ship. Appraises at ~21001. category: Small group: Shipyard shuttlePath: /Maps/_NF/Shuttles/tyne.yml From eab733a8b9d72b404bba4d5bdf6b74afb49aeb3b Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Tue, 7 Jan 2025 15:34:38 +0000 Subject: [PATCH 31/41] Automatic Changelog (#2428) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 9a0d35f6241..27802d70fed 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -6268,3 +6268,9 @@ Entries: them. id: 5635 time: '2025-01-06T21:21:18.0000000+00:00' +- author: Tych0theSynth + changes: + - type: Add + message: 'Updated the SBB Tyne. ' + id: 5636 + time: '2025-01-07T15:34:09.0000000+00:00' From e5a6625fe4f4eb1a086fb98b4a2f04021cd0855d Mon Sep 17 00:00:00 2001 From: GreaseMonk <1354802+GreaseMonk@users.noreply.github.com> Date: Tue, 7 Jan 2025 17:01:29 +0100 Subject: [PATCH 32/41] Prevent player despawning on salvage and other debris (#2661) * Prevent piloting of debris etc * Fix unparenting * Update nf_bluespace_grids_events.yml * Update nf_bluespace_dungeons_events.yml * Update nf_bluespace_dungeons_events.yml * Update base_debris.yml --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- .../Worldgen/Systems/LocalityLoaderSystem.cs | 2 +- .../EventSystems/LinkedLifecycleGridSystem.cs | 4 ++-- .../_NF/Entities/World/Debris/base_debris.yml | 4 +++- .../Events/nf_bluespace_dungeons_events.yml | 1 + .../_NF/Events/nf_bluespace_grids_events.yml | 24 +++++++++++++++++++ .../Events/nf_bluespace_salvage_events.yml | 3 +++ 6 files changed, 34 insertions(+), 4 deletions(-) diff --git a/Content.Server/Worldgen/Systems/LocalityLoaderSystem.cs b/Content.Server/Worldgen/Systems/LocalityLoaderSystem.cs index 742b9687bfc..9a16ef7a4db 100644 --- a/Content.Server/Worldgen/Systems/LocalityLoaderSystem.cs +++ b/Content.Server/Worldgen/Systems/LocalityLoaderSystem.cs @@ -88,7 +88,7 @@ private void OnDebrisDespawn(EntityUid entity, SpaceDebrisComponent component, E } // Do not delete the grid, it is being deleted. - _linkedLifecycleGrid.UnparentPlayersFromGrid(entity, false); + _linkedLifecycleGrid.UnparentPlayersFromGrid(grid: entity, deleteGrid: false, ignoreLifeStage: true); } } // Frontier diff --git a/Content.Server/_NF/StationEvents/EventSystems/LinkedLifecycleGridSystem.cs b/Content.Server/_NF/StationEvents/EventSystems/LinkedLifecycleGridSystem.cs index d663831a4f1..e7f869d3efc 100644 --- a/Content.Server/_NF/StationEvents/EventSystems/LinkedLifecycleGridSystem.cs +++ b/Content.Server/_NF/StationEvents/EventSystems/LinkedLifecycleGridSystem.cs @@ -130,9 +130,9 @@ private void OnMasterRemoved(EntityUid uid, LinkedLifecycleGridParentComponent c } // Deletes a grid, reparenting every humanoid and player character that's on it. - public void UnparentPlayersFromGrid(EntityUid grid, bool deleteGrid) + public void UnparentPlayersFromGrid(EntityUid grid, bool deleteGrid, bool ignoreLifeStage = false) { - if (MetaData(grid).EntityLifeStage >= EntityLifeStage.Terminating) + if (!ignoreLifeStage && MetaData(grid).EntityLifeStage >= EntityLifeStage.Terminating) return; var reparentEntities = GetEntitiesToReparent(grid); diff --git a/Resources/Prototypes/_NF/Entities/World/Debris/base_debris.yml b/Resources/Prototypes/_NF/Entities/World/Debris/base_debris.yml index fe24ffd6c0a..06273f90cfa 100644 --- a/Resources/Prototypes/_NF/Entities/World/Debris/base_debris.yml +++ b/Resources/Prototypes/_NF/Entities/World/Debris/base_debris.yml @@ -6,5 +6,7 @@ - type: LocalityLoader - type: GCAbleObject queue: SpaceDebris + - type: LinkedLifecycleGridParent - type: ProtectedGrid - preventArtifactTriggers: true \ No newline at end of file + preventArtifactTriggers: true + - type: PreventPilot diff --git a/Resources/Prototypes/_NF/Events/nf_bluespace_dungeons_events.yml b/Resources/Prototypes/_NF/Events/nf_bluespace_dungeons_events.yml index fbaf8d45ee7..4abd96077dd 100644 --- a/Resources/Prototypes/_NF/Events/nf_bluespace_dungeons_events.yml +++ b/Resources/Prototypes/_NF/Events/nf_bluespace_dungeons_events.yml @@ -41,6 +41,7 @@ - type: LinkedLifecycleGridParent - type: ProtectedGrid preventArtifactTriggers: true + - type: PreventPilot protos: - NFVGRoidBasalt diff --git a/Resources/Prototypes/_NF/Events/nf_bluespace_grids_events.yml b/Resources/Prototypes/_NF/Events/nf_bluespace_grids_events.yml index 9ff65d1e4bf..6b849df3af1 100644 --- a/Resources/Prototypes/_NF/Events/nf_bluespace_grids_events.yml +++ b/Resources/Prototypes/_NF/Events/nf_bluespace_grids_events.yml @@ -32,6 +32,9 @@ angularDamping: 999999 linearDamping: 999999 - type: LinkedLifecycleGridParent + - type: ProtectedGrid + preventArtifactTriggers: true + - type: PreventPilot paths: - /Maps/_NF/Bluespace/cache.yml rewardAccounts: @@ -71,6 +74,9 @@ angularDamping: 999999 linearDamping: 999999 - type: LinkedLifecycleGridParent + - type: ProtectedGrid + preventArtifactTriggers: true + - type: PreventPilot paths: - /Maps/_NF/Bluespace/vault.yml rewardAccounts: @@ -111,6 +117,9 @@ angularDamping: 999999 linearDamping: 999999 - type: LinkedLifecycleGridParent + - type: ProtectedGrid + preventArtifactTriggers: true + - type: PreventPilot paths: - /Maps/_NF/Bluespace/vaultsmall.yml rewardAccounts: @@ -149,6 +158,9 @@ angularDamping: 999999 linearDamping: 999999 - type: LinkedLifecycleGridParent + - type: ProtectedGrid + preventArtifactTriggers: true + - type: PreventPilot paths: - /Maps/_NF/Bluespace/syndieftlintercept.yml @@ -185,6 +197,9 @@ angularDamping: 999999 linearDamping: 999999 - type: LinkedLifecycleGridParent + - type: ProtectedGrid + preventArtifactTriggers: true + - type: PreventPilot paths: - /Maps/_NF/Bluespace/wizardprobealt.yml @@ -221,6 +236,9 @@ angularDamping: 999999 linearDamping: 999999 - type: LinkedLifecycleGridParent + - type: ProtectedGrid + preventArtifactTriggers: true + - type: PreventPilot paths: - /Maps/_NF/Bluespace/bloodmoon.yml @@ -255,6 +273,9 @@ angularDamping: 999999 linearDamping: 999999 - type: LinkedLifecycleGridParent + - type: ProtectedGrid + preventArtifactTriggers: true + - type: PreventPilot paths: - /Maps/_NF/Bluespace/cave.yml @@ -286,5 +307,8 @@ addComponents: - type: IFF - type: LinkedLifecycleGridParent + - type: ProtectedGrid + preventArtifactTriggers: true + - type: PreventPilot paths: - /Maps/_NF/Bluespace/mcevent.yml diff --git a/Resources/Prototypes/_NF/Events/nf_bluespace_salvage_events.yml b/Resources/Prototypes/_NF/Events/nf_bluespace_salvage_events.yml index bd126439dfc..64609585209 100644 --- a/Resources/Prototypes/_NF/Events/nf_bluespace_salvage_events.yml +++ b/Resources/Prototypes/_NF/Events/nf_bluespace_salvage_events.yml @@ -27,6 +27,9 @@ - type: IFF color: "#AAAAAA" - type: LinkedLifecycleGridParent + - type: ProtectedGrid + preventArtifactTriggers: true + - type: PreventPilot paths: - /Maps/_NF/Shuttles/Scrap/bison.yml # - /Maps/_NF/Shuttles/Scrap/canister.yml # Too small From b0ebcca4aa04d70cc3d038ffd3db43b71b1b1fe2 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Tue, 7 Jan 2025 16:01:55 +0000 Subject: [PATCH 33/41] Automatic Changelog (#2661) --- Resources/Changelog/Frontier.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 27802d70fed..387b8c83557 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -6274,3 +6274,11 @@ Entries: message: 'Updated the SBB Tyne. ' id: 5636 time: '2025-01-07T15:34:09.0000000+00:00' +- author: GreaseMonk + changes: + - type: Fix + message: Fix player bodies despawning on debris + - type: Tweak + message: No longer possible to fly debris, wrecks, and salvage + id: 5637 + time: '2025-01-07T16:01:29.0000000+00:00' From 66083bb801b4504dc1ce2e90e05d79de55a2729c Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Tue, 7 Jan 2025 23:55:17 +0200 Subject: [PATCH 34/41] Fix DeltaV namespaces (#2663) --- .../Nyanotrasen/Overlays/DogVisionSystem.cs | 2 +- Content.Client/Options/UI/OptionsMenu.xaml | 2 +- .../Abilities/CrawlUnderObjectsSystem.cs | 4 +- .../UI/DepartmentWhitelistPanel.xaml | 2 +- .../UI/DepartmentWhitelistPanel.xaml.cs | 2 +- .../UI/GhostRoleSetWhitelistPanel.xaml | 2 +- .../UI/GhostRoleSetWhitelistPanel.xaml.cs | 2 +- .../Administration/UI/JobWhitelistsEui.cs | 4 +- .../UI/JobWhitelistsWindow.xaml | 0 .../UI/JobWhitelistsWindow.xaml.cs | 6 +- .../Cartridges/MailMetricUi.cs | 2 +- .../Cartridges/MailMetricUiFragment.xaml | 2 +- .../Cartridges/MailMetricUiFragment.xaml.cs | 2 +- .../Harpy/HarpyVisualsComponent.cs | 2 +- .../{DeltaV => _DV}/Mail/MailComponent.cs | 4 +- .../{DeltaV => _DV}/Mail/MailSystem.cs | 4 +- .../Options/UI/Tabs/DeltaTab.xaml | 4 +- .../Options/UI/Tabs/DeltaTab.xaml.cs | 4 +- .../Overlays/UltraVisionOverlay.cs | 2 +- .../Overlays/UltraVisionSystem.cs | 4 +- .../{DeltaV => _DV}/RoundEnd/NoEorgPopup.xaml | 0 .../RoundEnd/NoEorgPopup.xaml.cs | 4 +- .../RoundEnd/NoEorgPopupSystem.cs | 4 +- .../Tests/Nyanotrasen/DeepFryerTest.cs | 59 ----- .../Chat/Systems/ChatSystem.Emote.cs | 2 +- .../Abilities/Felinid/FelinidSystem.cs | 2 +- .../Abilities/CrawlUnderObjectsSystem.cs | 4 +- .../Commands/JobWhitelistsCommand.cs | 2 +- .../Administration/JobWhitelistsEui.cs | 4 +- .../SectorLogisticStatsDatabaseComponent.cs | 4 +- .../Cargo/Systems/LogisticStatsSystem.cs | 4 +- .../MailMetricsCartridgeComponent.cs | 2 +- .../Cartridges/MailMetricsCartridgeSystem.cs | 8 +- .../Harpy/HarpySingerSystem.cs | 6 +- .../Mail/Components/DelayedItemComponent.cs | 2 +- .../Mail/Components/MailComponent.cs | 4 +- .../Mail/Components/MailDisabledComponent.cs | 2 +- .../Mail/Components/MailReceiverComponent.cs | 2 +- .../Components/MailTeleporterComponent.cs | 2 +- .../Components/StationMailRouterComponent.cs | 2 +- .../Mail/EntitySystems/DelayedItemSystem.cs | 4 +- .../Mail/EntitySystems/MailSystem.cs | 10 +- .../{DeltaV => _DV}/Mail/MailCommands.cs | 6 +- .../{DeltaV => _DV}/Mail/MailConstants.cs | 2 +- .../{DeltaV => _DV}/Nutrition/Events.cs | 0 .../RoundEnd/RoundEndSystem.Pacified.cs | 4 +- .../Components/ScottishAccentComponent.cs | 6 +- .../EntitySystems/ScottishAccentSystem.cs | 6 +- .../EntitySystems/MouthStorageSystem.cs | 6 +- .../Ranged/Components/EnergyGunComponent.cs | 4 +- .../Weapons/Ranged/Systems/EnergyGunSystem.cs | 6 +- .../AlwaysTriggerMousetrapComponent.cs | 0 .../Abilities/CrawlUnderObjectsComponent.cs | 2 +- .../Abilities/RummagerComponent.cs | 0 .../SharedCrawlUnderObjectsSystem.cs | 2 +- .../Abilities/UltraVisionComponent.cs | 0 .../Administration/JobWhitelistsEuiState.cs | 2 +- .../{DeltaV => _DV}/CCVars/DCCVars.cs | 2 +- .../Cartridges/MailMetricUiState.cs | 0 .../Harpy/Components/HarpyVisualSystem.cs | 2 +- .../Harpy/HarpySingerComponent.cs | 2 +- .../Harpy/HarpySingerSystem.cs | 2 +- .../Harpy/HarpyVisualsSystem.cs | 2 +- .../Harpy/SharedHarpyVisualsComponent.cs | 2 +- .../Mail/MailDeliveryPoolPrototype.cs | 2 +- .../{DeltaV => _DV}/Mail/MailVisuals.cs | 2 +- .../Mail/SharedMailComponent.cs | 2 +- .../NoShoesSilentFootstepsComponent.cs | 0 .../Components/MouthStorageComponent.cs | 4 +- .../EntitySystems/SharedMouthStorageSystem.cs | 4 +- .../Ranged/EnergyGunFireModeVisuals.cs | 2 +- .../Whitelist/WhitelistTierPrototype.cs | 2 +- .../Audio/{DeltaV => _DV}/Items/eatfood.ogg | Bin .../Caravan_Palace_Lone_Digger-MONO.ogg | Bin .../{DeltaV => _DV}/Jukebox/DOS=HIGH,_UMB.ogg | Bin .../Patricia_Taxxon_-_Minute_-_MONO.ogg | Bin .../Jukebox/Phoron_Will_Make_Us_RichMONO2.ogg | Bin .../Jukebox/Scratch_Post_-_OST_MONO.ogg | Bin ...ifferent_reality_lagoona_remix.xm-MONO.ogg | Bin .../Jukebox/aggravated.it-MONO.ogg | Bin .../{DeltaV => _DV}/Jukebox/attributions.yml | 4 +- .../Jukebox/autumnal_equinox.xm-MONO.ogg | Bin .../Jukebox/deck_the_halls_b-MONO.ogg | Bin .../Jukebox/drozerix_-_alone.xm-MONO.ogg | Bin .../drozerix_-_leisurely_voice.xm-MONO.ogg | Bin .../every_light_is_blinking_at_onceMONO.ogg | Bin .../{DeltaV => _DV}/Jukebox/hackers-MONO.ogg | Bin .../lasers_rip_apart_the_bulkheadMONO.ogg | Bin .../{DeltaV => _DV}/Jukebox/marhaba-MONO.ogg | Bin ...irius_-_nymphs_of_the_forest.mptm-MONO.ogg | Bin .../Jukebox/shibamata-MONO.ogg | Bin .../Jukebox/space_asshole-MONO.ogg | Bin .../Jukebox/superposition-MONO.ogg | Bin .../Voice/Harpy/attributions.yml | 0 .../{DeltaV => _DV}/Voice/Harpy/caw1.ogg | Bin .../{DeltaV => _DV}/Voice/Harpy/chirp1.ogg | Bin .../{DeltaV => _DV}/Voice/Harpy/license.txt | 0 .../{DeltaV => _DV}/Voice/Talk/license.txt | 0 .../Audio/{DeltaV => _DV}/Voice/Talk/vulp.ogg | Bin .../{DeltaV => _DV}/Voice/Talk/vulp_ask.ogg | Bin .../Voice/Talk/vulp_exclaim.ogg | Bin .../Voice/Vulpkanin/attributions.yml | 0 .../Voice/Vulpkanin/dog_bark1.ogg | Bin .../Voice/Vulpkanin/dog_bark2.ogg | Bin .../Voice/Vulpkanin/dog_bark3.ogg | Bin .../Voice/Vulpkanin/dog_growl1.ogg | Bin .../Voice/Vulpkanin/dog_growl2.ogg | Bin .../Voice/Vulpkanin/dog_growl3.ogg | Bin .../Voice/Vulpkanin/dog_growl4.ogg | Bin .../Voice/Vulpkanin/dog_growl5.ogg | Bin .../Voice/Vulpkanin/dog_growl6.ogg | Bin .../Voice/Vulpkanin/dog_snarl1.ogg | Bin .../Voice/Vulpkanin/dog_snarl2.ogg | Bin .../Voice/Vulpkanin/dog_snarl3.ogg | Bin .../Voice/Vulpkanin/dog_whine.ogg | Bin .../{DeltaV => _DV}/Voice/Vulpkanin/howl.ogg | Bin .../Voice/Vulpkanin/license.txt | 0 .../Weapons/Guns/Empty/dry_fire.ogg | Bin .../Weapons/Guns/Gunshots/laser.ogg | Bin Resources/Audio/{DeltaV => _DV}/license.txt | 0 .../en-US/{deltav => _DV}/accent/scottish.ftl | 0 .../administration/ui/player-panel.ftl | 0 .../advertisements/vending/pride.ftl | 0 .../cartridge-loader/cartridges.ftl | 0 .../catalog/cargo/cargo-vending.ftl | 0 .../catalog/fills/crates/vending-crates.ftl | 0 .../escape-menu/options-menu.ftl | 0 .../flavors/flavor-profiles.ftl | 0 .../{deltav => _DV}/harpy/singer_system.ftl | 0 .../en-US/{deltav => _DV}/info/whitelists.ftl | 0 .../en-US/{deltav => _DV}/markings/Oni.ftl | 0 .../{deltav => _DV}/markings/felinid.ftl | 0 .../en-US/{deltav => _DV}/markings/harpy.ftl | 0 .../en-US/{deltav => _DV}/markings/moth.ftl | 0 .../{deltav => _DV}/markings/rodentia.ftl | 0 .../{deltav => _DV}/materials/materials.ftl | 0 .../en-US/{deltav => _DV}/materials/units.ftl | 0 .../meta/consumable/food/condiments.ftl | 0 .../reagents/meta/physical-desc.ftl | 0 .../{deltav => _DV}/research/technologies.ftl | 0 .../roundend/no-eorg-popup.ftl | 0 .../{deltav => _DV}/species/namepreset.ftl | 0 .../en-US/{deltav => _DV}/species/species.ftl | 0 .../storage/mouth-storage-component.ftl | 0 .../{deltav => _DV}/store/uplink-catalog.ftl | 0 .../{deltav => _DV}/tools/tool-qualities.ftl | 0 .../en-US/{deltav => _DV}/traits/traits.ftl | 0 .../weapons/ranged/energygun.ftl | 0 .../Prototypes/DeltaV/Shaders/birdvision.yml | 4 - .../DeltaV/SoundCollections/vulpkanin.yml | 33 --- .../Prototypes/DeltaV/Voice/speech_sounds.yml | 17 -- .../Entities/Objects/Tools/jetpacks.yml | 22 +- .../Devices/Misc/identification_cards.yml | 8 +- .../Nyanotrasen/StatusEffects/job.yml | 4 +- .../Prototypes/Species/species_weights.yml | 2 +- .../Accents/word_replacements.yml | 0 .../{DeltaV => _DV}/Actions/types.yml | 2 +- .../{DeltaV => _DV}/Body/Organs/harpy.yml | 0 .../{DeltaV => _DV}/Body/Organs/vulpkanin.yml | 0 .../{DeltaV => _DV}/Body/Parts/harpy.yml | 42 ++-- .../{DeltaV => _DV}/Body/Parts/rodentia.yml | 4 +- .../{DeltaV => _DV}/Body/Parts/vulpkanin.yml | 42 ++-- .../{DeltaV => _DV}/Body/Prototypes/harpy.yml | 0 .../Body/Prototypes/rodentia.yml | 0 .../Body/Prototypes/vulpkanin.yml | 0 .../Catalog/Cargo/cargo_fun.yml | 0 .../Catalog/Cargo/cargo_vending.yml | 0 .../Catalog/Fills/Crates/vending.yml | 0 .../Catalog/Jukebox/Standard.yml | 40 +-- .../VendingMachines/Advertisements/pride.yml | 0 .../VendingMachines/Inventories/pride.yml | 0 .../{DeltaV => _DV}/Damage/modifier_sets.yml | 0 .../Detasets/Names/rodentia_female.yml | 0 .../Detasets/Names/rodentia_last.yml | 0 .../Detasets/Names/rodentia_male.yml | 0 .../Detasets/Names/vulpkanin_female.yml | 0 .../Detasets/Names/vulpkanin_last.yml | 0 .../Detasets/Names/vulpkanin_male.yml | 0 .../Entities/Clothing/Shoes/misc.yml | 0 .../Entities/Clothing/Shoes/winter-boots.yml | 84 +++---- .../Entities/Clothing/Uniforms/jumpsuits.yml | 4 +- .../Mobs/Customization/Markings/Oni_horns.yml | 6 +- .../Mobs/Customization/Markings/felinid.yml | 14 +- .../Mobs/Customization/Markings/harpy.yml | 46 ++-- .../Mobs/Customization/Markings/moth.yml | 8 +- .../Mobs/Customization/Markings/rodentia.yml | 162 ++++++------ .../Mobs/Customization/Markings/vulpkanin.yml | 234 +++++++++--------- .../Entities/Mobs/Player/harpy.yml | 0 .../Entities/Mobs/Player/rodentia.yml | 0 .../Entities/Mobs/Player/vulpkanin.yml | 0 .../Entities/Mobs/Species/harpy.yml | 6 +- .../Entities/Mobs/Species/rodentia.yml | 4 +- .../Entities/Mobs/Species/vulpkanin.yml | 8 +- .../Entities/Objects/Devices/cartridges.yml | 12 +- .../Entities/Objects/Devices/pda.yml | 4 +- .../Entities/Objects/Fun/toy_guns.yml | 4 +- .../Entities/Objects/Materials/ore.yml | 0 .../Objects/Misc/fire_extinguisher.yml | 4 +- .../Objects/Misc/identification_cards.yml | 4 +- .../Entities/Objects/Misc/mouth_storage.yml | 0 .../Hydroponics/plant_bag_holding.yml | 4 +- .../Objects/Specific/Justice/gavel.yml | 4 +- .../Objects/Specific/Justice/gavelblock.yml | 4 +- .../Objects/Specific/Justice/trialtimer.yml | 2 +- .../Service/vending_machine_restock.yml | 2 +- .../Objects/Weapons/Bombs/plastic.yml | 2 +- .../Guns/Ammunition/Boxes/toy_guns.yml | 2 +- .../Weapons/Guns/Battery/battery_guns.yml | 16 +- .../Weapons/Guns/Projectiles/impacts.yml | 0 .../Guns/Projectiles/toy_projectiles.yml | 2 +- .../Structures/Doors/Windoors/windoor.yml | 0 .../Structures/Machines/vending_machines.yml | 2 +- .../Structures/Storage/Crates/barrel.yml | 6 +- .../{DeltaV => _DV}/Flavors/flavors.yml | 0 .../{DeltaV => _DV}/Guidebook/species.yml | 10 +- .../digitigrade_inventory_template.yml | 0 .../Reagents/Materials/ores.yml | 0 .../Recipes/Crafting/Graphs/barrel.yml | 0 .../Recipes/Crafting/barrel.yml | 4 +- .../Recipes/Lathes/devices.yml | 0 .../Recipes/Lathes/medical.yml | 0 .../{DeltaV => _DV}/Recipes/Lathes/tools.yml | 0 .../Research/civilianservices.yml | 0 .../Prototypes/_DV/Shaders/birdvision.yml | 4 + .../SoundCollections/harpy.yml | 16 +- .../_DV/SoundCollections/vulpkanin.yml | 33 +++ .../{DeltaV => _DV}/Species/harpy.yml | 28 +-- .../{DeltaV => _DV}/Species/rodentia.yml | 28 +-- .../{DeltaV => _DV}/Species/vulpkanin.yml | 28 +-- .../{DeltaV => _DV}/Stacks/Materials/ore.yml | 0 .../{DeltaV => _DV}/Traits/disabilities.yml | 0 .../{DeltaV => _DV}/Traits/speech.yml | 0 .../Voice/speech_emote_sounds.yml | 0 .../{DeltaV => _DV}/Voice/speech_emotes.yml | 0 .../Prototypes/_DV/Voice/speech_sounds.yml | 17 ++ .../{DeltaV => _DV}/Voice/speech_verbs.yml | 0 .../Prototypes/{DeltaV => _DV}/shaders.yml | 0 Resources/Prototypes/{DeltaV => _DV}/tags.yml | 0 .../{DeltaV => _DV}/tool_qualities.yml | 0 .../{DeltaV => _DV}/typing_indicator.yml | 4 +- .../_NF/Catalog/security_uplink_catalog.yml | 4 +- .../Mobs/NPCs/mob_hostile_rogue_ai.yml | 2 +- .../_NF/Entities/Objects/Fun/toys.yml | 8 +- .../Weapons/Guns/Battery/battery_guns.yml | 6 +- .../Guns/Projectiles/toy_projectiles.yml | 4 +- .../Mobs/{DeltaV => _DV}/Felinid.xml | 0 .../Guidebook/Mobs/{DeltaV => _DV}/Harpy.xml | 0 .../Guidebook/Mobs/{DeltaV => _DV}/Oni.xml | 0 .../Mobs/{DeltaV => _DV}/Rodentia.xml | 0 .../Mobs/{DeltaV => _DV}/Vulpkanin.xml | 0 .../winterbootsatmos.rsi/equipped-FEET.png | Bin .../Shoes/Boots/winterbootsatmos.rsi/icon.png | Bin .../winterbootsatmos.rsi/inhand-left.png | Bin .../winterbootsatmos.rsi/inhand-right.png | Bin .../Boots/winterbootsatmos.rsi/meta.json | 0 .../winterbootscap.rsi/equipped-FEET.png | Bin .../Shoes/Boots/winterbootscap.rsi/icon.png | Bin .../Boots/winterbootscap.rsi/inhand-left.png | Bin .../Boots/winterbootscap.rsi/inhand-right.png | Bin .../Shoes/Boots/winterbootscap.rsi/meta.json | 0 .../Boots/winterbootsce.rsi/equipped-FEET.png | Bin .../Shoes/Boots/winterbootsce.rsi/icon.png | Bin .../Boots/winterbootsce.rsi/inhand-left.png | Bin .../Boots/winterbootsce.rsi/inhand-right.png | Bin .../Shoes/Boots/winterbootsce.rsi/meta.json | 0 .../winterbootscentcom.rsi/equipped-FEET.png | Bin .../Boots/winterbootscentcom.rsi/icon.png | Bin .../winterbootscentcom.rsi/inhand-left.png | Bin .../winterbootscentcom.rsi/inhand-right.png | Bin .../Boots/winterbootscentcom.rsi/meta.json | 0 .../winterbootschef.rsi/equipped-FEET.png | Bin .../Shoes/Boots/winterbootschef.rsi/icon.png | Bin .../Boots/winterbootschef.rsi/inhand-left.png | Bin .../winterbootschef.rsi/inhand-right.png | Bin .../Shoes/Boots/winterbootschef.rsi/meta.json | 0 .../winterbootschem.rsi/equipped-FEET.png | Bin .../Shoes/Boots/winterbootschem.rsi/icon.png | Bin .../Boots/winterbootschem.rsi/inhand-left.png | Bin .../winterbootschem.rsi/inhand-right.png | Bin .../Shoes/Boots/winterbootschem.rsi/meta.json | 0 .../winterbootsclown.rsi/equipped-FEET.png | Bin .../Shoes/Boots/winterbootsclown.rsi/icon.png | Bin .../winterbootsclown.rsi/inhand-left.png | Bin .../winterbootsclown.rsi/inhand-right.png | Bin .../Boots/winterbootsclown.rsi/meta.json | 0 .../winterbootscmo.rsi/equipped-FEET.png | Bin .../Shoes/Boots/winterbootscmo.rsi/icon.png | Bin .../Boots/winterbootscmo.rsi/inhand-left.png | Bin .../Boots/winterbootscmo.rsi/inhand-right.png | Bin .../Shoes/Boots/winterbootscmo.rsi/meta.json | 0 .../winterbootsgen.rsi/equipped-FEET.png | Bin .../Shoes/Boots/winterbootsgen.rsi/icon.png | Bin .../Boots/winterbootsgen.rsi/inhand-left.png | Bin .../Boots/winterbootsgen.rsi/inhand-right.png | Bin .../Shoes/Boots/winterbootsgen.rsi/meta.json | 0 .../winterbootshop.rsi/equipped-FEET.png | Bin .../Shoes/Boots/winterbootshop.rsi/icon.png | Bin .../Boots/winterbootshop.rsi/inhand-left.png | Bin .../Boots/winterbootshop.rsi/inhand-right.png | Bin .../Shoes/Boots/winterbootshop.rsi/meta.json | 0 .../winterbootshos.rsi/equipped-FEET.png | Bin .../Shoes/Boots/winterbootshos.rsi/icon.png | Bin .../Boots/winterbootshos.rsi/inhand-left.png | Bin .../Boots/winterbootshos.rsi/inhand-right.png | Bin .../Shoes/Boots/winterbootshos.rsi/meta.json | 0 .../winterbootshydro.rsi/equipped-FEET.png | Bin .../Shoes/Boots/winterbootshydro.rsi/icon.png | Bin .../winterbootshydro.rsi/inhand-left.png | Bin .../winterbootshydro.rsi/inhand-right.png | Bin .../Boots/winterbootshydro.rsi/meta.json | 0 .../winterbootsjani.rsi/equipped-FEET.png | Bin .../Shoes/Boots/winterbootsjani.rsi/icon.png | Bin .../Boots/winterbootsjani.rsi/inhand-left.png | Bin .../winterbootsjani.rsi/inhand-right.png | Bin .../Shoes/Boots/winterbootsjani.rsi/meta.json | 0 .../winterbootsmime.rsi/equipped-FEET.png | Bin .../Shoes/Boots/winterbootsmime.rsi/icon.png | Bin .../Boots/winterbootsmime.rsi/inhand-left.png | Bin .../winterbootsmime.rsi/inhand-right.png | Bin .../Shoes/Boots/winterbootsmime.rsi/meta.json | 0 .../winterbootsminer.rsi/equipped-FEET.png | Bin .../Shoes/Boots/winterbootsminer.rsi/icon.png | Bin .../winterbootsminer.rsi/inhand-left.png | Bin .../winterbootsminer.rsi/inhand-right.png | Bin .../Boots/winterbootsminer.rsi/meta.json | 0 .../winterbootsparamed.rsi/equipped-FEET.png | Bin .../Boots/winterbootsparamed.rsi/icon.png | Bin .../winterbootsparamed.rsi/inhand-left.png | Bin .../winterbootsparamed.rsi/inhand-right.png | Bin .../Boots/winterbootsparamed.rsi/meta.json | 0 .../Boots/winterbootsqm.rsi/equipped-FEET.png | Bin .../Shoes/Boots/winterbootsqm.rsi/icon.png | Bin .../Boots/winterbootsqm.rsi/inhand-left.png | Bin .../Boots/winterbootsqm.rsi/inhand-right.png | Bin .../Shoes/Boots/winterbootsqm.rsi/meta.json | 0 .../Boots/winterbootsrd.rsi/equipped-FEET.png | Bin .../Shoes/Boots/winterbootsrd.rsi/icon.png | Bin .../Boots/winterbootsrd.rsi/inhand-left.png | Bin .../Boots/winterbootsrd.rsi/inhand-right.png | Bin .../Shoes/Boots/winterbootsrd.rsi/meta.json | 0 .../winterbootsrobo.rsi/equipped-FEET.png | Bin .../Shoes/Boots/winterbootsrobo.rsi/icon.png | Bin .../Boots/winterbootsrobo.rsi/inhand-left.png | Bin .../winterbootsrobo.rsi/inhand-right.png | Bin .../Shoes/Boots/winterbootsrobo.rsi/meta.json | 0 .../winterbootsviro.rsi/equipped-FEET.png | Bin .../Shoes/Boots/winterbootsviro.rsi/icon.png | Bin .../Boots/winterbootsviro.rsi/inhand-left.png | Bin .../winterbootsviro.rsi/inhand-right.png | Bin .../Shoes/Boots/winterbootsviro.rsi/meta.json | 0 .../winterbootswarden.rsi/equipped-FEET.png | Bin .../Boots/winterbootswarden.rsi/icon.png | Bin .../winterbootswarden.rsi/inhand-left.png | Bin .../winterbootswarden.rsi/inhand-right.png | Bin .../Boots/winterbootswarden.rsi/meta.json | 0 .../kilt.rsi/equipped-INNERCLOTHING.png | Bin .../Uniforms/Jumpsuit/kilt.rsi/icon.png | Bin .../Jumpsuit/kilt.rsi/inhand-left.png | Bin .../Jumpsuit/kilt.rsi/inhand-right.png | Bin .../Uniforms/Jumpsuit/kilt.rsi/meta.json | 0 .../creampie.rsi/creampie_rodentia.png | Bin .../creampie.rsi/creampie_vulpkanin.png | Bin .../Effects/creampie.rsi/meta.json | 0 .../Effects/harpysinger.rsi/meta.json | 0 .../harpysinger.rsi/singing_music_notes.png | Bin .../Effects/speech.rsi/felinid0.png | Bin .../Effects/speech.rsi/felinid1.png | Bin .../Effects/speech.rsi/felinid2.png | Bin .../Effects/speech.rsi/meta.json | 0 .../Effects/speech.rsi/rodentia0.png | Bin .../Effects/speech.rsi/rodentia1.png | Bin .../Effects/speech.rsi/rodentia2.png | Bin .../Interface/Actions/harpy_sing.png | Bin .../Interface/Actions/harpy_syrinx.png | Bin .../Interface/Actions/mouthStorageOpen.png | Bin .../Interface/Misc/job_icons.rsi/Chaplain.png | Bin .../Misc/job_icons.rsi/ChiefJustice.png | Bin .../Interface/Misc/job_icons.rsi/Clerk.png | Bin .../Interface/Misc/job_icons.rsi/Lawyer.png | Bin .../Misc/job_icons.rsi/MedicalBorg.png | Bin .../Misc/job_icons.rsi/Prosecutor.png | Bin .../Misc/job_icons.rsi/SecurityBorg.png | Bin .../Interface/Misc/job_icons.rsi/meta.json | 0 .../Misc/job_icons.rsi/nyanoGladiator.png | Bin .../Misc/job_icons.rsi/nyanoMailCarrier.png | Bin .../Misc/job_icons.rsi/nyanoMantis.png | Bin .../Misc/job_icons.rsi/nyanoMartialArtist.png | Bin .../Misc/job_icons.rsi/nyanoPrisonGuard.png | Bin .../m_waggingtail_cat_FRONT.png | Bin .../Felinid/alternative_tail.rsi/meta.json | 0 .../Felinid_fluffy_tail_full.png | Bin .../felinid_fluffy_tail_rings.png | Bin .../Felinid/felinid_tails.rsi/meta.json | 0 .../tiger_tail.rsi/m_tail_tiger_primary.png | Bin .../tiger_tail.rsi/m_tail_tiger_secondary.png | Bin .../tiger_tail.rsi/m_tail_tiger_tertiary.png | Bin .../Felinid/tiger_tail.rsi/meta.json | 0 .../Harpy/harpy_chest.rsi/lower.png | Bin .../Harpy/harpy_chest.rsi/meta.json | 0 .../Harpy/harpy_chest.rsi/upper.png | Bin .../harpy_ears.rsi/harpy_ears_default.png | Bin .../Harpy/harpy_ears.rsi/meta.json | 0 .../Harpy/harpy_legs.rsi/feet.png | Bin .../Harpy/harpy_legs.rsi/meta.json | 0 .../Harpy/harpy_legs.rsi/talons.png | Bin .../Harpy/harpy_legs.rsi/thighs.png | Bin .../Harpy/harpy_tails.rsi/meta.json | 0 .../Harpy/harpy_tails.rsi/phoenix_tail.png | Bin .../Harpy/harpy_tails.rsi/rooster_tail.png | Bin .../Harpy/harpy_tailsx72.rsi/finch_tail.png | Bin .../Harpy/harpy_tailsx72.rsi/meta.json | 0 .../Customization/Harpy/harpy_wingcover.png | Bin .../Harpy/harpy_wings.rsi/classicharpy.png | Bin .../Harpy/harpy_wings.rsi/harpy.png | Bin .../Harpy/harpy_wings.rsi/harpy2tone1.png | Bin .../Harpy/harpy_wings.rsi/harpy2tone2.png | Bin .../Harpy/harpy_wings.rsi/harpy3tone1.png | Bin .../Harpy/harpy_wings.rsi/harpy3tone2.png | Bin .../Harpy/harpy_wings.rsi/harpy3tone3.png | Bin .../Harpy/harpy_wings.rsi/harpyfolded.png | Bin .../Harpy/harpy_wings.rsi/harpyspeckled1.png | Bin .../Harpy/harpy_wings.rsi/harpyspeckled2.png | Bin .../Harpy/harpy_wings.rsi/harpyundertone1.png | Bin .../Harpy/harpy_wings.rsi/harpyundertone2.png | Bin .../Harpy/harpy_wings.rsi/harpywingtip1.png | Bin .../Harpy/harpy_wings.rsi/harpywingtip2.png | Bin .../Harpy/harpy_wings.rsi/meta.json | 0 .../Moth/moth_wings.rsi/meta.json | 0 .../Moth/moth_wings.rsi/selene.png | Bin .../Moth/moth_wings.rsi/selene_primary.png | Bin .../Moth/moth_wings.rsi/selene_secondary.png | Bin .../Moth/moth_wings.rsi/selene_tertiary.png | Bin .../Customization/Oni/oni_horns.rsi/bull.png | Bin .../Customization/Oni/oni_horns.rsi/meta.json | 0 .../Oni/oni_horns.rsi/shaved.png | Bin .../body_markings.rsi/countershade.png | Bin .../body_markings.rsi/countershade_f.png | Bin .../body_markings.rsi/countershade_lleg.png | Bin .../body_markings.rsi/countershade_rleg.png | Bin .../Rodentia/body_markings.rsi/fawn.png | Bin .../Rodentia/body_markings.rsi/hooded.png | Bin .../Rodentia/body_markings.rsi/hooded_f.png | Bin .../Rodentia/body_markings.rsi/meta.json | 0 .../Rodentia/cheek_markings.rsi/cheeks.png | Bin .../cheek_markings.rsi/cheeks_overlay.png | Bin .../Rodentia/cheek_markings.rsi/fluff.png | Bin .../Rodentia/cheek_markings.rsi/fluff_alt.png | Bin .../cheek_markings.rsi/fluff_alt_overlay.png | Bin .../cheek_markings.rsi/fluff_overlay.png | Bin .../Rodentia/cheek_markings.rsi/meta.json | 0 .../Rodentia/cheek_markings.rsi/whiskers.png | Bin .../Rodentia/ear_markings.rsi/bat.png | Bin .../Rodentia/ear_markings.rsi/bat_large.png | Bin .../Rodentia/ear_markings.rsi/hamster.png | Bin .../ear_markings.rsi/hamster_overlay.png | Bin .../Rodentia/ear_markings.rsi/long.png | Bin .../ear_markings.rsi/long_overlay.png | Bin .../Rodentia/ear_markings.rsi/meta.json | 0 .../Rodentia/ear_markings.rsi/mouse.png | Bin .../Rodentia/ear_markings.rsi/mouse_large.png | Bin .../ear_markings.rsi/mouse_large_overlay.png | Bin .../ear_markings.rsi/mouse_overlay.png | Bin .../Rodentia/ear_markings.rsi/none.png | Bin .../Rodentia/ear_markings.rsi/pointy.png | Bin .../Rodentia/ear_markings.rsi/rabbit.png | Bin .../ear_markings.rsi/rabbit_overlay.png | Bin .../Rodentia/ear_markings.rsi/small.png | Bin .../Rodentia/head_markings.rsi/blaze.png | Bin .../Rodentia/head_markings.rsi/meta.json | 0 .../Rodentia/head_markings.rsi/round.png | Bin .../Rodentia/snout_markings.rsi/bat.png | Bin .../Rodentia/snout_markings.rsi/bat_nose.png | Bin .../snout_markings.rsi/bat_overlay.png | Bin .../Rodentia/snout_markings.rsi/flat.png | Bin .../Rodentia/snout_markings.rsi/flat_nose.png | Bin .../snout_markings.rsi/flat_overlay.png | Bin .../Rodentia/snout_markings.rsi/meta.json | 0 .../Rodentia/snout_markings.rsi/round.png | Bin .../snout_markings.rsi/round_nose.png | Bin .../snout_markings.rsi/round_overlay.png | Bin .../Rodentia/tail_markings.rsi/beaver.png | Bin .../Rodentia/tail_markings.rsi/hamster.png | Bin .../Rodentia/tail_markings.rsi/long.png | Bin .../tail_markings.rsi/long_overlay.png | Bin .../Rodentia/tail_markings.rsi/long_tip.png | Bin .../Rodentia/tail_markings.rsi/meta.json | 0 .../Rodentia/tail_markings.rsi/mouse.png | Bin .../Rodentia/tail_markings.rsi/rabbit.png | Bin .../tail_markings.rsi/rabbit_overlay.png | Bin .../Rodentia/tail_markings.rsi/short.png | Bin .../Rodentia/tail_markings.rsi/squirrel.png | Bin .../tail_markings.rsi/squirrel_overlay.png | Bin .../body_markings.rsi/belly_crest.png | Bin .../Vulpkanin/body_markings.rsi/belly_fox.png | Bin .../body_markings.rsi/belly_full.png | Bin .../Vulpkanin/body_markings.rsi/meta.json | 0 .../body_markings.rsi/points_crest-arms.png | Bin .../body_markings.rsi/points_crest-legs.png | Bin .../body_markings.rsi/points_crest.png | Bin .../body_markings.rsi/points_fade-arms.png | Bin .../body_markings.rsi/points_fade-legs.png | Bin .../body_markings.rsi/points_fade.png | Bin .../body_markings.rsi/points_feet.png | Bin .../body_markings.rsi/points_hands.png | Bin .../body_markings.rsi/points_sharp-arms.png | Bin .../body_markings.rsi/points_sharp-legs.png | Bin .../body_markings.rsi/points_sharp.png | Bin .../Vulpkanin/ear_markings.rsi/coyote.png | Bin .../Vulpkanin/ear_markings.rsi/dalmatian.png | Bin .../ear_markings.rsi/fennec-inner.png | Bin .../Vulpkanin/ear_markings.rsi/fennec.png | Bin .../Vulpkanin/ear_markings.rsi/fox.png | Bin .../ear_markings.rsi/jackal-inner.png | Bin .../Vulpkanin/ear_markings.rsi/jackal.png | Bin .../Vulpkanin/ear_markings.rsi/meta.json | 0 .../Vulpkanin/ear_markings.rsi/msai-inner.png | Bin .../Vulpkanin/ear_markings.rsi/msai.png | Bin .../Vulpkanin/ear_markings.rsi/otie-inner.png | Bin .../Vulpkanin/ear_markings.rsi/otie.png | Bin .../Vulpkanin/ear_markings.rsi/shock.png | Bin .../ear_markings.rsi/terrier-inner.png | Bin .../Vulpkanin/ear_markings.rsi/terrier.png | Bin .../Vulpkanin/ear_markings.rsi/vulp-fade.png | Bin .../Vulpkanin/ear_markings.rsi/vulp-inner.png | Bin .../Vulpkanin/ear_markings.rsi/vulp-sharp.png | Bin .../Vulpkanin/ear_markings.rsi/vulp.png | Bin .../Vulpkanin/ear_markings.rsi/wolf-inner.png | Bin .../Vulpkanin/ear_markings.rsi/wolf.png | Bin .../Vulpkanin/facial_hair.rsi/elder.png | Bin .../Vulpkanin/facial_hair.rsi/elder_chin.png | Bin .../Vulpkanin/facial_hair.rsi/kita.png | Bin .../Vulpkanin/facial_hair.rsi/meta.json | 0 .../Vulpkanin/facial_hair.rsi/ruff.png | Bin .../Vulpkanin/hair.rsi/adhara.png | Bin .../Vulpkanin/hair.rsi/anita.png | Bin .../Vulpkanin/hair.rsi/apollo.png | Bin .../Vulpkanin/hair.rsi/belle.png | Bin .../Vulpkanin/hair.rsi/braided.png | Bin .../Customization/Vulpkanin/hair.rsi/bun.png | Bin .../Vulpkanin/hair.rsi/clean_cut.png | Bin .../Customization/Vulpkanin/hair.rsi/curl.png | Bin .../Customization/Vulpkanin/hair.rsi/hawk.png | Bin .../Vulpkanin/hair.rsi/jagged.png | Bin .../Vulpkanin/hair.rsi/jeremy.png | Bin .../Vulpkanin/hair.rsi/kajam.png | Bin .../Customization/Vulpkanin/hair.rsi/keid.png | Bin .../Vulpkanin/hair.rsi/kleeia.png | Bin .../Vulpkanin/hair.rsi/meta.json | 0 .../Vulpkanin/hair.rsi/mizar.png | Bin .../Vulpkanin/hair.rsi/punkbraided.png | Bin .../Vulpkanin/hair.rsi/raine.png | Bin .../Vulpkanin/hair.rsi/rough.png | Bin .../Vulpkanin/hair.rsi/short.png | Bin .../Vulpkanin/hair.rsi/short2.png | Bin .../Vulpkanin/hair.rsi/spike.png | Bin .../Vulpkanin/head_markings.rsi/blaze.png | Bin .../Vulpkanin/head_markings.rsi/mask.png | Bin .../Vulpkanin/head_markings.rsi/meta.json | 0 .../Vulpkanin/head_markings.rsi/muzzle.png | Bin .../head_markings.rsi/muzzle_alt.png | Bin .../head_markings.rsi/muzzle_fade.png | Bin .../head_markings.rsi/muzzle_sharp.png | Bin .../Vulpkanin/head_markings.rsi/nose.png | Bin .../Vulpkanin/head_markings.rsi/patch.png | Bin .../Vulpkanin/head_markings.rsi/slash.png | Bin .../head_markings.rsi/tiger_face.png | Bin .../head_markings.rsi/tiger_head.png | Bin .../head_markings.rsi/vulpine-lines.png | Bin .../Vulpkanin/head_markings.rsi/vulpine.png | Bin .../masking_helpers.rsi/female_full.png | Bin .../masking_helpers.rsi/female_none.png | Bin .../masking_helpers.rsi/female_top.png | Bin .../Vulpkanin/masking_helpers.rsi/full.png | Bin .../masking_helpers.rsi/male_full.png | Bin .../masking_helpers.rsi/male_none.png | Bin .../masking_helpers.rsi/male_top.png | Bin .../Vulpkanin/masking_helpers.rsi/meta.json | 0 .../Vulpkanin/masking_helpers.rsi/none.png | Bin .../Vulpkanin/masking_helpers.rsi/top.png | Bin .../masking_helpers.rsi/unisex_full.png | Bin .../masking_helpers.rsi/unisex_none.png | Bin .../masking_helpers.rsi/unisex_top.png | Bin .../Vulpkanin/tail_markings.rsi/bushfluff.png | Bin .../tail_markings.rsi/bushfluff_wag.png | Bin .../Vulpkanin/tail_markings.rsi/corgi_wag.png | Bin .../Vulpkanin/tail_markings.rsi/coyote.png | Bin .../tail_markings.rsi/coyote_wag.png | Bin .../tail_markings.rsi/dalmatian_wag.png | Bin .../Vulpkanin/tail_markings.rsi/fennec.png | Bin .../Vulpkanin/tail_markings.rsi/fluffy.png | Bin .../Vulpkanin/tail_markings.rsi/fox-fade.png | Bin .../Vulpkanin/tail_markings.rsi/fox-tip.png | Bin .../Vulpkanin/tail_markings.rsi/fox.png | Bin .../Vulpkanin/tail_markings.rsi/fox2.png | Bin .../Vulpkanin/tail_markings.rsi/fox3-tip.png | Bin .../Vulpkanin/tail_markings.rsi/fox3.png | Bin .../tail_markings.rsi/fox_wag-fade.png | Bin .../tail_markings.rsi/fox_wag-tip.png | Bin .../Vulpkanin/tail_markings.rsi/fox_wag.png | Bin .../tail_markings.rsi/husky-inner.png | Bin .../tail_markings.rsi/husky-outer.png | Bin .../Vulpkanin/tail_markings.rsi/husky.png | Bin .../Vulpkanin/tail_markings.rsi/long-tip.png | Bin .../Vulpkanin/tail_markings.rsi/long.png | Bin .../Vulpkanin/tail_markings.rsi/meta.json | 0 .../Vulpkanin/tail_markings.rsi/otie.png | Bin .../Vulpkanin/tail_markings.rsi/vulp-fade.png | Bin .../Vulpkanin/tail_markings.rsi/vulp-tip.png | Bin .../Vulpkanin/tail_markings.rsi/vulp.png | Bin .../tail_markings.rsi/vulp_alt-fade.png | Bin .../tail_markings.rsi/vulp_alt-tip.png | Bin .../Vulpkanin/tail_markings.rsi/vulp_alt.png | Bin .../tail_markings.rsi/vulp_wag-fade.png | Bin .../tail_markings.rsi/vulp_wag-tip.png | Bin .../Vulpkanin/tail_markings.rsi/vulp_wag.png | Bin .../Mobs/Species/Harpy/organs.rsi/lung-l.png | Bin .../Mobs/Species/Harpy/organs.rsi/lung-r.png | Bin .../Mobs/Species/Harpy/organs.rsi/meta.json | 0 .../Mobs/Species/Harpy/parts.rsi/full.png | Bin .../Mobs/Species/Harpy/parts.rsi/head_f.png | Bin .../Mobs/Species/Harpy/parts.rsi/head_m.png | Bin .../Mobs/Species/Harpy/parts.rsi/l_arm.png | Bin .../Mobs/Species/Harpy/parts.rsi/l_foot.png | Bin .../Mobs/Species/Harpy/parts.rsi/l_hand.png | Bin .../Mobs/Species/Harpy/parts.rsi/l_leg.png | Bin .../Mobs/Species/Harpy/parts.rsi/meta.json | 0 .../Mobs/Species/Harpy/parts.rsi/r_arm.png | Bin .../Mobs/Species/Harpy/parts.rsi/r_foot.png | Bin .../Mobs/Species/Harpy/parts.rsi/r_hand.png | Bin .../Mobs/Species/Harpy/parts.rsi/r_leg.png | Bin .../Mobs/Species/Harpy/parts.rsi/torso_f.png | Bin .../Mobs/Species/Harpy/parts.rsi/torso_m.png | Bin .../Mobs/Species/Rodentia/parts.rsi/full.png | Bin .../Species/Rodentia/parts.rsi/head_f.png | Bin .../Species/Rodentia/parts.rsi/head_m.png | Bin .../Mobs/Species/Rodentia/parts.rsi/l_arm.png | Bin .../Species/Rodentia/parts.rsi/l_foot.png | Bin .../Species/Rodentia/parts.rsi/l_hand.png | Bin .../Mobs/Species/Rodentia/parts.rsi/l_leg.png | Bin .../Mobs/Species/Rodentia/parts.rsi/meta.json | 0 .../Mobs/Species/Rodentia/parts.rsi/r_arm.png | Bin .../Species/Rodentia/parts.rsi/r_foot.png | Bin .../Species/Rodentia/parts.rsi/r_hand.png | Bin .../Mobs/Species/Rodentia/parts.rsi/r_leg.png | Bin .../Species/Rodentia/parts.rsi/torso_f.png | Bin .../Species/Rodentia/parts.rsi/torso_m.png | Bin .../Mobs/Species/Vulpkanin/parts.rsi/full.png | Bin .../Species/Vulpkanin/parts.rsi/head_f.png | Bin .../Species/Vulpkanin/parts.rsi/head_m.png | Bin .../Mobs/Species/Vulpkanin/parts.rsi/icon.png | Bin .../Species/Vulpkanin/parts.rsi/l_arm.png | Bin .../Species/Vulpkanin/parts.rsi/l_foot.png | Bin .../Species/Vulpkanin/parts.rsi/l_hand.png | Bin .../Species/Vulpkanin/parts.rsi/l_leg.png | Bin .../Species/Vulpkanin/parts.rsi/meta.json | 0 .../Vulpkanin/parts.rsi/overlay_husk.png | Bin .../Species/Vulpkanin/parts.rsi/r_arm.png | Bin .../Species/Vulpkanin/parts.rsi/r_foot.png | Bin .../Species/Vulpkanin/parts.rsi/r_hand.png | Bin .../Species/Vulpkanin/parts.rsi/r_leg.png | Bin .../Species/Vulpkanin/parts.rsi/torso_f.png | Bin .../Species/Vulpkanin/parts.rsi/torso_m.png | Bin .../Devices/cartridge.rsi/cart-cri.png | Bin .../Devices/cartridge.rsi/cart-mail.png | Bin .../Objects/Devices/cartridge.rsi/meta.json | 0 .../fire_extinguisher_closed.png | Bin .../fire_extinguisher_open.png | Bin .../inhand-left.png | Bin .../inhand-right.png | Bin .../fire_extinguisher_bluespace.rsi/meta.json | 0 .../Objects/Misc/id_cards.rsi/idchaplain.png | Bin .../Misc/id_cards.rsi/idchiefjustice.png | Bin .../Objects/Misc/id_cards.rsi/idclerk.png | Bin .../Objects/Misc/id_cards.rsi/idlawyer.png | Bin .../Misc/id_cards.rsi/idprosecutor.png | Bin .../Objects/Misc/id_cards.rsi/meta.json | 0 .../Misc/id_cards.rsi/nyanogladiator.png | Bin .../Misc/id_cards.rsi/nyanomailcarrier.png | Bin .../Objects/Misc/id_cards.rsi/nyanomantis.png | Bin .../Misc/id_cards.rsi/nyanomartialartist.png | Bin .../Misc/id_cards.rsi/nyanoprisoner.png | Bin .../Misc/id_cards.rsi/nyanoprisonguard.png | Bin .../plant_bag_holding.rsi/equipped-BELT.png | Bin .../plant_bag_holding.rsi/icon-unlit.png | Bin .../plant_bag_holding.rsi/icon.png | Bin .../inhand-left-unlit.png | Bin .../plant_bag_holding.rsi/inhand-left.png | Bin .../inhand-right-unlit.png | Bin .../plant_bag_holding.rsi/inhand-right.png | Bin .../plant_bag_holding.rsi/meta.json | 0 .../Specific/Justice/gavel.rsi/icon.png | Bin .../Justice/gavel.rsi/inhand-left.png | Bin .../Justice/gavel.rsi/inhand-right.png | Bin .../Specific/Justice/gavel.rsi/meta.json | 0 .../Specific/Justice/gavelblock.rsi/icon.png | Bin .../Specific/Justice/gavelblock.rsi/meta.json | 0 .../Specific/Justice/trialtimer.rsi/meta.json | 0 .../Justice/trialtimer.rsi/trialtimer.png | Bin .../vending_machine_restock.rsi/base.png | Bin .../vending_machine_restock.rsi/green_bit.png | Bin .../inhand-left.png | Bin .../inhand-right.png | Bin .../vending_machine_restock.rsi/meta.json | 0 .../refill_pride.png | Bin .../Objects/Storage/barrel.rsi/base.png | Bin .../Objects/Storage/barrel.rsi/closed.png | Bin .../Objects/Storage/barrel.rsi/meta.json | 0 .../Objects/Storage/barrel.rsi/open.png | Bin .../Objects/Storage/keg.rsi/base.png | Bin .../Objects/Storage/keg.rsi/meta.json | 0 .../Jetpacks/black.rsi/equipped-BACKPACK.png | Bin .../black.rsi/equipped-SUITSTORAGE.png | Bin .../Tanks/Jetpacks/black.rsi/icon-on.png | Bin .../Objects/Tanks/Jetpacks/black.rsi/icon.png | Bin .../Tanks/Jetpacks/black.rsi/inhand-left.png | Bin .../Tanks/Jetpacks/black.rsi/inhand-right.png | Bin .../Tanks/Jetpacks/black.rsi/meta.json | 0 .../black.rsi/on-equipped-BACKPACK.png | Bin .../black.rsi/on-equipped-SUITSTORAGE.png | Bin .../Jetpacks/blue.rsi/equipped-BACKPACK.png | Bin .../blue.rsi/equipped-SUITSTORAGE.png | Bin .../Tanks/Jetpacks/blue.rsi/icon-on.png | Bin .../Objects/Tanks/Jetpacks/blue.rsi/icon.png | Bin .../Tanks/Jetpacks/blue.rsi/inhand-left.png | Bin .../Tanks/Jetpacks/blue.rsi/inhand-right.png | Bin .../Objects/Tanks/Jetpacks/blue.rsi/meta.json | 0 .../blue.rsi/on-equipped-BACKPACK.png | Bin .../blue.rsi/on-equipped-SUITSTORAGE.png | Bin .../security.rsi/equipped-BACKPACK.png | Bin .../security.rsi/equipped-SUITSTORAGE.png | Bin .../Tanks/Jetpacks/security.rsi/icon-on.png | Bin .../Tanks/Jetpacks/security.rsi/icon.png | Bin .../Jetpacks/security.rsi/inhand-left.png | Bin .../Jetpacks/security.rsi/inhand-right.png | Bin .../Tanks/Jetpacks/security.rsi/meta.json | 0 .../security.rsi/on-equipped-BACKPACK.png | Bin .../security.rsi/on-equipped-SUITSTORAGE.png | Bin .../Weapons/Bombs/breaching.rsi/icon.png | Bin .../Bombs/breaching.rsi/inhand-left.png | Bin .../Bombs/breaching.rsi/inhand-right.png | Bin .../Weapons/Bombs/breaching.rsi/meta.json | 0 .../Weapons/Bombs/breaching.rsi/primed.png | Bin .../Guns/Ammunition/Boxes/bbgun.rsi/bbbox.png | Bin .../Ammunition/Boxes/bbgun.rsi/bbbullet.png | Bin .../Guns/Ammunition/Boxes/bbgun.rsi/meta.json | 0 .../Guns/Battery/energygun.rsi/base.png | Bin .../energygun.rsi/disabler-inhand-left.png | Bin .../energygun.rsi/disabler-inhand-right.png | Bin .../Guns/Battery/energygun.rsi/icon.png | Bin .../energygun.rsi/lethal-inhand-left.png | Bin .../energygun.rsi/lethal-inhand-right.png | Bin .../Battery/energygun.rsi/mag-unshaded-0.png | Bin .../Battery/energygun.rsi/mag-unshaded-1.png | Bin .../Battery/energygun.rsi/mag-unshaded-2.png | Bin .../Battery/energygun.rsi/mag-unshaded-3.png | Bin .../Battery/energygun.rsi/mag-unshaded-4.png | Bin .../Guns/Battery/energygun.rsi/meta.json | 0 .../Battery/energygun.rsi/mode-disabler.png | Bin .../Battery/energygun.rsi/mode-lethal.png | Bin .../Guns/Battery/energygun.rsi/mode-stun.png | Bin .../energygun.rsi/special-inhand-left.png | Bin .../energygun.rsi/special-inhand-right.png | Bin .../Battery/multiphase_energygun.rsi/base.png | Bin .../disabler-inhand-left.png | Bin .../disabler-inhand-right.png | Bin .../equipped-BELT.png | Bin .../Battery/multiphase_energygun.rsi/icon.png | Bin .../lethal-inhand-left.png | Bin .../lethal-inhand-right.png | Bin .../mag-unshaded-0.png | Bin .../mag-unshaded-1.png | Bin .../mag-unshaded-2.png | Bin .../mag-unshaded-3.png | Bin .../mag-unshaded-4.png | Bin .../multiphase_energygun.rsi/meta.json | 0 .../mode-disabler.png | Bin .../multiphase_energygun.rsi/mode-ion.png | Bin .../multiphase_energygun.rsi/mode-lethal.png | Bin .../special-inhand-left.png | Bin .../special-inhand-right.png | Bin .../Weapons/Guns/Rifles/bbgun.rsi/base.png | Bin .../Rifles/bbgun.rsi/equipped-BACKPACK.png | Bin .../Rifles/bbgun.rsi/equipped-SUITSTORAGE.png | Bin .../Weapons/Guns/Rifles/bbgun.rsi/icon.png | Bin .../Guns/Rifles/bbgun.rsi/inhand-left.png | Bin .../Guns/Rifles/bbgun.rsi/inhand-right.png | Bin .../Weapons/Guns/Rifles/bbgun.rsi/meta.json | 0 .../Rifles/bbgun.rsi/wielded-inhand-left.png | Bin .../Rifles/bbgun.rsi/wielded-inhand-right.png | Bin .../{DeltaV => _DV}/Shaders/ultravision.swsl | 0 .../VendingMachines/pride.rsi/broken.png | Bin .../VendingMachines/pride.rsi/meta.json | 0 .../pride.rsi/normal-unshaded.png | Bin .../VendingMachines/pride.rsi/off.png | Bin .../VendingMachines/pride.rsi/panel.png | Bin .../base.png | Bin .../icon.png | Bin .../inhand-left-unshaded.png | Bin .../inhand-left.png | Bin .../inhand-right-unshaded.png | Bin .../inhand-right.png | Bin .../mag-unshaded-0.png | Bin .../mag-unshaded-1.png | Bin .../mag-unshaded-2.png | Bin .../meta.json | 0 .../mode-cyan.png | Bin .../mode-red.png | Bin .../mode-yellow.png | Bin 808 files changed, 638 insertions(+), 697 deletions(-) rename Content.Client/{DeltaV => _DV}/Abilities/CrawlUnderObjectsSystem.cs (93%) rename Content.Client/{DeltaV => _DV}/Administration/UI/DepartmentWhitelistPanel.xaml (85%) rename Content.Client/{DeltaV => _DV}/Administration/UI/DepartmentWhitelistPanel.xaml.cs (98%) rename Content.Client/{DeltaV => _DV}/Administration/UI/GhostRoleSetWhitelistPanel.xaml (86%) rename Content.Client/{DeltaV => _DV}/Administration/UI/GhostRoleSetWhitelistPanel.xaml.cs (97%) rename Content.Client/{DeltaV => _DV}/Administration/UI/JobWhitelistsEui.cs (91%) rename Content.Client/{DeltaV => _DV}/Administration/UI/JobWhitelistsWindow.xaml (100%) rename Content.Client/{DeltaV => _DV}/Administration/UI/JobWhitelistsWindow.xaml.cs (96%) rename Content.Client/{DeltaV => _DV}/CartridgeLoader/Cartridges/MailMetricUi.cs (91%) rename Content.Client/{DeltaV => _DV}/CartridgeLoader/Cartridges/MailMetricUiFragment.xaml (98%) rename Content.Client/{DeltaV => _DV}/CartridgeLoader/Cartridges/MailMetricUiFragment.xaml.cs (98%) rename Content.Client/{DeltaV => _DV}/Harpy/HarpyVisualsComponent.cs (69%) rename Content.Client/{DeltaV => _DV}/Mail/MailComponent.cs (60%) rename Content.Client/{DeltaV => _DV}/Mail/MailSystem.cs (96%) rename Content.Client/{DeltaV => _DV}/Options/UI/Tabs/DeltaTab.xaml (89%) rename Content.Client/{DeltaV => _DV}/Options/UI/Tabs/DeltaTab.xaml.cs (93%) rename Content.Client/{DeltaV => _DV}/Overlays/UltraVisionOverlay.cs (97%) rename Content.Client/{DeltaV => _DV}/Overlays/UltraVisionSystem.cs (96%) rename Content.Client/{DeltaV => _DV}/RoundEnd/NoEorgPopup.xaml (100%) rename Content.Client/{DeltaV => _DV}/RoundEnd/NoEorgPopup.xaml.cs (97%) rename Content.Client/{DeltaV => _DV}/RoundEnd/NoEorgPopupSystem.cs (91%) delete mode 100644 Content.IntegrationTests/Tests/Nyanotrasen/DeepFryerTest.cs rename Content.Server/{DeltaV => _DV}/Abilities/CrawlUnderObjectsSystem.cs (98%) rename Content.Server/{DeltaV => _DV}/Administration/Commands/JobWhitelistsCommand.cs (96%) rename Content.Server/{DeltaV => _DV}/Administration/JobWhitelistsEui.cs (98%) rename Content.Server/{DeltaV => _DV}/Cargo/Components/SectorLogisticStatsDatabaseComponent.cs (88%) rename Content.Server/{DeltaV => _DV}/Cargo/Systems/LogisticStatsSystem.cs (96%) rename Content.Server/{DeltaV => _DV}/CartridgeLoader/Cartridges/MailMetricsCartridgeComponent.cs (77%) rename Content.Server/{DeltaV => _DV}/CartridgeLoader/Cartridges/MailMetricsCartridgeSystem.cs (93%) rename Content.Server/{DeltaV => _DV}/Harpy/HarpySingerSystem.cs (98%) rename Content.Server/{DeltaV => _DV}/Mail/Components/DelayedItemComponent.cs (91%) rename Content.Server/{DeltaV => _DV}/Mail/Components/MailComponent.cs (97%) rename Content.Server/{DeltaV => _DV}/Mail/Components/MailDisabledComponent.cs (67%) rename Content.Server/{DeltaV => _DV}/Mail/Components/MailReceiverComponent.cs (68%) rename Content.Server/{DeltaV => _DV}/Mail/Components/MailTeleporterComponent.cs (98%) rename Content.Server/{DeltaV => _DV}/Mail/Components/StationMailRouterComponent.cs (79%) rename Content.Server/{DeltaV => _DV}/Mail/EntitySystems/DelayedItemSystem.cs (95%) rename Content.Server/{DeltaV => _DV}/Mail/EntitySystems/MailSystem.cs (99%) rename Content.Server/{DeltaV => _DV}/Mail/MailCommands.cs (98%) rename Content.Server/{DeltaV => _DV}/Mail/MailConstants.cs (96%) rename Content.Server/{DeltaV => _DV}/Nutrition/Events.cs (100%) rename Content.Server/{DeltaV => _DV}/RoundEnd/RoundEndSystem.Pacified.cs (95%) rename Content.Server/{DeltaV => _DV}/Speech/Components/ScottishAccentComponent.cs (54%) rename Content.Server/{DeltaV => _DV}/Speech/EntitySystems/ScottishAccentSystem.cs (89%) rename Content.Server/{DeltaV => _DV}/Storage/EntitySystems/MouthStorageSystem.cs (89%) rename Content.Server/{DeltaV => _DV}/Weapons/Ranged/Components/EnergyGunComponent.cs (94%) rename Content.Server/{DeltaV => _DV}/Weapons/Ranged/Systems/EnergyGunSystem.cs (97%) rename Content.Shared/{DeltaV => _DV}/Abilities/AlwaysTriggerMousetrapComponent.cs (100%) rename Content.Shared/{DeltaV => _DV}/Abilities/CrawlUnderObjectsComponent.cs (96%) rename Content.Shared/{DeltaV => _DV}/Abilities/RummagerComponent.cs (100%) rename Content.Shared/{DeltaV => _DV}/Abilities/SharedCrawlUnderObjectsSystem.cs (94%) rename Content.Shared/{DeltaV => _DV}/Abilities/UltraVisionComponent.cs (100%) rename Content.Shared/{DeltaV => _DV}/Administration/JobWhitelistsEuiState.cs (97%) rename Content.Shared/{DeltaV => _DV}/CCVars/DCCVars.cs (97%) rename Content.Shared/{DeltaV => _DV}/CartridgeLoader/Cartridges/MailMetricUiState.cs (100%) rename Content.Shared/{DeltaV => _DV}/Harpy/Components/HarpyVisualSystem.cs (83%) rename Content.Shared/{DeltaV => _DV}/Harpy/HarpySingerComponent.cs (94%) rename Content.Shared/{DeltaV => _DV}/Harpy/HarpySingerSystem.cs (95%) rename Content.Shared/{DeltaV => _DV}/Harpy/HarpyVisualsSystem.cs (97%) rename Content.Shared/{DeltaV => _DV}/Harpy/SharedHarpyVisualsComponent.cs (74%) rename Content.Shared/{DeltaV => _DV}/Mail/MailDeliveryPoolPrototype.cs (95%) rename Content.Shared/{DeltaV => _DV}/Mail/MailVisuals.cs (90%) rename Content.Shared/{DeltaV => _DV}/Mail/SharedMailComponent.cs (68%) rename Content.Shared/{DeltaV => _DV}/StepTrigger/Component/NoShoesSilentFootstepsComponent.cs (100%) rename Content.Shared/{DeltaV => _DV}/Storage/Components/MouthStorageComponent.cs (88%) rename Content.Shared/{DeltaV => _DV}/Storage/EntitySystems/SharedMouthStorageSystem.cs (96%) rename Content.Shared/{DeltaV => _DV}/Weapons/Ranged/EnergyGunFireModeVisuals.cs (87%) rename Content.Shared/{DeltaV => _DV}/Whitelist/WhitelistTierPrototype.cs (92%) rename Resources/Audio/{DeltaV => _DV}/Items/eatfood.ogg (100%) rename Resources/Audio/{DeltaV => _DV}/Jukebox/Caravan_Palace_Lone_Digger-MONO.ogg (100%) rename Resources/Audio/{DeltaV => _DV}/Jukebox/DOS=HIGH,_UMB.ogg (100%) rename Resources/Audio/{DeltaV => _DV}/Jukebox/Patricia_Taxxon_-_Minute_-_MONO.ogg (100%) rename Resources/Audio/{DeltaV => _DV}/Jukebox/Phoron_Will_Make_Us_RichMONO2.ogg (100%) rename Resources/Audio/{DeltaV => _DV}/Jukebox/Scratch_Post_-_OST_MONO.ogg (100%) rename Resources/Audio/{DeltaV => _DV}/Jukebox/a_different_reality_lagoona_remix.xm-MONO.ogg (100%) rename Resources/Audio/{DeltaV => _DV}/Jukebox/aggravated.it-MONO.ogg (100%) rename Resources/Audio/{DeltaV => _DV}/Jukebox/attributions.yml (98%) rename Resources/Audio/{DeltaV => _DV}/Jukebox/autumnal_equinox.xm-MONO.ogg (100%) rename Resources/Audio/{DeltaV => _DV}/Jukebox/deck_the_halls_b-MONO.ogg (100%) rename Resources/Audio/{DeltaV => _DV}/Jukebox/drozerix_-_alone.xm-MONO.ogg (100%) rename Resources/Audio/{DeltaV => _DV}/Jukebox/drozerix_-_leisurely_voice.xm-MONO.ogg (100%) rename Resources/Audio/{DeltaV => _DV}/Jukebox/every_light_is_blinking_at_onceMONO.ogg (100%) rename Resources/Audio/{DeltaV => _DV}/Jukebox/hackers-MONO.ogg (100%) rename Resources/Audio/{DeltaV => _DV}/Jukebox/lasers_rip_apart_the_bulkheadMONO.ogg (100%) rename Resources/Audio/{DeltaV => _DV}/Jukebox/marhaba-MONO.ogg (100%) rename Resources/Audio/{DeltaV => _DV}/Jukebox/psirius_-_nymphs_of_the_forest.mptm-MONO.ogg (100%) rename Resources/Audio/{DeltaV => _DV}/Jukebox/shibamata-MONO.ogg (100%) rename Resources/Audio/{DeltaV => _DV}/Jukebox/space_asshole-MONO.ogg (100%) rename Resources/Audio/{DeltaV => _DV}/Jukebox/superposition-MONO.ogg (100%) rename Resources/Audio/{DeltaV => _DV}/Voice/Harpy/attributions.yml (100%) rename Resources/Audio/{DeltaV => _DV}/Voice/Harpy/caw1.ogg (100%) rename Resources/Audio/{DeltaV => _DV}/Voice/Harpy/chirp1.ogg (100%) rename Resources/Audio/{DeltaV => _DV}/Voice/Harpy/license.txt (100%) rename Resources/Audio/{DeltaV => _DV}/Voice/Talk/license.txt (100%) rename Resources/Audio/{DeltaV => _DV}/Voice/Talk/vulp.ogg (100%) rename Resources/Audio/{DeltaV => _DV}/Voice/Talk/vulp_ask.ogg (100%) rename Resources/Audio/{DeltaV => _DV}/Voice/Talk/vulp_exclaim.ogg (100%) rename Resources/Audio/{DeltaV => _DV}/Voice/Vulpkanin/attributions.yml (100%) rename Resources/Audio/{DeltaV => _DV}/Voice/Vulpkanin/dog_bark1.ogg (100%) rename Resources/Audio/{DeltaV => _DV}/Voice/Vulpkanin/dog_bark2.ogg (100%) rename Resources/Audio/{DeltaV => _DV}/Voice/Vulpkanin/dog_bark3.ogg (100%) rename Resources/Audio/{DeltaV => _DV}/Voice/Vulpkanin/dog_growl1.ogg (100%) rename Resources/Audio/{DeltaV => _DV}/Voice/Vulpkanin/dog_growl2.ogg (100%) rename Resources/Audio/{DeltaV => _DV}/Voice/Vulpkanin/dog_growl3.ogg (100%) rename Resources/Audio/{DeltaV => _DV}/Voice/Vulpkanin/dog_growl4.ogg (100%) rename Resources/Audio/{DeltaV => _DV}/Voice/Vulpkanin/dog_growl5.ogg (100%) rename Resources/Audio/{DeltaV => _DV}/Voice/Vulpkanin/dog_growl6.ogg (100%) rename Resources/Audio/{DeltaV => _DV}/Voice/Vulpkanin/dog_snarl1.ogg (100%) rename Resources/Audio/{DeltaV => _DV}/Voice/Vulpkanin/dog_snarl2.ogg (100%) rename Resources/Audio/{DeltaV => _DV}/Voice/Vulpkanin/dog_snarl3.ogg (100%) rename Resources/Audio/{DeltaV => _DV}/Voice/Vulpkanin/dog_whine.ogg (100%) rename Resources/Audio/{DeltaV => _DV}/Voice/Vulpkanin/howl.ogg (100%) rename Resources/Audio/{DeltaV => _DV}/Voice/Vulpkanin/license.txt (100%) rename Resources/Audio/{DeltaV => _DV}/Weapons/Guns/Empty/dry_fire.ogg (100%) rename Resources/Audio/{DeltaV => _DV}/Weapons/Guns/Gunshots/laser.ogg (100%) rename Resources/Audio/{DeltaV => _DV}/license.txt (100%) rename Resources/Locale/en-US/{deltav => _DV}/accent/scottish.ftl (100%) rename Resources/Locale/en-US/{deltav => _DV}/administration/ui/player-panel.ftl (100%) rename Resources/Locale/en-US/{deltav => _DV}/advertisements/vending/pride.ftl (100%) rename Resources/Locale/en-US/{deltav => _DV}/cartridge-loader/cartridges.ftl (100%) rename Resources/Locale/en-US/{deltav => _DV}/catalog/cargo/cargo-vending.ftl (100%) rename Resources/Locale/en-US/{deltav => _DV}/catalog/fills/crates/vending-crates.ftl (100%) rename Resources/Locale/en-US/{deltav => _DV}/escape-menu/options-menu.ftl (100%) rename Resources/Locale/en-US/{deltav => _DV}/flavors/flavor-profiles.ftl (100%) rename Resources/Locale/en-US/{deltav => _DV}/harpy/singer_system.ftl (100%) rename Resources/Locale/en-US/{deltav => _DV}/info/whitelists.ftl (100%) rename Resources/Locale/en-US/{deltav => _DV}/markings/Oni.ftl (100%) rename Resources/Locale/en-US/{deltav => _DV}/markings/felinid.ftl (100%) rename Resources/Locale/en-US/{deltav => _DV}/markings/harpy.ftl (100%) rename Resources/Locale/en-US/{deltav => _DV}/markings/moth.ftl (100%) rename Resources/Locale/en-US/{deltav => _DV}/markings/rodentia.ftl (100%) rename Resources/Locale/en-US/{deltav => _DV}/materials/materials.ftl (100%) rename Resources/Locale/en-US/{deltav => _DV}/materials/units.ftl (100%) rename Resources/Locale/en-US/{deltav => _DV}/reagents/meta/consumable/food/condiments.ftl (100%) rename Resources/Locale/en-US/{deltav => _DV}/reagents/meta/physical-desc.ftl (100%) rename Resources/Locale/en-US/{deltav => _DV}/research/technologies.ftl (100%) rename Resources/Locale/en-US/{deltav => _DV}/roundend/no-eorg-popup.ftl (100%) rename Resources/Locale/en-US/{deltav => _DV}/species/namepreset.ftl (100%) rename Resources/Locale/en-US/{deltav => _DV}/species/species.ftl (100%) rename Resources/Locale/en-US/{deltav => _DV}/storage/mouth-storage-component.ftl (100%) rename Resources/Locale/en-US/{deltav => _DV}/store/uplink-catalog.ftl (100%) rename Resources/Locale/en-US/{deltav => _DV}/tools/tool-qualities.ftl (100%) rename Resources/Locale/en-US/{deltav => _DV}/traits/traits.ftl (100%) rename Resources/Locale/en-US/{deltav => _DV}/weapons/ranged/energygun.ftl (100%) delete mode 100644 Resources/Prototypes/DeltaV/Shaders/birdvision.yml delete mode 100644 Resources/Prototypes/DeltaV/SoundCollections/vulpkanin.yml delete mode 100644 Resources/Prototypes/DeltaV/Voice/speech_sounds.yml rename Resources/Prototypes/{DeltaV => _DV}/Accents/word_replacements.yml (100%) rename Resources/Prototypes/{DeltaV => _DV}/Actions/types.yml (94%) rename Resources/Prototypes/{DeltaV => _DV}/Body/Organs/harpy.yml (100%) rename Resources/Prototypes/{DeltaV => _DV}/Body/Organs/vulpkanin.yml (100%) rename Resources/Prototypes/{DeltaV => _DV}/Body/Parts/harpy.yml (85%) rename Resources/Prototypes/{DeltaV => _DV}/Body/Parts/rodentia.yml (96%) rename Resources/Prototypes/{DeltaV => _DV}/Body/Parts/vulpkanin.yml (84%) rename Resources/Prototypes/{DeltaV => _DV}/Body/Prototypes/harpy.yml (100%) rename Resources/Prototypes/{DeltaV => _DV}/Body/Prototypes/rodentia.yml (100%) rename Resources/Prototypes/{DeltaV => _DV}/Body/Prototypes/vulpkanin.yml (100%) rename Resources/Prototypes/{DeltaV => _DV}/Catalog/Cargo/cargo_fun.yml (100%) rename Resources/Prototypes/{DeltaV => _DV}/Catalog/Cargo/cargo_vending.yml (100%) rename Resources/Prototypes/{DeltaV => _DV}/Catalog/Fills/Crates/vending.yml (100%) rename Resources/Prototypes/{DeltaV => _DV}/Catalog/Jukebox/Standard.yml (57%) rename Resources/Prototypes/{DeltaV => _DV}/Catalog/VendingMachines/Advertisements/pride.yml (100%) rename Resources/Prototypes/{DeltaV => _DV}/Catalog/VendingMachines/Inventories/pride.yml (100%) rename Resources/Prototypes/{DeltaV => _DV}/Damage/modifier_sets.yml (100%) rename Resources/Prototypes/{DeltaV => _DV}/Detasets/Names/rodentia_female.yml (100%) rename Resources/Prototypes/{DeltaV => _DV}/Detasets/Names/rodentia_last.yml (100%) rename Resources/Prototypes/{DeltaV => _DV}/Detasets/Names/rodentia_male.yml (100%) rename Resources/Prototypes/{DeltaV => _DV}/Detasets/Names/vulpkanin_female.yml (100%) rename Resources/Prototypes/{DeltaV => _DV}/Detasets/Names/vulpkanin_last.yml (100%) rename Resources/Prototypes/{DeltaV => _DV}/Detasets/Names/vulpkanin_male.yml (100%) rename Resources/Prototypes/{DeltaV => _DV}/Entities/Clothing/Shoes/misc.yml (100%) rename Resources/Prototypes/{DeltaV => _DV}/Entities/Clothing/Shoes/winter-boots.yml (59%) rename Resources/Prototypes/{DeltaV => _DV}/Entities/Clothing/Uniforms/jumpsuits.yml (64%) rename Resources/Prototypes/{DeltaV => _DV}/Entities/Mobs/Customization/Markings/Oni_horns.yml (70%) rename Resources/Prototypes/{DeltaV => _DV}/Entities/Mobs/Customization/Markings/felinid.yml (62%) rename Resources/Prototypes/{DeltaV => _DV}/Entities/Mobs/Customization/Markings/harpy.yml (74%) rename Resources/Prototypes/{DeltaV => _DV}/Entities/Mobs/Customization/Markings/moth.yml (66%) rename Resources/Prototypes/{DeltaV => _DV}/Entities/Mobs/Customization/Markings/rodentia.yml (64%) rename Resources/Prototypes/{DeltaV => _DV}/Entities/Mobs/Customization/Markings/vulpkanin.yml (64%) rename Resources/Prototypes/{DeltaV => _DV}/Entities/Mobs/Player/harpy.yml (100%) rename Resources/Prototypes/{DeltaV => _DV}/Entities/Mobs/Player/rodentia.yml (100%) rename Resources/Prototypes/{DeltaV => _DV}/Entities/Mobs/Player/vulpkanin.yml (100%) rename Resources/Prototypes/{DeltaV => _DV}/Entities/Mobs/Species/harpy.yml (97%) rename Resources/Prototypes/{DeltaV => _DV}/Entities/Mobs/Species/rodentia.yml (97%) rename Resources/Prototypes/{DeltaV => _DV}/Entities/Mobs/Species/vulpkanin.yml (95%) rename Resources/Prototypes/{DeltaV => _DV}/Entities/Objects/Devices/cartridges.yml (78%) rename Resources/Prototypes/{DeltaV => _DV}/Entities/Objects/Devices/pda.yml (82%) rename Resources/Prototypes/{DeltaV => _DV}/Entities/Objects/Fun/toy_guns.yml (88%) rename Resources/Prototypes/{DeltaV => _DV}/Entities/Objects/Materials/ore.yml (100%) rename Resources/Prototypes/{DeltaV => _DV}/Entities/Objects/Misc/fire_extinguisher.yml (86%) rename Resources/Prototypes/{DeltaV => _DV}/Entities/Objects/Misc/identification_cards.yml (61%) rename Resources/Prototypes/{DeltaV => _DV}/Entities/Objects/Misc/mouth_storage.yml (100%) rename Resources/Prototypes/{DeltaV => _DV}/Entities/Objects/Specific/Hydroponics/plant_bag_holding.yml (83%) rename Resources/Prototypes/{DeltaV => _DV}/Entities/Objects/Specific/Justice/gavel.yml (77%) rename Resources/Prototypes/{DeltaV => _DV}/Entities/Objects/Specific/Justice/gavelblock.yml (78%) rename Resources/Prototypes/{DeltaV => _DV}/Entities/Objects/Specific/Justice/trialtimer.yml (89%) rename Resources/Prototypes/{DeltaV => _DV}/Entities/Objects/Specific/Service/vending_machine_restock.yml (86%) rename Resources/Prototypes/{DeltaV => _DV}/Entities/Objects/Weapons/Bombs/plastic.yml (93%) rename Resources/Prototypes/{DeltaV => _DV}/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy_guns.yml (81%) rename Resources/Prototypes/{DeltaV => _DV}/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml (86%) rename Resources/Prototypes/{DeltaV => _DV}/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml (100%) rename Resources/Prototypes/{DeltaV => _DV}/Entities/Objects/Weapons/Guns/Projectiles/toy_projectiles.yml (97%) rename Resources/Prototypes/{DeltaV => _DV}/Entities/Structures/Doors/Windoors/windoor.yml (100%) rename Resources/Prototypes/{DeltaV => _DV}/Entities/Structures/Machines/vending_machines.yml (90%) rename Resources/Prototypes/{DeltaV => _DV}/Entities/Structures/Storage/Crates/barrel.yml (96%) rename Resources/Prototypes/{DeltaV => _DV}/Flavors/flavors.yml (100%) rename Resources/Prototypes/{DeltaV => _DV}/Guidebook/species.yml (52%) rename Resources/Prototypes/{DeltaV => _DV}/InventoryTemplates/digitigrade_inventory_template.yml (100%) rename Resources/Prototypes/{DeltaV => _DV}/Reagents/Materials/ores.yml (100%) rename Resources/Prototypes/{DeltaV => _DV}/Recipes/Crafting/Graphs/barrel.yml (100%) rename Resources/Prototypes/{DeltaV => _DV}/Recipes/Crafting/barrel.yml (85%) rename Resources/Prototypes/{DeltaV => _DV}/Recipes/Lathes/devices.yml (100%) rename Resources/Prototypes/{DeltaV => _DV}/Recipes/Lathes/medical.yml (100%) rename Resources/Prototypes/{DeltaV => _DV}/Recipes/Lathes/tools.yml (100%) rename Resources/Prototypes/{DeltaV => _DV}/Research/civilianservices.yml (100%) create mode 100644 Resources/Prototypes/_DV/Shaders/birdvision.yml rename Resources/Prototypes/{DeltaV => _DV}/SoundCollections/harpy.yml (95%) create mode 100644 Resources/Prototypes/_DV/SoundCollections/vulpkanin.yml rename Resources/Prototypes/{DeltaV => _DV}/Species/harpy.yml (78%) rename Resources/Prototypes/{DeltaV => _DV}/Species/rodentia.yml (79%) rename Resources/Prototypes/{DeltaV => _DV}/Species/vulpkanin.yml (78%) rename Resources/Prototypes/{DeltaV => _DV}/Stacks/Materials/ore.yml (100%) rename Resources/Prototypes/{DeltaV => _DV}/Traits/disabilities.yml (100%) rename Resources/Prototypes/{DeltaV => _DV}/Traits/speech.yml (100%) rename Resources/Prototypes/{DeltaV => _DV}/Voice/speech_emote_sounds.yml (100%) rename Resources/Prototypes/{DeltaV => _DV}/Voice/speech_emotes.yml (100%) create mode 100644 Resources/Prototypes/_DV/Voice/speech_sounds.yml rename Resources/Prototypes/{DeltaV => _DV}/Voice/speech_verbs.yml (100%) rename Resources/Prototypes/{DeltaV => _DV}/shaders.yml (100%) rename Resources/Prototypes/{DeltaV => _DV}/tags.yml (100%) rename Resources/Prototypes/{DeltaV => _DV}/tool_qualities.yml (100%) rename Resources/Prototypes/{DeltaV => _DV}/typing_indicator.yml (63%) rename Resources/ServerInfo/Guidebook/Mobs/{DeltaV => _DV}/Felinid.xml (100%) rename Resources/ServerInfo/Guidebook/Mobs/{DeltaV => _DV}/Harpy.xml (100%) rename Resources/ServerInfo/Guidebook/Mobs/{DeltaV => _DV}/Oni.xml (100%) rename Resources/ServerInfo/Guidebook/Mobs/{DeltaV => _DV}/Rodentia.xml (100%) rename Resources/ServerInfo/Guidebook/Mobs/{DeltaV => _DV}/Vulpkanin.xml (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsatmos.rsi/equipped-FEET.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsatmos.rsi/icon.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsatmos.rsi/inhand-left.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsatmos.rsi/inhand-right.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsatmos.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootscap.rsi/equipped-FEET.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootscap.rsi/icon.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootscap.rsi/inhand-left.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootscap.rsi/inhand-right.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootscap.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsce.rsi/equipped-FEET.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsce.rsi/icon.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsce.rsi/inhand-left.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsce.rsi/inhand-right.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsce.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootscentcom.rsi/equipped-FEET.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootscentcom.rsi/icon.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootscentcom.rsi/inhand-left.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootscentcom.rsi/inhand-right.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootscentcom.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootschef.rsi/equipped-FEET.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootschef.rsi/icon.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootschef.rsi/inhand-left.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootschef.rsi/inhand-right.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootschef.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootschem.rsi/equipped-FEET.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootschem.rsi/icon.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootschem.rsi/inhand-left.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootschem.rsi/inhand-right.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootschem.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsclown.rsi/equipped-FEET.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsclown.rsi/icon.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsclown.rsi/inhand-left.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsclown.rsi/inhand-right.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsclown.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootscmo.rsi/equipped-FEET.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootscmo.rsi/icon.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootscmo.rsi/inhand-left.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootscmo.rsi/inhand-right.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootscmo.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsgen.rsi/equipped-FEET.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsgen.rsi/icon.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsgen.rsi/inhand-left.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsgen.rsi/inhand-right.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsgen.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootshop.rsi/equipped-FEET.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootshop.rsi/icon.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootshop.rsi/inhand-left.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootshop.rsi/inhand-right.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootshop.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootshos.rsi/equipped-FEET.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootshos.rsi/icon.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootshos.rsi/inhand-left.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootshos.rsi/inhand-right.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootshos.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootshydro.rsi/equipped-FEET.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootshydro.rsi/icon.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootshydro.rsi/inhand-left.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootshydro.rsi/inhand-right.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootshydro.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsjani.rsi/equipped-FEET.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsjani.rsi/icon.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsjani.rsi/inhand-left.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsjani.rsi/inhand-right.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsjani.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsmime.rsi/equipped-FEET.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsmime.rsi/icon.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsmime.rsi/inhand-left.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsmime.rsi/inhand-right.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsmime.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsminer.rsi/equipped-FEET.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsminer.rsi/icon.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsminer.rsi/inhand-left.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsminer.rsi/inhand-right.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsminer.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsparamed.rsi/equipped-FEET.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsparamed.rsi/icon.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsparamed.rsi/inhand-left.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsparamed.rsi/inhand-right.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsparamed.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsqm.rsi/equipped-FEET.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsqm.rsi/icon.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsqm.rsi/inhand-left.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsqm.rsi/inhand-right.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsqm.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsrd.rsi/equipped-FEET.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsrd.rsi/icon.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsrd.rsi/inhand-left.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsrd.rsi/inhand-right.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsrd.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsrobo.rsi/equipped-FEET.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsrobo.rsi/icon.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsrobo.rsi/inhand-left.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsrobo.rsi/inhand-right.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsrobo.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsviro.rsi/equipped-FEET.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsviro.rsi/icon.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsviro.rsi/inhand-left.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsviro.rsi/inhand-right.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootsviro.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootswarden.rsi/equipped-FEET.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootswarden.rsi/icon.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootswarden.rsi/inhand-left.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootswarden.rsi/inhand-right.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Shoes/Boots/winterbootswarden.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Uniforms/Jumpsuit/kilt.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Uniforms/Jumpsuit/kilt.rsi/icon.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Uniforms/Jumpsuit/kilt.rsi/inhand-left.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Uniforms/Jumpsuit/kilt.rsi/inhand-right.png (100%) rename Resources/Textures/{DeltaV => _DV}/Clothing/Uniforms/Jumpsuit/kilt.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Effects/creampie.rsi/creampie_rodentia.png (100%) rename Resources/Textures/{DeltaV => _DV}/Effects/creampie.rsi/creampie_vulpkanin.png (100%) rename Resources/Textures/{DeltaV => _DV}/Effects/creampie.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Effects/harpysinger.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Effects/harpysinger.rsi/singing_music_notes.png (100%) rename Resources/Textures/{DeltaV => _DV}/Effects/speech.rsi/felinid0.png (100%) rename Resources/Textures/{DeltaV => _DV}/Effects/speech.rsi/felinid1.png (100%) rename Resources/Textures/{DeltaV => _DV}/Effects/speech.rsi/felinid2.png (100%) rename Resources/Textures/{DeltaV => _DV}/Effects/speech.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Effects/speech.rsi/rodentia0.png (100%) rename Resources/Textures/{DeltaV => _DV}/Effects/speech.rsi/rodentia1.png (100%) rename Resources/Textures/{DeltaV => _DV}/Effects/speech.rsi/rodentia2.png (100%) rename Resources/Textures/{DeltaV => _DV}/Interface/Actions/harpy_sing.png (100%) rename Resources/Textures/{DeltaV => _DV}/Interface/Actions/harpy_syrinx.png (100%) rename Resources/Textures/{DeltaV => _DV}/Interface/Actions/mouthStorageOpen.png (100%) rename Resources/Textures/{DeltaV => _DV}/Interface/Misc/job_icons.rsi/Chaplain.png (100%) rename Resources/Textures/{DeltaV => _DV}/Interface/Misc/job_icons.rsi/ChiefJustice.png (100%) rename Resources/Textures/{DeltaV => _DV}/Interface/Misc/job_icons.rsi/Clerk.png (100%) rename Resources/Textures/{DeltaV => _DV}/Interface/Misc/job_icons.rsi/Lawyer.png (100%) rename Resources/Textures/{DeltaV => _DV}/Interface/Misc/job_icons.rsi/MedicalBorg.png (100%) rename Resources/Textures/{DeltaV => _DV}/Interface/Misc/job_icons.rsi/Prosecutor.png (100%) rename Resources/Textures/{DeltaV => _DV}/Interface/Misc/job_icons.rsi/SecurityBorg.png (100%) rename Resources/Textures/{DeltaV => _DV}/Interface/Misc/job_icons.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Interface/Misc/job_icons.rsi/nyanoGladiator.png (100%) rename Resources/Textures/{DeltaV => _DV}/Interface/Misc/job_icons.rsi/nyanoMailCarrier.png (100%) rename Resources/Textures/{DeltaV => _DV}/Interface/Misc/job_icons.rsi/nyanoMantis.png (100%) rename Resources/Textures/{DeltaV => _DV}/Interface/Misc/job_icons.rsi/nyanoMartialArtist.png (100%) rename Resources/Textures/{DeltaV => _DV}/Interface/Misc/job_icons.rsi/nyanoPrisonGuard.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Felinid/alternative_tail.rsi/m_waggingtail_cat_FRONT.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Felinid/alternative_tail.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Felinid/felinid_tails.rsi/Felinid_fluffy_tail_full.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Felinid/felinid_tails.rsi/felinid_fluffy_tail_rings.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Felinid/felinid_tails.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Felinid/tiger_tail.rsi/m_tail_tiger_primary.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Felinid/tiger_tail.rsi/m_tail_tiger_secondary.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Felinid/tiger_tail.rsi/m_tail_tiger_tertiary.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Felinid/tiger_tail.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Harpy/harpy_chest.rsi/lower.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Harpy/harpy_chest.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Harpy/harpy_chest.rsi/upper.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Harpy/harpy_ears.rsi/harpy_ears_default.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Harpy/harpy_ears.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Harpy/harpy_legs.rsi/feet.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Harpy/harpy_legs.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Harpy/harpy_legs.rsi/talons.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Harpy/harpy_legs.rsi/thighs.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Harpy/harpy_tails.rsi/phoenix_tail.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Harpy/harpy_tails.rsi/rooster_tail.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Harpy/harpy_tailsx72.rsi/finch_tail.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Harpy/harpy_tailsx72.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Harpy/harpy_wingcover.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Harpy/harpy_wings.rsi/classicharpy.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Harpy/harpy_wings.rsi/harpy.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone1.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Harpy/harpy_wings.rsi/harpy2tone2.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone1.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone2.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Harpy/harpy_wings.rsi/harpy3tone3.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Harpy/harpy_wings.rsi/harpyfolded.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled1.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Harpy/harpy_wings.rsi/harpyspeckled2.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone1.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Harpy/harpy_wings.rsi/harpyundertone2.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip1.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Harpy/harpy_wings.rsi/harpywingtip2.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Moth/moth_wings.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Moth/moth_wings.rsi/selene.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Moth/moth_wings.rsi/selene_primary.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Moth/moth_wings.rsi/selene_secondary.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Moth/moth_wings.rsi/selene_tertiary.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Oni/oni_horns.rsi/bull.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Oni/oni_horns.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Oni/oni_horns.rsi/shaved.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/body_markings.rsi/countershade.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/body_markings.rsi/countershade_f.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/body_markings.rsi/countershade_lleg.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/body_markings.rsi/countershade_rleg.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/body_markings.rsi/fawn.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/body_markings.rsi/hooded.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/body_markings.rsi/hooded_f.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/body_markings.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/cheek_markings.rsi/cheeks.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/cheek_markings.rsi/cheeks_overlay.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/cheek_markings.rsi/fluff.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/cheek_markings.rsi/fluff_alt.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/cheek_markings.rsi/fluff_alt_overlay.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/cheek_markings.rsi/fluff_overlay.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/cheek_markings.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/cheek_markings.rsi/whiskers.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/ear_markings.rsi/bat.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/ear_markings.rsi/bat_large.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/ear_markings.rsi/hamster.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/ear_markings.rsi/hamster_overlay.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/ear_markings.rsi/long.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/ear_markings.rsi/long_overlay.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/ear_markings.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/ear_markings.rsi/mouse.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/ear_markings.rsi/mouse_large.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/ear_markings.rsi/mouse_large_overlay.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/ear_markings.rsi/mouse_overlay.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/ear_markings.rsi/none.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/ear_markings.rsi/pointy.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/ear_markings.rsi/rabbit.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/ear_markings.rsi/rabbit_overlay.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/ear_markings.rsi/small.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/head_markings.rsi/blaze.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/head_markings.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/head_markings.rsi/round.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/snout_markings.rsi/bat.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/snout_markings.rsi/bat_nose.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/snout_markings.rsi/bat_overlay.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/snout_markings.rsi/flat.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/snout_markings.rsi/flat_nose.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/snout_markings.rsi/flat_overlay.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/snout_markings.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/snout_markings.rsi/round.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/snout_markings.rsi/round_nose.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/snout_markings.rsi/round_overlay.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/tail_markings.rsi/beaver.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/tail_markings.rsi/hamster.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/tail_markings.rsi/long.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/tail_markings.rsi/long_overlay.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/tail_markings.rsi/long_tip.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/tail_markings.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/tail_markings.rsi/mouse.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/tail_markings.rsi/rabbit.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/tail_markings.rsi/rabbit_overlay.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/tail_markings.rsi/short.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/tail_markings.rsi/squirrel.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Rodentia/tail_markings.rsi/squirrel_overlay.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/body_markings.rsi/belly_crest.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/body_markings.rsi/belly_fox.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/body_markings.rsi/belly_full.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/body_markings.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/body_markings.rsi/points_crest-arms.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/body_markings.rsi/points_crest-legs.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/body_markings.rsi/points_crest.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/body_markings.rsi/points_fade-arms.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/body_markings.rsi/points_fade-legs.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/body_markings.rsi/points_fade.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/body_markings.rsi/points_feet.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/body_markings.rsi/points_hands.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp-arms.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp-legs.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/body_markings.rsi/points_sharp.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/ear_markings.rsi/coyote.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/ear_markings.rsi/dalmatian.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/ear_markings.rsi/fennec-inner.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/ear_markings.rsi/fennec.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/ear_markings.rsi/fox.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/ear_markings.rsi/jackal-inner.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/ear_markings.rsi/jackal.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/ear_markings.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/ear_markings.rsi/msai-inner.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/ear_markings.rsi/msai.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/ear_markings.rsi/otie-inner.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/ear_markings.rsi/otie.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/ear_markings.rsi/shock.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/ear_markings.rsi/terrier-inner.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/ear_markings.rsi/terrier.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/ear_markings.rsi/vulp-fade.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/ear_markings.rsi/vulp-inner.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/ear_markings.rsi/vulp-sharp.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/ear_markings.rsi/vulp.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/ear_markings.rsi/wolf-inner.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/ear_markings.rsi/wolf.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/facial_hair.rsi/elder.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/facial_hair.rsi/elder_chin.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/facial_hair.rsi/kita.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/facial_hair.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/facial_hair.rsi/ruff.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/hair.rsi/adhara.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/hair.rsi/anita.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/hair.rsi/apollo.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/hair.rsi/belle.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/hair.rsi/braided.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/hair.rsi/bun.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/hair.rsi/clean_cut.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/hair.rsi/curl.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/hair.rsi/hawk.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/hair.rsi/jagged.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/hair.rsi/jeremy.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/hair.rsi/kajam.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/hair.rsi/keid.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/hair.rsi/kleeia.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/hair.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/hair.rsi/mizar.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/hair.rsi/punkbraided.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/hair.rsi/raine.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/hair.rsi/rough.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/hair.rsi/short.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/hair.rsi/short2.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/hair.rsi/spike.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/head_markings.rsi/blaze.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/head_markings.rsi/mask.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/head_markings.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/head_markings.rsi/muzzle.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/head_markings.rsi/muzzle_alt.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/head_markings.rsi/muzzle_fade.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/head_markings.rsi/muzzle_sharp.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/head_markings.rsi/nose.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/head_markings.rsi/patch.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/head_markings.rsi/slash.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/head_markings.rsi/tiger_face.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/head_markings.rsi/tiger_head.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/head_markings.rsi/vulpine-lines.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/head_markings.rsi/vulpine.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/masking_helpers.rsi/female_full.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/masking_helpers.rsi/female_none.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/masking_helpers.rsi/female_top.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/masking_helpers.rsi/full.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/masking_helpers.rsi/male_full.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/masking_helpers.rsi/male_none.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/masking_helpers.rsi/male_top.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/masking_helpers.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/masking_helpers.rsi/none.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/masking_helpers.rsi/top.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/masking_helpers.rsi/unisex_full.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/masking_helpers.rsi/unisex_none.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/masking_helpers.rsi/unisex_top.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/tail_markings.rsi/bushfluff.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/tail_markings.rsi/bushfluff_wag.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/tail_markings.rsi/corgi_wag.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/tail_markings.rsi/coyote.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/tail_markings.rsi/coyote_wag.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/tail_markings.rsi/dalmatian_wag.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/tail_markings.rsi/fennec.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/tail_markings.rsi/fluffy.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/tail_markings.rsi/fox-fade.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/tail_markings.rsi/fox-tip.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/tail_markings.rsi/fox.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/tail_markings.rsi/fox2.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/tail_markings.rsi/fox3-tip.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/tail_markings.rsi/fox3.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/tail_markings.rsi/fox_wag-fade.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/tail_markings.rsi/fox_wag-tip.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/tail_markings.rsi/fox_wag.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/tail_markings.rsi/husky-inner.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/tail_markings.rsi/husky-outer.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/tail_markings.rsi/husky.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/tail_markings.rsi/long-tip.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/tail_markings.rsi/long.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/tail_markings.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/tail_markings.rsi/otie.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/tail_markings.rsi/vulp-fade.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/tail_markings.rsi/vulp-tip.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/tail_markings.rsi/vulp.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/tail_markings.rsi/vulp_alt-fade.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/tail_markings.rsi/vulp_alt-tip.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/tail_markings.rsi/vulp_alt.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/tail_markings.rsi/vulp_wag-fade.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/tail_markings.rsi/vulp_wag-tip.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Customization/Vulpkanin/tail_markings.rsi/vulp_wag.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Harpy/organs.rsi/lung-l.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Harpy/organs.rsi/lung-r.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Harpy/organs.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Harpy/parts.rsi/full.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Harpy/parts.rsi/head_f.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Harpy/parts.rsi/head_m.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Harpy/parts.rsi/l_arm.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Harpy/parts.rsi/l_foot.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Harpy/parts.rsi/l_hand.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Harpy/parts.rsi/l_leg.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Harpy/parts.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Harpy/parts.rsi/r_arm.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Harpy/parts.rsi/r_foot.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Harpy/parts.rsi/r_hand.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Harpy/parts.rsi/r_leg.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Harpy/parts.rsi/torso_f.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Harpy/parts.rsi/torso_m.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Rodentia/parts.rsi/full.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Rodentia/parts.rsi/head_f.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Rodentia/parts.rsi/head_m.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Rodentia/parts.rsi/l_arm.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Rodentia/parts.rsi/l_foot.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Rodentia/parts.rsi/l_hand.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Rodentia/parts.rsi/l_leg.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Rodentia/parts.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Rodentia/parts.rsi/r_arm.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Rodentia/parts.rsi/r_foot.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Rodentia/parts.rsi/r_hand.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Rodentia/parts.rsi/r_leg.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Rodentia/parts.rsi/torso_f.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Rodentia/parts.rsi/torso_m.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Vulpkanin/parts.rsi/full.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Vulpkanin/parts.rsi/head_f.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Vulpkanin/parts.rsi/head_m.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Vulpkanin/parts.rsi/icon.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Vulpkanin/parts.rsi/l_arm.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Vulpkanin/parts.rsi/l_foot.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Vulpkanin/parts.rsi/l_hand.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Vulpkanin/parts.rsi/l_leg.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Vulpkanin/parts.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Vulpkanin/parts.rsi/overlay_husk.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Vulpkanin/parts.rsi/r_arm.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Vulpkanin/parts.rsi/r_foot.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Vulpkanin/parts.rsi/r_hand.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Vulpkanin/parts.rsi/r_leg.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Vulpkanin/parts.rsi/torso_f.png (100%) rename Resources/Textures/{DeltaV => _DV}/Mobs/Species/Vulpkanin/parts.rsi/torso_m.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Devices/cartridge.rsi/cart-cri.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Devices/cartridge.rsi/cart-mail.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Devices/cartridge.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Misc/fire_extinguisher_bluespace.rsi/fire_extinguisher_closed.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Misc/fire_extinguisher_bluespace.rsi/fire_extinguisher_open.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Misc/fire_extinguisher_bluespace.rsi/inhand-left.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Misc/fire_extinguisher_bluespace.rsi/inhand-right.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Misc/fire_extinguisher_bluespace.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Misc/id_cards.rsi/idchaplain.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Misc/id_cards.rsi/idchiefjustice.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Misc/id_cards.rsi/idclerk.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Misc/id_cards.rsi/idlawyer.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Misc/id_cards.rsi/idprosecutor.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Misc/id_cards.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Misc/id_cards.rsi/nyanogladiator.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Misc/id_cards.rsi/nyanomailcarrier.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Misc/id_cards.rsi/nyanomantis.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Misc/id_cards.rsi/nyanomartialartist.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Misc/id_cards.rsi/nyanoprisoner.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Misc/id_cards.rsi/nyanoprisonguard.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Specific/Hydroponics/plant_bag_holding.rsi/equipped-BELT.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Specific/Hydroponics/plant_bag_holding.rsi/icon-unlit.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Specific/Hydroponics/plant_bag_holding.rsi/icon.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Specific/Hydroponics/plant_bag_holding.rsi/inhand-left-unlit.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Specific/Hydroponics/plant_bag_holding.rsi/inhand-left.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Specific/Hydroponics/plant_bag_holding.rsi/inhand-right-unlit.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Specific/Hydroponics/plant_bag_holding.rsi/inhand-right.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Specific/Hydroponics/plant_bag_holding.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Specific/Justice/gavel.rsi/icon.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Specific/Justice/gavel.rsi/inhand-left.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Specific/Justice/gavel.rsi/inhand-right.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Specific/Justice/gavel.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Specific/Justice/gavelblock.rsi/icon.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Specific/Justice/gavelblock.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Specific/Justice/trialtimer.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Specific/Justice/trialtimer.rsi/trialtimer.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Specific/Service/vending_machine_restock.rsi/base.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Specific/Service/vending_machine_restock.rsi/green_bit.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Specific/Service/vending_machine_restock.rsi/inhand-left.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Specific/Service/vending_machine_restock.rsi/inhand-right.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Specific/Service/vending_machine_restock.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Specific/Service/vending_machine_restock.rsi/refill_pride.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Storage/barrel.rsi/base.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Storage/barrel.rsi/closed.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Storage/barrel.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Storage/barrel.rsi/open.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Storage/keg.rsi/base.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Storage/keg.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Tanks/Jetpacks/black.rsi/equipped-BACKPACK.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Tanks/Jetpacks/black.rsi/equipped-SUITSTORAGE.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Tanks/Jetpacks/black.rsi/icon-on.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Tanks/Jetpacks/black.rsi/icon.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Tanks/Jetpacks/black.rsi/inhand-left.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Tanks/Jetpacks/black.rsi/inhand-right.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Tanks/Jetpacks/black.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Tanks/Jetpacks/black.rsi/on-equipped-BACKPACK.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Tanks/Jetpacks/black.rsi/on-equipped-SUITSTORAGE.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Tanks/Jetpacks/blue.rsi/equipped-BACKPACK.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Tanks/Jetpacks/blue.rsi/equipped-SUITSTORAGE.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Tanks/Jetpacks/blue.rsi/icon-on.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Tanks/Jetpacks/blue.rsi/icon.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Tanks/Jetpacks/blue.rsi/inhand-left.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Tanks/Jetpacks/blue.rsi/inhand-right.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Tanks/Jetpacks/blue.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Tanks/Jetpacks/blue.rsi/on-equipped-BACKPACK.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Tanks/Jetpacks/blue.rsi/on-equipped-SUITSTORAGE.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Tanks/Jetpacks/security.rsi/equipped-BACKPACK.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Tanks/Jetpacks/security.rsi/equipped-SUITSTORAGE.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Tanks/Jetpacks/security.rsi/icon-on.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Tanks/Jetpacks/security.rsi/icon.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Tanks/Jetpacks/security.rsi/inhand-left.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Tanks/Jetpacks/security.rsi/inhand-right.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Tanks/Jetpacks/security.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Tanks/Jetpacks/security.rsi/on-equipped-BACKPACK.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Tanks/Jetpacks/security.rsi/on-equipped-SUITSTORAGE.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Bombs/breaching.rsi/icon.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Bombs/breaching.rsi/inhand-left.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Bombs/breaching.rsi/inhand-right.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Bombs/breaching.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Bombs/breaching.rsi/primed.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Ammunition/Boxes/bbgun.rsi/bbbox.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Ammunition/Boxes/bbgun.rsi/bbbullet.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Ammunition/Boxes/bbgun.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Battery/energygun.rsi/base.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Battery/energygun.rsi/disabler-inhand-left.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Battery/energygun.rsi/disabler-inhand-right.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Battery/energygun.rsi/icon.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Battery/energygun.rsi/lethal-inhand-left.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Battery/energygun.rsi/lethal-inhand-right.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Battery/energygun.rsi/mag-unshaded-0.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Battery/energygun.rsi/mag-unshaded-1.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Battery/energygun.rsi/mag-unshaded-2.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Battery/energygun.rsi/mag-unshaded-3.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Battery/energygun.rsi/mag-unshaded-4.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Battery/energygun.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Battery/energygun.rsi/mode-disabler.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Battery/energygun.rsi/mode-lethal.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Battery/energygun.rsi/mode-stun.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Battery/energygun.rsi/special-inhand-left.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Battery/energygun.rsi/special-inhand-right.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/base.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/disabler-inhand-left.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/disabler-inhand-right.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/equipped-BELT.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/icon.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/lethal-inhand-left.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/lethal-inhand-right.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/mag-unshaded-0.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/mag-unshaded-1.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/mag-unshaded-2.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/mag-unshaded-3.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/mag-unshaded-4.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/mode-disabler.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/mode-ion.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/mode-lethal.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/special-inhand-left.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi/special-inhand-right.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Rifles/bbgun.rsi/base.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Rifles/bbgun.rsi/equipped-BACKPACK.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Rifles/bbgun.rsi/equipped-SUITSTORAGE.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Rifles/bbgun.rsi/icon.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Rifles/bbgun.rsi/inhand-left.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Rifles/bbgun.rsi/inhand-right.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Rifles/bbgun.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Rifles/bbgun.rsi/wielded-inhand-left.png (100%) rename Resources/Textures/{DeltaV => _DV}/Objects/Weapons/Guns/Rifles/bbgun.rsi/wielded-inhand-right.png (100%) rename Resources/Textures/{DeltaV => _DV}/Shaders/ultravision.swsl (100%) rename Resources/Textures/{DeltaV => _DV}/Structures/Machines/VendingMachines/pride.rsi/broken.png (100%) rename Resources/Textures/{DeltaV => _DV}/Structures/Machines/VendingMachines/pride.rsi/meta.json (100%) rename Resources/Textures/{DeltaV => _DV}/Structures/Machines/VendingMachines/pride.rsi/normal-unshaded.png (100%) rename Resources/Textures/{DeltaV => _DV}/Structures/Machines/VendingMachines/pride.rsi/off.png (100%) rename Resources/Textures/{DeltaV => _DV}/Structures/Machines/VendingMachines/pride.rsi/panel.png (100%) rename Resources/Textures/_NF/Objects/Weapons/Guns/Battery/{holoflare_pistol.yml => holoflare_pistol.rsi}/base.png (100%) rename Resources/Textures/_NF/Objects/Weapons/Guns/Battery/{holoflare_pistol.yml => holoflare_pistol.rsi}/icon.png (100%) rename Resources/Textures/_NF/Objects/Weapons/Guns/Battery/{holoflare_pistol.yml => holoflare_pistol.rsi}/inhand-left-unshaded.png (100%) rename Resources/Textures/_NF/Objects/Weapons/Guns/Battery/{holoflare_pistol.yml => holoflare_pistol.rsi}/inhand-left.png (100%) rename Resources/Textures/_NF/Objects/Weapons/Guns/Battery/{holoflare_pistol.yml => holoflare_pistol.rsi}/inhand-right-unshaded.png (100%) rename Resources/Textures/_NF/Objects/Weapons/Guns/Battery/{holoflare_pistol.yml => holoflare_pistol.rsi}/inhand-right.png (100%) rename Resources/Textures/_NF/Objects/Weapons/Guns/Battery/{holoflare_pistol.yml => holoflare_pistol.rsi}/mag-unshaded-0.png (100%) rename Resources/Textures/_NF/Objects/Weapons/Guns/Battery/{holoflare_pistol.yml => holoflare_pistol.rsi}/mag-unshaded-1.png (100%) rename Resources/Textures/_NF/Objects/Weapons/Guns/Battery/{holoflare_pistol.yml => holoflare_pistol.rsi}/mag-unshaded-2.png (100%) rename Resources/Textures/_NF/Objects/Weapons/Guns/Battery/{holoflare_pistol.yml => holoflare_pistol.rsi}/meta.json (100%) rename Resources/Textures/_NF/Objects/Weapons/Guns/Battery/{holoflare_pistol.yml => holoflare_pistol.rsi}/mode-cyan.png (100%) rename Resources/Textures/_NF/Objects/Weapons/Guns/Battery/{holoflare_pistol.yml => holoflare_pistol.rsi}/mode-red.png (100%) rename Resources/Textures/_NF/Objects/Weapons/Guns/Battery/{holoflare_pistol.yml => holoflare_pistol.rsi}/mode-yellow.png (100%) diff --git a/Content.Client/Nyanotrasen/Overlays/DogVisionSystem.cs b/Content.Client/Nyanotrasen/Overlays/DogVisionSystem.cs index b52d23f1958..2a4ed3d64bd 100644 --- a/Content.Client/Nyanotrasen/Overlays/DogVisionSystem.cs +++ b/Content.Client/Nyanotrasen/Overlays/DogVisionSystem.cs @@ -1,5 +1,5 @@ using Content.Shared.Abilities; -using Content.Shared.DeltaV.CCVars; +using Content.Shared._DV.CCVars; using Robust.Client.Graphics; using Robust.Shared.Configuration; using Robust.Shared.Player; diff --git a/Content.Client/Options/UI/OptionsMenu.xaml b/Content.Client/Options/UI/OptionsMenu.xaml index 62184cf7774..60b33ee5777 100644 --- a/Content.Client/Options/UI/OptionsMenu.xaml +++ b/Content.Client/Options/UI/OptionsMenu.xaml @@ -1,6 +1,6 @@ diff --git a/Content.Client/DeltaV/Abilities/CrawlUnderObjectsSystem.cs b/Content.Client/_DV/Abilities/CrawlUnderObjectsSystem.cs similarity index 93% rename from Content.Client/DeltaV/Abilities/CrawlUnderObjectsSystem.cs rename to Content.Client/_DV/Abilities/CrawlUnderObjectsSystem.cs index 879a5efee55..77c51a45dc3 100644 --- a/Content.Client/DeltaV/Abilities/CrawlUnderObjectsSystem.cs +++ b/Content.Client/_DV/Abilities/CrawlUnderObjectsSystem.cs @@ -1,9 +1,9 @@ -using Content.Shared.DeltaV.Abilities; +using Content.Shared._DV.Abilities; using Content.Shared.Popups; using Robust.Client.GameObjects; using DrawDepth = Content.Shared.DrawDepth.DrawDepth; -namespace Content.Client.DeltaV.Abilities; +namespace Content.Client._DV.Abilities; public sealed partial class HideUnderTableAbilitySystem : SharedCrawlUnderObjectsSystem { diff --git a/Content.Client/DeltaV/Administration/UI/DepartmentWhitelistPanel.xaml b/Content.Client/_DV/Administration/UI/DepartmentWhitelistPanel.xaml similarity index 85% rename from Content.Client/DeltaV/Administration/UI/DepartmentWhitelistPanel.xaml rename to Content.Client/_DV/Administration/UI/DepartmentWhitelistPanel.xaml index 58251cf9a38..5faa57b619e 100644 --- a/Content.Client/DeltaV/Administration/UI/DepartmentWhitelistPanel.xaml +++ b/Content.Client/_DV/Administration/UI/DepartmentWhitelistPanel.xaml @@ -1,6 +1,6 @@ diff --git a/Content.Client/DeltaV/Administration/UI/DepartmentWhitelistPanel.xaml.cs b/Content.Client/_DV/Administration/UI/DepartmentWhitelistPanel.xaml.cs similarity index 98% rename from Content.Client/DeltaV/Administration/UI/DepartmentWhitelistPanel.xaml.cs rename to Content.Client/_DV/Administration/UI/DepartmentWhitelistPanel.xaml.cs index 513c5327d04..c223f5ad9c6 100644 --- a/Content.Client/DeltaV/Administration/UI/DepartmentWhitelistPanel.xaml.cs +++ b/Content.Client/_DV/Administration/UI/DepartmentWhitelistPanel.xaml.cs @@ -6,7 +6,7 @@ using Robust.Client.UserInterface.XAML; using Robust.Shared.Prototypes; -namespace Content.Client.DeltaV.Administration.UI; +namespace Content.Client._DV.Administration.UI; [GenerateTypedNameReferences] public sealed partial class DepartmentWhitelistPanel : PanelContainer diff --git a/Content.Client/DeltaV/Administration/UI/GhostRoleSetWhitelistPanel.xaml b/Content.Client/_DV/Administration/UI/GhostRoleSetWhitelistPanel.xaml similarity index 86% rename from Content.Client/DeltaV/Administration/UI/GhostRoleSetWhitelistPanel.xaml rename to Content.Client/_DV/Administration/UI/GhostRoleSetWhitelistPanel.xaml index e69b9919682..8f0a5b73c6c 100644 --- a/Content.Client/DeltaV/Administration/UI/GhostRoleSetWhitelistPanel.xaml +++ b/Content.Client/_DV/Administration/UI/GhostRoleSetWhitelistPanel.xaml @@ -1,6 +1,6 @@ diff --git a/Content.Client/DeltaV/Administration/UI/GhostRoleSetWhitelistPanel.xaml.cs b/Content.Client/_DV/Administration/UI/GhostRoleSetWhitelistPanel.xaml.cs similarity index 97% rename from Content.Client/DeltaV/Administration/UI/GhostRoleSetWhitelistPanel.xaml.cs rename to Content.Client/_DV/Administration/UI/GhostRoleSetWhitelistPanel.xaml.cs index da160a8c92c..7b968715a75 100644 --- a/Content.Client/DeltaV/Administration/UI/GhostRoleSetWhitelistPanel.xaml.cs +++ b/Content.Client/_DV/Administration/UI/GhostRoleSetWhitelistPanel.xaml.cs @@ -4,7 +4,7 @@ using Robust.Client.UserInterface.XAML; using Robust.Shared.Prototypes; -namespace Content.Client.DeltaV.Administration.UI; +namespace Content.Client._DV.Administration.UI; // Frontier: ghost role whitelist set [GenerateTypedNameReferences] diff --git a/Content.Client/DeltaV/Administration/UI/JobWhitelistsEui.cs b/Content.Client/_DV/Administration/UI/JobWhitelistsEui.cs similarity index 91% rename from Content.Client/DeltaV/Administration/UI/JobWhitelistsEui.cs rename to Content.Client/_DV/Administration/UI/JobWhitelistsEui.cs index 5188c8f8cbe..fe95900a249 100644 --- a/Content.Client/DeltaV/Administration/UI/JobWhitelistsEui.cs +++ b/Content.Client/_DV/Administration/UI/JobWhitelistsEui.cs @@ -1,8 +1,8 @@ using Content.Client.Eui; -using Content.Shared.DeltaV.Administration; +using Content.Shared._DV.Administration; using Content.Shared.Eui; -namespace Content.Client.DeltaV.Administration.UI; +namespace Content.Client._DV.Administration.UI; public sealed class JobWhitelistsEui : BaseEui { diff --git a/Content.Client/DeltaV/Administration/UI/JobWhitelistsWindow.xaml b/Content.Client/_DV/Administration/UI/JobWhitelistsWindow.xaml similarity index 100% rename from Content.Client/DeltaV/Administration/UI/JobWhitelistsWindow.xaml rename to Content.Client/_DV/Administration/UI/JobWhitelistsWindow.xaml diff --git a/Content.Client/DeltaV/Administration/UI/JobWhitelistsWindow.xaml.cs b/Content.Client/_DV/Administration/UI/JobWhitelistsWindow.xaml.cs similarity index 96% rename from Content.Client/DeltaV/Administration/UI/JobWhitelistsWindow.xaml.cs rename to Content.Client/_DV/Administration/UI/JobWhitelistsWindow.xaml.cs index dc119eee239..f2971b8d2dd 100644 --- a/Content.Client/DeltaV/Administration/UI/JobWhitelistsWindow.xaml.cs +++ b/Content.Client/_DV/Administration/UI/JobWhitelistsWindow.xaml.cs @@ -1,8 +1,8 @@ using Content.Client.UserInterface.Controls; using Content.Shared.Database; -using Content.Shared.DeltaV.Administration; +using Content.Shared._DV.Administration; using Content.Shared.Roles; -using Content.Shared.DeltaV.Whitelist; +using Content.Shared._DV.Whitelist; using Robust.Client.AutoGenerated; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; @@ -11,7 +11,7 @@ using Robust.Shared.Prototypes; using Content.Shared.Ghost.Roles; -namespace Content.Client.DeltaV.Administration.UI; +namespace Content.Client._DV.Administration.UI; /// /// An admin panel to toggle whitelists for individual jobs or entire departments. diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/MailMetricUi.cs b/Content.Client/_DV/CartridgeLoader/Cartridges/MailMetricUi.cs similarity index 91% rename from Content.Client/DeltaV/CartridgeLoader/Cartridges/MailMetricUi.cs rename to Content.Client/_DV/CartridgeLoader/Cartridges/MailMetricUi.cs index f1688c8dab4..7619e91483b 100644 --- a/Content.Client/DeltaV/CartridgeLoader/Cartridges/MailMetricUi.cs +++ b/Content.Client/_DV/CartridgeLoader/Cartridges/MailMetricUi.cs @@ -2,7 +2,7 @@ using Content.Client.UserInterface.Fragments; using Content.Shared.CartridgeLoader.Cartridges; -namespace Content.Client.DeltaV.CartridgeLoader.Cartridges; +namespace Content.Client._DV.CartridgeLoader.Cartridges; public sealed partial class MailMetricUi : UIFragment { diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/MailMetricUiFragment.xaml b/Content.Client/_DV/CartridgeLoader/Cartridges/MailMetricUiFragment.xaml similarity index 98% rename from Content.Client/DeltaV/CartridgeLoader/Cartridges/MailMetricUiFragment.xaml rename to Content.Client/_DV/CartridgeLoader/Cartridges/MailMetricUiFragment.xaml index c31a1c6063d..19853deaed0 100644 --- a/Content.Client/DeltaV/CartridgeLoader/Cartridges/MailMetricUiFragment.xaml +++ b/Content.Client/_DV/CartridgeLoader/Cartridges/MailMetricUiFragment.xaml @@ -1,5 +1,5 @@ /// Display a cool stamp on the parcel based on the job of the recipient. diff --git a/Content.Client/DeltaV/Options/UI/Tabs/DeltaTab.xaml b/Content.Client/_DV/Options/UI/Tabs/DeltaTab.xaml similarity index 89% rename from Content.Client/DeltaV/Options/UI/Tabs/DeltaTab.xaml rename to Content.Client/_DV/Options/UI/Tabs/DeltaTab.xaml index f1dae68077d..985e7da3865 100644 --- a/Content.Client/DeltaV/Options/UI/Tabs/DeltaTab.xaml +++ b/Content.Client/_DV/Options/UI/Tabs/DeltaTab.xaml @@ -1,6 +1,6 @@ - diff --git a/Content.Client/DeltaV/Options/UI/Tabs/DeltaTab.xaml.cs b/Content.Client/_DV/Options/UI/Tabs/DeltaTab.xaml.cs similarity index 93% rename from Content.Client/DeltaV/Options/UI/Tabs/DeltaTab.xaml.cs rename to Content.Client/_DV/Options/UI/Tabs/DeltaTab.xaml.cs index 892ddfc15bf..b83e4cd3fa1 100644 --- a/Content.Client/DeltaV/Options/UI/Tabs/DeltaTab.xaml.cs +++ b/Content.Client/_DV/Options/UI/Tabs/DeltaTab.xaml.cs @@ -1,11 +1,11 @@ -using Content.Shared.DeltaV.CCVars; +using Content.Shared._DV.CCVars; using Robust.Client.AutoGenerated; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.XAML; using Robust.Shared.Configuration; -namespace Content.Client.DeltaV.Options.UI.Tabs; +namespace Content.Client._DV.Options.UI.Tabs; [GenerateTypedNameReferences] public sealed partial class DeltaTab : Control diff --git a/Content.Client/DeltaV/Overlays/UltraVisionOverlay.cs b/Content.Client/_DV/Overlays/UltraVisionOverlay.cs similarity index 97% rename from Content.Client/DeltaV/Overlays/UltraVisionOverlay.cs rename to Content.Client/_DV/Overlays/UltraVisionOverlay.cs index f1d80770015..63ee769149c 100644 --- a/Content.Client/DeltaV/Overlays/UltraVisionOverlay.cs +++ b/Content.Client/_DV/Overlays/UltraVisionOverlay.cs @@ -5,7 +5,7 @@ using Content.Shared.Abilities; using System.Numerics; -namespace Content.Client.DeltaV.Overlays; +namespace Content.Client._DV.Overlays; public sealed partial class UltraVisionOverlay : Overlay { diff --git a/Content.Client/DeltaV/Overlays/UltraVisionSystem.cs b/Content.Client/_DV/Overlays/UltraVisionSystem.cs similarity index 96% rename from Content.Client/DeltaV/Overlays/UltraVisionSystem.cs rename to Content.Client/_DV/Overlays/UltraVisionSystem.cs index 828ca9e5215..d576d24b7b6 100644 --- a/Content.Client/DeltaV/Overlays/UltraVisionSystem.cs +++ b/Content.Client/_DV/Overlays/UltraVisionSystem.cs @@ -1,10 +1,10 @@ using Content.Shared.Abilities; -using Content.Shared.DeltaV.CCVars; +using Content.Shared._DV.CCVars; using Robust.Client.Graphics; using Robust.Shared.Configuration; using Robust.Shared.Player; -namespace Content.Client.DeltaV.Overlays; +namespace Content.Client._DV.Overlays; public sealed partial class UltraVisionSystem : EntitySystem { diff --git a/Content.Client/DeltaV/RoundEnd/NoEorgPopup.xaml b/Content.Client/_DV/RoundEnd/NoEorgPopup.xaml similarity index 100% rename from Content.Client/DeltaV/RoundEnd/NoEorgPopup.xaml rename to Content.Client/_DV/RoundEnd/NoEorgPopup.xaml diff --git a/Content.Client/DeltaV/RoundEnd/NoEorgPopup.xaml.cs b/Content.Client/_DV/RoundEnd/NoEorgPopup.xaml.cs similarity index 97% rename from Content.Client/DeltaV/RoundEnd/NoEorgPopup.xaml.cs rename to Content.Client/_DV/RoundEnd/NoEorgPopup.xaml.cs index 18e89bb15c5..3bf95d18006 100644 --- a/Content.Client/DeltaV/RoundEnd/NoEorgPopup.xaml.cs +++ b/Content.Client/_DV/RoundEnd/NoEorgPopup.xaml.cs @@ -1,5 +1,5 @@ using Content.Client.UserInterface.Controls; -using Content.Shared.DeltaV.CCVars; +using Content.Shared._DV.CCVars; using Robust.Client.AutoGenerated; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.XAML; @@ -7,7 +7,7 @@ using Robust.Shared.Timing; using Robust.Shared.Utility; -namespace Content.Client.DeltaV.RoundEnd; +namespace Content.Client._DV.RoundEnd; [GenerateTypedNameReferences] public sealed partial class NoEorgPopup : FancyWindow diff --git a/Content.Client/DeltaV/RoundEnd/NoEorgPopupSystem.cs b/Content.Client/_DV/RoundEnd/NoEorgPopupSystem.cs similarity index 91% rename from Content.Client/DeltaV/RoundEnd/NoEorgPopupSystem.cs rename to Content.Client/_DV/RoundEnd/NoEorgPopupSystem.cs index 40341b9ae89..9f1eecf3e02 100644 --- a/Content.Client/DeltaV/RoundEnd/NoEorgPopupSystem.cs +++ b/Content.Client/_DV/RoundEnd/NoEorgPopupSystem.cs @@ -1,8 +1,8 @@ using Content.Shared.GameTicking; -using Content.Shared.DeltaV.CCVars; +using Content.Shared._DV.CCVars; using Robust.Shared.Configuration; -namespace Content.Client.DeltaV.RoundEnd; +namespace Content.Client._DV.RoundEnd; public sealed class NoEorgPopupSystem : EntitySystem { diff --git a/Content.IntegrationTests/Tests/Nyanotrasen/DeepFryerTest.cs b/Content.IntegrationTests/Tests/Nyanotrasen/DeepFryerTest.cs deleted file mode 100644 index 0685c7d8877..00000000000 --- a/Content.IntegrationTests/Tests/Nyanotrasen/DeepFryerTest.cs +++ /dev/null @@ -1,59 +0,0 @@ -#nullable enable annotations -using Content.Server.Kitchen.Components; -using Content.Server.Nyanotrasen.Kitchen.Components; -using Content.Server.Nyanotrasen.Kitchen.EntitySystems; -using Robust.Shared.GameObjects; -using Robust.Shared.Reflection; - -namespace Content.IntegrationTests.Tests.DeepFryer -{ - [TestFixture] - [TestOf(typeof(DeepFriedComponent))] - [TestOf(typeof(DeepFryerSystem))] - [TestOf(typeof(DeepFryerComponent))] - public sealed class DeepFryerTest - { - - [TestPrototypes] - private const string Prototypes = @" -- type: entity - name: DeepFryerDummy - id: DeepFryerDummy - components: - - type: DeepFryer - entryDelay: 0 - draggedEntryDelay: 0 - flushTime: 0 - - type: Anchorable - - type: ApcPowerReceiver - - type: Physics - bodyType: Static - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeCircle - radius: 0.35 -"; - - [Test] - public async Task Test() - { - await using var pair = await PoolManager.GetServerClient(); - var server = pair.Server; - - var testMap = await pair.CreateTestMap(); - - EntityUid unitUid = default; - - var entityManager = server.ResolveDependency(); - var xformSystem = entityManager.System(); - var deepFryerSystem = entityManager.System(); - await server.WaitAssertion(() => - { - Assert.That(deepFryerSystem, Is.Not.Null); - }); - await pair.CleanReturnAsync(); - } - } -} diff --git a/Content.Server/Chat/Systems/ChatSystem.Emote.cs b/Content.Server/Chat/Systems/ChatSystem.Emote.cs index 20e3e14b8e8..60046a43194 100644 --- a/Content.Server/Chat/Systems/ChatSystem.Emote.cs +++ b/Content.Server/Chat/Systems/ChatSystem.Emote.cs @@ -4,7 +4,7 @@ using Robust.Shared.Prototypes; using Robust.Shared.Random; -using Content.Shared.DeltaV.Harpy; +using Content.Shared._DV.Harpy; namespace Content.Server.Chat.Systems; diff --git a/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidSystem.cs b/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidSystem.cs index 6e06a570f6b..74724f74bf6 100644 --- a/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidSystem.cs +++ b/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidSystem.cs @@ -152,7 +152,7 @@ private void OnEatMouse(EntityUid uid, FelinidComponent component, EatMouseActio Del(component.EatActionTarget.Value); component.EatActionTarget = null; - _audio.PlayPvs("/Audio/DeltaV/Items/eatfood.ogg", uid, AudioHelpers.WithVariation(0.15f)); + _audio.PlayPvs("/Audio/_DV/Items/eatfood.ogg", uid, AudioHelpers.WithVariation(0.15f)); _hungerSystem.ModifyHunger(uid, 50f, hunger); diff --git a/Content.Server/DeltaV/Abilities/CrawlUnderObjectsSystem.cs b/Content.Server/_DV/Abilities/CrawlUnderObjectsSystem.cs similarity index 98% rename from Content.Server/DeltaV/Abilities/CrawlUnderObjectsSystem.cs rename to Content.Server/_DV/Abilities/CrawlUnderObjectsSystem.cs index 3b7b464f91b..983d97de9bb 100644 --- a/Content.Server/DeltaV/Abilities/CrawlUnderObjectsSystem.cs +++ b/Content.Server/_DV/Abilities/CrawlUnderObjectsSystem.cs @@ -1,7 +1,7 @@ using Content.Shared.Actions; using Content.Shared.Climbing.Components; using Content.Shared.Climbing.Events; -using Content.Shared.DeltaV.Abilities; +using Content.Shared._DV.Abilities; using Content.Shared.Maps; using Content.Shared.Movement.Systems; using Content.Shared.Physics; @@ -9,7 +9,7 @@ using Robust.Shared.Physics; using Robust.Shared.Physics.Systems; -namespace Content.Server.DeltaV.Abilities; +namespace Content.Server._DV.Abilities; public sealed partial class CrawlUnderObjectsSystem : SharedCrawlUnderObjectsSystem { diff --git a/Content.Server/DeltaV/Administration/Commands/JobWhitelistsCommand.cs b/Content.Server/_DV/Administration/Commands/JobWhitelistsCommand.cs similarity index 96% rename from Content.Server/DeltaV/Administration/Commands/JobWhitelistsCommand.cs rename to Content.Server/_DV/Administration/Commands/JobWhitelistsCommand.cs index 7e7efce2e15..73912a7abb8 100644 --- a/Content.Server/DeltaV/Administration/Commands/JobWhitelistsCommand.cs +++ b/Content.Server/_DV/Administration/Commands/JobWhitelistsCommand.cs @@ -3,7 +3,7 @@ using Content.Shared.Administration; using Robust.Shared.Console; -namespace Content.Server.DeltaV.Administration.Commands; +namespace Content.Server._DV.Administration.Commands; /// /// Opens the job whitelists panel for editing player whitelists. diff --git a/Content.Server/DeltaV/Administration/JobWhitelistsEui.cs b/Content.Server/_DV/Administration/JobWhitelistsEui.cs similarity index 98% rename from Content.Server/DeltaV/Administration/JobWhitelistsEui.cs rename to Content.Server/_DV/Administration/JobWhitelistsEui.cs index 02e50729d07..fefb004b2ab 100644 --- a/Content.Server/DeltaV/Administration/JobWhitelistsEui.cs +++ b/Content.Server/_DV/Administration/JobWhitelistsEui.cs @@ -4,7 +4,7 @@ using Content.Server.EUI; using Content.Server.Players.JobWhitelist; using Content.Shared.Administration; -using Content.Shared.DeltaV.Administration; +using Content.Shared._DV.Administration; using Content.Shared.Eui; using Content.Shared.Ghost.Roles; // Frontier using Content.Shared.Roles; @@ -12,7 +12,7 @@ using Robust.Shared.Network; using Robust.Shared.Prototypes; -namespace Content.Server.DeltaV.Administration; +namespace Content.Server._DV.Administration; public sealed class JobWhitelistsEui : BaseEui { diff --git a/Content.Server/DeltaV/Cargo/Components/SectorLogisticStatsDatabaseComponent.cs b/Content.Server/_DV/Cargo/Components/SectorLogisticStatsDatabaseComponent.cs similarity index 88% rename from Content.Server/DeltaV/Cargo/Components/SectorLogisticStatsDatabaseComponent.cs rename to Content.Server/_DV/Cargo/Components/SectorLogisticStatsDatabaseComponent.cs index ab21e62729b..2c79387dce2 100644 --- a/Content.Server/DeltaV/Cargo/Components/SectorLogisticStatsDatabaseComponent.cs +++ b/Content.Server/_DV/Cargo/Components/SectorLogisticStatsDatabaseComponent.cs @@ -1,7 +1,7 @@ using Content.Shared.Cargo; using Content.Shared.CartridgeLoader.Cartridges; -namespace Content.Server.DeltaV.Cargo.Components; +namespace Content.Server._DV.Cargo.Components; /// /// Tracks all mail statistics for mail activity in the sector. @@ -11,4 +11,4 @@ public sealed partial class SectorLogisticStatsComponent : Component // Frontier { [DataField] public MailStats Metrics { get; set; } -} \ No newline at end of file +} diff --git a/Content.Server/DeltaV/Cargo/Systems/LogisticStatsSystem.cs b/Content.Server/_DV/Cargo/Systems/LogisticStatsSystem.cs similarity index 96% rename from Content.Server/DeltaV/Cargo/Systems/LogisticStatsSystem.cs rename to Content.Server/_DV/Cargo/Systems/LogisticStatsSystem.cs index d994c7a56b9..88f1a4f1ff3 100644 --- a/Content.Server/DeltaV/Cargo/Systems/LogisticStatsSystem.cs +++ b/Content.Server/_DV/Cargo/Systems/LogisticStatsSystem.cs @@ -1,8 +1,8 @@ -using Content.Server.DeltaV.Cargo.Components; +using Content.Server._DV.Cargo.Components; using Content.Shared.Cargo; using JetBrains.Annotations; -namespace Content.Server.DeltaV.Cargo.Systems; +namespace Content.Server._DV.Cargo.Systems; public sealed partial class LogisticStatsSystem : SharedCargoSystem { diff --git a/Content.Server/DeltaV/CartridgeLoader/Cartridges/MailMetricsCartridgeComponent.cs b/Content.Server/_DV/CartridgeLoader/Cartridges/MailMetricsCartridgeComponent.cs similarity index 77% rename from Content.Server/DeltaV/CartridgeLoader/Cartridges/MailMetricsCartridgeComponent.cs rename to Content.Server/_DV/CartridgeLoader/Cartridges/MailMetricsCartridgeComponent.cs index 2beed194ab0..898a37e5a20 100644 --- a/Content.Server/DeltaV/CartridgeLoader/Cartridges/MailMetricsCartridgeComponent.cs +++ b/Content.Server/_DV/CartridgeLoader/Cartridges/MailMetricsCartridgeComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Server.DeltaV.CartridgeLoader.Cartridges; +namespace Content.Server._DV.CartridgeLoader.Cartridges; // Frontier: removed the EntityUid of the station from the component [RegisterComponent, Access(typeof(MailMetricsCartridgeSystem))] diff --git a/Content.Server/DeltaV/CartridgeLoader/Cartridges/MailMetricsCartridgeSystem.cs b/Content.Server/_DV/CartridgeLoader/Cartridges/MailMetricsCartridgeSystem.cs similarity index 93% rename from Content.Server/DeltaV/CartridgeLoader/Cartridges/MailMetricsCartridgeSystem.cs rename to Content.Server/_DV/CartridgeLoader/Cartridges/MailMetricsCartridgeSystem.cs index 03448f3b8a0..60e46928ae0 100644 --- a/Content.Server/DeltaV/CartridgeLoader/Cartridges/MailMetricsCartridgeSystem.cs +++ b/Content.Server/_DV/CartridgeLoader/Cartridges/MailMetricsCartridgeSystem.cs @@ -1,12 +1,12 @@ -using Content.Server.DeltaV.Cargo.Components; -using Content.Server.DeltaV.Cargo.Systems; +using Content.Server._DV.Cargo.Components; +using Content.Server._DV.Cargo.Systems; using Content.Server.CartridgeLoader; using Content.Shared.CartridgeLoader; using Content.Shared.CartridgeLoader.Cartridges; -using Content.Server.DeltaV.Mail.Components; +using Content.Server._DV.Mail.Components; using Content.Server._NF.SectorServices; // Frontier -namespace Content.Server.DeltaV.CartridgeLoader.Cartridges; +namespace Content.Server._DV.CartridgeLoader.Cartridges; public sealed class MailMetricsCartridgeSystem : EntitySystem { diff --git a/Content.Server/DeltaV/Harpy/HarpySingerSystem.cs b/Content.Server/_DV/Harpy/HarpySingerSystem.cs similarity index 98% rename from Content.Server/DeltaV/Harpy/HarpySingerSystem.cs rename to Content.Server/_DV/Harpy/HarpySingerSystem.cs index 471cf1f9559..95a6284dda5 100644 --- a/Content.Server/DeltaV/Harpy/HarpySingerSystem.cs +++ b/Content.Server/_DV/Harpy/HarpySingerSystem.cs @@ -6,7 +6,7 @@ using Content.Shared.Bed.Sleep; using Content.Shared.Damage; using Content.Shared.Damage.ForceSay; -using Content.Shared.DeltaV.Harpy; +using Content.Shared._DV.Harpy; using Content.Shared.FixedPoint; using Content.Shared.Inventory; using Content.Shared.Inventory.Events; @@ -18,9 +18,9 @@ using Content.Shared.Zombies; using Robust.Shared.Player; using Robust.Shared.Prototypes; -using Content.Shared.DeltaV.Harpy.Components; +using Content.Shared._DV.Harpy.Components; -namespace Content.Server.DeltaV.Harpy +namespace Content.Server._DV.Harpy { public sealed class HarpySingerSystem : EntitySystem { diff --git a/Content.Server/DeltaV/Mail/Components/DelayedItemComponent.cs b/Content.Server/_DV/Mail/Components/DelayedItemComponent.cs similarity index 91% rename from Content.Server/DeltaV/Mail/Components/DelayedItemComponent.cs rename to Content.Server/_DV/Mail/Components/DelayedItemComponent.cs index d46d48ebdbf..f6b892fccba 100644 --- a/Content.Server/DeltaV/Mail/Components/DelayedItemComponent.cs +++ b/Content.Server/_DV/Mail/Components/DelayedItemComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Server.DeltaV.Mail.Components +namespace Content.Server._DV.Mail.Components { /// /// A placeholder for another entity, spawned when dropped or placed in someone's hands. diff --git a/Content.Server/DeltaV/Mail/Components/MailComponent.cs b/Content.Server/_DV/Mail/Components/MailComponent.cs similarity index 97% rename from Content.Server/DeltaV/Mail/Components/MailComponent.cs rename to Content.Server/_DV/Mail/Components/MailComponent.cs index ef70d7c522e..d359ca268ca 100644 --- a/Content.Server/DeltaV/Mail/Components/MailComponent.cs +++ b/Content.Server/_DV/Mail/Components/MailComponent.cs @@ -1,9 +1,9 @@ using System.Threading; using Robust.Shared.Audio; using Content.Shared.Storage; -using Content.Shared.DeltaV.Mail; +using Content.Shared._DV.Mail; -namespace Content.Server.DeltaV.Mail.Components +namespace Content.Server._DV.Mail.Components { [RegisterComponent] public sealed partial class MailComponent : SharedMailComponent diff --git a/Content.Server/DeltaV/Mail/Components/MailDisabledComponent.cs b/Content.Server/_DV/Mail/Components/MailDisabledComponent.cs similarity index 67% rename from Content.Server/DeltaV/Mail/Components/MailDisabledComponent.cs rename to Content.Server/_DV/Mail/Components/MailDisabledComponent.cs index 2225acc093a..0d0a92f4c82 100644 --- a/Content.Server/DeltaV/Mail/Components/MailDisabledComponent.cs +++ b/Content.Server/_DV/Mail/Components/MailDisabledComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Server.DeltaV.Mail.Components +namespace Content.Server._DV.Mail.Components { [RegisterComponent] public sealed partial class MailDisabledComponent : Component diff --git a/Content.Server/DeltaV/Mail/Components/MailReceiverComponent.cs b/Content.Server/_DV/Mail/Components/MailReceiverComponent.cs similarity index 68% rename from Content.Server/DeltaV/Mail/Components/MailReceiverComponent.cs rename to Content.Server/_DV/Mail/Components/MailReceiverComponent.cs index fbb962d3ae8..5fbc3723093 100644 --- a/Content.Server/DeltaV/Mail/Components/MailReceiverComponent.cs +++ b/Content.Server/_DV/Mail/Components/MailReceiverComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Server.DeltaV.Mail.Components +namespace Content.Server._DV.Mail.Components { [RegisterComponent] public sealed partial class MailReceiverComponent : Component diff --git a/Content.Server/DeltaV/Mail/Components/MailTeleporterComponent.cs b/Content.Server/_DV/Mail/Components/MailTeleporterComponent.cs similarity index 98% rename from Content.Server/DeltaV/Mail/Components/MailTeleporterComponent.cs rename to Content.Server/_DV/Mail/Components/MailTeleporterComponent.cs index fb583aa21a3..473276955f7 100644 --- a/Content.Server/DeltaV/Mail/Components/MailTeleporterComponent.cs +++ b/Content.Server/_DV/Mail/Components/MailTeleporterComponent.cs @@ -1,6 +1,6 @@ using Robust.Shared.Audio; -namespace Content.Server.DeltaV.Mail.Components +namespace Content.Server._DV.Mail.Components { /// /// This is for the mail teleporter. diff --git a/Content.Server/DeltaV/Mail/Components/StationMailRouterComponent.cs b/Content.Server/_DV/Mail/Components/StationMailRouterComponent.cs similarity index 79% rename from Content.Server/DeltaV/Mail/Components/StationMailRouterComponent.cs rename to Content.Server/_DV/Mail/Components/StationMailRouterComponent.cs index 4100c5a353f..87193c672ea 100644 --- a/Content.Server/DeltaV/Mail/Components/StationMailRouterComponent.cs +++ b/Content.Server/_DV/Mail/Components/StationMailRouterComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Server.DeltaV.Mail.Components; +namespace Content.Server._DV.Mail.Components; /// /// Designates a station as a place for sending and receiving mail. diff --git a/Content.Server/DeltaV/Mail/EntitySystems/DelayedItemSystem.cs b/Content.Server/_DV/Mail/EntitySystems/DelayedItemSystem.cs similarity index 95% rename from Content.Server/DeltaV/Mail/EntitySystems/DelayedItemSystem.cs rename to Content.Server/_DV/Mail/EntitySystems/DelayedItemSystem.cs index 7075c3ef1d6..2d94b5c2548 100644 --- a/Content.Server/DeltaV/Mail/EntitySystems/DelayedItemSystem.cs +++ b/Content.Server/_DV/Mail/EntitySystems/DelayedItemSystem.cs @@ -1,9 +1,9 @@ -using Content.Server.DeltaV.Mail.Components; +using Content.Server._DV.Mail.Components; using Content.Shared.Damage; using Content.Shared.Hands; using Robust.Shared.Containers; -namespace Content.Server.DeltaV.Mail.EntitySystems +namespace Content.Server._DV.Mail.EntitySystems { /// /// A placeholder for another entity, spawned when taken out of a container, with the placeholder deleted shortly after. diff --git a/Content.Server/DeltaV/Mail/EntitySystems/MailSystem.cs b/Content.Server/_DV/Mail/EntitySystems/MailSystem.cs similarity index 99% rename from Content.Server/DeltaV/Mail/EntitySystems/MailSystem.cs rename to Content.Server/_DV/Mail/EntitySystems/MailSystem.cs index 28a8a5e9ded..3e96a168bcb 100644 --- a/Content.Server/DeltaV/Mail/EntitySystems/MailSystem.cs +++ b/Content.Server/_DV/Mail/EntitySystems/MailSystem.cs @@ -3,9 +3,9 @@ using Content.Server.Cargo.Systems; using Content.Server.Chat.Systems; using Content.Server.Damage.Components; -using Content.Server.DeltaV.Cargo.Components; -using Content.Server.DeltaV.Cargo.Systems; -using Content.Server.DeltaV.Mail.Components; +using Content.Server._DV.Cargo.Components; +using Content.Server._DV.Cargo.Systems; +using Content.Server._DV.Mail.Components; using Content.Server.Destructible.Thresholds.Behaviors; using Content.Server.Destructible.Thresholds.Triggers; using Content.Server.Destructible.Thresholds; @@ -20,7 +20,7 @@ using Content.Shared.Access; using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Damage; -using Content.Shared.DeltaV.Mail; +using Content.Shared._DV.Mail; using Content.Shared.Destructible; using Content.Shared.Emag.Components; using Content.Shared.Emag.Systems; @@ -51,7 +51,7 @@ using Content.Shared.Bank.Components; // Frontier using Content.Shared._NF.Bank.BUI; // Frontier -namespace Content.Server.DeltaV.Mail.EntitySystems +namespace Content.Server._DV.Mail.EntitySystems { public sealed class MailSystem : EntitySystem { diff --git a/Content.Server/DeltaV/Mail/MailCommands.cs b/Content.Server/_DV/Mail/MailCommands.cs similarity index 98% rename from Content.Server/DeltaV/Mail/MailCommands.cs rename to Content.Server/_DV/Mail/MailCommands.cs index 84bced4776b..ad86982e4e6 100644 --- a/Content.Server/DeltaV/Mail/MailCommands.cs +++ b/Content.Server/_DV/Mail/MailCommands.cs @@ -4,10 +4,10 @@ using Robust.Shared.Prototypes; using Content.Shared.Administration; using Content.Server.Administration; -using Content.Server.DeltaV.Mail.Components; -using Content.Server.DeltaV.Mail.EntitySystems; +using Content.Server._DV.Mail.Components; +using Content.Server._DV.Mail.EntitySystems; -namespace Content.Server.DeltaV.Mail; +namespace Content.Server._DV.Mail; [AdminCommand(AdminFlags.Fun)] public sealed class MailToCommand : LocalizedCommands // Frontier: IConsoleCommand < LocalizedCommands diff --git a/Content.Server/DeltaV/Mail/MailConstants.cs b/Content.Server/_DV/Mail/MailConstants.cs similarity index 96% rename from Content.Server/DeltaV/Mail/MailConstants.cs rename to Content.Server/_DV/Mail/MailConstants.cs index 06ed4953ab6..eb861e2d76d 100644 --- a/Content.Server/DeltaV/Mail/MailConstants.cs +++ b/Content.Server/_DV/Mail/MailConstants.cs @@ -1,4 +1,4 @@ -namespace Content.Server.DeltaV.Mail +namespace Content.Server._DV.Mail { /// /// A set of localized strings related to mail entities diff --git a/Content.Server/DeltaV/Nutrition/Events.cs b/Content.Server/_DV/Nutrition/Events.cs similarity index 100% rename from Content.Server/DeltaV/Nutrition/Events.cs rename to Content.Server/_DV/Nutrition/Events.cs diff --git a/Content.Server/DeltaV/RoundEnd/RoundEndSystem.Pacified.cs b/Content.Server/_DV/RoundEnd/RoundEndSystem.Pacified.cs similarity index 95% rename from Content.Server/DeltaV/RoundEnd/RoundEndSystem.Pacified.cs rename to Content.Server/_DV/RoundEnd/RoundEndSystem.Pacified.cs index e73caa7591e..7e7fd81ae60 100644 --- a/Content.Server/DeltaV/RoundEnd/RoundEndSystem.Pacified.cs +++ b/Content.Server/_DV/RoundEnd/RoundEndSystem.Pacified.cs @@ -2,13 +2,13 @@ using Content.Server.GameTicking; using Content.Shared.CombatMode; using Content.Shared.CombatMode.Pacification; -using Content.Shared.DeltaV.CCVars; +using Content.Shared._DV.CCVars; using Content.Shared.Explosion.Components; using Content.Shared.Flash.Components; using Content.Shared.Store.Components; using Robust.Shared.Configuration; -namespace Content.Server.DeltaV.RoundEnd; +namespace Content.Server._DV.RoundEnd; public sealed class PacifiedRoundEnd : EntitySystem { diff --git a/Content.Server/DeltaV/Speech/Components/ScottishAccentComponent.cs b/Content.Server/_DV/Speech/Components/ScottishAccentComponent.cs similarity index 54% rename from Content.Server/DeltaV/Speech/Components/ScottishAccentComponent.cs rename to Content.Server/_DV/Speech/Components/ScottishAccentComponent.cs index 9cb83bf86d2..af0d7a63bdf 100644 --- a/Content.Server/DeltaV/Speech/Components/ScottishAccentComponent.cs +++ b/Content.Server/_DV/Speech/Components/ScottishAccentComponent.cs @@ -1,8 +1,8 @@ -using Content.Server.DeltaV.Speech.EntitySystems; +using Content.Server._DV.Speech.EntitySystems; -namespace Content.Server.DeltaV.Speech.Components; +namespace Content.Server._DV.Speech.Components; [RegisterComponent] [Access(typeof(ScottishAccentSystem))] public sealed partial class ScottishAccentComponent : Component -{ } \ No newline at end of file +{ } diff --git a/Content.Server/DeltaV/Speech/EntitySystems/ScottishAccentSystem.cs b/Content.Server/_DV/Speech/EntitySystems/ScottishAccentSystem.cs similarity index 89% rename from Content.Server/DeltaV/Speech/EntitySystems/ScottishAccentSystem.cs rename to Content.Server/_DV/Speech/EntitySystems/ScottishAccentSystem.cs index d17431911e2..69404d37e3f 100644 --- a/Content.Server/DeltaV/Speech/EntitySystems/ScottishAccentSystem.cs +++ b/Content.Server/_DV/Speech/EntitySystems/ScottishAccentSystem.cs @@ -1,9 +1,9 @@ -using Content.Server.DeltaV.Speech.Components; +using Content.Server._DV.Speech.Components; using Content.Server.Speech; using Content.Server.Speech.EntitySystems; using System.Text.RegularExpressions; -namespace Content.Server.DeltaV.Speech.EntitySystems; +namespace Content.Server._DV.Speech.EntitySystems; public sealed class ScottishAccentSystem : EntitySystem { @@ -30,4 +30,4 @@ private void OnAccentGet(EntityUid uid, ScottishAccentComponent component, Accen { args.Message = Accentuate(args.Message, component); } -} \ No newline at end of file +} diff --git a/Content.Server/DeltaV/Storage/EntitySystems/MouthStorageSystem.cs b/Content.Server/_DV/Storage/EntitySystems/MouthStorageSystem.cs similarity index 89% rename from Content.Server/DeltaV/Storage/EntitySystems/MouthStorageSystem.cs rename to Content.Server/_DV/Storage/EntitySystems/MouthStorageSystem.cs index e5e7d6755e6..a4d8dceec27 100644 --- a/Content.Server/DeltaV/Storage/EntitySystems/MouthStorageSystem.cs +++ b/Content.Server/_DV/Storage/EntitySystems/MouthStorageSystem.cs @@ -1,11 +1,11 @@ using Content.Server.Nutrition; using Content.Server.Speech; using Content.Server.Speech.EntitySystems; -using Content.Shared.DeltaV.Storage.Components; -using Content.Shared.DeltaV.Storage.EntitySystems; +using Content.Shared._DV.Storage.Components; +using Content.Shared._DV.Storage.EntitySystems; using Content.Shared.Storage; -namespace Content.Server.DeltaV.Storage.EntitySystems; +namespace Content.Server._DV.Storage.EntitySystems; public sealed class MouthStorageSystem : SharedMouthStorageSystem { diff --git a/Content.Server/DeltaV/Weapons/Ranged/Components/EnergyGunComponent.cs b/Content.Server/_DV/Weapons/Ranged/Components/EnergyGunComponent.cs similarity index 94% rename from Content.Server/DeltaV/Weapons/Ranged/Components/EnergyGunComponent.cs rename to Content.Server/_DV/Weapons/Ranged/Components/EnergyGunComponent.cs index ef146fd9309..e3d60d4f44f 100644 --- a/Content.Server/DeltaV/Weapons/Ranged/Components/EnergyGunComponent.cs +++ b/Content.Server/_DV/Weapons/Ranged/Components/EnergyGunComponent.cs @@ -1,8 +1,8 @@ using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; -using Content.Server.DeltaV.Weapons.Ranged.Systems; +using Content.Server._DV.Weapons.Ranged.Systems; -namespace Content.Server.DeltaV.Weapons.Ranged.Components; +namespace Content.Server._DV.Weapons.Ranged.Components; /// /// Allows for energy gun to switch between three modes. This also changes the sprite accordingly. diff --git a/Content.Server/DeltaV/Weapons/Ranged/Systems/EnergyGunSystem.cs b/Content.Server/_DV/Weapons/Ranged/Systems/EnergyGunSystem.cs similarity index 97% rename from Content.Server/DeltaV/Weapons/Ranged/Systems/EnergyGunSystem.cs rename to Content.Server/_DV/Weapons/Ranged/Systems/EnergyGunSystem.cs index c2fb914f4a2..88ad506b5d5 100644 --- a/Content.Server/DeltaV/Weapons/Ranged/Systems/EnergyGunSystem.cs +++ b/Content.Server/_DV/Weapons/Ranged/Systems/EnergyGunSystem.cs @@ -1,16 +1,16 @@ using Content.Server.Popups; -using Content.Server.DeltaV.Weapons.Ranged.Components; +using Content.Server._DV.Weapons.Ranged.Components; using Content.Shared.Database; using Content.Shared.Examine; using Content.Shared.Interaction; using Content.Shared.Verbs; using Content.Shared.Item; -using Content.Shared.DeltaV.Weapons.Ranged; +using Content.Shared._DV.Weapons.Ranged; using Content.Shared.Weapons.Ranged.Components; using Robust.Shared.Prototypes; using System.Linq; -namespace Content.Server.DeltaV.Weapons.Ranged.Systems; +namespace Content.Server._DV.Weapons.Ranged.Systems; public sealed class EnergyGunSystem : EntitySystem { diff --git a/Content.Shared/DeltaV/Abilities/AlwaysTriggerMousetrapComponent.cs b/Content.Shared/_DV/Abilities/AlwaysTriggerMousetrapComponent.cs similarity index 100% rename from Content.Shared/DeltaV/Abilities/AlwaysTriggerMousetrapComponent.cs rename to Content.Shared/_DV/Abilities/AlwaysTriggerMousetrapComponent.cs diff --git a/Content.Shared/DeltaV/Abilities/CrawlUnderObjectsComponent.cs b/Content.Shared/_DV/Abilities/CrawlUnderObjectsComponent.cs similarity index 96% rename from Content.Shared/DeltaV/Abilities/CrawlUnderObjectsComponent.cs rename to Content.Shared/_DV/Abilities/CrawlUnderObjectsComponent.cs index 1e7f17a0de0..90a2aedd405 100644 --- a/Content.Shared/DeltaV/Abilities/CrawlUnderObjectsComponent.cs +++ b/Content.Shared/_DV/Abilities/CrawlUnderObjectsComponent.cs @@ -4,7 +4,7 @@ using Robust.Shared.Prototypes; using Robust.Shared.Serialization; -namespace Content.Shared.DeltaV.Abilities; +namespace Content.Shared._DV.Abilities; [RegisterComponent, NetworkedComponent, AutoGenerateComponentState] public sealed partial class CrawlUnderObjectsComponent : Component diff --git a/Content.Shared/DeltaV/Abilities/RummagerComponent.cs b/Content.Shared/_DV/Abilities/RummagerComponent.cs similarity index 100% rename from Content.Shared/DeltaV/Abilities/RummagerComponent.cs rename to Content.Shared/_DV/Abilities/RummagerComponent.cs diff --git a/Content.Shared/DeltaV/Abilities/SharedCrawlUnderObjectsSystem.cs b/Content.Shared/_DV/Abilities/SharedCrawlUnderObjectsSystem.cs similarity index 94% rename from Content.Shared/DeltaV/Abilities/SharedCrawlUnderObjectsSystem.cs rename to Content.Shared/_DV/Abilities/SharedCrawlUnderObjectsSystem.cs index 56f1d11ee27..43facaad7b7 100644 --- a/Content.Shared/DeltaV/Abilities/SharedCrawlUnderObjectsSystem.cs +++ b/Content.Shared/_DV/Abilities/SharedCrawlUnderObjectsSystem.cs @@ -1,7 +1,7 @@ using Content.Shared.Popups; -namespace Content.Shared.DeltaV.Abilities; +namespace Content.Shared._DV.Abilities; public abstract class SharedCrawlUnderObjectsSystem : EntitySystem { [Dependency] private readonly SharedPopupSystem _popup = default!; diff --git a/Content.Shared/DeltaV/Abilities/UltraVisionComponent.cs b/Content.Shared/_DV/Abilities/UltraVisionComponent.cs similarity index 100% rename from Content.Shared/DeltaV/Abilities/UltraVisionComponent.cs rename to Content.Shared/_DV/Abilities/UltraVisionComponent.cs diff --git a/Content.Shared/DeltaV/Administration/JobWhitelistsEuiState.cs b/Content.Shared/_DV/Administration/JobWhitelistsEuiState.cs similarity index 97% rename from Content.Shared/DeltaV/Administration/JobWhitelistsEuiState.cs rename to Content.Shared/_DV/Administration/JobWhitelistsEuiState.cs index 7d96c0a9843..dd0870dda61 100644 --- a/Content.Shared/DeltaV/Administration/JobWhitelistsEuiState.cs +++ b/Content.Shared/_DV/Administration/JobWhitelistsEuiState.cs @@ -4,7 +4,7 @@ using Robust.Shared.Prototypes; using Robust.Shared.Serialization; -namespace Content.Shared.DeltaV.Administration; +namespace Content.Shared._DV.Administration; [Serializable, NetSerializable] public sealed class JobWhitelistsEuiState : EuiStateBase diff --git a/Content.Shared/DeltaV/CCVars/DCCVars.cs b/Content.Shared/_DV/CCVars/DCCVars.cs similarity index 97% rename from Content.Shared/DeltaV/CCVars/DCCVars.cs rename to Content.Shared/_DV/CCVars/DCCVars.cs index fe9a3edec9d..eb16f084ece 100644 --- a/Content.Shared/DeltaV/CCVars/DCCVars.cs +++ b/Content.Shared/_DV/CCVars/DCCVars.cs @@ -1,6 +1,6 @@ using Robust.Shared.Configuration; -namespace Content.Shared.DeltaV.CCVars; +namespace Content.Shared._DV.CCVars; /// /// DeltaV specific cvars. diff --git a/Content.Shared/DeltaV/CartridgeLoader/Cartridges/MailMetricUiState.cs b/Content.Shared/_DV/CartridgeLoader/Cartridges/MailMetricUiState.cs similarity index 100% rename from Content.Shared/DeltaV/CartridgeLoader/Cartridges/MailMetricUiState.cs rename to Content.Shared/_DV/CartridgeLoader/Cartridges/MailMetricUiState.cs diff --git a/Content.Shared/DeltaV/Harpy/Components/HarpyVisualSystem.cs b/Content.Shared/_DV/Harpy/Components/HarpyVisualSystem.cs similarity index 83% rename from Content.Shared/DeltaV/Harpy/Components/HarpyVisualSystem.cs rename to Content.Shared/_DV/Harpy/Components/HarpyVisualSystem.cs index f5100e13c7f..7bd6bed272e 100644 --- a/Content.Shared/DeltaV/Harpy/Components/HarpyVisualSystem.cs +++ b/Content.Shared/_DV/Harpy/Components/HarpyVisualSystem.cs @@ -1,6 +1,6 @@ using Robust.Shared.Serialization; -namespace Content.Shared.DeltaV.Harpy.Components +namespace Content.Shared._DV.Harpy.Components { [Serializable, NetSerializable] public enum HarpyVisualLayers diff --git a/Content.Shared/DeltaV/Harpy/HarpySingerComponent.cs b/Content.Shared/_DV/Harpy/HarpySingerComponent.cs similarity index 94% rename from Content.Shared/DeltaV/Harpy/HarpySingerComponent.cs rename to Content.Shared/_DV/Harpy/HarpySingerComponent.cs index 1ee3f795d58..20f856346f2 100644 --- a/Content.Shared/DeltaV/Harpy/HarpySingerComponent.cs +++ b/Content.Shared/_DV/Harpy/HarpySingerComponent.cs @@ -2,7 +2,7 @@ using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; -namespace Content.Shared.DeltaV.Harpy +namespace Content.Shared._DV.Harpy { [RegisterComponent, NetworkedComponent] public sealed partial class HarpySingerComponent : Component diff --git a/Content.Shared/DeltaV/Harpy/HarpySingerSystem.cs b/Content.Shared/_DV/Harpy/HarpySingerSystem.cs similarity index 95% rename from Content.Shared/DeltaV/Harpy/HarpySingerSystem.cs rename to Content.Shared/_DV/Harpy/HarpySingerSystem.cs index 50e8b6302c0..6ac7b9a409e 100644 --- a/Content.Shared/DeltaV/Harpy/HarpySingerSystem.cs +++ b/Content.Shared/_DV/Harpy/HarpySingerSystem.cs @@ -1,6 +1,6 @@ using Content.Shared.Actions; -namespace Content.Shared.DeltaV.Harpy +namespace Content.Shared._DV.Harpy { public class HarpySingerSystem : EntitySystem { diff --git a/Content.Shared/DeltaV/Harpy/HarpyVisualsSystem.cs b/Content.Shared/_DV/Harpy/HarpyVisualsSystem.cs similarity index 97% rename from Content.Shared/DeltaV/Harpy/HarpyVisualsSystem.cs rename to Content.Shared/_DV/Harpy/HarpyVisualsSystem.cs index cfe44016444..8879f105eda 100644 --- a/Content.Shared/DeltaV/Harpy/HarpyVisualsSystem.cs +++ b/Content.Shared/_DV/Harpy/HarpyVisualsSystem.cs @@ -3,7 +3,7 @@ using Content.Shared.Humanoid; using Content.Shared._NF.Clothing.Components; // Frontier -namespace Content.Shared.DeltaV.Harpy; +namespace Content.Shared._DV.Harpy; public sealed class HarpyVisualsSystem : EntitySystem { diff --git a/Content.Shared/DeltaV/Harpy/SharedHarpyVisualsComponent.cs b/Content.Shared/_DV/Harpy/SharedHarpyVisualsComponent.cs similarity index 74% rename from Content.Shared/DeltaV/Harpy/SharedHarpyVisualsComponent.cs rename to Content.Shared/_DV/Harpy/SharedHarpyVisualsComponent.cs index cc0f7c39354..ba0807fb647 100644 --- a/Content.Shared/DeltaV/Harpy/SharedHarpyVisualsComponent.cs +++ b/Content.Shared/_DV/Harpy/SharedHarpyVisualsComponent.cs @@ -1,6 +1,6 @@ using Robust.Shared.Serialization; -namespace Content.Shared.DeltaV.Harpy; +namespace Content.Shared._DV.Harpy; [Serializable, NetSerializable] public enum HardsuitWings : byte diff --git a/Content.Shared/DeltaV/Mail/MailDeliveryPoolPrototype.cs b/Content.Shared/_DV/Mail/MailDeliveryPoolPrototype.cs similarity index 95% rename from Content.Shared/DeltaV/Mail/MailDeliveryPoolPrototype.cs rename to Content.Shared/_DV/Mail/MailDeliveryPoolPrototype.cs index a541bef7ad9..eb118a2ff61 100644 --- a/Content.Shared/DeltaV/Mail/MailDeliveryPoolPrototype.cs +++ b/Content.Shared/_DV/Mail/MailDeliveryPoolPrototype.cs @@ -1,6 +1,6 @@ using Robust.Shared.Prototypes; -namespace Content.Shared.DeltaV.Mail; +namespace Content.Shared._DV.Mail; /// /// Generic random weighting dataset to use. diff --git a/Content.Shared/DeltaV/Mail/MailVisuals.cs b/Content.Shared/_DV/Mail/MailVisuals.cs similarity index 90% rename from Content.Shared/DeltaV/Mail/MailVisuals.cs rename to Content.Shared/_DV/Mail/MailVisuals.cs index 6ca26f129de..d6ef6146131 100644 --- a/Content.Shared/DeltaV/Mail/MailVisuals.cs +++ b/Content.Shared/_DV/Mail/MailVisuals.cs @@ -1,6 +1,6 @@ using Robust.Shared.Serialization; -namespace Content.Shared.DeltaV.Mail +namespace Content.Shared._DV.Mail { /// /// Stores the visuals for mail. diff --git a/Content.Shared/DeltaV/Mail/SharedMailComponent.cs b/Content.Shared/_DV/Mail/SharedMailComponent.cs similarity index 68% rename from Content.Shared/DeltaV/Mail/SharedMailComponent.cs rename to Content.Shared/_DV/Mail/SharedMailComponent.cs index 6f4d7a2278b..ba4c9f1b86c 100644 --- a/Content.Shared/DeltaV/Mail/SharedMailComponent.cs +++ b/Content.Shared/_DV/Mail/SharedMailComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Shared.DeltaV.Mail +namespace Content.Shared._DV.Mail { public abstract partial class SharedMailComponent : Component { diff --git a/Content.Shared/DeltaV/StepTrigger/Component/NoShoesSilentFootstepsComponent.cs b/Content.Shared/_DV/StepTrigger/Component/NoShoesSilentFootstepsComponent.cs similarity index 100% rename from Content.Shared/DeltaV/StepTrigger/Component/NoShoesSilentFootstepsComponent.cs rename to Content.Shared/_DV/StepTrigger/Component/NoShoesSilentFootstepsComponent.cs diff --git a/Content.Shared/DeltaV/Storage/Components/MouthStorageComponent.cs b/Content.Shared/_DV/Storage/Components/MouthStorageComponent.cs similarity index 88% rename from Content.Shared/DeltaV/Storage/Components/MouthStorageComponent.cs rename to Content.Shared/_DV/Storage/Components/MouthStorageComponent.cs index ecc90363a0b..ce3dba3aab7 100644 --- a/Content.Shared/DeltaV/Storage/Components/MouthStorageComponent.cs +++ b/Content.Shared/_DV/Storage/Components/MouthStorageComponent.cs @@ -1,9 +1,9 @@ -using Content.Shared.DeltaV.Storage.EntitySystems; +using Content.Shared._DV.Storage.EntitySystems; using Content.Shared.FixedPoint; using Robust.Shared.Containers; using Robust.Shared.GameStates; using Robust.Shared.Prototypes; -namespace Content.Shared.DeltaV.Storage.Components; +namespace Content.Shared._DV.Storage.Components; [RegisterComponent, NetworkedComponent, AutoGenerateComponentState] [Access(typeof(SharedMouthStorageSystem))] diff --git a/Content.Shared/DeltaV/Storage/EntitySystems/SharedMouthStorageSystem.cs b/Content.Shared/_DV/Storage/EntitySystems/SharedMouthStorageSystem.cs similarity index 96% rename from Content.Shared/DeltaV/Storage/EntitySystems/SharedMouthStorageSystem.cs rename to Content.Shared/_DV/Storage/EntitySystems/SharedMouthStorageSystem.cs index df3ed835e26..cee62c4bcd8 100644 --- a/Content.Shared/DeltaV/Storage/EntitySystems/SharedMouthStorageSystem.cs +++ b/Content.Shared/_DV/Storage/EntitySystems/SharedMouthStorageSystem.cs @@ -1,7 +1,7 @@ using Content.Shared.Actions; using Content.Shared.CombatMode; using Content.Shared.Damage; -using Content.Shared.DeltaV.Storage.Components; +using Content.Shared._DV.Storage.Components; using Content.Shared.Examine; using Content.Shared.IdentityManagement; using Content.Shared.Standing; @@ -10,7 +10,7 @@ using Robust.Shared.Containers; using Robust.Shared.Map; -namespace Content.Shared.DeltaV.Storage.EntitySystems; +namespace Content.Shared._DV.Storage.EntitySystems; public abstract class SharedMouthStorageSystem : EntitySystem { diff --git a/Content.Shared/DeltaV/Weapons/Ranged/EnergyGunFireModeVisuals.cs b/Content.Shared/_DV/Weapons/Ranged/EnergyGunFireModeVisuals.cs similarity index 87% rename from Content.Shared/DeltaV/Weapons/Ranged/EnergyGunFireModeVisuals.cs rename to Content.Shared/_DV/Weapons/Ranged/EnergyGunFireModeVisuals.cs index 73bc8f6b723..6a4daf69e15 100644 --- a/Content.Shared/DeltaV/Weapons/Ranged/EnergyGunFireModeVisuals.cs +++ b/Content.Shared/_DV/Weapons/Ranged/EnergyGunFireModeVisuals.cs @@ -1,6 +1,6 @@ using Robust.Shared.Serialization; -namespace Content.Shared.DeltaV.Weapons.Ranged; +namespace Content.Shared._DV.Weapons.Ranged; [Serializable, NetSerializable] public enum EnergyGunFireModeVisuals : byte diff --git a/Content.Shared/DeltaV/Whitelist/WhitelistTierPrototype.cs b/Content.Shared/_DV/Whitelist/WhitelistTierPrototype.cs similarity index 92% rename from Content.Shared/DeltaV/Whitelist/WhitelistTierPrototype.cs rename to Content.Shared/_DV/Whitelist/WhitelistTierPrototype.cs index 476d1d6a7aa..14659baa4e3 100644 --- a/Content.Shared/DeltaV/Whitelist/WhitelistTierPrototype.cs +++ b/Content.Shared/_DV/Whitelist/WhitelistTierPrototype.cs @@ -2,7 +2,7 @@ using Content.Shared.Roles; using Robust.Shared.Prototypes; -namespace Content.Shared.DeltaV.Whitelist; +namespace Content.Shared._DV.Whitelist; [Prototype("whitelistTier")] public sealed class WhitelistTierPrototype : IPrototype diff --git a/Resources/Audio/DeltaV/Items/eatfood.ogg b/Resources/Audio/_DV/Items/eatfood.ogg similarity index 100% rename from Resources/Audio/DeltaV/Items/eatfood.ogg rename to Resources/Audio/_DV/Items/eatfood.ogg diff --git a/Resources/Audio/DeltaV/Jukebox/Caravan_Palace_Lone_Digger-MONO.ogg b/Resources/Audio/_DV/Jukebox/Caravan_Palace_Lone_Digger-MONO.ogg similarity index 100% rename from Resources/Audio/DeltaV/Jukebox/Caravan_Palace_Lone_Digger-MONO.ogg rename to Resources/Audio/_DV/Jukebox/Caravan_Palace_Lone_Digger-MONO.ogg diff --git a/Resources/Audio/DeltaV/Jukebox/DOS=HIGH,_UMB.ogg b/Resources/Audio/_DV/Jukebox/DOS=HIGH,_UMB.ogg similarity index 100% rename from Resources/Audio/DeltaV/Jukebox/DOS=HIGH,_UMB.ogg rename to Resources/Audio/_DV/Jukebox/DOS=HIGH,_UMB.ogg diff --git a/Resources/Audio/DeltaV/Jukebox/Patricia_Taxxon_-_Minute_-_MONO.ogg b/Resources/Audio/_DV/Jukebox/Patricia_Taxxon_-_Minute_-_MONO.ogg similarity index 100% rename from Resources/Audio/DeltaV/Jukebox/Patricia_Taxxon_-_Minute_-_MONO.ogg rename to Resources/Audio/_DV/Jukebox/Patricia_Taxxon_-_Minute_-_MONO.ogg diff --git a/Resources/Audio/DeltaV/Jukebox/Phoron_Will_Make_Us_RichMONO2.ogg b/Resources/Audio/_DV/Jukebox/Phoron_Will_Make_Us_RichMONO2.ogg similarity index 100% rename from Resources/Audio/DeltaV/Jukebox/Phoron_Will_Make_Us_RichMONO2.ogg rename to Resources/Audio/_DV/Jukebox/Phoron_Will_Make_Us_RichMONO2.ogg diff --git a/Resources/Audio/DeltaV/Jukebox/Scratch_Post_-_OST_MONO.ogg b/Resources/Audio/_DV/Jukebox/Scratch_Post_-_OST_MONO.ogg similarity index 100% rename from Resources/Audio/DeltaV/Jukebox/Scratch_Post_-_OST_MONO.ogg rename to Resources/Audio/_DV/Jukebox/Scratch_Post_-_OST_MONO.ogg diff --git a/Resources/Audio/DeltaV/Jukebox/a_different_reality_lagoona_remix.xm-MONO.ogg b/Resources/Audio/_DV/Jukebox/a_different_reality_lagoona_remix.xm-MONO.ogg similarity index 100% rename from Resources/Audio/DeltaV/Jukebox/a_different_reality_lagoona_remix.xm-MONO.ogg rename to Resources/Audio/_DV/Jukebox/a_different_reality_lagoona_remix.xm-MONO.ogg diff --git a/Resources/Audio/DeltaV/Jukebox/aggravated.it-MONO.ogg b/Resources/Audio/_DV/Jukebox/aggravated.it-MONO.ogg similarity index 100% rename from Resources/Audio/DeltaV/Jukebox/aggravated.it-MONO.ogg rename to Resources/Audio/_DV/Jukebox/aggravated.it-MONO.ogg diff --git a/Resources/Audio/DeltaV/Jukebox/attributions.yml b/Resources/Audio/_DV/Jukebox/attributions.yml similarity index 98% rename from Resources/Audio/DeltaV/Jukebox/attributions.yml rename to Resources/Audio/_DV/Jukebox/attributions.yml index d0518b2d75f..9618cfa32ad 100644 --- a/Resources/Audio/DeltaV/Jukebox/attributions.yml +++ b/Resources/Audio/_DV/Jukebox/attributions.yml @@ -1,4 +1,4 @@ -# sorted alphabetically based on filenames in the folder Resources/Audio/DeltaV/Jukebox +# sorted alphabetically based on filenames in the folder Resources/Audio/_DV/Jukebox # keep it ordered or I'll stab you - files: ["a_different_reality_lagoona_remix.xm-MONO.ogg"] @@ -94,4 +94,4 @@ - files: ["Caravan_Palace_Lone_Digger-MONO.ogg"] license: "CC-BY-SA-3.0" copyright: "Lone Digger by Caravan Palace, converted to mono" - source: "https://vimeo.com/144736865" \ No newline at end of file + source: "https://vimeo.com/144736865" diff --git a/Resources/Audio/DeltaV/Jukebox/autumnal_equinox.xm-MONO.ogg b/Resources/Audio/_DV/Jukebox/autumnal_equinox.xm-MONO.ogg similarity index 100% rename from Resources/Audio/DeltaV/Jukebox/autumnal_equinox.xm-MONO.ogg rename to Resources/Audio/_DV/Jukebox/autumnal_equinox.xm-MONO.ogg diff --git a/Resources/Audio/DeltaV/Jukebox/deck_the_halls_b-MONO.ogg b/Resources/Audio/_DV/Jukebox/deck_the_halls_b-MONO.ogg similarity index 100% rename from Resources/Audio/DeltaV/Jukebox/deck_the_halls_b-MONO.ogg rename to Resources/Audio/_DV/Jukebox/deck_the_halls_b-MONO.ogg diff --git a/Resources/Audio/DeltaV/Jukebox/drozerix_-_alone.xm-MONO.ogg b/Resources/Audio/_DV/Jukebox/drozerix_-_alone.xm-MONO.ogg similarity index 100% rename from Resources/Audio/DeltaV/Jukebox/drozerix_-_alone.xm-MONO.ogg rename to Resources/Audio/_DV/Jukebox/drozerix_-_alone.xm-MONO.ogg diff --git a/Resources/Audio/DeltaV/Jukebox/drozerix_-_leisurely_voice.xm-MONO.ogg b/Resources/Audio/_DV/Jukebox/drozerix_-_leisurely_voice.xm-MONO.ogg similarity index 100% rename from Resources/Audio/DeltaV/Jukebox/drozerix_-_leisurely_voice.xm-MONO.ogg rename to Resources/Audio/_DV/Jukebox/drozerix_-_leisurely_voice.xm-MONO.ogg diff --git a/Resources/Audio/DeltaV/Jukebox/every_light_is_blinking_at_onceMONO.ogg b/Resources/Audio/_DV/Jukebox/every_light_is_blinking_at_onceMONO.ogg similarity index 100% rename from Resources/Audio/DeltaV/Jukebox/every_light_is_blinking_at_onceMONO.ogg rename to Resources/Audio/_DV/Jukebox/every_light_is_blinking_at_onceMONO.ogg diff --git a/Resources/Audio/DeltaV/Jukebox/hackers-MONO.ogg b/Resources/Audio/_DV/Jukebox/hackers-MONO.ogg similarity index 100% rename from Resources/Audio/DeltaV/Jukebox/hackers-MONO.ogg rename to Resources/Audio/_DV/Jukebox/hackers-MONO.ogg diff --git a/Resources/Audio/DeltaV/Jukebox/lasers_rip_apart_the_bulkheadMONO.ogg b/Resources/Audio/_DV/Jukebox/lasers_rip_apart_the_bulkheadMONO.ogg similarity index 100% rename from Resources/Audio/DeltaV/Jukebox/lasers_rip_apart_the_bulkheadMONO.ogg rename to Resources/Audio/_DV/Jukebox/lasers_rip_apart_the_bulkheadMONO.ogg diff --git a/Resources/Audio/DeltaV/Jukebox/marhaba-MONO.ogg b/Resources/Audio/_DV/Jukebox/marhaba-MONO.ogg similarity index 100% rename from Resources/Audio/DeltaV/Jukebox/marhaba-MONO.ogg rename to Resources/Audio/_DV/Jukebox/marhaba-MONO.ogg diff --git a/Resources/Audio/DeltaV/Jukebox/psirius_-_nymphs_of_the_forest.mptm-MONO.ogg b/Resources/Audio/_DV/Jukebox/psirius_-_nymphs_of_the_forest.mptm-MONO.ogg similarity index 100% rename from Resources/Audio/DeltaV/Jukebox/psirius_-_nymphs_of_the_forest.mptm-MONO.ogg rename to Resources/Audio/_DV/Jukebox/psirius_-_nymphs_of_the_forest.mptm-MONO.ogg diff --git a/Resources/Audio/DeltaV/Jukebox/shibamata-MONO.ogg b/Resources/Audio/_DV/Jukebox/shibamata-MONO.ogg similarity index 100% rename from Resources/Audio/DeltaV/Jukebox/shibamata-MONO.ogg rename to Resources/Audio/_DV/Jukebox/shibamata-MONO.ogg diff --git a/Resources/Audio/DeltaV/Jukebox/space_asshole-MONO.ogg b/Resources/Audio/_DV/Jukebox/space_asshole-MONO.ogg similarity index 100% rename from Resources/Audio/DeltaV/Jukebox/space_asshole-MONO.ogg rename to Resources/Audio/_DV/Jukebox/space_asshole-MONO.ogg diff --git a/Resources/Audio/DeltaV/Jukebox/superposition-MONO.ogg b/Resources/Audio/_DV/Jukebox/superposition-MONO.ogg similarity index 100% rename from Resources/Audio/DeltaV/Jukebox/superposition-MONO.ogg rename to Resources/Audio/_DV/Jukebox/superposition-MONO.ogg diff --git a/Resources/Audio/DeltaV/Voice/Harpy/attributions.yml b/Resources/Audio/_DV/Voice/Harpy/attributions.yml similarity index 100% rename from Resources/Audio/DeltaV/Voice/Harpy/attributions.yml rename to Resources/Audio/_DV/Voice/Harpy/attributions.yml diff --git a/Resources/Audio/DeltaV/Voice/Harpy/caw1.ogg b/Resources/Audio/_DV/Voice/Harpy/caw1.ogg similarity index 100% rename from Resources/Audio/DeltaV/Voice/Harpy/caw1.ogg rename to Resources/Audio/_DV/Voice/Harpy/caw1.ogg diff --git a/Resources/Audio/DeltaV/Voice/Harpy/chirp1.ogg b/Resources/Audio/_DV/Voice/Harpy/chirp1.ogg similarity index 100% rename from Resources/Audio/DeltaV/Voice/Harpy/chirp1.ogg rename to Resources/Audio/_DV/Voice/Harpy/chirp1.ogg diff --git a/Resources/Audio/DeltaV/Voice/Harpy/license.txt b/Resources/Audio/_DV/Voice/Harpy/license.txt similarity index 100% rename from Resources/Audio/DeltaV/Voice/Harpy/license.txt rename to Resources/Audio/_DV/Voice/Harpy/license.txt diff --git a/Resources/Audio/DeltaV/Voice/Talk/license.txt b/Resources/Audio/_DV/Voice/Talk/license.txt similarity index 100% rename from Resources/Audio/DeltaV/Voice/Talk/license.txt rename to Resources/Audio/_DV/Voice/Talk/license.txt diff --git a/Resources/Audio/DeltaV/Voice/Talk/vulp.ogg b/Resources/Audio/_DV/Voice/Talk/vulp.ogg similarity index 100% rename from Resources/Audio/DeltaV/Voice/Talk/vulp.ogg rename to Resources/Audio/_DV/Voice/Talk/vulp.ogg diff --git a/Resources/Audio/DeltaV/Voice/Talk/vulp_ask.ogg b/Resources/Audio/_DV/Voice/Talk/vulp_ask.ogg similarity index 100% rename from Resources/Audio/DeltaV/Voice/Talk/vulp_ask.ogg rename to Resources/Audio/_DV/Voice/Talk/vulp_ask.ogg diff --git a/Resources/Audio/DeltaV/Voice/Talk/vulp_exclaim.ogg b/Resources/Audio/_DV/Voice/Talk/vulp_exclaim.ogg similarity index 100% rename from Resources/Audio/DeltaV/Voice/Talk/vulp_exclaim.ogg rename to Resources/Audio/_DV/Voice/Talk/vulp_exclaim.ogg diff --git a/Resources/Audio/DeltaV/Voice/Vulpkanin/attributions.yml b/Resources/Audio/_DV/Voice/Vulpkanin/attributions.yml similarity index 100% rename from Resources/Audio/DeltaV/Voice/Vulpkanin/attributions.yml rename to Resources/Audio/_DV/Voice/Vulpkanin/attributions.yml diff --git a/Resources/Audio/DeltaV/Voice/Vulpkanin/dog_bark1.ogg b/Resources/Audio/_DV/Voice/Vulpkanin/dog_bark1.ogg similarity index 100% rename from Resources/Audio/DeltaV/Voice/Vulpkanin/dog_bark1.ogg rename to Resources/Audio/_DV/Voice/Vulpkanin/dog_bark1.ogg diff --git a/Resources/Audio/DeltaV/Voice/Vulpkanin/dog_bark2.ogg b/Resources/Audio/_DV/Voice/Vulpkanin/dog_bark2.ogg similarity index 100% rename from Resources/Audio/DeltaV/Voice/Vulpkanin/dog_bark2.ogg rename to Resources/Audio/_DV/Voice/Vulpkanin/dog_bark2.ogg diff --git a/Resources/Audio/DeltaV/Voice/Vulpkanin/dog_bark3.ogg b/Resources/Audio/_DV/Voice/Vulpkanin/dog_bark3.ogg similarity index 100% rename from Resources/Audio/DeltaV/Voice/Vulpkanin/dog_bark3.ogg rename to Resources/Audio/_DV/Voice/Vulpkanin/dog_bark3.ogg diff --git a/Resources/Audio/DeltaV/Voice/Vulpkanin/dog_growl1.ogg b/Resources/Audio/_DV/Voice/Vulpkanin/dog_growl1.ogg similarity index 100% rename from Resources/Audio/DeltaV/Voice/Vulpkanin/dog_growl1.ogg rename to Resources/Audio/_DV/Voice/Vulpkanin/dog_growl1.ogg diff --git a/Resources/Audio/DeltaV/Voice/Vulpkanin/dog_growl2.ogg b/Resources/Audio/_DV/Voice/Vulpkanin/dog_growl2.ogg similarity index 100% rename from Resources/Audio/DeltaV/Voice/Vulpkanin/dog_growl2.ogg rename to Resources/Audio/_DV/Voice/Vulpkanin/dog_growl2.ogg diff --git a/Resources/Audio/DeltaV/Voice/Vulpkanin/dog_growl3.ogg b/Resources/Audio/_DV/Voice/Vulpkanin/dog_growl3.ogg similarity index 100% rename from Resources/Audio/DeltaV/Voice/Vulpkanin/dog_growl3.ogg rename to Resources/Audio/_DV/Voice/Vulpkanin/dog_growl3.ogg diff --git a/Resources/Audio/DeltaV/Voice/Vulpkanin/dog_growl4.ogg b/Resources/Audio/_DV/Voice/Vulpkanin/dog_growl4.ogg similarity index 100% rename from Resources/Audio/DeltaV/Voice/Vulpkanin/dog_growl4.ogg rename to Resources/Audio/_DV/Voice/Vulpkanin/dog_growl4.ogg diff --git a/Resources/Audio/DeltaV/Voice/Vulpkanin/dog_growl5.ogg b/Resources/Audio/_DV/Voice/Vulpkanin/dog_growl5.ogg similarity index 100% rename from Resources/Audio/DeltaV/Voice/Vulpkanin/dog_growl5.ogg rename to Resources/Audio/_DV/Voice/Vulpkanin/dog_growl5.ogg diff --git a/Resources/Audio/DeltaV/Voice/Vulpkanin/dog_growl6.ogg b/Resources/Audio/_DV/Voice/Vulpkanin/dog_growl6.ogg similarity index 100% rename from Resources/Audio/DeltaV/Voice/Vulpkanin/dog_growl6.ogg rename to Resources/Audio/_DV/Voice/Vulpkanin/dog_growl6.ogg diff --git a/Resources/Audio/DeltaV/Voice/Vulpkanin/dog_snarl1.ogg b/Resources/Audio/_DV/Voice/Vulpkanin/dog_snarl1.ogg similarity index 100% rename from Resources/Audio/DeltaV/Voice/Vulpkanin/dog_snarl1.ogg rename to Resources/Audio/_DV/Voice/Vulpkanin/dog_snarl1.ogg diff --git a/Resources/Audio/DeltaV/Voice/Vulpkanin/dog_snarl2.ogg b/Resources/Audio/_DV/Voice/Vulpkanin/dog_snarl2.ogg similarity index 100% rename from Resources/Audio/DeltaV/Voice/Vulpkanin/dog_snarl2.ogg rename to Resources/Audio/_DV/Voice/Vulpkanin/dog_snarl2.ogg diff --git a/Resources/Audio/DeltaV/Voice/Vulpkanin/dog_snarl3.ogg b/Resources/Audio/_DV/Voice/Vulpkanin/dog_snarl3.ogg similarity index 100% rename from Resources/Audio/DeltaV/Voice/Vulpkanin/dog_snarl3.ogg rename to Resources/Audio/_DV/Voice/Vulpkanin/dog_snarl3.ogg diff --git a/Resources/Audio/DeltaV/Voice/Vulpkanin/dog_whine.ogg b/Resources/Audio/_DV/Voice/Vulpkanin/dog_whine.ogg similarity index 100% rename from Resources/Audio/DeltaV/Voice/Vulpkanin/dog_whine.ogg rename to Resources/Audio/_DV/Voice/Vulpkanin/dog_whine.ogg diff --git a/Resources/Audio/DeltaV/Voice/Vulpkanin/howl.ogg b/Resources/Audio/_DV/Voice/Vulpkanin/howl.ogg similarity index 100% rename from Resources/Audio/DeltaV/Voice/Vulpkanin/howl.ogg rename to Resources/Audio/_DV/Voice/Vulpkanin/howl.ogg diff --git a/Resources/Audio/DeltaV/Voice/Vulpkanin/license.txt b/Resources/Audio/_DV/Voice/Vulpkanin/license.txt similarity index 100% rename from Resources/Audio/DeltaV/Voice/Vulpkanin/license.txt rename to Resources/Audio/_DV/Voice/Vulpkanin/license.txt diff --git a/Resources/Audio/DeltaV/Weapons/Guns/Empty/dry_fire.ogg b/Resources/Audio/_DV/Weapons/Guns/Empty/dry_fire.ogg similarity index 100% rename from Resources/Audio/DeltaV/Weapons/Guns/Empty/dry_fire.ogg rename to Resources/Audio/_DV/Weapons/Guns/Empty/dry_fire.ogg diff --git a/Resources/Audio/DeltaV/Weapons/Guns/Gunshots/laser.ogg b/Resources/Audio/_DV/Weapons/Guns/Gunshots/laser.ogg similarity index 100% rename from Resources/Audio/DeltaV/Weapons/Guns/Gunshots/laser.ogg rename to Resources/Audio/_DV/Weapons/Guns/Gunshots/laser.ogg diff --git a/Resources/Audio/DeltaV/license.txt b/Resources/Audio/_DV/license.txt similarity index 100% rename from Resources/Audio/DeltaV/license.txt rename to Resources/Audio/_DV/license.txt diff --git a/Resources/Locale/en-US/deltav/accent/scottish.ftl b/Resources/Locale/en-US/_DV/accent/scottish.ftl similarity index 100% rename from Resources/Locale/en-US/deltav/accent/scottish.ftl rename to Resources/Locale/en-US/_DV/accent/scottish.ftl diff --git a/Resources/Locale/en-US/deltav/administration/ui/player-panel.ftl b/Resources/Locale/en-US/_DV/administration/ui/player-panel.ftl similarity index 100% rename from Resources/Locale/en-US/deltav/administration/ui/player-panel.ftl rename to Resources/Locale/en-US/_DV/administration/ui/player-panel.ftl diff --git a/Resources/Locale/en-US/deltav/advertisements/vending/pride.ftl b/Resources/Locale/en-US/_DV/advertisements/vending/pride.ftl similarity index 100% rename from Resources/Locale/en-US/deltav/advertisements/vending/pride.ftl rename to Resources/Locale/en-US/_DV/advertisements/vending/pride.ftl diff --git a/Resources/Locale/en-US/deltav/cartridge-loader/cartridges.ftl b/Resources/Locale/en-US/_DV/cartridge-loader/cartridges.ftl similarity index 100% rename from Resources/Locale/en-US/deltav/cartridge-loader/cartridges.ftl rename to Resources/Locale/en-US/_DV/cartridge-loader/cartridges.ftl diff --git a/Resources/Locale/en-US/deltav/catalog/cargo/cargo-vending.ftl b/Resources/Locale/en-US/_DV/catalog/cargo/cargo-vending.ftl similarity index 100% rename from Resources/Locale/en-US/deltav/catalog/cargo/cargo-vending.ftl rename to Resources/Locale/en-US/_DV/catalog/cargo/cargo-vending.ftl diff --git a/Resources/Locale/en-US/deltav/catalog/fills/crates/vending-crates.ftl b/Resources/Locale/en-US/_DV/catalog/fills/crates/vending-crates.ftl similarity index 100% rename from Resources/Locale/en-US/deltav/catalog/fills/crates/vending-crates.ftl rename to Resources/Locale/en-US/_DV/catalog/fills/crates/vending-crates.ftl diff --git a/Resources/Locale/en-US/deltav/escape-menu/options-menu.ftl b/Resources/Locale/en-US/_DV/escape-menu/options-menu.ftl similarity index 100% rename from Resources/Locale/en-US/deltav/escape-menu/options-menu.ftl rename to Resources/Locale/en-US/_DV/escape-menu/options-menu.ftl diff --git a/Resources/Locale/en-US/deltav/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/_DV/flavors/flavor-profiles.ftl similarity index 100% rename from Resources/Locale/en-US/deltav/flavors/flavor-profiles.ftl rename to Resources/Locale/en-US/_DV/flavors/flavor-profiles.ftl diff --git a/Resources/Locale/en-US/deltav/harpy/singer_system.ftl b/Resources/Locale/en-US/_DV/harpy/singer_system.ftl similarity index 100% rename from Resources/Locale/en-US/deltav/harpy/singer_system.ftl rename to Resources/Locale/en-US/_DV/harpy/singer_system.ftl diff --git a/Resources/Locale/en-US/deltav/info/whitelists.ftl b/Resources/Locale/en-US/_DV/info/whitelists.ftl similarity index 100% rename from Resources/Locale/en-US/deltav/info/whitelists.ftl rename to Resources/Locale/en-US/_DV/info/whitelists.ftl diff --git a/Resources/Locale/en-US/deltav/markings/Oni.ftl b/Resources/Locale/en-US/_DV/markings/Oni.ftl similarity index 100% rename from Resources/Locale/en-US/deltav/markings/Oni.ftl rename to Resources/Locale/en-US/_DV/markings/Oni.ftl diff --git a/Resources/Locale/en-US/deltav/markings/felinid.ftl b/Resources/Locale/en-US/_DV/markings/felinid.ftl similarity index 100% rename from Resources/Locale/en-US/deltav/markings/felinid.ftl rename to Resources/Locale/en-US/_DV/markings/felinid.ftl diff --git a/Resources/Locale/en-US/deltav/markings/harpy.ftl b/Resources/Locale/en-US/_DV/markings/harpy.ftl similarity index 100% rename from Resources/Locale/en-US/deltav/markings/harpy.ftl rename to Resources/Locale/en-US/_DV/markings/harpy.ftl diff --git a/Resources/Locale/en-US/deltav/markings/moth.ftl b/Resources/Locale/en-US/_DV/markings/moth.ftl similarity index 100% rename from Resources/Locale/en-US/deltav/markings/moth.ftl rename to Resources/Locale/en-US/_DV/markings/moth.ftl diff --git a/Resources/Locale/en-US/deltav/markings/rodentia.ftl b/Resources/Locale/en-US/_DV/markings/rodentia.ftl similarity index 100% rename from Resources/Locale/en-US/deltav/markings/rodentia.ftl rename to Resources/Locale/en-US/_DV/markings/rodentia.ftl diff --git a/Resources/Locale/en-US/deltav/materials/materials.ftl b/Resources/Locale/en-US/_DV/materials/materials.ftl similarity index 100% rename from Resources/Locale/en-US/deltav/materials/materials.ftl rename to Resources/Locale/en-US/_DV/materials/materials.ftl diff --git a/Resources/Locale/en-US/deltav/materials/units.ftl b/Resources/Locale/en-US/_DV/materials/units.ftl similarity index 100% rename from Resources/Locale/en-US/deltav/materials/units.ftl rename to Resources/Locale/en-US/_DV/materials/units.ftl diff --git a/Resources/Locale/en-US/deltav/reagents/meta/consumable/food/condiments.ftl b/Resources/Locale/en-US/_DV/reagents/meta/consumable/food/condiments.ftl similarity index 100% rename from Resources/Locale/en-US/deltav/reagents/meta/consumable/food/condiments.ftl rename to Resources/Locale/en-US/_DV/reagents/meta/consumable/food/condiments.ftl diff --git a/Resources/Locale/en-US/deltav/reagents/meta/physical-desc.ftl b/Resources/Locale/en-US/_DV/reagents/meta/physical-desc.ftl similarity index 100% rename from Resources/Locale/en-US/deltav/reagents/meta/physical-desc.ftl rename to Resources/Locale/en-US/_DV/reagents/meta/physical-desc.ftl diff --git a/Resources/Locale/en-US/deltav/research/technologies.ftl b/Resources/Locale/en-US/_DV/research/technologies.ftl similarity index 100% rename from Resources/Locale/en-US/deltav/research/technologies.ftl rename to Resources/Locale/en-US/_DV/research/technologies.ftl diff --git a/Resources/Locale/en-US/deltav/roundend/no-eorg-popup.ftl b/Resources/Locale/en-US/_DV/roundend/no-eorg-popup.ftl similarity index 100% rename from Resources/Locale/en-US/deltav/roundend/no-eorg-popup.ftl rename to Resources/Locale/en-US/_DV/roundend/no-eorg-popup.ftl diff --git a/Resources/Locale/en-US/deltav/species/namepreset.ftl b/Resources/Locale/en-US/_DV/species/namepreset.ftl similarity index 100% rename from Resources/Locale/en-US/deltav/species/namepreset.ftl rename to Resources/Locale/en-US/_DV/species/namepreset.ftl diff --git a/Resources/Locale/en-US/deltav/species/species.ftl b/Resources/Locale/en-US/_DV/species/species.ftl similarity index 100% rename from Resources/Locale/en-US/deltav/species/species.ftl rename to Resources/Locale/en-US/_DV/species/species.ftl diff --git a/Resources/Locale/en-US/deltav/storage/mouth-storage-component.ftl b/Resources/Locale/en-US/_DV/storage/mouth-storage-component.ftl similarity index 100% rename from Resources/Locale/en-US/deltav/storage/mouth-storage-component.ftl rename to Resources/Locale/en-US/_DV/storage/mouth-storage-component.ftl diff --git a/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl b/Resources/Locale/en-US/_DV/store/uplink-catalog.ftl similarity index 100% rename from Resources/Locale/en-US/deltav/store/uplink-catalog.ftl rename to Resources/Locale/en-US/_DV/store/uplink-catalog.ftl diff --git a/Resources/Locale/en-US/deltav/tools/tool-qualities.ftl b/Resources/Locale/en-US/_DV/tools/tool-qualities.ftl similarity index 100% rename from Resources/Locale/en-US/deltav/tools/tool-qualities.ftl rename to Resources/Locale/en-US/_DV/tools/tool-qualities.ftl diff --git a/Resources/Locale/en-US/deltav/traits/traits.ftl b/Resources/Locale/en-US/_DV/traits/traits.ftl similarity index 100% rename from Resources/Locale/en-US/deltav/traits/traits.ftl rename to Resources/Locale/en-US/_DV/traits/traits.ftl diff --git a/Resources/Locale/en-US/deltav/weapons/ranged/energygun.ftl b/Resources/Locale/en-US/_DV/weapons/ranged/energygun.ftl similarity index 100% rename from Resources/Locale/en-US/deltav/weapons/ranged/energygun.ftl rename to Resources/Locale/en-US/_DV/weapons/ranged/energygun.ftl diff --git a/Resources/Prototypes/DeltaV/Shaders/birdvision.yml b/Resources/Prototypes/DeltaV/Shaders/birdvision.yml deleted file mode 100644 index 43dc7ae2485..00000000000 --- a/Resources/Prototypes/DeltaV/Shaders/birdvision.yml +++ /dev/null @@ -1,4 +0,0 @@ -- type: shader - id: UltraVision - kind: source - path: "/Textures/DeltaV/Shaders/ultravision.swsl" diff --git a/Resources/Prototypes/DeltaV/SoundCollections/vulpkanin.yml b/Resources/Prototypes/DeltaV/SoundCollections/vulpkanin.yml deleted file mode 100644 index 63458928cc8..00000000000 --- a/Resources/Prototypes/DeltaV/SoundCollections/vulpkanin.yml +++ /dev/null @@ -1,33 +0,0 @@ -- type: soundCollection - id: VulpkaninBarks - files: - - /Audio/DeltaV/Voice/Vulpkanin/dog_bark1.ogg - - /Audio/DeltaV/Voice/Vulpkanin/dog_bark2.ogg - - /Audio/DeltaV/Voice/Vulpkanin/dog_bark3.ogg - -- type: soundCollection - id: VulpkaninGrowls - files: - - /Audio/DeltaV/Voice/Vulpkanin/dog_growl1.ogg - - /Audio/DeltaV/Voice/Vulpkanin/dog_growl2.ogg - - /Audio/DeltaV/Voice/Vulpkanin/dog_growl3.ogg - - /Audio/DeltaV/Voice/Vulpkanin/dog_growl4.ogg - - /Audio/DeltaV/Voice/Vulpkanin/dog_growl5.ogg - - /Audio/DeltaV/Voice/Vulpkanin/dog_growl6.ogg - -- type: soundCollection - id: VulpkaninSnarls - files: - - /Audio/DeltaV/Voice/Vulpkanin/dog_snarl1.ogg - - /Audio/DeltaV/Voice/Vulpkanin/dog_snarl2.ogg - - /Audio/DeltaV/Voice/Vulpkanin/dog_snarl3.ogg - -- type: soundCollection - id: VulpkaninWhines - files: - - /Audio/DeltaV/Voice/Vulpkanin/dog_whine.ogg - -- type: soundCollection - id: VulpkaninHowls - files: - - /Audio/DeltaV/Voice/Vulpkanin/howl.ogg diff --git a/Resources/Prototypes/DeltaV/Voice/speech_sounds.yml b/Resources/Prototypes/DeltaV/Voice/speech_sounds.yml deleted file mode 100644 index 89db03d2fcc..00000000000 --- a/Resources/Prototypes/DeltaV/Voice/speech_sounds.yml +++ /dev/null @@ -1,17 +0,0 @@ -- type: speechSounds - id: Vulpkanin - saySound: - path: /Audio/DeltaV/Voice/Talk/vulp.ogg - askSound: - path: /Audio/DeltaV/Voice/Talk/vulp_ask.ogg - exclaimSound: - path: /Audio/DeltaV/Voice/Talk/vulp_exclaim.ogg - -- type: speechSounds - id: Harpy - saySound: - path: /Audio/DeltaV/Voice/Harpy/chirp1.ogg - askSound: - path: /Audio/DeltaV/Voice/Harpy/chirp1.ogg - exclaimSound: - path: /Audio/DeltaV/Voice/Harpy/chirp1.ogg diff --git a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml index 5f474088ed7..41118efeb2b 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml @@ -33,17 +33,17 @@ weightlessModifier: 1.2 - type: CanMoveInAir - type: Sprite - sprite: DeltaV/Objects/Tanks/Jetpacks/blue.rsi # DeltaV - Modified sprites to allow SUITSTORAGE use. + sprite: _DV/Objects/Tanks/Jetpacks/blue.rsi # DeltaV - Modified sprites to allow SUITSTORAGE use. state: icon - type: Item - sprite: DeltaV/Objects/Tanks/Jetpacks/blue.rsi # DeltaV - Modified sprites to allow SUITSTORAGE use. + sprite: _DV/Objects/Tanks/Jetpacks/blue.rsi # DeltaV - Modified sprites to allow SUITSTORAGE use. size: Huge - type: UserInterface interfaces: enum.SharedGasTankUiKey.Key: type: GasTankBoundUserInterface - type: Clothing - sprite: DeltaV/Objects/Tanks/Jetpacks/blue.rsi # DeltaV - Modified sprites to allow SUITSTORAGE use. + sprite: _DV/Objects/Tanks/Jetpacks/blue.rsi # DeltaV - Modified sprites to allow SUITSTORAGE use. quickEquip: false slots: - Back @@ -82,9 +82,9 @@ suffix: Empty components: - type: Sprite - sprite: DeltaV/Objects/Tanks/Jetpacks/blue.rsi # DeltaV - Modified sprites to allow SUITSTORAGE use. + sprite: _DV/Objects/Tanks/Jetpacks/blue.rsi # DeltaV - Modified sprites to allow SUITSTORAGE use. - type: Clothing - sprite: DeltaV/Objects/Tanks/Jetpacks/blue.rsi # DeltaV - Modified sprites to allow SUITSTORAGE use. + sprite: _DV/Objects/Tanks/Jetpacks/blue.rsi # DeltaV - Modified sprites to allow SUITSTORAGE use. # DeltaV modifications - Covered by modifications on parent #slots: # - Back @@ -115,11 +115,11 @@ suffix: Empty components: - type: Item - sprite: DeltaV/Objects/Tanks/Jetpacks/black.rsi # DeltaV - Modified sprites to allow SUITSTORAGE use. + sprite: _DV/Objects/Tanks/Jetpacks/black.rsi # DeltaV - Modified sprites to allow SUITSTORAGE use. - type: Sprite - sprite: DeltaV/Objects/Tanks/Jetpacks/black.rsi # DeltaV - Modified sprites to allow SUITSTORAGE use. + sprite: _DV/Objects/Tanks/Jetpacks/black.rsi # DeltaV - Modified sprites to allow SUITSTORAGE use. - type: Clothing - sprite: DeltaV/Objects/Tanks/Jetpacks/black.rsi # DeltaV - Modified sprites to allow SUITSTORAGE use. + sprite: _DV/Objects/Tanks/Jetpacks/black.rsi # DeltaV - Modified sprites to allow SUITSTORAGE use. # DeltaV modifications - Covered by modifications on parent #slots: # - Back @@ -233,11 +233,11 @@ suffix: Empty components: - type: Item - sprite: DeltaV/Objects/Tanks/Jetpacks/security.rsi # DeltaV - Modified sprites to allow SUITSTORAGE use. + sprite: _DV/Objects/Tanks/Jetpacks/security.rsi # DeltaV - Modified sprites to allow SUITSTORAGE use. - type: Sprite - sprite: DeltaV/Objects/Tanks/Jetpacks/security.rsi # DeltaV - Modified sprites to allow SUITSTORAGE use. + sprite: _DV/Objects/Tanks/Jetpacks/security.rsi # DeltaV - Modified sprites to allow SUITSTORAGE use. - type: Clothing - sprite: DeltaV/Objects/Tanks/Jetpacks/security.rsi # DeltaV - Modified sprites to allow SUITSTORAGE use. + sprite: _DV/Objects/Tanks/Jetpacks/security.rsi # DeltaV - Modified sprites to allow SUITSTORAGE use. # DeltaV modifications - Covered by modifications on parent #slots: # - Back diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/Misc/identification_cards.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/Misc/identification_cards.yml index 5b0d17ffcbb..b03575fc526 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/Misc/identification_cards.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/Misc/identification_cards.yml @@ -7,7 +7,7 @@ - type: Sprite layers: - state: default - - sprite: DeltaV/Objects/Misc/id_cards.rsi + - sprite: _DV/Objects/Misc/id_cards.rsi state: nyanomailcarrier - type: PresetIdCard job: MailCarrier @@ -20,7 +20,7 @@ - type: Sprite layers: - state: orange - - sprite: DeltaV/Objects/Misc/id_cards.rsi + - sprite: _DV/Objects/Misc/id_cards.rsi state: nyanoprisoner - type: PresetIdCard job: Prisoner @@ -46,7 +46,7 @@ - type: Sprite layers: - state: default - - sprite: DeltaV/Objects/Misc/id_cards.rsi + - sprite: _DV/Objects/Misc/id_cards.rsi state: nyanoprisonguard - type: PresetIdCard - job: PrisonGuard \ No newline at end of file + job: PrisonGuard diff --git a/Resources/Prototypes/Nyanotrasen/StatusEffects/job.yml b/Resources/Prototypes/Nyanotrasen/StatusEffects/job.yml index 19890d65895..da9ac769d34 100644 --- a/Resources/Prototypes/Nyanotrasen/StatusEffects/job.yml +++ b/Resources/Prototypes/Nyanotrasen/StatusEffects/job.yml @@ -2,7 +2,7 @@ parent: JobIcon id: JobIconPrisonGuard icon: - sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi + sprite: /Textures/_DV/Interface/Misc/job_icons.rsi state: nyanoPrisonGuard jobName: job-name-guard allowSelection: false # Frontier: don't display, no job @@ -13,4 +13,4 @@ icon: sprite: /Textures/_NF/Interface/Misc/job_icons.rsi # /Textures/DeltaV Date: Wed, 8 Jan 2025 07:33:55 +0100 Subject: [PATCH 35/41] Fix Lyrae mixer setting (#2664) --- Resources/Maps/_NF/Shuttles/lyrae.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/lyrae.yml b/Resources/Maps/_NF/Shuttles/lyrae.yml index 48b4b9fcf78..4de1788a6b1 100644 --- a/Resources/Maps/_NF/Shuttles/lyrae.yml +++ b/Resources/Maps/_NF/Shuttles/lyrae.yml @@ -2419,8 +2419,8 @@ entities: pos: 3.5,-4.5 parent: 2 - type: GasMixer - inletTwoConcentration: 0.78 - inletOneConcentration: 0.22 + inletTwoConcentration: 0.21 + inletOneConcentration: 0.79 - type: AtmosPipeColor color: '#0055CCFF' - proto: GasPassiveVent From ad5495cd62aec3145000c8990bcdfedc0983ef1d Mon Sep 17 00:00:00 2001 From: Havaren <49597412+Havaren@users.noreply.github.com> Date: Wed, 8 Jan 2025 15:39:36 +0900 Subject: [PATCH 36/41] Update station anchor sell price (#2665) * Update station_anchor.yml * Update station_anchor.yml --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- .../Prototypes/Entities/Structures/Shuttles/station_anchor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Structures/Shuttles/station_anchor.yml b/Resources/Prototypes/Entities/Structures/Shuttles/station_anchor.yml index f2c8e21dfc4..3df9fd100ac 100644 --- a/Resources/Prototypes/Entities/Structures/Shuttles/station_anchor.yml +++ b/Resources/Prototypes/Entities/Structures/Shuttles/station_anchor.yml @@ -94,7 +94,7 @@ sound: collection: MetalBreak - type: StaticPrice - price: 10000 + price: 300 # Frontier 10000<300 - type: Machine board: StationAnchorCircuitboard - type: ContainerContainer From 74472c7636e2cbf2765114875d3201eed11ef8c3 Mon Sep 17 00:00:00 2001 From: Havaren <49597412+Havaren@users.noreply.github.com> Date: Wed, 8 Jan 2025 19:13:50 +0900 Subject: [PATCH 37/41] Add flatpacker Magnet (#2666) --- .../Prototypes/Entities/Structures/Machines/flatpacker.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Entities/Structures/Machines/flatpacker.yml b/Resources/Prototypes/Entities/Structures/Machines/flatpacker.yml index 8c95b09fb6b..c0e64b263ef 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/flatpacker.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/flatpacker.yml @@ -82,6 +82,8 @@ - machine_parts - machine_board - board_slot + - type: MaterialStorageMagnetPickup # Frontier + range: 0.30 # Frontier # - type: StaticPrice # Frontier # price: 2000 From a96c0eb05fb85577274593494dfc5c1da6698a04 Mon Sep 17 00:00:00 2001 From: Alkheemist Date: Wed, 8 Jan 2025 21:14:46 +1100 Subject: [PATCH 38/41] Automatically turn off magnet when ejecting materials from lathes (#2660) Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- Content.Server/Materials/MaterialStorageSystem.cs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Content.Server/Materials/MaterialStorageSystem.cs b/Content.Server/Materials/MaterialStorageSystem.cs index 9f43a220493..e8f9ab52e63 100644 --- a/Content.Server/Materials/MaterialStorageSystem.cs +++ b/Content.Server/Materials/MaterialStorageSystem.cs @@ -3,6 +3,7 @@ using Content.Shared.Materials; using Content.Shared.Popups; using Content.Shared.Stacks; +using Content.Server.Storage.Components; // Frontier using Content.Server.Power.Components; using Content.Server.Stack; using Content.Shared.ActionBlocker; @@ -81,6 +82,14 @@ private void OnEjectMessage(EjectMaterialMessage msg, EntitySessionEventArgs arg if (volume <= 0 || !TryChangeMaterialAmount(uid, msg.Material, -volume)) return; + // Frontier + // If we made it this far, turn off the magnet before spawning materials + if (TryComp(uid, out var magnet)) + { + magnet.MagnetEnabled = false; + } + // end Frontier + var mats = SpawnMultipleFromMaterial(volume, material, Transform(uid).Coordinates, out _); foreach (var mat in mats.Where(mat => !TerminatingOrDeleted(mat))) { From e8c20dd78b6281931eb32ffdcf190cd41ecd26cc Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Wed, 8 Jan 2025 10:15:22 +0000 Subject: [PATCH 39/41] Automatic Changelog (#2660) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 387b8c83557..08b74cdc0cc 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -6282,3 +6282,9 @@ Entries: message: No longer possible to fly debris, wrecks, and salvage id: 5637 time: '2025-01-07T16:01:29.0000000+00:00' +- author: Alkheemist + changes: + - type: Tweak + message: Lathes now automatically disable their magnets when ejecting materials. + id: 5638 + time: '2025-01-08T10:14:46.0000000+00:00' From 4dd592a1ba14444b88bd268bd21e2bd79dee71b0 Mon Sep 17 00:00:00 2001 From: blackknight954 <40075385+blackknight954@users.noreply.github.com> Date: Wed, 8 Jan 2025 04:17:27 -0600 Subject: [PATCH 40/41] Gas Recycler For The Gasbender (#2659) --- .../_NF/Shuttles/Expedition/gasbender.yml | 48 ++++--------------- 1 file changed, 8 insertions(+), 40 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/Expedition/gasbender.yml b/Resources/Maps/_NF/Shuttles/Expedition/gasbender.yml index 3c3a5389532..b3f47d5bad3 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/gasbender.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/gasbender.yml @@ -1847,7 +1847,6 @@ entities: parent: 1 - type: Physics canCollide: False - bodyType: Static - type: Fixtures fixtures: {} - uid: 840 @@ -1858,7 +1857,6 @@ entities: parent: 1 - type: Physics canCollide: False - bodyType: Static - type: Fixtures fixtures: {} - proto: BenchSofaCorpLeft @@ -1869,8 +1867,6 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,9.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSofaCorpMiddle entities: - uid: 528 @@ -1879,24 +1875,18 @@ entities: rot: 3.141592653589793 rad pos: 1.5,8.5 parent: 1 - - type: Physics - bodyType: Static - uid: 539 components: - type: Transform rot: 3.141592653589793 rad pos: 0.5,8.5 parent: 1 - - type: Physics - bodyType: Static - uid: 540 components: - type: Transform rot: 3.141592653589793 rad pos: 2.5,8.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSofaCorpRight entities: - uid: 833 @@ -1905,8 +1895,6 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,9.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSofaLeft entities: - uid: 516 @@ -1915,8 +1903,6 @@ entities: rot: 3.141592653589793 rad pos: -1.5,13.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSofaRight entities: - uid: 510 @@ -1925,8 +1911,6 @@ entities: rot: 3.141592653589793 rad pos: -0.5,13.5 parent: 1 - - type: Physics - bodyType: Static - proto: BlastDoor entities: - uid: 79 @@ -3541,19 +3525,6 @@ entities: rot: -1.5707963267948966 rad pos: 0.5,-13.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: ConveyorBelt entities: - uid: 7 @@ -3969,16 +3940,6 @@ entities: rot: 1.5707963267948966 rad pos: -6.5,-10.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: GasFilterFlipped entities: - uid: 89 @@ -5234,6 +5195,13 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' +- proto: GasRecyclerMachineCircuitboard + entities: + - uid: 891 + components: + - type: Transform + pos: -2.4430587,2.3822143 + parent: 1 - proto: GasThermoMachineFreezer entities: - uid: 414 @@ -7823,7 +7791,7 @@ entities: rot: -1.5707963267948966 rad pos: -1.5,1.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 818 components: From a773b4749b165e7acae325b2b97f275bf747dde7 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Wed, 8 Jan 2025 10:17:52 +0000 Subject: [PATCH 41/41] Automatic Changelog (#2659) --- Resources/Changelog/Frontier.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 08b74cdc0cc..960b27116ff 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -6288,3 +6288,7 @@ Entries: message: Lathes now automatically disable their magnets when ejecting materials. id: 5638 time: '2025-01-08T10:14:46.0000000+00:00' +- author: blackknight954 + changes: [] + id: 5639 + time: '2025-01-08T10:17:27.0000000+00:00'