Skip to content

[CHERRYPICK] September Part 1#626

Open
Ossa88 wants to merge 26 commits intoPentestSS13:masterfrom
Ossa88:cherrypick-sept2
Open

[CHERRYPICK] September Part 1#626
Ossa88 wants to merge 26 commits intoPentestSS13:masterfrom
Ossa88:cherrypick-sept2

Conversation

@Ossa88
Copy link
Collaborator

@Ossa88 Ossa88 commented Mar 13, 2026

About The Pull Request

Note: Because the Chem Overhaul will be so strange, this PR will not contain additional pulls.

Also mote everything below is part of the chemical PR, not the small ones before it.

** This isnt finished I need a break **

What was Removed:

$$\color{red}SHIPTEST$$ - Abductor Table removed
$$\color{green}PENTEST$$ - Restored + Modularized
$$\color{red}SHIPTEST$$ - Hot Potato (and toy) removed
$$\color{green}PENTEST$$ - Restored + Moduarlized
$$\color{red}SHIPTEST$$ - Xeno Cigarettes
$$\color{green}PENTEST$$ - Restored + Moduarlized
$$\color{red}SHIPTEST$$ - D20 of Fate
$$\color{green}PENTEST$$ - Restored + Moduarlized
$$\color{red}SHIPTEST$$ - Butler Outfit
$$\color{green}PENTEST$$ - Restored + Moduarlized
$$\color{red}SHIPTEST$$ - Cocoa Beans lost their Anti Tox
$$\color{red}SHIPTEST$$ - Hellbound and revival checks - No I am not bringing it back, I don't care.
$$\color{red}SHIPTEST$$ - Force Nose Pain
. New proc which determines how a character responds. When they gasp, groan or scream from pain.
. Demending on the "power" then pain resistance and analgesia adjust values down.
$$\color{green}PENTEST$$ - Force Nose Pain but working
. Corrects Shiptest code as they set some power levels values greater than 100, but their switch only checked 10-100.
. This resulted in tackling a vending machine, and it falling on you (power 400) to not cause you to scream.
. This was fixed.
$$\color{red}SHIPTEST$$ - Cult Stuff
. Unholy Water
. Hell Water
. No I am not bringing it back, its annoying and I just do not care enough
$$\color{red}SHIPTEST$$ - Super Lube
$$\color{red}SHIPTEST$$ - Advanced Slime Toxin
$$\color{green}PENTEST$$ - Restored. Added to Xenobio module
$$\color{red}SHIPTEST$$ - Gluttony's Blessing
$$\color{red}SHIPTEST$$ - Serotrotium
$$\color{red}SHIPTEST$$ - Fentanyl
$$\color{red}SHIPTEST$$ - Spraytan Crafting Removed
$$\color{red}SHIPTEST$$ - Hacked Peace Borgs no longer have Fentanyl

Sal Acid Removed
/datum/reagent/medicine/perfluorodecalin
/datum/reagent/medicine/oxandrolone
antitoxin
bicaridine
kelotane
dexalin
libital
silver sulf
styptic
/obj/item/reagent_containers/syringe/thializid
/obj/item/reagent_containers/hypospray/medipen/penacid
obj/item/storage/pill_bottle/trophazole
/datum/reagent/medicine/pyroxadone = 5

What was Changed:

$$\color{red}SHIPTEST$$ - Omnizine
. Omnizine was changed to Panacea
. Protozine (the weaker version) as changed to Effluvial Panacea
. Omnizine is a "development located on the frontier, a mildly anomalous substance"
. Efflucvial Panacea is "a waste product from attempts to make Panacea"
. Panacea can be found naturally inside Ambrosia Deus
. Effluvial Panacea can be found naturally in Geysers
$$\color{green}PENTEST$$ - Panacea
. Panacea is now known as Omnizine Panacea
. Omnizine Panavea is "a rare bioactive compound found within certain plant species."
. Effluvial Panavea is "A degraded or impure form of Omnizine Panacea which is produced though biomass decay in plant rich planets, or industrial food processing.
. This corrects the weird inconsistencies in their lore. Something can not be anomalous if it grows in a weed, and can be scooped out of a geyser on a planet.
$$\color{red}SHIPTEST$$ - Food
. Warm Donk Pockets no longer contain Omnizine Panacea but instead Effluvial Panacea
. Other foods that contained Omnizine Panacea should still contain Panacea
$$\color{red}SHIPTEST$$ - Tricordrazine
. Tricord was turned into Cureall
$$\color{green}PENTEST$$ - Cureall
. Cure all was turned back into Tricordrazine as Cureall is an unoriginal name.
$$\color{red}SHIPTEST$$ - Chemical Swaps
. Bicardine was replaced with Indomine
. Kelotane was replaced with Alvitane
. Dylovene was replaced with Pancrazine
. Tricordrazine was turned into Cureall
. Silver Sulfate was replaced with Quardexane**
. Styptic was replaced with Hadrakine**
. Lavaland Extract was turned into Hunter Extract
. Anti Toxin (Dylovene) was replaced with Charcoal
. ** In some cases they turned into Indomide and Alvitane for some reason
$$\color{red}SHIPTEST$$ - Crystal Reagent is stronger.
$$\color{red}SHIPTEST$$ - Purple Carpet now requires purple powder instead of Regenerative Jelly
$$\color{red}SHIPTEST$$ - Rotatium now requires Meth instead of Fentanyl
$$\color{red}SHIPTEST$$ - Syndicate Hypo now has Omnizine Panacea instead of Syndicate Nanites

What was Added:

$$\color{red}SHIPTEST$$ - Nettle gained Neoxanthin
. What is it? Heals tox... yay.

$$\color{red}SHIPTEST$$
Indomide

  • Slow brute healing
  • Increases bleed rate
  • synergizes with eating food
  • copper, 2 part acetone, phosphorus

$$\color{red}SHIPTEST$$
Hadrakine

  • Instant brute healing
  • slow healing over time
  • overdose causes extremely reduced bleeding
  • 3 part alum, hydrogen, oxygen, sulferic acid

$$\color{red}SHIPTEST$$
Silfrine

  • High brute healing, scales off how hurt you are
  • Can seal low-tier wounds when applied via injection
  • slows you down on account of the pain and agony
  • 3 part silver, phenol, carbon, sulpheric acid, 10u plasma catalyst and 450k heat

$$\color{red}SHIPTEST$$
Alvitane

  • low burn healing
  • cools you off
  • can heal very low-level burn wounds
  • carbon, silicon, 2 part silver, cryptobiolin catalyst (5u), low temp

$$\color{red}SHIPTEST$$
Quardexane

  • moderate burn healing
  • instant burn heal when applied via injection
  • does some wound healing
  • 3 part cryostylane, bromine, lye

$$\color{red}SHIPTEST$$
Ysiltane

  • High instant burn healing
  • Fuckton of stam damage that's right you gotta wait it out
  • ammonia, silver, sulfer, hydrogen, chlorine, 10u plasma catalyst

Charcoal

  • it's charcoal, practically unchanged

$$\color{red}SHIPTEST$$
Pancrazine

  • It's basically seiver
  • Nitrogen, silicon, potassium, 5u ammonia base

$$\color{red}SHIPTEST$$
Gjalrazine

  • Instant tox heals in exchange for disgust and other problems
  • 3 part pancrazine, 4 part carbon, 3 part diethylamine, 1u plasma catalyst

This results in the following:

Blood Chems
. Chitosan
. Saline-Glucose Solution
Chems from Fauna
. Soulus Dust
Chems from Flora
. Polypyrylium Oligomers
. Yes I fixed their math mistake instantly
. Pucetylline Essence
. Chartreuse Solution
. Earthsblood
. Neoxanthin
IPC Chems
. System Cleaner
. Liquid Solder
Misc Chems
. Strange Reagent
. Stasis
. Rezadone
. Insulin
Organ Chems
. Oculine
. Inacusiate - No more insta hearing fix
. Mannitol
. Neurine
. Corazone
. Silibinin
. Penthrite
Pain Chems
. Tramal
. Morphine
. Dimorlin
. Miner's Salve
. Carfencadrizine
Status Chems
. Spaceacillin
. Mutadone
. Antihol
. Diphenhydramine
. Haloperidol
. Modafilin
. Synaptizine
. Synaphydramine
. Lithium Carbonate
. Picodine
. Ephedrine
Wound Chems
. Bone Fixing Juice (C4L-Z1UM Agent)

Why It's Good For The Game

Updates things.

Changelog

🆑
add: Pending
/:cl:

thearbiber and others added 20 commits March 12, 2026 03:48
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
<img width="498" height="406" alt="image"
src="https://github.com/user-attachments/assets/62684d1c-3938-4deb-8fd7-778b6f55fee6"
/>

## Why It's Good For The Game

more underwear options nice i thinkl

## Changelog

:cl:
add: three new croptops
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

(cherry picked from commit c36c4f141d81a863c0d6dec30fbfce6d7bad584c)
…262)

## About The Pull Request

<img width="67" height="80" alt="image"
src="https://github.com/user-attachments/assets/d80ef473-779c-4f14-bcc5-803a88d11234"
/>
<img width="77" height="109" alt="image"
src="https://github.com/user-attachments/assets/befdaac3-a205-4054-9376-429515a556f7"
/>

## Why It's Good For The Game

you cant put the headphone thingy under your hair thats not how it works

## Changelog

:cl:
fix: Earmuffs and headphones now layer over hair
/:cl:

(cherry picked from commit 55295c06cb17c0ffeee1b0fe07071556d0fb4602)
Rips out like 3 chem systems of random healing chems. Adds new healing
chems

Indomide
 - Slow brute healing
 - Increases bleed rate
 - synergizes with eating food
 - copper, 2 part acetone, phosphorus

 Hadrakine
  - Instant brute healing
  - slow healing over time
  - overdose causes extremely reduced bleeding
  - 3 part alum, hydrogen, oxygen, sulferic acid

  Silfrine
  - High brute healing, scales off how hurt you are
  - Can seal low-tier wounds when applied via injection
  - slows you down on account of the pain and agony
- 3 part silver, phenol, carbon, sulpheric acid, 10u plasma catalyst and
450k heat

Alvitane
 - low burn healing
 - cools you off
 - can heal very low-level burn wounds
 -carbon, silicon, 2 part silver, cryptobiolin catalyst (5u), low temp

 Quardexane
 - moderate burn healing
 - instant burn heal when applied via injection
 - does some wound healing
 - 3 part cryostylane, bromine, lye

 Ysiltane
 - High instant burn healing
 - Fuckton of stam damage that's right you gotta wait it out
 -ammonia, silver, sulfer, hydrogen, chlorine, 10u plasma catalyst

Charcoal
- it's charcoal, practically unchanged

Pancrazine
- It's basically seiver
-Nitrogen, silicon, potassium, 5u ammonia base

Gjalrazine
- Instant tox heals in exchange for disgust and other problems
-3 part pancrazine, 4 part carbon, 3 part diethylamine, 1u plasma
catalyst

Surviving oxygen chems
- Salbutamol
- Dexalin
Both are unchanged

Reflavored
-Omnizine
-Tric

We have way too many random chems that do the same thing. I wanna change
the focus away from station chem to our own thing.

:cl:
add: new chemicals, see pr 5162 on the git
del: remove hot potatoes
del: 3 eras of random chems, from libital to salicylic acid
/:cl:

---------

Signed-off-by: Erika Fox <94164348+Erikafox@users.noreply.github.com>
Co-authored-by: generalthrax <139387950+generalthrax@users.noreply.github.com>
Co-authored-by: Ical <86125936+Ical92@users.noreply.github.com>
Co-authored-by: ritorizo <41831966+ritorizo@users.noreply.github.com>
Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
(cherry picked from commit d97836149b98ed2f5396608c8b2bb022002ab19f)
@Ossa88 Ossa88 changed the title [CHERRYPICK] September [CHERRYPICK] September Part 1 Mar 14, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants