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

Expands perma, adds license plate presses #14017

Merged
merged 12 commits into from May 10, 2022

Conversation

bruhlookatthisdood
Copy link
Contributor

@bruhlookatthisdood bruhlookatthisdood commented May 5, 2022

Document the changes in your pull request

I gave perma an expansion
I also gave it license plates
Cope?
It dosent touch the cells, shouldn't interfere with PR #13893
Box station has a disposal unit that goes from Warden to the prisoner's cell... for licensep lates.
image
image
image

Wiki Documentation

New picture

Changelog

🆑 Spookydonut and bruhlookatthisdood
rscadd: Perma has been given a makeover
rscadd: Perma has been given license plate presses to give them something to work on in prison.
/:cl:

@bruhlookatthisdood bruhlookatthisdood requested review from a team as code owners May 5, 2022 22:49
@Yogbot-13 Yogbot-13 added DME Edit This PR affects the yogstation.DME file Feature This adds new content to the game Mapping Will result in a change to a map. Sprites This PR has spriting changes labels May 5, 2022
@Cartlord
Copy link
Contributor

Cartlord commented May 6, 2022

your changelog has a typo
shame

@KillerOrcaCora
Copy link
Contributor

Based PR

@adamsong
Copy link
Contributor

adamsong commented May 6, 2022

I like the part where perma prisoners are given access to the warden's office

return FALSE
if(istype(I, /obj/item/stack/license_plates/empty))
var/obj/item/stack/license_plates/empty/plate = I
plate.use(1)
Copy link
Contributor

Choose a reason for hiding this comment

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

maybe put this as an if statement. "If you cannot use, early return."

Copy link
Contributor Author

Choose a reason for hiding this comment

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

dont see why it would be neccesary.

@bruhlookatthisdood
Copy link
Contributor Author

I like the part where perma prisoners are given access to the warden's office

how? its a outlet.

@maxion12345
Copy link
Contributor

Expansion seems a bit too large to justify another a few machines. This also ruins the whole "openness" of Perma that really solidified the whole "this is jail, the cameras watch your every move, there is no privacy outside of your cell and the bathroom".

Also disposal pipes through walls bad

@JamieD1
Copy link
Contributor

JamieD1 commented May 7, 2022

Comments in DMs

code/game/machinery/prisonlabor.dm Outdated Show resolved Hide resolved
code/game/machinery/prisonlabor.dm Outdated Show resolved Hide resolved
code/modules/cargo/packs.dm Outdated Show resolved Hide resolved
@bruhlookatthisdood
Copy link
Contributor Author

only thing im worried about right now is the warden throwing things in the license plate disposal chute, that are not license plates.

the prisoners must mald.

@JamieD1 JamieD1 merged commit 61c1f2c into yogstation13:master May 10, 2022
Yogbot-13 added a commit that referenced this pull request May 10, 2022
@Cartlord
Copy link
Contributor

But what do you DO with license plates?

@bruhlookatthisdood
Copy link
Contributor Author

But what do you DO with license plates?

sell them to cargo

@bruhlookatthisdood bruhlookatthisdood deleted the pribson branch May 12, 2022 01:40
@ghost
Copy link

ghost commented May 12, 2022

Actually it conflicts with #13893

@bruhlookatthisdood
Copy link
Contributor Author

Actually it conflicts with #13893

uhoh

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
DME Edit This PR affects the yogstation.DME file Feature This adds new content to the game 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

10 participants