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

[Bounty] Ports prisoner from TG #13893

Closed
wants to merge 15 commits into from
Closed

[Bounty] Ports prisoner from TG #13893

wants to merge 15 commits into from

Conversation

ghost
Copy link

@ghost ghost commented Apr 25, 2022

Document the changes in your pull request

Ports prisoner job from TG, and four pull requests related to it:
tgstation/tgstation#48819
tgstation/tgstation#49229
tgstation/tgstation#49177
tgstation/tgstation#49423
tgstation/tgstation#49861

I did change every map for this role except GaxStation, because it is currently under development and i don't want merge conflicts(fuck merge conflicts).

Wiki Documentation

A wikipage about it?

Changelog

🆑 Author: RaveRadbury
rscadd: Adds Prisoner role
imageadd: Adds icons for prisoner plasmeme envirosuit
rscadd: The biogenerator can now produce soy milk.
/:cl:

@ghost ghost requested review from a team as code owners April 25, 2022 13:44
@Yogbot-13 Yogbot-13 added Feature This adds new content to the game Mapping Will result in a change to a map. labels Apr 25, 2022
@TheGamerdk
Copy link
Contributor

tgstation/tgstation#49235 would probably be a good idea so they're not bored out of their minds.
License plate press PR is cool too
There's some bugfix PRs missing afaik

@ghost
Copy link
Author

ghost commented Apr 25, 2022

tgstation/tgstation#49235 would probably be a good idea so they're not bored out of their minds. License plate press PR is cool too There's some bugfix PRs missing afaik

I am bad at mapping and have no experience at it. If i would try to port it, permabrig will end up being without energy, normal access and air

There's some bugfix PRs missing afaik

Ill check them

@ghost
Copy link
Author

ghost commented Apr 25, 2022

Actually i can probably try to port tgstation/tgstation#49235, but maybe as another PR

@tattax
Copy link
Contributor

tattax commented Apr 25, 2022

we have different plasmaman suit sprites from tg

@tattax
Copy link
Contributor

tattax commented Apr 25, 2022

we have different plasmaman suit sprites from tg

i'd be better if you did it closer to ours

code/game/gamemodes/traitor/traitor.dm Outdated Show resolved Hide resolved
@@ -690,7 +690,7 @@
name = "Monkey"
antag_flag = ROLE_MONKEY
antag_datum = /datum/antagonist/monkey/leader
restricted_roles = list("Cyborg", "AI")
restricted_roles = list("Prisoner","Cyborg", "AI")
Copy link
Contributor

Choose a reason for hiding this comment

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

make a protected roles list for these

Copy link
Author

Choose a reason for hiding this comment

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

Actually i dont think it is required, since monkey gamemode is removed. I put prisoner restriction here just because... yes.

code/modules/clothing/outfits/plasmaman.dm Outdated Show resolved Hide resolved
Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>
@ghost
Copy link
Author

ghost commented Apr 25, 2022

we have different plasmaman suit sprites from tg

i'd be better if you did it closer to ours

I didn't do the sprites, and i am a bad spriter.

SuperSlayer and others added 3 commits April 25, 2022 18:11
@smorgli
Copy link
Contributor

smorgli commented Apr 25, 2022

It's a bounty, you're supposed to do all of it to claim the prize

@Hopekz
Copy link
Contributor

Hopekz commented Apr 25, 2022

Actually i can probably try to port tgstation/tgstation#49235, but maybe as another PR

Would have to be separate (probably outside of the bounty)
It's deceptively simple but in reality most of the important things on that map aren't 1:1 copies to things we have here like for example they fully redid their wire system and the new wire types don't exist in our codebase

@ghost
Copy link
Author

ghost commented Apr 25, 2022

It's a bounty, you're supposed to do all of it to claim the prize

Actually moderators aproved this bounty like "15 dollars for porting prisoner from TG", so event just porting only tgstation/tgstation#48819 would be fine. And the map change i am still planning to port, but not now.

@MenacingManatee MenacingManatee added the Bounty This PR is for a bounty, and cash reward label Apr 25, 2022
@ghost
Copy link
Author

ghost commented May 8, 2022

When merged

@ghost
Copy link
Author

ghost commented May 12, 2022

Merge conflicts, hooray

@ghost
Copy link
Author

ghost commented May 16, 2022

Not dead.

@JamieD1
Copy link
Contributor

JamieD1 commented May 30, 2022

christ :( conflicts..

@ghost
Copy link
Author

ghost commented May 31, 2022

When i will FINALLY get a computer i will fix it, but for now i can't do anything about this

@ghost
Copy link
Author

ghost commented Jul 1, 2022

Fix time

@ghost ghost closed this Jul 1, 2022
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bounty This PR is for a bounty, and cash reward Feature This adds new content to the game Mapping Will result in a change to a map.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants