From adb3e4829aaffbe9a40671dfb62547e1b2dda01f Mon Sep 17 00:00:00 2001 From: xTray Date: Wed, 22 Nov 2023 11:53:26 +0300 Subject: [PATCH] Upstream --- .../Tests/PostMapInitTest.cs | 2 +- Content.Server/Chat/Managers/ChatManager.cs | 4 -- .../SwitchableWeaponComponent.cs | 5 +- Resources/Maps/corvax_spectrum.yml | 11 ---- .../Catalog/Fills/Boxes/halloween_suit.yml | 8 +-- .../ADT/Catalog/Fills/Boxes/underwear.yml | 2 +- .../Fills/Items/djah_rings_storage.yml | 4 +- .../ADT/Entities/Clothing/Head/Hats/ears.yml | 2 +- .../ADT/Entities/Clothing/Head/Hats/veil.yml | 4 +- .../Entities/Clothing/Head/Hats/zepelli.yml | 2 +- .../Objects/Consumable/Food/halloween.yml | 4 +- .../Objects/Weapons/Melee/folding_knife.yml | 4 +- .../KD/Entites/Clothing/gloves/RingBlood.yml | 4 +- .../Entites/Clothing/gloves/RingEmerald.yml | 4 +- .../KD/Entites/Clothing/gloves/RingPlazma.yml | 4 +- .../KD/Entites/Clothing/gloves/RingTurk.yml | 4 +- .../ADT/KD/Entites/JessusX/JessusX.yml | 2 +- .../ADT/KD/Entites/Storage/RingStorage.yml | 2 +- .../Prototypes/ADT/KD/Entites/pen/pen.yml | 2 +- .../Prototypes/ADT/KD/FireBorn/FireBorn.yml | 6 +- .../Insulgon_Items/Holographic_Monocline.yml | 4 +- .../ADT/Lixon/Kiirava_Magic_Wand.yml | 10 +-- .../ADT/Lixon/Storage_Implanter_Informant.yml | 61 ++++++++++--------- .../ADT/Lixon/Yumi_Degurshavs_tail.yml | 2 +- .../ADT/Shark/Entities/Mobs/Player/Shark.yml | 2 +- .../Prototypes/ADT/Shark/Species/Shark.yml | 2 +- .../Catalog/Cargo/cargo_vending.yml | 2 +- .../Entities/Mobs/Player/familiars.yml | 2 +- .../Entities/Mobs/Player/silicon.yml | 3 - .../Entities/Objects/Tools/jetpacks.yml | 2 +- .../Guns/AbakanRifle/burstFireRifles.yml | 2 +- .../Entities/Structures/Furniture/dresser.yml | 2 +- .../Entities/Structures/Walls/walls.yml | 3 - .../Recipes/Construction/structures.yml | 37 ----------- Resources/Prototypes/Research/industrial.yml | 19 ------ .../Interface/Misc/job_icons.rsi/meta.json | 3 + .../Robotics/borgmodule.rsi/meta.json | 5 +- .../Structures/Storage/closet.rsi/meta.json | 5 +- 38 files changed, 90 insertions(+), 156 deletions(-) diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs index 85898853926..04b07d425fd 100644 --- a/Content.IntegrationTests/Tests/PostMapInitTest.cs +++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs @@ -342,7 +342,7 @@ public async Task NonGameMapsLoadableTest() var mapFolder = new ResPath("/Maps"); var maps = resourceManager .ContentFindFiles(mapFolder) - .Where(filePath => filePath.Extension == "yml" && !filePath.Filename.StartsWith(".", StringComparison.Ordinal)) + .Where(filePath => filePath.Extension == "yml" && !filePath.Filename.StartsWith(".", StringComparison.Ordinal) && !filePath.Filename.StartsWith("corvax_", StringComparison.Ordinal)) .ToArray(); var mapNames = new List(); diff --git a/Content.Server/Chat/Managers/ChatManager.cs b/Content.Server/Chat/Managers/ChatManager.cs index 1c3e310d9ca..6788619f0cd 100644 --- a/Content.Server/Chat/Managers/ChatManager.cs +++ b/Content.Server/Chat/Managers/ChatManager.cs @@ -236,10 +236,6 @@ private void SendOOC(ICommonSession player, string message) } // Corvax-Sponsors-End - ref var key = ref CollectionsMarshal.GetValueRefOrAddDefault(SenderKeys, player, out var exists); - if (!exists) - key = SenderKeys.Count; - //TODO: player.Name color, this will need to change the structure of the MsgChatMessage ChatMessageToAll(ChatChannel.OOC, message, wrappedMessage, EntityUid.Invalid, hideChat: false, recordReplay: true, colorOverride: colorOverride, author: player.UserId); _mommiLink.SendOOCMessage(player.Name, message); diff --git a/Content.Shared/ADT/SwitchableWeapon/SwitchableWeaponComponent.cs b/Content.Shared/ADT/SwitchableWeapon/SwitchableWeaponComponent.cs index 7dad6b767f0..c4020bcd5a0 100644 --- a/Content.Shared/ADT/SwitchableWeapon/SwitchableWeaponComponent.cs +++ b/Content.Shared/ADT/SwitchableWeapon/SwitchableWeaponComponent.cs @@ -2,6 +2,7 @@ using Content.Shared.Damage; using Content.Shared.Item; using Robust.Shared.Audio; +using Robust.Shared.Prototypes; namespace Content.Shared.ADT.SwitchableWeapon; @@ -43,8 +44,8 @@ public sealed partial class SwitchableWeaponComponent : Component public SoundSpecifier? BonkSound; [ViewVariables(VVAccess.ReadWrite)][DataField("sizeOpened")] - public ItemSize SizeOpened = ItemSize.Normal; + public ProtoId SizeOpened = "Normal"; [ViewVariables(VVAccess.ReadWrite)][DataField("sizeClosed")] - public ItemSize SizeClosed = ItemSize.Normal; + public ProtoId SizeClosed = "Normal"; } diff --git a/Resources/Maps/corvax_spectrum.yml b/Resources/Maps/corvax_spectrum.yml index b5462f1ff5a..1ee8f0b6e67 100644 --- a/Resources/Maps/corvax_spectrum.yml +++ b/Resources/Maps/corvax_spectrum.yml @@ -165832,17 +165832,6 @@ entities: - pos: -7.5,33.5 parent: 2 type: Transform -- proto: GatewayDestination - entities: - - uid: 39498 - components: - - pos: 5.5,-8.5 - parent: 36907 - type: Transform - - openTime: 1800 - name: C&1R_Lava3FS - enabled: True - type: GatewayDestination - proto: Gauze entities: - uid: 10343 diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Boxes/halloween_suit.yml b/Resources/Prototypes/ADT/Catalog/Fills/Boxes/halloween_suit.yml index 33142ca0d5e..b5ea2eeff30 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Boxes/halloween_suit.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Boxes/halloween_suit.yml @@ -11,9 +11,9 @@ #layers: #- state: pennywise - type: Item - size: 100 + size: Ginormous - type: Storage - maxItemSize: Size100 + maxItemSize: Ginormous maxTotalWeight: 0 maxSlots: 50 #By this ignore maxTotalWeight - type: ContainerContainer @@ -129,7 +129,7 @@ #- state: base #- state: jecket - type: Item - size: 125 + size: Ginormous - type: Storage maxItemSize: Ginormous - type: StorageFill @@ -209,7 +209,7 @@ #- state: base #- state: postal2 - type: Item - size: 125 + size: Ginormous - type: Storage maxItemSize: Ginormous - type: StorageFill diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Boxes/underwear.yml b/Resources/Prototypes/ADT/Catalog/Fills/Boxes/underwear.yml index 7745d740779..fb9be6559fd 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Boxes/underwear.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Boxes/underwear.yml @@ -9,7 +9,7 @@ state: box - type: Item sprite: ADT/Objects/Storage/underwear_boxes.rsi - size: 10 + size: Normal - type: Storage maxItemSize: Normal - type: StorageFill diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Items/djah_rings_storage.yml b/Resources/Prototypes/ADT/Catalog/Fills/Items/djah_rings_storage.yml index 7fa38c2416c..d302a8d6015 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Items/djah_rings_storage.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Items/djah_rings_storage.yml @@ -13,10 +13,10 @@ - state: box-open map: ["openLayer"] - type: Storage - maxItemSize: Normal + maxItemSize: Small - type: Item sprite: ADT/KD/RingBox.rsi - size: 4 + size: Small heldPrefix: box - type: StorageFill contents: diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/ears.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/ears.yml index e1fbc231207..41453475718 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/ears.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/ears.yml @@ -13,4 +13,4 @@ types: Piercing: 15 - type: Item - size: 40 + size: Normal diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/veil.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/veil.yml index 6cf3d1b8844..e2ead49e74b 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/veil.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/veil.yml @@ -13,7 +13,7 @@ types: Piercing: 15 - type: Item - size: 5 + size: Tiny - type: entity parent: ClothingHeadBase @@ -30,4 +30,4 @@ types: Piercing: 15 - type: Item - size: 5 + size: Small diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/zepelli.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/zepelli.yml index d3a0e253f77..6091ab1fa38 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/zepelli.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/zepelli.yml @@ -13,4 +13,4 @@ types: Piercing: 15 - type: Item - size: 40 + size: Huge diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/halloween.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/halloween.yml index 9eb58798e54..85c721c7b4e 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/halloween.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/halloween.yml @@ -5,7 +5,7 @@ description: Round orange object that you can slice and eat. components: - type: Item - size: 10 + size: Normal - type: FlavorProfile flavors: - adt_pumpkin @@ -65,7 +65,7 @@ description: Juicy orange slice. components: - type: Item - size: 2 + size: Tiny - type: FlavorProfile flavors: - adt_pumpkin diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/folding_knife.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/folding_knife.yml index 2a42a55be17..dbc04866000 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/folding_knife.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/folding_knife.yml @@ -21,8 +21,8 @@ Blunt: 0 staminaDamageFolded: 0 staminaDamageOpen: 0 - sizeOpened: 10 - sizeClosed: 5 + sizeOpened: Normal + sizeClosed: Small - type: StaminaDamageOnHit damage: 0 - type: MeleeWeapon diff --git a/Resources/Prototypes/ADT/KD/Entites/Clothing/gloves/RingBlood.yml b/Resources/Prototypes/ADT/KD/Entites/Clothing/gloves/RingBlood.yml index 9ea368b12bb..9619d3f10e4 100644 --- a/Resources/Prototypes/ADT/KD/Entites/Clothing/gloves/RingBlood.yml +++ b/Resources/Prototypes/ADT/KD/Entites/Clothing/gloves/RingBlood.yml @@ -9,6 +9,6 @@ - type: Clothing sprite: ADT/KD/RingBlood.rsi - type: Item - size: 1 + size: Tiny - type: StaticPrice - price: 1000 \ No newline at end of file + price: 1000 diff --git a/Resources/Prototypes/ADT/KD/Entites/Clothing/gloves/RingEmerald.yml b/Resources/Prototypes/ADT/KD/Entites/Clothing/gloves/RingEmerald.yml index e48ce75f26a..7205443e852 100644 --- a/Resources/Prototypes/ADT/KD/Entites/Clothing/gloves/RingEmerald.yml +++ b/Resources/Prototypes/ADT/KD/Entites/Clothing/gloves/RingEmerald.yml @@ -9,6 +9,6 @@ - type: Clothing sprite: ADT/KD/RingEmerald.rsi - type: Item - size: 1 + size: Tiny - type: StaticPrice - price: 1000 \ No newline at end of file + price: 1000 diff --git a/Resources/Prototypes/ADT/KD/Entites/Clothing/gloves/RingPlazma.yml b/Resources/Prototypes/ADT/KD/Entites/Clothing/gloves/RingPlazma.yml index 85ba3b2b00c..7691c6b0573 100644 --- a/Resources/Prototypes/ADT/KD/Entites/Clothing/gloves/RingPlazma.yml +++ b/Resources/Prototypes/ADT/KD/Entites/Clothing/gloves/RingPlazma.yml @@ -9,6 +9,6 @@ - type: Clothing sprite: ADT/KD/RingPlazma.rsi - type: Item - size: 1 + size: Tiny - type: StaticPrice - price: 1000 \ No newline at end of file + price: 1000 diff --git a/Resources/Prototypes/ADT/KD/Entites/Clothing/gloves/RingTurk.yml b/Resources/Prototypes/ADT/KD/Entites/Clothing/gloves/RingTurk.yml index e4e7708fcfe..e5afe34a818 100644 --- a/Resources/Prototypes/ADT/KD/Entites/Clothing/gloves/RingTurk.yml +++ b/Resources/Prototypes/ADT/KD/Entites/Clothing/gloves/RingTurk.yml @@ -9,6 +9,6 @@ - type: Clothing sprite: ADT/KD/RingTurk.rsi - type: Item - size: 1 + size: Tiny - type: StaticPrice - price: 1000 \ No newline at end of file + price: 1000 diff --git a/Resources/Prototypes/ADT/KD/Entites/JessusX/JessusX.yml b/Resources/Prototypes/ADT/KD/Entites/JessusX/JessusX.yml index 3822792a018..c58c676b591 100644 --- a/Resources/Prototypes/ADT/KD/Entites/JessusX/JessusX.yml +++ b/Resources/Prototypes/ADT/KD/Entites/JessusX/JessusX.yml @@ -35,7 +35,7 @@ sprite: ADT/KD/JessusX.rsi state: icon - type: Item - size: 5 + size: Small sprite: ADT/KD/JessusX.rsi - type: Clothing slots: diff --git a/Resources/Prototypes/ADT/KD/Entites/Storage/RingStorage.yml b/Resources/Prototypes/ADT/KD/Entites/Storage/RingStorage.yml index 6e0967b9600..a4b3ed4b4f6 100644 --- a/Resources/Prototypes/ADT/KD/Entites/Storage/RingStorage.yml +++ b/Resources/Prototypes/ADT/KD/Entites/Storage/RingStorage.yml @@ -16,7 +16,7 @@ maxItemSize: Small - type: Item sprite: ADT/KD/RingBox.rsi - size: 4 + size: Small heldPrefix: box - type: StorageFill contents: diff --git a/Resources/Prototypes/ADT/KD/Entites/pen/pen.yml b/Resources/Prototypes/ADT/KD/Entites/pen/pen.yml index b62dbaf415a..04ee55247fc 100644 --- a/Resources/Prototypes/ADT/KD/Entites/pen/pen.yml +++ b/Resources/Prototypes/ADT/KD/Entites/pen/pen.yml @@ -13,4 +13,4 @@ - type: Item sprite: ADT/KD/pen.rsi heldPrefix: pen - size: 2 + size: Tiny diff --git a/Resources/Prototypes/ADT/KD/FireBorn/FireBorn.yml b/Resources/Prototypes/ADT/KD/FireBorn/FireBorn.yml index b21f15788da..88f0b50133e 100644 --- a/Resources/Prototypes/ADT/KD/FireBorn/FireBorn.yml +++ b/Resources/Prototypes/ADT/KD/FireBorn/FireBorn.yml @@ -12,7 +12,7 @@ map: [ "enabled" ] - type: Item sprite: ADT/KD/fireborn.rsi - size: 15 + size: Normal - type: SolutionContainerManager solutions: spray: @@ -21,7 +21,7 @@ - ReagentId: Phlogiston Quantity: 100 - ReagentId: Napalm - Quantity: 900 + Quantity: 900 - type: RefillableSolution solution: spray - type: DrainableSolution @@ -45,4 +45,4 @@ enum.FireExtinguisherVisuals.Safety: enabled: True: { state: fire_extinguisher_closed } - False: { state: fire_extinguisher_open } \ No newline at end of file + False: { state: fire_extinguisher_open } diff --git a/Resources/Prototypes/ADT/Lixon/Insulgon_Items/Holographic_Monocline.yml b/Resources/Prototypes/ADT/Lixon/Insulgon_Items/Holographic_Monocline.yml index e181416e66f..879fd118f56 100644 --- a/Resources/Prototypes/ADT/Lixon/Insulgon_Items/Holographic_Monocline.yml +++ b/Resources/Prototypes/ADT/Lixon/Insulgon_Items/Holographic_Monocline.yml @@ -16,7 +16,7 @@ Piercing: 5 Radiation: 10 - type: Item - size: 15 + size: Normal sprite: ADT/Objects/Weapons/Melee/holographic-monocline.rsi - type: Tool qualities: @@ -27,4 +27,4 @@ - type: loadout id: ADTHolographicMonoclineInsulgonLoadout entity: ADTHolographicMonoclineL - sponsorOnly: true \ No newline at end of file + sponsorOnly: true diff --git a/Resources/Prototypes/ADT/Lixon/Kiirava_Magic_Wand.yml b/Resources/Prototypes/ADT/Lixon/Kiirava_Magic_Wand.yml index 012164c214e..e475a5525bf 100644 --- a/Resources/Prototypes/ADT/Lixon/Kiirava_Magic_Wand.yml +++ b/Resources/Prototypes/ADT/Lixon/Kiirava_Magic_Wand.yml @@ -8,12 +8,12 @@ sprite: ADT/Objects/Weapons/Guns/kiiravamagicwand.rsi layers: - state: icon - map: ["enum.GunVisualLayers.Base"] + map: ["enum.GunVisualLayers.Base"] - type: Item - size: 1 + size: Tiny sprite: ADT/Objects/Weapons/Guns/kiiravamagicwand.rsi - type: Gun - fireRate: 1 + fireRate: 1 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/Magic/staff_healing.ogg - type: BallisticAmmoProvider @@ -28,7 +28,7 @@ containers: ballistic-ammo: !type:Container ents: [] - + - type: entity id: ADTCartridgeWand name: cartridge (.10 rifle) @@ -47,4 +47,4 @@ - type: Projectile damage: types: - Slash: 50 + Slash: 50 diff --git a/Resources/Prototypes/ADT/Lixon/Storage_Implanter_Informant.yml b/Resources/Prototypes/ADT/Lixon/Storage_Implanter_Informant.yml index db4573c3f14..c5f27a6bc81 100644 --- a/Resources/Prototypes/ADT/Lixon/Storage_Implanter_Informant.yml +++ b/Resources/Prototypes/ADT/Lixon/Storage_Implanter_Informant.yml @@ -1,31 +1,32 @@ -- type: entity - id: ADTStorageImplanterInformant - name: storage implanter informant - description: a single use implanter, the implant grants hidden storage - parent: BaseImplantOnlyImplanter - components: - - type: Implanter - implant: ADTStorageImplant +#- type: entity +# id: ADTStorageImplanterInformant +# name: storage implanter informant +# description: a single use implanter, the implant grants hidden storage +# parent: BaseImplantOnlyImplanter +# components: +# - type: Implanter +# implant: ADTStorageImplant -- type: entity - parent: BaseSubdermalImplant - id: ADTStorageImplant - name: storage implant - description: made with bluespace technology, allows the user to fit a few items in hidden storage - noSpawn: true - components: - #TODO xTray нет протатипа OpenStorageImplant - #- type: SubdermalImplant - # implantAction: OpenStorageImplant - - type: Item - size: 9999 - - type: Storage - maxItemSize: Ginormous #10-20 should be more than enough for this - - type: ContainerContainer - containers: - storagebase: !type:Container - ents: [ ] - - type: UserInterface - interfaces: - - key: enum.StorageUiKey.Key - type: StorageBoundUserInterface +#TODO: Не спрайта +#- type: entity +# parent: BaseSubdermalImplant +# id: ADTStorageImplant +# name: storage implant +# description: made with bluespace technology, allows the user to fit a few items in hidden storage +# noSpawn: true +# components: +# #TODO xTray нет протатипа OpenStorageImplant +# #- type: SubdermalImplant +# # implantAction: OpenStorageImplant +# - type: Item +# size: Ginormous +# - type: Storage +# maxItemSize: Ginormous #10-20 should be more than enough for this +# - type: ContainerContainer +# containers: +# storagebase: !type:Container +# ents: [ ] +# - type: UserInterface +# interfaces: +# - key: enum.StorageUiKey.Key +# type: StorageBoundUserInterface diff --git a/Resources/Prototypes/ADT/Lixon/Yumi_Degurshavs_tail.yml b/Resources/Prototypes/ADT/Lixon/Yumi_Degurshavs_tail.yml index fe586c2b79b..c43baa497bc 100644 --- a/Resources/Prototypes/ADT/Lixon/Yumi_Degurshavs_tail.yml +++ b/Resources/Prototypes/ADT/Lixon/Yumi_Degurshavs_tail.yml @@ -10,7 +10,7 @@ - state: icon map: ["enum.GunVisualLayers.Base"] - type: Item - size: 1 + size: Tiny sprite: ADT/Objects/Weapons/Guns/HMGs/yumidegurshavstail.rsi - type: Gun fireRate: 30 diff --git a/Resources/Prototypes/ADT/Shark/Entities/Mobs/Player/Shark.yml b/Resources/Prototypes/ADT/Shark/Entities/Mobs/Player/Shark.yml index 993c6a7d437..d855affe97f 100644 --- a/Resources/Prototypes/ADT/Shark/Entities/Mobs/Player/Shark.yml +++ b/Resources/Prototypes/ADT/Shark/Entities/Mobs/Player/Shark.yml @@ -2,7 +2,7 @@ save: false name: "Плафеим" parent: BaseMobShark - id: MobShark + id: ADTMobShark components: - type: CombatMode - type: InteractionPopup diff --git a/Resources/Prototypes/ADT/Shark/Species/Shark.yml b/Resources/Prototypes/ADT/Shark/Species/Shark.yml index e71b1880e77..aa06363a6fd 100644 --- a/Resources/Prototypes/ADT/Shark/Species/Shark.yml +++ b/Resources/Prototypes/ADT/Shark/Species/Shark.yml @@ -2,7 +2,7 @@ id: SharkSpecies name: species-name-Shark roundStart: true #can player role - prototype: MobShark + prototype: ADTMobShark sprites: MobSharkSprites markingLimits: MobSharkMarkingLimits dollPrototype: MobSharkDummy diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index c6daac1f484..93587eea70e 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -164,7 +164,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockSeedsFilled - cost: 3350 + cost: 3500 category: Hydroponics group: market diff --git a/Resources/Prototypes/Entities/Mobs/Player/familiars.yml b/Resources/Prototypes/Entities/Mobs/Player/familiars.yml index dc84c043366..9406fc586dc 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/familiars.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/familiars.yml @@ -27,7 +27,7 @@ tags: - Chapel - type: Item - size: 5 + size: Small - type: MindContainer showExamineInfo: true - type: NpcFactionMember diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml index 37f09e0764b..b782ff66e76 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml @@ -351,9 +351,7 @@ borg_brain: - MMIFilled borg_module: - - BorgModuleLightReplacer - BorgModuleCleaning - - BorgModuleTrashCollection - type: ItemSlots slots: cell_slot: @@ -389,7 +387,6 @@ borg_brain: - MMIFilled borg_module: - - BorgModuleLiteracy - BorgModuleMusique - BorgModuleGardening - BorgModuleHarvesting diff --git a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml index 713274ada4e..341f1afd524 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml @@ -255,7 +255,7 @@ components: - type: Item sprite: Objects/Tanks/Jetpacks/void.rsi - size: 20 + size: Normal - type: Sprite sprite: Objects/Tanks/Jetpacks/void.rsi - type: Clothing diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/AbakanRifle/burstFireRifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/AbakanRifle/burstFireRifles.yml index 26d57f9b15c..3600059a4a8 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/AbakanRifle/burstFireRifles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/AbakanRifle/burstFireRifles.yml @@ -8,7 +8,7 @@ components: - type: Sprite - type: Item - size: 50 + size: Ginormous - type: Clothing sprite: Objects/Weapons/Guns/BurstRifles/abakan.rsi quickEquip: false diff --git a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml index a14c06f1392..ffc39e2f2b6 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml @@ -46,7 +46,7 @@ suffix: Filled components: - type: Storage - maxItemSize: Cheat + maxItemSize: Ginormous maxTotalWeight: 0 maxSlots: 50 #By this ignore maxTotalWeight - type: StorageFill diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml index eb7622f14ac..37c2b27f89d 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml @@ -774,9 +774,6 @@ - type: IconSmooth key: walls base: state - - type: Construction - graph: Girder - node: shuttleWall - type: Reflect reflectProb: 1 diff --git a/Resources/Prototypes/Recipes/Construction/structures.yml b/Resources/Prototypes/Recipes/Construction/structures.yml index fe2a39184f9..a3a21a912fe 100644 --- a/Resources/Prototypes/Recipes/Construction/structures.yml +++ b/Resources/Prototypes/Recipes/Construction/structures.yml @@ -436,25 +436,6 @@ canRotate: false - type: construction - name: shuttle window - id: ShuttleWindow - graph: Window - startNode: start - targetNode: shuttleWindow - category: construction-category-structures - canBuildInImpassable: true - description: Extra sturdy to resist the pressure of FTL or sustain damage from munitions. - conditions: - - !type:EmptyOrWindowValidInTile - - !type:NoWindowsInTile - icon: - sprite: Structures/Windows/shuttle_window.rsi - state: full - objectType: Structure - placementMode: SnapgridCenter - canRotate: false - -- type: construction name: diagonal plasma window id: PlasmaWindowDiagonal graph: WindowDiagonal @@ -1279,24 +1260,6 @@ conditions: - !type:TileNotBlocked -- type: construction - name: shuttle wall - id: ShuttleWall - graph: Girder - startNode: start - targetNode: shuttleWall - category: construction-category-structures - description: Keeps the air in and the greytide out. - icon: - sprite: Structures/Walls/shuttle.rsi - state: full - objectType: Structure - placementMode: SnapgridCenter - canRotate: false - canBuildInImpassable: false - conditions: - - !type:TileNotBlocked - - type: construction name: shuttle window id: ShuttleWindow diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml index a39f412ba2d..f1aef40a1ef 100644 --- a/Resources/Prototypes/Research/industrial.yml +++ b/Resources/Prototypes/Research/industrial.yml @@ -88,25 +88,6 @@ - ThermomachineFreezerMachineCircuitBoard - GasRecyclerMachineCircuitboard -- type: technology - id: RipleyAPLU - name: research-technology-ripley-aplu - icon: - sprite: Objects/Specific/Mech/mecha.rsi - state: ripley - discipline: Industrial - tier: 1 - cost: 7500 - recipeUnlocks: - - RipleyHarness - - RipleyLArm - - RipleyRArm - - RipleyLLeg - - RipleyRLeg - - RipleyCentralElectronics - - RipleyPeripheralsElectronics - - MechEquipmentGrabber - # Tier 2 - type: technology diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json index 5bfce83da38..fe4719edcd8 100644 --- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json @@ -183,6 +183,9 @@ }, { "name": "HeadRevolutionary" + }, + { + "name": "Syndicate" } ] } diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json index 20b8e18b9ef..495091ef55c 100644 --- a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json @@ -117,6 +117,9 @@ }, { "name": "syndicate" - } + }, + { + "name": "icon-pda" + } ] } diff --git a/Resources/Textures/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/Structures/Storage/closet.rsi/meta.json index 3f2a1ae2444..4dd79352475 100644 --- a/Resources/Textures/Structures/Storage/closet.rsi/meta.json +++ b/Resources/Textures/Structures/Storage/closet.rsi/meta.json @@ -534,6 +534,9 @@ }, { "name": "representative_door" - } + }, + { + "name": "brigmedlocked" + } ] }