405 Commits

Author	SHA1	Message	Date
Ghagliiarghii	9921456a81	Make Holy Water more like Water (#27068) ... holy water can now be used to satiate thirst, water plants, and extinguish fires. (cherry picked from commit 40d90ddcb3d85be291f2dffae2d91681c512158d)	2025-07-20 14:03:09 +10:00
VMSolidus	a89a2c7bb7	IPC Rebalance And Rework (#2464) ... This PR significantly reworks IPCs to make them more interactive with many other aspects of gameplay. Some of the changes made are: - IPCs are no longer immune to radiation, they instead have a (currently) unique flat reduction to radiation. Minor rad sources will not harm them, whereas significant sources such as the Supermatter will require more meaningful protection. - IPCs are no longer immune to space. They take constant heat damage when exposed to a hard vacuum, as their internal cooling system fails in the absense of an atmosphere. Just like organics, they can wear space suits to be protected from this. - IPCs now bleed coolant. It doesn't actually do anything currently, but it looks cool. - IPCs have gained numerous new traits so that you can customize your IPC how you please. - Nanite Auto Repair Bots have been nerfed. Now they only work up to 75 damage. They still work if you are dead. <details><summary><h1>Media</h1></summary> <p> Hardened Circuits:  G2 Chassis:  Superior Radiation Shielding:  IPC guidebook fix and tweak:  </p> </details> 🆑 - tweak: IPCs are no longer immune to Radiation and Space. - tweak: IPC shock damage has been reduced from 3x to 1.2x - add: IPCs have gained numerous new traits for customization. As well as rebalanced Nanite Auto-Repair Bots. - add: Circuitry can now be used to repair Synthetics. - fix: Fixed the guidebook link for IPCs not appearing in character creation. --------- Signed-off-by: OldDanceJacket <98985560+OldDanceJacket@users.noreply.github.com> Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: OldDanceJacket <98985560+OldDanceJacket@users.noreply.github.com>	2025-07-20 13:49:13 +10:00
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>        (dylovene to the left for comparison)    </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
Nemanja	398fc5cd98	Hivelord mob (#31322) ... * Hivelord * make it longah (cherry picked from commit e510504596f992744cfe62cdf26aa12f38ff6aa2)	2025-07-19 15:43:29 +10:00
Nemanja	ca2680fd6d	increase material prices (#30869) ... * increase material prices * ack (cherry picked from commit 18c146cc7ff292cbeae44e8e5abb1aebc42b6414)	2025-07-19 13:02:39 +10:00
potato1234_x	beed765e5b	Tea Plant and Blue Pumpkin (#25092) ... * tea plant, blumpkin * fix linter * fix tests pls * bloompkin * forgor rsi * work please * WORK PLEASE * migration of the blumpkins * it is now glumpkin * lowercase * uppercase * adjust values and fix blorbo wtf when did blumpkin donut turn into blorbo donut what * fix test * update * fix stupid mistake * Update meta.json * totally not a webedit * not a webedit 2 * nitpicks (cherry picked from commit 19526182035345c5cf8c675691666ee2c7ffa5ec)	2025-07-18 15:51:09 +10:00
deltanedas	8a51f8f96a	give spiders unique venom reagent (#29066) ... * add mechanotoxin * make tarantulas use mechanotoxin * trolled --------- Co-authored-by: deltanedas <@deltanedas:kde.org> (cherry picked from commit f730d120c72e26e39f4e776622c6e29a676330f6)	2025-07-12 13:38:00 +10:00
VMSolidus	dc52f8bf2b	Mood Rework Part 1 (#2425) ... This PR significantly reworks some parts of the mood system, namely by completely restoring and reworking the saturation scale shader so that its not completely terrible. Additionally, I've added numerous new instances and locations where Moodlets can be found in the game, particularly when it comes to food and drugs, as well as a new Mood interaction with the Deep Fryer. Chef gameplay is significantly expanded via the introduction of flavor related moodlets, as well as the almighty deep fryer giving a unique, moderately strong, and long lasting moodlet to anyone who eats whatever you deep fry. Go ahead, give someone a deep fried stick of salted butter coated in chocolate. You'll make their day. The big differences with the Saturation Scale are that its now variable, with smooth transitions, with the scale scaling with your character's mood. The more depressed you are, the more desaturated the world becomes. Whereas if you have entirely too many positive mood bonuses, the world becomes incredibly vibrant. <details><summary><h1>Media</h1></summary> <p> Shoukou's Bar as seen by someone with the Sanguine trait(and no other moodlets)  Max mood  Saturnine trait:  Minimum mood(dead)  Smooth transitions for shader tone. https://github.com/user-attachments/assets/3ab55da1-eca6-4cc5-9489-f4ad13ed0f27 </p> </details> 🆑 - add: Re-enabled the "Mood shader" after significantly reworking it. Mood visual effects now scale with your character's mood, instead of only ever being near-greyscale. Being high life now makes the world more colorful and saturated. - add: A huge variety of medicines, drugs, and even food items(based on flavor!) now have mood effects. Reaching for the packet of salt now actually makes food provide a better mood buff. - add: Being Tear-gassed causes a massive mood penalty. - add: Deep frying food provides a strong mood bonus. - add: Added new Manic, Mercurial, and Dead Emotions traits. Signed-off-by: VMSolidus <evilexecutive@gmail.com>	2025-07-12 00:55:42 +10:00
vanx	da66b13c0f	[Add] Painkillers Stop Damage Affecting Mood (#586) ... * killpainer * 5 --------- Co-authored-by: vanx <discord@vanxxxx>	2025-06-16 20:29:41 +03:00
Boevi4ok	1bf2431706	[TWEAK] Make krio grate again (#498) ... * krio * fixik	2025-05-16 23:47:43 +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
EctoplasmIsGood	6ed0dc7137	Chem/Gas Ports (#2184) ... <!-- 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 over a large amount of Goob Chems, which will be required for future PRs such as medical patches and their unique autoinjectors. --- # 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 --> 🆑 - add: Ported almost all of Goob LRPs chems, have fun playing with them chemistry mains --------- Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com> Co-authored-by: Your Name <EctoplasmIsGood@users.noreply.github.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: Aiden <aiden@djkraz.com> Co-authored-by: Steve <marlumpy@gmail.com> Co-authored-by: Timfa <timfalken@hotmail.com> (cherry picked from commit 1dac78692e686198d560c084ed1c16cb795f9287)	2025-04-18 19:36:59 +03:00
RocketBoss360	8b556e4ba0	Evil VVizard VVeed (#2179) ... <!-- 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]? --> Adds Ousiana dust, allowing one to regenerate their psionic Reroll without having to wait for Noosphere zap events, at the cost of a bowl, 1 bluespace crystal and 1 normalcy crystal, and fair amount of health. This allowes for Psions to reliably grow their power throughout a round so long as Epistemics does their job well and co-ordinates with other departments for ectoplasm (via either glimmer mobs or Botany) and offerings to the Oracle. Note : Only way to get reagent is via crafting. --- # 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] Make component for returning a psion's Reroll - [x] Add Ousiana dust reagent - [x] Add Ousiana dust bowl - [x] Actually add functional crafting recipe for crafting Ousiana dust bowl --- <!-- 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> </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 --> 🆑 - add: Ousiana Dust, Allows one to gain benefit from mind opening drugs like a Noosphere Zap, crafted with 1 bluespace crystal and 1 normalcy crystal crushed into a bowl. Probably has no long term psychological side effects. --------- Signed-off-by: RocketBoss360 <rocketboss360@gmail.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> (cherry picked from commit 33d79f590eab79420bca0529e624bf581f6418e6)	2025-04-18 18:37:38 +03:00
GNUtopia	a0633b5643	Stamina and Advanced Bloodloss Drugs (#2124) ... # Description Adds three new reagents. Artiplates are an advanced bloodloss chem that reduces bleeding, heals bloodloss, and increases blood level. Cryanobalamin and Lift Lovers Special are narcotics that restore stamina over time. (This also comes with a new StaminaChange event to make that work.) --- <details><summary><h1>Media</h1></summary> <p>     </p> </details> --- # Changelog 🆑 - add: Added advanced bloodloss chem Artiplates - add: Added stamina-restoring chem Cryanobalamin - add: Added stamina-restoring chem Lift Lovers Special --------- Signed-off-by: GNUtopia <93669372+GNUtopia@users.noreply.github.com> (cherry picked from commit c06b0ebc6ee1c0656f6b9b2c25ff277fc49e8146)	2025-04-04 14:53:08 +03:00
Spatison	88f8d6ff9c	[Tweak/Add] Stims (#368) ... * tweak stims * fix	2025-03-30 10:55:29 +03:00
Eagle-0	e4c3993afd	Security Buffs But Real (#2022) ... # Description Ports Security buffs from [/Goob-Station#953](https://github.com/Goob-Station/Goob-Station/pull/953) ## Once Again, I am John Combat I don't have the energy today for the witty PR jokes. Apologies, people. # TODO * [x] Oil floats on water * [x] Cover yourself in oil * [x] Wait for it to rain * [x] :trollface: # Media # Changelog 🆑 Eagle * add: Flashbangs now stun and knockdown people. Wear over-ear headset or combat hardsuit helmet to reduce flashbang effective range. * add: All sec and command members received over-ear headsets. * add: Wearing security, ert, syndie or deathsquad gas mask blocks smoke inhalation even if internals are off. * tweak: Epinephrine now speeds up by 10%. * add: Jackboots, combat and mercenary boots now reduce all stun and knockdown times by 20%. * add: Combat hardsuit helmets now protect from flashes. * tweak: Tear gas is now stronger. * tweak: Stamcrit stun time is once again 6 seconds. * tweak: Security hardsuits now have heat resistance. --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: Aviu00 <93730715+Aviu00@users.noreply.github.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> (cherry picked from commit 9bae47bc6d3e44fba8b86e18c78e6b0f3fe00ed6)	2025-03-21 18:53:10 +03:00
Raikyr0	bd1f0783be	Vampirism Trait (#1943) ... # Description Ported Vampirism Trait and it's Bloodsucking Components from Floofstation It's working now for real. --- # TODO - [x] See if it Works --- # Changelog 🆑 - add: Vampirism Trait and it's Components --------- Signed-off-by: Raikyr0 <Kurohana@hotmail.com.au> (cherry picked from commit 5155cc8df6c22b23fae71070dce8bb68d92526f1)	2025-03-21 17:22:08 +03:00
RocketBoss360	8f4cb8a2b3	Shadowkin Blood Change (#1904) ... <!-- 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 --> # Replaces Shadowkin's blood type with black blood, to fit their pre-existing organ set <!-- 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]? --- # 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] Add reagent Black Blood - [x] Change shadowkin blood type and injury color - [x] Lock in descriptions and exact hex code - [x] Add artifact trigger --- <!-- 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 -->   </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 --> 🆑 - tweak: Changed shadowkin blood type to black blood, to better fit their organs' color palette (cherry picked from commit 33de108fb39d09e2eff5cce586755671007a6746)	2025-03-21 17:06:28 +03:00
Timfa	7c343118dc	Allow Tricordrazine to Heal Minor Accidental Exposures (#1840) ... <!-- 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]? --> As requested in Goob: https://discord.com/channels/1323488536501944350/1323488538750353442/1343047906114011167 this allows Tricordrazine to heal _very minor_ amounts of radiation poisoning. The use case: I walked past a Borg with a micro-RTG and the medibot won't stop bugging me because it doesn't know it can't help. With this change it _can_ help, but it's really only viable for small amounts. Ordinarily, in these small amounts of damage (10-12 tops), it was a hassle to make appropriate radiation medicine for; a lot of effort for only a tiny problem. This apparently caused annoyance, and this change will both make Tricordrazine a tiny bit more useful and lessen the aforementioned problem. --- # 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 --> 🆑 - tweak: Tweaked Tricordrazine to heal MINOR amounts of radiation damage. This includes Medibots. If it's more than a teeny tiny amount, go to medical! This also alleviates the issue where the medibot keeps pestering you about the 0.1 rad damage because it thinks it can heal it, while the medicine it'll inject (before this change) didn't actually do anything. (cherry picked from commit 23e332e0e7b0e8ca20eec2d20ca63f1f1354faec)	2025-02-28 16:28:00 +03:00
sleepyyapril	5b2cd95609	Sedin (#27110) (#1786) ... <!-- 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 https://github.com/space-wizards/space-station-14/pull/27110 --- # 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 --> 🆑 Erisfiregamer1 - add: New chemical, Sedin. It restores seeds on plants 20% of the time with other adverse effects included. --------- Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> Co-authored-by: Eris <eris@erisws.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> (cherry picked from commit ed593f070a579a47f2e8800d4a5191741971b3b9)	2025-02-15 00:33:17 +03:00
VMSolidus	52b6896a91	Add 4 New Mining Materials (#1693) ... # Description This PR adds 4 new materials for use with lathe recipes. As well as plenty of assets to implement more as we need. Nothing actually currently uses these yet, so they're just sellable for now. Eventually we're going to start differentiating ore loot by biome, so that we can # TODO <details><summary><h1>Media</h1></summary> <p> new materials   new ores  </p> </details> # Changelog 🆑 - add: Added lathe and ore processor materials for Lead, Aluminium, Copper, Tungsten-Carbide, and Circuitry. Only Tungsten-Carbide currently has a use. - add: Tacsuits now require Tungsten-Carbide to make instead of Plasteel, and require a lot less. - add: Reworked ore drops for Lava planets. Lava planets now have random ores that drop from any rock, but with their own drop table. Iron & Gold are "Plentiful" on lava planets, with moderate amounts of Aluminium and Tungsten. All other ores are very rare from Lava rocks. - add: Energy Swords can now be manufactured at a Secfab after researching Arsenal T3 Prototype Weapons --------- Co-authored-by: stellar-novas <stellar_novas@riseup.net> (cherry picked from commit dad3d5ddbc7051ce4d6f0e361beffd5c931933df)	2025-02-14 23:33:13 +03:00
Aikakakah	6bb7625ecc	Drink flavors (#2462) ... * Added flavors * Added the flavors for real this time * Fixed the spaces * Removed xenobasher (it already existed and I missed that) * Fixed acidspit * DEFINITELY fixed acidspit --------- Signed-off-by: Aikakakah <145503852+Aikakakah@users.noreply.github.com> (cherry picked from commit 0ce6ca206407d33dfebde300daf79bebf3ea34b2)	2025-02-05 18:35:37 +03:00
Kr8art	2cecfc8ffc	Buff Aloxadone (#2318) ... * Buff Alox * Revert "Buff Alox" This reverts commit 730825bd9458c7f35d994627799c0b04ce2a29eb. * Buff Alox fixed * Untouch (cherry picked from commit d82bfac627b53d19b60dc45e4f684c00b74b80b7)	2025-02-05 18:35:05 +03:00
Skubman	a46b4f2b5a	New Species: Plasmaman (#1291) ... # Description Adds the Plasmamen as a playable species. Plasmamen are a skeletal species who depend on Plasma to live, and oxygen is highly fatal to them. Being exposed to oxygen will set them on fire, unless they wear their envirosuits. ## Species Guidebook <img width=500px src="https://github.com/user-attachments/assets/a1ef91ef-87b2-4ae0-8b5c-922a0c34777f"> <img width=500px src="https://github.com/user-attachments/assets/110f0fa0-7dc4-410b-a2c0-a517f0311484"> **SPECIAL:** - Plasmamen speak the language Calcic, a language they share with Skeletons. ## Shitmed Integration Plasmamen are the first ever species designed with Shitmed in mind, with one of their core mechanics (self-ignition) powered entirely by Shitmed. Whether or not a Plasmaman ignites from oxygen exposure depends only on their body parts. A Plasmaman with only their head exposed will not burn as much as an entirely naked Plasmaman. You can **transfer** Plasmaman body parts to non-Plasmamen through **surgery** so that they also ignite from oxygen exposure. Meanwhile, a Plasmaman with a non-Plasmaman head can expose their head without self-igniting. https://github.com/user-attachments/assets/0aa33070-04be-4ded-b668-3afb9f4ddd7c ## Technical Details This also cherry-picks https://github.com/space-wizards/space-station-14/pull/28595 as a quality-of-life feature to ensure Plasmamen keep their internals on upon toggling their helmet with a breath mask on. ## TODO ### RELEASE-NECESSARY <details> - [x] Port more envirosuits / enviro helms (job-specific) and their sprites - [x] Remove breath masks from default plasmaman loadouts because the envirohelms already allow them to breathe internals - [x] Change default plasma tank to higher-capacity version - [x] Prevent plasmamen from buying jumpsuits and helmets other than envirosuits - ~~[ ] **Client UI update for loadout groups min/max items and default items**~~ - [x] Plasmaman-specific mask sprites from TG - [x] Disable too cold alert for plasmamen - [x] Create/port sprites for these jobs - [x] Courier - [x] Forensic Mantis - [x] Corpsman (Resprite security envirosuit) - [x] Prison Guard (Resprite security envirosuit) - [x] Magistrate (No Paradise envirosuit so use new colorable envirosuit) - [x] Blueshield (Port from Paradise and tg-ify?) - [x] NanoTrasen Representative (No Paradise envirosuit so use new colorable envirosuit) - [x] Martial Artist (use new colorable envirosuit and make pure white) - [x] Musician (use new colorable envirosuit) - [x] Reporter (use new colorable envirosuit) - [x] Zookeeper (use new colorable envirosuit) - [x] Service Worker (use new colorable envirosuit) - [x] Gladiator - [x] Technical Assistant - [x] Medical Intern - [x] Acolyte / Research Assistant - [x] Security Cadet - [x] Assistant - You know what. These intern jobs are fine. They can use their normal equivalent's envirosuits. - [x] Logistics Officer (use new colorable envirosuit) - [x] Adjust sprites to be closer to actual job - [x] Captain (Shift color to be closer to ss14 captain) - [x] ~~CMO (Remove yellow accents)~~ - [x] Port HoP envirogloves sprite - [x] unique sprite for self-extinguish verb - [x] Refactor conditional gear stuff to live only in StartingGearPrototype with `SubGear` `List<ProtoId<StartingGearPrototype>>` field and `List<Requirement>` field for sub-gear requirements - [x] Add starting gear for paradox anomaly, and antags and ghost roles - [x] Paradox - [x] Nukies - [x] Disaster victims - [x] Listening post operative - [x] Make all envirosuit helmets have a glowing (unshaded) visor - [x] Envirosuit extinguish visuals - [x] JobPrototype: AfterLoadoutSpecial - [x] Set prisoner envirohelm battery to potato, command/sec/dignitary to high-powered - [x] Set base envirosuit extinguishes to 4, sec 6 and command 8 - [x] Improve plasmaman organ extraction experience - [x] Body parts now give 1 plasma sheet each, while Torso gives 3 - [x] Organs can be juiced to get plasma - [x] Make envirohelm flashlights battery-powered - [x] Plasmamen visuals - [x] Grayscale sprites for color customization, and set default skintone color to Plasmaman classic skintone - [x] Plasmaman eye organ sprite - [x] Add basic loadouts - [x] Add way to refill envirosuit charges (refill at medical protolathe after some research) </details> ### Low Importance <details> - [x] Envirogloves - [ ] (SCOPE CREEP) Plasma tanks sprite (only normal emergency/extended, rather low priority) - [ ] (SCOPE CREEP) Modify envirosuit helmet sprites to have a transparent visor - [ ] Glowing eyes/mouth marking - [x] More cargo content with plasma tanks / envirosuits - [x] Plasmaman survival kit like slime - [x] Additional plasma tanks - [ ] (SCOPE CREEP) Plasmaman EVA suits - [x] ~~Add envirosuits to clothesmate~~ - [x] Add more plasma tanks to random lockers and job lockers - [x] Turn envirosuit auto-extinguish into extinguish action - [x] move self-extinguish verb stuff to shared for prediction of the verb - [x] move self-extinguisher stuff away from extinguisher namespace - [x] unique sprite for self-extinguish icon - [x] ~~IDEA: purple glowy fire extinguisher ~~ - [x] on self-extinguish, check for pressure immunity OR ignite from gas immunity properly - [x] See envirosuit extinguish charges in examine - [x] Milk heals on ingestion - [x] Plasma heals on ingestion - [x] Self-ignition doesn't occur on a stasis bed - [x] ~~Self-ignition doesn't occur when dead~~ - [x] Guidebook entry - [x] Make self-ignition ignore damage resistances from fire suits - [x] ~~Make self-ignition ignore damage resistances from armor~~ - [x] ~~Unable to rot?~~ - [x] Make the envirosuit helmet toggle on for the character dummy in lobby - [ ] (SCOPE CREEP) One additional Plasmaman trait - [x] ~~Showers extinguish water as well as water tiles~~ - Unnecessary as stasis beds now prevent ignition, allowing surgery on a plasmaman on stasis beds. - [x] Unique punch animations for Plasmafire Punch/Toxoplasmic Punch traits - [x] Actually remove toxoplasmic it's just slop filler tbh - [ ] Talk sounds - [ ] Normal - [ ] Question - [ ] Yell - [x] Positive moodlet for drinking milk / more positive moodlet for drinking plasma - [x] Increase moodlet bonus and also minimum reagent required for the plasma/milk moodlets - [x] Increase fire rate base stacks on ignite cause putting out your helmet for a few secs isn't that dangerous due to the fire stacks immediately decaying - [x] I think halving firestack fade from -0.1 to -0.05 might work to do the same thing too - [ ] (SCOPE CREEP) Get bone laugh sounds from monke 'monkestation/sound/voice/laugh/skeleton/skeleton_laugh.ogg' - [ ] (SCOPE CREEP) When EVA plasmaman suit is added, 25% caustic resist - [x] Envirosuit helmet - [x] Equivalent of 100% bio / 100% fire / 75% acid resist - [x] Envirosuit - [x] Equivalent of 100% bio / 100% fire / 75% acid resist - [x] Envirogloves - [x] Equivalent of 100% bio / 95% fire / 95% acid resist - [x] Put breath mask back on - [x] Refactor: put body parts covered data into component instead of being hardcoded </details> ## Media **Custom Plasmaman Outfits** All of these use the same **absolutely massive** [envirosuit RSI](0c3af432df/Resources/Textures/Clothing/Uniforms/Envirosuits/color.rsi) and [envirohelm RSI](0c3af432df/Resources/Textures/Clothing/Head/Envirohelms/color.rsi) to quickly create the envirosuits that didn't exist in SS13 where the envirosuit sprites were ported. From Left to Right: Magistrate, Prison Guard, Boxer, Reporter, Logistics Officer <img width=200px src="https://github.com/user-attachments/assets/bf990841-7d9e-4f4e-abae-8f29a3980ca1"> <img width=200px src="https://github.com/user-attachments/assets/07ca7af7-4f43-4504-9eac-4ca9188ae98e"> <img width=200px src="https://github.com/user-attachments/assets/0d20332c-826f-4fec-8396-74e84c23b074"> <img width=200px src="https://github.com/user-attachments/assets/1634364e-7cb3-457b-b638-e1b562b7c0c5"> <img width=200px src="https://github.com/user-attachments/assets/c2881764-f2fa-4e40-9fbf-35d1b717c432"> **Plasmaman Melee Attack** https://github.com/user-attachments/assets/6e694f2c-3e03-40bf-ae27-fc58a3e4cb6c **Chat bubble** <img width=240px src="https://github.com/user-attachments/assets/e3c17e6d-5050-410f-a42c-339f0bfa30a1"> **Plasmaman Body** <img width=140px src="https://github.com/user-attachments/assets/7ed90a47-9c33-487d-bd44-c50cec9f16dd"> With different colors: <img width=140px src="https://github.com/user-attachments/assets/0a28068e-7392-4062-950b-f60d2602da84"> <img width=140px src="https://github.com/user-attachments/assets/9b652311-0305-4ec0-be60-e404697617a2"> **Skeleton Language**  **(Bonus) Skeleton chat bubble** <img width=240px src="https://github.com/user-attachments/assets/a2e2be5c-f3ae-49d9-b655-8688de45b512"> **Self-Extinguish** https://github.com/user-attachments/assets/6c68e2ef-8010-4f00-8c24-dce8a8065be8 The self-extinguish is also accessible as a verb, which also means that others can activate your self-extinguish if they open the strip menu. <img width=200px src="https://github.com/user-attachments/assets/291ab86d-2250-46ec-ae0c-80084ab04407"> The self-extinguish action has different icons depending on the status of the self extinguish. Left to right: Ready, On Cooldown, Out Of Charges <img src="https://github.com/user-attachments/assets/0340de8a-9440-43b1-8bff-1c8f962faa0c"> <img src="https://github.com/user-attachments/assets/11f73558-6dc1-444d-b2ef-2f15f55174ca"> <img src="https://github.com/user-attachments/assets/030ed737-f178-4c60-ba0c-109659e7d9cb"> **Envirosuit Extinguisher Refill** <img width=300px src="https://github.com/user-attachments/assets/9379294b-e3f3-436d-81bc-2584631869ef"> <img width=300px src="https://github.com/user-attachments/assets/807b9e9e-7b4b-4593-aa1f-d9d24ac6985c"> **Loadouts** <img width=400px src="https://github.com/user-attachments/assets/55713b87-29bb-41b3-b7a3-88fbc6e5e797"> <img width=400px src="https://github.com/user-attachments/assets/ab1757fa-9b70-4a66-b5ae-20fd9cabe935"> <img width=400px src="https://github.com/user-attachments/assets/aacc4cf7-9ce1-4099-b8c7-108bef1f3bde"> <img width=400px src="https://github.com/user-attachments/assets/58604dc2-82ef-4d42-b9e2-639548c93f40"> **Plasma Envirosuit Crate** <img width=400px src="https://github.com/user-attachments/assets/fa362387-9c10-47c3-b1af-2c11e6b00163"> <img width=400px src="https://github.com/user-attachments/assets/bf773722-9034-4469-967d-e00dbf8c77a7"> **Internals Crate (Plasma)** <img width=400px src="https://github.com/user-attachments/assets/fcd4ff2e-09e9-423a-9b21-96817f6042a4"> <img width=400px src="https://github.com/user-attachments/assets/bf773722-9034-4469-967d-e00dbf8c77a7"> **Glow In The Dark**  ## Changelog 🆑 Skubman - add: The Plasmaman species has arrived! They need to breathe plasma to live, and a special jumpsuit to prevent oxygen from igniting them. In exchange, they deal formidable unarmed Heat damage, are never hungry nor thirsty, and are immune to cold and radiation damage. Read more about Plasmamen in their Guidebook entry. - tweak: Internals are no longer toggled off if you take your helmet off but still have a gas mask on and vice versa. - tweak: Paradox Anomalies will now spawn with the original person's Loadout items. - fix: Fixed prisoners not being able to have custom Loadout names and descriptions, and heirlooms if they didn't have a backpack when joining. --------- Signed-off-by: Skubman <ba.fallaria@gmail.com> Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> (cherry picked from commit e68e0c3f4b9cf263e07efc888b32a091df62fb51)	2025-01-29 20:19:20 +03:00
Spatison	a255206cb3	fix upstraem	2025-01-14 23:57:35 +03:00
Brandon Li	9b946db04a	Chem Colors (#1461) ... <!-- 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]? --> This is [cherrypicked from wizden](https://github.com/space-wizards/space-station-14/pull/28367). It literally just changes colors. See that PR for all information. # Why It bothered me that my 20 minutes of hard labor and 30 minutes arguing in github issues was not present on EE. I am since rectifying this blatant injustice. # 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 --> 🆑 - tweak: Some chemicals have been made more colorful and child-friendly. --------- Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> (cherry picked from commit e733fa01ab4a3ae4bf0845b5cfa03aadefe9a653)	2025-01-14 01:46:26 +03:00
Sapphire	878094af26	Cherry Pick Haloperidol and Potassium Iodide (#1410) ... # Description Title, doing this to make a single test pass. --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> (cherry picked from commit 5767be1d9704f063eb38da7f0bba3aa2f59ec1a9)	2025-01-14 00:35:51 +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
Spatison	7c4bf63a33	[Feature] TG Gases / TG Газы (#147) ... * 237.2.0 * feat: /tg/ gases * Revert "237.2.0" This reverts commit 08ecd6b145. * fix: sound * Revert "237.2.0" This reverts commit 08ecd6b145. * tweak: AI rewie * fix: tupo * Revert "237.2.0" This reverts commit 08ecd6b145. * fix: tupo	2024-12-17 14:08:35 +07:00
Spatison	0e0ffb6d14	Upstream (#142) ... * Fix Power Attacks Being Faster Than Left Clicks (#1252) # Description This fixes some stupid math. Power attacks are now correctly slower than left clicks. Previously they were faster. # Changelog 🆑 - fix: Power Attacks now correctly apply a penalty on swing speed, and are no longer faster than left clicking. (cherry picked from commit 049a995f64c42734e5286229b524161a730aaea9) * Automatic Changelog Update (#1252) (cherry picked from commit 8a88bfd11f1384fa2fb01fd7ace6477202a68499) * Tweak Wizden Trait Descriptions (#1260) # Description Converted the descriptions of most wizden traits to a more formal and roleplay-oriented style, also clarifying some aspects of other traits in the process. --- TODO: - [ ] Test this --- # Changelog 🆑 - tweak: Tweaked the descriptions of most Wizden traits to be more vivid and descriptive. --------- Signed-off-by: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> (cherry picked from commit 411cb213ac9ab2e6a0b790e72b25a142a4945217) * More Trait Functions (PushMarkup & AddArmor) (#1253) # Description This PR effectively "Reworks" several of the Bionic Traits through use of new modular TraitFunctions. These being, **TraitPushDescription**: Ensures that an entity has the new ExtendDescriptionComponent, then writes to said component. ExtendDescriptionComponent serves as a new highly modular "One stop shop" for any system wanting to add text to the shift-click examine window. It even accepts arguments for text color, font size, and whether or not a person must be standing within touching distance to "See" the provided texts. It accepts arbitrarily any number of descriptions. **TraitAddArmor**: This takes advantage of a new functionality for the DamageableSystem, whereby entities are able to have more than one DamageModifierSet. This allows arbitrarily any number of traits to add as many modifier sets as desired, without fear of any compatibility issues. These can be both negative and positive, and as Skubman has pointed out, this can also be used to create negative traits that make a character more vulnerable to a given damage type! Additionally, most of the Bionics Traits have been reworked. CyberEyes has been split into two modules, one for the base implant, and one for the Flash Protection. Dermal Armor has been reworked using TraitAddArmor, so that it no longer replaces your original modifier set, and instead stacks multiplicatively with whatever your original species modifier set was. Thus, it can now be taken by any species. # TODO <details><summary><h1>Media</h1></summary> <p> TraitPushDescription  TraitAddArmor  </p> </details> # Changelog 🆑 - add: Five new functions for the Trait System, AddArmor, PushDescription, ModifyMobThresholds, AddSolutionContainer, and ModifyStamina. - tweak: CyberEyes Basic System has been split, now Flash Protection is a separate module. - add: Dermal Armor no longer replaces your original species damage resistances. It now stacks multiplicatively with your original resistances. - tweak: Dermal Armor can now be taken by any species, not just Humans. - add: Dermal Armor, and Bionic Arms can now be revealed by a close examination. Shift click on someone within touching distance will reveal if they have these "Obvious" cyberware. --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: Remuchi <72476615+Remuchi@users.noreply.github.com> (cherry picked from commit 29d2cb1ed85ab089d83c702f7405e938a0d9374c) * Automatic Changelog Update (#1260) (cherry picked from commit 8d54aa2fffdd3726e948d6d228287b01c0a81413) * Feat: Anomaly Scanner Data Copying (#1250) # Description Makes it so that using one anomaly scanner on another transfers the anomaly data onto the used scanner. <details><summary><h1>Media</h1></summary> <p>  </p> </details> # Changelog 🆑 - add: You can now touch one anomaly scanner with another to copy the anomaly scan data from it. (cherry picked from commit 0574be444b90137808c07f85e10b59c464f054cf) * Automatic Changelog Update (#1253) (cherry picked from commit 6fa8d6817fa81e6d6d20b61f5ec4b7b96fdb185b) * Automatic Changelog Update (#1250) (cherry picked from commit 1b5704535ce42041c068d201cdb447af42004c20) * Rename "Pierce" Typo to "Piercing" (#1267) # Description Oops. Some files refer to the non-existent **Pierce** damage type when the proper name is **Piercing**. # Changelog 🆑 Skubman - fix: Piercing damage can now dismember body parts, just like Blunt and Slash damage. (cherry picked from commit 992b2e486855cea6646cf5d4af51ca8cbf61b29d) * Buff Medical Due to Shitmed Changes Cherry-Pick (#1259) <!-- 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]? --> + Buffed applicable medication heal values. + Buffed applicable medication stack sizes. + Slightly buffed dylovene, burn, and brute chems. + Buffed applicable medication doAfter delay from 3s to 2s. --- ## Why / Balance <!-- Discuss how this would affect game balance or explain why it was changed. Link any relevant discussions or issues. --> This change was made with the advent of the new Limb Damage system. This PR seeks to achieve making SS14 Medical more equivalent to SS13 Medical when it comes to healing damage values. This was done as Bruise Packs and Ointment only heal 5 Brute or 5 Burn respectively when applied to a limb. When each limb has a 100 Crit threshold, this can make it extremely hard even with surgery to heal limbs in the absence of Chemicals. Furthermore on higher pop, this will lead to people burning through applicable meds even faster than before Limb Damage was implemented. It would take 34 bruise packs to heal someone with 170 Blunt spread out across their limbs, with this change it would reduce that to 12 bruise packs. Full list of numerical val changes: - Healing component doAfter Delay reduced. was 3s, now its 2s. - Applicable medical items now have a max stack size of 15 (was 10). - Ointment heals 15 of each burn type, 10 caustic (was 5 of each burn type, 1.5 caustic) - Mesh now heals 20 of each burn type (was 10 of each burn type). - Bruise Packs now heal 15 of each brute type (was 5 of each brute type) - Sutures now heal 20 of each brute type (was 10 of each brute type) - Bloodpacks now heal 2.5 Bloodloss & restore 10% bloodlevel (was .5 Bloodloss and 5%) - Gauzes now heal 15 Slash and 20 Pierce (was 5 Slash and 10 Pierce) - Dylovene now heals 1.5 Poison per .5u (was 1 Poison per .5u) - Bicaridine now heals 2.5 Brute per .5u (Was 2 Brute per .5u) - Dermaline now heals 2 Burn per .5u (was 1.5 Burn per .5u) - Epinephrine now heals 1 Burn & 1 Brute per .5u (was .5 for each per .5u) - Kelotane now heals .5 Burn per .5u (was .33 Burn per .5u) - Omnizine now heals 3 Burn, Toxin, Airloss, and Brute per .5u (was 2 per .5u) - Lacerinol now heals 4 Slash per .5u (was 3 per .5u) - Bruizine now heals 4 Blunt per .5u (was 3.5 per .5u) # 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] Cherry-pick Medical changes merged in Goobstation --- <!-- 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 --> --- ## Breaking changes <!-- List any breaking changes, including namespaces, public class/method/field changes, prototype renames; and provide instructions for fixing them. This will be posted in #codebase-changes. --> Should values be overtuned, they can be reduced in a future PR or before this PR is merged. **Changelog** <!-- Add a Changelog entry to make players aware of new features or changes that could affect gameplay. Make sure to read the guidelines and take this Changelog template out of the comment block in order for it to show up. Changelog must have a 🆑 symbol, so the bot recognizes the changes and adds them to the game's changelog. --> 🆑 - tweak: Increased applicable medication heal values. - tweak: Increased stack size of applicable medications. - tweak: Slightly increased dylovene, burn, and brute chemicals heal values. - tweak: Decreased Medical item application time from 3s to 2s --------- Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> Signed-off-by: Tmanzxd <164098915+Tmanzxd@users.noreply.github.com> Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> (cherry picked from commit b431d24f86f94433ea0c53982db83e40ef1d3f2c) * Automatic Changelog Update (#1267) (cherry picked from commit 02dd8ab06333a5b2dabe03845bfd6719ca09ef48) * Automatic Changelog Update (#1259) (cherry picked from commit 09d59007d4c55ee9f7daa0f56cae672c51951843) * The Blood Cult (#1001) <!-- 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 Adds a new game mode - The Blood Cult. Hail to Nar'Sie! --- # TODO - [x] Gamemode - [x] Roles - [x] Runes - [x] Constructs - [x] Structures - [x] Forge - [x] Archives - [x] Altar - [x] Pylon - [x] Structure - [x] Placement System - [x] Airlocks - [x] Repulsor system - [x] Construction system - [x] Items - [x] Eldritch Whetstone - [x] Construct Shell - [x] Mirror Shield - [x] True Nar'sian Hardened Armor - [x] Flagellant's Robe - [x] Eldritch Longsword - [x] Zealot's Blindfold - [ ] Night vision system - [x] Shuttle Curse - [x] Veil Shifter - [x] Void Torch - [x] Reagents - [x] Holy Water - [ ] Actions - [x] Cult Magic - [x] Stun - [x] Teleport - [x] Electromagnetic Pulse - [x] Shadow Shackles - [x] Twisted Construction - [x] Summon Combat Equipment - [x] Summon Ritual Dagger - [x] Blood Rites - [ ] Cult Leader Magic - [ ] Final Reckoning - [ ] Mark Target - [ ] Eldritch Pulse - [ ] Construct's Magic - [ ] Artificer - [ ] Summon Cult Floor - [ ] Summon Cult Wall - [ ] Greater Conjuration - [ ] Summon Soulstone - [ ] Wraith - [ ] Phase Shift - [ ] Juggernaut - [ ] Shield - [ ] Gauntlet Echo - [x] Cult leader selection system - [ ] Rending/Apocalypse rune placement markers EXTRA: - [ ] Spirit Realm rune - [x] Eldritch language - [ ] Conceal magic - [ ] Ru locale --- <!-- 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>  </p> </details> --- # Changelog 🆑 - add: Added Blood Cult Gamemode. --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> Signed-off-by: Remuchi <RemuchiOfficial@gmail.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> (cherry picked from commit 150020866ddd383f297dfccd7717017c23222d82) * fix * Automatic Changelog Update (#1001) (cherry picked from commit a179e186fa812e5dbce34983e11ef7af56ccdcf4) * Engine Update v237.2.0 (#1270) <!-- 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]? --> Updates to engine version v237.2.0. Fixes disposals systems breaking and not using the proper direction. --------- Co-authored-by: sleepyyapril <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> (cherry picked from commit dcc1c38fb729b00fdb15b79b38372f3e1e8bc951) * [QoL] Show Oni Damage Bonus In Damage Examine (#1268) # Description Examining an item's damage values as an Oni now calculates your bonus damage, and it also works with all of the Oni combat traits. ## Technical details `OniSystem`, instead of adding melee damage through `MeleeHitEvent`, now adds damage through `GetMeleeDamageEvent`, the same event that examining melee weapon damage raises through `GetDamage`. ## Media **Normal damage values** <img src="https://github.com/user-attachments/assets/9de255ef-29e6-4119-93cc-356349812a6f" width=300px> **Oni damage values** <img src="https://github.com/user-attachments/assets/18d44aaf-5a70-4ba9-a8c8-be29e92d7267" width=300px> # 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 --> 🆑 Skubman - tweak: As an Oni, examining the damage values of weapons now takes into account the melee damage bonus from your species or trait. (cherry picked from commit 613e7937392d5d4fd9bf906f571adc237c706367) * Automatic Changelog Update (#1268) (cherry picked from commit 5fe4b1e94b987f787807cc10df06f667b87d124e) * Loadouts V4 (#1164) # Description # TODO - [x] Custom name/desc/color tint, toggleable individually per-loadout - [x] Fix them not changing correctly between profiles in-editor - [x] Preview colors in the lobby - [x] Allow the users to null the color themselves (and default it to such) - [x] Pick what should be allowed to be recolored - [x] Guidebook links - [x] Make an example - [x] Special components for loadouts - [x] Heirlooms - [x] Pick what should have heirlooms - [x] Decimate lag - [x] Fix live character preview - Maybe do characters per job - Rethink unusable --- <details><summary><h1>Media</h1></summary> <p> <!--  --> https://github.com/user-attachments/assets/bcf61517-6b64-40d2-b299-7462e2469fe2 </p> </details> --- # Changelog 🆑 - add: Players can set custom names, descriptions, and color tints for their loadout items - add: Certain loadouts may have Guidebook pages shown in the editor - add: Players can pick a list of loadout items to have one randomly be their family heirloom for a mood bonus or deficit if they are carrying it - fix: Loadouts have almost as little lag as possible (hopefully none) - fix: Everything properly updates your character editor's live preview --------- Signed-off-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: Pspritechologist <81725545+Pspritechologist@users.noreply.github.com> (cherry picked from commit f0463062812428625da9e8adad60c8a567fdacbe) * Automatic Changelog Update (#1164) (cherry picked from commit 57917a746f514aba3f142d870a9280c9b1eb9a4f) * [Fix] Added Robust.Xaml to the Project Solution (#1266) Mirrors https://github.com/space-wizards/space-station-14/pull/31573 Signed-off-by: Remuchi <RemuchiOfficial@gmail.com> (cherry picked from commit 1d65d548e69862295926fb08aee962d8fbd0b5c4) * Update Credits (#1274) This is an automated Pull Request. This PR updates the GitHub contributors in the credits section. Co-authored-by: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com> (cherry picked from commit 39f4ad8a8884bc5bb9e64530b1a708ea41b4de32) * Fixes Make Cultist Admin Verb to Act on Target Not Self (#1289) There's a small error on the admin verb for blood cultists which made the verb only work on self. This fixes it. (cherry picked from commit 6c2b2a8a4ab7c7b0c5e18d796ccd94d09b087509) * IPC Instrument Menu Fix (#1287) <!-- 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]? --> Fixes IPCs being unable to use the midi menu. --- # 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 --> 🆑 - fix: Fixed IPCs being unable to use the midi menu. (cherry picked from commit f133b9b7cf175815a3c6de59d541e12f0fc60790) * Automatic Changelog Update (#1287) (cherry picked from commit 92a6e099fca1581ea8a0cfd16bf7f13ae8d1108a) * Change Target Doll Icon For Ashen Theme (#1282) # Description  (cherry picked from commit 327247585612d9d65e20b8b856864701ceb1c933) * Fix Applicable Medication Stack Bug (#1278) <!-- Guidelines: https://docs.spacestation14.io/en/getting-started/pr-guideline --> ## About the PR <!-- What did you change? --> - Fixed a bug where applicable medication stacks would revert back to 10 after 1 use. ## Why / Balance <!-- Discuss how this would affect game balance or explain why it was changed. Link any relevant discussions or issues. --> - Did you know maxstacks were stored in a separate YML? Me neither, until now. **Changelog** <!-- Add a Changelog entry to make players aware of new features or changes that could affect gameplay. Make sure to read the guidelines and take this Changelog template out of the comment block in order for it to show up. Changelog must have a 🆑 symbol, so the bot recognizes the changes and adds them to the game's changelog. --> <!-- --> 🆑 - fix: Fixed a bug where applicable medication stacks would revert back to 10 after 1 use from full. Signed-off-by: Tmanzxd <164098915+Tmanzxd@users.noreply.github.com> (cherry picked from commit d4879f9129ae484f24f57eb642cc7d600f2323e0) * Automatic Changelog Update (#1278) (cherry picked from commit 8d485e8c0d4e3932835aeed210388e85988a0213) * Re-Enable Language Color and Font (#1294) # Description Re-enables language font and colors showing up in chat messages. The language font/colors were bugged after adding language names in chat (https://github.com/Simple-Station/Einstein-Engines/pull/1165) I also overhauled the format for chat messages to be more aesthetically pleasing, and made sure chat bubbles use the language color/font. ## Media **Nekomimetic**   **Bubblish**   **Tau-Ceti Basic (Default Language)**   **Rootspeak**   ## Changelog 🆑 Skubman - fix: Language colors and fonts will show up in text messages again, both on in-person messages and on the radio. - tweak: The text on chat bubbles now uses the color and font of the language being spoken. - tweak: The language prefix before the name on chat messages now uses the language's color. (cherry picked from commit 1a9763528a9b15f11f474a2fa7ecfdde98aa9a15) * Automatic Changelog Update (#1294) (cherry picked from commit 7d802e35dc45c37016681c3a009bdaebe2707178) * Shitmed Update 2 - [Insert Snarky Remark] (#1271) # Description  Honey wake up, another shitmed PR with 5 features and a trillion bugs! I love bloat. --- # Known Bugs - A lot of shit with changelings lol - Markings suddenly disappear from your entity apparently at random. Wizden exclusive issue as of now. - Fire heretics explode when ascending due to part damage shitcode (sorry) - Some exceptions/null point references at round end, tentatively related to salvage corpses. - Slots having wonky behavior due to not being networked. More of a broad issue with how I implemented them initially. - Arachne are FUCKED with surgery, I was incredibly tempted to set them to roundstart: false, but I'll try to hotfix it this week. --- # Changelog 🆑 Mocho, Deltanedas - add: Ported Ghetto Surgery from Deltanedas! - add: Ported fishops organs from Deltanedas! - add: Added different step durations to each surgery step. - add: Added a T2 research for advanced surgical tools - add: Added a T3 research for an omnitool for surgery. - add: Added Surgical and Advanced Surgical modules for Mediborgs - add: Mediborgs can now perform surgery! - add: Added lobotomies as an operation. Godspeed you psychopaths. - add: Added cybernetic arms, legs and eyes. - add: Added EMP weaknesses to all cybernetic parts (the day of reckoning will come for IPCs soon) - add: Losing your eyes now blinds you. - fix: Fixed a few species that did not inherit from BasePart's, thus taking damage types they shouldn't on their limbs. - fix: Fixed harpy lungs not being usable in surgeries. - fix: Fixed biosynthetic and other printable parts not allowing you to attach body parts to them. - fix: Fixed fire being able to destroy your chest. - fix: Fixed entities being able to take over your body by just inserting a brain or another head on top of you. - fix: Fixed some shitcode that didnt let rejuvenate or godmode work properly. - fix: Fixed bionic arm, and cybernetic eyes traits not working properly due to shitty networking. - tweak: Increased tend wounds's speed by double, and bumped up the values on its calculations. DEATH TO TOPICALS, LEAVE THOSE TO TIDERS. - tweak: Beheading an entity now doesnt let it move, speak, and forces it to the ground immediately (literally 1984!!11!!) - tweak: Changed sprites on most surgical tools to now use /tg/ sprites. - tweak: Unbound shitmed targeting doll keybinds by default (did you know we have those). --------- Signed-off-by: gluesniffler <159397573+gluesniffler@users.noreply.github.com> Co-authored-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> Co-authored-by: goet <6637097+goet@users.noreply.github.com> Co-authored-by: Saphire Lattice <lattice@saphi.re> (cherry picked from commit 2eafa0d47e7b9a3270ae797f82dd7b1772dffb15) * Admin Tooling Cherry Picks (#1290) <!-- 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]? --> Link to every PR I cherry-picked: 1. https://github.com/new-frontiers-14/frontier-station-14/pull/2283 2. https://github.com/space-wizards/space-station-14/pull/29219 3. https://github.com/space-wizards/space-station-14/pull/30075 4. https://github.com/space-wizards/space-station-14/pull/28639 5. https://github.com/space-wizards/space-station-14/pull/32527 6. https://github.com/space-wizards/space-station-14/pull/28030 7. https://github.com/space-wizards/space-station-14/pull/28178 The main purpose of this PR is the first cherry-picked PR. It adds the ability for admins to reply to ahelps via discord using an HTTP POST request. See all relevant details in the initial PR by Myzumi. --------- Co-authored-by: Myzumi <34660019+Myzumi@users.noreply.github.com> Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> Co-authored-by: Whatstone <whatston3@gmail.com> Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com> Co-authored-by: to4no_fix <156101927+chavonadelal@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: metalgearsloth <comedian_vs_clown@hotmail.com> Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> (cherry picked from commit b8e75dae0e25301da4ffdd1f6ca5b4aebdf5a2b8) * Automatic Changelog Update (#1271) (cherry picked from commit d58d397a69fc2bb5b2bbce9280a978d5d899bba0) * More Loadout Equipment (#1281) # Description This PR adds a bunch more equipment selections for Engineering loadouts, plus Suit/Skirt selections for the jobs that were missing it. <details><summary><h1>Media</h1></summary> <p>  </p> </details> # Changelog 🆑 - add: All engineering roles have had their equipment loadouts significantly expanded upon. Engineers can now buy construction materials with their loadout points. - fix: All engineering jobs now have their Suit/Skirt selection via loadouts. - add: Salvage techs can now select from a variety of knife options to start their spess adventures with. - add: Epistemics staff now have *some* equipment selection options that they share. More to come when I finish making the Potentiometer. (cherry picked from commit 0bd9a9ea81c2e6e9ef775a131b547b8b861548b1) * Automatic Changelog Update (#1281) (cherry picked from commit c7f1b4fa3c57f3650154150e1c30ce28e3302230) * Dynamic Hostname System (#1296) <!-- 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]? --> Change your hostname whenever map, preset, or runlevel changes! Variables given on all hostname locale strings: - {$mapName} - The name of the current map. - {$preset} - The name of the current preset. - {$originalHostname} - What you originally had game.hostname set to, before updating. --- <!-- 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>     </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 --> nah (cherry picked from commit de98c2aec2c072abeb6c81c74b830d72e29ba0c8) * Religious Headgear For Character Customization (#1297) # Description This PR adds a few articles of various kinds of religious headgear to loadouts, namely a Hijab, Turban, and Kippah. All 3 are whitescale items that are set as colorable, allowing players to make them whatever color is desired. Farida can finally have the pink Hijab she was always supposed to have. <details><summary><h1>Media</h1></summary> <p>  </p> </details> # Changelog 🆑 - add: Added various articles of religious headgear to loadouts, such as Hijab, Kippah, and Turban. All of these are set to allow custom colors. (cherry picked from commit e46a8636eb235e627023cdd3d42428b34c134353) * Automatic Changelog Update (#1297) (cherry picked from commit 56be69053045a2d2184c975c2325889df69838e0) * Don't Require Running in Release to Test Mood (#1257) (cherry picked from commit f2871885b6dd13b418dfd7ff55ffe0559a4f7044) * Update Credits (#1300) This is an automated Pull Request. This PR updates the GitHub contributors in the credits section. Co-authored-by: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com> (cherry picked from commit 9ef825252a0dc0054b1ba9626e7283d296150f3b) * Start of Lore Documents (cherry picked from commit dfb12e53abf1ef5d767240a19b28ba12dd35ef9b) * Finally Done (cherry picked from commit 2a8bf58dfc61f24796a55940e4a7ab6be3ced3ec) * Automatic Changelog Update (#1298) (cherry picked from commit 8a368bbdce5dd05adae998ec55f15fd5ff04b52f) * Fashion Update: Earrings & Makeup (#1299) # Description Adds **38** new earrings, **31** new face markings, and **16** bracelet/watch markings, based from Aurorastation cosmetics. Each earring, bracelet, and watch marking is applied to just one side of the body, allowing for greater customizability and mixing-and-matching markings. Most notably, the new face markings unlock **full customization of every pixel** in the 5x4 pixel space of the face. Examples of this are shown below. Arachne now have access to **more than a hundred** markings above the leg, after not having any markings in their 2 years of existence. ## Media ### Pauline <img height=270px src="https://github.com/user-attachments/assets/8316effb-34b3-4fa1-a80f-af2a3cd670c2"> <img height=270px src="https://github.com/user-attachments/assets/be75770a-c5bb-46a7-afb4-2ec54bd5a5e5"> **Head (Side):** Drop Earrings (Left), Drop Earrings (Right) **Left Hand:** Left Bracelet ### Red and Blue <img height=270px src="https://github.com/user-attachments/assets/8c1356fc-6eaa-484f-afb6-5ace7f45d895"> **Head:** Cheek Spot (Left), Eye Corner (Left), Cheek Spot (Right), Eye Corner (Right) **Head (Side):** Double Gemstone Earrings (Left), Double Gemstone Earrings (Right) **Left Hand:** Left Watch (Colorable) **Left Arm:** Left Arm Bracelet **Right Hand:** Right Watch (Colorable) **Right Arm:** Right Arm Bracelet ### Pink <img height=270px src="https://github.com/user-attachments/assets/ae376cc3-7cd5-4e91-a3a0-ebe48202f5e6"> **Head (Side):** Hoop Earrings (Left), Double Gemstone Earrings (Right) **Left Hand:** Left Bracelet **Left Arm:** Left Arm Bracelet **Right Hand:** Right Bracelet **Right Arm:** Right Arm Bracelet ### Psychic <img height=270px src="https://github.com/user-attachments/assets/eaa8069a-2e51-4456-a315-414aa64cd41a"> **Head:** Bindi, Full Blush **Head (Side):** Long Crystal Earrings (Left), Long Crystal Earrings (Right) **Left Hand:** Left Bracelet **Right Hand:** Right Bracelet **Right Arm:** Right Arm Bracelet ### Cyclops <img height=270px src="https://github.com/user-attachments/assets/55e67db9-0aa4-488d-a25b-32e8fd92044b"> **Head [Eyes]:** Bindi, Glabella, Nose Tape **Head [Cover for mouth area]:** Lip Corner (Left), Lip Corner (Right), Cheek Spot (Left), Cheek Spot (Right), Lips **Head (Side):** Cross Earrings (Left), Cross Earrings (Right) ### 😂 <img height=270px src="https://github.com/user-attachments/assets/4001b95a-60e1-431c-8463-1e2904cf767a"> ### Arachne  **Head:** Left Arachne Eye, Right Arachne Eye, Lips, Neck Cover (Slim Thick) **Head (Side):** Long Crystal Earrings (Left), Long Crystal Earrings (Right) **Left Arm:** Left Robotic Arm from Hesphiastos Industries **Left Hand:** Left Robotic Arm from Bishop Cybernetics **Right Arm:** Right Arm Bracelet **Right Hand:** Right Watch (Colorable), Right Nail Polish ## Technical Details I did a quick fix in [MarkingsSet.cs](https://github.com/Simple-Station/Einstein-Engines/compare/master...angelofallars:Einstein-Engines:fashion-update-markings?expand=1#diff-54373833c74b35579f9b3293d5bb0c17eda0d214c11f27dcb40c334ef8c6b513) to handle a list index out of bounds error where the number of default markings was lower than the maximum allowed markings, like with Onis who have a default horn but can wear 2 earrings. # 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 --> 🆑 Skubman - add: 80+ new markings have arrived, including earrings, makeup, bracelets, and watches. Sashay over to Character Setup to personalize your character like never before! - add: The Arachne species can now select markings above the leg, including cybernetics, makeup, tattoos, noses, earrings, heterochromia, bracelets, gauze, and more! - tweak: The available points for Head (Side), Left Hand, and Right Hand markings have been increased for most species to support the new markings. - tweak: The Nail Polish markings have been moved from the Overlay category to the Left Hand and Right Hand categories. (cherry picked from commit 932f9e31eab9b2c11c4429b7c9c36effc327e733) * Automatic Changelog Update (#1299) (cherry picked from commit b05ab8e0d1e8aa043a60ca96843061f4778136e6) * ♂️ Add Male Arachne (#1301) # Description Adds the ability for Arachne to be male. Also in this I added chest/arm Arachnid markings for Arachne to use. I enabled footstep sounds for Arachne since it doesn't seem that they were intended to have silent footsteps. ## Media <img height=160px src="https://github.com/user-attachments/assets/04e3b066-e75c-4ee7-bfd6-762c2defcaf8"> <img height=160px src="https://github.com/user-attachments/assets/d4582c12-72d8-413f-92e6-145cb90c76c3"> ## Changelog 🆑 Skubman - add: Arachne can now be Male instead of only being Female. They can now also wear Facial Hair. - add: Arachne can use Arachnid chest and arm markings. - fix: Arachne will now have footstep sounds instead of being quiet when moving. (cherry picked from commit 1bab6b8844c679897b3a695b363620589292d783) * Automatic Changelog Update (#1301) (cherry picked from commit 5476ee090bd735d7791b4ae7f1e8aeea674cd55a) * Add Localization for Senior Physician and Senior Engineer (#1302) <!-- 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]? --> Adds localization for the Senior Engineer and Senior Physician roles that were recently enabled. --- # 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 --> n/a --- <!-- 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>   </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 --> 🆑 zelezniciar - fix: Fixed Senior Engineer and Physician names not appearing correctly (cherry picked from commit 4bf762411e866952c0257ce7d255b2610d7a3a21) * Automatic Changelog Update (#1302) (cherry picked from commit 9169818f60ef0cf156bb1b095d66e5e9d0b4575b) * Make Cultist Constructs Speak Eldritch (#1303) # Description Fixes cultist constructs only speaking Universal and not being able to understand anyone else due to a missing `LanguageKnowledgeComponent`. ## Changelog 🆑 Skubman - tweak: Cultist constructs and soul shards now speak Tau-Ceti Basic and Eldritch. Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> (cherry picked from commit 8573914e8b6183197abc250d3e8f3c186194b0a6) * Automatic Changelog Update (#1303) (cherry picked from commit 114ecde8384ae3d98350aa80d38b96766dc49cfa) * Fix Lobotomy (#1306) # Description Fixes several bugs in the lobotomy procedure. The lobotomy effect is now stored in the brain instead of the body, so transferring a lobotomized brain will still give the lobotomy effects, and a brain transplant to a body where a lobotomy occurred no longer applies the lobotomy effects. The "Mend brain tissue" procedure to reverse a lobotomy has been unlocked after a bug prevented it from showing in the surgery UI. Lobotomies now add the `ClumsyComponent`, which makes the lobotomized target as clumsy as clowns. ## Technical Details This deletes [SurgeryComponentConditionComponent.cs](https://github.com/Simple-Station/Einstein-Engines/compare/master...angelofallars:Einstein-Engines:fix-lobotomy?expand=1#diff-3786e2be1879fd877a8b501352bbd92baa3a17aecfa4a62827ad41497deb0fd7) which was only used for the lobotomy procedures (incorrectly, it was checking for `OhioAccentComponent` in the body part) in favor of [SurgeryPartComponentConditionComponent.cs](https://github.com/Simple-Station/Einstein-Engines/compare/master...angelofallars:Einstein-Engines:fix-lobotomy?expand=1#diff-7e180742b3a6f00b9f867d3ee4e8891dd00587dc4a2da8ad5e199180a387d18d) and [SurgeryBodyComponentConditionComponent.cs](https://github.com/Simple-Station/Einstein-Engines/compare/master...angelofallars:Einstein-Engines:fix-lobotomy?expand=1#diff-249e5a937ba929ffc76f85e8a43f17918afc9ba866e81f4ea4eba2c90fd0c408). These two components are currently unused as the lobotomy procedures use a new condition component checking for the brain's `OrganComponent.OnAdd` field, but they provide a way to check for components on the body part and on the body, respectively. ## Media **Lobotomy**  **Mend brain tissue**  **Remove organ step picture**  ## 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 --> 🆑 Skubman - add: The lobotomy procedure makes the target clumsy like the clown. This makes them bonk when climbing tables and makes guns they're shooting blow up on their face. - tweak: The lobotomy step now requires a scalpel instead of a drill. - fix: Enabled the "Mend brain tissue" surgical procedure on a lobotomized target. - fix: The lobotomized effect is now stored in the brain instead of the body. The same brain stays lobotomized throughout brain transplants, and transferring a normal brain to a body where a lobotomy occurred no longer applies the lobotomized effect. - fix: The lobotomy procedure now shows the proper popup during the lobotomization step. - fix: Removed the ability to perform lobotomies on bodies without a brain. - fix: The "Remove organ" surgery step on the UI now properly shows the retractor sprite instead of the hemostat. --------- Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> (cherry picked from commit 1895f3addc871e3ad18845c22c61f422f9807107) * Automatic Changelog Update (#1306) (cherry picked from commit 71c641283a13fc79c68f8ad23fa1397052b7e74b) * You Can Now Drag People Into Deep Friers (#1279) <!-- 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]? --> You can now drag entities like people into deep fryers. Yes, this will cook them. Yes, you can cannibalize your own dead crew. --- # 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 --> - [ ] Add a doafter - [ ] Add a popup warning everyone of what you've done --- <!-- 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> obs is broken part 295 </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 --> 🆑 - add: You can now shove people into deep fryers by drag-dropping them onto it. --------- Signed-off-by: Eris <erisfiregamer1@gmail.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> (cherry picked from commit 82b2b28f3ee0f534b7f32fe54a70ba58d9ebbe1c) * Automatic Changelog Update (#1279) (cherry picked from commit cbc76ef649396a827a6c3b38b83c4a20f1affc7b) * Revert "Emp Flashlight (#5)" This reverts commit 932f1f6c * Emp Flashlight (#5) (#1189) # Description Ports https://github.com/WWhiteDreamProject/wwdpublic/pull/5 # Changelog 🆑 - add: Added the EMP Flashlight to Syndicate Uplinks. --------- Co-authored-by: Ivan <126400932+HellCatten@users.noreply.github.com> (cherry picked from commit 7c0c16e3f2c07bad045c09e13a95855c356024ac) * Automatic Changelog Update (#1189) (cherry picked from commit 7beea8901ceea287918f35bd33f8d9445582427a) * Add Europa Map to Rotation (#1152) <!-- 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]? --> This PR adds an old map to rotation called "Europa", originally a planetary map, but due to several problems it was not able to be played, I updated a good part of the map adding things necessary to be able to be played in the EE code, using the same idea To make the Glacier map a "planet", I created a parallax using the desert texture for the map and set the atmosphere on the outer side to a temperature of 356.2 K (83 C) with a high presence of CO2 --- # 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] Rework eng - [x] add Super Matter engine - [x] better layout - [x] Rework Epi - [x] Better layout - [x] missing content - [x] Minor fixes on the map - [x] test the map - [x] add image --- <!-- 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>  </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 --> 🆑 - add: added a new map called "Europa" to rotation --------- Co-authored-by: VMSolidus <evilexecutive@gmail.com> (cherry picked from commit 831a7b3092aaab0ef130072a8dfde5354d7809df) * Automatic Changelog Update (#1152) (cherry picked from commit b1c3703cdec223ba10aa8e46d28c88694f97450c) * Update medicine.yml (#1210) Merges the med doc by floof. At least one original change by XavierSomething (will update when other PRs are found) https://github.com/Fansana/floofstation1/pull/222 --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> (cherry picked from commit c22325983ecd0a90b8a042585d20568030d69aaf) * Atmospheric Alerts Computer Upgrades (#1313) <!-- 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]? --> This PR upgrades the capabilities of the Atmospheric Alerts Computer by displaying colored zones on the station map corresponding to air alarm status. Additionally, it makes the Atmospheric Alerts Computer board obtainable in a Circuit Imprinter once Epi has researched "Atmospheric Technologies". This is a port of [Wizden #31910](https://github.com/space-wizards/space-station-14/pull/31910) by @chromiumboy --- # 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 --> n/a --- <!-- 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>   </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 --> 🆑 zelezniciar - tweak: Atmospheric Alerts Computer now displays colored zones corresponding to air alarm status on the station map - fix: Atmospheric Alerts Computer board is printable in a circuit imprinter --------- Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com> (cherry picked from commit e2ee77db5c7dd20958fa246c893d44b767826868) * Automatic Changelog Update (#1313) (cherry picked from commit 6c9270d0cf4526bd632d9d975eaa98c9d6767513) * More Bug Fixes (#1311) <!-- 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]? --> [Mice pickup fixed!](https://github.com/space-wizards/space-station-14/pull/33602) [Mobs can no longer spill jugs](https://github.com/space-wizards/space-station-14/pull/33602) Rest in changelog. # Changelog 🆑 - fix: You can pick up mobs again with left click. - fix: No more mob jug spill, including you revenants. - fix: Set the Gloves of the North Star to the proper attack speed. - fix: Medibots will no longer try to heal borgs. --------- Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> (cherry picked from commit 978173efd5f6e7a7cd9f5a52234291e29ed862dc) * Automatic Changelog Update (#1311) (cherry picked from commit 1b156683af55eb6e4fef1f1be46f69ff6b258856) * ChemMaster Sorting (#1310) <!-- 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 this Frontier PR.](https://github.com/new-frontiers-14/frontier-station-14/pull/2498#issuecomment-2513268858) --- # 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 --> 🆑 DmitriTheDemon - tweak: The ChemMaster is now sorted. --------- Signed-off-by: Remuchi <72476615+Remuchi@users.noreply.github.com> Co-authored-by: Dmitri <reznoriam@gmail.com> Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> Co-authored-by: Remuchi <72476615+Remuchi@users.noreply.github.com> (cherry picked from commit 32e17a621bc78ba70b330036bb5ba2fd371286e0) * Automatic Changelog Update (#1310) (cherry picked from commit 01a13e3c9f0beaa595b03acd0e50af4cb6de40bf) * Port Shipyards (#1314) # Description I needed this extremely badly. # TODO - [x] Move all of this out of the DeltaV folders. # Changelog 🆑 - add: Added Shipyards. --------- Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: Null <56081759+NullWanderer@users.noreply.github.com> Co-authored-by: Milon <milonpl.git@proton.me> Co-authored-by: Plykiya <58439124+plykiya@users.noreply.github.com> Co-authored-by: plykiya <plykiya@protonmail.com> Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: Radezolid <snappednexus@gmail.com> Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> (cherry picked from commit d69b516ce2fe3f8da65db745f1157ae259f60e96) * Automatic Changelog Update (#1314) (cherry picked from commit 36cd6ca4706196e9c3097efcff3443bc30896c19) * Port UserActivateInWorldEvent and BypassInteractionChecksComponent (#1295) <!-- 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]? --> See https://github.com/space-wizards/space-station-14/pull/28393 and https://github.com/space-wizards/space-station-14/pull/28236 for breaking changes and extra information Works perfectly on a downstream of EE. Changes in third commit have been tested with doors. --- # 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 --> nuh uh --------- Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com> (cherry picked from commit 1016a0809c6636147647347e9736846cf0536e68) * Inverts the Check for Material Whitelist in CanChangeMaterialAmount (#1320) This change was actually suggested by April, I'm not the author. It fixes Pacman generators and god knows what else. Prior to the change you could insert steel in it, or just the wrong kind of fuel. Since you could only load the wrong kind of fuel the generators were not working at all. <!-- 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]? --> Description. --- # 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 --> --- <!-- 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> Ejecting steel from a pacman gen  Them working after the fix.  </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 --> Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> (cherry picked from commit 54d15c03617c5c33b3804ad233e6dc6d7444080d) * Build Your Own TEG! (#1316) <!-- 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]? --> This PR adds the option of constructing a Thermoelectric Generator (TEG) from scratch, by adding flatpacks for the TEG Center and TEG Circulator, as well as a crate that can be ordered from logistics that contains the flatpacks. The aim is to give engineering crews the ability to add a TEG to stations that might lack one, as a "fun" engineering project that can be pursued on shift. This capability already exists for the Singularity Engine and Tesla Engines. The cost of the TEG Construction Kit is set at 8000 spesos, but this can be changed for balance reasons. Note: Kit may contain small parts not suitable for children under 3 years old. Some assembly required. --- # 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 --> n/a --- <!-- 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>   </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 --> 🆑 zelezniciar - add: TEG components now be ordered from Logistics and assembled on station. (cherry picked from commit f1b8f960f7aa9f29e638cb794d6f2639b63225e8) * Automatic Changelog Update (#1316) (cherry picked from commit 3d2cdd73bfd52e89ae9c11d60cba5c801bf68c8e) * Several Small Map Fixes to Europa (#1319) <!-- 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]? --> Description. --- # 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] Lack of radiator underneath the SM crystal - [x] Wrong kind of vent and lack of connectors at the gas chambers - [x] Inverts one of the connector pumps in the SM's closed loop - [x] Adds a decal to this inverted pump which was missing - [x] Lack of Mv wire under a APC on a hallway at the north side - [x] Lack of Hv wire connection to a substation in the bridge which powers the bridge and the bar area - [x] Switches a medical records computer in medbay to a crew monitoring one - [x] Adds an autolathe to cargo - [x] Protrudes the cargo dock which was too tight to fit the shuttle --- <!-- 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> Previous docking issue:  Change in cargo dock design  Crew monitoring replacing medical records  Autolathe added to cargo  <h2>Atmos/SM/Wiring changes:</h2> Added missing Hv connection to a substation in the bridge  Added one missing Mv wire to this APC  Changed regular vents into passive vents, added connector slot and attached canisters to it  Radiator added to SM  These two pumps in the SM which were redundant, also one of them were missing decal to the same tile  Showing the changed pump after being inverted  --- Recenter changes: There were three APC in cargo and north of in which one was connected with cargo's APC for no apparent reason and the other was missing wires entirely. I've put the one missing wires to work in the Lv wiring around it and cut the Lv wires were it seemed appropriate to prevent connecting multiple APCs with Lv for no reason.   Excess lamps not included in the change     </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 --> 🆑 - fix: Several small fixes to Europa map, namely to cargo dock, SM and atmos piping and wires, adds autolathe to cargo and crew monitor to med (cherry picked from commit 50eb2173c25073d8bed2aaf3dc5a8e4db44a261d) * Automatic Changelog Update (#1319) (cherry picked from commit f4152a5597156c58731308e0ef0869862035dce2) * Fix Rules (#1321) # Description The latest update killed our generic rules, and made them not work anymore. This PR brings them back.  # Changelog 🆑 - fix: Server rules work again. (cherry picked from commit 06a8cee785e74db4c820d072aa3fdafcf2e4c403) * Automatic Changelog Update (#1321) (cherry picked from commit 9989c4d3d2214b22f90045c15e32b04f93adb3b0) * fix * 237.2.0 * fix * 237.2.0 * Uplink: Remove Deception Category (#1309) <!-- 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 this downstream PR.](https://github.com/Fansana/floofstation1/pull/315) --- # 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 --> 🆑 fenndragon - tweak: Moved the uplink deception category into utility. --------- Co-authored-by: fenndragon <fenndragon@gmail.com> (cherry picked from commit ec650c49cf9aa00ef94a8ef6fd122e9f2906f98b) * Automatic Changelog Update (#1309) (cherry picked from commit 5d64873978b40fc03108674d9554e0cf11e4b454) * [Feat] Bring Back Die Glorious Death, Hijack And Ian's Meat Traitor Objectives (#1323) <!-- 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 Title --- # 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 --> 🆑 - add: Reintroduced 3 traitors objectives: steal Ian's meat, Die Glorious Death and Hijack Evacuation Shuttle Signed-off-by: Remuchi <RemuchiOfficial@gmail.com> (cherry picked from commit 0c60671d98a565cbc81daed2df438853fc03c5bb) * Automatic Changelog Update (#1307) (cherry picked from commit 33f80d679da22d870fb5e7d0beddfd67366b77a4) * Automatic Changelog Update (#1323) (cherry picked from commit 3ae43708cadfc9e1ab1b3ef1b4f8bc7144017065) * The Throwing Update (#1307) # Description Turns a plethora of items into throwing weapons that deal damage when thrown. Throwing weapons cost stamina to throw. ## Technical/Balance Details To make a melee weapon also a throwing weapon, just add `- type: DamageOtherOnHit`, and it will automatically inherit the damage from a light melee attack and the melee sound effect as the thrown hit sound effect. You can set a custom damage value with the `damage` field (necessary when the item is not a `MeleeWeapon`) and stamina cost with `staminaCost`. To make the throwing weapon embed and deal damage over time when embedded, add `- type: EmbeddableProjectile` and `- type: EmbedPassiveDamage`. By default, the embed damage per second is 5% of the throwing damage, but it can be modified on `EmbedPassiveDamage` with `throwingDamageMultiplier`. The default stamina cost for throwing is 3.5 stamina. The baseline cost for almost all DoT embeddables is 5 stamina, because of the extra damage the DoT brings. When a thrown item hits a target with body parts, it will randomly select a body part and only deal throwing damage to that body part. It will also embed to the same body part and only deal passive embed damage to it. ## TODO The unchecked checkmarks are best addressed in another PR but they will stay here for now. <details><summary>Show Todo</summary> - [ ] Deal with prediction issue on embeddable projectile removal - [ ] This happens even before this PR so not really a big issue, maybe in a separate PR - [x] Add embeddable damage numbers to embeddables - [x] Fix throwing angle for surgery tools after the surgical tools sprite update - [ ] Try to make the throw knockback function as if it hit a wall - [x] Esword/desword/e-dagger toggle embed damage - [x] Don't start passive embed damage if EmbedPassiveDamageComponent has no damage - [x] Make DamageOtherOnHit.Damage not nullable - [x] Throwing damage only to a specific body part ### Traits - [ ] **Enraged Throw** (Oni) - [ ] Oni/trait damage bonus applied to throwing weapon too - [ ] Can throw carried bodies, which will do a MassContest between the thrown body and the hit body to determine blunt damage, and stun duration for each party - [ ] 15% resistance to thrown/embed damage - This helps when their enemy uses the items they throw against them. - [ ] **Sharpthrower** (Human) - [ ] 10% more Brute thrown damage - [ ] 50% chance of throw hitting targetted body part - [ ] 40% throwing stamina cost reduction - [ ] 15% resistance to thrown/embed damage ### Embeds - [x] Adjust embed damage per second to be like /tg/ (in /tg/ spear has around ~1.2 embed DPS, adjust for ~45% embed chance since we're not implementing embed chance and its 0.54) - [ ] Merge EmbeddableProjectileComponent and EmbeddablePassiveDamageComponent - [ ] Split SharedProjectileSystem into EmbeddableProjectileSystem - [x] Embed to a specific body part and deal damage only to that part, for now can randomly select body parts on embed - [ ] ~~Normal passive damage becomes x0.2 when lying down~~ - [ ] Increased damage when moving, more bonus damage for running (Jostle DPS on /tg/ is 0.2 running and 0.1 when walking/crawling) - [x] All embeddables have a fall out time (30 or 45 secs) - [ ] - [x] On damage examine, can see that an object is embeddable "It can embed on a target if thrown." - [ ] Negative moodlet for attached harmful embeddables - [ ] On health examine target with embeds, can see embedded objects "He has a spear embedded in his left arm." - [x] On examine item that is embedded, can see to which body part the item is embedded "The spear is embedded on Urist McHands's left arm." - [ ] An embeddable removed outside of surgery deals a lot of damage (x2 thrown damage) - [ ] Lying down prevents natural falling out and thus the damage with non-surgical removal - [ ] Surgical procedure on a body part to remove all embeds on it, using hemostat for removal - [x] Allow anyone to remove embedded cultist weapons even if they're not a cultist </details> ## Media **Throwing Toolbox Tools** https://github.com/user-attachments/assets/4e20568f-adf0-4be8-ac38-fc6b21fed03c **Examine**  **Examine After Embedding**  ## Changelog 🆑 Skubman - add: The Throwing Update is here. You can throw most melee weapons at the cost of stamina to deal damage from afar. - add: Dozens of throwable weapons, mainly sharp weapons will now embed on throw and deal damage every second until they're manually removed or naturally fall off after some time. - add: Examining the damage values of an item now shows its throwing damage, throwing stamina cost, whether or not it embeds on a throw, and if the embed deals damage over time. - add: Examining an embedded item now shows what body part it's embedded in. - tweak: The traits High Adrenaline, Adrenal Dysfunction, Masochism and Low Pain Tolerance now affect throwing attacks just like melee attacks. - tweak: The default time to remove embedded items has been increased from 3 to 5 seconds, and both the remover and the target with the embedded item need to stand still during the removal. - tweak: The time to pry up a floor tile with a crowbar and other tools has been decreased from 1 second to 0.5 seconds. The throwing damage of floor tiles has been increased. Go figure. - fix: Attempting to throw a Blood Cultist item without being a cultist will stun you and drop the item you're holding properly. --------- Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> (cherry picked from commit c40af73e43c394edb1e96f2bfcc278ca0d54f94e) * fix * Automatic Changelog Update (#1307) (cherry picked from commit 33f80d679da22d870fb5e7d0beddfd67366b77a4) * Replace Direct Uses of GameTicker Dictionary with `TryGetValue` (#33222) (#1329) Cherry picks "Fix station events schedulers, antag selection and possibly other systems acting weird in a rare scenario." # Description This is being PRed mostly as a fix to an issue which caused the round to fail to start due to an error in antag selection, which did happen in Thief antags and may also happen with Bloodcult gamemode. Double posting from discord: > It fixed issues caused with antag selection at roundstart which affected roundstart Thief selection. > > Since cultists are also selected exactly at roundstart - unlike traitors for instance, I think this might help with cultists too. > > I tried to force start bloodcult gamemode in the past and it failed to start but I since I had tracebacks disabled trying to improve performance I'm not sure this was the cause. > Credits to April for pointing this out for me after I commented on the issue. ---- This cherry picks 79ff990ddf7c7af40f70bcc7ba2d3220730852ab removing changes which change methods which do not exist yet on our side. <!-- 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 --> Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com> (cherry picked from commit 8216a6e60b114a65fb4662587e6e6f2e38dd242f) * Fix Debug Assert. (#1325) nothin' crazy, just annoying. (cherry picked from commit ca7e5768be4350d13a0541005ad795b9fb17c2a7) * Fix Melee Weapon Attack Speed (#1330) Description. Melee weapons got swapped from attacks/second to second/attack but the actual attack rate value didn't get changed so weapons got all jumbled. I'm pretty sure I got them all but I might've missed a few in weird folders 🆑 - fix: Fixed melee weapons. --------- Signed-off-by: dge21 <129136517+dge21@users.noreply.github.com> Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> (cherry picked from commit f9133933e72bb9c3f7b5d130fc3c3ceb4358b9cd) * Automatic Changelog Update (#1330) (cherry picked from commit 1592c0e225593707d03626f24e009ad089631e49) * CVar CharacterRequirement (#1322) <!-- 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]? --> This takes in one CVar and one required value and simply checks if the CVar's value as a string is equal to the required value. I could make it use a list of them, but I really didn't think it was needed considering CharacterAndLogic. I also cleaned up CharacterRequirements.Profile.cs a bit. --------- Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> (cherry picked from commit 34209e69c0251e279a7090bbd097825ffae70fde) * Update Credits (#1326) This is an automated Pull Request. This PR updates the GitHub contributors in the credits section. Co-authored-by: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com> Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> (cherry picked from commit 49b9c34f66528c92303fb3bf6dd8f8db55c435b6) * Back Out "Flash Now Flashes Black Instead of White. (#14642)" (#1331) Original commit changeset: c3dcc7a124 # Description Dark flash is cowardly. Billions must be flashbanged irl # Changelog 🆑 - tweak: Flashes are bright again! (cherry picked from commit 6b1feac3b12fecb33cfb7e30354347e8443b9c41) * Automatic Changelog Update (#1331) (cherry picked from commit 48951ffc83393b6d0d007283206efc8af678c92a) * Nix housekeeping (cherry picked from commit 142ff101a3e7794250bd91422db7c3dbabcf1161) * Port N14 Mapper Assets (#1315) # Description By request from Old Dance Jacket, who wanted to be able to use N14 Mapping Assets in SS14. We should probably trim this list down for what assets aren't actually needed (Any asset that is 100% unique to Fallout for instance) # Changelog 🆑 - add: Added a large number of mapping assets from Nuclear14 (cherry picked from commit 3e9387686105cc7a0928e65682b8075f7e7737f4) * Automatic Changelog Update (#1315) (cherry picked from commit b4e9e44b0e2641fc5ea7936d9cdb5c156d3a2d39) * Billions Must Flip (#1318) # Description Billions must flip. https://github.com/Goob-Station/Goob-Station/pull/828 https://github.com/Goob-Station/Goob-Station/pull/832 # Changelog 🆑 - add: Spin, flip, and jump emotes have been added. --------- Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> Co-authored-by: username <113782077+whateverusername0@users.noreply.github.com> Co-authored-by: router <messagebus@vk.com> (cherry picked from commit 0ed26cebf3e82c3aeb3d5d5096a3be6750cf1e77) * Automatic Changelog Update (#1318) (cherry picked from commit 39d250fb74e5da7d87fae08c662cd88f914d2df6) * Re-Enable Clown/Mime Hardsuit and Clown Snoring (#1324) # Description Reverses one of the countless content removals from the old codebase EE was based on by adding back the Clown hardsuit and Mime hardsuit as craftable items. Also re-enables the unique clown snoring sound. ## Media **Hardsuits (renamed to Vacsuit)** <img width=400px src="https://github.com/user-attachments/assets/92f77ef3-3380-4b98-a099-7ed28e260de2"> <br> <img width=400px src="https://github.com/user-attachments/assets/7940d34c-0e7c-4979-bd95-3992e3d79e98"> **Honk Mimimimi** https://github.com/user-attachments/assets/2d8af9a6-d17d-4a94-9f59-7b3aafd987a2 ## Changelog 🆑 Skubman - fix: Fixed an issue where players could not craft clown hardsuits and mime hardsuits on the crafting menu. - fix: Fixed an issue where clowns did not have their signature silly snore sound when sleeping. --------- Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> (cherry picked from commit 946b7664763b8b823215a710743d74b4b0dd6a79) * Automatic Changelog Update (#1324) (cherry picked from commit 48d63bacf6bd665c8ff98e33d5da3a0e1e4ffb52) * Blood Cult DLC 1: Make It an Actually Playable Game (Mode) (#1276) <!-- 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 You don't actually have to pay for it, y'know? --- # 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] Fix bugs from discord thread. --- <!-- 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>  </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 --> 🆑 - add: In-game guide book to kickstart your sinister activities. - add: Constructs now have abilities. - add: Rending rune and apocalypse rune now should only be placed in the specific spots on maps. Needs to be mapped. - add: Veil Shifter now displays how much charges it has when examining. - add: Cult runes now have descriptions. Also stating how much invokers required for each rune. - add: Blood rites can now be dropped&deleted. - add: Blood rites now suck... blood in 0.5 tiles radius. - remove: Non-cultists can no longer examine runes. - fix: Fixed Cult Objective Target selection. You can (and should) sacrifice your own people now. - fix: Non cultists can no longer use veil shifter. - fix: Teleport spell is no more a cheap rip-off and now actually teleports. - fix: Timed Factories can't no more produce infinite number of entities. - fix: Offering rune should now properly convert someone. - fix: Sacrificing body with mind now properly transfers their mind to soul shard. - fix: Shadow Shackles now cuffs the target instead of the caster (lmao). --------- Signed-off-by: Remuchi <RemuchiOfficial@gmail.com> Signed-off-by: Remuchi <72476615+Remuchi@users.noreply.github.com> Co-authored-by: Raphael Bertoche <bertocheraphael@gmail.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> (cherry picked from commit 975c673d41f7379975e3d9bed07d29a33371b39a) * Automatic Changelog Update (#1276) (cherry picked from commit 149afb608d2f84f4bd8c48443374ba7b9d72ff34) * Automatic Changelog Update (#1335) (cherry picked from commit 478e159fb76c497423e370bd583958295bbbb443) * RobustToolbox * fix: stun * fix: stun --------- Co-authored-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: SimpleStation Changelogs <simplestation14@users.noreply.github.com> Co-authored-by: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> Co-authored-by: Skubman <ba.fallaria@gmail.com> Co-authored-by: Tmanzxd <164098915+Tmanzxd@users.noreply.github.com> Co-authored-by: Remuchi <72476615+remuchi@users.noreply.github.com> Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> Co-authored-by: DEATHB4DEFEAT <77995199+deathb4defeat@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Raphael Bertoche <rbertoche@cpti.cetuc.puc-rio.br> Co-authored-by: DocNITE <docnite0530@gmail.com> Co-authored-by: gluesniffler <159397573+gluesniffler@users.noreply.github.com> Co-authored-by: zelezniciar1 <39102800+zelezniciar1@users.noreply.github.com> Co-authored-by: Eris <erisfiregamer1@gmail.com> Co-authored-by: Ichaie <167008606+ichaie@users.noreply.github.com> Co-authored-by: Emily Smith <41290202+Suraru@users.noreply.github.com> Co-authored-by: Raphael Bertoche <bertocheraphael@gmail.com> Co-authored-by: dge21 <129136517+dge21@users.noreply.github.com> Co-authored-by: stellar-novas <stellar_novas@riseup.net>	2024-12-14 10:41:27 +02:00
Spatison	a2557f75a6	Upstream (#129)	2024-11-21 17:49:04 +07:00
Aiden	e5a53ce702	Bluespace and Normality Tweaks/Fixes + Bluespace Part Crafting (#1052) ... # Description Bluespace crystals would turn into ore when ejected from autolathe, lead me down a rabbit hole of issues with them. - fixes above mentioned - normality crystals dont appear as bluespace when inserted into lathes anymore - adds textures for ores and crystals (grey cuz its "normal" duh) - fixes glimmer drain using a DIFFERENT normality crystal that was made with chems - the old chem version now gives new normality crystals - add crafting recipes for bluespace parts (fixes not being able to reverse engineer them) Fixes #980 --- <details><summary><h1>Media</h1></summary> <p>  </p> </details> --- # Changelog 🆑 - fix: Bluespace crystals now properly eject from lathes. - fix: Bluespace parts can be reverse engineered. --------- Signed-off-by: Aiden <aiden@djkraz.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>	2024-10-19 14:59:20 +07:00
DEATHB4DEFEAT	47b10a01b0	Catch-Up Cherry Pick 2 (#944) ... # Description Picked 400 commits (and skipped many, many more) from WizDen since #540. Stopped at commit 332f54a3aebe669f6e50d26e7b047f0bdc28e0fb (Lobby Refactor). --- # TODO - [x] Pick - [x] Compile - [x] Fix runtime errors - [ ] Fix up humanoid profile editor - [ ] Test everything --- # Changelog 🆑 - add: Merged 400 WizDen PRs. Happy testing! --------- Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com> Co-authored-by: FungiFellow <151778459+FungiFellow@users.noreply.github.com> Co-authored-by: osjarw <62134478+osjarw@users.noreply.github.com> Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com> Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com> Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Co-authored-by: Magnus Larsen <i.am.larsenml@gmail.com> Co-authored-by: Hanz <41141796+Hanzdegloker@users.noreply.github.com> Co-authored-by: Kukutis96513 <146854220+Kukutis96513@users.noreply.github.com> Co-authored-by: potato1234_x <79580518+potato1234x@users.noreply.github.com> Co-authored-by: Gotimanga <127038462+Gotimanga@users.noreply.github.com> Co-authored-by: Mangohydra <156087924+Mangohydra@users.noreply.github.com> Co-authored-by: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com> Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Co-authored-by: Morb <14136326+Morb0@users.noreply.github.com> Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com> Co-authored-by: KrasnoshchekovPavel <119816022+KrasnoshchekovPavel@users.noreply.github.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com> Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: KittenColony <149278380+KittenColony@users.noreply.github.com> Co-authored-by: ShadowCommander <shadowjjt@gmail.com> Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com> Co-authored-by: T-Stalker <43253663+DogZeroX@users.noreply.github.com> Co-authored-by: ERROR404 <100093430+ERORR404V1@users.noreply.github.com> Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com> Co-authored-by: Jezithyr <jezithyr@gmail.com> Co-authored-by: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com> Co-authored-by: no <165581243+pissdemon@users.noreply.github.com> Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com> Co-authored-by: Ciac32 <aknoxlor@gmail.com> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: NotSoDana <75203942+NotSoDana@users.noreply.github.com> Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com> Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com> Co-authored-by: Tayrtahn <tayrtahn@gmail.com> Co-authored-by: nao fujiwara <awkwarddryad@gmail.com> Co-authored-by: Michael <107807667+Doc-Michael@users.noreply.github.com> Co-authored-by: Vasilis <vasilis@pikachu.systems> Co-authored-by: Lamrr <96937466+Lamrr@users.noreply.github.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Co-authored-by: Jay <67732946+DuskyJay@users.noreply.github.com> Co-authored-by: Just-a-Unity-Dev <67359748+Just-a-Unity-Dev@users.noreply.github.com> Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com> Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com> Co-authored-by: Tyzemol <85772526+Tyzemol@users.noreply.github.com> Co-authored-by: Alzore <140123969+Blackern5000@users.noreply.github.com> Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com> Co-authored-by: RumiTiger <154005209+RumiTiger@users.noreply.github.com> Co-authored-by: Verm <32827189+Vermidia@users.noreply.github.com> Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com> Co-authored-by: Killerqu00 <47712032+Killerqu00@users.noreply.github.com> Co-authored-by: Ty Ashley <42426760+TyAshley@users.noreply.github.com> Co-authored-by: exincore <me@exin.xyz> Co-authored-by: 0x6273 <0x40@keemail.me> Co-authored-by: Kara <lunarautomaton6@gmail.com> Co-authored-by: Ygg01 <y.laughing.man.y@gmail.com> Co-authored-by: Łukasz Mędrek <lukasz@lukaszm.xyz> Co-authored-by: Hannah Giovanna Dawson <karakkaraz@gmail.com> Co-authored-by: TurboTracker <130304754+TurboTrackerss14@users.noreply.github.com> Co-authored-by: OnsenCapy <101037138+LGRuthes@users.noreply.github.com> Co-authored-by: pigeonpeas <147350443+pigeonpeas@users.noreply.github.com> Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com> Co-authored-by: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com> Co-authored-by: Rio <110139251+Riolume@users.noreply.github.com> Co-authored-by: vorkathbruh <152932728+vorkathbruh@users.noreply.github.com> Co-authored-by: Sphiral <145869023+SphiraI@users.noreply.github.com> Co-authored-by: PrPleGoo <PrPleGoo@users.noreply.github.com> Co-authored-by: Moomoobeef <62638182+Moomoobeef@users.noreply.github.com> Co-authored-by: username <113782077+whateverusername0@users.noreply.github.com> Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com> Co-authored-by: Джексон Миссиссиппи <tripwiregamer@gmail.com> Co-authored-by: Brandon Li <48413902+aspiringLich@users.noreply.github.com> Co-authored-by: Jajsha <101492056+Zap527@users.noreply.github.com> Co-authored-by: RiceMar1244 <138547931+RiceMar1244@users.noreply.github.com> Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Co-authored-by: youtissoum <51883137+youtissoum@users.noreply.github.com> Co-authored-by: ike709 <ike709@users.noreply.github.com> Co-authored-by: icekot8 <93311212+icekot8@users.noreply.github.com> Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: Geekyhobo <66805063+Geekyhobo@users.noreply.github.com> Co-authored-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> # Conflicts: # Content.Client/Input/ContentContexts.cs # Content.Client/Lobby/LobbyState.cs # Content.Client/Lobby/UI/HumanoidProfileEditor.xaml # Content.Client/Lobby/UI/LobbyGui.xaml # Content.Client/Lobby/UI/LobbyGui.xaml.cs # Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs # Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml # Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs # Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs # Content.Server/GameTicking/GameTicker.Spawning.cs # Content.Shared/Alert/AlertType.cs # Content.Shared/Input/ContentKeyFunctions.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs # Resources/ConfigPresets/EinsteinEngines/default.toml # Resources/Prototypes/Alerts/alerts.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml # Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml # Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/keybinds.yml	2024-10-19 14:53:37 +07:00
VMSolidus	bfa8bba9d8	Bluespace And Normality Ores (#1042) ... # Description This PR adds new ores in the form of Bluespace and Normality ores, the former being just as rare as artifact fragments, and the latter being even rarer still. These ores can be mined by salvage, will generate on asteroids or expeditions, and can be processed in an ore processor into bluespace or normality crystals, which Epistemics can use to create psionic related objects. Note that the two are currently indistinguishable from the other until you actually mine them. Yes this DOES infact make it easier to make glimmer drains and probers. I need this as an excuse to make psionics even more dangerous. <details><summary><h1>Media</h1></summary> <p>    </p> </details> # Changelog 🆑 - add: Added Bluespace and Normality ore as very rare ore types. Salvage can occasionally find these ores on Asteroids or on Expedition planets. Bluespace and Normality Ore can be smelted in an Ore Processor into Bluespace and Normality Crystals. Make sure to bring these to Epistemics so that they can do their job. --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>	2024-10-19 13:45:27 +07:00
VMSolidus	4d56010091	More Drug Moodlets (#1014) ... # Description This PR adds two more drug related moodlets, neither of which are addictions. This would be Space Drugs and Ethanol. # Changelog 🆑 - add: Added positive moodlets for drinking Space Drugs and Alcohol.	2024-10-19 13:36:42 +07:00
Mnemotechnican	520a0dcc7f	Blood Regeneration Affects Hunger/Thirst (#1007) ... # Description Makes natural blood regeneration use up some hunger and thirst, and halt completely when you are starving/dying of thirst. This is necessary to fix two issues: 1. It being possible to feed off of your own blood, by repeatedly drawing your blood and injecting it back with a syringe. (I actually know a few people on floof who do that on a daily basis) 2. Hunger and thirst having no real impact on gameplay, besides giving you a mildly annoying depression overlay when low. This PR also slightly refactors the blood deficiency trait so that it's no longer completely hardcoded in the bloodstream system. <details><summary><h1>Media</h1></summary> <p> https://github.com/user-attachments/assets/f8634de5-19bd-44a5-ada2-62f4504bf3d4 </p> </details> # Changelog 🆑 - add: Blood regeneration now uses up hunger and thirst, and comes to a halt when you are very hungry or thirst. - fix: It is no longer feasible to drink your own blood to satiate your own hunger. # Conflicts: # Content.Server/Body/Systems/BloodstreamSystem.cs	2024-10-19 13:35:50 +07:00
VMSolidus	ff6d43c9a5	Chemical Moodlets (And Drug Addictions!) (#896) ... # Description This PR implements a new Reagent Reaction that modifies a character's mood, done by raising a MoodEvent on that character. It also extends some of the functionality of the TraitSystem and MoodSystem so as to support a new serializable Drug Addiction mechanic. https://www.youtube.com/watch?v=8liPBsUtND4  <details><summary><h1>Media</h1></summary> <p>     </p> </details> # Changelog 🆑 - add: Drug Addictions! Drug addictions are long lasting Moodlet-Pairs. The first consisting of a temporary Mood bonus that is refreshed by consuming the drug, and the second consisting of an extremely long lasting mood penalty, which replaces the mood bonus should you go a long enough time between consuming the drug in question. - add: Nicotine Addiction has been added as a new minor negative trait. - add: Drugs/Reagents can now affect your character's Mood! Both with, and without Addiction. - add: TraitSystem has had functionality added for directly adding Moodlets to a character upon joining the round, such as drug addictions, or permanent mood modifications like Sanguine/Saturnine - add: Lotophagoi Oil now induces an extremely powerful drug addiction, providing an extremely large mood benefit for a short time. Which when it wears off, creates an equally extreme mood penalty that lasts for a very long time(or until you drink more Loto Oil).	2024-10-19 12:52:13 +07:00
SleepyScarecrow	6fd044afab	Alcohol Ethanol Content Fix (#911) ... <!-- 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]? --> I changed the ethanol content of all of the drinks and base alcohols within the game based off of irl parallels and math for the sake of realism and because it bugged the shit out of me that it was so inconsistent. --- # 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 --> 🆑 - tweak: Ethanol Contents - fix: SnowWhite Recipe - tweak: Ethanol overdose changed from 15 to 45	2024-10-19 12:48:23 +07:00
FoxxoTrystan	666e820aed	Plushie Update! (#654) ... <!-- 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]? --> By multiple requests i bring my PR from Frontier The [PLUSHIE UPDATE!](https://github.com/new-frontiers-14/frontier-station-14/pull/886) This PR add a prize vendor machine where you can trade prize ticket for a toy/plushie, to get ticket you win those in arcade machines. This PR will give a chance for everyone to get the toys they need in a special machine and will make plushies in general more random and fun, in term of random spawns. WARNING THIS PR DOES NOT MAP THE PRIZE VENDOR AND WILL MOSTLY NEED TO BE MAPPED. --- # 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] Prize Vendor - [x] Prize Tickets - [x] New Toys/Plushies - [x] Prizes --- <!-- 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>  </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 --> 🆑 - add: A ton of new plushies has arrived - add: Prize counter are here, get your prizes by winning games and getting prize tickets! and find prize balls!!	2024-08-13 18:16:51 +01:00
Angelo Fallaria	6a12eabbaa	New Trait: Liquor Lifeline 🍺🩹 (#706) ... # Description **Liquor Lifeline** 🍺 is a new trait (-3 points) that makes you slowly heal Brute and Burn (except Caustic) damage when drunk, healing more the drunker you are. Inspired by the SS13 /tg/station quirk called Drunken Resilience. Strength of Liquor Lifeline healing in terms of its Brute damage healed per tick compared to Bicaridine: - 0.1u to 0.5u Ethanol - 10% Bicaridine - 0.5u to 7u Ethanol - 20% Bicaridine - 7u to 11u Ethanol - 40% Bicaridine - 11u to 15u Ethanol - 80% Bicaridine - 15u+ Ethanol **(drunk poisoning starts)** - 120% Bicaridine ## Media **Trait entry**  # Changelog 🆑 Skubman - add: Add Liquor Lifeline (-3 points), a new positive trait that makes you slowly heal Brute and Burn damage when drunk, healing more the drunker you are. The trait also gives you the benefits of Alcohol Tolerance. - tweak: The cost of the Alcohol Tolerance trait has been reduced from -2 points to -1 point. - add: Dwarves receive the Liquor Lifeline trait for free. --------- Signed-off-by: Angelo Fallaria <ba.fallaria@gmail.com>	2024-08-10 16:59:22 -04:00
VMSolidus	981b7dd9e3	Rebase Blood Drinker System, Arachne, Oneirophage (#438) ... # Description This is a simple rebase of the Blood Drinker System, and its related features that have been commented out and/or omitted due to its lack of rebase. I am NOT substantially updating any of this code at this time, outside of the barest minimum updates needed to make it run in the first place. The reason I am doing this is that I require the Blood Drinker system functional as a prerequisite for future features, and I will update or refactor it when needed. Arachne are still pending a Full Rework, but that is beyond the scope of this PR. # TODO - [x] Make the code functional - [x] Port Arachne - [x] Uncomment Oneirophages - [x] Re-add Oneirophage midround event # Changelog 🆑 - add: Arachne have been reimplemented! - add: Oneirophages are back! --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com>	2024-08-05 21:52:32 -07:00
Mnemotechnican	c976bfa40c	Oracle Refactor (#549) ... # Description Refactors the oracle system and component, making them more customizable and less trash. - Most of the nyano shitcode was rewritten in accordance with the new standards and in a less hardcoded manner (all features were preserved, with some changes). - Replaced the accumulator field pattern with the "nextX" pattern for things oracle does on certain intervals. - Removed some code duplication and bloat. - Gave oracle a 75% chance to request technology and 25% to request a plant. - When requesting a technology, oracle will only request what's either already researched, or can be researched soon (that is, the prerequisites of the research are complete and the research isn't locked for any reason). - If there's no research server at the moment when oracle demands an item, it will only demand a plant - When dispensing rewards, oracle can now spawn 1, 3, or 5 crystals at once, and research disks worth 5k, 10k, and 20k research points. Each one of those have different probabilities (3 crystals and 5k points still prevail, but occasionally you can get the more expensive rewards). - When dispensing rewards, oracle now throws them at the person who fulfilled the request instead of simply spawning them at their feet. Almost every oracle thing (except for throwing and the amount of liquid dispensed) can now be configured in the yaml prototype of the oracle. # TODO Forget it <details><summary><h1>Media</h1></summary><p> https://github.com/user-attachments/assets/9d4be44f-37d5-4072-a6e6-f194764f7ff6  </p></details> --- # Changelog 🆑 - tweak: Oracle requests are now more likely to be aligned with the current research.	2024-08-05 18:10:42 +01:00
Vasilis	24278597f9	Uncooked animal proteins is safe for animal stomachs only (#26906) ... Uncooked animal proteins is safe for animal stomachs	2024-07-11 21:42:12 -07:00
Tayrtahn	b3eb17c519	Server-only component YAML cleanup (#26836) ... * First pass cleaning up server-only YAML errors. * Second pass	2024-07-11 21:34:38 -07:00
Alzore	6acc8a3bce	Dionae now bleed sap, and this can be used to make syrup. (#25748) ... * SapAndSyrup * centrifug * morewatervapor * whyisitnotpushing * nymphs * lessrealmorefun	2024-07-11 21:23:41 -07:00
Firewatch	4c1fe8b7c1	Bartender "Essentials" (#25367) ... * drinks round 1 saving my progress before my hard drive explodes * test 2 please work * name fixes whoops * Update drinks.yml * various fixes am dumb * add sol dry to vends more fixes and changes, yippee! * more fixes & ingame testing shrimple tests * last fixes :trollface: should be ready for pr now * Update soda.yml sate thirst	2024-07-11 21:18:12 -07:00
takemysoult	4a160c0f3a	up stimulants (no sleep) (#25886) ... * up stimulants (no sleep) * Update SharedSleepingSystem.cs	2024-07-11 20:40:18 -07:00
EdenTheLiznerd	1a16908e18	Rebalance amatoxin so it is a slower killer (#25830) ... * Balancing? Balancing!!! * Additional changes	2024-07-11 20:40:09 -07:00
SimpleStation14	d3ad07a6c5	Mirror: Slimes can drink fourteenloko (#116) ... ## Mirror of PR #25889: [Slimes can drink fourteenloko](https://github.com/space-wizards/space-station-14/pull/25889) 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) ###### `a846966515e3051c131f00dc56743c360a91766e` PR opened by <img src="https://avatars.githubusercontent.com/u/128169402?v=4" width="16"/><a href="https://github.com/Nimfar11"> Nimfar11</a> at 2024-03-06 21:30: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 20:50:10 UTC --- PR changed 1 files with 4 additions and 0 deletions. The PR had the following labels: - No C# - Status: Needs Review --- <details open="true"><summary><h1>Original Body</h1></summary> > ## About the PR > > Slimes can drink FourteenLoko not 1 time or even 2, but as much as they want. Their stomachs can process this obscure slurry without harming their bodies. > > ## Why / Balance > > Strange finding legal poison, that way they'll have at least one consumer in them. Interesting feature for the slime people. > > ## Media > > - [X] I have added screenshots/videos to this PR showcasing its changes ingame, **or** this PR does not require an ingame showcase > > 🆑 Nimfar11 > > - tweak: Slimes can now drink FourteenLoko without harming their bodies. > </details> Co-authored-by: Nim <128169402+Nimfar11@users.noreply.github.com>	2024-05-12 00:07:01 -04:00