Merge remote-tracking branch 'upstream/master'

Imaginos16 · Oct 18, 2024 · 967a04a · 967a04a
2 parents 2044077 + cd88cfe
commit 967a04a
Show file tree

Hide file tree

Showing 271 changed files with 13,043 additions and 8,635 deletions.
diff --git a/_maps/RandomRuins/IceRuins/icemoon_ice_lodge.dmm b/_maps/RandomRuins/IceRuins/icemoon_ice_lodge.dmm
diff --git a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
@@ -1028,14 +1028,10 @@
 	pixel_y = 32
 	},
 /obj/structure/closet/secure_closet/freezer/wall/directional/west,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
 /obj/item/reagent_containers/condiment/enzyme{
 	pixel_x = -8;
 	pixel_y = 5

diff --git a/_maps/RandomRuins/JungleRuins/jungle_interceptor.dmm b/_maps/RandomRuins/JungleRuins/jungle_interceptor.dmm
@@ -1090,7 +1090,7 @@
 /obj/item/radio,
 /obj/item/radio,
 /obj/item/clothing/under/color/jumpskirt/darkblue,
-/obj/item/clothing/under/dress/skirt/blue,
+/obj/item/clothing/under/dress/skirt/color/blue,
 /obj/effect/turf_decal/corner/opaque/black{
 	icon_state = "siding_line";
 	dir = 10
@@ -1516,7 +1516,7 @@
 	},
 /obj/item/radio,
 /obj/item/radio,
-/obj/item/clothing/under/dress/skirt/blue,
+/obj/item/clothing/under/dress/skirt/color/blue,
 /obj/item/clothing/under/color/darkblue,
 /obj/effect/turf_decal/corner/opaque/black{
 	icon_state = "siding_line";

diff --git a/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm b/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm
@@ -960,21 +960,7 @@
 /area/overmap_encounter/planetoid/rockplanet/explored)
 "pj" = (
 /obj/structure/table/reinforced,
-/obj/item/slime_extract/grey{
-	pixel_x = -4;
-	pixel_y = -1
-	},
-/obj/item/slime_extract/grey{
-	pixel_x = 8
-	},
-/obj/item/slime_extract/grey,
-/obj/item/slime_extract/grey,
-/obj/item/slime_extract/green{
-	pixel_x = 4;
-	pixel_y = -6
-	},
 /obj/structure/window/reinforced,
-/obj/item/slime_scanner,
 /turf/open/floor/engine,
 /area/ruin/rockplanet/nanotrasen)
 "pl" = (

diff --git a/_maps/RandomRuins/SpaceRuins/power_puzzle.dmm b/_maps/RandomRuins/SpaceRuins/power_puzzle.dmm
@@ -1850,8 +1850,8 @@
 /obj/item/reagent_containers/food/drinks/waterbottle/empty,
 /obj/item/reagent_containers/food/drinks/waterbottle/empty,
 /obj/item/reagent_containers/food/drinks/waterbottle,
-/obj/item/reagent_containers/food/snacks/rationpack,
-/obj/item/reagent_containers/food/snacks/rationpack,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
 /obj/item/reagent_containers/food/snacks/sosjerky,
 /obj/item/reagent_containers/food/snacks/sosjerky,
 /obj/item/stack/medical/gauze/improvised,

diff --git a/_maps/configs/minutemen_atlas.json b/_maps/configs/minutemen_atlas.json
@@ -0,0 +1,50 @@
+	{
+	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+	"map_name": "Atlas-class Light Armored Crusier",
+	"prefix": "CMSV",
+	"namelists": ["GENERAL", "CLIP MINUTEMEN", "NATURAL_AGGRESSIVE"],
+	"description": "The Atlas-Class is the designation for some of the oldest serving vessels in the Confederated League's military fleet. Originally the Atlantas-class, the design of the Atlantas was taken by the Colonial Militia just before the beginning of the war with the Old Frontiersmen, playing a pivotal role in multiple skirmishes. It is small in size and crew, well-rounded, and well-suited as an unexpensive hit-and-run vessel. Despite its age, the Atlas continues to serve the Confederated League for peacekeeping missions and driving off small crews of pirates from colonies.",
+	"tags": [
+		"Combat",
+		"Generalist"
+	],
+	"map_short_name": "Atlas-class",
+	"faction": "/datum/faction/clip",
+	"starting_funds": 1000,
+	"map_path": "_maps/shuttles/minutemen/minutemen_atlas.dmm",
+	"limit": 1,
+	"job_slots": {
+		"Captain": {
+			"outfit": "/datum/outfit/job/clip/minutemen/captain",
+			"officer": true,
+			"slots": 1
+		},
+		"First Officer": {
+			"outfit": "/datum/outfit/job/clip/first_officer",
+			"officer": true,
+			"slots": 1
+		},
+		"Sergeant": {
+			"outfit": "/datum/outfit/job/clip/minutemen/grunt/lead",
+			"officer": true,
+			"slots": 1
+		},
+		"Corpsman": {
+			"outfit": "/datum/outfit/job/clip/minutemen/doctor",
+			"slots": 1
+		},
+		"Engineer": {
+			"outfit": "/datum/outfit/job/clip/minutemen/engineer",
+			"slots": 1
+		},
+		"Minuteman": {
+			"outfit": "/datum/outfit/job/clip/minutemen/grunt",
+			"slots": 4
+		},
+		"Reservist": {
+			"outfit": "/datum/outfit/job/clip/minutemen/grunt/reserve",
+			"slots": 1
+		}
+	},
+	"enabled": true
+}
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
@@ -4840,7 +4840,7 @@
 "aRr" = (
 /obj/structure/closet/secure_closet/personal/cabinet,
 /obj/item/clothing/under/rank/civilian/curator/treasure_hunter,
-/obj/item/clothing/under/dress/skirt,
+/obj/item/clothing/under/dress/skirt/color,
 /obj/item/clothing/under/shorts/black,
 /obj/item/clothing/under/pants/track,
 /obj/item/clothing/accessory/armband/deputy,

diff --git a/_maps/shuttles/independent/independent_tranquility.dmm b/_maps/shuttles/independent/independent_tranquility.dmm
@@ -1326,7 +1326,7 @@
 /obj/item/clothing/head/beret,
 /obj/item/clothing/under/color/jumpskirt/random,
 /obj/item/clothing/under/color/random,
-/obj/item/clothing/under/dress/skirt/red,
+/obj/item/clothing/under/dress/skirt/color/red,
 /obj/item/clothing/suit/longcoat,
 /obj/item/clothing/suit/jacket/letterman_red,
 /obj/item/clothing/head/soft/mime,