From 4bab2794c51e9efcb1277e8c9d53c77b449bce35 Mon Sep 17 00:00:00 2001 From: Golfavel <32048635+Golfavel@users.noreply.github.com> Date: Thu, 8 Dec 2022 13:02:54 -0700 Subject: [PATCH] [NeoDays] Random additions and fixes (#1728) * added: (item) box archery target, armored training dummy, training dummy cleaned: large box * added: deck chair * connected: visitors pass with science id cleaned: loyalty card, various gas cards, military id * connected: various engines to combustion engine * moved: archery target box, hobo stove, minifreezer, minifridge, and various training dummies to deployables/ * added: wood stool (item) connected: black and white chairs to stool * added: unique log stool (furniture) sprite, log stool (item) * fixed: various nre printouts * added: book pieces connected: ruined book to brown book, movie poster to missing poster, urban explorer map to road map * added: aquerque, ambuscade * added: armchair (item), figurine, shark plushie, cheese grater * connected: various cbms to bionic * added: various cbm installation data * added: various dog tags changed: brush * added: various squeeze tubes cleaned: plastic bottle moved: brush to tools/toiletries * connected: propane lantern on and off to smart lamp on and off * added: various jack o lanterns * added: long plank, short plank, crutches, makeshift crutches connected: various makerspace kits to toolbox cleaned: 2x4 * added: plastic tumbler cleaned: glass bottle --- .../pngs_large_20x20/items/plank_long.png | Bin 0 -> 151 bytes .../furniture/indoors/f_stool.json | 4 +- .../furniture/outdoors/f_deckchair.png | Bin 0 -> 171 bytes .../furniture/outdoors/f_logstool.png | Bin 0 -> 128 bytes .../items/{2010_2x4_0.png => 2x4.png} | Bin gfx/NeoDays/pngs_tiles_10x10/items/2x4_0.json | 1 - gfx/NeoDays/pngs_tiles_10x10/items/AID.json | 28 ++++ gfx/NeoDays/pngs_tiles_10x10/items/AID.png | Bin 0 -> 144 bytes ...nace_bio_ethanol_bio_memory_bio_ear_0.json | 1 - .../pngs_tiles_10x10/items/bionic.json | 124 ++++++++++++++++++ .../items/{1211_bio_null_0.png => bionic.png} | Bin .../pngs_tiles_10x10/items/book_pieces.png | Bin 0 -> 132 bytes ...53_bottle_glass_0.png => bottle_glass.png} | Bin .../items/bottle_glass_0.json | 1 - .../items/bottle_plastic.json | 8 ++ ...ttle_twoliter_0.png => bottle_plastic.png} | Bin ...bottle_plastic_bottle_plastic_small_0.json | 1 - .../{3061_box_large_0.png => box_large.png} | Bin .../pngs_tiles_10x10/items/box_large_0.json | 1 - gfx/NeoDays/pngs_tiles_10x10/items/brush.png | Bin 170 -> 0 bytes .../pngs_tiles_10x10/items/brushes_0.json | 1 - .../items/deployables/archery_target_box.png | Bin 0 -> 131 bytes .../items/deployables/armchair.png | Bin 0 -> 130 bytes .../items/{ => deployables}/hobo_stove.json | 0 .../items/{ => deployables}/hobo_stove.png | Bin .../items/{ => deployables}/minifreezer.json | 0 .../items/{ => deployables}/minifreezer.png | Bin .../items/{ => deployables}/minifridge.json | 0 .../items/deployables/stool_log.png | Bin 0 -> 114 bytes .../items/deployables/stool_wood.json | 9 ++ .../items/deployables/stool_wood.png | Bin 0 -> 103 bytes .../deployables/training_dummy_heavy.png | Bin 0 -> 181 bytes .../deployables/training_dummy_light.png | Bin 0 -> 143 bytes .../pngs_tiles_10x10/items/dog_tag.json | 7 + .../pngs_tiles_10x10/items/dog_tag.png | Bin 0 -> 122 bytes .../items/fp_loyalty_card_0.json | 1 - .../items/gasdiscount_gold_cash_card_0.json | 1 - ...iscount_silver_gasdiscount_platinum_0.json | 1 - .../items/generic_figurine_plastic.png | Bin 0 -> 149 bytes .../pngs_tiles_10x10/items/id_military_0.json | 1 - .../pngs_tiles_10x10/items/id_science_0.json | 1 - .../pngs_tiles_10x10/items/plank_short.png | Bin 0 -> 141 bytes .../items/reading/manual_brown.json | 3 +- .../items/reading/missing_poster.json | 3 +- .../pngs_tiles_10x10/items/reading/paper.json | 6 +- .../items/reading/roadmap.json | 3 +- .../pngs_tiles_10x10/items/shark_plushie.png | Bin 0 -> 152 bytes .../pngs_tiles_10x10/items/squeeze_tube.png | Bin 0 -> 131 bytes .../items/squeeze_tube_small.png | Bin 0 -> 125 bytes .../items/tablegames/alquerque.png | Bin 0 -> 106 bytes .../items/tablegames/ambush.png | Bin 0 -> 131 bytes .../items/tools/block_and_tackle.png | Bin 0 -> 132 bytes .../items/tools/block_and_tackle_wood.png | Bin 0 -> 128 bytes .../pngs_tiles_10x10/items/tools/crutches.png | Bin 0 -> 135 bytes .../fp_loyalty_card.png} | Bin .../items/tools/gasdiscount_gold.json | 7 + .../gasdiscount_gold.png} | Bin .../items/tools/gasdiscount_silver.json | 7 + .../gasdiscount_silver.png} | Bin .../id_military.png} | Bin .../items/tools/id_science.json | 7 + .../id_science.png} | Bin .../items/tools/kitchenware/cheese_grater.png | Bin 0 -> 125 bytes .../tools/kitchenware/tumbler_plastic.png | Bin 0 -> 134 bytes .../items/tools/lighting/jackolantern.json | 7 + .../items/tools/lighting/jackolantern.png | Bin 0 -> 142 bytes .../items/tools/lighting/jackolantern_lit.png | Bin 0 -> 157 bytes .../items/tools/lighting/jackolantern_on.json | 7 + .../items/tools/lighting/smart_lamp.json | 3 +- .../items/tools/lighting/smart_lamp_on.json | 3 +- .../items/tools/makeshift_crutches.png | Bin 0 -> 135 bytes .../items/tools/toiletries/brush.png | Bin 0 -> 155 bytes .../items/tools/toiletries/brushes.json | 8 ++ .../items/tools/toolbox_empty.json | 4 +- .../items/vehicle/combustion_engine.json | 11 +- .../items/{ => vehicle}/v_table.json | 0 .../items/{ => vehicle}/veh_tracker.json | 0 .../pngs_tiles_10x10/terrain/t_stump.json | 7 - 78 files changed, 246 insertions(+), 31 deletions(-) create mode 100644 gfx/NeoDays/pngs_large_20x20/items/plank_long.png create mode 100644 gfx/NeoDays/pngs_tiles_10x10/furniture/outdoors/f_deckchair.png create mode 100644 gfx/NeoDays/pngs_tiles_10x10/furniture/outdoors/f_logstool.png rename gfx/NeoDays/pngs_tiles_10x10/items/{2010_2x4_0.png => 2x4.png} (100%) delete mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/2x4_0.json create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/AID.json create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/AID.png delete mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/bio_null_bio_power_storage_bio_power_storage_mkII_bio_batteries_bio_metabolics_bio_solar_bio_torsionratchet_bio_furnace_bio_ethanol_bio_memory_bio_ear_0.json create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/bionic.json rename gfx/NeoDays/pngs_tiles_10x10/items/{1211_bio_null_0.png => bionic.png} (100%) create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/book_pieces.png rename gfx/NeoDays/pngs_tiles_10x10/items/{1153_bottle_glass_0.png => bottle_glass.png} (100%) delete mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/bottle_glass_0.json create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/bottle_plastic.json rename gfx/NeoDays/pngs_tiles_10x10/items/{1149_bottle_twoliter_0.png => bottle_plastic.png} (100%) delete mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/bottle_twoliter_bottle_plastic_bottle_plastic_small_0.json rename gfx/NeoDays/pngs_tiles_10x10/items/{3061_box_large_0.png => box_large.png} (100%) delete mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/box_large_0.json delete mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/brush.png delete mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/brushes_0.json create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/deployables/archery_target_box.png create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/deployables/armchair.png rename gfx/NeoDays/pngs_tiles_10x10/items/{ => deployables}/hobo_stove.json (100%) rename gfx/NeoDays/pngs_tiles_10x10/items/{ => deployables}/hobo_stove.png (100%) rename gfx/NeoDays/pngs_tiles_10x10/items/{ => deployables}/minifreezer.json (100%) rename gfx/NeoDays/pngs_tiles_10x10/items/{ => deployables}/minifreezer.png (100%) rename gfx/NeoDays/pngs_tiles_10x10/items/{ => deployables}/minifridge.json (100%) create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/deployables/stool_log.png create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/deployables/stool_wood.json create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/deployables/stool_wood.png create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/deployables/training_dummy_heavy.png create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/deployables/training_dummy_light.png create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/dog_tag.json create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/dog_tag.png delete mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/fp_loyalty_card_0.json delete mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/gasdiscount_gold_cash_card_0.json delete mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/gasdiscount_silver_gasdiscount_platinum_0.json create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/generic_figurine_plastic.png delete mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/id_military_0.json delete mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/id_science_0.json create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/plank_short.png create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/shark_plushie.png create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/squeeze_tube.png create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/squeeze_tube_small.png create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/tablegames/alquerque.png create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/tablegames/ambush.png create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/tools/block_and_tackle.png create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/tools/block_and_tackle_wood.png create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/tools/crutches.png rename gfx/NeoDays/pngs_tiles_10x10/items/{3029_fp_loyalty_card_0.png => tools/fp_loyalty_card.png} (100%) create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/tools/gasdiscount_gold.json rename gfx/NeoDays/pngs_tiles_10x10/items/{1441_gasdiscount_gold_0.png => tools/gasdiscount_gold.png} (100%) create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/tools/gasdiscount_silver.json rename gfx/NeoDays/pngs_tiles_10x10/items/{1442_gasdiscount_silver_0.png => tools/gasdiscount_silver.png} (100%) rename gfx/NeoDays/pngs_tiles_10x10/items/{1443_id_military_0.png => tools/id_military.png} (100%) create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/tools/id_science.json rename gfx/NeoDays/pngs_tiles_10x10/items/{1444_id_science_0.png => tools/id_science.png} (100%) create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/tools/kitchenware/cheese_grater.png create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/tools/kitchenware/tumbler_plastic.png create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/tools/lighting/jackolantern.json create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/tools/lighting/jackolantern.png create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/tools/lighting/jackolantern_lit.png create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/tools/lighting/jackolantern_on.json create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/tools/makeshift_crutches.png create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/tools/toiletries/brush.png create mode 100644 gfx/NeoDays/pngs_tiles_10x10/items/tools/toiletries/brushes.json rename gfx/NeoDays/pngs_tiles_10x10/items/{ => vehicle}/v_table.json (100%) rename gfx/NeoDays/pngs_tiles_10x10/items/{ => vehicle}/veh_tracker.json (100%) delete mode 100644 gfx/NeoDays/pngs_tiles_10x10/terrain/t_stump.json diff --git a/gfx/NeoDays/pngs_large_20x20/items/plank_long.png b/gfx/NeoDays/pngs_large_20x20/items/plank_long.png new file mode 100644 index 0000000000000000000000000000000000000000..b1726df1cea526eb0f86b564c08299355f4af1a1 GIT binary patch literal 151 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE;AoTrOph{fsT1PRu~2@*_hLRbH* zr?7FaY@0hXlSkaZ)4qFQM`z68w6j*-p^Cz$yvoNM=CnODnmp0zutcZn1f9bLoRe}T z{Fs-kWgoB<*T181%V5!D-i>V!zZ&h_$;DvvTyN!Or&Fmwn;1M@{an^LB{Ts5DuOVp literal 0 HcmV?d00001 diff --git a/gfx/NeoDays/pngs_tiles_10x10/furniture/indoors/f_stool.json b/gfx/NeoDays/pngs_tiles_10x10/furniture/indoors/f_stool.json index fc733998b3..7056c8ec11 100644 --- a/gfx/NeoDays/pngs_tiles_10x10/furniture/indoors/f_stool.json +++ b/gfx/NeoDays/pngs_tiles_10x10/furniture/indoors/f_stool.json @@ -1,7 +1,9 @@ { "id": [ "f_stool", - "f_chair" + "f_chair", + "f_chair_white", + "f_chair_black" ], "fg": "f_stool" } diff --git a/gfx/NeoDays/pngs_tiles_10x10/furniture/outdoors/f_deckchair.png b/gfx/NeoDays/pngs_tiles_10x10/furniture/outdoors/f_deckchair.png new file mode 100644 index 0000000000000000000000000000000000000000..9f9435f098b73665981345b2591ec72420e65553 GIT binary patch literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^AU2l(8<4!aNcbO+D)Mx34AD5BoUp(sVTsT0|Nmbo z`Ape$;-aDP=ZDT+yhlnTXEhqIzA(vaPSErA|Nr0KR<_%zgDHkhIb+5yQEek58ykbC zkqK@}IZnL7B@Dshf`-Y*`eY>v&zxw;V?L7>qjx~HPfTTrbi?T+H>ZtmS_}+Q;x+y& SRdPYLGkCiCxvXf4xqG@ehDcmaPFP@;;PUwYansA=6PH6;!g*E50V%iMf4g?qXYyuPg5` tVz_X1!J)j1r>c|p&#N|Hc6s|^8_wA#2W=F7J_lOC;OXk;vd$@?2>?U*Hj@AV literal 0 HcmV?d00001 diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/bio_null_bio_power_storage_bio_power_storage_mkII_bio_batteries_bio_metabolics_bio_solar_bio_torsionratchet_bio_furnace_bio_ethanol_bio_memory_bio_ear_0.json b/gfx/NeoDays/pngs_tiles_10x10/items/bio_null_bio_power_storage_bio_power_storage_mkII_bio_batteries_bio_metabolics_bio_solar_bio_torsionratchet_bio_furnace_bio_ethanol_bio_memory_bio_ear_0.json deleted file mode 100644 index 9a16a8a43e..0000000000 --- a/gfx/NeoDays/pngs_tiles_10x10/items/bio_null_bio_power_storage_bio_power_storage_mkII_bio_batteries_bio_metabolics_bio_solar_bio_torsionratchet_bio_furnace_bio_ethanol_bio_memory_bio_ear_0.json +++ /dev/null @@ -1 +0,0 @@ -{"id": ["bio_null", "bio_power_storage", "bio_power_storage_mkII", "bio_batteries", "bio_metabolics", "bio_solar", "bio_torsionratchet", "bio_furnace", "bio_ethanol", "bio_memory", "bio_ears", "bio_eye_enhancer", "bio_dex_enhancer", "bio_str_enhancer", "bio_int_enhancer", "bio_membrane", "bio_targeting", "bio_gills", "bio_purifier", "bio_climate", "bio_storage", "bio_recycler", "bio_digestion", "bio_tools", "bio_shock", "bio_heat_absorb", "bio_carbon", "bio_armor_head", "bio_armor_torso", "bio_armor_arms", "bio_armor_legs", "bio_flashlight", "bio_night_vision", "bio_infrared", "bio_face_mask", "bio_ads", "bio_ods", "bio_scent_mask", "bio_scent_vision", "bio_cloak", "bio_painkiller", "bio_nanobots", "bio_heatsink", "bio_resonator", "bio_time_freeze", "bio_teleport", "bio_blood_anal", "bio_blood_filter", "bio_alarm", "bio_evap", "bio_lighter", "bio_claws", "bio_blaster", "bio_laser", "bio_emp", "bio_hydraulics", "bio_water_extractor", "bio_magnet", "bio_fingerhack", "bio_lockpick", "bio_ground_sonar", "bio_power_armor_interface", "bio_power_armor_interface_mkII", "bio_flashbang", "bio_railgun", "bio_probability_travel", "bio_shockwave", "bio_chain_lightning", "bio_night", "bio_uncanny_dodge", "bio_dis_shock", "bio_dis_acid", "bio_drain", "bio_noise", "bio_power_weakness", "bio_sunglasses", "bio_speed", "bio_watch", "bio_faraday", "bio_armor_eyes", "bio_leukocyte", "bio_geiger", "bio_radscrubber", "bio_adrenaline", "bio_razors", "bio_blade", "bio_itchy", "bio_nostril", "bio_thumbs", "bio_spasm", "bio_shakes", "bio_leaky", "bio_sleepy", "bio_deformity", "bio_voice", "bio_pokedeye", "bio_ankles", "bio_trip", "bio_cqb", "bio_meteorologist", "bio_ups", "bio_remote", "bio_advreactor", "bio_plut_filter", "bio_reactor", "bio_reactor_upgrade", "bio_stiff", "bio_eye_optic", "bio_chest_gun", "bio_emp_armgun", "bio_surgical_razor", "bio_cable"], "fg": ["1211_bio_null_0"], "rotates": false, "bg": []} \ No newline at end of file diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/bionic.json b/gfx/NeoDays/pngs_tiles_10x10/items/bionic.json new file mode 100644 index 0000000000..0c2f59a9c9 --- /dev/null +++ b/gfx/NeoDays/pngs_tiles_10x10/items/bionic.json @@ -0,0 +1,124 @@ +{ + "id": [ + "bio_null", + "bio_power_storage", + "bio_power_storage_mkII", + "bio_batteries", + "bio_metabolics", + "bio_solar", + "bio_torsionratchet", + "bio_furnace", + "bio_ethanol", + "bio_memory", + "bio_ears", + "bio_eye_enhancer", + "bio_dex_enhancer", + "bio_str_enhancer", + "bio_int_enhancer", + "bio_membrane", + "bio_targeting", + "bio_gills", + "bio_purifier", + "bio_climate", + "bio_storage", + "bio_recycler", + "bio_digestion", + "bio_tools", + "bio_shock", + "bio_heat_absorb", + "bio_carbon", + "bio_armor_head", + "bio_armor_torso", + "bio_armor_arms", + "bio_armor_legs", + "bio_flashlight", + "bio_night_vision", + "bio_infrared", + "bio_face_mask", + "bio_ads", + "bio_ods", + "bio_scent_mask", + "bio_scent_vision", + "bio_cloak", + "bio_painkiller", + "bio_nanobots", + "bio_heatsink", + "bio_resonator", + "bio_time_freeze", + "bio_teleport", + "bio_blood_anal", + "bio_blood_filter", + "bio_alarm", + "bio_evap", + "bio_lighter", + "bio_claws", + "bio_blaster", + "bio_laser", + "bio_emp", + "bio_hydraulics", + "bio_water_extractor", + "bio_magnet", + "bio_fingerhack", + "bio_lockpick", + "bio_ground_sonar", + "bio_power_armor_interface", + "bio_power_armor_interface_mkII", + "bio_flashbang", + "bio_railgun", + "bio_probability_travel", + "bio_shockwave", + "bio_chain_lightning", + "bio_night", + "bio_uncanny_dodge", + "bio_dis_shock", + "bio_dis_acid", + "bio_drain", + "bio_noise", + "bio_power_weakness", + "bio_sunglasses", + "bio_speed", + "bio_watch", + "bio_faraday", + "bio_armor_eyes", + "bio_leukocyte", + "bio_geiger", + "bio_radscrubber", + "bio_adrenaline", + "bio_razors", + "bio_blade", + "bio_itchy", + "bio_nostril", + "bio_thumbs", + "bio_spasm", + "bio_shakes", + "bio_leaky", + "bio_sleepy", + "bio_deformity", + "bio_voice", + "bio_pokedeye", + "bio_ankles", + "bio_trip", + "bio_cqb", + "bio_meteorologist", + "bio_ups", + "bio_remote", + "bio_advreactor", + "bio_plut_filter", + "bio_reactor", + "bio_reactor_upgrade", + "bio_stiff", + "bio_eye_optic", + "bio_chest_gun", + "bio_emp_armgun", + "bio_surgical_razor", + "bio_cable", + "bio_faulty_electromagnetic_leak", + "bio_glowy", + "bio_radleak", + "bio_sleep_shutdown", + "bio_synaptic_regen", + "bio_faulty_grossfood", + "bio_trickle" + ], + "fg": "bionic" +} diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/1211_bio_null_0.png b/gfx/NeoDays/pngs_tiles_10x10/items/bionic.png similarity index 100% rename from gfx/NeoDays/pngs_tiles_10x10/items/1211_bio_null_0.png rename to gfx/NeoDays/pngs_tiles_10x10/items/bionic.png diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/book_pieces.png b/gfx/NeoDays/pngs_tiles_10x10/items/book_pieces.png new file mode 100644 index 0000000000000000000000000000000000000000..8424b87096b185ad548b60985d80ff0e8c83828a GIT binary patch literal 132 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4d3(AzhDcoQo#4oKz=4A){oDWg zWy{sBUR`phWkrL-ih@Uc4nmVwmA+$GvEr-C{F@UuZRg}UX1}dyuZ~=GhvtRQqh(jW hr~2Qr_#6F$nX6HY;lAmml|W+|JYD@<);T3K0RRE;F<}4z literal 0 HcmV?d00001 diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/1153_bottle_glass_0.png b/gfx/NeoDays/pngs_tiles_10x10/items/bottle_glass.png similarity index 100% rename from gfx/NeoDays/pngs_tiles_10x10/items/1153_bottle_glass_0.png rename to gfx/NeoDays/pngs_tiles_10x10/items/bottle_glass.png diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/bottle_glass_0.json b/gfx/NeoDays/pngs_tiles_10x10/items/bottle_glass_0.json deleted file mode 100644 index 061bac63c4..0000000000 --- a/gfx/NeoDays/pngs_tiles_10x10/items/bottle_glass_0.json +++ /dev/null @@ -1 +0,0 @@ -{"id": "bottle_glass", "fg": ["1153_bottle_glass_0"], "rotates": false, "bg": []} \ No newline at end of file diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/bottle_plastic.json b/gfx/NeoDays/pngs_tiles_10x10/items/bottle_plastic.json new file mode 100644 index 0000000000..6700f70c68 --- /dev/null +++ b/gfx/NeoDays/pngs_tiles_10x10/items/bottle_plastic.json @@ -0,0 +1,8 @@ +{ + "id": [ + "bottle_plastic", + "bottle_plastic_small", + "bottle_twoliter" + ], + "fg": "bottle_plastic" +} diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/1149_bottle_twoliter_0.png b/gfx/NeoDays/pngs_tiles_10x10/items/bottle_plastic.png similarity index 100% rename from gfx/NeoDays/pngs_tiles_10x10/items/1149_bottle_twoliter_0.png rename to gfx/NeoDays/pngs_tiles_10x10/items/bottle_plastic.png diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/bottle_twoliter_bottle_plastic_bottle_plastic_small_0.json b/gfx/NeoDays/pngs_tiles_10x10/items/bottle_twoliter_bottle_plastic_bottle_plastic_small_0.json deleted file mode 100644 index ce5f2a5c5c..0000000000 --- a/gfx/NeoDays/pngs_tiles_10x10/items/bottle_twoliter_bottle_plastic_bottle_plastic_small_0.json +++ /dev/null @@ -1 +0,0 @@ -{"id": ["bottle_twoliter", "bottle_plastic", "bottle_plastic_small"], "fg": ["1149_bottle_twoliter_0"], "rotates": false, "bg": []} \ No newline at end of file diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/3061_box_large_0.png b/gfx/NeoDays/pngs_tiles_10x10/items/box_large.png similarity index 100% rename from gfx/NeoDays/pngs_tiles_10x10/items/3061_box_large_0.png rename to gfx/NeoDays/pngs_tiles_10x10/items/box_large.png diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/box_large_0.json b/gfx/NeoDays/pngs_tiles_10x10/items/box_large_0.json deleted file mode 100644 index 874570fc67..0000000000 --- a/gfx/NeoDays/pngs_tiles_10x10/items/box_large_0.json +++ /dev/null @@ -1 +0,0 @@ -{"id": "box_large", "fg": ["3061_box_large_0"], "rotates": false, "bg": []} \ No newline at end of file diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/brush.png b/gfx/NeoDays/pngs_tiles_10x10/items/brush.png deleted file mode 100644 index ec06fa341a8cae7a59118b08ccd08e7e82787efc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 170 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f46?(cjhDcmaPB_5#&)C4=&-__y zKFXguw)Vt^TxFk&^=v?(rqdwifJ35jKD*#f4d3m}xhDcmaPFP@;;F9$J`0_T^ z$ctS({5#$}-o0GXt9*a!=a~sSC9W?TSoJKE*`2P0N;oSD8@Y>}4B5jq(bu(1e$)E@ e!h%{y7#T9oiOg0?lnV!%%HZkh=d#Wzp$P!A<|$+V literal 0 HcmV?d00001 diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/deployables/armchair.png b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/armchair.png new file mode 100644 index 0000000000000000000000000000000000000000..d64703bdd532c5365c827119133a130d2061a04c GIT binary patch literal 130 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4d3w4yhDcmaPFP@;;PUwYan$a#TOQ_p#d bS``czb=6q+%AGw9G?c;9)z4*}Q$iB}QTiyD literal 0 HcmV?d00001 diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/hobo_stove.json b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/hobo_stove.json similarity index 100% rename from gfx/NeoDays/pngs_tiles_10x10/items/hobo_stove.json rename to gfx/NeoDays/pngs_tiles_10x10/items/deployables/hobo_stove.json diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/hobo_stove.png b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/hobo_stove.png similarity index 100% rename from gfx/NeoDays/pngs_tiles_10x10/items/hobo_stove.png rename to gfx/NeoDays/pngs_tiles_10x10/items/deployables/hobo_stove.png diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/minifreezer.json b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/minifreezer.json similarity index 100% rename from gfx/NeoDays/pngs_tiles_10x10/items/minifreezer.json rename to gfx/NeoDays/pngs_tiles_10x10/items/deployables/minifreezer.json diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/minifreezer.png b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/minifreezer.png similarity index 100% rename from gfx/NeoDays/pngs_tiles_10x10/items/minifreezer.png rename to gfx/NeoDays/pngs_tiles_10x10/items/deployables/minifreezer.png diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/minifridge.json b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/minifridge.json similarity index 100% rename from gfx/NeoDays/pngs_tiles_10x10/items/minifridge.json rename to gfx/NeoDays/pngs_tiles_10x10/items/deployables/minifridge.json diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/deployables/stool_log.png b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/stool_log.png new file mode 100644 index 0000000000000000000000000000000000000000..eb013dddbf31c3151efbf85e1202711d533d5dbc GIT binary patch literal 114 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4S$euShDcmaPLTN1AlUg=e!i4j zitAj>g&JC?p08=sPHWmYL3HZ*$g=@<>84#0!e+u3eAP~7EwW{1sL2)PlsY!u251O_ Mr>mdKI;Vst0K4BI{{R30 literal 0 HcmV?d00001 diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/deployables/stool_wood.json b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/stool_wood.json new file mode 100644 index 0000000000..0108dc1aaa --- /dev/null +++ b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/stool_wood.json @@ -0,0 +1,9 @@ +{ + "id": [ + "stool_wood", + "chair_wood", + "chair_wood_white", + "chair_wood_black" + ], + "fg": "stool_wood" +} diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/deployables/stool_wood.png b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/stool_wood.png new file mode 100644 index 0000000000000000000000000000000000000000..a27a33c0898d2c946054057aee133fc2231924ba GIT binary patch literal 103 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4>3O<1hDcmaPLMD-z_IkdaL{3v z$7@e~Xt-?9!}EYkIql7XY*XQlc}F(PN;)sV%fMC7l`ZzlItr+h!PC{xWt~$(699Cg BA6@_e literal 0 HcmV?d00001 diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/deployables/training_dummy_heavy.png b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/training_dummy_heavy.png new file mode 100644 index 0000000000000000000000000000000000000000..bf2747b49439e55e5a1662524ccb2f05dd6a1c9a GIT binary patch literal 181 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4)p)u%hDcoQop6x%umKPA`ONl@ z`qC+q%zsMc>RC!==1hp6#(Bqo@hP`}mIj8?YMEZ0@=+G*Y(5)Ts>XL(sq1^@?qGf( zId|LfM_HaTZe~vT^Llbh+LcK&`$avkOa4FD`FUd*zhPT?&ED_%yM*>_xYp(bJbO(c{tDnm{r-UW|IIcwK literal 0 HcmV?d00001 diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/deployables/training_dummy_light.png b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/training_dummy_light.png new file mode 100644 index 0000000000000000000000000000000000000000..d84b697626ab3722017a4e4d4b7eac3bf1c5d24f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4g?YL-hDcoQop6wsL6L)nJ<0If z)5}#gx2E5%(6?2vyV1hJ!4ugMfBT8kgj-2lenk~6kzRaNwu)hjL(vzz>x`Yp8ttyf rZedVe`6a>f`KGF!rRP*X=QQw7j8ts;!ZpPZXaj?%tDnm{r-UW|V81h7 literal 0 HcmV?d00001 diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/dog_tag.json b/gfx/NeoDays/pngs_tiles_10x10/items/dog_tag.json new file mode 100644 index 0000000000..3ccfeaa3ce --- /dev/null +++ b/gfx/NeoDays/pngs_tiles_10x10/items/dog_tag.json @@ -0,0 +1,7 @@ +{ + "id": [ + "dog_tag", + "dog_tag_dog" + ], + "fg": "dog_tag" +} diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/dog_tag.png b/gfx/NeoDays/pngs_tiles_10x10/items/dog_tag.png new file mode 100644 index 0000000000000000000000000000000000000000..3ad2d5f06f5044f43bc3f2860dad5cc7e815f262 GIT binary patch literal 122 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4IeNM{hDcmK+waZApuoX8|6;7| zFy&V`XJ}=xkXU?74ORLxaE2~Umk`Ad9 VHQ@48*998J;OXk;vd$@?2>=!lCj0;Z literal 0 HcmV?d00001 diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/fp_loyalty_card_0.json b/gfx/NeoDays/pngs_tiles_10x10/items/fp_loyalty_card_0.json deleted file mode 100644 index 711102afb5..0000000000 --- a/gfx/NeoDays/pngs_tiles_10x10/items/fp_loyalty_card_0.json +++ /dev/null @@ -1 +0,0 @@ -{"id": "fp_loyalty_card", "fg": ["3029_fp_loyalty_card_0"], "rotates": false, "bg": []} \ No newline at end of file diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/gasdiscount_gold_cash_card_0.json b/gfx/NeoDays/pngs_tiles_10x10/items/gasdiscount_gold_cash_card_0.json deleted file mode 100644 index ea1b093eb2..0000000000 --- a/gfx/NeoDays/pngs_tiles_10x10/items/gasdiscount_gold_cash_card_0.json +++ /dev/null @@ -1 +0,0 @@ -{"id": ["gasdiscount_gold", "cash_card"], "fg": ["1441_gasdiscount_gold_0"], "rotates": false, "bg": []} \ No newline at end of file diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/gasdiscount_silver_gasdiscount_platinum_0.json b/gfx/NeoDays/pngs_tiles_10x10/items/gasdiscount_silver_gasdiscount_platinum_0.json deleted file mode 100644 index 4655e1cd19..0000000000 --- a/gfx/NeoDays/pngs_tiles_10x10/items/gasdiscount_silver_gasdiscount_platinum_0.json +++ /dev/null @@ -1 +0,0 @@ -{"id": ["gasdiscount_silver", "gasdiscount_platinum"], "fg": ["1442_gasdiscount_silver_0"], "rotates": false, "bg": []} \ No newline at end of file diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/generic_figurine_plastic.png b/gfx/NeoDays/pngs_tiles_10x10/items/generic_figurine_plastic.png new file mode 100644 index 0000000000000000000000000000000000000000..9a398e5d1e857df87c63d440aedc2569c966e01d GIT binary patch literal 149 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4#dx|nhDcmaPH|}X&$FUIaOUBb zGds5|ZGU)anjBkBLo1{CkN&(r^*O61_+I<0**K#^kK^&{pHm)~33e;F%}AG+Xwap3 xf4g?PF+hDcmaPFP@;a75{w{A??+ zoUU_cOxn0-ESaC000M`WXIxvexxh@=uq(jl$TE&d-8;SN{f4#e2FqhDcmaPEZgsSoHD#<4MU* z*Jo~iqiN>L;}g*M|AbIR*MDOJgFoph2?;;$SN^eg-l?j*iAlsj)k`YLbk`!yz)KOf zpY79c2Jc8Yw`n=grmmm@)~C~YI9gL$_(T~PUK`0RG@n;8185b4r>mdKI;Vst0EO~3 A*#H0l literal 0 HcmV?d00001 diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/squeeze_tube.png b/gfx/NeoDays/pngs_tiles_10x10/items/squeeze_tube.png new file mode 100644 index 0000000000000000000000000000000000000000..29744cfe53722de3bf79cf12582be09e7e449acf GIT binary patch literal 131 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4d3m}xhDcmaPH|xUFKNK2%nStF zyE1<7j4vo#Dk#mY_hEixINM;fcP-RtbnJL@8d(OF6Po!dY(h)faM# bCtVmcqopU_eg2#kXexuJtDnm{r-UW|_i-sD literal 0 HcmV?d00001 diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/squeeze_tube_small.png b/gfx/NeoDays/pngs_tiles_10x10/items/squeeze_tube_small.png new file mode 100644 index 0000000000000000000000000000000000000000..583eb5180480c9e3b7d9c04612c004285f059eb7 GIT binary patch literal 125 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4xp=xbhDcmaPFP@;;PUwY@uh97 zv0MJ$(YM%rse^Yp?|(@NiGSPY|Nbg}tj*Klp^@Otlr>zM-*|-0996O<3ukuZX~oDf Y@Lv>h-_uc50W^=n)78&qol`;+061SM!~g&Q literal 0 HcmV?d00001 diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/tablegames/alquerque.png b/gfx/NeoDays/pngs_tiles_10x10/items/tablegames/alquerque.png new file mode 100644 index 0000000000000000000000000000000000000000..56ac39ec9c85ff8f4b648cc28332249b63fe754e GIT binary patch literal 106 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f48G5=nhDcmaPLObGnAq6((B6=1 zrUVfD`~UyEfS_RGf4d3m}xhDcmaPLObGnAq6((B6f4d3(AzhDcn#+h@qv;2^;Cd|p;= z?k0bQn^muCwalKYin(QHaf4xqG@ehDcmaPLObG5cK-5zNC+H z*^1kt5`Bpas$bQxr8NI5-_7;Ez35-L|J?ukfkGm7%*==D-BN@T7nFRD-jTWVX6KTf af(*@W@{PZ4|BMA1$>8bg=d#Wzp$P!Y(k@#7 literal 0 HcmV?d00001 diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/tools/crutches.png b/gfx/NeoDays/pngs_tiles_10x10/items/tools/crutches.png new file mode 100644 index 0000000000000000000000000000000000000000..b65172c5ad05608a6e9af8b25239ba38c10d8896 GIT binary patch literal 135 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4`FXlHhDcmaPEZgsSoHD#<4Ng< zmaV9MRTCp6`OnzE;LrPcR{!nI%p6@`bQy{qG}t7gyvsV_o%UJ3Bd@A+!V-5(WSp*~ jVpw7E_qb4*MiN8+RA0}{T}M6uO=j?P^>bP0l+XkKEln^c literal 0 HcmV?d00001 diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/3029_fp_loyalty_card_0.png b/gfx/NeoDays/pngs_tiles_10x10/items/tools/fp_loyalty_card.png similarity index 100% rename from gfx/NeoDays/pngs_tiles_10x10/items/3029_fp_loyalty_card_0.png rename to gfx/NeoDays/pngs_tiles_10x10/items/tools/fp_loyalty_card.png diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/tools/gasdiscount_gold.json b/gfx/NeoDays/pngs_tiles_10x10/items/tools/gasdiscount_gold.json new file mode 100644 index 0000000000..cd8a953df0 --- /dev/null +++ b/gfx/NeoDays/pngs_tiles_10x10/items/tools/gasdiscount_gold.json @@ -0,0 +1,7 @@ +{ + "id": [ + "gasdiscount_gold", + "cash_card" + ], + "fg": "gasdiscount_gold" +} diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/1441_gasdiscount_gold_0.png b/gfx/NeoDays/pngs_tiles_10x10/items/tools/gasdiscount_gold.png similarity index 100% rename from gfx/NeoDays/pngs_tiles_10x10/items/1441_gasdiscount_gold_0.png rename to gfx/NeoDays/pngs_tiles_10x10/items/tools/gasdiscount_gold.png diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/tools/gasdiscount_silver.json b/gfx/NeoDays/pngs_tiles_10x10/items/tools/gasdiscount_silver.json new file mode 100644 index 0000000000..5e28aa9c76 --- /dev/null +++ b/gfx/NeoDays/pngs_tiles_10x10/items/tools/gasdiscount_silver.json @@ -0,0 +1,7 @@ +{ + "id": [ + "gasdiscount_silver", + "gasdiscount_platinum" + ], + "fg": "gasdiscount_silver" +} diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/1442_gasdiscount_silver_0.png b/gfx/NeoDays/pngs_tiles_10x10/items/tools/gasdiscount_silver.png similarity index 100% rename from gfx/NeoDays/pngs_tiles_10x10/items/1442_gasdiscount_silver_0.png rename to gfx/NeoDays/pngs_tiles_10x10/items/tools/gasdiscount_silver.png diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/1443_id_military_0.png b/gfx/NeoDays/pngs_tiles_10x10/items/tools/id_military.png similarity index 100% rename from gfx/NeoDays/pngs_tiles_10x10/items/1443_id_military_0.png rename to gfx/NeoDays/pngs_tiles_10x10/items/tools/id_military.png diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/tools/id_science.json b/gfx/NeoDays/pngs_tiles_10x10/items/tools/id_science.json new file mode 100644 index 0000000000..0a1b9497b8 --- /dev/null +++ b/gfx/NeoDays/pngs_tiles_10x10/items/tools/id_science.json @@ -0,0 +1,7 @@ +{ + "id": [ + "id_science", + "id_science_visitor_1" + ], + "fg": "id_science" +} diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/1444_id_science_0.png b/gfx/NeoDays/pngs_tiles_10x10/items/tools/id_science.png similarity index 100% rename from gfx/NeoDays/pngs_tiles_10x10/items/1444_id_science_0.png rename to gfx/NeoDays/pngs_tiles_10x10/items/tools/id_science.png diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/tools/kitchenware/cheese_grater.png b/gfx/NeoDays/pngs_tiles_10x10/items/tools/kitchenware/cheese_grater.png new file mode 100644 index 0000000000000000000000000000000000000000..97b129055768670bde29ea6c03896325220c943f GIT binary patch literal 125 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4xp=xbhDcmaPH|xUfAL3;0h{nF z7U%eQc@W-Z;KVL=IpE5M1+&|Dy1Kd~3Zi<~F)Tl{Xpz#Iyd$q9U(N2g{Q3wBKZ8@6 WXolIf$9zEZ7(8A5T-G@yGywpGVkrRt literal 0 HcmV?d00001 diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/tools/kitchenware/tumbler_plastic.png b/gfx/NeoDays/pngs_tiles_10x10/items/tools/kitchenware/tumbler_plastic.png new file mode 100644 index 0000000000000000000000000000000000000000..184f5c6f9fd577d37c5387971f2aeca902e08c7b GIT binary patch literal 134 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4`FgrIhDcmaPH|xUfAL3;1ka2` z--`E3fPhx-jSVXsHFE5~zqSuyHk#cC0<5v7XIx4S9C1)tu+d3n{-O;RMU9dSI|Qez coMT{TxHnHE*8Oai9nfF~Pgg&ebxsLQ09BnVGXMYp literal 0 HcmV?d00001 diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/tools/lighting/jackolantern.json b/gfx/NeoDays/pngs_tiles_10x10/items/tools/lighting/jackolantern.json new file mode 100644 index 0000000000..4ce130a639 --- /dev/null +++ b/gfx/NeoDays/pngs_tiles_10x10/items/tools/lighting/jackolantern.json @@ -0,0 +1,7 @@ +{ + "id": [ + "jackolantern", + "plastic_jack_o_lantern" + ], + "fg": "jackolantern" +} diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/tools/lighting/jackolantern.png b/gfx/NeoDays/pngs_tiles_10x10/items/tools/lighting/jackolantern.png new file mode 100644 index 0000000000000000000000000000000000000000..dcfff426218a7c972c7dfca399c53f24cafe74b5 GIT binary patch literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4g?hR;hDcoQ4LHclpvaLOdtUI* zuCB!v>3==?gwMqYUusf~>g2HW6;?I=8u*bl@@wGJ>iT8|kI%I$B-73-BwuE=Ke)Hj q+;sY^x91ekoD^$0sh)oRFw=EShvRL()@u$a literal 0 HcmV?d00001 diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/tools/lighting/jackolantern_lit.png b/gfx/NeoDays/pngs_tiles_10x10/items/tools/lighting/jackolantern_lit.png new file mode 100644 index 0000000000000000000000000000000000000000..39dd53bab8ffcc26007933b8341a90365271864a GIT binary patch literal 157 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4rFgnHhDcnl4LHerK!K+?VSAlK zqyB0GuVt?V-YsqrlFH(|X(^)4v2VdeBiF83QTi5*pSQ+kB)@iGSn^Bh>T@B60LGY~ zslxiQZz@`NX8&K7rOvl{?$SK*V8?qmH|~vU^6$HLm|2nAGU>qWd&WTf7(8A5T-G@y GGywqNLpPoP literal 0 HcmV?d00001 diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/tools/lighting/jackolantern_on.json b/gfx/NeoDays/pngs_tiles_10x10/items/tools/lighting/jackolantern_on.json new file mode 100644 index 0000000000..8e196d12bf --- /dev/null +++ b/gfx/NeoDays/pngs_tiles_10x10/items/tools/lighting/jackolantern_on.json @@ -0,0 +1,7 @@ +{ + "id": [ + "jackolantern_lit", + "plastic_jack_o_lantern_lit" + ], + "fg": "jackolantern_lit" +} diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/tools/lighting/smart_lamp.json b/gfx/NeoDays/pngs_tiles_10x10/items/tools/lighting/smart_lamp.json index 85a3a8777d..a664641ac1 100644 --- a/gfx/NeoDays/pngs_tiles_10x10/items/tools/lighting/smart_lamp.json +++ b/gfx/NeoDays/pngs_tiles_10x10/items/tools/lighting/smart_lamp.json @@ -3,7 +3,8 @@ "smart_lamp", "electric_lantern", "oxylamp", - "atomic_lamp_off" + "atomic_lamp_off", + "propane_lantern" ], "fg": "smart_lamp" } diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/tools/lighting/smart_lamp_on.json b/gfx/NeoDays/pngs_tiles_10x10/items/tools/lighting/smart_lamp_on.json index f222ed6993..27002b55d6 100644 --- a/gfx/NeoDays/pngs_tiles_10x10/items/tools/lighting/smart_lamp_on.json +++ b/gfx/NeoDays/pngs_tiles_10x10/items/tools/lighting/smart_lamp_on.json @@ -2,7 +2,8 @@ "id": [ "smart_lamp_on", "electric_lantern_on", - "oxylamp_on" + "oxylamp_on", + "propane_lantern_on" ], "fg": "smart_lamp_on" } diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/tools/makeshift_crutches.png b/gfx/NeoDays/pngs_tiles_10x10/items/tools/makeshift_crutches.png new file mode 100644 index 0000000000000000000000000000000000000000..c42a1676a9ecaf93361547fcfe6ab47841f0df45 GIT binary patch literal 135 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4`FXlHhDcmaPEZgsSoHD#<4Ng< zmSse3veN72`7bFU@z38o?0f4C3(6yhDcmaPEZgscr@{M|C&C| z`AWYd)gRQT#dPu9HZxMV?6X7UV`qnPP1WZ~iogCjv4MbC$>W4;2SuiyiEDo-x#Mwl wP_qOOJm>%CW8zyoy2wzq{^6~KAP@ruLp00i_>zopr0ASuT!vFvP literal 0 HcmV?d00001 diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/tools/toiletries/brushes.json b/gfx/NeoDays/pngs_tiles_10x10/items/tools/toiletries/brushes.json new file mode 100644 index 0000000000..9c2a8a4e3d --- /dev/null +++ b/gfx/NeoDays/pngs_tiles_10x10/items/tools/toiletries/brushes.json @@ -0,0 +1,8 @@ +{ + "id": [ + "brush", + "brush_toilet", + "hairbrush" + ], + "fg": "brush" +} diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/tools/toolbox_empty.json b/gfx/NeoDays/pngs_tiles_10x10/items/tools/toolbox_empty.json index 71456df713..dbc142fa1a 100644 --- a/gfx/NeoDays/pngs_tiles_10x10/items/tools/toolbox_empty.json +++ b/gfx/NeoDays/pngs_tiles_10x10/items/tools/toolbox_empty.json @@ -2,7 +2,9 @@ "id": [ "toolbox_empty", "toolbox_workshop_empty", - "rc_car_box" + "rc_car_box", + "maker_kit_box", + "engineering_makerspace_kit" ], "fg": "toolbox_empty" } diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/vehicle/combustion_engine.json b/gfx/NeoDays/pngs_tiles_10x10/items/vehicle/combustion_engine.json index e725a41c18..28f3f643a7 100644 --- a/gfx/NeoDays/pngs_tiles_10x10/items/vehicle/combustion_engine.json +++ b/gfx/NeoDays/pngs_tiles_10x10/items/vehicle/combustion_engine.json @@ -1,16 +1,21 @@ { "id": [ "v12_diesel", + "i6_diesel", + "i4_diesel", + "v6_diesel", + "v8_diesel", "1cyl_combustion", "1cyl_combustion_small", + "1cyl_combustion_large", "v2_combustion", "i4_combustion", "v6_combustion", "v8_combustion", "v12_combustion", - "i6_diesel", - "v6_diesel", - "v8_diesel" + "small_turbine_engine", + "medium_turbine_engine", + "large_turbine_engine" ], "fg": "combustion_engine" } diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/v_table.json b/gfx/NeoDays/pngs_tiles_10x10/items/vehicle/v_table.json similarity index 100% rename from gfx/NeoDays/pngs_tiles_10x10/items/v_table.json rename to gfx/NeoDays/pngs_tiles_10x10/items/vehicle/v_table.json diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/veh_tracker.json b/gfx/NeoDays/pngs_tiles_10x10/items/vehicle/veh_tracker.json similarity index 100% rename from gfx/NeoDays/pngs_tiles_10x10/items/veh_tracker.json rename to gfx/NeoDays/pngs_tiles_10x10/items/vehicle/veh_tracker.json diff --git a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_stump.json b/gfx/NeoDays/pngs_tiles_10x10/terrain/t_stump.json deleted file mode 100644 index 29970c256e..0000000000 --- a/gfx/NeoDays/pngs_tiles_10x10/terrain/t_stump.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "id": [ - "t_stump", - "f_logstool" - ], - "fg": "t_stump" -}