diff --git a/.github/workflows/cancel.yml b/.github/workflows/cancel.yml index bf11bf4ea04d0..d0f8b0484296d 100644 --- a/.github/workflows/cancel.yml +++ b/.github/workflows/cancel.yml @@ -14,7 +14,7 @@ jobs: name: 'Cancel Redundant Builds' permissions: actions: write # required to cancel other actions - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 timeout-minutes: 3 steps: - uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa diff --git a/.github/workflows/changelog_generation.yml b/.github/workflows/changelog_generation.yml index 6a4e9317fb6d1..d2c4b334e117f 100644 --- a/.github/workflows/changelog_generation.yml +++ b/.github/workflows/changelog_generation.yml @@ -12,7 +12,7 @@ jobs: CompileCL: permissions: contents: write # required to push the updated changelog commit - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 if: github.repository == 'Baystation12/Baystation12' # to prevent this running on forks steps: - name: Checkout diff --git a/.github/workflows/close_stale.yml b/.github/workflows/close_stale.yml index e149b3e5ba128..161d8f764d5c9 100644 --- a/.github/workflows/close_stale.yml +++ b/.github/workflows/close_stale.yml @@ -12,7 +12,7 @@ jobs: stale: permissions: issues: write # required to close stale issues - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/stale@v9 with: diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 8967e34d8a4c0..97fed3a5a2e19 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -20,7 +20,7 @@ on: jobs: analyze: name: Analyze - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 timeout-minutes: 10 permissions: actions: read diff --git a/.github/workflows/generate_documentation.yml b/.github/workflows/generate_documentation.yml index 65a73aafaec25..6639e48d72bf8 100644 --- a/.github/workflows/generate_documentation.yml +++ b/.github/workflows/generate_documentation.yml @@ -14,7 +14,7 @@ env: jobs: PreFlight: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: checkout uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 @@ -28,7 +28,7 @@ jobs: generate_documentation: permissions: contents: write # required to push the doc commit - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: PreFlight if: | (needs.PreFlight.outputs.dm == 'true') && @@ -39,7 +39,7 @@ jobs: steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - name: Setup Cache - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 with: path: ~/spaceman_dmm/${{ env.SPACEMAN_DMM_VERSION }} key: ${{ runner.os }}-spacemandmm-${{ env.SPACEMAN_DMM_VERSION }} diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index b507963942a52..6f37388965fba 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -13,7 +13,7 @@ jobs: permissions: contents: read # may be required due to overwrite/add ambiguity pull-requests: write # required to apply labels to PRs - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/labeler@v5 with: diff --git a/.github/workflows/make_changelogs.yml b/.github/workflows/make_changelogs.yml index 841fa422e0803..f1eaf89e6bf23 100644 --- a/.github/workflows/make_changelogs.yml +++ b/.github/workflows/make_changelogs.yml @@ -12,7 +12,7 @@ jobs: MakeCL: permissions: contents: write # required to push the changelog chunk yml commit - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 if: github.repository == 'Baystation12/Baystation12' # to prevent this running on forks steps: - name: Checkout diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 034dbce43423d..8791ee350ed3a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,7 +16,7 @@ env: jobs: PreFlight: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: checkout uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 @@ -28,13 +28,13 @@ jobs: outputs: dm: ${{ steps.filter.outputs.dm }} DreamChecker: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: PreFlight if: needs.PreFlight.outputs.dm == 'true' steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - name: Setup Cache - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 with: path: ~/spaceman_dmm/${{ env.SPACEMAN_DMM_VERSION }} key: ${{ runner.os }}-spacemandmm-${{ env.SPACEMAN_DMM_VERSION }} @@ -54,7 +54,7 @@ jobs: chmod +x send.sh ./send.sh failure $WEBHOOK_URL Code: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: - PreFlight - DreamChecker @@ -62,7 +62,7 @@ jobs: steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - name: Setup Cache - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 with: path: ~/BYOND-${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }} key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }} @@ -84,7 +84,7 @@ jobs: chmod +x send.sh ./send.sh failure $WEBHOOK_URL ExampleMap: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: - PreFlight - DreamChecker @@ -92,7 +92,7 @@ jobs: steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - name: Setup Cache - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 with: path: ~/BYOND-${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }} key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }} @@ -113,7 +113,7 @@ jobs: chmod +x send.sh ./send.sh failure $WEBHOOK_URL TorchMap: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: - PreFlight - DreamChecker @@ -121,7 +121,7 @@ jobs: steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - name: Setup Cache - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 with: path: ~/BYOND-${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }} key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }} @@ -142,7 +142,7 @@ jobs: chmod +x send.sh ./send.sh failure $WEBHOOK_URL AwaySites: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: - PreFlight - DreamChecker @@ -150,7 +150,7 @@ jobs: steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - name: Setup Cache - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 with: path: ~/BYOND-${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }} key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }} diff --git a/.github/workflows/testmerge-blocker.yml b/.github/workflows/testmerge-blocker.yml index ad49f5e998116..d73ec7a6a5fb4 100644 --- a/.github/workflows/testmerge-blocker.yml +++ b/.github/workflows/testmerge-blocker.yml @@ -7,7 +7,7 @@ on: jobs: testmerge-blocker: name: Enforce Test Merge Label - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Enforce Test Merge Label if: contains(github.event.pull_request.labels.*.name, 'Test Merge') && !contains(github.event.pull_request.labels.*.name, 'Test Merge Passed') diff --git a/code/modules/admin/view_variables/helpers.dm b/code/modules/admin/view_variables/helpers.dm index 971e7187adb64..e9957532eaaff 100644 --- a/code/modules/admin/view_variables/helpers.dm +++ b/code/modules/admin/view_variables/helpers.dm @@ -154,7 +154,7 @@ /atom/VV_static() - return ..() + list("bound_x", "bound_y", "bound_height", "bound_width", "bounds", "step_x", "step_y", "step_size") + return ..() + list("bound_x", "bound_y", "bound_height", "bound_width", "bounds", "step_x", "step_y", "step_size", "underlays", "overlays") /client/VV_static() return ..() + list("holder", "prefs") diff --git a/html/changelog.html b/html/changelog.html index 1fe8064d82fac..4045f5b4c0d20 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,17 @@ -->
+

16 October 2024

+

Spookerton updated:

+ +

The_Spanish_1nquisition updated:

+ +

07 October 2024

Mucker updated:

- -

13 August 2024

-

SierraKomodo updated:

-
GoonStation 13 Development Team diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index b7f6e5fe38e5d..28fa2ba569174 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -22916,3 +22916,10 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - rscadd: Added Party Cards for the SCG's major political parties - rscadd: Added Cultural Options for Wikified Planets - rscadd: Added Passports for said Planets +2024-10-16: + Spookerton: + - admin: Atom overlays and underlays no longer incorrectly appear modifiable via + VV. + The_Spanish_1nquisition: + - rscdel: Removed outdated event related memos + - rscadd: Added new event related (and other) memos diff --git a/maps/torch/items/memos.dm b/maps/torch/items/memos.dm index 028bc1ad895f8..b019cd316eaf9 100644 --- a/maps/torch/items/memos.dm +++ b/maps/torch/items/memos.dm @@ -177,6 +177,10 @@ name = "fleet rank abbreviations" info = {"Some "internal use only" reports on proper and improper ways of abbreviating fleet ranks and roles, including emphasis that "sub" is NOT an authorized way, shorthand or otherwise, to refer to sub lieutenant."} +/obj/item/paper/memo/generic/misuseofcom + name = "misuse of communications" + info = {"Some "internal use only" reports on telecommunications use, reminding personnel that all telecommunications data is automatically relayed to command upon its transcription to the server, and that if you don't want command to hear something, don't say it on radio or in emails."} + // scgr memos @@ -206,7 +210,7 @@ /obj/item/paper/memo/scgr/yourjob name = "\improper SCG and you" - info = {"Some "confidential" briefing documents, detailing the job of the SCGR in brief. It highlights they are a civilian, first and foremost, who functions as a general-purpose civil servant aboard the SEV Torch. They also should advise the Commanding Officer, assisting with bureaucratic affairs where required, and spearheading diplomatic negotations."} + info = {"Some "confidential" briefing documents, detailing the job of the SCGR in brief. It highlights they are a civilian, first and foremost, who functions as a general-purpose civil servant aboard the SEV Torch. They also should advise the Commanding Officer, assisting with bureaucratic affairs where required, and spearheading diplomatic negotations. At the bottom, underlined several times and in bold is "YOU ARE NOT A LAWYER"."} /obj/item/paper/memo/scgr/perdiemdeny name = "per diem denials" @@ -224,6 +228,10 @@ name = "assembly floor proceedings" info = {"A copy of the minutes from the Sol Assembly hearing over an emergency bill giving the SCG Defense Forces jurisdiction over the Expeditionary Corps (and by extension, the SEV Torch). The debate is vicious and devolves into angry bickering at points. The bill appears to have gotten uncomfortably close to being passed."} +/obj/item/paper/memo/scgr/radicals + name = "radicalization investigation report" + info = {"A summary of a Senate investigation into the radicalization of government employees. The findings appear somewhat grim, with long lists of reports of politics seeping its way into the everyday functions of the Fleet, Diplomatic Service, SFP, and Expeditionary Corps. While the report clarifies that no major incidents have occurred thus far, the intertwining of politics and governmental operations will likely have grave consequences if let run rampant."} + // command memos @@ -279,27 +287,25 @@ name = "non-judicial punishments" info = {"A "for official use only" memorandum detailing options with regards to non-judicially punishing uniformed servicemembers. Such punishments include admonishment/reprimand, forfeiture of pay, restriction, extra duty, and reduction in rank. The punishments available and their severity depend on the rank of the accused and the imposing officer."} -/obj/item/paper/memo/command/recall - name = "order of recall" - info = {"A notice from the Helios Board of Admiralty regarding the urgent return of the Torch to Mars - the Board has ordered debriefing and review regarding the diplomatic meetings with the Terran Pioneer Corps and the field execution of SLT Kristen Rohtin. The document stresses that the ship be wary of any vessels, Fleet or otherwise, masking their transponders."} - -/obj/item/paper/memo/command/roguefleeties - name = "rogue fleet movements" - info = {"An "internal use only" memorandum sent from Expeditionary Command, detailing the last known locations and naval capacity of several rogue Fifth Fleet vessels, including the SFV Nathan Hale. The data available in the report is uncomfortably sparse."} - -/obj/item/paper/memo/command/outpostreport1 - name = "\improper E-14b outpost report" - info = {"An "internal use only" memo detailing the status of the research outpost in the E-14b system. It states that construction is still underway, and suggests efforts would benefit from better communication between EC and Terran engineering personnel."} - -/obj/item/paper/memo/command/outpostreport2 - name = "\improper E-14b outpost report" - info = {"An "internal use only" memo detailing the status of the research outpost in the E-14b system. It states that construction has been delayed due to a migration of native ambulatory fungus at the site, and requests that the EC begin looking into low-impact mushroom removal methods."} +/obj/item/paper/memo/command/outpostreport + name = "E-14b outpost report" + info = {"An "internal use only" memo detailing the status of the research outpost in the E-14b system. It states that construction is overall complete, and suggests efforts in better communication between EC and Confederate engineering personnel have born fruit, with several listed examples of the formed bonds."} /obj/item/paper/memo/command/evasiveflight name = "evasive flight maneuvers" info = {"A hastily-penned report detailing strategies for evading ship-to-ship laser fire and missile strikes in the event of another attack on the Torch. The author highly recommends the tactical use of space dust and other debris, citing the successful evasive action taken during the attack by the SFV Nathan Hale."} +/obj/item/paper/memo/command/confedsightings + name = "confederate naval protocols" + info = {"An "internal use only" memo sent from the Government Representative to the bridge crew reminding them that the SCG is, and will for the foreseeable future, be a peace with the GCC. As such, it is entirely unneeded to 'batten down the hatches' and prepare the ship for hostilities at the mere sighting of a Confederate Naval Vessel, and that such preparations implies Xenophobic tendencies and increases the probability of diplomatic incidents."} + +/obj/item/paper/memo/command/pioneerpranks + name = "pioneer prank reports" + info = {"An "internal use only" memo sent from Expeditionary Command reporting on an increase in "friendly pranks" between the Expeditionary Corps and Pioneerng Corps. The report details how the warming of relations between the two Corps has brought pranks usually kept within the Expeditonary Corps into the inter-Corps realm. The report advises Non-Expeditionary Corps personnel to interpret Pioneers acting oddly as nothing more than attempts at pranking a EC vessel. It lists an example of how a Pioneer crew used the derelict hull of a cargo vessel to scare the SEV Komarov into believing they were being followed by a ghost ship."} +/obj/item/paper/memo/command/miranda + name = "miranda line caution" + info = {"A notice from the Ministry of Stellar Charts to the command of the SEV Torch. It is long and full of technical Cartography, but is quite clearly summarized when it says "although the Miranda Line was drawn as the edge of 'Known' Space during the Collapse of the Terran Commonwealth, the Space you are exploring was known to Humanity, but the charts were lost, it is not impossible for you to come across evidence of previous human presence."} // supply memos @@ -315,10 +321,6 @@ name = "in defense of the bar" info = {"An "internal use only" memo sent from the Executive Officer on behalf of Expeditionary Command detailing that the service department does not need self-defense weapons, and any arguments to the contrary will be handled internally. A personal memo has been added; an underlined "STOP ASKING US" penned onto the page."} -/obj/item/paper/memo/supply/officelocation - name = "supply office location reminder" - info = {"An "internal use only" memo issued to supply staff, reminding them that the supply office is to the aft of the hangar, not the fore, and that they should ensure they know the way to work."} - /obj/item/paper/memo/supply/shipping name = "shipping report" info = {"Some "internal use only" reports about the recent items coming and going from Expeditionary Corps vessels, with 70% of the orders being filed as replacement chemical cartridges."} @@ -379,18 +381,13 @@ name = "radio damage complaint" info = {"An "internal use only" report on complaints of garbled static emitting from radios during shifts with IPC crew members onboard. The report further goes onto state that when inquiring about this to IPC crew members on the radio, their radios would emit the same noises instead of getting a clear answer from them."} -/obj/item/paper/memo/engineering/hulldamage - name = "damage control report" - info = {"An "internal use only" report on damages to the hull following the attack by the SFV Nathan Hale. It suggests that the repairs currently in place are temporary at best, and that the Torch will need hefty drydock maintenance before its next deep space mission. The report goes on to recommend petitioning EXO for additional funding for maintenance and upkeep."} - -/obj/item/paper/memo/engineering/tcommssabotage - name = "damage control report" - info = {"An "internal use only" report on damages to ship systems following the 5/14 sabotage incident. It suggests that the saboteur exploited a previously-unknown vulnerability in the ship's telecommunications systems to shut down long-range communications - the system will need a full inspection from DAIS management before it can be deemed properly secure again. How the saboteur discovered the exploit is still unknown."} - /obj/item/paper/memo/engineering/bsddamage name = "\improper Bluespace drive safety notice" info = {"A "confidential" memo from Krri'gli Engineering regarding the new Bluespace drive. It explains in very slow and simple language that this is a "Bluespace drive", a very expensive and volatile piece of machinery, and that you should not break this one or remove the exotic particle shielding. The author does not appear to have a very high opinion of human engineering or mental faculties."} +/obj/item/paper/memo/engineering/maintventing + name = "venting complaint" + info = {"A "sensitive" memo from a formerly Enlisted contractor aboard the Torch. In somewhat colourful language it outlines how a single breach of the hull anywhere in the maintenance corridors will vent the entirety of the corridors on that side of the vessel. Attached are almost identical copies of the complaint, each filed exactly a year before the previous one, dating back to the Torch's refit in 2305."} // medical memos @@ -496,7 +493,7 @@ /obj/item/paper/memo/exploration/pioneers name = "pioneers and you" - info = {"An "internal use only" memo detailing proper ettiquette for explorers interacting with Terran Pioneer Corps personnel. It stresses very heavily that yes, most Terrans do speak ZAC; no, you should not share your funny Pan-Slavic impression; and no, you should ABSOLUTELY not ask if they know any war criminals."} + info = {"An "internal use only" memo detailing proper ettiquette for explorers interacting with Confederate Pioneer Corps personnel. It stresses very heavily that yes, most Confederates do speak ZAC; no, you should not share your funny Pan-Slavic impression; and no, you should ABSOLUTELY not ask if they know any war criminals."} // research memos @@ -565,7 +562,13 @@ name = "contractor safety and you" info = {"An "internal use only" corporate document reminding corporate liaisons to report any unsafe behavior from contractors that they either see directly or is reported to them. It goes on to explain that ensuring the health and safety compliance of those under contract not only helps to keep up an image of security but ensures that the reputation of EXO as a whole is not tarnished due to a workplace accident."} +/obj/item/paper/memo/corporate/legion + name = "internal communications" + info = {"A stack of "confidential" communications inside the EXO pertaining to the recent encounter with the 'Legion'. The almost unregulated panic among some of the discussions is quite clear, with the overall worry more focused on possible financial losses then danger to the SCG or SCG personnel."} +/obj/item/paper/memo/corporate/miranda + name = "miranda line memo" + info = {"A "secret" memo from the EXO Head Office. It is somewhat lacking in specifics, but is quite clear that should the Torch locate any traces of human presence past the Miranda Line, that any involvement whatsoever of the EXO or its subsidiaries in the presence is to be denied."} // security memos @@ -612,3 +615,8 @@ /obj/item/paper/memo/security/extremism name = "anti-radicalization pamphlet" info = {"An "internal use only" document detailing strategies for identifying signs and risk factors for radicalization, created in light of perceived extremism in the SCGF. It discusses low self-esteem, stress, marginalization, repeat disciplinary issues, and excessive interest in weaponry."} + +/obj/item/paper/memo/security/useofforce + name = "use of force complaint" + info = {"An inter-departmental memo from the Chief Medical Officer to the Chief of Security and Brig Chief about the amount of detainees treated for injuries "far greater then would be needed" following their detainment. It has a quite graphic description of a crewmember who's legs were broken for simply walking away from a master at arms."} +