Make recyclers great again (#6653)

Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-02-21 14:39:24 +11:00
parent 1cacaebf2d
commit f9c853f100
39 changed files with 181 additions and 66 deletions
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -2104,6 +2104,7 @@
    sprite: Objects/Consumable/Drinks/ramen.rsi
  - type: Tag
    tags:
+    - Recyclable
    - Trash
  - type: Recyclable

--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
@@ -36,6 +36,7 @@
      stateOpen: icon_open
  - type: Tag
    tags:
+    - Recyclable
    - Trash
  - type: ItemCooldown
  - type: Recyclable
@@ -56,6 +57,7 @@
  - type: Tag
    tags:
    - Cola
+    - Recyclable
    - Trash
  - type: Sprite
    sprite: Objects/Consumable/Drinks/cola.rsi
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml
@@ -52,6 +52,7 @@
        acts: [ "Destruction" ]
  - type: Tag
    tags:
+    - Recyclable
    - Trash
  - type: Recyclable

--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml
@@ -55,6 +55,7 @@
    netsync: false
  - type: Tag
    tags:
+    - Recyclable
    - Trash
  - type: Recyclable

--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/food_base.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/food_base.yml
@@ -7,6 +7,7 @@
  abstract: true
  components:
  - type: Food
+  - type: Recyclable
  - type: Sprite
    netsync: false

--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -195,6 +195,7 @@
        - SmallImpassable
  - type: Tag
    tags:
+    - Recyclable
    - Trash
  - type: SolutionContainerManager
    solutions:
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
@@ -208,6 +208,7 @@
    HeldPrefix: packet
  - type: Tag
    tags:
+    - Recyclable
    - Trash
  - type: Recyclable

--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml
@@ -23,6 +23,7 @@
        openIcon: open
  - type: Tag
    tags:
+    - Recyclable
    - Trash
  - type: Recyclable

--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
@@ -14,6 +14,7 @@
  - type: Tag
    tags:
      - Cigarette
+      - Recyclable
      - Trash
  - type: Recyclable
  - type: Clothing
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/joints.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/joints.yml
@@ -11,6 +11,7 @@
  - type: Tag
    tags:
      - Cigarette
+      - Recyclable
      - Trash
  - type: Recyclable
  - type: Clothing
@@ -42,6 +43,7 @@
  - type: Tag
    tags:
      - Cigarette
+      - Recyclable
      - Trash
  - type: Recyclable
  - type: Clothing
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
@@ -7,6 +7,7 @@
  - type: Tag
    tags:
    - CigPack
+    - Recyclable
    - Trash
  - type: Recyclable
  - type: Storage
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml
@@ -57,6 +57,7 @@
    size: 2
  - type: Tag
    tags:
+    - Recyclable
    - RollingPaper
    - Trash
  - type: Recyclable
@@ -80,5 +81,6 @@
  - type: Tag
    tags:
    - CigFilter
+    - Recyclable
    - Trash
  - type: Recyclable
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/base_smokeables.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/base_smokeables.yml
@@ -12,6 +12,7 @@
      - type: BurnStateVisualizer
  - type: Tag
    tags:
+    - Recyclable
    - Trash
  - type: Recyclable

--- a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
@@ -9,6 +9,7 @@
    tags:
    - Write
    - Crayon
+    - Recyclable
    - Trash
  - type: Recyclable
  - type: UserInterface
@@ -38,6 +39,7 @@
    - Write
    - Crayon
    - CrayonWhite
+    - Recyclable
    - Trash

 - type: entity
@@ -60,6 +62,7 @@
    - Write
    - Crayon
    - CrayonWhite
+    - Recyclable
    - Trash

 - type: entity
@@ -82,6 +85,7 @@
    - Write
    - Crayon
    - CrayonBlack
+    - Recyclable
    - Trash

 - type: entity
@@ -104,6 +108,7 @@
    - Write
    - Crayon
    - CrayonRed
+    - Recyclable
    - Trash

 - type: entity
@@ -126,6 +131,7 @@
    - Write
    - Crayon
    - CrayonOrange
+    - Recyclable
    - Trash

 - type: entity
@@ -148,6 +154,7 @@
    - Write
    - Crayon
    - CrayonYellow
+    - Recyclable
    - Trash

 - type: entity
@@ -170,6 +177,7 @@
    - Write
    - Crayon
    - CrayonGreen
+    - Recyclable
    - Trash

 - type: entity
@@ -192,6 +200,7 @@
    - Write
    - Crayon
    - CrayonBlue
+    - Recyclable
    - Trash

 - type: entity
@@ -214,6 +223,7 @@
    - Write
    - Crayon
    - CrayonPurple
+    - Recyclable
    - Trash

 - type: entity
--- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
@@ -25,6 +25,7 @@
        Slash: 2
  - type: Tag
    tags:
+    - Recyclable
    - Trash
  - type: Recyclable

--- a/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
@@ -20,6 +20,7 @@
        Slash: 2
  - type: Tag
    tags:
+    - Recyclable
    - Trash
  - type: Recyclable

--- a/Resources/Prototypes/Entities/Objects/Misc/utensils.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/utensils.yml
@@ -9,6 +9,7 @@
    sprite: Objects/Misc/utensils.rsi
  - type: Tag
    tags:
+    - Recyclable
    - Trash
  - type: Recyclable

--- a/Resources/Prototypes/Entities/Objects/Power/lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/lights.yml
@@ -54,6 +54,7 @@
    - type: LightBulbVisualizer
  - type: Tag
    tags:
+    - Recyclable
    - Trash
  - type: Recyclable

--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -51,6 +51,7 @@
      emptySpriteName: medipen_empty
  - type: Tag
    tags:
+    - Recyclable
    - Trash
  - type: Recyclable

--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
@@ -8,6 +8,7 @@
  - type: Tag
    tags:
    - Bottle
+    - Recyclable
    - Trash
  - type: Recyclable
  - type: Sprite
--- a/Resources/Prototypes/Entities/Objects/Tools/flare.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/flare.yml
@@ -7,6 +7,7 @@
  - type: Tag
    tags:
    - Flare
+    - Recyclable
    - Trash
  - type: Recyclable
  - type: ExpendableLight
--- a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml
@@ -6,6 +6,7 @@
  components:
    - type: Tag
      tags:
+      - Recyclable
      - Trash
    - type: Recyclable
    - type: ExpendableLight
--- a/Resources/Prototypes/Entities/Objects/Tools/matches.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/matches.yml
@@ -17,6 +17,7 @@
  - type: Tag
    tags:
    - Matchstick
+    - Recyclable
    - Trash
  - type: Recyclable
  - type: Sprite
@@ -80,5 +81,6 @@
          - matchbox3
  - type: Tag
    tags:
+    - Recyclable
    - Trash
  - type: Recyclable
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/BaseCartridge.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/BaseCartridge.yml
@@ -6,6 +6,7 @@
  - type: Tag
    tags:
    - Cartridge
+    - Recyclable
  - type: Item
    size: 1
  - type: Recyclable
--- a/Resources/Prototypes/Entities/Structures/Machines/recycler.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/recycler.yml
@@ -4,22 +4,40 @@
  name: recycler
  description: A large crushing machine used to recycle small items inefficiently. There are lights on the side.
  components:
+  - type: AmbientSound
+    enabled: false
+    volume: -8
+    range: 5
+    sound:
+      # TODO: https://freesound.org/people/derjuli/sounds/448133/ CC-NC-
+      path: /Audio/Ambience/Objects/circular_saw.ogg
  - type: Physics
  - type: Fixtures
    fixtures:
    - shape:
        !type:PhysShapeAabb
-          bounds: "-0.49,-0.49,0.49,0.49"
+          bounds: "-0.2,-0.2,0.2,0.2"
+      id: brrt
      hard: false
      layer:
      - Opaque
      - Impassable
      - MobImpassable
      - VaultImpassable
+    - shape:
+        !type:PhysShapeAabb
+          bounds: "-0.49,-0.49,0.49,0.49"
+      id: collision
+      hard: true
+      mask:
+      - Impassable
+      layer:
+        - Opaque
  - type: Transform
    anchored: true
  - type: Sprite
    netsync: false
+    drawdepth: Doors
    sprite: Structures/Machines/recycling.rsi
    layers:
    - state: grinder-o0