From: lzk <124214523+lzk228@users.noreply.github.com> Date: Thu, 22 Feb 2024 11:28:03 +0000 (+0100) Subject: Make even more items good looking in inventory + size changing (#25461) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=35723ad22f3e5bc038ef90bd9112c84ca8516051;p=space-station-14.git Make even more items good looking in inventory + size changing (#25461) * Make even more items good looking in inventory * holoprojecrots --- diff --git a/Resources/Prototypes/Entities/Clothing/Head/welding.yml b/Resources/Prototypes/Entities/Clothing/Head/welding.yml index 753646757e..fb791ae567 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/welding.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/welding.yml @@ -4,6 +4,8 @@ name: welding mask abstract: true components: + - type: Item + storedRotation: 0 - type: IngestionBlocker - type: FlashImmunity - type: IdentityBlocker diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml index ba70efb205..fe88859584 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml @@ -6,6 +6,8 @@ id: FoodPieBase abstract: true components: + - type: Item + storedRotation: -90 - type: FlavorProfile flavors: - sweet @@ -34,6 +36,8 @@ abstract: true description: A slice of pie. Tasty! components: + - type: Item + size: Tiny - type: FlavorProfile flavors: - sweet diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml index eb05133a38..52f6d42dc8 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml @@ -6,6 +6,8 @@ id: FoodBowlBig description: A simple bowl, used for soups and salads. components: + - type: Item + storedRotation: -90 - type: SolutionContainerManager solutions: food: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml index 8b6df79b9f..6ce0c7a443 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml @@ -214,6 +214,8 @@ - type: Item sprite: Objects/Consumable/Food/Baked/pizza.rsi heldPrefix: box + shape: + - 0,0,1,1 - type: Appearance - type: EntityStorageVisuals stateDoorOpen: box-open diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml index 8a90468199..33c2a39d7f 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml @@ -10,6 +10,8 @@ abstract: true description: A delicious meal, cooked with love. components: + - type: Item + storedRotation: -90 - type: Food - type: Sprite sprite: Objects/Consumable/Food/meals.rsi diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml index d8817ab86d..6e588a3efc 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml @@ -7,6 +7,8 @@ abstract: true description: Now that's a nice pasta! components: + - type: Item + storedRotation: -90 - type: Sprite sprite: Objects/Consumable/Food/noodles.rsi - type: SolutionContainerManager diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml index c313f2d046..51bf229f2c 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml @@ -19,6 +19,7 @@ Quantity: 8 - type: Item size: Small + storedRotation: -90 # Kebabs diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml index f9cf223114..27f2bdbce2 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml @@ -451,6 +451,7 @@ - type: Item sprite: Objects/Consumable/Food/snacks.rsi heldPrefix: packet + size: Tiny - type: Tag tags: - Trash @@ -469,7 +470,6 @@ components: - type: Sprite state: boritos-trash - - type: Item - type: entity noSpawn: true @@ -479,7 +479,6 @@ components: - type: Sprite state: cnds-trash - - type: Item - type: entity noSpawn: true @@ -489,7 +488,6 @@ components: - type: Sprite state: cheesiehonkers-trash - - type: Item - type: entity noSpawn: true @@ -499,7 +497,6 @@ components: - type: Sprite state: chips-trash - - type: Item - type: entity noSpawn: true @@ -509,7 +506,6 @@ components: - type: Sprite state: chocolatebar-trash - - type: Item - type: entity noSpawn: true @@ -519,7 +515,6 @@ components: - type: Sprite state: energybar-trash - - type: Item - type: entity noSpawn: true @@ -529,7 +524,6 @@ components: - type: Sprite state: pistachio-trash - - type: Item - type: entity noSpawn: true @@ -539,7 +533,6 @@ components: - type: Sprite state: popcorn-trash - - type: Item - type: entity noSpawn: true @@ -549,7 +542,6 @@ components: - type: Sprite state: raisins-trash - - type: Item - type: entity noSpawn: true @@ -559,7 +551,6 @@ components: - type: Sprite state: semki-trash - - type: Item - type: entity noSpawn: true @@ -569,7 +560,6 @@ components: - type: Sprite state: susjerky-trash - - type: Item - type: entity noSpawn: true @@ -579,7 +569,6 @@ components: - type: Sprite state: syndicakes-trash - - type: Item - type: entity noSpawn: true @@ -589,7 +578,6 @@ components: - type: Sprite state: chinese1 - - type: Item - type: entity noSpawn: true @@ -599,7 +587,6 @@ components: - type: Sprite state: chinese2 - - type: Item - type: entity noSpawn: true diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml index 0dca39ea48..3b080e843b 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml @@ -5,6 +5,8 @@ id: FoodBowlBase abstract: true components: + - type: Item + storedRotation: -90 - type: Food trash: FoodBowlBig utensil: Spoon diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml index 72d20624a4..9df2f3039e 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml @@ -6,6 +6,8 @@ id: FoodTacoShell description: A taco shell, easy to hold, but falls on its side when put down. components: + - type: Item + storedRotation: -90 - type: Food - type: Sprite sprite: Objects/Consumable/Food/taco.rsi @@ -44,6 +46,7 @@ Quantity: 4 - type: Item sprite: Objects/Consumable/Food/taco.rsi + storedRotation: -90 - type: Tag tags: - Meat diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/misc.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/misc.yml index a4275995dc..cb35219eb0 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/misc.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/misc.yml @@ -4,6 +4,8 @@ name: station map electronics description: An electronics board used in station maps. components: + - type: Item + storedRotation: 0 - type: Sprite sprite: Objects/Misc/module.rsi state: airalarm_electronics diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/atmos_alarms.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/atmos_alarms.yml index b54d21750d..838ec637d3 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/atmos_alarms.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/atmos_alarms.yml @@ -19,6 +19,8 @@ name: fire alarm electronics description: An electronics board used in fire alarms components: + - type: Item + storedRotation: 0 - type: Sprite sprite: Objects/Misc/module.rsi state: airalarm_electronics diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/base_electronics.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/base_electronics.yml index 8ee76d43e9..7848d987e5 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/base_electronics.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/base_electronics.yml @@ -1,17 +1,19 @@ -- type: entity +- type: entity id: BaseElectronics parent: BaseItem name: base electronics abstract: true suffix: Electronics components: - - type: Sprite - sprite: Objects/Misc/module.rsi - state: generic - - type: StaticPrice - price: 100 - - type: PhysicalComposition - materialComposition: - Glass: 200 - chemicalComposition: - Silicon: 20 + - type: Item + storedRotation: -90 + - type: Sprite + sprite: Objects/Misc/module.rsi + state: generic + - type: StaticPrice + price: 100 + - type: PhysicalComposition + materialComposition: + Glass: 200 + chemicalComposition: + Silicon: 20 diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/firelock.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/firelock.yml index 00b928f2ec..c7fa8f9ecd 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/firelock.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/firelock.yml @@ -4,6 +4,8 @@ name: firelock electronics description: An electronics board used to detect differences in pressure, temperature and gas concentrations between the two sides of the door. components: + - type: Item + storedRotation: 0 - type: Sprite sprite: Objects/Misc/module.rsi state: mainboard diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/mech.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/mech.yml index 6657418488..f224c1c2bf 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/mech.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/mech.yml @@ -6,6 +6,8 @@ name: ripley central control module description: The electrical control center for the ripley mech. components: + - type: Item + storedRotation: 0 - type: Sprite sprite: Objects/Misc/module.rsi state: mainboard @@ -40,6 +42,8 @@ name: H.O.N.K. central control module description: The electrical control center for the H.O.N.K. mech. components: + - type: Item + storedRotation: 0 - type: Sprite sprite: Objects/Misc/module.rsi state: mainboard @@ -90,6 +94,8 @@ name: HAMTR central control module description: The electrical control center for the HAMTR mech. components: + - type: Item + storedRotation: 0 - type: Sprite sprite: Objects/Misc/module.rsi state: mainboard diff --git a/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml b/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml index 4924a46fe8..0066e3fbe8 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml @@ -4,6 +4,8 @@ name: holographic sign projector description: A handy-dandy holographic projector that displays a janitorial sign. components: + - type: Item + storedRotation: -90 - type: HolosignProjector - type: UseDelay - type: ContainerContainer diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 3e1c056419..86417c4839 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -51,7 +51,7 @@ reagents: - ReagentId: Fiber Quantity: 10 - + - type: entity parent: BasePlushie id: PlushieGhost @@ -398,6 +398,7 @@ state: blue - type: Item heldPrefix: blue + storedRotation: -90 - type: Tag tags: - PlushieSharkBlue @@ -467,6 +468,7 @@ state: carpplush - type: Item heldPrefix: carpplush + storedRotation: -90 - type: EmitSoundOnUse sound: path: /Audio/Effects/bite.ogg @@ -679,7 +681,7 @@ - type: EmitSoundOnTrigger sound: path: /Audio/Voice/Human/malescream_5.ogg - + - type: entity parent: BasePlushie id: PlushieMoth diff --git a/Resources/Prototypes/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/Entities/Objects/Power/powercells.yml index 8aefe5e931..7397bcaa51 100644 --- a/Resources/Prototypes/Entities/Objects/Power/powercells.yml +++ b/Resources/Prototypes/Entities/Objects/Power/powercells.yml @@ -3,6 +3,8 @@ abstract: true parent: BaseItem components: + - type: Item + storedRotation: -90 - type: Battery pricePerJoule: 0.15 - type: PowerCell diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml index 9b17d7ed32..de014c8912 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml @@ -166,6 +166,7 @@ state: medicated-suture - type: Item heldPrefix: medicated-suture + storedRotation: -90 - type: Healing damageContainers: - Biological diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml index 9d1398c6ca..bafcd928bf 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml @@ -102,6 +102,8 @@ name: ash description: This used to be something, but now it's not. components: + - type: Item + size: Tiny - type: Sprite sprite: Objects/Materials/materials.rsi state: ash diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml index 943fdad518..2519611c68 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -5,6 +5,8 @@ description: A piece of tech that gives cyborgs new abilities. abstract: true components: + - type: Item + storedRotation: -90 - type: Sprite sprite: Objects/Specific/Robotics/borgmodule.rsi - type: BorgModule @@ -238,7 +240,7 @@ - WelderExperimental - NetworkConfigurator - RemoteSignaller - - GasAnalyzer + - GasAnalyzer - GeigerCounter - type: entity @@ -490,7 +492,7 @@ - BikeHorn - ClownRecorder - BikeHornInstrument - + #syndicate modules - type: entity id: BorgModuleSyndicateWeapon diff --git a/Resources/Prototypes/Entities/Objects/Tools/emag.yml b/Resources/Prototypes/Entities/Objects/Tools/emag.yml index 702b7c86be..0117d44d6d 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/emag.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/emag.yml @@ -1,28 +1,22 @@ - type: entity parent: BaseItem - id: Emag + id: EmagUnlimited + suffix: Unlimited name: cryptographic sequencer description: The all-in-one hacking solution. The thinking man's lockpick. The iconic EMAG. components: - type: Emag - - type: LimitedCharges - - type: AutoRecharge - type: Sprite sprite: Objects/Tools/emag.rsi state: icon - type: Item sprite: Objects/Tools/emag.rsi + storedRotation: -90 - type: entity - parent: BaseItem - id: EmagUnlimited - suffix: Unlimited - name: cryptographic sequencer - description: The all-in-one hacking solution. The thinking man's lockpick. The iconic EMAG. + parent: EmagUnlimited + id: Emag + suffix: Limited components: - - type: Emag - - type: Sprite - sprite: Objects/Tools/emag.rsi - state: icon - - type: Item - sprite: Objects/Tools/emag.rsi + - type: LimitedCharges + - type: AutoRecharge diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index ecabe2a4ab..8b31bf40ed 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -158,6 +158,8 @@ id: WeaponTetherGun description: Manipulates gravity around objects to fling them at high velocities. components: + - type: Item + storedRotation: -90 - type: TetherGun frequency: 5 dampingRatio: 4 @@ -195,6 +197,8 @@ id: WeaponForceGun description: Manipulates gravity around objects to fling them at high velocities. components: + - type: Item + storedRotation: -90 - type: ForceGun frequency: 15 dampingRatio: 4 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml index 21c1cedd01..cb9defccd9 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml @@ -42,9 +42,11 @@ id: MiningDrill description: Powerful tool used to quickly drill through rocks components: + - type: Item + storedRotation: -90 - type: Tag tags: - - Pickaxe + - Pickaxe - type: Sprite sprite: Objects/Tools/handdrill.rsi state: handdrill