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

Woah! Nice Clock(work tools)! #6068

Merged
merged 18 commits into from
Oct 20, 2023

Conversation

TheObserver-sys
Copy link
Contributor

About The Pull Request

image

While Clockwork content is currently still InDev™, this doesn't mean we can't add a few crumbs from them early. This adds a new loot pool, new tools, and a new crafting recipe.

Clockwork tools: Equal in power (stronger in the welder's case) to the Alien Versions, with different use sounds, and a description for each. In addition: The clockwork multitool has wirevision, equal to the alien multi, and thus, the code has been changed accordingly.

The Replica Clockwork Welder: Looks like the real clockwork welder, but has half the capacity, and .4 use speed, with no eye protection. It regenerates on its own, though, and requires an experimental welder to make. A nice minor upgrade, and not a complete hazard to use.

Why It's Good For The Game

These things were bound to make it into the game one way or another, so why not get that small piece of the bandaid done and over with. We can corrupt them later when Clockwork Content shifts from InDev, to something more tangible.

Changelog

🆑
add: Adds clockwork tools, replica clockwork welders, and the clockwork tool spawning pool. Currently, it's hooked up to the rouge miner generation so they can appear in game, at prob(1)
/:cl:

@github-actions github-actions bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Oct 13, 2023
silicons pushed a commit that referenced this pull request Oct 13, 2023
silicons pushed a commit that referenced this pull request Oct 14, 2023
silicons pushed a commit that referenced this pull request Oct 14, 2023
silicons pushed a commit that referenced this pull request Oct 14, 2023
silicons pushed a commit that referenced this pull request Oct 15, 2023
Copy link
Collaborator

@TheLordME TheLordME left a comment

Choose a reason for hiding this comment

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

please make macros for the <span>s

silicons pushed a commit that referenced this pull request Oct 15, 2023
silicons pushed a commit that referenced this pull request Oct 17, 2023
silicons pushed a commit that referenced this pull request Oct 17, 2023
@TheObserver-sys
Copy link
Contributor Author

please make macros for the s

They have been made -- however, I have no clue how you call them in the middle of a description, nor as an entire description for a tool.

@github-actions github-actions bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 18, 2023
@lolman360
Copy link
Contributor

please make macros for the s

They have been made -- however, I have no clue how you call them in the middle of a description, nor as an entire description for a tool.

"string with normal text [SPAN_FUNNY("string with the funny text")]" works:tm: (i tested it in discord with !dm and it works fine)

@TheObserver-sys
Copy link
Contributor Author

please make macros for the s

They have been made -- however, I have no clue how you call them in the middle of a description, nor as an entire description for a tool.

"string with normal text [SPAN_FUNNY("string with the funny text")]" works™️ (i tested it in discord with !dm and it works fine)

Yeah, funny you should mention that.
image
image

silicons pushed a commit that referenced this pull request Oct 18, 2023
@TheLordME
Copy link
Collaborator

TheLordME commented Oct 18, 2023

Yeah, funny you should mention that. image image

You can use the update_desc() proc (it allows you to use Runtime assignment to desc),
alternatively you can just leave the span part out and append it to an examine(which also would allow you to add a proximity requirement)

/obj/item/multitool/clockwork/examine(mob/user, dist)
	. = ..()
	. += SPAN_NZCRENTR("funny span massage")

silicons pushed a commit that referenced this pull request Oct 18, 2023
silicons pushed a commit that referenced this pull request Oct 18, 2023
silicons pushed a commit that referenced this pull request Oct 19, 2023
silicons pushed a commit that referenced this pull request Oct 19, 2023
silicons pushed a commit that referenced this pull request Oct 20, 2023
silicons pushed a commit that referenced this pull request Oct 20, 2023
silicons pushed a commit that referenced this pull request Oct 20, 2023
Copy link
Contributor

@silicons silicons left a comment

Choose a reason for hiding this comment

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

you generally don't want a space between the = and class and ', because that space is hard to read + gets sent verbatim so that's 2 characters of wasted space, but, yea, good enough for corporate :D

@silicons silicons merged commit 000b602 into Citadel-Station-13:master Oct 20, 2023
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants