Merge remote-tracking branch 'upstream/master'

blackdav123 · Sep 22, 2024 · 08b95a1 · 08b95a1
2 parents 4b8383c + 8a6b1d2
commit 08b95a1
Show file tree

Hide file tree

Showing 139 changed files with 354,986 additions and 17,790 deletions.
diff --git a/_maps/_basemap.dm b/_maps/_basemap.dm
@@ -27,6 +27,9 @@
 		#include "map_files\slumbridge\slumbridge.dmm"
 		#include "map_files\DaedalusPrison\DaedalusPrison.dmm"
 		#include "map_files\riptide\riptide.dmm"
+		#include "map_files\lavaoutpost\LavaOutpost.dmm"
+		#include "map_files\desertdam\desertdam.dmm"
+		#include "map_files\corsat\corsat.dmm"
 		#ifdef CIBUILDING
 			#include "templates.dm"
 		#endif

diff --git a/_maps/corsat.json b/_maps/corsat.json
@@ -0,0 +1,11 @@
+{
+    "map_name": "CORSAT Research Station",
+    "map_path": "map_files/corsat",
+    "map_file": "corsat.dmm",
+	"disk_sets": {
+		"basic": 1
+	},
+    "armor": "prison",
+    "quickbuilds": 2300,
+	"announce_text": "A classified distress signal has been picked up by our scanners, which have tracked the source to Nanotrasen's Corporate Orbital Research Station for Advanced Technology research station, known as CORSAT. Through use of bluespace drive tech, the ship has jumped within range of the colony. TGMC, gear up and get ready to respond!"
+}
diff --git a/_maps/desertdam.json b/_maps/desertdam.json
@@ -0,0 +1,12 @@
+{
+    "map_name": "Chigusa",
+    "map_path": "map_files/desertdam",
+    "map_file": "desertdam.dmm",
+	"disk_sets": {
+		"basic": 1
+	},
+    "map_item_type": "/obj/item/map/desert_dam",
+    "armor": "desert",
+	"quickbuilds": 3300,
+	"announce_text": "We've lost contact with NT's extra-solar colony, \"Chigusa Dam\", on the planet \"Trivonus IV.\" Your ship has been dispatched to assist."
+}
diff --git a/_maps/lavaoutpost.json b/_maps/lavaoutpost.json
@@ -0,0 +1,10 @@
+{
+    "map_name": "Lava Outpost V1",
+    "map_path": "map_files/lavaoutpost",
+    "map_file": "LavaOutpost.dmm",
+	"disk_sets": {
+		"basic": 1
+	},
+	"quickbuilds": 1800,
+	"announce_text": "A faint distress signal has been picked up by our scanners, which have tracked the source to LO145. Through use of emergency bluespace drive tech, the ship has jumped within range of the outpost. Senior officers are present and will need to be evacuated in order to completely finish your mission. TGMC, gear up and get ready to respond!"
+}
diff --git a/_maps/lv624.json b/_maps/lv624.json
@@ -6,7 +6,7 @@
 		"basic": 1
 	},
     "armor": "jungle",
-	"quickbuilds": 1400,
+	"quickbuilds": 2000,
 	"announce_text": "A faint distress signal has been picked up by our scanners, which have tracked the source to a third generation colony, known as LV-624. Through use of bluespace drive tech, the ship has jumped within range of the colony. TGMC, gear up and get ready to respond!",
 	"traits":[{
 		"weather_acidrain": true

diff --git a/_maps/map_files/Arachne/TGS_Arachne.dmm b/_maps/map_files/Arachne/TGS_Arachne.dmm
@@ -25507,7 +25507,7 @@
 "vgK" = (
 /obj/structure/table/mainship/nometal,
 /obj/effect/spawner/random/food_or_drink/kitchenknife,
-/obj/item/tool/kitchen/tray,
+/obj/item/storage/kitchen_tray,
 /turf/open/floor/mainship/floor,
 /area/mainship/living/grunt_rnr)
 "vgL" = (

diff --git a/_maps/map_files/Campaign maps/jungle_outpost/jungle_outpost.dmm b/_maps/map_files/Campaign maps/jungle_outpost/jungle_outpost.dmm
@@ -1847,7 +1847,7 @@
 /area/campaign/jungle_outpost/ground/jungle/west)
 "jq" = (
 /obj/structure/table/mainship,
-/obj/item/tool/kitchen/tray,
+/obj/item/storage/kitchen_tray,
 /obj/effect/spawner/random/food_or_drink/burger,
 /turf/open/floor/tile/barber,
 /area/campaign/jungle_outpost/outpost/living/kitchen)
@@ -6810,7 +6810,7 @@
 /area/campaign/jungle_outpost/ground/river/east)
 "Iz" = (
 /obj/structure/table/mainship,
-/obj/item/tool/kitchen/tray,
+/obj/item/storage/kitchen_tray,
 /obj/effect/spawner/random/food_or_drink/burger,
 /obj/effect/spawner/random/food_or_drink/burger,
 /turf/open/floor/tile/barber,

diff --git a/_maps/map_files/Campaign maps/nt_base/nt_base.dmm b/_maps/map_files/Campaign maps/nt_base/nt_base.dmm
@@ -593,7 +593,7 @@
 /obj/item/reagent_containers/food/condiment/peppermill{
 	pixel_x = 9
 	},
-/obj/item/tool/kitchen/tray{
+/obj/item/storage/kitchen_tray{
 	pixel_y = 3
 	},
 /turf/open/floor/prison/whitepurple/full{
@@ -1925,8 +1925,8 @@
 /area/gelida/indoors/c_block/cargo)
 "buY" = (
 /obj/structure/table/mainship,
-/obj/item/tool/kitchen/tray,
-/obj/item/tool/kitchen/tray{
+/obj/item/storage/kitchen_tray,
+/obj/item/storage/kitchen_tray{
 	pixel_y = 6
 	},
 /obj/item/trash/plate{
@@ -2912,7 +2912,7 @@
 /area/gelida/indoors/b_block/bridge)
 "cii" = (
 /obj/structure/table/mainship,
-/obj/item/tool/kitchen/tray{
+/obj/item/storage/kitchen_tray{
 	pixel_x = 3;
 	pixel_y = 7
 	},
@@ -4790,7 +4790,7 @@
 	pixel_x = -7;
 	pixel_y = 13
 	},
-/obj/item/tool/kitchen/tray{
+/obj/item/storage/kitchen_tray{
 	pixel_y = 5
 	},
 /turf/open/floor/carpet,
@@ -10042,7 +10042,7 @@
 	dir = 1
 	},
 /obj/structure/table/mainship,
-/obj/item/tool/kitchen/tray{
+/obj/item/storage/kitchen_tray{
 	pixel_y = 3
 	},
 /obj/item/reagent_containers/food/condiment/saltshaker,
@@ -12587,7 +12587,7 @@
 /obj/item/reagent_containers/food/condiment/saltshaker{
 	pixel_x = 3
 	},
-/obj/item/tool/kitchen/tray{
+/obj/item/storage/kitchen_tray{
 	pixel_y = 3
 	},
 /turf/open/floor/prison/whitepurple/full{
@@ -13397,7 +13397,7 @@
 /area/gelida/indoors/b_block/bridge)
 "jTA" = (
 /obj/structure/table/mainship,
-/obj/item/tool/kitchen/tray{
+/obj/item/storage/kitchen_tray{
 	pixel_x = 12;
 	pixel_y = -6
 	},
@@ -13858,10 +13858,10 @@
 /area/gelida/indoors/a_block/bridges)
 "knX" = (
 /obj/structure/table/mainship,
-/obj/item/tool/kitchen/tray{
+/obj/item/storage/kitchen_tray{
 	pixel_y = 5
 	},
-/obj/item/tool/kitchen/tray{
+/obj/item/storage/kitchen_tray{
 	pixel_x = 1;
 	pixel_y = 9
 	},
@@ -15785,7 +15785,7 @@
 	pixel_x = 9
 	},
 /obj/item/reagent_containers/food/condiment/saltshaker,
-/obj/item/tool/kitchen/tray{
+/obj/item/storage/kitchen_tray{
 	pixel_y = 3
 	},
 /obj/item/reagent_containers/food/snacks/sandwiches/tofubreadslice{
@@ -22348,10 +22348,10 @@
 /area/gelida/outdoors/colony_streets/north_east_street)
 "qpW" = (
 /obj/structure/table/mainship,
-/obj/item/tool/kitchen/tray{
+/obj/item/storage/kitchen_tray{
 	pixel_y = 9
 	},
-/obj/item/tool/kitchen/tray{
+/obj/item/storage/kitchen_tray{
 	pixel_y = 12
 	},
 /turf/open/floor/prison/plate,
@@ -28439,7 +28439,7 @@
 /area/gelida/indoors/a_block/medical)
 "uNc" = (
 /obj/structure/table/mainship,
-/obj/item/tool/kitchen/tray{
+/obj/item/storage/kitchen_tray{
 	pixel_y = 3
 	},
 /obj/item/reagent_containers/food/snacks/sliceable/pizzapasta/margherita{

diff --git a/_maps/map_files/Campaign maps/patricks_rest/patricks_rest.dmm b/_maps/map_files/Campaign maps/patricks_rest/patricks_rest.dmm
@@ -958,7 +958,7 @@
 /area/patricks_rest/ground/colonys)
 "es" = (
 /obj/structure/table/reinforced/prison,
-/obj/item/tool/kitchen/tray,
+/obj/item/storage/kitchen_tray,
 /turf/open/floor/grayscale/black,
 /area/patricks_rest/surface/building/residential_cent)
 "et" = (
@@ -3882,7 +3882,7 @@
 /area/patricks_rest/ground/colonys)
 "ru" = (
 /obj/structure/table/reinforced/prison,
-/obj/item/tool/kitchen/tray,
+/obj/item/storage/kitchen_tray,
 /turf/open/floor/prison/sterilewhite,
 /area/patricks_rest/surface/building/residential_cent)
 "rv" = (
@@ -4323,7 +4323,7 @@
 /area/patricks_rest/surface/building/offices)
 "tD" = (
 /obj/structure/table/reinforced,
-/obj/item/tool/kitchen/tray,
+/obj/item/storage/kitchen_tray,
 /obj/item/reagent_containers/food/snacks/soup/meatballsoup,
 /turf/open/floor/grayscale/black,
 /area/patricks_rest/surface/building/residential_cent)
@@ -4538,7 +4538,7 @@
 /obj/structure/window{
 	dir = 4
 	},
-/obj/item/tool/kitchen/tray,
+/obj/item/storage/kitchen_tray,
 /turf/open/floor/grayscale/black,
 /area/patricks_rest/surface/building/residential_cent)
 "uE" = (
@@ -10782,7 +10782,7 @@
 /obj/structure/window{
 	dir = 8
 	},
-/obj/item/tool/kitchen/tray,
+/obj/item/storage/kitchen_tray,
 /turf/open/floor/grayscale/black,
 /area/patricks_rest/surface/building/residential_cent)
 "YZ" = (

diff --git a/_maps/map_files/Campaign maps/som_base/sombase.dmm b/_maps/map_files/Campaign maps/som_base/sombase.dmm
@@ -9600,7 +9600,7 @@
 /area/rocinante_base/surface/building/administration/central_com)
 "nzS" = (
 /obj/structure/table/black,
-/obj/item/tool/kitchen/tray,
+/obj/item/storage/kitchen_tray,
 /turf/open/floor/mainship/red{
 	dir = 1
 	},
@@ -13181,7 +13181,7 @@
 /area/rocinante_base/surface/building/living/barracks)
 "sDO" = (
 /obj/structure/table/black,
-/obj/item/tool/kitchen/tray,
+/obj/item/storage/kitchen_tray,
 /turf/open/floor/mainship/red{
 	dir = 9
 	},

diff --git a/_maps/map_files/Campaign maps/som_raid_base/som_raiding_base.dmm b/_maps/map_files/Campaign maps/som_raid_base/som_raiding_base.dmm
@@ -137,7 +137,7 @@
 /area/campaign/som_raiding/outpost/tunnel)
 "aW" = (
 /obj/structure/table/mainship,
-/obj/item/tool/kitchen/tray,
+/obj/item/storage/kitchen_tray,
 /obj/effect/spawner/random/food_or_drink/burger,
 /obj/effect/spawner/random/food_or_drink/burger,
 /turf/open/floor/tile/barber,
@@ -2470,7 +2470,7 @@
 /area/campaign/som_raiding/outpost/security/south_post)
 "ng" = (
 /obj/structure/table/mainship,
-/obj/item/tool/kitchen/tray,
+/obj/item/storage/kitchen_tray,
 /obj/effect/spawner/random/food_or_drink/burger,
 /turf/open/floor/tile/barber,
 /area/campaign/som_raiding/outpost/living/kitchen)

diff --git a/_maps/map_files/DaedalusPrison/DaedalusPrison.dmm b/_maps/map_files/DaedalusPrison/DaedalusPrison.dmm
@@ -5402,7 +5402,7 @@
 /area/daedalusprison/inside/cargo)
 "evD" = (
 /obj/structure/table/mainship,
-/obj/item/tool/kitchen/tray,
+/obj/item/storage/kitchen_tray,
 /obj/machinery/atmospherics/pipe/simple/green/hidden,
 /obj/effect/landmark/weed_node,
 /turf/open/floor/prison/kitchen,
@@ -17332,7 +17332,7 @@
 /area/daedalusprison/inside/security/medsec)
 "olj" = (
 /obj/structure/table/mainship,
-/obj/item/tool/kitchen/tray,
+/obj/item/storage/kitchen_tray,
 /turf/open/floor/prison/kitchen,
 /area/daedalusprison/inside/kitchen)
 "oly" = (
@@ -28560,7 +28560,7 @@
 /area/daedalusprison/inside/janitorial)
 "xdB" = (
 /obj/structure/table/mainship,
-/obj/item/tool/kitchen/tray,
+/obj/item/storage/kitchen_tray,
 /obj/effect/landmark/weed_node,
 /turf/open/floor/prison/kitchen,
 /area/daedalusprison/inside/kitchen)