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

Mediborg #113

Merged
merged 13 commits into from
Oct 6, 2023
Merged

Mediborg #113

merged 13 commits into from
Oct 6, 2023

Conversation

FluffiestFloof
Copy link
Contributor

@FluffiestFloof FluffiestFloof commented Oct 5, 2023

About the PR

So this re-adds mediborgs but extremely downgraded since it follows the same logic as the normal wizden borg.
This give them the bare minimum to do their job (health analyser) and they can create candies.

The PR additionally re-adds their old laws.

I'm sure people that enjoyed the old mediborg won't like having no tools on spawn but it give them something to bother epi for. The research is only Tier 1.
If required, they can always start with more modules if we want, maybe the treatment module. (Limits is 3 total for borgs)

Why / Balance

Technical details

Media

ss (2023-10-05 at 11 55 11)

  • [NO] I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

🆑

  • add: Added mediborgs as round start job.

@github-actions
Copy link
Contributor

github-actions bot commented Oct 5, 2023

RSI Diff Bot; head commit aab74a8 merging into 37b7f6a
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi

State Old New Status
BorgMedical Added

Edit: diff updated after aab74a8

@github-actions github-actions bot added the S: Merge Conflict Fix your PR! label Oct 6, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Oct 6, 2023

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the S: Merge Conflict Fix your PR! label Oct 6, 2023
Copy link
Contributor

@Colin-Tel Colin-Tel left a comment

Choose a reason for hiding this comment

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

😄

@Colin-Tel Colin-Tel enabled auto-merge (squash) October 6, 2023 15:24
@Colin-Tel Colin-Tel merged commit 0f68868 into DeltaV-Station:master Oct 6, 2023
DeltaV-Bot pushed a commit that referenced this pull request Oct 6, 2023
@FluffiestFloof FluffiestFloof deleted the mediborg branch October 6, 2023 15:32
DebugOk referenced this pull request in DebugOk/Delta-v Oct 8, 2023
* basic stuff

* Fabricate them candies

* the candy creator and laws

* Technically still a normal borg

* jobicon

* migration

* Make the CMO their supervisor

* duplicate migration

* job timer

I hate this I wish all borgs could just be JobBorg

* works better if its not in the wrong repo

* buh

---------

Signed-off-by: Colin-Tel <[email protected]>
Co-authored-by: Colin-Tel <[email protected]>
DebugOk referenced this pull request in DebugOk/Delta-v Oct 8, 2023
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Jan 3, 2025
## Mirror of PR #25299: [Lawdrobe
update](space-wizards/space-station-14#25299)
from <img src="https://avatars.githubusercontent.com/u/10567778?v=4"
alt="space-wizards" width="22"/>
[space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14)

###### `4b359466ccf1cfb7642a048dc142d12ffbefc3e9`

PR opened by <img
src="https://avatars.githubusercontent.com/u/107373427?v=4"
width="16"/><a href="https://github.com/beck-thompson">
beck-thompson</a> at 2024-02-16 01:39:38 UTC
PR merged by <img
src="https://avatars.githubusercontent.com/u/19864447?v=4"
width="16"/><a href="https://github.com/web-flow"> web-flow</a> at
2024-03-07 19:18:39 UTC

---

PR changed 3 files with 26 additions and 0 deletions.

The PR had the following labels:
- No C#


---

<details open="true"><summary><h1>Original Body</h1></summary>

> <!-- Please read these guidelines before opening your PR:
https://docs.spacestation14.io/en/getting-started/pr-guideline -->
> <!-- The text between the arrows are comments - they will not be
visible on your PR. -->
> 
> ## About the PR
> <!-- What did you change in this PR? -->
> Some basic changes to the Lawdrobe.
> 
> ## Why / Balance
> <!-- Why was it changed? Link any discussions or issues here. Please
discuss how this would affect game balance. -->
> The lawdrobe was, overall, pretty dull so I added a few new things
that greatly improve its role play potential!
> ## Technical details
> <!-- If this is a code change, summarize at high level how your new
code works. This makes it easier to review. -->
> - Added 5 new advertisements.
> - Added 5 new thank you messages.
> - Added Luxury Pen to Lawdrobe 2x.
> - Added Judge robe and Hair to contraband.
> - Added 100 space cash to contraband Inventory 2x.
> ## Media
> <!-- 
> PRs which make ingame changes (adding clothing, items, new features,
etc) are required to have media attached that showcase the changes.
> Small fixes/refactors are exempt.
> Any media may be used in SS14 progress reports, with clear credit
given.
> 
> If you're unsure whether your PR will require media, ask a maintainer.
> 
> Check the box below to confirm that you have in fact seen this (put an
X in the brackets, like [X]):
> -->
> 
>
[Meda.webm](https://github.com/space-wizards/space-station-14/assets/107373427/2d774ba3-1aaf-467c-b4e0-eac903e98a1a)
> 
> **Changelog**
> <!--
> Make players aware of new features and changes that could affect how
they play the game by adding a Changelog entry. Please read the
Changelog guidelines located at:
https://docs.spacestation14.io/en/getting-started/pr-guideline#changelog
> -->
> 
> 🆑 Beck Thompson
> - add: Lawdrobe has some new items and new ads!


</details>

---------

Co-authored-by: beck-thompson <[email protected]>
Co-authored-by: VMSolidus <[email protected]>
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