Upstream

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<string>();

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);

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<ItemSizePrototype> SizeOpened = "Normal";
 
     [ViewVariables(VVAccess.ReadWrite)][DataField("sizeClosed")]
-    public ItemSize SizeClosed = ItemSize.Normal;
+    public ProtoId<ItemSizePrototype> SizeClosed = "Normal";
 }

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

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

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

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:

Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/ears.yml

@@ -13,4 +13,4 @@
       types:
         Piercing: 15
   - type: Item
-    size: 40
+    size: Normal

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

Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/zepelli.yml

@@ -13,4 +13,4 @@
       types:
         Piercing: 15
   - type: Item
-    size: 40
+    size: Huge

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

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

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
+    price: 1000

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
+    price: 1000

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
+    price: 1000

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
+    price: 1000

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:

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:

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

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 }
+          False: { state: fire_extinguisher_open }

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
+  sponsorOnly: true

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

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

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

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

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

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