Merge Upstream #56
Merged
Merge Upstream #56
+27,094
−13,113
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Adds a way to specify traits in the jobs special area.
Hashset so you can specify multiple traits. Tested on Nuclear14 to give
the tribals a specific language in a friendly way.
```
special:
- !type:AddTraitSpecial
traits: [ LanguageTribal, LanguageChinese ]
```
# Description This fixes the Job IDs that show in the time transfer panel because the users that added them did not add the FTL for them to be named in game. --- # Media Images are broken up by their respective showings. <details><summary><h3>Job Icon Images</h3></summary> <p>    </p> </details> <details><summary><h3>Nanotrasen Representative Stamp</h3></summary> <p>  </p> </details> --- # Changelog :cl: - fix: Fixed the NTR Stamp Texture on Paper - fix: Fixed name of Senior Officer, CBURN, and Deathsquad.
<!-- 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]? --> Check the changelog for the full list. --- # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - add: Added Holopads (unmapped) - add: Intellicards are now useful for removing/adding a Station AI's brain. - add: Added the Communications Console to Station AI actions. - add: AI now has a warp point. - add: Added more things for the AI to press. - add: More AI laws have been added. - fix: Fixed the mail system - fix: Fixed AI actions - fix: Fixed invalid spawns for station AI breaking and ruining your ability to play it. - fix: The Station AI's name will now properly send in "arrived to the station" announcements. - fix: Changed the CPR sound to simply not loop until fixed. - fix: Fixed unlocalized messages being sent for the random sentience event. --------- Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: ScarKy0 <[email protected]> Co-authored-by: Zachary Higgs <[email protected]> Co-authored-by: MendaxxDev <[email protected]> Co-authored-by: chromiumboy <[email protected]> Co-authored-by: slarticodefast <[email protected]>
This does cause it to warp onto the wrong airlock (at arrivals), but that's a map issue. (Yes, I tested it) # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - fix: Fixes arrivals destroying all nearby doors/walls/etc. --------- Co-authored-by: Plykiya <[email protected]> Co-authored-by: MilenVolf <[email protected]> Co-authored-by: Gansu <[email protected]> Co-authored-by: aa5g21 <[email protected]> Co-authored-by: metalgearsloth <[email protected]>
Co-authored-by: Pieter-Jan Briers <[email protected]>
* Added checks to not target AIs and people in containers * made the change to use IsEntityInContainer. Much Better! * returned old Mindquerry and removed wrong use of admin logger * guard statment * removed unnecessery refs and fixed position swap * Minor change --------- Co-authored-by: metalgearsloth <[email protected]>
Layout would break for machines with >6 lights because the column count was hardcoded. Uncap the UI width and fix the rows count instead. Lights with less than 4 characters of text weren't aligned right, now they are.
* allow ai to understand if its handcuffed. * rerun tests they worky on local * Contained here in, a string of expletives about flaky tests. * on retrospect, default true is probably smorter. * do reviews * I forgor xml * more xml
Reordered MeleeCombatCompound to improve unpulling
* ai stays seated while cuffed. * Do the thing I thought was dumb.... whatever. * less than
* FINALLY * Update animals.yml
* Add IsNullOrEmpty checks before indexing KnownSubnets * actor
* remove ItemToggle from PowerCellDraw query * add EntityQuery for resolves, make them all optional * move integration to ToggleCellDraw * add ToggleCellDraw to almost every PowerCellDraw prototype **
* ItemToggle + slots stuff - Add component for itemslot locks to match LockComponent (surprised this didn't exist). - Add thing for pointlight to match itemtoggle. In future should be used for PDAs and stuff but need to fix some other stuff first. * Also this * grill
fix energy shield visuals
* Update MoverController.cs * Update a bunch of movement code to use Entity<T> * Last errors * wow, there were more errors --------- Co-authored-by: plykiya <[email protected]>
* PDA can no longer be linked to multitool * Ignore previous commit, it would've broken things * Added SavableAddress field to DeviceNetwork component and PDA for testing. Still need to implement * System works, borg and pda addresses cannot be saved, but they still connect to the net. * Suit sensors can no longer be added to network configurators, still work for monitoring purposes. --------- Co-authored-by: Zachary Yona <[email protected]>
Fixes several issues alongside some console errors. Also refactors MoverController to use Entity<T>. Not specified changes: - Fixes the SurveillanceCamera console error. - Fixes the ItemToggleComponent for PDAs console error (hopefully) - Fixes the NPCSteeringSystem error. - Fixes the random bark error. # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - tweak: Outer clothing will now count as partial identity coverage. - fix: Fixed portal artifacts targeting the Station AI. - fix: Fixed job titles not showing up in various announcements. - fix: Ported some general mob AI fixes. - fix: Fixed energy shield visuals.
# Description Reworks the Martial Artist trait, making it a more impactful and visually distinct trait. - Left-clicks are now single-target power attacks, requiring less aim than before. - **50%** damage bonus reduced to **20%** damage bonus (same overall DPS with next change). - Gain **25%** attack rate bonus. - The attack rate bonus helps make the trait feel and look distinct from non-Martial Artist melee attacks. - **50%** range bonus reduced to **10%** range bonus. - The damage bonus is now also applied to Asphyxiation and Poison damage, which Lamia unarmed attacks deal. - Trait cost increased from **-3** points to **-5** points. - Striking Calluses (which requires Martial Artist) cost reduced from **-4** points to **-3** points to prevent the Martial Artist/Striking Calluses combo from being too expensive. The combo used to cost **-7** points, now it is **-8** points. The reworked Martial Artist trait is also given to the Boxers, Martial Artists and Gladiators. Also reverted some wizmerge messery that messed up the melee attack rate **again**, and messed up pistol whipping by making the cooldowns of gunshots and melee attacks intertwined. Also while we're at it, Natural Weapons Removal has been disabled for all species whose damage is pure Blunt, including Diona, Dwarf, Arachne and IPC. (IPC have 6 blunt so the trait would literally be a 0-point negative trait for them) ## Technical Details A new trait function has been added for Martial Artist: `TraitModifyUnarmed`, which modifies the player entity's `MeleeWeaponComponent`. The Claws, Talons, Natural Weapon Removal, and Striking Calluses traits have also been refactored under the hood to use `TraitModifyUnarmed`, instead of replacing `MeleeWeaponComponent` which would wipe out all the changes made by the Martial Artist trait. ## Media ### New Description  ### Martial Artist In Action https://github.com/user-attachments/assets/7890aac2-2c74-4abd-be9f-b28c2922c865 ### Striking Calluses New Description  ### Natural Weapons Removal New Description  # Changelog :cl: Skubman - add: Martial Artist Rework: Martial Artist now costs 5 points, but it turns all unarmed melee attacks into single-target power attacks, with 20% bonus damage, 25% bonus attack rate and 10% bonus attack range. - tweak: The reworked Martial Artist trait is now given for free to Boxers, Martial Artists, and Gladiators. - tweak: Martial Artists (the job) and Gladiators can now select the Striking Calluses trait. - tweak: The Martial Artist trait now applies bonus damage to the Lamiae's unarmed Asphyxiation and Poison damage. - tweak: The cost of Striking Calluses has been reduced from 4 points to 3 points. - fix: Fixed a bug where slow weapons were fast and fast weapons were slow. - fix: You can pistol whip (right-click melee) immediately after firing a gun again, and the cooldown on firing the gun after pistol whipping is always 0.528 seconds again. - fix: Prevented Dionas, Arachnae and IPCs, who all have pure Blunt damage from selecting the redundant Natural Weapons Removal trait.
<!-- 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 frequencies to handheld radios. Ports [this PR](new-frontiers-14/frontier-station-14#1833) with changes.  --- # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - add: Added handheld radio frequencies, accessible by pressing your "Use Item" key while holding one. --------- Co-authored-by: Whatstone <[email protected]>
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> This PR adds credits for lobby screens, the same as lobby songs have. This works by adding `name` and `artist` to the LobbyBackground prototype and storing the prototype rather than just the path to the texture. --- <!-- 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 `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - add: Added credits for lobby screens. --------- Signed-off-by: VMSolidus <[email protected]> Co-authored-by: VMSolidus <[email protected]>
# Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: sleepyyapril, Stop-Signs, Memeji - add: Changed the Warden suit's capabilities. (Original author: Stop-Signs) - add: Repeater, Argenti, and 45 magnum rubber box to Bartender's loadout. - add: Red cloak to loadout (Port from Floof PR #390) - add: Witch Robes to loadout (Port from Floof PR #390) - add: Sawed-off PKA (Port from Floof PR #390) - add: The ChemMaster now has 20, 75, and 80 unit options available. - tweak: Made the ChemMaster wider. - fix: Ported Frontier fix to mag visuals on specific guns. - fix: Fixed heirlooms flickering negative mood when the moodlet ended. --------- Signed-off-by: Stop-Signs <[email protected]> Signed-off-by: sleepyyapril <[email protected]> Co-authored-by: Stop-Signs <[email protected]> Co-authored-by: FoxxoTrystan <[email protected]> Co-authored-by: Radezolid <[email protected]> Co-authored-by: ErhardSteinhauer <[email protected]> Co-authored-by: VMSolidus <[email protected]>
# Description Adds Facial Hair to IPCs. They already have hair and human-like heads like the Zenghu, Ward-Takahashi and Bishop Cybernetics heads, so I think it makes sense to give them facial hair too. ## Media   ## Changelog :cl: Skubman - add: IPCs can now wear Facial Hair.
# Description Just because I can. I've added requirements to every firearm available in Loadouts, and added a minimum character age requirement to them in order to make them consistent with Space Law(Biesel Republic Law). # Changelog :cl: - add: In order to comply with Biesel Republic laws governing firearm ownership, all firearms now require that a person be 21 years of age or older to purchase.
# Description Adds an alternative set of Bunny Ears and Bunny Tail markings for humans as part of the Kemonomimi markings set, which comes from the bunny ears item. ## Media     ## Changelog :cl: Skubman add: Humans have received alternative bunny ears and bunny tail markings that look the same as the bunny ears from the AutoDrobe, but color-customizable.
# Description
Fixes the attack values of mining weapons which were messed up in the
Wizmerge.
For the pickaxe, I reverted all damage values to be the same as before.
For the mining drill however, I opted to keep the rapid fire rate
because it was an interesting effect and just added the extra range from
pre-wizmerge and the throwing damage back. I also **greatly reduced the
mining drill's stamina cost** because it was a common complaint among
players.
Before the wizmerge, the mining weapons (pickaxe and drill) were in
`Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml` but
they got moved to
`Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml` and
thus the EE-specific changes got wiped.
Also fixes a subtle bug in `SharedMeleeWeaponSystem.OnMeleeSelected`,
responsible for resetting the cooldown of a melee weapon upon selecting
it, that treated attack rate as attacks per second as opposed to seconds
per attack :
```diff
private void OnMeleeSelected(EntityUid uid, MeleeWeaponComponent component, HandSelectedEvent args)
{
...
- var minimum = curTime + TimeSpan.FromSeconds(1 / attackRate);
+ var minimum = curTime + TimeSpan.FromSeconds(GetAttackRate(uid, args.User, component));
if (minimum < component.NextAttack)
return;
component.NextAttack = minimum;
DirtyField(uid, component, nameof(MeleeWeaponComponent.NextAttack));
}
```
Bug above was particularly noticeable for weapons with a very fast
attack rate like the mining drill and north stars, which caused the
`NextAttack` delay on select to be 4 seconds instead of 0.25 seconds.
Another subtle issue, the Goliath's attack rate field was `0.75` but the
field was set from Wizden and means attacks per second, not seconds per
attack so I changed it `1.33`.
## Media
**Pickaxe**
<img width=300px
src="https://github.com/user-attachments/assets/8bf1290e-6506-4ac8-9b8b-2bb23a2013b6">
**Mining Drill**
<img width=300px
src="https://github.com/user-attachments/assets/2f852a29-7b58-4e33-8264-67bab87254fd">
**Diamond Tipped Mining Drill**
<img width=300px
src="https://github.com/user-attachments/assets/750fa019-17dc-4d21-900c-88526c873771">
**Mining with Mining Drill**
https://github.com/user-attachments/assets/a9822ccb-c991-4341-a076-fd89a8689e0c
## Changelog
:cl: Skubman
- fix: The mining drill now has a fast fire rate and extra range again.
- fix: The pickaxe and the mining drill can now be used as throwing
weapons again.
- fix: Fixed a bug where selecting weapons with a fast attack rate took
a few seconds before you could attack with them.
- fix: Fixed the Goliath attacking too fast.
- tweak: The power attack stamina cost of mining drills has been reduced
to 0.7 stamina.
- tweak: Re-adjusted the damage of the pickaxe.
# Description This adds the Magistrate to the role list of Central Command VIPs. This also splits up the Central Command VIPs into their own department named "Dignitary" for the purpose of making it clear that Central Command VIPs are above Command and should be responding to orders from Central Command. --- # TODO Lots of stuff to do here, mostly just transferring Chief Justice's loadout to also work for Magistrate (most of it). I'll also list the basics I've done as well. ### Magistrate-Specific - [x] Add Magistrate-only Access (for locker). - [x] Add Magistrate Job, Job Icon, and PlayTimeTracker - [x] Add Magistrate clothes (ported from PS13) - [x] Add Magistrate job spawner. - [x] Add Magistrate Locker Teleporter and Locker. - [x] Add Magistrate Contents to Locker. - [x] Add Magistrate loadout (Chief Justice included). - [x] Add Magistrate stamp and stamped icon. ### Dignitary Department - [x] Add Dignitary Department. - [x] Put Magistrate, Blueshield Officer, and Nanotrasen Representative in Dignitary. - [x] Add FTL for Dignitary. - [x] Put Dignitary above Command. ### Map Stuff - [x] Add Magistrate job spawners to maps. - [x] Add a Centcom Wintercoat to NTR and Magistrate on the Glacier map.\ ### Extras/Fixes - [x] Add winter coats for Magistrate and NanoRep on Glacier. - [x] Fix the category grouping FTL for NTR and BSO. --- # Media <details><summary><h3>Lobby/Customization Screenshots</h3></summary> <p> Jobs Listing  Category Grouping  </p> </details> <details><summary><h3>Items/Clothes/Entities</h3></summary> <p> Stamps (Stamp shows the same in the spawn menu)  Magistrate Robes  Spawner & Magistrate Robes  Access List  PDA Crew Manifest  Lockers with Teleporter  Locker with Contents (from Teleported Locker)  </p> </details> <details><summary><h3>Map Spawners</h3></summary> <p> Arena  Asterisk  Core  Edge  Europa  Gaxstation  Glacier (Winter Coats for NTR and Magistrate as well.)  Hammurabi  Hive  Lighthouse  Meta  Pebble  Radstation  Saltern  Shoukou  Submarine  Tortuga  </p> </details> <details><summary><h3>Misc. Minor Fixes</h3></summary> <p> Chief Justice Access  Category Groupings (BSO AND NTR)   </p> </details> --- # Changelog :cl: - add: Added Magistrate role. - add: Added Dignitary Department. - add: Added winter coats for NTR and Magistrate on Glacier Spawn. - tweak: Moved Blueshield Officer and Nanotrasen Representative to Dignitary Department. - fix: Fixed the category groups identifier for BSO and NTR in Loadouts. - fix: Fixed Chief Justice tag in ID Card Computer. --------- Co-authored-by: sleepyyapril <[email protected]>
# Description Adds new attributes to Vigor and Lethargy to catch up with the recent traits: Vigor: - Still has +10 stamina - Now increases stamina regen per second from 3 to 3.6 - Time to regenerate 50 stamina: ~13.8 seconds - (As a reference, the base time to regenerate 50 stamina with 3 regen is ~16.6 seconds) - Now reduces the delay of stamina regen after stamina damage from 3 seconds to 2.25 seconds Lethargy: - Still has -15 stamina - Now decreases stamina regen per second from 3 to 2.4 - Time to regenerate 50 stamina: ~20.8 seconds - Now increases the delay of stamina regen after stamina damage from 3 seconds to 3.75 seconds As a bonus change to be consistent with the traits, Onis and Felinids now have their stamina regen scaled precisely with their non-standard stamina points, such that the time where they regenerate all their stamina is the exact same. Onis have (3 * 1.15) 3.45 stamina regen, and Felinids have (3 * 0.85) 2.55 stamina regen. ## Why / Balance Vigor/Lethargy was one of the traits designed early in Einstein Engines' lifetime. For better or for worse, Vigor has been powercreeped by several traits in the same cost bracket:  Why get a +10 stamina stat increase when for the same points you can either have a constant source of power attacks (Martial Artist), traverse difficult terrain faster (Parkour Training), or have a constant 10% armor (Dermal Armor)? Adding faster stamina regen could mean more stamina for Power Attacks in prolonged fights, and being able to recover from stamina slowdowns faster, escaping bad situations more efficiently. This makes Vigor more or less up to par with the new traits. ## Media **New Vigor Description**  **New Lethargy Description**  ## Changelog :cl: Skubman - add: The Vigor trait now has additional effects! Aside from increasing stamina, Vigor now increases stamina regen per second, and reduces the delay of stamina regen after taking stamina damage. The opposite effects have been added to the Lethargy trait. - tweak: The Oni species now has slightly increased stamina regen, and Felinids decreased stamina regen.
…ngines into mergeupstream
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.