mirror of
https://github.com/WWhiteDreamProject/wwdpublic.git
synced 2026-04-23 00:27:50 +03:00
4265b4a052d3cd03ea0dd39d1d5ffdfe1bd42caa
19 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
Nemanja
|
9624745347 |
Add space debris to salvage magnet (#31113)
* add space debris to salvage magnet * multiplication * necessary mercy for NPCs * back and forth on mercy (cherry picked from commit b52686ea3851e422bffbf8391f5b88f9c75845d4) |
||
|
Nemanja
|
bff0c6cdba |
anonymize salvage wrecks (#31087)
* anonymize salvage wrecks * display wreck size (cherry picked from commit 8440fb6acb6e5e18c8035140b2b17644404c38d7) |
||
|
Nemanja
|
dfa0165bc8 |
Mining Rebalance (#30920)
* first pass * this shit too * ok fix that shit * buff * actually fix that (cherry picked from commit 3cdd62b0dd880135a4d83f6dcf0be4f1f95c3e8d) |
||
|
chavonadelal
|
908c97b78a |
Localization of the Salvage Expedition Console (#30339)
* Localization of the Salvage Expedition Console * Localization of the Salvage Expedition Console 2 (cherry picked from commit 9e1e9b8c34598aaf463b8294ece53df5d9842aef) |
||
|
sleepyyapril
|
885ee5a831 |
Wizmerge for Station AI (#1351)
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description the adding AI is now up to y'all because i'm not touching loadout code for name datasets, but it shouldn't be too bad from here --------- Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> Signed-off-by: SolStar <44028047+ewokswagger@users.noreply.github.com> Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: themias <89101928+themias@users.noreply.github.com> Co-authored-by: Verm <32827189+Vermidia@users.noreply.github.com> Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com> Co-authored-by: Sphiral <145869023+SphiraI@users.noreply.github.com> Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> Co-authored-by: Alzore <140123969+Blackern5000@users.noreply.github.com> Co-authored-by: ravage <142820619+ravage123321@users.noreply.github.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Co-authored-by: Intoxicating-Innocence <188202277+Intoxicating-Innocence@users.noreply.github.com> Co-authored-by: Saphire <lattice@saphi.re> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com> Co-authored-by: Tayrtahn <tayrtahn@gmail.com> Co-authored-by: CaasGit <87243814+CaasGit@users.noreply.github.com> Co-authored-by: BramvanZijp <56019239+BramvanZijp@users.noreply.github.com> Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com> Co-authored-by: NakataRin <45946146+NakataRin@users.noreply.github.com> Co-authored-by: Kara <lunarautomaton6@gmail.com> Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com> Co-authored-by: SlamBamActionman <slambamactionman@gmail.com> Co-authored-by: Doomsdrayk <robotdoughnut@comcast.net> Co-authored-by: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com> Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Co-authored-by: ElectroJr <leonsfriedrich@gmail.com> Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com> Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com> Co-authored-by: Julian Giebel <juliangiebel@live.de> Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com> Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com> Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com> Co-authored-by: icekot8 <93311212+icekot8@users.noreply.github.com> Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com> Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Co-authored-by: no <165581243+pissdemon@users.noreply.github.com> Co-authored-by: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com> Co-authored-by: osjarw <62134478+osjarw@users.noreply.github.com> Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com> Co-authored-by: TGRCDev <tgrc@tgrc.dev> Co-authored-by: Milon <milonpl.git@proton.me> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> Co-authored-by: Fildrance <fildrance@gmail.com> Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru> Co-authored-by: chavonadelal <156101927+chavonadelal@users.noreply.github.com> Co-authored-by: SolStar <44028047+ewokswagger@users.noreply.github.com> Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com> Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> Co-authored-by: ArchRBX <5040911+ArchRBX@users.noreply.github.com> Co-authored-by: archrbx <punk.gear5260@fastmail.com> Co-authored-by: Radezolid <snappednexus@gmail.com> Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Co-authored-by: EmoGarbage404 <retron404@gmail.com> Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com> Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com> Co-authored-by: Velcroboy <velcroboy333@hotmail.com> Co-authored-by: neuPanda <chriseparton@gmail.com> Co-authored-by: neuPanda <spainman0@yahoo.com> Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Whatstone <whatston3@gmail.com> Co-authored-by: VideoKompany <135313844+VlaDOS1408@users.noreply.github.com> (cherry picked from commit 93ed70acfeda357133a701f637d3faeec02749bb) |
||
|
Spatison
|
afaceb8a42 |
Upstream 12.12-26.12 (#208)
* Pistol-Whipping (Guns as Melee Weapons) (#1335)
# Description
Adds the ability to use guns as melee weapons and throwing weapons.
The gun melee attack is a Light Attack done with a right click. The
attack rate is slower than average melee weapons.
The cooldown on melee attacks after shooting has been removed entirely,
so you can right-click immediately after shooting (like in hero shooters
😎). The cooldown on shooting after a melee attack has been set to a
constant 0.5 seconds.
## Balance
Technically speaking, weaving shooting and pistol-whipping lowers your
overall DPS in most cases, because you can't shoot for 0.5 seconds after
doing a melee attack. With _skillful_ usage, however, it provides some
key tactical advantages:
- Preserving ammo by dealing damage without firing a shot.
- Deal stamina damage as a natural effect of dealing melee Blunt damage.
- Most non-pistol guns have increased blunt stamina damage factors to
help with this.
- Bypassing Piercing resists of armors with a higher Piercing resist
than Blunt resist like plate carriers.
- Doing the combo of right-clicking immediately after shooting deals a
big burst of damage.
Pistol-whipping also helps as a last resort when you run out of ammo.
However, it's almost always better to use a proper melee weapon instead
of a gun as a pure melee weapon, because you can't power attack with
guns and the guns' melee attack rate are slower by design than most
melee weapons.
Shotguns benefit the most from pistol-whipping, because their ideal
range is close-range where a melee attack can be performed, and their
low fire rate means they're not affected too much by the 0.5s shooting
cooldown.
Guns have received throwing damage. You can throw guns at the enemy once
you're out of ammo to deal extra damage. I think this makes fights a
little more spectacular to watch.
Melee damage sorted by group (from least to greatest):
1. Revolver
2. Pistol (+ Energy Pistol)
3. Sniper rifle
4. Rifle (+ Energy Rifle)
5. Sub Machine Gun
6. Shotgun
7. Light Machine Gun (L6 saw)
8. Heavy Machine Gun
## Media
**mk 58**
**Kardashev-Mosin (Wielded)**
**Basic Combat**
https://github.com/user-attachments/assets/922998d1-0cd0-4fea-8f0b-365bcff3c12b
**Particle Decelerator Combo (80 damage)**
https://github.com/user-attachments/assets/ce62334a-13dd-46d9-9c0e-453e26bf1261
Combo: Shoot + Power Attack, wait 1.6s then Power Attack + Throw
This combo costs 90 stamina which almost depletes 100 stamina leaving
you vulnerable, so the Vigor trait can help you pull off this combo.
## Changelog
🆑 Skubman
- add: Pistol-whipping has been added. You can press right click with a
gun to perform a Light Attack. Most guns will deal Blunt damage, apart
from the Kardashev-Mosin dealing Piercing/Slash damage with its bayonet.
Weaving bullets and melee attacks correctly will give you the upper hand
in combat.
- add: Guns can now be thrown to deal the same damage as their melee
damage.
(cherry picked from commit 5899f4ea5a978ded0362bdf46185f8fbb1a2607c)
* local #1335
* Fix Interact Verb (#1346)
Finally fixed it.
Interact verbs weren't appearing because this is required in BaseMob.
(cherry picked from commit 3e3ca59850f1a21f2bb8e249455d655ec6b63d2c)
* Fix Ripley Hydraulic Clamp (#1344)
# Description
Fix a bug in `MechGrabberSystem` causing the hydraulic clamps in Ripley
to drop items far away.
---
<details><summary><h1>Media</h1></summary>
<p>
https://github.com/user-attachments/assets/d2c8e951-e391-42d7-b45d-78a275dc8bf2
</p>
</details>
---
# Changelog
🆑
- fix: Hydraulic clamps now drop entities correctly
(cherry picked from commit f0e4612612fe18a126cdf47d712b63bc083b5483)
* Automatic Changelog Update (#1344)
(cherry picked from commit 6dcb367adb769f51bcaf1a647a4ca6c886a10be7)
* Salvage Magnet UI and Character Switching Height/Width Bug Fix (#1347)
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->
# Description
<!--
Explain this PR in as much detail as applicable
Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->
i fixed it
also added a button "Connect & Go to Lobby" for people testing lobby
stuff!
Resolves #1131
---
# 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 the bug where switching characters made your width/height
change to incorrect values.
- fix: Fixed the salvage magnet opening ten times.
---------
Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
(cherry picked from commit c4c3e4283ae077fd0f55e4cce31710f31de046f7)
* Automatic Changelog Update (#1347)
(cherry picked from commit 8ff70215d9f6e2a73150b55313333b9d5ca87749)
* Update Credits (#1350)
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 2a7a4719d39b51ffd232c667b1ca49dbce68dce6)
* Fix Bartender Mosin (#1337)
Bartender Mosin was replacing their duffel bag at roundstart.
(cherry picked from commit 3aa430f486dcdf40629468c715092aee0089187c)
* Trait Purchasable Mentalic Powers (#1343)
# Description
This PR adds a few of the "Mentalic" category of psionic abilities to
the Traits System, allowing them to be purchased by any character that
is also a Latent Psychic. These powers are:
- Dispel
- Metapsionic Pulse
- Xenoglossy (Also requires Natural Telepath)
- Psychognomy (Also requires Natural Telepath)
These are all quite expensive, so to help address the "Expensive trait
proliferation", I've increased the points granted by the Blindness trait
to 10. Have fun being a blind wizard. From this point on, we're going to
need to start adding more "High point value" negative traits.
# Changelog
🆑
- add: Dispel, Metapsionic Pulse, Xenoglossy, and Psychognomy can all be
purchased during character creation using trait points.
- tweak: Blindness now grants 10 trait points instead of 6.
(cherry picked from commit acec14d08879ebaf16e5425fccd26d8f066eda55)
* Automatic Changelog Update (#1343)
(cherry picked from commit adddc1df27184f74e5e48e5220e0cd4eeb57084c)
* Pointy Ears For Harpies And Arachne (#1348)
# Description
Like half the art references I have for Harpies have them with elf-like
pointed ears, another half have them with their feather tufts. We have
pointy ears markings, so this PR makes it so that Harpies can have them.
Actually it also gives them to Arachne, for similar reasons(It's an
oddly common thing on Arachne/Lamia art depictions).
# Changelog
🆑
- add: Added a variety of Pointy Ears markings for Harpy and Arachne
characters.
(cherry picked from commit 59a55c9d6ae6772d4ead0e73d5dab7b24c539e53)
* Automatic Changelog Update (#1348)
(cherry picked from commit 99d616953af89462d827fd8ca6e50a92e63e8203)
* Port Cosmatic Drift Arrivals (#1340)
# Description
Done after a lengthy discussion with @OldDanceJacket about mapping
issues, namely the existence of "Walk-In Closets" on maps that take up
an inordinate amount of space that would otherwise be usable for other
purposes. Seriously, Saltern has a 4x6 room that contains >200 medical
uniforms, and is on a map intended only for 15 people(And maximum of 6
medbay personnel). Every map in rotation is like this.
Ostensibly, Loadouts were created to provide a solution to this problem,
by making it so that players choose their DRIP before spawning in, so
that mappers don't need to put in a whole ass room dedicated to medical
uniforms. But Mappers ended up keeping the "Walk-in Closets" even after
Loadouts were introduced to serve as a "Sanity check" in case of events
such as people not choosing their loadouts, or getting hired during the
round by the HoP to work in the medbay, etc. To solve this, me and ODJ
agreed upon adopting Cosmatic Drift's solution to this, by making it so
that the Arrivals Terminal serves as the "Walk-in Closet Hotel" that
every map can just piggyback off of. Nobody needs to make the stupid
closet rooms, on ANY map, because every map is fully guaranteed to have
every closet the players could ever need in arrivals.
# Media
<details><summary><h1>Media</h1></summary>
<p>
Dock
Dorms(Spawn points)
Medbay:
Security
Captain/HOP
Cargo:
Epistemics:
</p>
</details>
# Changelog
🆑
- add: Ported Cosmatic Drift's version of the Arrivals Terminal.
Terminal now includes every version of department clothing and material
lockers that players could ever need, allowing them to try on their
chosen job equipment and drip before departing for the station.
(cherry picked from commit 4509a9d030efb7eb45378824559a3f88c4caf4b4)
* Automatic Changelog Update (#1340)
(cherry picked from commit 9a1cda889a085974f666adb99c753ba4e1392355)
* More Dangerous Mindbreaking (#1249)
# Description
Somehow people weren't getting the memo despite the **HORRIFYING** texts
associated with Mindbreaking, that doing so is an almost comically evil
act akin to murder. So this PR fixes that. By making it even more
obvious.
<details><summary><h1>Media</h1></summary>
<p>
</p>
</details>
# Changelog
🆑
- add: Added a server option for "Scarier Mindbreaking". Mindbreaking
now irreversibly converts a player character into a non-sentient NPC.
- fix: Mindbreaking now only works on Psychics.
---------
Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
(cherry picked from commit 80f83484e9653f159581ea0dfc82d56256e4947c)
* Automatic Changelog Update (#1249)
(cherry picked from commit 4d87be6ea66356156cdac6e7e9cd70af36daae24)
* Redshirt And Brittle Bone Traits (#1352)
# Description
This PR adds two additional "High Value" physical negative traits, to
help address a growing need for more high point value negatives, since
there is also a very large number of high point positive traits. These
two traits are fairly simple, the first is Redshirt, which decreases
your Dead threshold by 100, and Brittle Bone Disease , which reduces
your Crit threshold by 50. Taking both on an ordinary human would give
+18 trait points to work with, but would in turn give a healthbar of
only 50/100, compared with the standard healthbar of 100/200.
# Changelog
🆑
- add: Added Redshirt and Brittle Bone Disease traits. These give
extremely large negative modifiers to your healthbar, but also grant a
large amount of trait points to work with.
(cherry picked from commit 88edcd05aef76acb10e3d0924dd874eef22c7f71)
* Automatic Changelog Update (#1352)
(cherry picked from commit ed0e56aa446ea9ad9ecae1a1a1685438378b1814)
* Jackboots Slowdown Mitigation (PORT) (#1342)
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->
# Description
<!--
Explain this PR in as much detail as applicable
Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->
Ports jackboot slowdown mitigation from [space-wizards
github](https://github.com/space-wizards/space-station-14/pull/30586).
Adds fake version for civilian use.
---
# Changelog
<!--
You can add an author after the `🆑` to change the name that appears
in the changelog (ex: `🆑 Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->
🆑
- add: Added slowdown mitigation to jackboots
- add: Added fake jackboots for style outside of sec
---------
Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
(cherry picked from commit f5d45d790d793acbba7d21258cd206568fe79f99)
* Automatic Changelog Update (#1342)
(cherry picked from commit 03dc85aa7071c70cd9f01392cabf7cb7fb2fa6ac)
* Fix Redshirt & Brittle Bone Traits (#1355)
These were supposed to be negative traits(They give you points), but I
accidentally made them positive traits(They cost points).
(cherry picked from commit ec60940fe5eae5d7d3e969bac132e1da2a659272)
* Example Hub Ad List (#1356)
# Description
this PR extends the list of default advertiser hubs to include every
existing hub except for SSMV(Which is mutually exclusive with the
others). If there are more hubs I have missed, please let me know. This
will allow our servers to appear on as many hubs as possible.
(cherry picked from commit 577126f987ff70ba213f2898ea9e5170b0dc5ea6)
* Saltern Update (#1357)
# Description
I would like to offer my thanks to the Singularity Network Mapping Team
for this update, they've done some great work! This PR launches Saltern
with a significant rework to everything on it except for arrivals.
<details><summary><h1>Media</h1></summary>
<p>
Sorry, Map Renderer is dead right now.
</p>
</details>
# Changelog
Death do NOT change the name given for the Changelog author, the mappers
here have requested that "SiN Mapping Team" be given as the name for
this PR.
🆑 SiN Mapping Team
- add: Saltern has been fully reworked!
(cherry picked from commit a06b4661b08abe6f64460655962b98f4ccb9db07)
* Automatic Changelog Update (#1357)
(cherry picked from commit aab36bfe65d82cff13bb6d8b6a55c2b70a031aa2)
* v237.3.0 (#1354)
the robust toolbox updater!!
https://github.com/space-wizards/RobustToolbox/blob/v237.3.0/RELEASE-NOTES.md
(cherry picked from commit bf1b0d03aede161d62aedfc9166589335a5d7c4c)
* Hotfix Saltern (#1359)
# Description
Small maintenance to do. Bridge needed FixGridAtmos done, and a single
light in dorms needed wiring.
# Changelog
🆑
- fix: Fixed the Saltern bridge being a hard vacuum at roundstart.
(cherry picked from commit 3c1ed56ed3122866b32249006496c37be825c82a)
* Automatic Changelog Update (#1359)
(cherry picked from commit 48413d6a435de700197a4f6ceb1290d61f5130b4)
* Loadouts Debloating (Colorable Items) (#1364)
# Description
This PR cuts down significantly on Loadouts bloat by removing all
specific color versions of colorable items from the loadouts. I left the
original items untouched for compatibility reasons since certain things
in the game still need to be able to spawn a "Blue jumpsuit" etc.
Additionally, to help aid in clarity for players, I've added
localizations for all the generic colorable items so that they have
(colorable) in the loadout names, so that players can tell which items
have the option without needing to click into the customize button on
every item.
<details><summary><h1>Media</h1></summary>
<p>
</p>
</details>
# Changelog
🆑
- add: Added labels to all generic colorable items in loadouts, so that
players can see which items have custom colors as customization options.
- remove: Removed all 'specific color' variants of colorable items from
Loadouts, such as "Blue Jumpsuit" when a colorable jumpsuit exists.
(cherry picked from commit 452b9113f61790e8258b95904361de5ed34a034f)
* Automatic Changelog Update (#1364)
(cherry picked from commit cd5a6f8b5743904dbecbf04e5d70614e4444d149)
* More Colorable Items (#1365)
# Description
This PR adds even more colorable items to loadouts, this time making
entirely new whitescale versions of existing items that did not have one
previously. This replaces several more options for items that had a
whole bunch of specific color entries with a single item that can take
any color.
<details><summary><h1>Media</h1></summary>
<p>
</p>
</details>
# Changelog
🆑
- add: Added colorable variants of fingerless gloves, headbands, berets,
hairflowers, cloth masks, and the neck gaiter.
(cherry picked from commit 0674895a3b6a84c2761eb13c7b5f35bc826fe19c)
* Automatic Changelog Update (#1365)
(cherry picked from commit cc1e52c47c7b27b8da9be5da701580efe42590ca)
* Make the EE Logo Match the Banner (#1361)
# Description
Light mode logo
(cherry picked from commit 35c95a5da3ccb7d23620eaa1aad43022be3d6673)
* Loadout Modular Functions (And Loadout Pets) (#1366)
# Description
This PR implements a reflection based system for applying functions
directly to entities spawned by loadouts. In order to provide an
"Example" use of this system, I have created a "LoadoutMakeFollower"
function, which can be applied to a loadout entity that happens to be an
NPC with the Follower blackboard, making it follow the player who
purchased that loadout.
Basically. Pet mouse. The pet mouse will follow its owner.
Yes I actually have tested this ingame, and it works great. The longest
part about coding this was me spending almost 30 minutes straight
wondering why the mouse wasn't following my character, until I
remembered that I had to make a special "Pet" mouse variant that had the
right HTN root task.
This could be extended to other things. I happen to know that Nuclear14
wanted something like this for a Pet Dog.
<details><summary><h1>Media</h1></summary>
<p>
</p>
</details>
# Changelog
🆑
- add: Loadouts can now apply modular functions to items upon spawning
in.
- add: A new LoadoutMakeFollower function, which lets you buy NPC
followers in loadouts.
- add: added Pet Mice, Cockroach, Mothroach, and Hamster to Loadouts.
All of which use the new LoadoutMakeFollower function.
Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
(cherry picked from commit 311b86e012ac7d40363b5027ab51b09c9d2285e2)
* Automatic Changelog Update (#1366)
(cherry picked from commit 18a751d5c3d53cd4ff36728dd585ada37e9175b9)
* Plushies! (#1369)
<!--
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]?
-->
Added two new plushies to the game! A harpy plushie and a plushie for
the beloved station pet Morty!
---
# 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: two new cuddly friends to the station! (harpy and morty plush)
---------
Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
Co-authored-by: juniwoofs <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>
Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
(cherry picked from commit 6fb12233d48de476c2b06415031fa2e9c9a1d327)
* Automatic Changelog Update (#1369)
(cherry picked from commit 5293b92007f7ca81375d9806cccf9be38846c8d3)
* Traits System Anticheat (#1358)
# Description
It turns out that there was no system in place for serverside fact
checking of whether or not people have a legal traits list. Last night a
bug was reported whereby a player used Cheat Engine to give himself
every trait in the game, bypassing the points system entirely. It's not
actually possible to reduce a trait selection down to a legal list
without creating interesting race conditions, which limits my options on
how to deal with it.
So I made it a vote on the Einstein Engines discord, and the vote was
unanimous. PUNISH THE CHEATERS.
<details><summary><h1>Media</h1></summary>
<p>
https://www.youtube.com/watch?v=X2QMN0a_TrA
</p>
</details>
# Changelog
🆑
- add: Implemented Anti-cheat for Traits. Attempting to join a round
with an illegal traits list will result in hilarious consequences.
(cherry picked from commit 2fc1f25bc0daa29e2017490adbdf41f9db4f4927)
* Automatic Changelog Update (#1358)
(cherry picked from commit 9d738c8f36c0762e0ba3942fb26ef25735ade327)
* Make Prisoner Not Shitter Role (#1341)
# Description
Prisoner is consistently the most problematic role in this entire game,
being seen as "The Self Antagging Role", which produces endless amounts
of administrative burden. This is especially a problem with lowpop
servers, or servers that are understaffed with admins. Players just join
as Prisoner, *immediately* break out of the permabrig, and then go on a
self antagging spree. The solution to this was staring us in the face
the whole time. Just give them the same Pacified component that the
Thief antag has. Now it's impossible for them to smash the permabrig
windows, someone has to intentionally let them out, and even if they do,
they will be hard pressed to selfantag when they can't turn on harm
intent.
# Changelog
🆑
- add: Prisoners now spawn with a Pacifier Implant.
(cherry picked from commit 7f8d76ea6f63d334c894fc0f7ada6fd1359408f1)
* Automatic Changelog Update (#1341)
(cherry picked from commit 68cb9ea4888c16056c6cfe9fea17de1a78420374)
* Fix Jittering (#1334)
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->
# Description
<!--
Explain this PR in as much detail as applicable
Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->
Title.
Ported from https://github.com/Fansana/floofstation1/pull/393
Resolves #1277
---
# 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 jittering displacing your character when shaken.
(cherry picked from commit a13d9640ec77e07b532b729ac540dc95b689c557)
* Automatic Changelog Update (#1334)
(cherry picked from commit bfb32cf24eda47ff3dbd5d4b15b58e25ae597947)
* Basic Soft-Crit Implementation (#1370)
# Description
This PR adds a simple server configuration option for enabling basic
"Soft-Crit", and not much else because oh my god this system is horribly
complicated. When enabled, characters can crawl around very slowly while
in crit, and really not much else. This more or less mirrors how crit
affects character movement in SS13, where you can at least crawl to
relative safety while bleeding to death.
# Changelog
🆑
- add: Added server config options for basic "Soft-Crit". When enabled,
characters who are critically injured can still slowly crawl, but are
otherwise still helpless and dying.
(cherry picked from commit dff8c69f2afff6714b893a7c9572a84bd384ff89)
* Automatic Changelog Update (#1370)
(cherry picked from commit 9430b9046a9a40cc2f96bb3c66251aabbaf9e80a)
* local upstream
* Revert "Make Prisoner Not Shitter Role (#1341)"
This reverts commit
|
||
|
Spatison
|
2fd69f53e3 |
[Fix] Mass Bug Fix (#130)
* Mass Bug Fixing (#1256)
<!--
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]?
-->
Mass bug fixing, for bugs related to #1220.
Feel free to link or send bugs.
Fix list:
- #1242
- #1243
- #1244
- https://github.com/space-wizards/space-station-14/pull/28084
- https://github.com/space-wizards/space-station-14/pull/28282
- Actually fixed PirateRadioSpawnRule heisentest (with a bandaid) (I
cancel if it's 0)
- https://github.com/Simple-Station/Einstein-Engines/issues/1263
---
# 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 chair visuals drawing depth wrongly if you sat in a
north-facing chair.
- fix: Fixed buckling doing several buckles each time you did one.
- fix: Fixed the magic mirror.
- fix: Fixed beds re-positioning you every few seconds.
- fix: Fixed E not opening containers that are in another container.
- fix: Fixed disposal systems not flushing or ejecting properly.
---------
Co-authored-by: sleepyyapril <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>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
(cherry picked from commit 41501bd335c5e1e2e65b5d2ad040a3ae6851d4e8)
* Automatic Changelog Update (#1256)
(cherry picked from commit 9798f5363135cbe71479d0a14cf3215d01ed28f0)
* fix
* Fix animation looping bugs. (#29457)
Summary of the problem is in the corresponding engine commit:
|
||
|
Remuchi
|
cebab3b3f6 |
[Upstream] Upstream. Yappie (#50)
* Fix Prize Balls' Pet Rock (#831)
# Description
This PR fixes an undetected bug in Prize Balls where an error would
occur if a prize ball tried to give out a BasePetRock.
---
No CL No Fun
Signed-off-by: ShatteredSwords <135023515+ShatteredSwords@users.noreply.github.com>
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
* More/Better Tips (#844)
# Description
This PR adds several new Tips that are specific to Einstein-Engines. I
also removed some tips that are completely irrelevant to the game. These
should be as a whole, relevant only to SS14 and Einstein Engines. While
some joke tips are probably fine, they should still be game relevant.
# Changelog
🆑
- add: Several new tips have been added to the game, many of which
reference new content available on Einstein-Engines.
---------
Signed-off-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
* Automatic Changelog Update (#844)
# Conflicts:
# Resources/Changelog/Changelog.yml
* Fix some Things with Interaction Verbs (#854)
# Description
Fixes:
- Interaction verbs being usable regardless of whether the user can
access the target (I checked for CanInteract but not CanAccess 😭), which
fixes #836
- Certain close-range verbs having a ridiculous 2-tile range (now it's
1.2, similarly to hugging and other things)
- Certain locale strings missing
This also separates verb checks into its own method in the interaction
verb system and adds more error messages instead of one generic "some
requirements are not met".
# Changelog
🆑
- fix: Fixed a couple issues with the new interaction verb system.
* Automatic Changelog Update (#854)
* Fix Colored Jumpskirts Actually Being Skirts (#848)
# Description
This matters for Birbs. All Colored Jumpskirts were incorrectly parented
to Jumpsuit and not Jumpskirt, meaning that Harpies couldn't wear them.
This fixes that issue.
# Changelog
🆑
- add: Due to NUMEROUS complaints, NanoTrasen has swapped the sticker
labels on all colored jumpskirts to correctly state that they are
infact, "Skirts", so now they can legally be worn by Harpies, Lamia, and
Arachne.
* Automatic Changelog Update (#848)
* Ports Trait Rebalance From Floof (#842)
# Description
This PR ports my trait balance changes from Floof. You can find the PR
for that repo at https://github.com/Fansana/floofstation1/pull/170.
---
# Changelog
🆑
- tweak: The cost of many traits have been updated
- tweak: A few traits have been tweaked
---------
Signed-off-by: ShatteredSwords <135023515+ShatteredSwords@users.noreply.github.com>
Co-authored-by: Fansana <116083121+Fansana@users.noreply.github.com>
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
* Automatic Changelog Update (#842)
* Roboticist (#801)
# Description
By a (somewhat) popular request from floofstation, this adds the
roboticist job (each existing map gets 1 job slot, since robotics on
each of them is just one tiny room that's more similar to a broom closet
than a subdepartament).
The job is purely cosmetical and does not offer any new accesses since
that would require changing a lot of maps and would probably make being
a scientist in the absense of a roboticist miserable. If needed,
roboticists can always build blast doors on the entrance to robotics, as
someone has done before in my experience.
This also adds the robotics PDA, robotics ID card, robotics satchel,
backpack, and duffel (duffel icon taken from paradise station, rest of
the sprites is respective science bags recolored by me to match the
palette of the icon). This also increases the capacity of mystagogue's
science PDA box to incorporate the new PDA type.
<details><summary><h1>Media</h1></summary>
<p>
</p>
</details>
---
# Changelog
🆑
- add: A new Roboticist job has been added. The job does not offer any
new accesses, but lets you distinguish yourself from scientists.
Existing maps will need to be updated to support the new job.
- add: Added new PDA, ID, and bag variants for roboticists. The
mystagogue will now also find a roboticist PDA in their office.
---------
Signed-off-by: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com>
* Automatic Changelog Update (#801)
* Loadouts V3 (#736)
# Description
Resolves #723
Resolves #708
Resolves #691
Resolves #671
Resolves #643
Adding/removing loadouts and categories (and trait stuff) will require
disconnecting and reconnecting to the server (or anything that will
reload the lobby UI) due to how I've done my caching.
---
# TODO
- [x] Test entity IDs from loadouts
- [x] Better Tab Container
- [x] Scroll props
- [x] Margin props
- [x] Make vertical work
- [x] Merge buttons
- [x] Subcategories
- [x] Allow the same for traits (their tab is completely broken)
- [x] Give the Job Picker tab a BoxContainer
- [x] Different selected unusable color
- [x] Deselect unusable button
- Sort menu/Reverse sort direction button
- [x] Fix scroll resetting on updating
- [x] Cache loadouts
- [x] Ensure everything that can affect reqs updates everything that
checks reqs
- [x] More Requirements
- [x] Height
- [x] Width
- [x] Weight
- [x] Gender
- [x] Sex
- Markings
- [x] Logic
- [x] And
- [x] Or
- [x] Xor
- [x] Item groups
- [x] #643
- Something better than `Exclusive`
- Allow picking slots for things to go in (hands and inventories too)
- [x] Add a background to the loadout spriteView
- [x] Get better style colors
---
- [ ] More PRs
- [ ] Remove duplicate command loadouts that are outside the command
folders/categories
- [ ] Categorize job loadouts (By dept?)
- [ ] Fix [every
loadout](https://discord.com/channels/1218698320155906090/1218698321053356060/1279260210208440361)'s
IDs (who reviewed them??)
- [ ] Make loadout ID migrations?
---
<details><summary><h1>Media</h1></summary>
<p>
## New loadouts/traits UI
<!--
-->
## NeoTabContainer allows changing the tab orientation
### https://youtu.be/krg8TJoQG3I
</p>
</details>
---
# Changelog
🆑
- fix: The loadout/trait editors' performance has been improved by
100~1000x
- tweak: The character editor's tabs look, feel, and function much
better
- fix: Unusable loadouts/traits have an orange color when selected
- tweak: Loadout previews are now inside the button
- add: Added a button to remove any unusable loadouts (or traits) you
have selected
- add: Loadouts and traits can have subcategories, though only Command
loadouts use them at the moment
- fix: Fixed empty loadout categories not hiding
- fix: Fixed spacing on some loadout requirements' reason text
- fix: Fixed traits not updating after saving
# Conflicts:
# Content.Shared/Customization/Systems/CharacterRequirements.Profile.cs
# Resources/Locale/en-US/customization/character-requirements.ftl
# Resources/Prototypes/Loadouts/Jobs/service.yml
* Automatic Changelog Update (#736)
* Fix For Discord Changelog (#869)
Signed-off-by: Evgencheg <73418250+Evgencheg@users.noreply.github.com>
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
* Civilian Uniform Loadout Group (#872)
# Description
I'm going to split the other groups into their own PRs, next up is
Shoes. This PR adds all of the "Civilian" uniforms to the first of what
will be many new Loadout Groups, and now takes the opportunity to
significantly cut down on the loadout point costs of all non-job
uniforms. Now the overwhelming majority of them are 0 or 1 point, with
rare few examples being only 2 points. The tradeoff for this is that you
are limited to a single selection of civilian uniforms to take with you
to the station, presumably in addition to your job uniform as a spare
outfit, if desired.
Next up, shoes.
<details><summary><h1>Media</h1></summary>
<p>
https://github.com/user-attachments/assets/47804a59-189d-4432-bac9-0b010c50f61e
</p>
</details>
---
# Changelog
🆑
- add: The first of all new loadout groups has been added, Civilian
Uniforms. Only one civilian uniform can be selected, in exchange for...
- tweak: All non-job specific uniforms have had their points reduced
drastically, almost all of them down to 0 points, with only a tiny
handful at 2 points, and the rest as 1.
---------
Signed-off-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
* Shoes Loadout Group (#873)
# Description
This is the next PR after
https://github.com/Simple-Station/Einstein-Engines/pull/872
This time adding an item group for Shoes, and drastically cutting down
on the base cost of shoes to compensate.
# Changelog
🆑
- tweak: The cost of all shoes in loadouts has been reduced, in most
cases to 0.
---------
Signed-off-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
* Hat Loadout Group (#876)
# Description
Cheaper Hats
# Changelog
🆑
- tweak: All non-job specific headgear has been significantly reduced in
Loadout point costs, most of them to 0.
* Outerclothes Loadout Group (#877)
# Description
And now Outerwear. :)
# Changelog
🆑
- tweak: All non-job outerwear has had their Loadout point costs
significantly reduced.
* Gloves Loadout Group (#878)
# Description
Gloves Next. Woo.
# Changelog
🆑
- tweak: All gloves have had their Loadout point costs reduced, many to
0.
* Miscellaneous Item Groups (#880)
# Description
This is the last of the Loadout Item Group PRs I'm going to do for now.
This PR adds several more than the previous ones, primarily to split up
the Items tab into several distinct groups so as to push down the costs
of many items. In particular, the new groups are:
1. Smokes
2. Lighters
3. Instruments
4. Air tanks
5. Box Kits(Survival Boxes or Medkits)
6. Writables
Survival boxes sharing an Item Group with Medkits is kind of intentional
here. Both of them take up a SIGNIFICANT amount of your starting
inventory space. Now we can have free survival kits once again, but also
have as an option, where you can elect to spend some of your loadout
points to take a personal Medkit instead of a survival box. You can
think of it as an upgrade over a standard survival kit. :)
# Changelog
🆑
- tweak: Item groups for Smokes, Lighters, Instruments, Air Tanks,
SurvivalBoxes/Medkits, and Writable items have been added. All items in
these categories have received discounts to their costs, and in some
cases have become free.
# Conflicts:
# Resources/Prototypes/Loadouts/items.yml
* Neck Loadout Group (#874)
# Description
And another one! This time Neck slot items. Sequel to
https://github.com/Simple-Station/Einstein-Engines/pull/872
# Changelog
🆑
- tweak: All neck slot Loadout items have had their costs significantly
reduced, most of them to 0.
---------
Signed-off-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
* Automatic Changelog Update (#872)
* Automatic Changelog Update (#874)
* Eyewear Loadout Group (#879)
# Description
Now for Eyes...
Last one to do is split apart the "Items" tab.
# Changelog
🆑
- tweak: Eyewear have had their loadout point costs significantly
reduced.
---------
Signed-off-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
* Masks Loadout Group (#875)
# Description
Yet another sequel to
https://github.com/Simple-Station/Einstein-Engines/pull/872
This time Masks
# Changelog
🆑
- tweak: All masks have had their loadout point costs substantially
reduced.
---------
Signed-off-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
* Automatic Changelog Update (#879)
* Automatic Changelog Update (#875)
* Update discord-changelog.yml (#881)
Signed-off-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
* Revert "[Feature] Short Construction System / Система Крафтов В Руках (#17)"
This reverts commit
|
||
|
Debug
|
330e0e37d9 |
*Properly* fix salvage strings (#840)
Me when the maps |
||
|
metalgearsloth
|
4c7ca09c9b |
Biome marker layer tweaks (#23663)
* Biome marker layer tweaks - Ensure veins get spawned at great perf cost (it's time-sliced anyway). - Bump asteroids from 6 nodes to 10 nodes. * Fixes * magnet * Magnet dictates wreck spawn * Update Content.Shared/Procedural/PostGeneration/BiomeMarkerLayerPostGen.cs * mraow (cherry picked from commit d7eb7b700c72a7aa56e6bb2181ed5cd622f04a83) |
||
|
metalgearsloth
|
f128143d13 |
Salvage magnet revamp (#23119)
* Generic offering window * More work * weh * Parity * Progression meter * magnet * rona * PG asteroid work * code red * Asteroid spawnings * clams * a * Marker fixes * More fixes * Workings of biome asteroids * A * Fix this loading code * a * Fix masking * weh * Fixes * Magnet claiming * toe * petogue * magnet * Bunch of fixes * Fix default * Fixes * asteroids * Fix offerings * Localisation and a bunch of fixes * a * Fixes * Preliminary draft * Announcement fixes * Fixes and bump spawn rate * Fix asteroid spawns and UI * More fixes * Expeditions fix * fix * Gravity * Fix announcement rounding * a * Offset tweak * sus * jankass * Fix merge (cherry picked from commit bf79acd127483d64f96dc23f2e64c74ceb84303d) |
||
|
metalgearsloth
|
b1c988627a | Expeditions rework (#18960) | ||
|
TemporalOroboros
|
3ac4cf85db | Cleaner BoundUserInterfaces (#17736) | ||
|
deltanedas
|
9cd8d25ae7 |
more expedition changes (#17403)
Co-authored-by: deltanedas <@deltanedas:kde.org> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> |
||
|
metalgearsloth
|
1485666a23 | Ambient music fixes (#17685) | ||
|
deltanedas
|
a3c37edd69 |
use parts crates for rewards, show rewards in ui (#17374)
Co-authored-by: deltanedas <@deltanedas:kde.org> |
||
|
metalgearsloth
|
0ebcba370f | Expeditions QOL (#15599) | ||
|
metalgearsloth
|
122350f19c | Salvage expeditions (#12745) | ||
|
metalgearsloth
|
6157dfa3c0 | Salvage dungeons (#14520) |