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

This reverts commit 1861309, reversing
changes made to b097107.

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,34 +1,7 @@
-<!-- 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. -->
+## PR HISPANICO
 
-## About The Pull Request
+<!-- 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. -->
 
-<!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! -->
+## Por que es bueno para el juego
 
-## 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. -->
+<!-- Aqui argumentaras por que crees que los cambios que traes son beneficicios para la codebase. -->

_maps/RandomRuins/SpaceRuins/spacemall.dmm

@@ -936,6 +936,8 @@
 /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/independent_metis.json

@@ -0,0 +1,71 @@
+{
+	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+	"map_name": "Metis-class Experimental Extrasolar Pathfinder",
+	"map_short_name": "Metis-class",
+	"description": "The elderly Metis-class is effectively a mobile research barge, a large and ungainly hunk of titanium outfitted with a wide variety of scientific facilities and equipment. While the specifics of any given Metis are subject to extreme variance, common features include AI facilities, xenobiological research chambers, and robotics equipment. Due to the dangerous and often tenuously-legal research typically pursued on the Frontier as well as tight budgets and low safety investment common to independent research teams, the Metis-class has earned a reputation for disaster, and abandoned Metises overrun with xenofauna or rogue machines are a disturbingly common sight in some parts of the Frontier.",
+	"tags": [
+		"Science",
+		"Robotics",
+		"Survival Challenge"
+	],
+	"map_path": "_maps/shuttles/shiptest/independent_metis.dmm",
+	"prefix": "ISV",
+	"namelists": [
+		"SPACE"
+	],
+	"limit": 1,
+	"starting_funds": 500,
+	"job_slots": {
+		"Extraterrestrial Exploratory Project Supervisor": {
+			"outfit": "/datum/outfit/job/rd",
+			"officer": true,
+			"slots": 1
+		},
+		"Invertebrate Xenofauna Morphology Analyst": {
+			"outfit": "/datum/outfit/job/scientist/xenobiologist",
+			"slots": 1
+		},
+		"Hostile Planetary Exobiologist": {
+			"outfit": "/datum/outfit/job/scientist/xenobiologist/fauna",
+			"slots": 1
+		},
+
+		"Mechatronic Hydraulics Calibration Engineer": {
+			"outfit": "/datum/outfit/job/roboticist/mechatronicengineer",
+			"slots": 1
+		},
+		"Positronic Reliability Technician": {
+			"outfit": "/datum/outfit/job/roboticist/biomechanicalengineer",
+			"slots": 1
+		},
+		"Ionic Dynamo Engineer": {
+			"outfit": "/datum/outfit/job/roboticist/engineer",
+			"slots": 1
+		},
+		"Percussive Acquisitions-Focused Minerologist": {
+			"outfit": "/datum/outfit/job/miner/scientist",
+			"slots": 1
+		},
+		"Mechanosynthesis Specialist": {
+			"outfit": "/datum/outfit/job/scientist/naniteresearcher",
+			"slots": 1
+		},
+		"Plasmic Pyrolysis Researcher": {
+			"outfit": "/datum/outfit/job/scientist/seniorscientist",
+			"slots": 1
+		},
+		"Fiberboard Containment Inspector": {
+			"outfit": "/datum/outfit/job/scientist/juniorscientist",
+			"slots": 1
+		},
+		"Hyphenated-Specialist": {
+			"outfit": "/datum/outfit/job/scientist/juniorscientist",
+			"slots": 1
+		},
+		"Cantilevered Tool Containment Technician": {
+			"outfit": "/datum/outfit/job/scientist/juniorscientist",
+			"slots": 1
+		}
+	},
+	"enabled": true
+}