Skip to content

Commit

Permalink
[NeoDays] Random additions and fixes (#1728)
Browse files Browse the repository at this point in the history
* 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
Golfavel authored Dec 8, 2022
1 parent 6ebe5b9 commit 4bab279
Show file tree
Hide file tree
Showing 78 changed files with 246 additions and 31 deletions.
Binary file added gfx/NeoDays/pngs_large_20x20/items/plank_long.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion gfx/NeoDays/pngs_tiles_10x10/furniture/indoors/f_stool.json
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
1 change: 0 additions & 1 deletion gfx/NeoDays/pngs_tiles_10x10/items/2x4_0.json

This file was deleted.

28 changes: 28 additions & 0 deletions gfx/NeoDays/pngs_tiles_10x10/items/AID.json
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"
}
Binary file added gfx/NeoDays/pngs_tiles_10x10/items/AID.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 was deleted.

124 changes: 124 additions & 0 deletions gfx/NeoDays/pngs_tiles_10x10/items/bionic.json
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"
}
Binary file added gfx/NeoDays/pngs_tiles_10x10/items/book_pieces.png
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 gfx/NeoDays/pngs_tiles_10x10/items/bottle_glass_0.json

This file was deleted.

8 changes: 8 additions & 0 deletions gfx/NeoDays/pngs_tiles_10x10/items/bottle_plastic.json
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"
}

This file was deleted.

1 change: 0 additions & 1 deletion gfx/NeoDays/pngs_tiles_10x10/items/box_large_0.json

This file was deleted.

Binary file removed gfx/NeoDays/pngs_tiles_10x10/items/brush.png
Binary file not shown.
1 change: 0 additions & 1 deletion gfx/NeoDays/pngs_tiles_10x10/items/brushes_0.json

This file was deleted.

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.
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.
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.
7 changes: 7 additions & 0 deletions gfx/NeoDays/pngs_tiles_10x10/items/dog_tag.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"id": [
"dog_tag",
"dog_tag_dog"
],
"fg": "dog_tag"
}
Binary file added gfx/NeoDays/pngs_tiles_10x10/items/dog_tag.png
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 gfx/NeoDays/pngs_tiles_10x10/items/fp_loyalty_card_0.json

This file was deleted.

This file was deleted.

This file was deleted.

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 gfx/NeoDays/pngs_tiles_10x10/items/id_military_0.json

This file was deleted.

1 change: 0 additions & 1 deletion gfx/NeoDays/pngs_tiles_10x10/items/id_science_0.json

This file was deleted.

Binary file added gfx/NeoDays/pngs_tiles_10x10/items/plank_short.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion gfx/NeoDays/pngs_tiles_10x10/items/reading/manual_brown.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"pocket_firearms",
"tailor_portfolio",
"family_cookbook",
"leather_journal"
"leather_journal",
"book_ruined"
],
"fg": "manual_brown"
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"missing_poster_cat",
"missing_poster_dog",
"missing_poster_child",
"missing_poster_adult"
"missing_poster_adult",
"movie_poster"
],
"fg": "missing_poster"
}
6 changes: 3 additions & 3 deletions gfx/NeoDays/pngs_tiles_10x10/items/reading/paper.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
"newspaper_memorial",
"necropolis_leaflet",
"black_box_transcript",
"large_prinout_portal_storm_data",
"medium_prinout_portal_storm_data",
"small_prinout_portal_storm_data"
"large_printout_portal_storm_data",
"medium_printout_portal_storm_data",
"small_printout_portal_storm_data"
],
"fg": "paper"
}
3 changes: 2 additions & 1 deletion gfx/NeoDays/pngs_tiles_10x10/items/reading/roadmap.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"restaurantmap",
"touristmap",
"trailmap",
"labmap"
"labmap",
"urbexmap"
],
"fg": "roadmap"
}
Binary file added gfx/NeoDays/pngs_tiles_10x10/items/shark_plushie.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 gfx/NeoDays/pngs_tiles_10x10/items/squeeze_tube.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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"id": [
"gasdiscount_gold",
"cash_card"
],
"fg": "gasdiscount_gold"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"id": [
"gasdiscount_silver",
"gasdiscount_platinum"
],
"fg": "gasdiscount_silver"
}
7 changes: 7 additions & 0 deletions gfx/NeoDays/pngs_tiles_10x10/items/tools/id_science.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"id": [
"id_science",
"id_science_visitor_1"
],
"fg": "id_science"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"id": [
"jackolantern",
"plastic_jack_o_lantern"
],
"fg": "jackolantern"
}
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"
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"smart_lamp",
"electric_lantern",
"oxylamp",
"atomic_lamp_off"
"atomic_lamp_off",
"propane_lantern"
],
"fg": "smart_lamp"
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"id": [
"smart_lamp_on",
"electric_lantern_on",
"oxylamp_on"
"oxylamp_on",
"propane_lantern_on"
],
"fg": "smart_lamp_on"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"id": [
"brush",
"brush_toilet",
"hairbrush"
],
"fg": "brush"
}
4 changes: 3 additions & 1 deletion gfx/NeoDays/pngs_tiles_10x10/items/tools/toolbox_empty.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
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"
}
7 changes: 0 additions & 7 deletions gfx/NeoDays/pngs_tiles_10x10/terrain/t_stump.json

This file was deleted.

0 comments on commit 4bab279

Please sign in to comment.