-
Notifications
You must be signed in to change notification settings - Fork 173
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[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
- Loading branch information
Showing
78 changed files
with
246 additions
and
31 deletions.
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,9 @@ | ||
{ | ||
"id": [ | ||
"f_stool", | ||
"f_chair" | ||
"f_chair", | ||
"f_chair_white", | ||
"f_chair_black" | ||
], | ||
"fg": "f_stool" | ||
} |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
{ | ||
"id": [ | ||
"AID_bio_ups", | ||
"AID_bio_watch", | ||
"AID_bio_alarm", | ||
"AID_bio_geiger", | ||
"AID_bio_weight", | ||
"AID_bio_magnet", | ||
"AID_bio_trickle", | ||
"AID_bio_syringe", | ||
"AID_bio_climate", | ||
"AID_bio_shotgun", | ||
"AID_bio_heatsink", | ||
"AID_bio_soporific", | ||
"AID_bio_armor_arms", | ||
"AID_bio_tattoo_led", | ||
"AID_bio_flashlight", | ||
"AID_bio_blood_anal", | ||
"AID_bio_armor_legs", | ||
"AID_bio_blood_filter", | ||
"AID_bio_pitch_perfect", | ||
"AID_bio_power_storage", | ||
"AID_bio_power_storage_mkII", | ||
"AID_bio_meteorologist", | ||
"AID_bio_power_armor_interface" | ||
], | ||
"fg": "AID" | ||
} |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion
1
...metabolics_bio_solar_bio_torsionratchet_bio_furnace_bio_ethanol_bio_memory_bio_ear_0.json
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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" | ||
} |
File renamed without changes
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
{ | ||
"id": [ | ||
"bottle_plastic", | ||
"bottle_plastic_small", | ||
"bottle_twoliter" | ||
], | ||
"fg": "bottle_plastic" | ||
} |
File renamed without changes
1 change: 0 additions & 1 deletion
1
...NeoDays/pngs_tiles_10x10/items/bottle_twoliter_bottle_plastic_bottle_plastic_small_0.json
This file was deleted.
Oops, something went wrong.
File renamed without changes
This file was deleted.
Oops, something went wrong.
Binary file not shown.
This file was deleted.
Oops, something went wrong.
Binary file added
BIN
+131 Bytes
gfx/NeoDays/pngs_tiles_10x10/items/deployables/archery_target_box.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions
9
gfx/NeoDays/pngs_tiles_10x10/items/deployables/stool_wood.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
{ | ||
"id": [ | ||
"stool_wood", | ||
"chair_wood", | ||
"chair_wood_white", | ||
"chair_wood_black" | ||
], | ||
"fg": "stool_wood" | ||
} |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+181 Bytes
gfx/NeoDays/pngs_tiles_10x10/items/deployables/training_dummy_heavy.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+143 Bytes
gfx/NeoDays/pngs_tiles_10x10/items/deployables/training_dummy_light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
{ | ||
"id": [ | ||
"dog_tag", | ||
"dog_tag_dog" | ||
], | ||
"fg": "dog_tag" | ||
} |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file was deleted.
Oops, something went wrong.
1 change: 0 additions & 1 deletion
1
gfx/NeoDays/pngs_tiles_10x10/items/gasdiscount_gold_cash_card_0.json
This file was deleted.
Oops, something went wrong.
1 change: 0 additions & 1 deletion
1
gfx/NeoDays/pngs_tiles_10x10/items/gasdiscount_silver_gasdiscount_platinum_0.json
This file was deleted.
Oops, something went wrong.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,7 +7,8 @@ | |
"restaurantmap", | ||
"touristmap", | ||
"trailmap", | ||
"labmap" | ||
"labmap", | ||
"urbexmap" | ||
], | ||
"fg": "roadmap" | ||
} |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
File renamed without changes
7 changes: 7 additions & 0 deletions
7
gfx/NeoDays/pngs_tiles_10x10/items/tools/gasdiscount_gold.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
{ | ||
"id": [ | ||
"gasdiscount_gold", | ||
"cash_card" | ||
], | ||
"fg": "gasdiscount_gold" | ||
} |
File renamed without changes
7 changes: 7 additions & 0 deletions
7
gfx/NeoDays/pngs_tiles_10x10/items/tools/gasdiscount_silver.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
{ | ||
"id": [ | ||
"gasdiscount_silver", | ||
"gasdiscount_platinum" | ||
], | ||
"fg": "gasdiscount_silver" | ||
} |
File renamed without changes
File renamed without changes
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
{ | ||
"id": [ | ||
"id_science", | ||
"id_science_visitor_1" | ||
], | ||
"fg": "id_science" | ||
} |
File renamed without changes
Binary file added
BIN
+125 Bytes
gfx/NeoDays/pngs_tiles_10x10/items/tools/kitchenware/cheese_grater.png
Oops, something went wrong.
Binary file added
BIN
+134 Bytes
gfx/NeoDays/pngs_tiles_10x10/items/tools/kitchenware/tumbler_plastic.png
Oops, something went wrong.
7 changes: 7 additions & 0 deletions
7
gfx/NeoDays/pngs_tiles_10x10/items/tools/lighting/jackolantern.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
{ | ||
"id": [ | ||
"jackolantern", | ||
"plastic_jack_o_lantern" | ||
], | ||
"fg": "jackolantern" | ||
} |
Oops, something went wrong.
Binary file added
BIN
+157 Bytes
gfx/NeoDays/pngs_tiles_10x10/items/tools/lighting/jackolantern_lit.png
Oops, something went wrong.
7 changes: 7 additions & 0 deletions
7
gfx/NeoDays/pngs_tiles_10x10/items/tools/lighting/jackolantern_on.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
{ | ||
"id": [ | ||
"jackolantern_lit", | ||
"plastic_jack_o_lantern_lit" | ||
], | ||
"fg": "jackolantern_lit" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
8 changes: 8 additions & 0 deletions
8
gfx/NeoDays/pngs_tiles_10x10/items/tools/toiletries/brushes.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
{ | ||
"id": [ | ||
"brush", | ||
"brush_toilet", | ||
"hairbrush" | ||
], | ||
"fg": "brush" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 8 additions & 3 deletions
11
gfx/NeoDays/pngs_tiles_10x10/items/vehicle/combustion_engine.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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" | ||
} |
File renamed without changes.
File renamed without changes.
This file was deleted.
Oops, something went wrong.