Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Terminals, Store furniture and misc structures #150

Merged
merged 21 commits into from
Jan 19, 2024
Merged

Conversation

Peptide90
Copy link
Collaborator

@Peptide90 Peptide90 commented Jan 1, 2024

About the PR

wallmount fire hydrants (old and new)

  • make sure it functions as storage.
  • Visualiser and layer for thing inside?

various terminals added.

  • Add rigged versions that blow up on use (maybe after a 1-2 second timer and an activation noise for balance).
  • Add deconstruction graphs.
  • Add destruction spawn for destroyed variants.
  • Add some actually useful consoles? Reskinned versions of computers. Power Monitoring, body scanner, solar control, camera monitor, mass media.
  • Fix directions. Might need E/W and N/S versions that are sprite offset to sit on desks and against walls.

Adds the deli stand and fruit stand as new store furniture.

  • Use a visualiser and whitelist for these with new states for storing food?

Adds a bunch of new shelves

  • Decide on making these storage containers with visualisers? Seems like a fun idea to show they're holding stuff.
  • Figure out BB stuff again. Only works best in N/S E/W again otherwise BB gets funky.

ToDo

  • Add store counters. (Entities in, import textures)
  • Add more tables. (Entities in, import textures)
  • Add more vendors.
  • Add wall vents like hydrant as discrete storage. Maybe use plant code instead for hiding single item.
  • Freezers etc
  • New wall signs added.
  • Fix BB on streetlights by making the N/S E/W variants
  • Fix BB on billboards.

Media

image

image
image
image
image
image

safes
image

roller shutter doors
image

roller shutter lockers and enclave variant
https://cdn.discordapp.com/attachments/995399323061850232/1197870887513362442/image.png?ex=65bcd732&is=65aa6232&hm=73e9aa8d5e6c0a1db68babeb0ef5e09247594cd54b931212cac600347df2fd54&

washing machines
image

vent stashes
https://cdn.discordapp.com/attachments/995399323061850232/1197864252711645204/image.png?ex=65bcd105&is=65aa5c05&hm=6413823e305b6a2f10baa6afa0f999a13fcb65952e6be3870781665ecf077d3f&

@Peptide90 Peptide90 marked this pull request as draft January 1, 2024 01:45
@github-actions github-actions bot added Changes: Sprites No C# For easier issues relating to YAML labels Jan 1, 2024
Copy link
Contributor

github-actions bot commented Jan 1, 2024

RSI Diff Bot; head commit 4ee534d merging into 568f40a
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Nuclear14/Structures/Furniture/Street_Furniture/powerpole.rsi

State Old New Status
powerpole1 Modified
powerpole2 Added

Resources/Textures/Nuclear14/Structures/Furniture/Street_Furniture/streetlight1.rsi

State Old New Status
broken Removed
empty Removed
off Removed
on Removed

Resources/Textures/Nuclear14/Structures/Furniture/Street_Furniture/streetlight1_raider.rsi

State Old New Status
broken Removed
empty Removed
off Removed
on Removed

Resources/Textures/Nuclear14/Structures/Furniture/Street_Furniture/streetlight2.rsi

State Old New Status
broken Removed
empty Removed
off Removed
on Removed

Resources/Textures/Nuclear14/Structures/Furniture/Street_Furniture/streetlight2_raider.rsi

State Old New Status
broken Removed
empty Removed
off Removed
on Removed

Resources/Textures/Nuclear14/Structures/Decoration/signs_64x64.rsi

State Old New Status
bazaar Added
we_open Added

Resources/Textures/Nuclear14/Structures/Doors/RollerDoors/framedshutter.rsi

State Old New Status
closed Added
closing Added
open Added
opening Added
welded Added

Resources/Textures/Nuclear14/Structures/Doors/RollerDoors/garageshutter.rsi

State Old New Status
closed Added
closing Added
open Added
opening Added
welded Added

Resources/Textures/Nuclear14/Structures/Furniture/64x64_furniture.rsi

State Old New Status
bigshelf1_openL Added
bigshelf1_openR Added
bigshelf2_open Added
clothing_rack Added
desk_metal Added
desk_metal_small Added
desk_wood Added
desk_wood_small Added
medshelves Added
metal_shelf Added
shelf_shop Added
showcase Added
stand_wood Added
stand_wood_small Added
table_cards Added
table_metal_wide Added
table_pool Added
table_wood_wide_oval Added
table_wood_wide_square Added
wood_shelf-alt Added
wood_shelf Added
wood_shelf_big Added

Resources/Textures/Nuclear14/Structures/Furniture/Store_Furniture/delistand.rsi

State Old New Status
deli_stand Added
food-0 Added
food-1 Added
food-2 Added
food-3 Added
food-4 Added
food-5 Added

Resources/Textures/Nuclear14/Structures/Furniture/Store_Furniture/fruitstand.rsi

State Old New Status
fruitstand-1 Added
fruitstand-2 Added
fruitstand-3 Added
fruitstand_empty Added

Resources/Textures/Nuclear14/Structures/Furniture/Street_Furniture/streetlight1_left.rsi

State Old New Status
broken Added
empty Added
off Added
on Added

Resources/Textures/Nuclear14/Structures/Furniture/Street_Furniture/streetlight1_raider_left.rsi

State Old New Status
broken Added
empty Added
off Added
on Added

Resources/Textures/Nuclear14/Structures/Furniture/Street_Furniture/streetlight1_raider_right.rsi

State Old New Status
broken Added
empty Added
off Added
on Added

Resources/Textures/Nuclear14/Structures/Furniture/Street_Furniture/streetlight1_right.rsi

State Old New Status
broken Added
empty Added
off Added
on Added

Resources/Textures/Nuclear14/Structures/Furniture/Street_Furniture/streetlight2_left.rsi

State Old New Status
broken Added
empty Added
off Added
on Added

Resources/Textures/Nuclear14/Structures/Furniture/Street_Furniture/streetlight2_raider_left.rsi

State Old New Status
broken Added
empty Added
off Added
on Added

Resources/Textures/Nuclear14/Structures/Furniture/Street_Furniture/streetlight2_raider_right.rsi

State Old New Status
broken Added
empty Added
off Added
on Added

Resources/Textures/Nuclear14/Structures/Furniture/Street_Furniture/streetlight2_right.rsi

State Old New Status
broken Added
empty Added
off Added
on Added

Resources/Textures/Nuclear14/Structures/Furniture/Tables/barcounter.rsi

State Old New Status
full Added
state_0 Added
state_1 Added
state_2 Added
state_3 Added
state_4 Added
state_5 Added
state_6 Added
state_7 Added

Resources/Textures/Nuclear14/Structures/Furniture/Tables/counters.rsi

State Old New Status
craft_counter Added
craft_counter_bend Added
craft_counter_cross Added
craft_counter_intersect Added
metal_counter Added
metal_counter_bend Added
metal_counter_cross Added
metal_counter_intersect Added
wood_counter Added
wood_counter_bend Added
wood_counter_cross Added
wood_counter_intersect Added

Resources/Textures/Nuclear14/Structures/Furniture/Tables/metalgrate.rsi

State Old New Status
full Added
state_0 Added
state_1 Added
state_2 Added
state_3 Added
state_4 Added
state_5 Added
state_6 Added
state_7 Added

Resources/Textures/Nuclear14/Structures/Furniture/Tables/tables.rsi

State Old New Status
cable_reel Added
dice_clean Added
dice_dirty Added
table_metal_round-1 Added
table_metal_round-2 Added
table_metal_round Added
table_rolling Added
table_wood_end Added
table_wood_low Added
table_wood_round Added
table_wood_square Added
table_wood_stand Added
tableframe_wood Added
trableframe_metal Added
workbench_wood Added

Resources/Textures/Nuclear14/Structures/Machines/Terminals/terminal.rsi

State Old New Status
broken Added
computer Added
frame Added
rigged Added
screens Added
wired Added

Resources/Textures/Nuclear14/Structures/Machines/Terminals/terminal_classic.rsi

State Old New Status
broken Added
computer Added
screens Added

Resources/Textures/Nuclear14/Structures/Machines/Terminals/terminal_handmade.rsi

State Old New Status
computer Added
screens Added

Resources/Textures/Nuclear14/Structures/Machines/Terminals/terminal_new.rsi

State Old New Status
broken Added
computer Added
frame Added
screens Added
wired Added

Resources/Textures/Nuclear14/Structures/Machines/Terminals/terminal_rusted.rsi

State Old New Status
broken Added
computer Added
rigged Added
screens Added

Resources/Textures/Nuclear14/Structures/Machines/Terminals/terminal_security.rsi

State Old New Status
computer Added
screens Added

Resources/Textures/Nuclear14/Structures/Machines/Terminals/terminal_vault.rsi

State Old New Status
computer Added
screens Added

Resources/Textures/Nuclear14/Structures/Machines/Terminals/terminal_wall.rsi

State Old New Status
broken Added
computer Added
off Added
screens Added

Resources/Textures/Nuclear14/Structures/Machines/Terminals/terminal_wall_new.rsi

State Old New Status
broken Added
computer Added
off Added
screens Added

Resources/Textures/Nuclear14/Structures/Machines/Terminals/terminal_wall_rusted.rsi

State Old New Status
broken Added
computer Added
off Added
screens Added

Resources/Textures/Nuclear14/Structures/Storage/Closets/closetenclave.rsi

State Old New Status
closet Added
closet_door Added
closet_open Added
welded Added

Resources/Textures/Nuclear14/Structures/Storage/Closets/closetgeneric.rsi

State Old New Status
closet Added
closet_door Added
closet_open Added
welded Added

Resources/Textures/Nuclear14/Structures/Storage/Furniture/safe.rsi

State Old New Status
closet Added
closet_door Added
closet_open Added
welded Added

Resources/Textures/Nuclear14/Structures/Storage/Furniture/safespinner.rsi

State Old New Status
closet Added
closet_door Added
closet_open Added
welded Added

Resources/Textures/Nuclear14/Structures/Storage/Furniture/washingmachine.rsi

State Old New Status
generic Added
generic_door Added
generic_on Added
generic_open Added

Resources/Textures/Nuclear14/Structures/Storage/Furniture/washingmachine_industrial.rsi

State Old New Status
generic Added
generic_door Added
generic_on Added
generic_open Added

Resources/Textures/Nuclear14/Structures/Storage/storage.rsi

State Old New Status
firstaid Added
firstaid_door Added
firstaid_open Added
fridge Added
fridge_door Added
fridge_open Added
locker Added
locker_door Added
locker_loot Added
locker_open Added
safe_wall-open Added
safe_wall Added
toolbox Added
toolbox_loot Added
toolbox_open Added
vent-damaged Added
vent-open Added
vent Added

Resources/Textures/Nuclear14/Structures/Wallmounts/hydrant.rsi

State Old New Status
closed Added
frame Added
open Added

Resources/Textures/Nuclear14/Structures/Wallmounts/hydrantold.rsi

State Old New Status
closed Added
frame Added
open Added

Resources/Textures/Nuclear14/Structures/Wallmounts/signs_32x32.rsi

State Old New Status
bar Added
clinic Added
open Added
open_bar Added
open_bar_on Added
open_on Added
rent Added

Resources/Textures/Nuclear14/Structures/Wallmounts/signs_64x32.rsi

State Old New Status
bazaar_on Added
hotel Added
private Added

Edit: diff updated after 4ee534d

@github-actions github-actions bot removed the No C# For easier issues relating to YAML label Jan 8, 2024
@Peptide90 Peptide90 marked this pull request as ready for review January 19, 2024 10:26
@Peptide90 Peptide90 merged commit 0600f0d into master Jan 19, 2024
6 of 7 checks passed
@Peptide90 Peptide90 deleted the structures_pack branch January 19, 2024 13:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant