mirror of
https://github.com/WWhiteDreamProject/wwdpublic.git
synced 2026-04-27 02:27:46 +03:00
5b2cd95609bd29afabb203d2e4b0644d7745856c
86 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
|
|
f4192fa06e |
Ghost Bar!!!! (From Goobstation) (#1675)
# Description Adds the Ghost Bar from Goob LRP. Upon spawn, the character's loadouts and traits will also be applied as if their job was their Ghost Bar job. Adjusts the weights for kill objectives, re-enabling the kill objective and reducing the weight of Teach a Lesson now that there's more things to do after getting round removed. Goobstation cherry-picked PRs: - https://github.com/Goob-Station/Goob-Station/pull/454 - https://github.com/Goob-Station/Goob-Station/pull/464 - https://github.com/Goob-Station/Goob-Station/pull/689 (partially applied to Ghost bar files only) - https://github.com/Goob-Station/Goob-Station/pull/963 - https://github.com/Goob-Station/Goob-Station/pull/974 - https://github.com/Goob-Station/Goob-Station/pull/982 (partially applied to Ghost bar files only) - https://github.com/Goob-Station/Goob-Station/pull/1288 (partially applied to Ghost bar files only) Wizden cherry-picked PRs: - https://github.com/space-wizards/space-station-14/pull/29103 (for the foam force rifle that spawns in the Ghost bar) ## Media **Ghost Bar UI**  **Ghost Bar In-Game**  Notice how the Ghost Bar character has loadout items in the backpack and the Skeleton Accent trait. ## 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: Ghost Bar! When you die, you can now go to the Ghost Bar to chill and talk about the round with other ghosts. (by Aidenkrz) - add: Foam Force rifle to cargo lottery! (by IProduceWidgets) - add: Re-enabled the Kill objective for traitors. - tweak: Reduced the chances of traitors getting the "Teach a Lesson" objective. --------- Co-authored-by: Aiden <aiden@djkraz.com> Co-authored-by: Rank #1 Jonestown partygoer <mary@thughunt.ing> Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Co-authored-by: Aviu00 <93730715+Aviu00@users.noreply.github.com> (cherry picked from commit 0b4ceb21cc406cd39b894afe79decf40c2366369) |
||
|
|
7a77fc6621 |
Plasmaman Hotfix + Other Fixes (#1676)
# Description - Added the `SkeletonAccent` trait to the `TraitsAccents` item group prototype (was mistakenly not included) - Set all plasma tank's output pressure to 5.325 (was 21.3), same as the smaller plasma internals tank - Apparently the Output Pressure is not really meaningful for engineering on plasma tanks so this is just a QoL feature for plasmamen - Prevent plasmamen from taking the Temperature Tolerance trait that is useless due to their cold immunity. - Fix price of uplink mechs due to lack of https://github.com/Goob-Station/Goob-Station/pull/332 - We absolutely want to bring the Telecrystal Rework here, but for now reduce the price Pending Rework™. - https://github.com/space-wizards/space-station-14/pull/30393 (cherry-picked from Wizden) - Disable the Raise Glimmer objective due to the glimmer rework. ## Media **Plasma Tank Output Pressure** <img width=300px src="https://github.com/user-attachments/assets/4632a93d-25b9-4b16-b941-d7d2b39c2d77"> **Uplink Mechs** <img width=300px src="https://github.com/user-attachments/assets/6494d693-ca01-497d-a1bf-784058ffc1f6"> # Changelog 🆑 Skubman - tweak: All plasma tanks of all kinds now have the correct output pressure for use as Plasmamen internals. - tweak: Plasmamen can no longer select the Temperature Tolerance trait which has no effect since they are already immune to Cold damage. - fix: Reduced the price of mechs on the uplink. - fix: Thief game rule now properly selects more than one thief. - remove: Remove the Raise Glimmer To 500 traitor objective. --------- Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com> Co-authored-by: plykiya <plykiya@protonmail.com> (cherry picked from commit e9036ff47b6b98a3ccc13602c6042427442c2982) |
||
|
|
3a9a0e63bf |
Change "Kill" To "Teach a Lesson" (#1654)
better for MRP this code is originally by me anyway, they just made it better 🆑 - tweak: Kill random person objective has been replaced by teaching them a lesson, removing the need to RR a random person. --------- Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> Co-authored-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> Co-authored-by: Milon <milonpl.git@proton.me> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> (cherry picked from commit f592d4cd890bc14c70153182a400d273ffb113b9) |
||
|
|
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) |
||
|
|
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 |
||
|
|
a2557f75a6 | Upstream (#129) | ||
|
|
0cbb73203b |
[Tweak/Fix] Resprite / Рейспрайт (#103)
* Tweak big WWDP Texturepack * fix * tweak * fix * fix * fix * fix * fix |
||
|
|
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 |
||
|
|
c5761e7ca4 |
Remove Become Psionic Objective (#940)
# Description
This should have been removed awhile ago. This objective shouldn't exist
because you automatically win it entirely by default if you selected the
Latent Psychic trait in Chargen. And you permanently fail the objective
if you didn't select said trait.
# Changelog
🆑
- remove: Removed the "Become Psionic" traitor objective. It was
literally impossible to fail if you took the Latent Psychic trait, and
literally impossible to greentext if you didn't.
|
||
|
|
4d654458d3 |
BigWWDPTexturepack-2-0 (#46)
* WallsWindowsTablesTools * ClothingWITHOUTUniform * ClotningAndMelochi * Fix * FixFixilov * Brevno * NuChasTochnoZarabotaet |
||
|
|
6df564aafc |
Hardsuit MRP Descriptions (#725)
# Description Copying over the original description from #617 > This is a significantly pared down version of #492 > Focusing only on a small category of item descriptions just to get the ball rolling. > > Space Station 14 is actually missing the other two suit-names that were at one point present and commonplace in SS13. The term "Hardsuit" is itself one of three classifications of space suit, based on a book series that I read as a teenager. The full list is as follows. > > Vacsuit: Vacuum-Protection-Suit > Hardsuit: Hardened Vacsuit > Tacsuit: Tactical Combat Hardsuit > Vacsuits are a catch-all shorthand for civilian space suits. They offer no actual protection from anything other than the cold void. > Hardsuits are a form of "Up-armored" vacsuit, and are more like industrial PPE in space. You wear a hardsuit because it's there to protect you while you're welding, shipbreaking, asteroid mining, and so on. > Tacsuits are a variant on the idea of a hardsuit, but instead of having an industrial purpose, they are explicitly for military purposes, and aren't for civilian use at all. > > I've opened this up on draft because Mocho was asking to help me with it. > > Generally, the hardsuits need to be explicitly associated with a specific in-universe corporation. With descriptions changed to better suit a hypothetical setting that we'd wish to write. > > For instance, much of the equipment used by Security would likely be products of Five-Points-Armory, a corporation that NT prefers to buy their security equipment from for the simple fact that it's cheap, yet gets the job done. Rewrote hardsuit descriptions to match the original request, but from the POV of a character as suggested by @DangerRevolution. The descriptions also have a rough template which goes along the lines of... {Type of suit} produced by {corporation} + {optional visual attributes} + the label/tag says {hint at protective stats} + it feels {light or heavy depending on speed stats}. In the commits you can also find that I had lengthier but more fleshed out descs for each of the hardsuits. But they went into detail your character wouldn't feasibly be able to know at a glance (how do I know this suit is made of plastitanium plating, and that the other has ceramic TPS plates?). Feel free to ask for mix and matching between the two. **Also I moved the paramedic voidsuit to be a hardsuit, because for whatever reason it wasn't one already.** Even had all of the properties that a normal hardsuit does. :trollface: --- # Changelog 🆑 - tweak: Changed hardsuit descriptions to be slightly less LRP. - tweak: Changed paramedic voidsuit from a softsuit to a hardsuit. --------- Co-authored-by: VMSolidus <evilexecutive@gmail.com> |
||
|
|
80e48a578f |
Supermatter Engine (Port From White Dream) (#341)
# Description   This PR has been produced in collaboration with coders from White Dream, with written permission given by the relevant code owners to port this specific slice of content to Einstein-Engines. Supermatter Engines are a form of nuclear reactor, which produces energy in the form of radioactive particles, while also decaying into Phoron when excited by an external energy source. Power can be obtained from the engine via radiation collectors, which like those of a singularity engine, must be periodically refueled. In addition, the engine must also be actively cooled via aid from Atmospherics, and for undesirable gasses to be extracted from the reactor chamber. If not cooled, the crystal will begin to destabilize and eventually collapse into one of three different situations depending on the source of its instability. 1. A nuclear blast. 2. A gravitational singularity 3. A Tesla ball # Changelog 🆑 VMSolidus, White Dream, Colin-Tel - add: Supermatter Engines have been implemented. --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: whateverusername0 <whateveremail> Co-authored-by: username <113782077+whateverusername0@users.noreply.github.com> Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> |
||
|
|
ec385000a3 | Merge branch 'master' of https://github.com/Simple-Station/Einstein-Engines into wizden-mass-pick-1 | ||
|
|
18df90e255 |
IdCard Resprite (#537)
<!-- 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]? --> Resprite the IDCards with newers looking sprites, making them also modular so easy to edit/create new cards without the need to make compleatly new sprites. --- # 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] ID Cards - [x] Cleanup --- <!-- 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 --> 🆑 - tweak: We got new ID Cards the old ones were soo tiny that they were lost. |
||
|
|
fa40733d6a |
Fix round start crash (causing instant restart) (#26579)
* Fix round start crash * Make `TryCreateObjective` more error tolerant |
||
|
|
318bb084d1 |
Mirror 26421: Nerf Ninja's Research Stealing (#446)
## Mirror of PR #26421: [Nerf ninja research stealing](https://github.com/space-wizards/space-station-14/pull/26421) 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) ###### `3b9c5d43ec97a0693ced0118fcfcb8467aa5595e` PR opened by <img src="https://avatars.githubusercontent.com/u/98561806?v=4" width="16"/><a href="https://github.com/EmoGarbage404"> EmoGarbage404</a> at 2024-03-25 01:44:21 UTC - merged at 2024-03-26 00:52:27 UTC --- PR changed 4 files with 75 additions and 8 deletions. The PR had the following labels: - Status: Needs Review --- <details open="true"><summary><h1>Original Body</h1></summary> > <!-- Please read these guidelines before opening your PR: https://docs.spacestation14.io/en/getting-started/pr-guideline --> > <!-- The text between the arrows are comments - they will not be visible on your PR. --> > > ## About the PR > <!-- What did you change in this PR? --> > Changes ninja gloves to steal a flat rate of techs instead of wiping all of them. > Additionally adjusts the objective to require 1 to 2 steals to reach the target amount. > > ## Why / Balance > <!-- Why was it changed? Link any discussions or issues here. Please discuss how this would affect game balance. --> > Ninja's stealing research was previously an extremely trivial and annoying objective. For them, you can pretty easily break into the server room and wait out the 20 second doafter. It's not super hard and you're not exactly shooting off warning signs. At this very low cost, science loses literally an hour+ of progress. > > This nerf changes it to only remove 4-8 random technologies, or only about 20k to 40k points worth. This is still pretty crippling but not awful. On top of that, they need to do it twice to hit the target amounts of 9 to 12 techs stolen. This provides counterplay by actually giving science a chance to see that all their research has vanished before the ninja is already gone. It also makes it significantly harder for ninja to obliterate everything science has done. > > ## Media > <!-- > PRs which make ingame changes (adding clothing, items, new features, etc) are required to have media attached that showcase the changes. > Small fixes/refactors are exempt. > Any media may be used in SS14 progress reports, with clear credit given. > > If you're unsure whether your PR will require media, ask a maintainer. > > Check the box below to confirm that you have in fact seen this (put an X in the brackets, like [X]): > --> > > - [x] I have added screenshots/videos to this PR showcasing its changes ingame, **or** this PR does not require an ingame showcase > > ## Breaking changes > <!-- > List any breaking changes, including namespace, public class/method/field changes, prototype renames; and provide instructions for fixing them. This will be pasted in #codebase-changes. > --> > > **Changelog** > <!-- > Make players aware of new features and changes that could affect how they play the game by adding a Changelog entry. Please read the Changelog guidelines located at: https://docs.spacestation14.io/en/getting-started/pr-guideline#changelog > --> > > 🆑 > - tweak: Ninjas no longer wipe all technologies when using their gloves on a research server. > </details> Co-authored-by: SimpleStation14 <Unknown> |
||
|
|
a9335dbbc9 |
Port Station Goals (#465)
# Description https://github.com/Simple-Station/Parkstation-Friendly-Chainsaw/pull/10 This adds a feature whereby a random goal for the shift is faxed to the station's Captain at the start of every shift. It is up to the Captain to decide if and how this goal is to be completed. Goals are randomly generated every shift, and are meant to help encourage station activity and RP. Admins are also able to send station goals via `sendstationgoal`. --- <details><summary><h1>Media</h1></summary> <p>  --- </p> </details> # Changelog 🆑 VMSolidus - add: Added station goals that get sent to the Command fax machine at the start of every shift --------- Signed-off-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> |
||
|
|
e5314b25a1 |
Mirror: Removed Cannabis from thief objectives (#369)
## Mirror of PR #26412: [Removed Cannabis from thief objectives](https://github.com/space-wizards/space-station-14/pull/26412) 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) ###### `b44015bd554eb97a2d4762d7b585c71e43865571` PR opened by <img src="https://avatars.githubusercontent.com/u/57235581?v=4" width="16"/><a href="https://github.com/ChaseFlorom"> ChaseFlorom</a> at 2024-03-24 21:40:14 UTC --- PR changed 3 files with 4 additions and 26 deletions. The PR had the following labels: - No C# - Status: Needs Review --- <details open="true"><summary><h1>Original Body</h1></summary> > <!-- Please read these guidelines before opening your PR: https://docs.spacestation14.io/en/getting-started/pr-guideline --> > <!-- The text between the arrows are comments - they will not be visible on your PR. --> > > ## About the PR > <!-- What did you change in this PR? --> > > Removed the cannabis objective from the thief objectives. > > ## Why / Balance > <!-- Why was it changed? Link any discussions or issues here. Please discuss how this would affect game balance. --> > > 20-30 cannabis leaves is neither fun for the thief, or for the botanist that they're asking to grow it. It doesn't fit with the heart of the thief objective system, as the only real way to accomplish it is to ask the botanist to grow it for you, or grow it yourself. Neither of which is stealing. > > Resolve [#26321] > > ## Technical details > <!-- If this is a code change, summarize at high level how your new code works. This makes it easier to review. --> > Removed the proper .yml code. > ## Media > <!-- > PRs which make ingame changes (adding clothing, items, new features, etc) are required to have media attached that showcase the changes. > Small fixes/refactors are exempt. > Any media may be used in SS14 progress reports, with clear credit given. > > If you're unsure whether your PR will require media, ask a maintainer. > > Check the box below to confirm that you have in fact seen this (put an X in the brackets, like [X]): > --> > > - [x] I have added screenshots/videos to this PR showcasing its changes ingame, **or** this PR does not require an ingame showcase > > ## Breaking changes > <!-- > List any breaking changes, including namespace, public class/method/field changes, prototype renames; and provide instructions for fixing them. This will be pasted in #codebase-changes. > --> > > **Changelog** > <!-- > Make players aware of new features and changes that could affect how they play the game by adding a Changelog entry. Please read the Changelog guidelines located at: https://docs.spacestation14.io/en/getting-started/pr-guideline#changelog > --> > 🆑 > - remove: removed cannabis thief objective. </details> Co-authored-by: SimpleStation14 <Unknown> |
||
|
|
90d1731739 |
Mirror: Remove Hamlet, Smile and Pun Pun from Thief objective (#120)
## Mirror of PR #25921: [Remove Hamlet, Smile and Pun Pun from Thief objective](https://github.com/space-wizards/space-station-14/pull/25921) 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) ###### `faed7a3746c90db98538958d0332c778092eb377` PR opened by <img src="https://avatars.githubusercontent.com/u/96445749?v=4" width="16"/><a href="https://github.com/TheShuEd"> TheShuEd</a> at 2024-03-07 22:07:40 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 23:53:36 UTC --- PR changed 4 files with 0 additions and 66 deletions. The PR had the following labels: - No C# --- <details open="true"><summary><h1>Original Body</h1></summary> > ## About the PR > title > > ## Why / Balance > stealing ghostrole is asspain > > **Changelog** > 🆑 > - remove: Removed Hamlet, Smile and Pun Pun from Thief objectives > </details> Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> |
||
|
|
9b2d304326 |
Merge pull request #937 from DebugOk/2024/03/05-Merge-Master
2024/03/05 merge master |
||
|
|
8a863666f0 |
add crew monitor as traitor steal objective (#25563)
(cherry picked from commit 002b8d88711aa6395c5e054c3aa9bd163f74799e) |
||
|
|
63ec9e7d70 |
Replace RD mentions with Mystagogue (#893)
* rogue rd mentions whats an rd even * one line comments Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Signed-off-by: Fluffiest Floofers <thebluewulf@gmail.com> --------- Signed-off-by: Fluffiest Floofers <thebluewulf@gmail.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> |
||
|
|
b4dc5351fb |
Little rework of existing yaml flatpacks (#24814)
* Little rework of existing yaml flatpacks * comit 2 * 55 * 66 * 77 * WRAAAA * done mr sloth * Update flatpack.yml * fix?? (cherry picked from commit 326b89031809a88c7c6a0a5ecb2b1b2a23b082f1) |
||
|
|
4c7c904549 |
Remove vehicles (#24681)
* Remove wheelchairs Vehicle code is dogwater and wheelchairs just keeps exposing edgecases. If someone wants it brought it back they can do vehicle refactor. * Also this one * Remove vehicles * goodbye vehicles * Remove this check * sasd * Cronch * Add sprites back * jani (cherry picked from commit d2f20d8955a25a32aa5fb9b3631a41921b464cd4) |
||
|
|
870cae9db8 |
Store ninja objectives in conditions 2 (#20894)
* move spider charge target from role * shorter field names * remove ninja role comment * remove unused systems in SpaceNinjaSystem * GenericAntagObjectivesAddedEvent * check if warp point is on same map * remove unnecessary import * add missing loc when spider charge has no target * a * remove spider charge target requirement comp * inline SpiderChargeTitle * allow planting charge without objective * remove map check * fix role check when planting * obj.Target * Fix merge --------- Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> (cherry picked from commit 7311ce671fe29d81c662b2313e28c275c4f868cb) |
||
|
|
0f35906014 |
Steal cleanup (#24428)
- Fix datafield spelling - Fix some code oddities (cherry picked from commit b1f9e25c1364064b03bc37357d3453f01e28b8a4) |
||
|
|
b438a04fba |
more objective logging + maybe fix the no objective bug (#24139)
* more objective log * remove hijack from group!!!! --------- Co-authored-by: deltanedas <@deltanedas:kde.org> (cherry picked from commit 0a1b3ba601ccaf6827253bc9f824fba853e34fa8) |
||
|
|
cb9d6be362 |
Tropico pet added to thief objective pool (#24119)
* git it's the same stop gaslighting yourself * tropico added to thief objective pool (cherry picked from commit 49057ace7ee61609e96f25b1a1e92f24cd07c67d) |
||
|
|
0c3c4843d9 |
Remove AmmoTechFabCircuitboard from Thief objectives (#24037)
(cherry picked from commit 8e125e0ea5e9a4eb46ac5cab4030b0803908fd34) |
||
|
|
78424dcde0 |
Adjust prototype names to lowercase (#23810)
(cherry picked from commit ae59b072ccfdb7ce806ac6bf392871020fc942f0) |
||
|
|
03cbdbecd2 |
Some thief steal target tweaks (#23572)
pipip (cherry picked from commit 45be12b834a2c008f0002d599d3567360e8a05cd) |
||
|
|
0a2e3663e5 |
Added a regular and an engraved zippo (flippo) lighter (#23020)
* Added the zippo and engraved zippo. Added the engraved zippo in the detective's coat. * Added copyright. * Renamed to Flippo * Gave the Flippo new sounds. Moved the lighter sound collections to their own folder in Items. * Fixed YAML issues that showed up with moving the lighter noises to their own folder. * Added the detective's Flippo as a thief objective, with half the weight of the forensic scanner. (cherry picked from commit 1c8eb2f3de92e52fcc5100e4751e0dd51f20c77e) |
||
|
|
38f8bc5b5f |
Move stamps out of big mess (#22877)
* gigacommit * Update honkbot.yml * foxing * merg * bring back mime sound * ; * :trollface: (cherry picked from commit 78965d1e368fa19549bfb043620c85d48188d78e) |
||
|
|
a86f9ba75f |
Thief hotfix (#22976)
* fixes! * reduced collection amount * omeeeeega * pipup * popup (cherry picked from commit 166296b2c510a81cdf3a11636a296b1ad859ed85) |
||
|
|
b7ce6cdbd1 |
exterminator midround minor antag (#19946)
* terminator locale * terminate objective * terminator components and shared system * terminator roles rules and system * terminator events * skeleton recolour * terminator and endoskeleton * ghost role spawn * damage modifier sets * :trollface: * :trollface: * add antag prototype * ghost role locale * skynet * :trollface: * :trollface: * :trollface: * add endoskeleton body prototype * :trollface: * :trollface: * smite locale * implement terminate smite * :trollface: * :trollface: * implement PopupBehavior * endoskeleton transform popup * move stuff from shared to server since nothing actually used it * recolour everything * update parts * :trollface: * :trollface: * ok fire was using the damage set, back to 1.0 * tweak * :trollface: * :trollface: * simplemob ops * 1 rule per pro * :trollface: * :trollface: * update some sprites * structural damage * :trollface: * :trollface: * Revert "update some sprites" This reverts commit 459196c6a8942c5412885d5fe2f1a83a48408ddc. * offbrand, add die objective to maybe remove fear of murderbone * add shut down objective to the list * fix ghost role * fix control mob * :trollface: * :trollface: * please * naming * code changes for GenericAntag terminator * yml changes for GenericAntag terminator * :trollface: * moved kill objective override to an objective component * use kill objective override * fix * oh * locale changes * change burn to heat for skin melting gib * change some endoskeleton stuff * pro * i already did this dementia ops * objective * fix * pro * swap out full sprite * update parts * forgor * fix mind transfer * type * endoskeleton has 500 mass * evil * fishops * warops --------- Co-authored-by: deltanedas <@deltanedas:kde.org> (cherry picked from commit 52532e40759d874e25daf1620ad5d808b0942116) |
||
|
|
556288b0de |
add limits to steal objectives (#22672)
* add ObjectiveLimit comp/system * give ian and disk limits * all * up limit --------- Co-authored-by: deltanedas <@deltanedas:kde.org> (cherry picked from commit 2ca649edfa4963215919f3fc4dc621899cd8c595) |
||
|
|
8bca049ca7 |
New Thief minor antagonist (#21520)
* start working * add right-click thief antagins some architecture restruct * add meh thief greeting audio * add thief subgamemode to Traitors gamemode * add late join thief (not tested yet) add briefing * add pacifism * add Steal tasks to thief * fix crash thief+traitor on person * add new condition: collection steal * add tracking of succes collection objective * add stamp collection target remove some boring steal target add check pulling entity to collection target * finalize first 2 group objective * start merging stealing objective systems * merging * finish merging. Now traitor steal objective work better * we don't check the items of pullable sentient entity * clear naming, enable thief signle item objective start * objective pack add * finish with steal item objectives * convert string to ProtoId<> * some clean up * add thieves to revolution game mode * Update Resources/Locale/en-US/game-ticking/game-presets/preset-thief.ftl Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com> * Update Resources/Locale/en-US/game-ticking/game-presets/preset-thief.ftl Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com> * update pacifism: fix crashing, monkey-thief without pacified * adaptive animal briefing, cleaning locales * add structure steal objectives * remove RCD target * add thiefs to manifest, but bug with traitor duplications * add escape objective * add chat briefing * setup animal objective group system * add animal steal objectives * add animal objectives notroleconditions * add morty * now thief mode has a chance of not launching Now there are a random number of thieves per round from 1 to 3 * 6 hours of trying to fix duplicate tasks. Failure * added thief pinpointer (buggy) * start thief backpack UI work * revert pinpointer for scope reason * UI continue work * add thief starter kits content * remove ERP kit :trollface: * finally! giving starting items to thief. Now it playable, but still need more work * clean up * fix * fox * add merged items into thief new Starting Kit (buggy) * fix YES antag menu * objection tweaks * remove hearts objective, working on spawning things from toolbox * smug * fixes * add race specifier objective condition LAMPS * meh * fix fix fix * the alive * Adding stamps * Update backpack.ftl * Revert1 * Revert ftl * add voice mask to communicator kit * Update Resources/Locale/en-US/administration/antag.ftl Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> * Update Resources/Locale/en-US/game-ticking/game-presets/preset-thief.ftl Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> * Update Resources/Locale/en-US/thief/backpack.ftl Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> * Update Resources/Locale/en-US/objectives/conditions/steal.ftl Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> * Update Resources/Locale/en-US/thief/backpack.ftl Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> * Update Resources/Locale/en-US/thief/backpack.ftl Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> * Update Resources/Locale/en-US/thief/backpack.ftl Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> * Update Resources/Locale/en-US/thief/backpack.ftl Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> * Update Resources/Locale/en-US/prototypes/roles/antags.ftl Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> * Update Resources/Locale/en-US/thief/backpack.ftl Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> * update * fix * more reusable function, add documentation * fix doc * faint fixes --------- Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com> Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> (cherry picked from commit 144af233c4f4135cccacfa5d50281fce44a1595e) |
||
|
|
474d7177d2 | disable hijack objective (#21928) | ||
|
|
bad35e181a |
Energy Guns (#385)
* gee * forgor comments * licence for audio * Update equipped-BELT.png * Makes the sprite change but shitcode Because shitcode makes everyone happy * it only got two of them firemodes lets not lie * We can name this appropriately now * Apply 3 suggestions from code review Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Signed-off-by: Fluffiest Floofers <thebluewulf@gmail.com> * update sources * Energy Gun + more firemodes its still energygun only --------- Signed-off-by: Fluffiest Floofers <thebluewulf@gmail.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> |
||
|
|
0f685fca4c |
Fix hijack objective (#21241)
* Fix hijack * Max difficulty |
||
|
|
4996db833f |
Adds Psionic-related Antag Objectives. (#345)
* Adds Psionic-related Antag Objectives. Look at them. * Adds NotJobsRequirement, which should probably replace NotJob |
||
|
|
2d65e87159 | sneaked back in (#329) | ||
|
|
6a6551fbf1 |
Remove glorius death (#321)
* Felinid own stomach * Remove glorius death * removes glorus deat lrp * removes glorus death because lrp * removes glorus death because lrp * removes glorus death because lrp * Added respective comment * Update traitor.yml added comment Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> --------- Signed-off-by: Sif <58263971+AitorLogedo@users.noreply.github.com> Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> |
||
|
|
e20cfcc457 |
Hijack shuttle objective (#19621)
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com> |
||
|
|
abaa2feba5 |
The Quartermaster's Requisition Digi-board (#21023)
* Added sprites * Added item in game * Ditched glowing light indicator to simplify implementation * Added clipboard to locker fill * Added traitor objective * forgor meta.json * forgor clip textures on front-facing in-hand sprites * lowered concussiveness of bureaucracy * added remote cargo ordering, paper sucking, and removed paper on spawn * slightly reduce storage capacity so it can fit in backpacks |
||
|
|
2c73e0c8aa |
Rename Science and Cargo ID (#211)
* We are the science team * I feel like i'm missing something * Yup this is also visible to the player |
||
|
|
6fcebdbac3 | rename (#187) | ||
|
|
8281f889db |
HoP's Photobook steal objective (#142)
* ian * Update heads.yml added comment Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> * more pictures * wrong reference * update pictures --------- Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> |
||
|
|
fd2cc8570d |
Sync master up to 1/10 (#74)
* Automatic changelog update * Make NPC names proper nouns & fix some genders (#20534) * Proper names & genders * Uppercase proper names * Make Smile female * fix bingus wrinkly head (#20531) * rouny meat and steak (#20526) * lost friendship flavor * add rouny steak * rouny special meat * rouny meat textures --------- Co-authored-by: deltanedas <@deltanedas:kde.org> * Automatic changelog update * Wearable Wet Floor Sign and 'Janitorial Suicide Vest' (#20311) * Explosive wet floor sign & janitorial suicide vest * fix attributions * Remove name & desc from explosive wet floor sign * Make wet floor sign chameleonable * Automatic changelog update * Minor slippery stuff (#20535) * Update submodule to 162.2.0 (#20570) * Predicted armor (#20560) * clean up some lines in smile the slime prototype (#20552) * Revert "Use full file path for temp replays (#19002)" (#20545) * Add EyesGlasses into ClothesMate (#20523) * Automatic changelog update * Fix Punpun crew monitor sensor (#20484) * Automatic changelog update * EasyPry airlocks for arrivals. Now also prying refactor I guess (#19394) Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> * Automatic changelog update * Make arcades hackable again (#20555) * Automatic changelog update * Health alert tweaks (#20557) * Automatic changelog update * Add active and ended game rule components, generic TryRoundStartAttempt and minPlayers field (#20564) * Improve active game rule querying, add generic try round start attempt method, move minPlayers to GameRuleComponent * Nukeops todo and cleanup * Remove Active field * Add EndedGameRuleComponent * bartender suit (#20521) * give me a drink bartender * guh * aARG * Necropolis and mine walls (#20578) * Automatic changelog update * archaic accent tweaks (#20567) * Automatic changelog update * Add confirmation to kick and respawn in the admin player actions panel (#20542) * Remove windows-latest CI runs, remove unused build-test-release.yml (#20540) * Change .editorconfig to keep existing attribute arrangement (#20538) * Automatic changelog update * Catch replay start and end errors on round restarts (#20565) * Update trivial components to use auto comp states (#20539) * Fix role unbans not applying in real time (#20547) * Disable AHelp buttons when no player is selected, update button styling (#20568) * Automatic changelog update * Added a toggle fullscreen button (default F11) (#20272) * Added a toggle fullscreen button (default F11) * Removed un-needed comments * Review Requested Changes * Fixed Acidental Spacing Change * bwoink, removed extraneous code * nothing, litterally * Automatic changelog update * Fix not networking markings (#20588) * Automatic changelog update * Update RobustToolbox to v162.2.1 (#20590) * Automatic changelog update * Glorfcode (force say on damage/stun/crit) (#20562) * Automatic changelog update * Fix AHelp progressively showing more AHelp panels (#20591) * Automatic changelog update * caninsert entitystorage tweaks (#20589) * Automatic changelog update * Fix mapping actions crashing on load (#20592) * Fix loading a map with a ThirstComponent crashing the game (#20594) * Fix electrocution displaying real name of disguised players (#20603) * Organ fixes (#20488) * Automatic changelog update * Kettle medical rework (#20435) * Initial try at medical rework for kettle * Re-add decal decorations to Kettle's medical * Add more lockers to kettle's med * Actually upload kettle's map, not its proto * Automatic changelog update * Added blocked visuals to volumetric pump (#20610) * Automatic changelog update * Move TimedDespawn to engine (#20515) * Update submodule to 163.0.0 (#20616) * Remove v0.1 version number from local main menu screen (#20617) * Remove cloneData parameter from AutoNetworkedField (#20596) * Update submodule to 164.0.0 (#20618) * fix cognizine ghost role (#20632) Co-authored-by: deltanedas <@deltanedas:kde.org> * Automatic changelog update * Move ID layer one pixel to correct alignment (#20630) * Update nukie hardsuit descriptions (#20529) * Make holofans destructable (#20445) * Automatic changelog update * bowl is open (#20453) Co-authored-by: deltanedas <@deltanedas:kde.org> * Add TestPair.WaitCommand() (#20615) * Rename ThreatPrototype and mark fields as required (#20611) * Adjust hard bomb shape (#20608) * dragon refactor, objectives and use GenericAntag (#20201) Co-authored-by: deltanedas <@deltanedas:kde.org> * Automatic changelog update * Added generic empty liquids tank (#20563) * Move view variables verb to the top of the list with no category and localize it (#20546) * saltern update (#20325) Co-authored-by: deltanedas <@deltanedas:kde.org> * Fix followers leaking (#20643) * Add Winter Boots (#20622) * add * fix prototype * Add QM mantle (#20621) * add * fix prototype * Automatic changelog update * Slime mobs breathe nitrogen and resprite their organs (#20577) * Slimes breathe nitrogen and resprite their organs * ups * mmm * Automatic changelog update * Fix the new lizard horn's consistency + issue (#20620) * fix * add * Revert "add" This reverts commit a054a3204a8f185a94ceb80b1bd3bc9f30423711. * Add RandomHumanoidAppearance component to for space ninjas (#20605) * Automatic changelog update * Space cat breathes space (#20550) * Space cat breathes space Made Space Cat lungs ROBUST * Made Space Cat's lungs ROBUST 2.0 * Automatic changelog update * Wide anomaly locator (#20581) * Add files via upload * Add files via upload * Add files via upload * Add files via upload * add textures * fix encoding * fix 2 * Automatic changelog update * Fixed Telescopic Shield Lighting (#20650) * Fixed Telescopic Shield Lighting Bug fix #20199 * no need for these at all --------- Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> * Automatic changelog update * Add a special hardsuit for nukie medic (#20471) * Automatic changelog update * Carry over other mutations when doing species mutation (#20551) * Automatic changelog update * Add Spanish accent to poncho and sombrero (#20377) --------- Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com> Co-authored-by: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com> Co-authored-by: deltanedas <39013340+deltanedas@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: ravage <142820619+ravage123321@users.noreply.github.com> Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com> Co-authored-by: LEVELcat <68501903+LEVELcat@users.noreply.github.com> Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com> Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> Co-authored-by: Doru991 <75124791+Doru991@users.noreply.github.com> Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com> Co-authored-by: Skarletto <122584947+Skarletto@users.noreply.github.com> Co-authored-by: NULL882 <104377798+NULL882@users.noreply.github.com> Co-authored-by: lunarcomets <140772713+lunarcomets@users.noreply.github.com> Co-authored-by: Miro Kavaliou <miraslauk@gmail.com> Co-authored-by: Kara <lunarautomaton6@gmail.com> Co-authored-by: Kacper Urbańczyk <kacperjaroslawurbanczyk@gmail.com> Co-authored-by: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com> Co-authored-by: daerSeebaer <61566539+daerSeebaer@users.noreply.github.com> Co-authored-by: Fluffiest Floofers <thebluewulf@gmail.com> Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com> Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Co-authored-by: Kevin Zheng <kevinz5000@gmail.com> Co-authored-by: drteaspoon420 <87363733+drteaspoon420@users.noreply.github.com> Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com> Co-authored-by: Nim <128169402+Nimfar11@users.noreply.github.com> Co-authored-by: Kacper Urbańczyk <mikrel071204@gmail.com> Co-authored-by: Tox Cruize <141375638+TexCruize@users.noreply.github.com> Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: Michael Cu <43478115+michaelcu@users.noreply.github.com> |
||
|
|
e3c9a66a28 |
Praying Mantis (#86)
* Mantis mail for detective Forensic Pads are no longer for Mantis, as the detective will take over the investigating crimes job. * Mantis * Remove forensic and pill * Doesn't need this headset * buh * Fix capitalization I swear I have a brain * Minor spelling mistake, PR closed * bread * Rename to psionic mantis + antag advantage * Zipties and mindbreaker pills Mindbreaker doesn't do anything yet * Update job-description.ftl minor spelling mistake Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> --------- Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> |