Skip to content

Commit

Permalink
Botany Furniture and Fixes (#581)
Browse files Browse the repository at this point in the history
* remove leftover meta file

* Fix materials

Some objects were missing their materials and others had to be re-exported entirely because of their materials names (palette05.004, e.g.)

Also re-adds the alt styled sleeper and cryotube

* move microwave scrip into microwave folder

* Fix beakers

- fix mesh
- fix origin placements
- adds lids

* Add botany machine models

Adds Dirt Mound, Seed Processor, Hydro Tray, & Biogenerator

* Fix vending machines

Rotation and some object names

* Adds botany vendors

* Update map

- Adds hydro furniture to the empty room
- Adds general equpment and piping for vent, scrubbers, & disposals
- Adds a sink to the kitchen

* Rename folder

Renamed "Junk Food" folders to "Snacks"

* Add food folders and organized food files

* Last map save

* Remove spare folders

* Fixes

- Fixed rotations on biogenerator, seed processor, & beaker
- Fixed Beaker prefabs again
- Fixed Dirt mound fbx material

* Model and prefab fixes

Co-authored-by: João Buratto <[email protected]>
  • Loading branch information
cosmiccoincidence and joaoburatto authored Dec 22, 2020
1 parent c9a2e9c commit 638f981
Show file tree
Hide file tree
Showing 152 changed files with 18,187 additions and 9,355 deletions.
Binary file modified Assets/Art/Models/Furniture/Generic/Seats/chairs.fbx
Binary file not shown.
6 changes: 6 additions & 0 deletions Assets/Art/Models/Furniture/Generic/Seats/chairs.fbx.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Assets/Art/Models/Furniture/Machines/Atmospherics/canisters.fbx
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Assets/Art/Models/Furniture/Machines/Engineering/Solar Panel.fbx
Binary file not shown.
Binary file modified Assets/Art/Models/Furniture/Machines/Kitchen/blender.fbx
Binary file not shown.
5 changes: 5 additions & 0 deletions Assets/Art/Models/Furniture/Machines/Kitchen/blender.fbx.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Assets/Art/Models/Furniture/Machines/Kitchen/microwave.fbx
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Assets/Art/Models/Furniture/Machines/Medical/Sleeper Bed.fbx
Binary file not shown.
Binary file modified Assets/Art/Models/Furniture/Machines/Medical/cryotube.fbx
Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Assets/Art/Models/Furniture/Storage/fridge.fbx
Binary file not shown.
Binary file modified Assets/Art/Models/Furniture/Storage/janitorial cart.fbx
Binary file not shown.
5 changes: 5 additions & 0 deletions Assets/Art/Models/Furniture/Storage/janitorial cart.fbx.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Assets/Art/Models/Items/Consumables/Food/General/Grain.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Assets/Art/Models/Items/Consumables/Food/General/Snacks.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Assets/Art/Models/Items/Consumables/Food/Meals.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Assets/Art/Models/Items/Functional/Generic/Floor Tile.fbx
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Assets/Art/Models/Items/Functional/Generic/boombox.fbx
Binary file not shown.
Binary file modified Assets/Art/Models/Items/Functional/Parts/light frames and bulbs.fbx
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Assets/Art/Models/Items/Functional/Tools/Generic/welders.fbx
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Assets/Art/Models/Structures/Doors/airlocks.fbx
Binary file not shown.
11 changes: 11 additions & 0 deletions Assets/Art/Models/Structures/Doors/airlocks.fbx.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file removed Assets/Art/Models/Structures/Pipes/Scrubber.fbx
Binary file not shown.
Binary file removed Assets/Art/Models/Structures/Pipes/Vent.fbx
Binary file not shown.
Binary file modified Assets/Art/Models/Structures/Wall Mounts/Fire Alarm.fbx
Binary file not shown.
Binary file modified Assets/Art/Models/Structures/Wall Mounts/Light Switch.fbx
Binary file not shown.
10 changes: 10 additions & 0 deletions Assets/Art/Models/Structures/Wall Mounts/Light Switch.fbx.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Assets/Art/Models/Structures/Wall Mounts/light fixtures.fbx
Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Assets/Content/Furniture/Machines/Botany.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions Assets/Content/Furniture/Machines/Botany/Biogenerator.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6d14215af6993f44280475b2ae2470c6, type: 3}
m_Name: Biogenerator
m_EditorClassIdentifier:
id: biogenerator
genericType: furniture
prefab: {fileID: 1769453492926099347, guid: 9d688b1b7995f5846aca9597f2b27ee3, type: 3}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 638f981

Please sign in to comment.