Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[NeoDays] Fillout #2195

Merged
merged 15 commits into from
Nov 16, 2023
Merged

[NeoDays] Fillout #2195

merged 15 commits into from
Nov 16, 2023

Conversation

Golfavel
Copy link
Contributor

Summary

Various sprites with minimal association

Content of the change

Adds:

  • Solid hydrogen canister
  • Inflatable boat
  • (generic) engine block
  • Pair of kiddie scissors
  • Pair of wavy scissors
  • Pair of medical scissors
  • Battlefield cross
  • Coffee pot
  • Wallet
  • Large wallet
  • Leather wallet
  • Travel wallet
  • Duct tape wallet
  • Pencil sharpener
  • Pencil case
  • Tear gas sprayer
  • Metal trash can
  • Industrial trash can (vehicle part)
  • Industrial trash can (item)
  • Trash can (item)
  • Disconnected refrigerator
  • Disconnected glass door refrigerator

Changes:

  • Coffeemaker
  • Atomic coffeemaker
  • Trash can (furniture)

Connects:

  • Various rebreather filters to canned clams
  • Various rebreather cartridges to 'rebreather_filter'
  • Various mask cartridges to 'rebreather_filter'
  • Various welding blankets to emergency blanket
  • Drill press (appliance) to drill press (furniture)
  • Sample freezer to freezer
  • Polaroid photo to family photo
  • Photograph to family photo

Testing

Before
neo_es6cbef
After
neo_es6caft

Additional information

connected: various rebreather fillters with canned clams; various rebreather cartridges and various mask cartridges with 'rebreather_filter'
connected: various welding blankets with emergency blanket
changed: coffeemaker, atomic coffee maker (shifted pixels down one)
cleaned: razorblade
…n (item), industrial trash can (item)

changed: trash can (furniture)
@Fris0uman Fris0uman merged commit a0ef628 into I-am-Erk:master Nov 16, 2023
1 check passed
@Golfavel Golfavel deleted the neo_filout branch November 16, 2023 21:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants