From: Tao <56692749+TaoNewt@users.noreply.github.com> Date: Wed, 6 Aug 2025 16:58:07 +0000 (+0100) Subject: Fun with cardboard! (#37363) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=4821bff9415bf027fdde9f9149f629a7bfe6aca1;p=space-station-14.git Fun with cardboard! (#37363) * learning??? * made card walls work, then made game unlaunchable (: * Still broken, added notes that I thought of while in bed * wall, door, table and chair are now bare min functional, yay * learnt why not to web edit... * added floors, walls and floors fully complete * added swords, shields, armour, helmets and arrows * added funny sound and cleanup small issues * cleanup * cleanup * credited myself * card to cardboard * fixed licence issue and meta thingy * adjusted arrow stam-damage * made card carpets more regular * simplified sprite, reduced stam damage * formatting fixes --------- Co-authored-by: beck-thompson --- diff --git a/Content.Shared/Physics/CollisionGroup.cs b/Content.Shared/Physics/CollisionGroup.cs index db065d22b1..1f19184b50 100644 --- a/Content.Shared/Physics/CollisionGroup.cs +++ b/Content.Shared/Physics/CollisionGroup.cs @@ -78,6 +78,8 @@ public enum CollisionGroup WallLayer = Opaque | Impassable | HighImpassable | MidImpassable | LowImpassable | BulletImpassable | InteractImpassable, GlassLayer = Impassable | HighImpassable | MidImpassable | LowImpassable | BulletImpassable | InteractImpassable, HalfWallLayer = MidImpassable | LowImpassable, + FlimsyLayer = Opaque | HighImpassable | MidImpassable | LowImpassable | InteractImpassable, + // Allows people to interact past and target players inside of this SpecialWallLayer = Opaque | HighImpassable | MidImpassable | LowImpassable | BulletImpassable, diff --git a/Resources/Audio/Effects/attributions.yml b/Resources/Audio/Effects/attributions.yml index 3a7f18c7a3..9f85c4fb05 100644 --- a/Resources/Audio/Effects/attributions.yml +++ b/Resources/Audio/Effects/attributions.yml @@ -256,3 +256,13 @@ license: "CC-BY-4.0" copyright: "Clipped by FairlySadPanda (Github) from a sound created by CheChoDj (Freesound)" source: "https://freesound.org/people/CheChoDj/sounds/609353/" + +- files: [card_drag.ogg] + copyright: 'created by Tao7891' + license: CC0-1.0 + source: https://github.com/space-wizards/space-station-14/pull/37363 + +- files: [card_tube_bonk.ogg] + copyright: 'created by Crinkem on Freesound' + license: "CC0-1.0" + source: https://freesound.org/people/Crinkem/sounds/492027/ diff --git a/Resources/Audio/Effects/card_drag.ogg b/Resources/Audio/Effects/card_drag.ogg new file mode 100644 index 0000000000..8ecf632e8a Binary files /dev/null and b/Resources/Audio/Effects/card_drag.ogg differ diff --git a/Resources/Audio/Items/Toys/card_tube_bonk.ogg b/Resources/Audio/Items/Toys/card_tube_bonk.ogg new file mode 100644 index 0000000000..b300702c25 Binary files /dev/null and b/Resources/Audio/Items/Toys/card_tube_bonk.ogg differ diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml index 0f023e2470..9cc79b2aaa 100644 --- a/Resources/Prototypes/Damage/modifier_sets.yml +++ b/Resources/Prototypes/Damage/modifier_sets.yml @@ -145,6 +145,13 @@ flatReductions: Blunt: 5 +- type: damageModifierSet + id: Card + coefficients: + Slash: 2.0 + Piercing: 0.1 # Holes easily poked through, but do little to structural integrity + Heat: 3.0 + - type: damageModifierSet id: Web # Very flammable, can be easily hacked and slashed, but shooting or hitting it is another story. coefficients: diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index f729ea1034..57665af04f 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -568,3 +568,25 @@ itemIconStyle: BigItem - type: InstantAction event: !type:ToggleActionEvent + +#card helmet +- type: entity + parent: ClothingHeadHelmetBase + id: CardHelmet + name: cardboard helmet + description: A medieval helmet built from cardboard. + components: + - type: Sprite + sprite: Clothing/Head/Helmets/card_helmet.rsi + - type: Clothing + sprite: Clothing/Head/Helmets/card_helmet.rsi + - type: IngestionBlocker + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + - type: StaminaResistance + damageCoefficient: 0.95 + - type: Construction + graph: cardHelmet + node: cardhelmet \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index a345622d85..25d963882c 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -491,3 +491,22 @@ - type: ProtectedFromStepTriggers slots: WITHOUT_POCKET +- type: entity + parent: ClothingOuterArmorBase + id: CardArmour + name: cardboard armour + description: A medieval chestpiece built from cardboard. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Armor/card_armour.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Armor/card_armour.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + - type: StaminaResistance + damageCoefficient: 0.90 + - type: Construction + graph: cardArmour + node: cardarmour \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 9ff94db3b1..81b09be659 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -769,6 +769,44 @@ shape: - 0,0,0,2 +- type: entity + parent: BaseItem + id: CardSword + name: cardboard sword + description: A cardboard tube thats been fashioned into a sword. + components: + - type: Sprite + sprite: Objects/Fun/card_sword.rsi + state: icon + - type: Clothing + sprite: Objects/Fun/card_sword.rsi + slots: + - Back + - SuitStorage + - type: StaminaDamageOnHit + damage: 6 + - type: Appearance + - type: DisarmMalus + malus: 0 + - type: MeleeWeapon + wideAnimationRotation: -135 + attackRate: 1.25 + damage: + types: + Blunt: 0.3 + soundHit: + path: /Audio/Items/Toys/card_tube_bonk.ogg + - type: Construction + graph: CardSword + node: cardSword + - type: Item + size: Normal + storedSprite: + state: icon + sprite: Objects/Fun/card_sword.rsi + shape: + - 0,0,1,3 + - type: entity parent: BaseItem id: ClownRecorder diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml index a64566f258..969dc5997a 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml @@ -56,6 +56,13 @@ Quantity: 6 - type: Item heldPrefix: cardboard + - type: FloorTile + outputs: + - Plating + - type: SpawnAfterInteract #Nuke after convert to FloorTile + prototype: CarpetCard + doAfter: 0.5 + removeOnInteract: true - type: entity parent: MaterialCardboard diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml index c461b5683b..3b64f0c4b1 100644 --- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml +++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml @@ -180,6 +180,61 @@ - type: StaticPrice price: 150 +- type: entity + name: cardboard shield + parent: BaseShield + id: CardShield + description: A shield that wont shield you from much. + components: + - type: Sprite + state: cardshield-icon + - type: Item + heldPrefix: cardshield + - type: StaminaResistance + damageCoefficient: 0.95 + worn: true + - type: Blocking + passiveBlockModifier: + coefficients: + Blunt: 1 + Slash: 2 + Piercing: 0.6 + Heat: 3 + activeBlockModifier: + coefficients: + Blunt: 0.9 + Slash: 1.8 + Piercing: 0.5 + Heat: 2.5 + flatReductions: + Blunt: 0.5 + - type: Construction + graph: CardShield + node: cardShield + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 25 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 10 #Very very weak shield + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: /Audio/Items/Toys/ToyFall2.ogg + - !type:SpawnEntitiesBehavior + spawn: + MaterialCardboard: + min: 2 + max: 4 + - type: StaticPrice + price: 20 + - type: entity name: makeshift shield parent: BaseShield diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml index e9a0c6a381..1e61fa3295 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml @@ -185,3 +185,28 @@ - type: Construction graph: ImprovisedArrowCarp node: ImprovisedArrowCarp + +- type: entity + parent: BaseArrow + id: ArrowCard + name: cardboard arrow + description: Cant kill no matter how hard you try. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/arrows.rsi + layers: + - state: tail + color: white + - state: rod + color: brown + - state: tip + color: brown + - type: Projectile + damage: + types: + Blunt: 1 + - type: StaminaDamageOnCollide + damage: 10 + - type: Construction + graph: CardArrow + node: CardArrow \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml index 5d6a87ea6b..d22687faec 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml @@ -261,3 +261,82 @@ path: /Audio/Effects/rustle1.ogg openSound: path: /Audio/Effects/rustle2.ogg + + +- type: entity + id: CardDoor + parent: BaseStructure + name: cardboard door + description: A door, where will it lead? + components: + - type: InteractionOutline + - type: Sprite + sprite: Structures/Doors/MineralDoors/card_door.rsi + layers: + - state: closed + map: ["enum.DoorVisualLayers.Base"] + - type: AnimationPlayer + - type: Physics + bodyType: Static + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.49,-0.49,0.49,0.49" + density: 100 + mask: + - FullTileMask + layer: + - FlimsyLayer + - type: Door + bumpOpen: false + clickOpen: true + canCrush: false + closeTimeOne: 0.2 + closeTimeTwo: 0.6 + openTimeOne: 0.6 + openTimeTwo: 0.2 + openingAnimationTime: 1.2 + closingAnimationTime: 1.2 + openSound: + path: /Audio/Effects/card_drag.ogg + closeSound: + path: /Audio/Effects/card_drag.ogg + - type: MeleeSound + soundGroups: + Brute: + path: + "/Audio/Weapons/pierce.ogg" + - type: Appearance + - type: Damageable + damageContainer: StructuralInorganic + damageModifierSet: Card + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 60 #excess damage (nuke?). avoid computational cost of spawning entities. + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 30 + behaviors: + - !type:SpawnEntitiesBehavior + spawn: + MaterialCardboard: + min: 2 + max: 4 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Icon + sprite: Structures/Doors/MineralDoors/card_door.rsi + state: closed + - type: Construction + graph: DoorGraph + node: cardDoor + - type: NavMapDoor + - type: Occluder + - type: BlockWeather diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml index 132d87a969..fda2ac5e18 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml @@ -300,6 +300,61 @@ footstepSoundCollection: collection: FootstepTile +- type: entity + id: TableCard + parent: TableBase + name: cardboard table + description: Cardboard sheets wrapped around a metal table frame. + components: + - type: Sprite + sprite: Structures/Furniture/Tables/card.rsi + - type: Icon + sprite: Structures/Furniture/Tables/card.rsi + - type: GlassTable #they named it that cause 'it would never be used elsewhere' or something, smh + climberDamage: + types: + Blunt: 6 + tableDamage: + types: + Blunt: 15 + tableMassLimit: 40 + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Card + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 45 #excess damage (nuke?). avoid computational cost of spawning entities. + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: /Audio//Weapons/pierce.ogg + - trigger: + !type:DamageTrigger + damage: 15 + behaviors: + - !type:PlaySoundBehavior + sound: /Audio//Weapons/pierce.ogg + - !type:SpawnEntitiesBehavior + spawn: + MaterialCardboard: + min: 1 + max: 2 + - !type:ChangeConstructionNodeBehavior + node: TableFrame + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: IconSmooth + key: cardtable + - type: Construction + graph: Table + node: TableCard + - type: FootstepModifier + footstepSoundCollection: + collection: FootstepTile + - type: entity id: TableReinforcedGlass parent: TableBase diff --git a/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml b/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml index d82ba95d76..b6e6a7ca9a 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml @@ -366,3 +366,60 @@ - !type:DoActsBehavior acts: [ "Destruction" ] - type: TrayScanReveal + +#cardpet + +- type: entity + id: CarpetCard + parent: BaseStructure + name: cardboard "carpet" + description: "Even lino is better." + components: + - type: Sprite + drawdepth: FloorTiles + sprite: Structures/Furniture/Carpets/card_carpet.rsi + - type: Icon + sprite: Structures/Furniture/Carpets/card_carpet.rsi + state: full + - type: IconSmooth + key: cardpets + additionalKeys: + - cards + base: carpet_ + - type: Tag + tags: + - Carpet + - ForceFixRotations + - type: Physics + canCollide: false + - type: Clickable + - type: Fixtures + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Card + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 40 + behaviors: #excess damage (nuke?). avoid computational cost of spawning entities. + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 10 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:SpawnEntitiesBehavior + spawn: + MaterialCardboard: + min: 1 + max: 1 + - type: Butcherable + butcheringType: Knife + butcherDelay: 1 + spawned: + - id: MaterialCardboard1 + amount: 1 + - type: TrayScanReveal \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml index 584c80132e..4a680de3d3 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml @@ -401,6 +401,40 @@ graph: Seat node: chairSteelBench +- type: entity + name: cardboard stool + id: CardStool + parent: UnanchoredChairBase + description: Make sure you sit *really* gently. + components: + - type: Sprite + state: card-stool + - type: Construction + graph: Seat + node: stoolCard + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Card + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 40 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 10 + behaviors: + - !type:SpawnEntitiesBehavior + spawn: + MaterialCardboard: + min: 1 + max: 2 + - !type:DoActsBehavior + acts: ["Destruction"] + - type: entity name: wooden bench id: WoodenBench diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml index af828c9020..f3c2eaafe4 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml @@ -1628,3 +1628,74 @@ - type: IconSmooth key: cobblebricks base: cobblebrick + +# Cardboard + +- type: entity + id: Cardwall + parent: BaseStructure + name: cardboard wall + description: Budget cuts are hitting hard. + placement: + mode: SnapgridCenter + snap: + - Wall + components: + - type: MeleeSound + soundGroups: + Brute: + path: + "/Audio/Weapons/pierce.ogg" + - type: Tag + tags: + - Wall + - type: Sprite + drawdepth: SmallObjects #so bullets pass 'through' + sprite: Structures/Walls/card.rsi + - type: Icon + sprite: Structures/Walls/card.rsi + state: full + - type: Construction + graph: Cardwall + node: cardwall + deconstructionTarget: start + - type: Damageable + damageContainer: StructuralInorganic + damageModifierSet: Card + - type: Physics + bodyType: Static + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.5,-0.5,0.5,0.5" + mask: + - FullTileMask + layer: + - FlimsyLayer + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 80 #excess damage (nuke?). avoid computational cost of spawning entities. + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 40 + behaviors: + - !type:SpawnEntitiesBehavior + spawn: + MaterialCardboard: + min: 1 + max: 2 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: IconSmooth + key: cards + base: card + - type: Occluder + - type: BlockWeather + - type: SunShadowCast \ No newline at end of file diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/armor.yml b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/armor.yml index e597d7cdc4..269dd615f7 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/armor.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/armor.yml @@ -25,3 +25,31 @@ doAfter: 1 - node: helmet entity: ClothingHeadHelmetBone + +- type: constructionGraph + id: cardArmour + start: start + graph: + - node: start + edges: + - to: cardarmour + steps: + - material: Cardboard + amount: 10 + doAfter: 4 + - node: cardarmour + entity: CardArmour + +- type: constructionGraph + id: cardHelmet + start: start + graph: + - node: start + edges: + - to: cardhelmet + steps: + - material: Cardboard + amount: 5 + doAfter: 2 + - node: cardhelmet + entity: CardHelmet diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml index c587e47efb..08ac6e45d7 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml @@ -68,6 +68,11 @@ - material: Steel amount: 2 doAfter: 1 + - to: stoolCard + steps: + - material: Cardboard + amount: 3 + doAfter: 1 - to: chairWoodBench steps: - material: WoodPlank @@ -231,6 +236,20 @@ - tool: Screwing doAfter: 1 + - node: stoolCard + entity: CardStool + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: MaterialCardboard1 + amount: 3 + - !type:PlaySound + sound: /Audio/Items/Toys/ToyFall2.ogg + steps: + - tool: Slicing + doAfter: 1 + - node: chairWoodBench entity: WoodenBench edges: diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml index 37c94f0b39..c0721cf154 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml @@ -64,6 +64,12 @@ amount: 1 doAfter: 1 + - to: TableCard + steps: + - material: Cardboard + amount: 3 + doAfter: 1 + - to: TableReinforcedGlass steps: - material: ReinforcedGlass @@ -162,6 +168,18 @@ - tool: Anchoring doAfter: 1 + - node: TableCard + entity: TableCard + edges: + - to: TableFrame + completed: + - !type:SpawnPrototype + prototype: MaterialCardboard1 + amount: 3 + steps: + - tool: Slicing + doAfter: 2 + - node: TableReinforcedGlass entity: TableReinforcedGlass edges: diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/cardwall.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/cardwall.yml new file mode 100644 index 0000000000..493982b617 --- /dev/null +++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/cardwall.yml @@ -0,0 +1,25 @@ +- type: constructionGraph + id: Cardwall + start: start + graph: + - node: start + edges: + - to: cardwall + steps: + - material: Cardboard + amount: 3 + doAfter: 3 + - node: cardwall + entity: Cardwall + edges: + - to: start + completed: + - !type:PlaySound + sound: /Audio/Items/Toys/ToyFall2.ogg + - !type:SpawnPrototype + prototype: MaterialCardboard1 + amount: 3 + - !type:DeleteEntity {} + steps: + - tool: Slicing + doAfter: 1.2 diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/doors.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/doors.yml index e15f4a644a..2c8260269f 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/doors.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/doors.yml @@ -55,6 +55,13 @@ - material: Paper amount: 20 doAfter: 15 + - to: cardDoor + completed: + - !type:SnapToGrid { } + steps: + - material: Cardboard + amount: 5 + doAfter: 6 - node: metalDoor entity: MetalDoor edges: @@ -121,6 +128,20 @@ steps: - tool: Anchoring doAfter: 15 + - node: cardDoor + entity: CardDoor + edges: + - to: start + completed: + - !type:PlaySound + sound: /Audio/Items/Toys/ToyFall2.ogg + - !type:SpawnPrototype + prototype: MaterialCardboard1 + amount: 5 + - !type:DeleteEntity {} + steps: + - tool: Slicing + doAfter: 2 - node: bananiumDoor entity: BananiumDoor edges: diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/card_shield.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/card_shield.yml new file mode 100644 index 0000000000..3cc3219c15 --- /dev/null +++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/card_shield.yml @@ -0,0 +1,17 @@ +- type: constructionGraph + id: CardShield + start: start + graph: + - node: start + edges: + - to: cardShield + steps: + - material: Cable + amount: 2 + doAfter: 2 + - material: Cardboard + amount: 6 + doAfter: 2 + + - node: cardShield + entity: CardShield \ No newline at end of file diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/card_sword.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/card_sword.yml new file mode 100644 index 0000000000..d63aa855e4 --- /dev/null +++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/card_sword.yml @@ -0,0 +1,14 @@ +- type: constructionGraph + id: CardSword + start: start + graph: + - node: start + edges: + - to: cardSword + steps: + - material: Cardboard + amount: 6 + doAfter: 3 + + - node: cardSword + entity: CardSword \ No newline at end of file diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/improvised_arrow.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/improvised_arrow.yml index e04e359b50..bac533a06f 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/improvised_arrow.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/improvised_arrow.yml @@ -90,3 +90,22 @@ - node: ImprovisedArrowCarp entity: ArrowImprovisedCarp + +- type: constructionGraph + id: CardArrow + start: start + graph: + - node: start + edges: + - to: CardArrow + steps: + - material: Cloth + amount: 1 + doAfter: 0.5 + - material: Cardboard + amount: 1 + doAfter: 0.5 + + - node: CardArrow + entity: ArrowCard + diff --git a/Resources/Prototypes/Recipes/Construction/clothing.yml b/Resources/Prototypes/Recipes/Construction/clothing.yml index 0a23bc8648..abd2911ecb 100644 --- a/Resources/Prototypes/Recipes/Construction/clothing.yml +++ b/Resources/Prototypes/Recipes/Construction/clothing.yml @@ -30,6 +30,22 @@ category: construction-category-clothing objectType: Item +- type: construction + id: cardHelmet + graph: cardHelmet + startNode: start + targetNode: cardhelmet + category: construction-category-clothing + objectType: Item + +- type: construction + id: cardArmour + graph: cardArmour + startNode: start + targetNode: cardarmour + category: construction-category-clothing + objectType: Item + - type: construction id: BananaClownMask graph: BananaClownMask diff --git a/Resources/Prototypes/Recipes/Construction/furniture.yml b/Resources/Prototypes/Recipes/Construction/furniture.yml index f9b810731e..80ddd7d2dc 100644 --- a/Resources/Prototypes/Recipes/Construction/furniture.yml +++ b/Resources/Prototypes/Recipes/Construction/furniture.yml @@ -155,6 +155,18 @@ conditions: - !type:TileNotBlocked +- type: construction + id: StoolCard + graph: Seat + startNode: start + targetNode: stoolCard + category: construction-category-furniture + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + - type: construction id: ChairWoodBench graph: Seat @@ -230,6 +242,18 @@ conditions: - !type:TileNotBlocked +- type: construction + id: TableCard + graph: Table + startNode: start + targetNode: TableCard + category: construction-category-furniture + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + - type: construction id: TableReinforcedGlass graph: Table diff --git a/Resources/Prototypes/Recipes/Construction/structures.yml b/Resources/Prototypes/Recipes/Construction/structures.yml index 1335c6400c..ed533bcc52 100644 --- a/Resources/Prototypes/Recipes/Construction/structures.yml +++ b/Resources/Prototypes/Recipes/Construction/structures.yml @@ -207,6 +207,19 @@ conditions: - !type:TileNotBlocked +- type: construction + id: Cardwall + graph: Cardwall + startNode: start + targetNode: cardwall + category: construction-category-structures + conditions: + - !type:TileNotBlocked + failIfSpace: false + objectType: Structure + placementMode: SnapgridCenter + canRotate: false + - type: construction id: Grille graph: Grille @@ -1192,6 +1205,16 @@ placementMode: SnapgridCenter canBuildInImpassable: false +- type: construction + id: CardDoor + graph: DoorGraph + startNode: start + targetNode: cardDoor + category: construction-category-structures + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + - type: construction id: PlasticFlapsClear name: construction-recipe-plastic-flaps-clear diff --git a/Resources/Prototypes/Recipes/Construction/weapons.yml b/Resources/Prototypes/Recipes/Construction/weapons.yml index 290dc30099..d1ecbc552d 100644 --- a/Resources/Prototypes/Recipes/Construction/weapons.yml +++ b/Resources/Prototypes/Recipes/Construction/weapons.yml @@ -102,6 +102,14 @@ category: construction-category-weapons objectType: Item +- type: construction + id: CardShield + graph: CardShield + startNode: start + targetNode: cardShield + category: construction-category-weapons + objectType: Item + - type: construction id: MakeshiftShield graph: MakeshiftShield @@ -142,6 +150,14 @@ category: construction-category-weapons objectType: Item +- type: construction + id: CardArrow + graph: CardArrow + startNode: start + targetNode: CardArrow + category: construction-category-weapons + objectType: Item + - type: construction id: ImprovisedBow graph: ImprovisedBow @@ -165,3 +181,11 @@ targetNode: icon category: construction-category-weapons objectType: Item + +- type: construction + id: CardSword + graph: CardSword + startNode: start + targetNode: cardSword + category: construction-category-weapons + objectType: Item diff --git a/Resources/Textures/Clothing/Head/Helmets/card_helmet.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/card_helmet.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..c335b6bbdc Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/card_helmet.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/card_helmet.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/card_helmet.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..0ff496c88e Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/card_helmet.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/card_helmet.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/card_helmet.rsi/icon.png new file mode 100644 index 0000000000..adf3c2807a Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/card_helmet.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/card_helmet.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/card_helmet.rsi/meta.json new file mode 100644 index 0000000000..6027df662b --- /dev/null +++ b/Resources/Textures/Clothing/Head/Helmets/card_helmet.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites by TaoNewt (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/card_armour.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Armor/card_armour.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..a0d570b468 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/card_armour.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/card_armour.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/card_armour.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..4605c87ea4 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/card_armour.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/card_armour.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/card_armour.rsi/icon.png new file mode 100644 index 0000000000..2fac5a732e Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/card_armour.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/card_armour.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/card_armour.rsi/meta.json new file mode 100644 index 0000000000..85b68f67c8 --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Armor/card_armour.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites by TaoNewt (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Fun/card_sword.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Fun/card_sword.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..e7ae945d84 Binary files /dev/null and b/Resources/Textures/Objects/Fun/card_sword.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Fun/card_sword.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Fun/card_sword.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000..e7ae945d84 Binary files /dev/null and b/Resources/Textures/Objects/Fun/card_sword.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/Objects/Fun/card_sword.rsi/icon.png b/Resources/Textures/Objects/Fun/card_sword.rsi/icon.png new file mode 100644 index 0000000000..281d243a52 Binary files /dev/null and b/Resources/Textures/Objects/Fun/card_sword.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Fun/card_sword.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/card_sword.rsi/inhand-left.png new file mode 100644 index 0000000000..b5dc4c4116 Binary files /dev/null and b/Resources/Textures/Objects/Fun/card_sword.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Fun/card_sword.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/card_sword.rsi/inhand-right.png new file mode 100644 index 0000000000..706e11ef32 Binary files /dev/null and b/Resources/Textures/Objects/Fun/card_sword.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Fun/card_sword.rsi/meta.json b/Resources/Textures/Objects/Fun/card_sword.rsi/meta.json new file mode 100644 index 0000000000..dfbec476c3 --- /dev/null +++ b/Resources/Textures/Objects/Fun/card_sword.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites by TaoNewt (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Melee/shields.rsi/cardshield-icon.png b/Resources/Textures/Objects/Weapons/Melee/shields.rsi/cardshield-icon.png new file mode 100644 index 0000000000..f73eb51293 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/shields.rsi/cardshield-icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/shields.rsi/cardshield-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/shields.rsi/cardshield-inhand-left.png new file mode 100644 index 0000000000..bed0d999c0 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/shields.rsi/cardshield-inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/shields.rsi/cardshield-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/shields.rsi/cardshield-inhand-right.png new file mode 100644 index 0000000000..06c7c32cc4 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/shields.rsi/cardshield-inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/shields.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/shields.rsi/meta.json index 2d2663c158..307cb4bb4a 100644 --- a/Resources/Textures/Objects/Weapons/Melee/shields.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/shields.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/Citadel-Station-13/Citadel-Station-13/commit/84223c65f5caf667a84f3c0f49bc2a41cdc6c4e3", + "copyright": "Taken from https://github.com/Citadel-Station-13/Citadel-Station-13/commit/84223c65f5caf667a84f3c0f49bc2a41cdc6c4e3, card shield sprites by TaoNewt (github)", "size": { "x": 32, "y": 32 @@ -51,6 +51,18 @@ "name": "ratvarian-inhand-left", "directions": 4 }, + { + "name": "cardshield-icon" + }, + { + "name": "cardshield-inhand-right", + "directions": 4 + }, + { + "name": "cardshield-inhand-left", + "directions": 4 + }, + { "name": "mirror-icon", "delays": [ diff --git a/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/closed.png b/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/closed.png new file mode 100644 index 0000000000..442e1df8b6 Binary files /dev/null and b/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/closing.png b/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/closing.png new file mode 100644 index 0000000000..bc769ff0df Binary files /dev/null and b/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/meta.json b/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/meta.json new file mode 100644 index 0000000000..d50a2a8397 --- /dev/null +++ b/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/meta.json @@ -0,0 +1,57 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites by TaoNewt (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "closed", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "closing", + "directions": 1, + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "open", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "opening", + "directions": 1, + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + } + ] +} diff --git a/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/open.png b/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/open.png new file mode 100644 index 0000000000..c773a61cd1 Binary files /dev/null and b/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/opening.png b/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/opening.png new file mode 100644 index 0000000000..c26d93225e Binary files /dev/null and b/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_0.png b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_0.png new file mode 100644 index 0000000000..f165ae6673 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_0.png differ diff --git a/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_1.png b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_1.png new file mode 100644 index 0000000000..842e29f0f3 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_1.png differ diff --git a/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_2.png b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_2.png new file mode 100644 index 0000000000..2975c479be Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_2.png differ diff --git a/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_3.png b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_3.png new file mode 100644 index 0000000000..842e29f0f3 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_3.png differ diff --git a/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_4.png b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_4.png new file mode 100644 index 0000000000..7ecec5ee70 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_4.png differ diff --git a/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_5.png b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_5.png new file mode 100644 index 0000000000..3fd87a6de3 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_5.png differ diff --git a/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_6.png b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_6.png new file mode 100644 index 0000000000..7ecec5ee70 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_6.png differ diff --git a/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_7.png b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_7.png new file mode 100644 index 0000000000..a6e84b4d43 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_7.png differ diff --git a/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/full.png b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/full.png new file mode 100644 index 0000000000..43fbf2fbe7 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/full.png differ diff --git a/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/meta.json b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/meta.json new file mode 100644 index 0000000000..b67903f65e --- /dev/null +++ b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/meta.json @@ -0,0 +1,46 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites by TaoNewt (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full" + }, + { + "name": "carpet_0", + "directions": 4 + }, + { + "name": "carpet_1", + "directions": 4 + }, + { + "name": "carpet_2", + "directions": 4 + }, + { + "name": "carpet_3", + "directions": 4 + }, + { + "name": "carpet_4", + "directions": 4 + }, + { + "name": "carpet_5", + "directions": 4 + }, + { + "name": "carpet_6", + "directions": 4 + }, + { + "name": "carpet_7", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Structures/Furniture/Tables/card.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/card.rsi/full.png new file mode 100644 index 0000000000..dde5d4d9c7 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/card.rsi/full.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/card.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/card.rsi/meta.json new file mode 100644 index 0000000000..1f73612ec2 --- /dev/null +++ b/Resources/Textures/Structures/Furniture/Tables/card.rsi/meta.json @@ -0,0 +1,163 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites by TaoNewt (github)", + "states": [ + { + "name": "full", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "state_0", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_1", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_2", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_3", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_4", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_5", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_6", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "state_7", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + } + ] +} diff --git a/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_0.png new file mode 100644 index 0000000000..7234b73890 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_0.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_1.png new file mode 100644 index 0000000000..f2f8df413b Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_1.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_2.png new file mode 100644 index 0000000000..7234b73890 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_2.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_3.png new file mode 100644 index 0000000000..42273c1071 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_3.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_4.png new file mode 100644 index 0000000000..f280789f09 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_4.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_5.png new file mode 100644 index 0000000000..b1fad514ec Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_5.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_6.png new file mode 100644 index 0000000000..16cd343dfc Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_6.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_7.png new file mode 100644 index 0000000000..1bdaad3abe Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_7.png differ diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/card-stool.png b/Resources/Textures/Structures/Furniture/chairs.rsi/card-stool.png new file mode 100644 index 0000000000..7e7ca14b74 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/chairs.rsi/card-stool.png differ diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json b/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json index 435b686c72..1616f665c8 100644 --- a/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json +++ b/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json @@ -102,6 +102,10 @@ { "name": "xeno-chair", "directions": 4 + }, + { + "name": "card-stool", + "directions": 4 } ] } diff --git a/Resources/Textures/Structures/Walls/card.rsi/card0.png b/Resources/Textures/Structures/Walls/card.rsi/card0.png new file mode 100644 index 0000000000..aca7f7cc5d Binary files /dev/null and b/Resources/Textures/Structures/Walls/card.rsi/card0.png differ diff --git a/Resources/Textures/Structures/Walls/card.rsi/card1.png b/Resources/Textures/Structures/Walls/card.rsi/card1.png new file mode 100644 index 0000000000..f0550405f6 Binary files /dev/null and b/Resources/Textures/Structures/Walls/card.rsi/card1.png differ diff --git a/Resources/Textures/Structures/Walls/card.rsi/card2.png b/Resources/Textures/Structures/Walls/card.rsi/card2.png new file mode 100644 index 0000000000..aca7f7cc5d Binary files /dev/null and b/Resources/Textures/Structures/Walls/card.rsi/card2.png differ diff --git a/Resources/Textures/Structures/Walls/card.rsi/card3.png b/Resources/Textures/Structures/Walls/card.rsi/card3.png new file mode 100644 index 0000000000..e9760a8a0d Binary files /dev/null and b/Resources/Textures/Structures/Walls/card.rsi/card3.png differ diff --git a/Resources/Textures/Structures/Walls/card.rsi/card4.png b/Resources/Textures/Structures/Walls/card.rsi/card4.png new file mode 100644 index 0000000000..a51edee25d Binary files /dev/null and b/Resources/Textures/Structures/Walls/card.rsi/card4.png differ diff --git a/Resources/Textures/Structures/Walls/card.rsi/card5.png b/Resources/Textures/Structures/Walls/card.rsi/card5.png new file mode 100644 index 0000000000..6741c5e94e Binary files /dev/null and b/Resources/Textures/Structures/Walls/card.rsi/card5.png differ diff --git a/Resources/Textures/Structures/Walls/card.rsi/card6.png b/Resources/Textures/Structures/Walls/card.rsi/card6.png new file mode 100644 index 0000000000..b26b5feb57 Binary files /dev/null and b/Resources/Textures/Structures/Walls/card.rsi/card6.png differ diff --git a/Resources/Textures/Structures/Walls/card.rsi/card7.png b/Resources/Textures/Structures/Walls/card.rsi/card7.png new file mode 100644 index 0000000000..c70786eabf Binary files /dev/null and b/Resources/Textures/Structures/Walls/card.rsi/card7.png differ diff --git a/Resources/Textures/Structures/Walls/card.rsi/full.png b/Resources/Textures/Structures/Walls/card.rsi/full.png new file mode 100644 index 0000000000..6170c2a04a Binary files /dev/null and b/Resources/Textures/Structures/Walls/card.rsi/full.png differ diff --git a/Resources/Textures/Structures/Walls/card.rsi/meta.json b/Resources/Textures/Structures/Walls/card.rsi/meta.json new file mode 100644 index 0000000000..baafe2f140 --- /dev/null +++ b/Resources/Textures/Structures/Walls/card.rsi/meta.json @@ -0,0 +1,46 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites by TaoNewt (github)", + "states": [ + { + "name": "full" + }, + { + "name": "card0", + "directions": 4 + }, + { + "name": "card1", + "directions": 4 + }, + { + "name": "card2", + "directions": 4 + }, + { + "name": "card3", + "directions": 4 + }, + { + "name": "card4", + "directions": 4 + }, + { + "name": "card5", + "directions": 4 + }, + { + "name": "card6", + "directions": 4 + }, + { + "name": "card7", + "directions": 4 + } + ] +} \ No newline at end of file