Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

.github/CONTRIBUTING.md

@@ -11,7 +11,8 @@
 6. [Pull Request Process](#pull-request-process)
 7. [Porting features/sprites/sounds/tools from other codebases](#porting-featuresspritessoundstools-from-other-codebases)
 8. [Banned content](#banned-content)
-9. [A word on Git](#a-word-on-git)
+9. [Content requiring prior approval](#content-requiring-prior-approval)
+10. [A word on Git](#a-word-on-git)
 
 ## Reporting Issues
 If you ever encounter a bug in-game, the best way to let a coder know about it is with our GitHub Issue Tracker. Please make sure you use the supplied issue template, and include the round ID for the server.
@@ -678,6 +679,14 @@ Do not add any of the following in a Pull Request or risk getting the PR closed:
 
 Just because something isn't on this list doesn't mean that it's acceptable. Use common sense above all else.
 
+## Content requiring prior approval
+Certain types of changes may require prior approval from maintainers. This currently includes:
+
+* Code adding, removing, or updating the availability of alien races/species/human mutants. This includes pull requests attempting to add or remove features from said races/species/mutants. (Requires approval from at least one maintainer)
+* Code adding, removing, or modifying the functionality of adult-oriented features (such as, but not limited to: vore, genitals, MKUltra, and more). This also includes pull requests attempting to add or remove these features outright. (Requires approval from at least half of the formal maintainer team)
+
+If a PR contains any of the above content, and it lacks prior approval, then it may closed at maintainer discretion. Prior approval requires an @Maintainer ping in a relevant development/code or staff channel on the Discord. This is primarily to limit the impact of PRs that're created in bad faith, or are otherwise counterproductive to the server's health.
+
 ## A word on Git
 This repository uses `LF` line endings for all code as specified in the **.gitattributes** and **.editorconfig** files.
 

code/game/objects/structures/window.dm

@@ -719,7 +719,6 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup)
 	icon = 'icons/obj/smooth_structures/rplasma_window.dmi'
 	icon_state = "rplasmawindow"
 	dir = FULLTILE_WINDOW_DIR
-	state = PRWINDOW_SECURE
 	max_integrity = 1000
 	fulltile = TRUE
 	flags_1 = PREVENT_CLICK_UNDER_1

html/changelogs/AutoChangeLog-pr-15510.yml

@@ -0,0 +1,36 @@
+author: "TripleShades"
+delete-after: True
+changes: 
+  - rscadd: "[Omega] Gateway shutter button"
+  - rscadd: "[Omega] Signs to the airlocks that lead to space that say SPACE"
+  - rscadd: "[Omega] Air Alarm for the Turbine itself"
+  - rscadd: "[Omega] SMES Unit for the Turbine itself"
+  - rscadd: "[Omega] Firelock to Robotics airlock"
+  - rscadd: "[Omega] Captain's Office now has a hand teleporter and medal box"
+  - rscadd: "[Omega] Screwdriver to Chemistry"
+  - rscadd: "[Omega] Space Cleaner bottle to Medbay"
+  - rscadd: "[Omega] Limb Grower and Spare Limb Crate to Surgery"
+  - rscadd: "[Omega] Kinkmate in Dorms"
+  - rscadd: "[Omega] Lightbulb fixture to Secure Tech Storage"
+  - rscadd: "[Omega] Armsky is now in the Armoury"
+  - rscdel: "[Omega] Extra automated announcement machine"
+  - rscdel: "[Omega] Wall inside of southwest Solar Array window"
+  - rscdel: "[Omega] Wall inside library maint airlock"
+  - rscdel: "[Omega] Duplicate Robotics airlock
+tweak: [Omega] HoS gun now spawns in HoS locker instead of Captain's locker
+tweak: [Omega] Both Solar Arrays now have more windows
+tweak: [Omega] PACMAN moved out from behind a Command airlock in Engineering
+tweak: [Omega] A few cameras so that they're not sitting improperly on windows
+tweak: [Omega] Medbay Surgery now has a surgical duffel instead of strewn about tools
+tweak: [Omega] Security Cell 1 is now properly named and has a bed instead of a chair
+tweak: [Omega] Toxins scrubber piping now goes through a wall
+tweak: [Omega] Robotics trash can is now moved to the small hallway between Robotics and Toxins
+tweak: [Omega] Maint Pool drain moved down a tile so it's easier to retrieve lost items"
+  - bugfix: "[Omega] Lawyer Office access"
+  - bugfix: "[Omega] Both Solar Arrays are now wired up to power the station properly"
+  - bugfix: "[Omega] Wire leading to the single Supermatter Emitter should now be properly connected and not diagonal"
+  - bugfix: "[Omega] Gateway Maint airlock access"
+  - bugfix: "[Omega] Toxins Launch not being connected to the main air supply"
+  - bugfix: "[Omega] Toxins Mix Chamber no longer starts bolted"
+  - bugfix: "[Omega] Missing pipe above Security leading into Perma"
+  - bugfix: "[Omega] Secure Tech Storage now properly has an area"

html/changelogs/AutoChangeLog-pr-15513.yml

@@ -0,0 +1,4 @@
+author: "Putnam3145"
+delete-after: True
+changes: 
+  - bugfix: "Default features on linux auxmos compile now formatted correctly"

html/changelogs/AutoChangeLog-pr-15515.yml

@@ -0,0 +1,4 @@
+author: "Putnam3145"
+delete-after: True
+changes: 
+  - bugfix: "reinforced plasma glass windows are buildable"

tools/tgs4_scripts/PreCompile.sh

@@ -84,7 +84,7 @@ fi
 
 echo "Deploying auxmos..."
 git checkout "$AUXMOS_VERSION"
-env PKG_CONFIG_ALLOW_CROSS=1 ~/.cargo/bin/cargo rustc --release --target=i686-unknown-linux-gnu --features all_reaction_hooks,katmos -- -C target-cpu=native
+env PKG_CONFIG_ALLOW_CROSS=1 ~/.cargo/bin/cargo rustc --release --target=i686-unknown-linux-gnu --features "all_reaction_hooks katmos" -- -C target-cpu=native
 mv -f target/i686-unknown-linux-gnu/release/libauxmos.so "$1/libauxmos.so"
 cd ..