Merge remote-tracking branch 'upstream/master' into Artillery_I

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,7 +1,34 @@
-## PR HISPANICO
+<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. -->
+<!-- You can view Contributing.MD for a detailed description of the pull request process. -->
 
-<!-- Describe aqui todo los cambios que trae el Pull Request. Trata de usar todas las herramientas a tu disposicion, por ejemplo listas, tablas, imagenes o parrafos documentando todo lo posible. -->
+## About The Pull Request
 
-## Por que es bueno para el juego
+<!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! -->
 
-<!-- Aqui argumentaras por que crees que los cambios que traes son beneficicios para la codebase. -->
+## Why It's Good For The Game
+
+<!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. -->
+
+## Changelog
+
+:cl:
+add: Added new things
+add: Added more things
+del: Removed old things
+tweak: tweaked a few things
+balance: rebalanced something
+fix: fixed a few things
+soundadd: added a new sound thingy
+sounddel: removed an old sound thingy
+imageadd: added some icons and images
+imagedel: deleted some icons and images
+spellcheck: fixed a few typos
+code: changed some code
+refactor: refactored some code
+config: changed some config setting
+admin: messed with admin stuff
+server: something server ops should know
+/:cl:
+
+<!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. -->
+<!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->

.github/workflows/codeowner_reviews.yml

@@ -0,0 +1,25 @@
+name: Codeowner Reviews
+
+# Controls when the workflow will run
+on: pull_request_target
+
+jobs:
+  assign-users:
+    runs-on: ubuntu-latest
+
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so the job can access it
+      - uses: actions/checkout@v3
+
+      #Parse the Codeowner file
+      - name: CodeOwnersParser
+        id: CodeOwnersParser
+        uses: tgstation/CodeOwnersParser@v1
+
+      #Request reviews
+      - name: Request reviews
+        if: steps.CodeOwnersParser.outputs.owners != ''
+        uses: tgstation/RequestReviewFromUser@v1
+        with:
+          separator: " "
+          users: ${{ steps.CodeOwnersParser.outputs.owners }}

.github/workflows/labeler.yml

@@ -0,0 +1,25 @@
+name: PR Labeler
+
+on:
+  push:
+    branches:
+      - master
+  pull_request_target:
+
+jobs:
+  Label:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check for conflicting PRs
+        uses: eps1lon/actions-label-merge-conflict@releases/2.x
+        with:
+          dirtyLabel: "Merge Conflict"
+          repoToken: "${{ secrets.GITHUB_TOKEN }}"
+          commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
+      - name: Apply labels based on changed files
+        if: github.event_name != 'push'
+        uses: actions/labeler@main
+        with:
+          repo-token: "${{ secrets.GITHUB_TOKEN }}"
+          sync-labels: true
+          configuration-path: .github/labeler.yml

_maps/RandomRuins/SpaceRuins/spacemall.dmm

@@ -936,8 +936,6 @@
 /obj/effect/turf_decal/corner/opaque/blue/borderfull,
 /obj/item/circuitboard/machine/vending,
 /obj/item/vending_refill/autodrobe,
-/obj/item/clothing/shoes/drip,
-/obj/item/clothing/under/drip,
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/spacemall/shop)
 "dG" = (

_maps/configs/solgov_paracelsus.json

@@ -0,0 +1,45 @@
+{
+	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+	"map_name": "Paracelsus-class Medical Corvette",
+	"prefix": "SGSV",
+	"namelists": [
+		"SOLGOV",
+		"SPACE",
+		"BRITISH_NAVY",
+		"NATURAL"
+	],
+	"map_short_name": "Paracelsus-class",
+	"description": "Fulfilling its role as a medicinal powerhouse of the Solarian Navy, the Paracelsus-class is a specially designed corvette to assist solarian fleets in medical troubles, as well as supplying such vessels with medication. Scribes pursuing a medical degree often work in these ships to shadow trained medical doctors to complete their residency.",
+	"tags": ["RP Focus", "Medical", "Chemistry"],
+	"map_path": "_maps/shuttles/shiptest/solgov_paracelsus.dmm",
+	"limit": 1,
+	"job_slots": {
+		"Captain": {
+			"outfit": "/datum/outfit/job/solgov/captain",
+			"officer": true,
+			"slots": 1
+		},
+		"Bureaucrat": {
+			"outfit": "/datum/outfit/job/solgov/bureaucrat",
+			"officer": true,
+			"slots": 1
+		},
+		"Medical Doctor": {
+			"outfit": "/datum/outfit/job/solgov/doctor",
+			"slots": 3
+		},
+		"Ship Engineer": {
+			"outfit": "/datum/outfit/job/solgov/engineer",
+			"slots": 1
+		},
+		"Field Engineer": {
+			"outfit": "/datum/outfit/job/solgov/miner",
+			"slots": 1
+		},
+		"Scribe": {
+			"outfit": "/datum/outfit/job/solgov/assistant",
+			"slots" : 3
+		}
+	},
+	"enabled": true
+}