rotate more items in inventory part 3 + cleanup for good (#41149)

* rotate more items in inventory part 3 + cleanup for good

* i forgor

diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index c2b1c5abbde2bdf8152ae102810377c21faed3e9..431c2978b1bdc6370140825953871ac1d55aaa2c 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -563,6 +563,8 @@
     - state: icon-nobeard
       map: [ "foldedLayer" ]
       visible: true
+  - type: Item
+    storedRotation: 0
   - type: Tag
     tags:
     - PetWearable
@@ -1227,6 +1229,8 @@
     sprite: Clothing/Head/Hats/party_red.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/party_red.rsi
+  - type: Item
+    storedRotation: 0
   - type: Tag
     tags:
     - PetWearable
@@ -1243,12 +1247,6 @@
     sprite: Clothing/Head/Hats/party_yellow.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/party_yellow.rsi
-  - type: Tag
-    tags:
-    - PetWearable
-    - CorgiWearable
-    - WhitelistChameleon
-    - HamsterWearable
 
 - type: entity
   parent: ClothingHeadHatPartyRed
@@ -1259,12 +1257,6 @@
     sprite: Clothing/Head/Hats/party_green.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/party_green.rsi
-  - type: Tag
-    tags:
-    - PetWearable
-    - CorgiWearable
-    - WhitelistChameleon
-    - HamsterWearable
 
 - type: entity
   parent: ClothingHeadHatPartyRed
@@ -1275,12 +1267,6 @@
     sprite: Clothing/Head/Hats/party_blue.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/party_blue.rsi
-  - type: Tag
-    tags:
-    - PetWearable
-    - CorgiWearable
-    - WhitelistChameleon
-    - HamsterWearable
 
 - type: entity
   parent: ClothingHeadHatPartyRed

diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
index 539fa90ea466be526739bf1915bbb9cd5c63a782..574e76d9ba17e82571877199f2286508ab02fb20 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
@@ -221,6 +221,8 @@
     sprite: Clothing/Head/Helmets/templar.rsi
   - type: Clothing
     sprite: Clothing/Head/Helmets/templar.rsi
+  - type: Item
+    storedRotation: 0
   - type: IngestionBlocker
   - type: IdentityBlocker
   - type: HideLayerClothing

diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml
index 511f1e198034ec0b4a90beaebdb95bc249edcb54..332efb731be37bd7e569fa2e8a2bf7dbe9595fd9 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml
@@ -121,6 +121,8 @@
     sprite: Clothing/Head/Misc/richard.rsi
   - type: Clothing
     sprite: Clothing/Head/Misc/richard.rsi
+  - type: Item
+    storedRotation: 0
   - type: IngestionBlocker
   - type: IdentityBlocker
   - type: HideLayerClothing

diff --git a/Resources/Prototypes/Entities/Clothing/Neck/stoles.yml b/Resources/Prototypes/Entities/Clothing/Neck/stoles.yml
index aab8eb30ca45faf73fc922a8c404cb7dc00f6101..d708a48f7dd2cb39affe2ddd13419ee331e655be 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Neck/stoles.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/stoles.yml
@@ -8,3 +8,5 @@
     sprite: Clothing/Neck/Stoles/chaplain.rsi
   - type: Clothing
     sprite: Clothing/Neck/Stoles/chaplain.rsi
+  - type: Item
+    storedRotation: 90

diff --git a/Resources/Prototypes/Entities/Clothing/Neck/ties.yml b/Resources/Prototypes/Entities/Clothing/Neck/ties.yml
index bf1772dc81231bfe1026ad8ddeb63e4d9a629d75..2e172ae285fd2b7739124ef3b0172da24c3f277f 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Neck/ties.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/ties.yml
@@ -1,5 +1,13 @@
 - type: entity
   parent: ClothingNeckBase
+  id: ClothingNeckTieBase
+  abstract: true
+  components:
+  - type: Item
+    storedRotation: -45
+
+- type: entity
+  parent: ClothingNeckTieBase
   id: ClothingNeckTieRed
   name: red-tie
   description: A neosilk clip-on red tie.
@@ -16,7 +24,7 @@
     - Recyclable
 
 - type: entity
-  parent: ClothingNeckBase
+  parent: ClothingNeckTieBase
   id: ClothingNeckTieDet
   name: detective's tie
   description: A loosely tied necktie, a perfect accessory for the over-worked detective.
@@ -27,7 +35,7 @@
     sprite: Clothing/Neck/Ties/dettie.rsi
     
 - type: entity
-  parent: ClothingNeckBase
+  parent: ClothingNeckTieBase
   id: ClothingNeckTieSci
   name: scientist's tie
   description: Why do we all have to wear these ridiculous ties?

diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/igniter.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/igniter.yml
index 87bef747d8eb054254363ae29556ae25f60705cb..0d8f57edeaccca9865010627d13e6287b289a0ee 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/igniter.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/igniter.yml
@@ -7,6 +7,8 @@
   - type: Sprite
     sprite: Objects/Devices/igniter.rsi
     state: icon
+  - type: Item
+    storedRotation: -90
   - type: IgnitionSource
     temperature: 800
   - type: IgniteOnTrigger

diff --git a/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml b/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml
index 494bda50d16b30338a3dea972e056e5a10e0ebec..93f012ce57dd6ce9469fb0618b60105b70604b87 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml
@@ -1,11 +1,20 @@
 - type: entity
   parent: BaseItem
+  id: BasePDACartridge
+  abstract: true
+  components:
+  - type: Item
+    storedRotation: -90
+  - type: Sprite
+    sprite: Objects/Devices/cartridge.rsi
+
+- type: entity
+  parent: BasePDACartridge
   id: NotekeeperCartridge
   name: notekeeper cartridge
   description: A program for keeping notes.
   components:
   - type: Sprite
-    sprite: Objects/Devices/cartridge.rsi
     state: cart-y
   - type: UIFragment
     ui: !type:NotekeeperUi
@@ -16,15 +25,13 @@
       state: book_icon
   - type: NotekeeperCartridge
 
-
 - type: entity
-  parent: BaseItem
+  parent: BasePDACartridge
   id: NanoTaskCartridge
   name: NanoTask cartridge
   description: A program that allows you to keep a list of tasks to do.
   components:
   - type: Sprite
-    sprite: Objects/Devices/cartridge.rsi
     state: cart-nav
   - type: Cartridge
     programName: nano-task-program-name
@@ -36,13 +43,12 @@
   - type: NanoTaskCartridge
 
 - type: entity
-  parent: BaseItem
+  parent: BasePDACartridge
   id: NewsReaderCartridge
   name: news cartridge
   description: A program for reading news.
   components:
   - type: Sprite
-    sprite: Objects/Devices/cartridge.rsi
     state: cart-y
   - type: UIFragment
     ui: !type:NewsReaderUi
@@ -54,13 +60,12 @@
   - type: NewsReaderCartridge
 
 - type: entity
-  parent: BaseItem
+  parent: BasePDACartridge
   id: CrewManifestCartridge
   name: crew manifest cartridge
   description: A program for listing your fellow crewmembers.
   components:
     - type: Sprite
-      sprite: Objects/Devices/cartridge.rsi
       state: cart-y
     - type: UIFragment
       ui: !type:CrewManifestUi
@@ -72,13 +77,12 @@
     - type: CrewManifestCartridge
 
 - type: entity
-  parent: BaseItem
+  parent: BasePDACartridge
   id: NetProbeCartridge
   name: NetProbe cartridge
   description: A program for getting the address and frequency of network devices.
   components:
     - type: Sprite
-      sprite: Objects/Devices/cartridge.rsi
       state: cart-y
     - type: UIFragment
       ui: !type:NetProbeUi
@@ -90,13 +94,12 @@
     - type: NetProbeCartridge
 
 - type: entity
-  parent: BaseItem
+  parent: BasePDACartridge
   id: LogProbeCartridge
   name: LogProbe cartridge
   description: A program for getting access logs from devices.
   components:
     - type: Sprite
-      sprite: Objects/Devices/cartridge.rsi
       state: cart-log
     - type: Icon
       sprite: Objects/Devices/cartridge.rsi
@@ -114,13 +117,12 @@
       - Forensics
 
 - type: entity
-  parent: BaseItem
+  parent: BasePDACartridge
   id: WantedListCartridge
   name: Wanted list cartridge
   description: A program to get a list of wanted persons.
   components:
   - type: Sprite
-    sprite: Objects/Devices/cartridge.rsi
     state: cart-sec
   - type: Icon
     sprite: Objects/Devices/cartridge.rsi
@@ -137,13 +139,12 @@
     stealGroup: WantedListCartridge
 
 - type: entity
-  parent: BaseItem
+  parent: BasePDACartridge
   id: MedTekCartridge
   name: MedTek cartridge
   description: A program that provides medical diagnostic tools.
   components:
     - type: Sprite
-      sprite: Objects/Devices/cartridge.rsi
       state: cart-med
     - type: Icon
       sprite: Objects/Devices/cartridge.rsi
@@ -156,13 +157,12 @@
     - type: MedTekCartridge
 
 - type: entity
-  parent: BaseItem
+  parent: BasePDACartridge
   id: AstroNavCartridge
   name: AstroNav cartridge
   description: A program for navigation that provides GPS coordinates.
   components:
     - type: Sprite
-      sprite: Objects/Devices/cartridge.rsi
       state: cart-nav
     - type: Icon
       sprite: Objects/Devices/cartridge.rsi

diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
index c6ba706d0613da721834758ad08e09246636254d..9d63aa0c69b88ae6a39a7a8bfb23a40a4efaf0e4 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
@@ -57,6 +57,7 @@
     program: 124
   - type: Item
     size: Small
+    storedRotation: -90
   - type: Prayable
     sentMessage: prayer-popup-notify-centcom-sent
     notificationPrefix: prayer-chat-notify-centcom

diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml
index e073f40942ed0e077d1787e213882b085b0dc3a9..adff2cf0141779137870e294ae2e7bb8d7994c8f 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml
@@ -61,6 +61,7 @@
     sprite: Objects/Fun/Instruments/microphone.rsi
   - type: Item
     size: Small
+    storedRotation: -45
 
 - type: entity
   parent: BasePercussionInstrument

diff --git a/Resources/Prototypes/Entities/Objects/Misc/brb_sign.yml b/Resources/Prototypes/Entities/Objects/Misc/brb_sign.yml
index 845130d3324b76ab91a7330ad74f24a87209cdcc..8e7943ce47e73dcb675dd1461b3aca5096e16911 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Misc/brb_sign.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/brb_sign.yml
@@ -12,3 +12,5 @@
     quickEquip: false
     slots:
     - Neck
+  - type: Item
+    storedRotation: -90

diff --git a/Resources/Prototypes/Entities/Objects/Misc/improvised_gun_parts.yml b/Resources/Prototypes/Entities/Objects/Misc/improvised_gun_parts.yml
index abf4e0974a6264680a51d985dd741196d4df8639..12c6e1f4fe2aa88b7edf57edc3055d218511d0dc 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Misc/improvised_gun_parts.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/improvised_gun_parts.yml
@@ -6,8 +6,9 @@
   name: modular receiver
   description: A vital part used in the creation of firearms. #Could use a better description, but I'm not a gun nut so I can't really do that.
   components:
-#    - type: Item
-#      size: Normal
+    - type: Item
+      storedRotation: -90
+      # size: Normal
     - type: Sprite
       sprite: Objects/Misc/modular_receiver.rsi
       state: icon
@@ -22,8 +23,9 @@
   name: rifle stock
   description: A robust wooden stock, used in the creation of firearms. #Same as above
   components:
-#    - type: Item
-#      size: Normal
+    - type: Item
+      storedRotation: -90
+      # size: Normal
     - type: Sprite
       sprite: Objects/Misc/rifle_stock.rsi
       state: icon

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
index d152bb908e93726589b5271db746af45bde57a28..e37c1a881671edeac4eadcb118018f9aaaa19fda 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
@@ -19,6 +19,7 @@
         Slash: 6
   - type: Item
     sprite: Objects/Tools/Hydroponics/hoe.rsi
+    storedRotation: -135
   - type: PhysicalComposition
     materialComposition:
       Steel: 100
@@ -97,6 +98,7 @@
         Piercing: 2
   - type: Item
     sprite: Objects/Tools/Hydroponics/hatchet.rsi
+    storedRotation: -135
   - type: PhysicalComposition
     materialComposition:
       Steel: 100
@@ -123,6 +125,7 @@
       collection: MetalThud
   - type: Item
     sprite: Objects/Tools/Hydroponics/spade.rsi
+    storedRotation: -45
   - type: Shovel
     speedModifier: 0.75 # slower at digging than a full-sized shovel
   - type: PhysicalComposition

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
index a4280f6a50ffdc75291c3361a30674f3c5e3e2b4..5aba5b7918ffbe6db940826c2792d496b709de16 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -37,6 +37,7 @@
   - type: Item
     size: Large
     sprite: Objects/Specific/Janitorial/mop.rsi
+    storedRotation: 45
   - type: Absorbent
     useAbsorberSolution: true
   - type: SolutionContainerManager
@@ -58,7 +59,7 @@
   - type: DnaSubstanceTrace
 
 - type: entity
-  parent: BaseItem
+  parent: MopItem
   name: advanced mop
   id: AdvMopItem
   description: Motorized mop that has a bigger reservoir and quickly replaces reagents inside with water. Automatic Clown Countermeasure not included.
@@ -70,37 +71,12 @@
       - map: ["enum.SolutionContainerLayers.Fill"]
         state: fill-2
         visible: false
-    - type: Appearance
     - type: SolutionContainerVisuals
       maxFillLevels: 2
-      fillBaseName: fill-
-      inHandsFillBaseName: -fill-
-      inHandsMaxFillLevels: 2
-    - type: MeleeWeapon
-      damage:
-        types:
-          Blunt: 10
-      soundHit:
-         collection: MetalThud
-    - type: Spillable
-      solution: absorbed
-      spillWhenThrown: false
-      preventMelee: false
-    - type: DrainableSolution
-      solution: absorbed
-    - type: Wieldable
-    - type: IncreaseDamageOnWield
-      damage:
-        types:
-          Blunt: 5
     - type: Item
-      size: Large
       sprite: Objects/Specific/Janitorial/advmop.rsi
     - type: Absorbent
       pickupAmount: 100
-      useAbsorberSolution: true
-    - type: UseDelay
-      delay: 1.0
     - type: SolutionRegeneration
       solution: absorbed
       generated:
@@ -112,15 +88,10 @@
       preserve:
       - Water
       quantity: 10
-    - type: SolutionContainerManager
-      solutions:
-        absorbed:
-          maxVol: 100
     - type: Tag
       tags:
         - Mop
         - MopAdv
-    - type: DnaSubstanceTrace
 
 - type: entity
   name: wet floor sign

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
index 0f0d8ae0c283a617c0d9d7b2799eabb7b93abb0e..aedbd3190c8d1ac7f423ed43bfb7befc98230a96 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
@@ -27,6 +27,7 @@
     state: ointment
   - type: Item
     heldPrefix: ointment
+    storedRotation: 45
   - type: Healing
     damageContainers:
       - Biological
@@ -295,6 +296,7 @@
     state: gauze
   - type: Item
     heldPrefix: gauze
+    storedRotation: -90
   - type: Construction
     graph: Gauze
     node: gauze

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml b/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml
index f23e0964c13c3959ad237b159ac9bee943d6af9f..e3fe3584f8083b134c77db4ca60de34bf4f473b0 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml
@@ -7,6 +7,8 @@
   - type: Sprite
     sprite: Objects/Tools/scissors.rsi
     state: icon
+  - type: Item
+    storedRotation: 135
   - type: MagicMirror
   - type: ActivatableUI
     key: enum.MagicMirrorUiKey.Key

diff --git a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
index cb038b3c5a315b26ced4d561ad464418a53be558..eb4b881998bb9d8296d29a9ba864659374297bf4 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
@@ -94,6 +94,7 @@
   - type: Item
     size: Small
     sprite: Objects/Tanks/emergency.rsi
+    storedRotation: -45
   - type: GasTank
     air:
       volume: 0.66

diff --git a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml
index e000b9963885fbc97dd56b6d68742fa9da133a9d..986f65badc16fb40006517dc8f5741a595db147d 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml
@@ -29,6 +29,7 @@
     - type: Item
       sprite: Objects/Misc/glowstick.rsi
       heldPrefix: unlit
+      storedRotation: -45
     - type: Appearance
     - type: PointLight
       enabled: false

diff --git a/Resources/Prototypes/Entities/Objects/Tools/inflatable_wall.yml b/Resources/Prototypes/Entities/Objects/Tools/inflatable_wall.yml
index 4f55d5c1649d228f924ac3f693b914b0a8742361..953d191d5e46ca2a5128fce6de81aebf21f56b23 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Tools/inflatable_wall.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/inflatable_wall.yml
@@ -14,6 +14,7 @@
   - type: Item
     sprite: Objects/Misc/inflatable_wall.rsi
     size: Small
+    storedRotation: 90
   - type: SpawnAfterInteract
     prototype: InflatableWall
     doAfter: 1
@@ -41,6 +42,7 @@
   - type: Item
     sprite: Objects/Misc/inflatable_door.rsi
     size: Small
+    storedRotation: 90
   - type: SpawnAfterInteract
     prototype: InflatableDoor
     doAfter: 1

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
index 9320e1627fd1260cdb1ab1cb7f9913ef31b8948a..f2dffa776b149191319ea95d6f06d95081281b94 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
@@ -103,6 +103,8 @@
   parent: [ BaseItem, BaseSecurityContraband ]
   description: Unconventional 30-round top feeding magazine for the WT550 SMG. Intended to hold general-purpose kinetic ammunition.
   components:
+  - type: Item
+    storedRotation: 90
   - type: Tag
     tags:
       - MagazinePistolSubMachineGunTopMounted