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

More N14 Assets #54

Merged
merged 11 commits into from
Dec 23, 2024
Merged

More N14 Assets #54

merged 11 commits into from
Dec 23, 2024

Conversation

Aidenkrz
Copy link
Collaborator

@Aidenkrz Aidenkrz commented Dec 23, 2024

yuh

Copy link
Contributor

github-actions bot commented Dec 23, 2024

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

Resources/Textures/_Nuclear14/Clothing/OuterClothing/WinterCoats/corpo_jacket_discount_dans.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Resources/Textures/_Nuclear14/Decals/FullWhite.rsi

State Old New Status
full_tile Added
half_tile Added

Resources/Textures/_Nuclear14/Decals/curb.rsi

State Old New Status
sidewalk-0 Added
sidewalk-1 Added
sidewalk-10 Added
sidewalk-11 Added
sidewalk-110 Added
sidewalk-111 Added
sidewalk-12 Added
sidewalk-127 Added
sidewalk-13 Added
sidewalk-137 Added
sidewalk-139 Added
sidewalk-14 Added
sidewalk-141 Added
sidewalk-143 Added
sidewalk-15 Added
sidewalk-157 Added
sidewalk-159 Added
sidewalk-175 Added
sidewalk-191 Added
sidewalk-2 Added
sidewalk-203 Added
sidewalk-207 Added
sidewalk-21 Added
sidewalk-223 Added
sidewalk-23 Added
sidewalk-239 Added
sidewalk-255 Added
sidewalk-29 Added
sidewalk-3 Added
sidewalk-31 Added
sidewalk-38 Added
sidewalk-39 Added
sidewalk-4 Added
sidewalk-46 Added
sidewalk-47 Added
sidewalk-5 Added
sidewalk-55 Added
sidewalk-6 Added
sidewalk-63 Added
sidewalk-7 Added
sidewalk-74 Added
sidewalk-75 Added
sidewalk-78 Added
sidewalk-79 Added
sidewalk-8 Added
sidewalk-9 Added
sidewalk-95 Added

Resources/Textures/_Nuclear14/Decals/droughtdecor.rsi

State Old New Status
drought_1 Added
drought_10 Added
drought_11 Added
drought_12 Added
drought_13 Added
drought_14 Added
drought_15 Added
drought_16 Added
drought_17 Added
drought_18 Added
drought_19 Added
drought_2 Added
drought_20 Added
drought_21 Added
drought_22 Added
drought_23 Added
drought_24 Added
drought_25 Added
drought_26 Added
drought_27 Added
drought_28 Added
drought_29 Added
drought_3 Added
drought_30 Added
drought_31 Added
drought_32 Added
drought_4 Added
drought_5 Added
drought_6 Added
drought_7 Added
drought_8 Added
drought_9 Added

Resources/Textures/_Nuclear14/Decals/graffiti.rsi

State Old New Status
aid Added
arrow Added
arrows_yellow Added
below Added
boombooms Added
camp_east Added
camp_north Added
camp_south Added
camp_west Added
clueless Added
clueless_green Added
crabs Added
danger Added
dead Added
deadcount Added
deadinside Added
deadman Added
death Added
death2 Added
dieyoung Added
donot Added
dontopen Added
eyes Added
follow Added
fort Added
free Added
fuckncr Added
fuckyou Added
gangshit Added
ghouls Added
gohome Added
guns Added
ladder_east Added
ladder_north Added
ladder_south Added
ladder_west Added
legion Added
many_eyes Added
mark Added
mines Added
mirelurk Added
moyai Added
ncr Added
ncr_bear Added
ncr_caution Added
ncr_stop Added
noway Added
ourtown Added
phoenix Added
rangers Added
reaper Added
riddler1 Added
riddler2 Added
riddler3 Added
scorpion_east Added
scorpion_north Added
scorpion_south Added
scorpion_west Added
skullbones Added
slumbers Added
stop Added
verydead Added

Resources/Textures/_Nuclear14/Decals/graffiti64x64.rsi

State Old New Status
checkpoint_decal Added
nofuture_black Added
nofuture_red Added
nogod_black Added
nogod_red Added
seal_president Added
workers_decal Added

Resources/Textures/_Nuclear14/Decals/road_decals_ms.rsi

State Old New Status
drain Added
horizontal_crossing-1 Added
horizontal_crossing-2 Added
horizontal_crossing Added
horizontal_line-1 Added
horizontal_line-2 Added
horizontal_line Added
vertical_crossing-1 Added
vertical_crossing-2 Added
vertical_crossing Added
vertical_line-1 Added
vertical_line-2 Added
vertical_line Added

Resources/Textures/_Nuclear14/Decals/roadlines.rsi

State Old New Status
double1 Added
double2 Added
doublebroken1 Added
doublebroken2 Added
doublecorner Added
doublecorner2 Added
doublecorner3 Added
middlebrokensplit1 Added
middlebrokensplit2 Added
middlesolid1 Added
middlesolid2 Added
middlesolidbrokensplit1 Added
middlesolidbrokensplit2 Added
middlesolidbrokensplit3 Added
middlesolidbrokensplit4 Added
middlesolidcorner1 Added
middlesolidcorner2 Added
middlesolidsplit1 Added
middlesolidsplit2 Added
single1 Added
single2 Added
singlebroken1 Added
singlebroken2 Added
singlecorner Added
singlecorner2 Added
singlecorner3 Added

Resources/Textures/_Nuclear14/Decals/sheltersigns.rsi

State Old New Status
arrowshelter_left Added
arrowshelter_right Added
falloutshelter Added
shelteryellow Added
shelteryellow_circle Added
shelteryellow_left Added
shelteryellow_right Added

Resources/Textures/_Nuclear14/Structures/Furniture/Benches/parkbench_bamboo.rsi

State Old New Status
left Added
middle Added
right Added

Resources/Textures/_Nuclear14/Structures/Furniture/Benches/parkbench_wooden.rsi

State Old New Status
left Added
middle Added
right Added

Resources/Textures/_Nuclear14/Structures/Furniture/Benches/pews.rsi

State Old New Status
arm_left Added
arm_right Added
left Added
middle Added
right Added

Resources/Textures/_Nuclear14/Structures/Furniture/Benches/sofa.rsi

State Old New Status
arm_left Added
arm_right Added
corner Added
left Added
middle Added
right Added

Resources/Textures/_Nuclear14/Structures/Furniture/Benches/sofa_corp.rsi

State Old New Status
arm_left Added
arm_right Added
corner Added
left Added
middle Added
right Added

Resources/Textures/_Nuclear14/Structures/Furniture/Benches/steel_bench.rsi

State Old New Status
left Added
middle Added
right Added

Resources/Textures/_Nuclear14/Structures/Furniture/Benches/steel_bench_white.rsi

State Old New Status
left Added
middle Added
right Added

Resources/Textures/_Nuclear14/Structures/Misc/forklifts.rsi

State Old New Status
yellowforklift Added

Resources/Textures/_Nuclear14/Structures/Misc/tractors.rsi

State Old New Status
redtractor Added

Resources/Textures/_Nuclear14/Structures/Specific/barbershop.rsi

State Old New Status
barberchair Added
dyedispenser-broken Added
dyedispenser-off Added
dyedispenser Added
pole Added
thesnip Added

Resources/Textures/_Nuclear14/Structures/Specific/fitness.rsi

State Old New Status
bopbag Added
bopbag2 Added
fitnesslifter Added
fitnesslifter2 Added
fitnessweight-c Added
fitnessweight-w Added
fitnessweight Added
punchingbag Added
punchingbag2 Added
punchingbagcaptain Added
punchingbagcaptain2 Added
punchingbagsyndie Added
punchingbagsyndie2 Added
punchingbagwizard Added
punchingbagwizard2 Added

Resources/Textures/_Nuclear14/Structures/Wallmounts/conspiracy_board.rsi

State Old New Status
icon Added

Resources/Textures/_Nuclear14/Structures/Wallmounts/doujou.rsi

State Old New Status
doujousign Added

Resources/Textures/_Nuclear14/Structures/Wallmounts/last_idiot.rsi

State Old New Status
icon Added

Resources/Textures/_Nuclear14/Structures/Wallmounts/signs.rsi

State Old New Status
direction_epi Added

Edit: diff updated after 4f4077f

@Aidenkrz Aidenkrz changed the title Rooftops map Rooftops map (and more N14 assets) Dec 23, 2024
@Aidenkrz Aidenkrz changed the title Rooftops map (and more N14 assets) More N14 Assets Dec 23, 2024
@Aidenkrz Aidenkrz merged commit 570cebc into Goob-Station:master Dec 23, 2024
12 checks passed
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