Station AI, Nanotrasen Representative, Administrative Assistant and Blueshield #151
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
# Description this ports the following PRs: TheDenSS14#128 TheDenSS14#133 TheDenSS14#135 TheDenSS14#143 Essentially, this PR adds several new "Civilian Grade" firearms to the game that come from Frontier, most of which use the new LightRifle cartridge, a fairly underpowered round. Security can take the new Argenti revolver in their loadouts, while Salvage can spend their Mining Points on the civilian rifles. Notably, the ones purchased in the Mining Vendor do not come with ammo. Salvage needs to go request ammo from Security, or a traitor salvage can emag the cargo autolathe to get ammo for them. I'm going to laugh my ass off the first time a Warden has to deal with Salvage specialists coming to ask "Hey can you print me ammo for my MOSIN?" <details><summary><h1>Media</h1></summary> <p> New 0 point revolver for sec. It does shit-tier damage since it fires .20 rifle, but with an 8 round capacity, it's the highest capacity revolver in the game.   New salvage vendor "Civilian Grade" equipment  Tested and verified that the salvage vendor guns actually do spawn empty:  </p> </details> # Changelog :cl: - add: Added the Argenti, Gestio, Novalite C1, and SVT firearms. Added an "Empty" Mosin variant for Salvage. - add: Salvage technicians can now spend their mining points on new "Civilian Grade" firearms from the Mining Vendor. These don't come with ammo, so you'll have to request ammo be printed by Security. - add: Added the Argenti Revolver to Security Loadouts. - tweak: Salvage Specialist lockers are now guaranteed to come with one pickaxe and one ore bag. --------- Co-authored-by: sleepyyapril <[email protected]> Co-authored-by: Rosycup <[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: - fix: Fixed announcement spam caused by my silly blunder.
<!-- 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]? --> Port from [Goob](Goob-Station/Goob-Station#989) --- # 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: Aviu00, Spatison - add: Added material silo --------- Signed-off-by: Spatison <[email protected]> Signed-off-by: VMSolidus <[email protected]> Co-authored-by: VMSolidus <[email protected]>
…1492) <!-- 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 incompatibility to ensure that someone cannot take negative visual traits while having cyber-eyes systems, and likewise cannot take redundant negative visual traits. Should resolve [this issue](Simple-Station/Einstein-Engines#1327). --- <!-- 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: - fix: You cannot take Photophobia while blind or you have cyber-eyes. - fix: You cannot take nearsightedness while blind or while having cyber-eyes. - fix: You cannot be blind while nearsighted, photophobic, or while having cyber-eyes.
Found it. Had to trace everything calling the Ai Whitelist component, and found this system was closing all UIs if you weren't an AI and were trying to interact with a computer with said whitelist component.
<!-- 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]? --> Shadow shackles should not bind the target instantly. --- # 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: Spatison - tweak: Shadow shackles now have a delay before binding - fix: Shadow shackles can now be removed --------- Signed-off-by: Spatison <[email protected]>
…noid Spawner (#1497) # Description Title. Refers to [this](https://github.com/Simple-Station/Einstein-Engines/actions/runs/12688697909/job/35365794632?pr=1466) --- # Changelog no cl no fun --------- Signed-off-by: Remuchi <[email protected]> Signed-off-by: Remuchi <[email protected]>
# Description This PR adds an Ore Silo to every map in rotation. It also adds a station AI to (almost) every map. A decent number of the maps had to have a shitton of cameras added to make AI actually playable. In particular Glacier is/was/probablystillis pretty bad for AI. <details><summary><h1>Media</h1></summary> <p> </p> </details> # Changelog :cl: - add: Added Station AI to (almost) every map in rotation. - add: Added Ore Silos to every map in rotation.
# Description Fixes Simple-Station/Einstein-Engines#1498 Funny trig errors go brrr. :cl: - fix: Fixed an issue where ranged NPCs were incapable of aiming.
# Description Pretty simple fix, just tell the weather system "If there's already a weather sound playing, stop.". I have infact tested this, and verified that this fix does work. Fixes Simple-Station/Einstein-Engines#1285 # Changelog :cl: - fix: Fixed a crash caused by Weather System creating millions of sounds.
<!-- 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 a command that adds the playtime requirements of a job. --- # 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: ADMIN: - add: Added a command to easily allow for adding a jobs playtime requirements. (playtime_unlock)
yeag --------- Co-authored-by: Pieter-Jan Briers <[email protected]> Co-authored-by: Leon Friedrich <[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]? --> I forgot about 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: Aviu00 - fix: Fix silo being out of range.
<!-- 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]? --> Finishes BSO and Nanorep. --- # TODO - [x] Jobs - [x] Clothing - [x] BSO weapons - [x] Loadouts - [x] Mapping - [x] Set map prototypes --- # 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: sleepyapril, Goob Station contributors - add: Added Nanotrasen Representative and Blueshield Officer - add: Added Admin Assistant, Nanorep, and Blueshield Officer spawns to all maps. BSO and Nanorep don't get an office, they get a unique teleporter. (as of now) Ask your resident mapper to fix this. - add: Added the loadout options for Nanotrasen Representative and Blueshield Officer. --------- Co-authored-by: Aidenkrz <[email protected]> Co-authored-by: Icepick <[email protected]> Co-authored-by: Memeji <[email protected]> Co-authored-by: Theapug <[email protected]> Co-authored-by: DarkenedSynergy <[email protected]> Co-authored-by: Solstice <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: BombasterDS <[email protected]> Co-authored-by: starch <[email protected]> Co-authored-by: BombasterDS2 <[email protected]> Co-authored-by: BombasterDS <[email protected]> Co-authored-by: Piras314 <[email protected]>
…ngines into bso-and-nanorep
|
RSI Diff Bot; head commit 3df474e merging into bf31678 Resources/Textures/Objects/Misc/id_cards.rsi
Resources/Textures/Structures/Machines/material_silo.rsi
Resources/Textures/_Goobstation/Clothing/Armor/bso_armour.rsi
Resources/Textures/_Goobstation/Clothing/Back/Backpacks/blueshield.rsi
Resources/Textures/_Goobstation/Clothing/Back/Backpacks/centcom.rsi
Resources/Textures/_Goobstation/Clothing/Back/Backpacks/stasis_back.rsi
Resources/Textures/_Goobstation/Clothing/Back/Duffels/blueshield.rsi
Resources/Textures/_Goobstation/Clothing/Back/Satchels/blueshield.rsi
Resources/Textures/_Goobstation/Clothing/Back/Satchels/nanorep.rsi
Resources/Textures/_Goobstation/Clothing/Eyes/Glasses/medglasses.rsi
Resources/Textures/_Goobstation/Clothing/Head/Hats/beret_bso_navy.rsi
Resources/Textures/_Goobstation/Clothing/Head/Hats/beret_bso_officer.rsi
Resources/Textures/_Goobstation/Clothing/Head/Hats/cowboyhatbso.rsi
Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_cowboy_jacket.rsi
Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_jacket.rsi
Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/blueshield_officer.rsi
Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/centcom_agent.rsi
Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/nanotrasen_representative.rsi
Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/blueshield_officer.rsi
Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/nanotrasen_representative.rsi
Resources/Textures/_Goobstation/Interface/Misc/job_icons.rsi
Resources/Textures/_Goobstation/Objects/Devices/pda.rsi
|
sleepyyapril
changed the title
sleepyyapril
added a commit
that referenced
this pull request
Jan 12, 2025
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.
🆑 sleepyapril, EE and Goob contributors