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

Redoes KMC's ticket machine and allows it to be built. #8833

Merged
merged 29 commits into from Jun 22, 2020

Conversation

jcatjmeow
Copy link
Contributor

Intent of your Pull Request

Requested by @Jarod1200
Re-adds and redoes KMC's ticket machine!
Features:

  • stunning overlays instead of shitty maptext!
  • wireless remote! Operate your ticket machine from the comfort of your desk!
  • density! The ticket machine now tangibly exists instead of being ethereal!
  • machine stuff! The machine can be, gasp, constructed and deconstructed!! Wow!!
  • infinite tickets! The ticket machine no longer runs out!
  • tickets catch fire if the machine is emagged! oh no!
  • cooldowns and message spam reduced, so the machine feels more smooth to use!

This has been tested, and I went through and added a football field of whitespace before and after every single character, for JameiD1's benefit :3

Picture!

Changelog

Original pr by KMC The sounds from this pr are the same but a lot of other stuff has changed so keep that in mind
🆑
rscadd: The ticket machine is back, and it and plays better than ever! Build it at your local service, medbay, or cargo lathe!
imageadd: beautiful sprites by KMC, with overlays by Jcat, and help from Partheo
/:cl:

@yogstation13-bot yogstation13-bot added Feature This adds new content to the game Icon Change labels Jun 7, 2020
@github-actions github-actions bot added the Sprites This PR has spriting changes label Jun 7, 2020
@jcatjmeow jcatjmeow requested a review from Ktlwjec1 as a code owner June 7, 2020 17:44
@github-actions github-actions bot added the Mapping Will result in a change to a map. label Jun 7, 2020
code/modules/research/designs/misc_designs.dm Outdated Show resolved Hide resolved
code/modules/paperwork/ticketmachine.dm Outdated Show resolved Hide resolved
code/modules/paperwork/ticketmachine.dm Outdated Show resolved Hide resolved
code/modules/paperwork/ticketmachine.dm Outdated Show resolved Hide resolved
code/modules/paperwork/ticketmachine.dm Outdated Show resolved Hide resolved
code/modules/paperwork/ticketmachine.dm Outdated Show resolved Hide resolved
code/modules/paperwork/ticketmachine.dm Show resolved Hide resolved
code/modules/paperwork/ticketmachine.dm Show resolved Hide resolved
code/modules/paperwork/ticketmachine.dm Show resolved Hide resolved
code/modules/paperwork/ticketmachine.dm Outdated Show resolved Hide resolved
jcatjmeow and others added 4 commits June 7, 2020 14:11
Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
@jcatjmeow jcatjmeow requested a review from JamieD1 June 7, 2020 18:52
@jcatjmeow
Copy link
Contributor Author

I can code it so your ticket buzzes when it's your turn. Y/N? TG has that feature as far as I'm aware

@smorgli
Copy link
Contributor

smorgli commented Jun 8, 2020

Buzzer is a good thing imo as long as you keep the ticket in your inventory.
Question, you removed it from eclipse station?

@MayhemSailor
Copy link
Contributor

@jcatjmeow - The machine is a standard feature of Eclipse Station, should not be removed.

@jcatjmeow
Copy link
Contributor Author

jcatjmeow commented Jun 8, 2020

@jcatjmeow - The machine is a standard feature of Eclipse Station, should not be removed.

Thanks for reminding me!
I had removed the button. As in, the button code no longer exists. I'm using a remote now. As such I had to remove the ticket machine button from eclipse.

However, you reminded me that the actual ticket machine was on eclipse as well! This is no good because the ticket machine behavior has been re-written and now it would be stuck in a wall, yucky! I have removed it as well.

If you want to have a ticket machine on eclipse station, just build one! The boards and remote can be printed roundstart from the cargo or service or medbay lathes. The machine does not require any expensive components either!

@MayhemSailor
Copy link
Contributor

MayhemSailor commented Jun 9, 2020

Removing from Eclipse is no good, port (PR #6884) was specifically to have working ticket machine at round start on Eclipse.

Do not support unless the machine is added to Eclipse. This is a wider issue than the ticket machine specifically. If coders change things that are extant on other maps (for whatever reason) they need to maintain the changes to those maps. "Just build one!" is not an excuse for lax maintenance.

@jcatjmeow
Copy link
Contributor Author

Ok this should be ready to go then!

@Firewolf34
Copy link
Contributor

Well put-together PR.

Copy link
Contributor

@JamieD1 JamieD1 left a comment

Choose a reason for hiding this comment

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

See below:

Also:
machine_designs.dm -> list ( to list(
misc_designs.dm -> list ( to list(
math spacing -> ticketmachine.dm 148-150

code/modules/paperwork/ticketmachine.dm Outdated Show resolved Hide resolved
code/modules/paperwork/ticketmachine.dm Outdated Show resolved Hide resolved
code/modules/paperwork/ticketmachine.dm Outdated Show resolved Hide resolved
code/modules/paperwork/ticketmachine.dm Outdated Show resolved Hide resolved
code/modules/paperwork/ticketmachine.dm Outdated Show resolved Hide resolved
@jcatjmeow jcatjmeow requested a review from JamieD1 June 12, 2020 21:36
@Tipy1802
Copy link

Best PR ever

@jcatjmeow
Copy link
Contributor Author

@JamieD1

@JamieD1 JamieD1 removed the Sprites label Jun 20, 2020
@jcatjmeow jcatjmeow added the Awaiting - Merge This PR is ready for merge label Jun 21, 2020
@JamieD1 JamieD1 added Awaiting - Action - Maintainer This PR is awaiting an action from a maintainer and removed Sprites / Icon Changes Awaiting - Merge This PR is ready for merge labels Jun 21, 2020
@jcatjmeow jcatjmeow requested a review from Partheo as a code owner June 22, 2020 21:29
@JamieD1 JamieD1 merged commit 2e71e4e into yogstation13:master Jun 22, 2020
@Yogbot-13 Yogbot-13 added the Icon Change This PR changes icons label Jun 22, 2020
Yogbot-13 added a commit that referenced this pull request Jun 22, 2020
@jcatjmeow jcatjmeow deleted the Ticket-machine branch June 23, 2020 17:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Awaiting - Action - Maintainer This PR is awaiting an action from a maintainer Feature This adds new content to the game Icon Change This PR changes icons Mapping Will result in a change to a map. Sprites This PR has spriting changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants