Merge remote-tracking branch 'space-station-14/master' into new-upstream

2024-04-09 12:15:46 +03:00
parent 9597d6a84a 813a0b7b7f
commit 9ca762564c
2 changed files with 9 additions and 1 deletions
--- a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
+++ b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
@@ -135,7 +135,7 @@
  - type: RCDDeconstructable
    cost: 2
    delay: 2
-    fx: EffectRCDDeconstruct2
+    fx: EffectRCDDeconstruct2  
  - type: Clickable
  - type: InteractionOutline
  - type: Sprite
--- a/Resources/Textures/_CP14/Structures/Furniture/chairs.rsi/meta.json
+++ b/Resources/Textures/_CP14/Structures/Furniture/chairs.rsi/meta.json
@@ -1,15 +1,23 @@
 {
  "version": 1,
  "license": "CC-BY-SA-3.0",
+<<<<<<<< HEAD:Resources/Textures/_CP14/Structures/Furniture/chairs.rsi/meta.json
  "copyright": "Created by TheShuEd (Github) for CrystallPunk 14",
+========
+  "copyright": "Made by SlamBamActionman",
+>>>>>>>> space-station-14/master:Resources/Textures/Objects/Misc/cd.rsi/meta.json
  "size": {
    "x": 32,
    "y": 32
  },
  "states": [
    {
+<<<<<<<< HEAD:Resources/Textures/_CP14/Structures/Furniture/chairs.rsi/meta.json
      "name": "wooden",
      "directions": 4
+========
+      "name": "icon"
+>>>>>>>> space-station-14/master:Resources/Textures/Objects/Misc/cd.rsi/meta.json
    }
  ]
 }