From: SpaceRox1244 <138547931+SpaceRox1244@users.noreply.github.com> Date: Wed, 16 Apr 2025 23:35:57 +0000 (-0400) Subject: Adds handheld artifact container to cargo orders (#33327) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=6ef5f8e2f1f7b4ac1076850370ad3798826be37a;p=space-station-14.git Adds handheld artifact container to cargo orders (#33327) * Adds handheld artifact container * Adds inhands and missing details * Reduces use delay on unlocking and opening hand arti container * Adds handheld arti container to cargo orders * Fixes build error i think * Removes extra whitespace * Adds static price to handheld arti container --- diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_science.yml b/Resources/Prototypes/Catalog/Cargo/cargo_science.yml index cb7f8af822..aa428b7d55 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_science.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_science.yml @@ -8,6 +8,16 @@ category: cargoproduct-category-name-science group: market +- type: cargoProduct + id: HandheldArtifactContainer + icon: + sprite: Objects/Storage/artifact_container.rsi + state: icon + product: HandheldArtifactContainer + cost: 500 + category: cargoproduct-category-name-science + group: market + - type: cargoProduct id: RandomArtifact icon: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml index 27084003ee..46f79e1140 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml @@ -94,7 +94,6 @@ enum.PaperLabelVisuals.Layer: True: { offset: "0.0,0.3125" } False: { offset: "0.0,0.0" } - - type: LockVisuals - type: ItemSlots - type: ContainerContainer @@ -103,3 +102,93 @@ paper_label: !type:ContainerSlot - type: StaticPrice price: 250 + +- type: entity + parent: BaseStorageItem + id: HandheldArtifactContainer + name: handheld artifact container + description: A handheld case used to safely contain and move small artifacts. + components: + - type: Sprite + sprite: Objects/Storage/artifact_container.rsi + state: icon + layers: + - state: icon + map: [ base ] + - state: locked + map: ["enum.LockVisualLayers.Lock"] + shader: unshaded + - type: Storage + maxItemSize: Normal + grid: + - 0,0,1,1 + whitelist: + components: + - Artifact + - type: Item + sprite: Objects/Storage/artifact_container.rsi + size: Huge + - type: MeleeWeapon + damage: + types: + Blunt: 12 + soundHit: + path: "/Audio/Weapons/smash.ogg" + - type: Appearance + - type: AccessReader + access: [["Research"], ["Cargo"]] + - type: Lock + - type: SuppressArtifactContainer + - type: RadiationBlockingContainer + resistance: 5 + - type: EmitSoundOnLand + sound: + path: /Audio/Items/toolbox_drop.ogg + - type: LockVisuals + - type: Damageable + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallicStrong + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 50 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - type: PaperLabel + labelSlot: + insertVerbText: Attach Label + ejectVerbText: Remove Label + whitelist: + components: + - Paper + blacklist: + tags: + - Book + - type: GenericVisualizer + visuals: + enum.StorageVisuals.Open: + base: + True: { state: icon-open } + False: { state: icon } + enum.PaperLabelVisuals.HasLabel: + enum.PaperLabelVisuals.Layer: + True: { visible: true } + False: { visible: false } + enum.PaperLabelVisuals.LabelType: + enum.PaperLabelVisuals.Layer: + Paper: { state: paper } + Bounty: { state: bounty } + CaptainsPaper: { state: captain } + Invoice: { state: invoice } + - type: ItemSlots + - type: ContainerContainer + containers: + paper_label: !type:ContainerSlot + storagebase: !type:Container + ents: [] + - type: UseDelay + delay: 0.3 + - type: StaticPrice + price: 250 diff --git a/Resources/Textures/Objects/Storage/artifact_container.rsi/bounty.png b/Resources/Textures/Objects/Storage/artifact_container.rsi/bounty.png new file mode 100644 index 0000000000..f0d459eb50 Binary files /dev/null and b/Resources/Textures/Objects/Storage/artifact_container.rsi/bounty.png differ diff --git a/Resources/Textures/Objects/Storage/artifact_container.rsi/captain.png b/Resources/Textures/Objects/Storage/artifact_container.rsi/captain.png new file mode 100644 index 0000000000..1e9713f6a9 Binary files /dev/null and b/Resources/Textures/Objects/Storage/artifact_container.rsi/captain.png differ diff --git a/Resources/Textures/Objects/Storage/artifact_container.rsi/icon-open.png b/Resources/Textures/Objects/Storage/artifact_container.rsi/icon-open.png new file mode 100644 index 0000000000..fce4d97638 Binary files /dev/null and b/Resources/Textures/Objects/Storage/artifact_container.rsi/icon-open.png differ diff --git a/Resources/Textures/Objects/Storage/artifact_container.rsi/icon.png b/Resources/Textures/Objects/Storage/artifact_container.rsi/icon.png new file mode 100644 index 0000000000..ca30cb7979 Binary files /dev/null and b/Resources/Textures/Objects/Storage/artifact_container.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Storage/artifact_container.rsi/inhand-left.png b/Resources/Textures/Objects/Storage/artifact_container.rsi/inhand-left.png new file mode 100644 index 0000000000..8136557f71 Binary files /dev/null and b/Resources/Textures/Objects/Storage/artifact_container.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Storage/artifact_container.rsi/inhand-right.png b/Resources/Textures/Objects/Storage/artifact_container.rsi/inhand-right.png new file mode 100644 index 0000000000..0023c2c3b7 Binary files /dev/null and b/Resources/Textures/Objects/Storage/artifact_container.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Storage/artifact_container.rsi/invoice.png b/Resources/Textures/Objects/Storage/artifact_container.rsi/invoice.png new file mode 100644 index 0000000000..b2cb06ac81 Binary files /dev/null and b/Resources/Textures/Objects/Storage/artifact_container.rsi/invoice.png differ diff --git a/Resources/Textures/Objects/Storage/artifact_container.rsi/locked.png b/Resources/Textures/Objects/Storage/artifact_container.rsi/locked.png new file mode 100644 index 0000000000..890a26f1b2 Binary files /dev/null and b/Resources/Textures/Objects/Storage/artifact_container.rsi/locked.png differ diff --git a/Resources/Textures/Objects/Storage/artifact_container.rsi/meta.json b/Resources/Textures/Objects/Storage/artifact_container.rsi/meta.json new file mode 100644 index 0000000000..d350f747a2 --- /dev/null +++ b/Resources/Textures/Objects/Storage/artifact_container.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites by SpaceRox1244", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-open" + }, + { + "name": "locked" + }, + { + "name": "unlocked" + }, + { + "name": "paper" + }, + { + "name": "captain" + }, + { + "name": "bounty" + }, + { + "name": "invoice" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Storage/artifact_container.rsi/paper.png b/Resources/Textures/Objects/Storage/artifact_container.rsi/paper.png new file mode 100644 index 0000000000..86a0b218a2 Binary files /dev/null and b/Resources/Textures/Objects/Storage/artifact_container.rsi/paper.png differ diff --git a/Resources/Textures/Objects/Storage/artifact_container.rsi/unlocked.png b/Resources/Textures/Objects/Storage/artifact_container.rsi/unlocked.png new file mode 100644 index 0000000000..c02fe83521 Binary files /dev/null and b/Resources/Textures/Objects/Storage/artifact_container.rsi/unlocked.png differ