Merge remote-tracking branch 'upstream/master' into ups

This commit is contained in:
Jabak
2024-08-01 11:20:57 +03:00
576 changed files with 102382 additions and 87280 deletions

View File

@@ -80,7 +80,7 @@
stackEntity: MaterialBananium1
name: materials-bananium
unit: materials-unit-bunch
icon: { sprite: Objects/Materials/materials.rsi, state: bananium }
icon: { sprite: White/Objects/Materials/materials.rsi, state: bananium }
color: "#32a852"
price: 0.2
@@ -123,4 +123,4 @@
unit: materials-unit-piece
icon: { sprite: Objects/Misc/reagent_fillings.rsi, state: powderpile }
color: "#A9A9A9"
price: 0
price: 0