Commit Graph

10 Commits

Author SHA1 Message Date
GNUtopia
31457e3f85 Chem Tweaks (#2293)
Makes an assortment of changes related to chems.
Morphine has been made more accessible at roundstart, adding a pain pen
to the prefilled advanced medical belt and swapping a pain pen for a
morphine bottle in the prefilled syringe case. Morphine also now blocks
pain for longer, hopefully alleviating an issue where the effect would
wear off during heart transplants. Also fixes an error which required
the patient to have *both* ForcedSleep and NoScream to block the surgery
pain moodlet. Additionally adds a morphine autoinjector cartridge.
Adds enunciase, which removes stuttering statuses and temporarily
disables all accents, and formic acid, which can react to make water or
enunciase.
Haloperidol also now removes less severe stuttering and ousiana dust now
removes psionic insulation and power blocking statuses.
Salicylic acid now works on corpses to reflect the description.
Additionally fixes a missing locale from the Goob chem port and tweaks
the text for the proto medical multitool.

---

<details><summary><h1>Media</h1></summary>
<p>

![formic
acid](https://github.com/user-attachments/assets/7344bfec-4bb0-4b6c-9182-0b3ca2bce111)

![enunciase](https://github.com/user-attachments/assets/46ded0e3-39ea-4943-bcd8-d1721de81052)

![haloperidol](https://github.com/user-attachments/assets/04d67bc9-ce7b-49b8-82b5-fbc9ee5b83b1)
![ousiana
dust](https://github.com/user-attachments/assets/5cb1a0b4-5591-492d-88ce-9717b6606cbb)

![morphine](https://github.com/user-attachments/assets/78893dc4-805d-4adf-8804-1db5aeb9020f)
![updated stamina change
text](https://github.com/user-attachments/assets/acba97d3-35a8-4b52-a04f-f76aeea4e183)
![tweaked appearances for morphine and
artiplates](https://github.com/user-attachments/assets/09864b45-25af-4dda-b61b-91fbe114d5dc)
(dylovene to the left for comparison)
![enunciase being
used](https://github.com/user-attachments/assets/99f1fdac-9c9c-4746-9994-9b31a2eaede9)
![formic acid reacting with sulfuric
acid](https://github.com/user-attachments/assets/f530fdf6-be8f-4add-aa9b-4e606f572907)
![morphine ACTUALLY blocking the moodlet this
time](https://github.com/user-attachments/assets/919c70f0-8ab0-4ffa-be70-da7114194322)

</p>

</details>

---

🆑
- add: Added formic acid
- add: Added enunciase
- add: Added morphine autoinjector cartridge
- tweak: Haloperidol now counteracts stuttering from chems
- tweak: Ousiana dust now counteracts psionic insulation/blocking
statuses
- tweak: Morphine blocks pain for longer
- tweak: Morphine and artiplates are more visually distinct
- tweak: Increased distribution of morphine roundstart
- tweak: Changed wording of stamina change effect
- tweak: Salicylic acid works on corpses
- fix: Fixed missing locale text for some stamina-affecting chems
- fix: Fixed guidebook falsely saying effects accumulate
- fix: Fixed capitalisation of proto medical multitool
- fix: Fixed morphine not blocking surgery pain moodlet

---------

Signed-off-by: GNUtopia <93669372+GNUtopia@users.noreply.github.com>

      - CartridgePain # Morphine Tweaks#
2025-07-20 13:09:28 +10:00
vanx
f6ea129ea8 [Fix+Tweak] Surgery Speed (#564)
* surgery speed

* Update Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml

---------

Co-authored-by: vanx <discord@vanxxxx>
Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>
2025-06-09 21:21:01 +03:00
ZetaNull
fbf4ebf62f New Xelthia Surgical Jacket + Surgery Check for Xelthia Jackets (#2340)
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

Title. Allows the insulated jacket to be used as gloves during surgery,
adding a component to facilitate this, and adds a similar jacket for the
express purpose of being used in surgery.

Also comes with a bugfix for the Xelthia-specific insulated jacket
sprite not working properly and a bit of fine tuning for its
description. The jackets are also added to appropriate spots like CE and
CMO lockers.

---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

<details><summary><h1>Media</h1></summary>
<p>

A fair number of screenshots taken while testing this at various points

![image](https://github.com/user-attachments/assets/1e903668-e109-4c7c-b136-9ff3b16f277a)

![image](https://github.com/user-attachments/assets/2793b4d0-21f3-41bd-8934-aae79f40b73a)
(pre-fix for xelthia insulated jacket sprite)

![image](https://github.com/user-attachments/assets/87f6c976-a32a-43f6-ada0-c6ca6549841d)

![image](https://github.com/user-attachments/assets/f314e9bc-cc85-407f-9b67-e1f6b79313d6)

![image](https://github.com/user-attachments/assets/47d2dc8a-96d7-46df-b222-eabf02bc6306)

</p>
</details>

---

# Changelog

<!--
You can add an author after the `🆑` to change the name that appears
in the changelog (ex: `🆑 Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

🆑 Zeta_Null
- add: Added a surgical jacket, for Xelthia to perform surgery wearing
in place of gloves.
- tweak: Tweaked surgery to allow for jackets with gloves to be treated
as gloves.

(cherry picked from commit d110aa2cb23734f6bb8092e05da1186da847216e)
2025-05-10 00:15:14 +03:00
Remuchi
1e363c7346 Revert "Merge pull request #462 from WWhiteDreamProject/revert-460-upstream"
This reverts commit 092dba42e5, reversing
changes made to e6315c2320.
2025-04-20 11:15:45 +07:00
DVONIKS
6c19771020 Revert "Upstream 04.04-18.04" 2025-04-20 06:34:09 +03:00
dootythefrooty
717f8404f0 Abductor Port (#2234)
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

Ports the lone abductor and possibly(?) the duo abductors.

---

# TODO

<!--
A list of everything you have to do before this PR is "complete"
You probably won't have to complete everything before merging but it's
good to leave future references
-->

- [X] Figure out why abductors aren't spawning as the abductor race.
- [X] Make sure it's not a buggy mess.

---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

<details><summary><h1>Media</h1></summary>
<p>

![image](https://github.com/user-attachments/assets/81292bde-ad96-4d08-a30e-87c9bc2df8aa)
</p>
</details>

---
# Credits
Thank to [Starlight ](https://discord.com/invite/wAyQKB78fH)for the
original version!
Darkrell, Rinary, and Landosaur made the funny little guys.

![image](https://github.com/user-attachments/assets/1c62afe9-7fb9-458e-bc61-5745ba3a2a6b)

# Changelog

<!--
You can add an author after the `🆑` to change the name that appears
in the changelog (ex: `🆑 Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

🆑 Darkrell, Rinary, Landosaur
- add: The Abductors are here to replace your organs. Gleep Glorp!

---------

Co-authored-by: gluesniffler <159397573+gluesniffler@users.noreply.github.com>
Co-authored-by: Solstice <solsticeofthewinter@gmail.com>
Co-authored-by: SX_7 <sn1.test.preria.2002@gmail.com>
Co-authored-by: Theodore Lukin <66275205+pheenty@users.noreply.github.com>
Co-authored-by: Piras314 <p1r4s@proton.me>
Co-authored-by: Ilya246 <57039557+ilya246@users.noreply.github.com>

(cherry picked from commit ea9f1526868289d20832989cb02f79c76c240918)
2025-04-19 01:45:58 +03:00
GNUtopia
1f40a248bb Morphine (#2198)
# Description

Brings a number of improvements to the surgical experience. Adds
morphine, a new narcotic which prevents screaming (and mood penalties)
from surgery without putting the patient to sleep. This allows for
lengthier operations without either knocking the player out or having
them scream a lot. Also adds analgesic medipens which contain 15u of
morphine (enough for 75 seconds of operation) and 5u of epinephrine.
These are included in the combat medkit, field surgery kit, and filled
CMO webbing. Additionally adds emergency nitrous oxide tanks which spawn
in paramedic lockers to potentially allow for field surgery. Also adds a
proper syringe case, craftable in the medfab, for those who want to
organise their supplies without using cigarette boxes. Finally, this
(re?)enables mood penalties for surgery without morphine/NO2 to
hopefully incentivise medics to interface with the system.

---

<details><summary><h1>Media</h1></summary>
<p>

![Morphine guidebook
entry](https://github.com/user-attachments/assets/2002e4da-da64-4c5a-b25e-36281166bfe5)
![A felinid is painlessly relieved of his
brain](https://github.com/user-attachments/assets/91ec0d32-ddc5-4186-b0fd-ae9b0f6ffea3)

</p>
</details>

---

# Changelog

🆑
- add: Added morphine
- add: Added syringe case
- add: Added analgesic medipen
- add: Added emergency nitrous oxide tank
- tweak: Added pain pens to advanced medipen kits
- tweak: (Re?)enabled surgery pain moodlet

---------

Signed-off-by: GNUtopia <93669372+GNUtopia@users.noreply.github.com>

(cherry picked from commit 6573a2b4c7df20ac3a38d552a10748b90b7ce517)
2025-04-18 18:01:10 +03:00
vanx
d46ece0beb [Fix] Torso Cavity Being Accessible (#300)
rezal uristov na lokalke 10 chasov

Co-authored-by: vanx <discord@vanxxxx>
2025-03-09 14:58:26 +03:00
sleepyyapril
885ee5a831 Wizmerge for Station AI (#1351)
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

the adding AI is now up to y'all because i'm not touching loadout code
for name datasets, but it shouldn't be too bad from here

---------

Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
Signed-off-by: SolStar <44028047+ewokswagger@users.noreply.github.com>
Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: themias <89101928+themias@users.noreply.github.com>
Co-authored-by: Verm <32827189+Vermidia@users.noreply.github.com>
Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Co-authored-by: Sphiral <145869023+SphiraI@users.noreply.github.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: Alzore <140123969+Blackern5000@users.noreply.github.com>
Co-authored-by: ravage <142820619+ravage123321@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: Intoxicating-Innocence <188202277+Intoxicating-Innocence@users.noreply.github.com>
Co-authored-by: Saphire <lattice@saphi.re>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: CaasGit <87243814+CaasGit@users.noreply.github.com>
Co-authored-by: BramvanZijp <56019239+BramvanZijp@users.noreply.github.com>
Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com>
Co-authored-by: NakataRin <45946146+NakataRin@users.noreply.github.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com>
Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
Co-authored-by: Doomsdrayk <robotdoughnut@comcast.net>
Co-authored-by: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com>
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: Julian Giebel <juliangiebel@live.de>
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com>
Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
Co-authored-by: icekot8 <93311212+icekot8@users.noreply.github.com>
Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: no <165581243+pissdemon@users.noreply.github.com>
Co-authored-by: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com>
Co-authored-by: osjarw <62134478+osjarw@users.noreply.github.com>
Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com>
Co-authored-by: TGRCDev <tgrc@tgrc.dev>
Co-authored-by: Milon <milonpl.git@proton.me>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Co-authored-by: Fildrance <fildrance@gmail.com>
Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
Co-authored-by: chavonadelal <156101927+chavonadelal@users.noreply.github.com>
Co-authored-by: SolStar <44028047+ewokswagger@users.noreply.github.com>
Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: ArchRBX <5040911+ArchRBX@users.noreply.github.com>
Co-authored-by: archrbx <punk.gear5260@fastmail.com>
Co-authored-by: Radezolid <snappednexus@gmail.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com>
Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
Co-authored-by: neuPanda <chriseparton@gmail.com>
Co-authored-by: neuPanda <spainman0@yahoo.com>
Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
Co-authored-by: Whatstone <whatston3@gmail.com>
Co-authored-by: VideoKompany <135313844+VlaDOS1408@users.noreply.github.com>

(cherry picked from commit 93ed70acfeda357133a701f637d3faeec02749bb)
2025-01-14 00:13:42 +03:00
gluesniffler
2a33691a1c Ports Shitmed Updates From Goob (#1387)
Lots of stuff. Also moved everything I could to the _Shitmed namespace
as I do in Goob. Will make future ports way faster

# Changelog
🆑 Mocho
- add: Added some fun organs and other thingies, check out the Goob PRs
if you want more details.
- fix: Fixed tons of issues with shitmed. Too many for the changelog in
fact.

(cherry picked from commit 3c9db94102cb25b28a83d51ac8d659fa31fe7d12)
2025-01-13 23:01:51 +03:00