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

Adds Umbrellas #575

Merged
merged 32 commits into from
Nov 5, 2024
Merged

Adds Umbrellas #575

merged 32 commits into from
Nov 5, 2024

Conversation

Constellado
Copy link
Contributor

@Constellado Constellado commented Aug 30, 2024

What's this?

Adds umbrellas to the game!
They can open and close and they look real neat!

Why?

Because we need handheld parasols or umbrellas for the beach!
TO DO:

  • Inhand sprites for Volkan's umbrella
  • Item sprite for a basic umbrella
  • Inhand sprites for a basic umbrella
  • item sprite for a parasol
  • inhand sprites for a parasol
  • Make a Volkan's umbrella and parasol in code.
  • Make Volkan's umbrella stop radiation when open. It has radiation shielding.
  • Have the plain umbrellas have colour options!
  • Add umbrellas to the preferences menu.

Sprites so far:

Basic umbrella

imageimage
inhand open:
imageimageimageimage
inhand closed:
imageimageimageimage

Black Parasol

imageimage

Inhand open:
imageimageimageimage

inhand closed:
imageimageimageimage

Volkan's umbrella

imageimage
Inhand open:
imageimageimageimage

Inhand closed:
imageimageimageimage

@Constellado Constellado marked this pull request as ready for review August 31, 2024 12:59
@Constellado
Copy link
Contributor Author

Constellado commented Aug 31, 2024

In theory it is possible to add colour variations like with screwdrivers, but that is out of my scope.
Should be good enough for the beach!

@Draggeru
Copy link
Contributor

Based Drag core PR

Comment on lines 127 to 132
/obj/item/umbrella/volkan/on_transform(obj/item/source, mob/user, active)
. = ..()
if(active)
ADD_TRAIT(user, TRAIT_RADIMMUNE, INNATE_TRAIT)
else
REMOVE_TRAIT(user, TRAIT_RADIMMUNE, INNATE_TRAIT)
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The way you currently have it, this trait will be permanent if you open up an umbrella and then just drop it.

Also INNATE_TRAIT is an inappropriate trait source

You'd need to add a system so that it adds the trait in pickup if it's active, removes the trait in dropped regardless if it's active or not, and then in on_transform you'd have this code still*.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

*Except I think 1. user is not nullsafe in this code, and 2. this would give people using telekinesis to open the umbrella rad immunity

Copy link
Contributor Author

@Constellado Constellado Sep 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay I managed to do most of that apart from the telekinesis thing. I have NO idea how to deal with that.

@Constellado
Copy link
Contributor Author

I ended up adding colours!!
I also added it to the preferences menu :)
image

@github-actions github-actions bot added the Merge Conflict Resolve it or perish label Oct 20, 2024
@github-actions github-actions bot removed the Merge Conflict Resolve it or perish label Oct 27, 2024
@MrMelbert MrMelbert merged commit 3a63e14 into MrMelbert:master Nov 5, 2024
21 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants