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

Fishin' and the killin' power of rock also trash is permanent #428

Merged
merged 13 commits into from
Sep 4, 2024

Conversation

AmoryBlaine
Copy link
Contributor

@AmoryBlaine AmoryBlaine commented Sep 1, 2024

  • Updates fishable table to include crabs and squid.
  • Removes timer on all instances of garbage in the game. No more magically disappearing trash.
  • adds rocks you can find and use to kill things.

- Trash no longer magically disappears
- Rocks are now a prop that can be placed on maps and act as a type of basic weapon
@AmoryBlaine AmoryBlaine changed the title Fishin' Fishin' and the killin' power of rock Sep 1, 2024
@AmoryBlaine AmoryBlaine changed the title Fishin' and the killin' power of rock Fishin' and the killin' power of rock also trash is permanent Sep 1, 2024
Copy link
Contributor

@Doubleumc Doubleumc left a comment

Choose a reason for hiding this comment

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

Leave garbage items marked as garbage. If you want to change how they get cleaned up, look in the item_cleanup subsystem:

wait = 10 MINUTES //should be adjusted for WO
var/start_processing_time = 35 MINUTES //should be adjusted for WO

Garbage is TRUE again, but less stuff is marked as garbage and garbage is infinite now
Copy link
Contributor

@Doubleumc Doubleumc left a comment

Choose a reason for hiding this comment

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

No need to change any garbage = ... lines at all.

Other than that, code looks good.

Copy link
Contributor

@Doubleumc Doubleumc left a comment

Choose a reason for hiding this comment

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

Just some dangling changes.

Otherwise looks good.

code/datums/diseases/black_goo.dm Outdated Show resolved Hide resolved
code/game/objects/effects/decals/cleanable/misc.dm Outdated Show resolved Hide resolved
code/game/objects/items/props/helmetgarb.dm Outdated Show resolved Hide resolved
code/game/objects/prop.dm Outdated Show resolved Hide resolved
@Doubleumc Doubleumc enabled auto-merge (squash) September 4, 2024 03:20
@Doubleumc Doubleumc merged commit 99b6522 into cmss13-devs:master Sep 4, 2024
35 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.

2 participants