[NeoDays] Fillout (I-am-Erk#2195)

* added: solid hydrogen canister connected: various rebreather fillters with canned clams; various rebreather cartridges and various mask cartridges with 'rebreather_filter' * added: folded inflatable boat * fixed: missing 'generic_folded_vehicle' * added: engine block connected: various welding blankets with emergency blanket * added: various scissors * added: battlefield cross * connected: drill press (appliance) to drill press (furniture) * added: coffee pot changed: coffeemaker, atomic coffee maker (shifted pixels down one) * added: various wallets * added: pencil sharpener cleaned: razorblade * added: pencil case * added: tear gas sprayer * added: metal trash can, industrial trash can (vehicle part), trash can (item), industrial trash can (item) changed: trash can (furniture) * added: disconnected refrigerator, disconnected glass door refrigerator connected: sample freezer to freezer * connected: polaroid photo and photograph with family photo
hoasd1 · Nov 16, 2023 · a0ef628 · a0ef628
1 parent 6a9a33e
commit a0ef628
Show file tree

Hide file tree

Showing 41 changed files with 59 additions and 5 deletions.
diff --git a/gfx/NeoDays/pngs_tiles_10x10/furniture/outdoors/f_battlefield_cross.png b/gfx/NeoDays/pngs_tiles_10x10/furniture/outdoors/f_battlefield_cross.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/furniture/outdoors/f_trashcan.png b/gfx/NeoDays/pngs_tiles_10x10/furniture/outdoors/f_trashcan.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_drill_press.json b/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_drill_press.json
@@ -0,0 +1,7 @@
+{
+  "id": [
+    "f_drill_press",
+    "vp_ap_drill_press"
+  ],
+  "fg": "f_drill_press"
+}
diff --git a/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_freezer.json b/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_freezer.json
@@ -1,7 +1,8 @@
 {
   "id": [
     "f_freezer",
-    "vp_ap_freezer"
+    "vp_ap_freezer",
+    "f_sample_freezer"
   ],
   "fg": "f_freezer"
 }
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/ammunition/firearms/plasma.png b/gfx/NeoDays/pngs_tiles_10x10/items/ammunition/firearms/plasma.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/deployables/f_metal_trashcan.png b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/f_metal_trashcan.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/deployables/fridge.png b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/fridge.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/deployables/glass_fridge.png b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/glass_fridge.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/deployables/trashcan.png b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/trashcan.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/deployables/trashcan_large.png b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/trashcan_large.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/emer_blanket.json b/gfx/NeoDays/pngs_tiles_10x10/items/emer_blanket.json
@@ -0,0 +1,9 @@
+{
+  "id": [
+    "emer_blanket",
+    "welding_blanket",
+    "makeshift_welding_blanket",
+    "generic_folded_vehicle"
+  ],
+  "fg": "emer_blanket"
+}
diff --git a/...tiles_10x10/items/1674_emer_blanket_0.png → ...s/pngs_tiles_10x10/items/emer_blanket.png b/...tiles_10x10/items/1674_emer_blanket_0.png → ...s/pngs_tiles_10x10/items/emer_blanket.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/emer_blanket_generic_folded_vehicle_0.json b/gfx/NeoDays/pngs_tiles_10x10/items/emer_blanket_generic_folded_vehicle_0.json
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/engine_block.json b/gfx/NeoDays/pngs_tiles_10x10/items/engine_block.json
@@ -0,0 +1,10 @@
+{
+  "id": [
+    "engine_block_tiny",
+    "engine_block_small",
+    "engine_block_medium",
+    "engine_block_large",
+    "engine_block_massive"
+  ],
+  "fg": "engine_block"
+}
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/engine_block.png b/gfx/NeoDays/pngs_tiles_10x10/items/engine_block.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/family_photo.json b/gfx/NeoDays/pngs_tiles_10x10/items/family_photo.json
@@ -0,0 +1,8 @@
+{
+  "id": [
+    "family_photo",
+    "wallet_photo",
+    "polaroid_photo"
+  ],
+  "fg": "family_photo"
+}
diff --git a/...tiles_10x10/items/3072_family_photo_0.png → ...s/pngs_tiles_10x10/items/family_photo.png b/...tiles_10x10/items/3072_family_photo_0.png → ...s/pngs_tiles_10x10/items/family_photo.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/family_photo_0.json b/gfx/NeoDays/pngs_tiles_10x10/items/family_photo_0.json
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/pencil_case.png b/gfx/NeoDays/pngs_tiles_10x10/items/pencil_case.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/piles/can_clams.json b/gfx/NeoDays/pngs_tiles_10x10/items/piles/can_clams.json
@@ -40,6 +40,8 @@
     "teargas_spray",
     "chem_washing_soda",
     "hominy",
+    "rebreather_filler_ko2",
+    "rebreather_filler_soda_lime",
     "albuterol"
   ],
   "fg": "can_clams"

diff --git a/...x10/items/plasma_charge_shot_rebreather_filter_gasfilter_s_gasfilter_m_gasfilter_l_0.json b/...x10/items/plasma_charge_shot_rebreather_filter_gasfilter_s_gasfilter_m_gasfilter_l_0.json
diff --git a/..._tiles_10x10/items/2118_razor_blade_0.png → ...ys/pngs_tiles_10x10/items/razor_blade.png b/..._tiles_10x10/items/2118_razor_blade_0.png → ...ys/pngs_tiles_10x10/items/razor_blade.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/razor_blade_0.json b/gfx/NeoDays/pngs_tiles_10x10/items/razor_blade_0.json
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/rebreather_filter.json b/gfx/NeoDays/pngs_tiles_10x10/items/rebreather_filter.json
@@ -0,0 +1,14 @@
+{
+  "id": [
+    "rebreather_filter",
+    "rebreather_cartridge_regen",
+    "rebreather_cartridge_o2",
+    "rebreather_cartridge_air",
+    "gasfilter_s",
+    "gasfilter_sm",
+    "gasfilter_m",
+    "gasfilter_med",
+    "gasfilter_l"
+  ],
+  "fg": "rebreather_filter"
+}
diff --git a/.../pngs_tiles_10x10/items/1228_plasma_0.png → ...s_tiles_10x10/items/rebreather_filter.png b/.../pngs_tiles_10x10/items/1228_plasma_0.png → ...s_tiles_10x10/items/rebreather_filter.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/sharpener.png b/gfx/NeoDays/pngs_tiles_10x10/items/sharpener.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/tools/kitchenware/atomic_coffeepot.png b/gfx/NeoDays/pngs_tiles_10x10/items/tools/kitchenware/atomic_coffeepot.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/tools/kitchenware/coffeemaker.png b/gfx/NeoDays/pngs_tiles_10x10/items/tools/kitchenware/coffeemaker.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/tools/kitchenware/coffeepot.png b/gfx/NeoDays/pngs_tiles_10x10/items/tools/kitchenware/coffeepot.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/tools/scissors_child.png b/gfx/NeoDays/pngs_tiles_10x10/items/tools/scissors_child.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/tools/scissors_medical.png b/gfx/NeoDays/pngs_tiles_10x10/items/tools/scissors_medical.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/tools/scissors_wavy.png b/gfx/NeoDays/pngs_tiles_10x10/items/tools/scissors_wavy.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/vehicle/folded_inflatable_boat.png b/gfx/NeoDays/pngs_tiles_10x10/items/vehicle/folded_inflatable_boat.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/wallet.png b/gfx/NeoDays/pngs_tiles_10x10/items/wallet.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/wallet_duct_tape.png b/gfx/NeoDays/pngs_tiles_10x10/items/wallet_duct_tape.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/wallet_large.png b/gfx/NeoDays/pngs_tiles_10x10/items/wallet_large.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/wallet_leather.json b/gfx/NeoDays/pngs_tiles_10x10/items/wallet_leather.json
@@ -0,0 +1,7 @@
+{
+  "id": [
+    "wallet_leather",
+    "wallet_stylish"
+  ],
+  "fg": "wallet_leather"
+}
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/wallet_leather.png b/gfx/NeoDays/pngs_tiles_10x10/items/wallet_leather.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/weaponry/teargas_sprayer.png b/gfx/NeoDays/pngs_tiles_10x10/items/weaponry/teargas_sprayer.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/vehicle/vp_integrated_trashcan.png b/gfx/NeoDays/pngs_tiles_10x10/vehicle/vp_integrated_trashcan.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/wearables/head/wallet_travel.png b/gfx/NeoDays/pngs_tiles_10x10/wearables/head/wallet_travel.png