Paramedic Lockers, Portafibs, and Chemvend Tweaks #53

rosieposieeee · 2023-09-28T06:47:47Z

About the PR

Added the content from my previous PRs on the original branch. As a recap of these PRs:

Portafibs are smaller, portable defibs with less charge, for Paramedics to carry around to help people who JUST died. They hardly have enough charge to really bring back anyone who has been dead for a while, making them situational.
Paramedic access was actually added, which means the paramedic secure windoor now works. Oh, and doctors can't nab the really valuable Paramedic items like the hud and suit and make paramedics into shittier doctors with no chem access.
Added more of each jug to the chemvend so that restocks will be happening less constantly.

On top of that, I made additional tweaks and fixes to those previous PRs.

Portafibs were only in duffels by accident, fixed that
added the emagged chem dispenser chemicals to the chemvend since the dispenser will not be around very often
gave paramed access for doctors when there's a skeleton crew
I also made the rollerbed inside paramedic gear the emergency one since it seems more fitting, stands out more, is less ugly, and is otherwise literally identical.

portafib.mp4

Tested everything again and it all works.

Technical details

I had to add napalm and ultravasculine bottles to our own code.

Media

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

Breaking changes

Changelog

upped jug amounts in each vend to accomodate for their use, and adds all emagged chemicals from the dispenser to them

github-actions · 2023-09-28T06:48:33Z

RSI Diff Bot; head commit 4dff633 merging into 6018cb6
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/DeltaV/Objects/Medical/portafib.rsi

State	Old	New	Status
icon			Added
inhand-left			Added
inhand-right			Added
ready			Added
screen			Added

Edit: diff updated after 4dff633

FluffiestFloof

I love comments.

They are helpful in figuring what is from especially when touching the base game files

Resources/Prototypes/Access/misc.yml

Resources/Prototypes/Access/medical.yml

Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml

Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml

Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml

Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml

Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml

Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml

Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml

Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml

github-actions · 2023-09-28T14:49:49Z

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

DebugOk

Paramedic is not defined within Content.Shared/Access/Components/IdCardConsoleComponent.cs meaning its an unobtainable access level outside of spawning with it.

rosieposieeee · 2023-09-28T18:59:20Z

Paramedic is not defined within Content.Shared/Access/Components/IdCardConsoleComponent.cs meaning its an unobtainable access level outside of spawning with it.

Done, whoops. Never even been hop so I didn't think about it. Will fix merge conflicts in a sec.

DebugOk

Test failures are valid. Chemvend changes introduce free money for cargo.

  Failed NoCargoOrderArbitrage [1 s]
  Error Message:
     Found arbitrage on CrateVendingMachineRestockChemVend cargo product! Cost is 3820 but sell is 6770!
  Expected: less than or equal to 3820
  But was:  6770.0d```

removed unnecessary comments (ones indicating a Delta V change while already in the Delta V directory)

Colin-Tel

Looks good! We'll just have to see how this affects the balance of things.

Adrian16199 · 2023-09-30T20:09:59Z

Not to be chuggin logs with a meaningless comment but..... I absolutely love this PR. Atleast as a paramedic enjoyer. Being able to carry defibs without it usin half your bag at the cost of power, definitely 10/10 because consequences if you dont pay attention to it as balance, givin paramedics additional access durin skeleton crew, absolutely 10/10 because i want to be able to paramed but also get chems if im alone at medical without CMO.

github-actions · 2023-10-03T20:23:45Z

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

Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

Colin-Tel

me saying the same thing post-merge fix
Looks good! We'll just have to see how this affects the balance of things.

this wont work btw

DebugOk · 2023-10-05T19:25:07Z

Fuck it

DebugOk · 2023-10-05T19:25:36Z

The fuck you mean merging failed

* add paramedic-only access * edit chemvend upped jug amounts in each vend to accomodate for their use, and adds all emagged chemicals from the dispenser to them * add portafib * added comments and tweaked rollerbed * one line comments * Update IdCardConsoleComponent.cs * increase crate price * Comment, misspelling adjustments removed unnecessary comments (ones indicating a Delta V change while already in the Delta V directory) * not all jugs are created equal this wont work btw * chemvend restock price --------- Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

plushes

rosieposieeee added 3 commits September 28, 2023 02:10

add paramedic-only access

52e2f14

edit chemvend

ca2dd26

upped jug amounts in each vend to accomodate for their use, and adds all emagged chemicals from the dispenser to them

add portafib

9ea60d2

github-actions bot added Changes: Sprites Changes: YML Changes any yml files labels Sep 28, 2023

FluffiestFloof reviewed Sep 28, 2023

View reviewed changes

rosieposieeee added 2 commits September 28, 2023 04:26

added comments and tweaked rollerbed

85d9e5f

one line comments

4475ef0

github-actions bot added the Status: Merge Conflict Fix your PR! label Sep 28, 2023

DebugOk suggested changes Sep 28, 2023

View reviewed changes

Update IdCardConsoleComponent.cs

625db72

github-actions bot removed the Changes: YML Changes any yml files label Sep 28, 2023

Merge remote-tracking branch 'upstream/master' into medical

2be507f

github-actions bot removed the Status: Merge Conflict Fix your PR! label Sep 28, 2023

rosieposieeee requested a review from DebugOk September 29, 2023 00:44

github-actions bot added the Status: Needs Review label Sep 29, 2023

DebugOk suggested changes Sep 29, 2023

View reviewed changes

increase crate price

05baaa9

rosieposieeee requested a review from DebugOk September 30, 2023 09:27

Comment, misspelling adjustments

1b085ae

removed unnecessary comments (ones indicating a Delta V change while already in the Delta V directory)

Colin-Tel previously approved these changes Sep 30, 2023

View reviewed changes

github-actions bot added the Status: Merge Conflict Fix your PR! label Oct 3, 2023

Merge branch 'master' into medical

f035b63

Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

Colin-Tel dismissed their stale review via f035b63 October 3, 2023 20:25

github-actions bot removed the Status: Merge Conflict Fix your PR! label Oct 3, 2023

Colin-Tel previously approved these changes Oct 3, 2023

View reviewed changes

not all jugs are created equal

67d5540

this wont work btw

rosieposieeee dismissed Colin-Tel’s stale review via 67d5540 October 4, 2023 01:55

chemvend restock price

4dff633

DebugOk merged commit 8940aec into DeltaV-Station:master Oct 5, 2023
12 checks passed

rosieposieeee deleted the medical branch February 7, 2024 03:20

TypoChel1 pushed a commit to TypoChel1/Ifi07 that referenced this pull request Jul 14, 2024

Merge PR DeltaV-Station#53 from Tetronamecronicus/plush

3d37ba4

plushes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Paramedic Lockers, Portafibs, and Chemvend Tweaks #53

Paramedic Lockers, Portafibs, and Chemvend Tweaks #53

rosieposieeee commented Sep 28, 2023 •

edited

Loading

github-actions bot commented Sep 28, 2023 •

edited

Loading

FluffiestFloof left a comment •

edited

Loading

github-actions bot commented Sep 28, 2023

DebugOk left a comment

rosieposieeee commented Sep 28, 2023

DebugOk left a comment

Colin-Tel left a comment

Adrian16199 commented Sep 30, 2023

github-actions bot commented Oct 3, 2023

Colin-Tel left a comment

DebugOk commented Oct 5, 2023

DebugOk commented Oct 5, 2023

Paramedic Lockers, Portafibs, and Chemvend Tweaks #53

Paramedic Lockers, Portafibs, and Chemvend Tweaks #53

Conversation

rosieposieeee commented Sep 28, 2023 • edited Loading

About the PR

Technical details

Media

Breaking changes

github-actions bot commented Sep 28, 2023 • edited Loading

FluffiestFloof left a comment • edited Loading

Choose a reason for hiding this comment

github-actions bot commented Sep 28, 2023

DebugOk left a comment

Choose a reason for hiding this comment

rosieposieeee commented Sep 28, 2023

DebugOk left a comment

Choose a reason for hiding this comment

Colin-Tel left a comment

Choose a reason for hiding this comment

Adrian16199 commented Sep 30, 2023

github-actions bot commented Oct 3, 2023

Colin-Tel left a comment

Choose a reason for hiding this comment

DebugOk commented Oct 5, 2023

DebugOk commented Oct 5, 2023

rosieposieeee commented Sep 28, 2023 •

edited

Loading

github-actions bot commented Sep 28, 2023 •

edited

Loading

FluffiestFloof left a comment •

edited

Loading