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

Major Resprite Overhaul #433

Merged
merged 6 commits into from
Dec 12, 2023
Merged

Major Resprite Overhaul #433

merged 6 commits into from
Dec 12, 2023

Conversation

Crumpaloo
Copy link
Contributor

@Crumpaloo Crumpaloo commented Dec 6, 2023

About The Pull Request

This is a rather sizeable sprite PR involving mostly minor fixes and tweaks of existing sprites, as well as some new resprites all together, look towards the changelog to see what changes this PR contains.

How Does This Help Gameplay?

How Does This Help Roleplay?

Proof of Testing

Screenshots/Videos

Changelog

🆑
imageadd: Computers resprited
imageadd: Computer glowing overlay fixed
imageadd: resprited chairs, new colored stools
imageadd: repsrited default floor tiles
imageadd: white tiles given more contrast
imageadd: directional windows resprited to fit new windoors
imageadd: fridge resprited to be more fridge sized
imageadd: White lockers given more contrast
imageadd: CE locker decal mistake fixed
imageadd: New Rollerbed
imageadd: Scrubber Given Vent outline decal to fit in more
imageadd: New Surgery Table
imageadd: New Crates
imageadd: New Wooden Dresser
imageadd: New Sinks
imageadd: New Iron Rack/Shelf
imageadd: New APC sprites
imageadd: New Vending Machines for some of the more popular ones since theres ALOT of machines
del: Red coke vendor.
/:cl:

Computer has been resprited

Computer glowing overlay fixed

resprited chairs, new colored stools

repsrited default floor tiles

white tiles given more contrast

directional windows resprited to fit new windoors

fridge resprited to be more fridge sized

White lockers given more contrast

CE locker decal mistake fixed

New Railings ( Borrowed from TG )

New Rollerbed

Scrubber Given Vent outline decal to fit in more

New Surgery Table

New Crates

New Wooden Dresser

New Sinks

New Iron Rack/Shelf

New APC sprites reconfigured to work with current APC icon states

New Vending Machines for some of the more popular ones since theres ALOT of machines
@github-actions github-actions bot added Sprites I like pretty things. Feature How I broke the server in one easy step! Merge Conflict Uh oh, a maint merged a PR that edits the same stuff as yours! labels Dec 6, 2023
…sprite-Overhaul

# Conflicts:
#	icons/obj/computer.dmi
#	icons/obj/modular_console.dmi
#	icons/obj/vending.dmi
@RimiNosha RimiNosha removed the Merge Conflict Uh oh, a maint merged a PR that edits the same stuff as yours! label Dec 7, 2023
@RimiNosha
Copy link
Contributor

RimiNosha commented Dec 7, 2023

Standing issues:
Modcomp and computer emissive is named wrong.
Vendor overlays need to be updated in code, due to recycled icons that no longer exist/have changed.
Fix APC offsets.
Window and windoor need layer adjustments to they look correct facing north.

  • Perhaps separate the top into an overlay with a higher layer to give the illusion of height.

@github-actions github-actions bot added Mapping Something something someone placed three reinforced window spawners in one place. Tools Oh great, another thing with external dependencies that'll break in the next six months. labels Dec 8, 2023
@github-actions github-actions bot added the Removal "What is soul? Are you a cult?" label Dec 8, 2023
@RimiNosha
Copy link
Contributor

Merging cause more resprites are incoming, and the window layering isn't important.

@RimiNosha RimiNosha merged commit b68dd53 into master Dec 12, 2023
21 of 22 checks passed
@RimiNosha RimiNosha deleted the Major-Resprite-Overhaul branch December 12, 2023 17:44
Artea-Station-Bot added a commit that referenced this pull request Dec 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature How I broke the server in one easy step! Mapping Something something someone placed three reinforced window spawners in one place. Removal "What is soul? Are you a cult?" Sprites I like pretty things. Tools Oh great, another thing with external dependencies that'll break in the next six months.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants