Merge Upstream 30.07.2024 (#1399)

## Что этот PR делает Заменяет Skill Issue хэдэдэ на мой ## Changelog :cl: ParadiseSS13 add: Трейторы теперь будут получать целы спустя 5-15 минут после начала раунда add: Новая космическая руина - спутник телекомов fix: Электродемон теперь должен умирать реже при спавне fix: Нося защиту от радиации, все вещи под защитой, например, сумки, больше не будут облучаться fix: МОДы с защитой от радиации, теперь не защищают от радиации, если заряда меньше 1000 fix: Патроны с горохом теперь отбрасывают жертву при попадании fix: Зарядники снова могут быть улучшены с помощью RPED fix: Destroyer и борги Гамма ЕРТ теперь блочат флеш del: Удалены кодовые слова напитков и имён членов экипажей fix: И куча мелких фиксов /:cl:
ss220club · Jul 30, 2024 · 80569ad · 80569ad
2 parents e20712c + 856596c
commit 80569ad
Show file tree

Hide file tree

Showing 449 changed files with 18,350 additions and 5,831 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -1,18 +1,26 @@
 {
 	"version": "0.2.0",
 	"configurations": [
-	  {
+	{
 		"type": "byond",
 		"request": "launch",
 		"name": "Build & DS Debug",
 		"preLaunchTask": "dm: build - ${command:CurrentDME}",
 		"dmb": "${workspaceFolder}/${command:CurrentDMB}"
-	  },
-	  {
+	},
+	{
+		"type": "byond",
+		"request": "launch",
+		"name": "Build & DD Debug",
+		"preLaunchTask": "dm: build - ${command:CurrentDME}",
+		"dmb": "${workspaceFolder}/${command:CurrentDMB}",
+		"dreamDaemon": true
+	},
+	{
 		"type": "byond",
 		"request": "launch",
 		"name": "DS Debug",
 		"dmb": "${workspaceFolder}/${command:CurrentDMB}"
-	  }
+	}
 	]
-  }
+}
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 > [!IMPORTANT]
-> July is a month of focus on "Quality releases", this means no new balance or feature PRs are permitted without prior approval.</br>
+> We are currently in a period of focus on "Quality releases", this means no new balance or feature PRs are permitted without prior approval.</br>
 > [For more info, see the following discord post on our public discord](https://discord.com/channels/145533722026967040/499000353312735233/1256632472196878337)
 
 <a href="#"><img src=".github/assets/paradise.png" alt="Paradise Station"></a>

diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm
@@ -102,7 +102,7 @@
 /area/ruin/powered/snow_cabin)
 "ax" = (
 /obj/structure/table/wood,
-/obj/item/food/snacks/beans,
+/obj/item/food/beans,
 /turf/simulated/floor/wood,
 /area/ruin/powered/snow_cabin)
 "ay" = (

diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_excavation.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_excavation.dmm
@@ -665,7 +665,7 @@
 /area/lavaland/surface/outdoors)
 "ie" = (
 /obj/structure/table,
-/obj/item/food/snacks/badrecipe,
+/obj/item/food/badrecipe,
 /turf/simulated/floor/plating/lavaland_air,
 /area/ruin/unpowered/althland_excavation)
 "iv" = (
@@ -1088,8 +1088,8 @@
 "Cs" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/table_frame,
-/obj/item/food/snacks/badrecipe,
-/obj/item/food/snacks/badrecipe{
+/obj/item/food/badrecipe,
+/obj/item/food/badrecipe{
 	pixel_y = 14;
 	pixel_x = 14
 	},
@@ -1313,7 +1313,7 @@
 /area/lavaland/surface/outdoors)
 "OX" = (
 /obj/structure/table_frame,
-/obj/item/food/snacks/badrecipe,
+/obj/item/food/badrecipe,
 /turf/simulated/floor/plating/lavaland_air,
 /area/ruin/unpowered/althland_excavation)
 "Pe" = (

diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm
@@ -36,7 +36,7 @@
 /turf/simulated/floor/wood/lavaland_air,
 /area/ruin/powered/pizza_party)
 "j" = (
-/obj/item/food/snacks/mushroompizzaslice,
+/obj/item/food/mushroompizzaslice,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating/lavaland_air,
 /area/ruin/powered/pizza_party)
@@ -147,18 +147,18 @@
 /area/ruin/powered/pizza_party)
 "D" = (
 /obj/structure/table/wood,
-/obj/item/food/snacks/margheritapizzaslice,
+/obj/item/food/margheritapizzaslice,
 /obj/item/trash/plate,
 /turf/simulated/floor/wood/lavaland_air,
 /area/ruin/powered/pizza_party)
 "E" = (
 /obj/structure/table/wood,
-/obj/item/food/snacks/meatpizzaslice,
+/obj/item/food/meatpizzaslice,
 /turf/simulated/floor/wood/lavaland_air,
 /area/ruin/powered/pizza_party)
 "F" = (
 /obj/structure/table/wood,
-/obj/item/food/snacks/sliceable/birthdaycake,
+/obj/item/food/sliceable/birthdaycake,
 /turf/simulated/floor/wood/lavaland_air,
 /area/ruin/powered/pizza_party)
 "G" = (

diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm
@@ -119,7 +119,7 @@
 /obj/effect/mapping_helpers/no_lava,
 /obj/effect/mob_spawn/human/corpse/seed_vault_diona,
 /obj/item/pickaxe/mini,
-/obj/item/food/snacks/grown/mushroom/glowshroom{
+/obj/item/food/grown/mushroom/glowshroom{
 	pixel_x = 8;
 	pixel_y = -8
 	},

diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm
@@ -25,7 +25,7 @@
 /area/ruin/powered/sloth)
 "f" = (
 /obj/structure/table/wood,
-/obj/item/food/snacks/grown/citrus/orange,
+/obj/item/food/grown/citrus/orange,
 /turf/simulated/floor/sepia{
 	slowdown = 10
 	},

diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_watcher_grave.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_watcher_grave.dmm
@@ -34,7 +34,7 @@
 /obj/structure/stone_tile{
 	dir = 1
 	},
-/obj/item/food/snacks/egg/watcher,
+/obj/item/food/egg/watcher,
 /obj/effect/mapping_helpers/no_lava,
 /obj/effect/mapping_helpers/no_lava,
 /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm b/_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm
@@ -539,7 +539,7 @@
 /area/ruin/space/unpowered)
 "bn" = (
 /obj/structure/table/reinforced,
-/obj/item/food/snacks/carrotfries,
+/obj/item/food/carrotfries,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/blowntcommsat.dmm b/_maps/map_files/RandomRuins/SpaceRuins/blowntcommsat.dmm
@@ -587,7 +587,7 @@
 /turf/simulated/wall/r_wall,
 /area/space/nearstation)
 "Nw" = (
-/obj/item/food/snacks/xenomeatbreadslice{
+/obj/item/food/xenomeatbreadslice{
 	name = "green mold bread slice"
 	},
 /turf/simulated/floor/plating/airless,

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/casino.dmm b/_maps/map_files/RandomRuins/SpaceRuins/casino.dmm
@@ -200,6 +200,15 @@
 	},
 /turf/space,
 /area/space)
+"ft" = (
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment,
+/turf/simulated/floor/plating,
+/area/ruin/space/powered/casino/engine)
 "fG" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 10
@@ -389,9 +398,7 @@
 /turf/simulated/floor/mineral/titanium/blue/airless,
 /area/ruin/space/powered/casino/docked_ships)
 "jh" = (
-/obj/machinery/light/small{
-	dir = 2
-	},
+/obj/machinery/light/small,
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
@@ -595,7 +602,7 @@
 /turf/simulated/floor/mineral/silver,
 /area/ruin/space/powered/casino/hall)
 "od" = (
-/obj/item/food/snacks/grown/lily,
+/obj/item/food/grown/lily,
 /turf/simulated/floor/beach/away/water/deep,
 /area/ruin/space/powered/casino/hall)
 "oi" = (
@@ -1035,7 +1042,7 @@
 /turf/simulated/floor/plating,
 /area/ruin/space/powered/casino/maints)
 "Aw" = (
-/obj/effect/spawner/airlock/engineer,
+/obj/effect/spawner/airlock,
 /turf/simulated/wall,
 /area/ruin/space/powered/casino/floor)
 "AF" = (
@@ -1166,7 +1173,6 @@
 /area/ruin/space/powered/casino/maints)
 "DL" = (
 /obj/machinery/light{
-	dir = 2;
 	brightness_color = "#FF0000";
 	color = "#FF0000"
 	},
@@ -3465,7 +3471,7 @@ mp
 Eq
 fG
 jS
-jS
+ft
 jS
 wo
 Xe

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm
@@ -318,11 +318,11 @@
 /area/ruin/space/unpowered)
 "aF" = (
 /obj/structure/closet/cardboard,
-/obj/item/food/snacks/beans,
-/obj/item/food/snacks/beans,
-/obj/item/food/snacks/beans,
-/obj/item/food/snacks/beans,
-/obj/item/food/snacks/beans,
+/obj/item/food/beans,
+/obj/item/food/beans,
+/obj/item/food/beans,
+/obj/item/food/beans,
+/obj/item/food/beans,
 /turf/simulated/floor/plasteel,
 /area/ruin/space/unpowered)
 "aG" = (
@@ -649,7 +649,7 @@
 /area/ruin/space/unpowered)
 "bD" = (
 /obj/structure/table,
-/obj/item/food/snacks/beans,
+/obj/item/food/beans,
 /turf/simulated/floor/plasteel{
 	icon_state = "bar"
 	},

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/derelict2.dmm b/_maps/map_files/RandomRuins/SpaceRuins/derelict2.dmm
@@ -67,7 +67,7 @@
 /obj/item/trash/plate{
 	pixel_x = -10
 	},
-/obj/item/food/snacks/burger/ghost,
+/obj/item/food/burger/ghost,
 /turf/simulated/floor/plasteel,
 /area/ruin/space/powered)
 "o" = (

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm b/_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm
@@ -279,10 +279,10 @@
 /area/ruin/space/unpowered)
 "SX" = (
 /obj/structure/table,
-/obj/item/food/snacks/beans{
+/obj/item/food/beans{
 	pixel_x = 10
 	},
-/obj/item/food/snacks/beans{
+/obj/item/food/beans{
 	pixel_x = -5
 	},
 /turf/simulated/floor/plasteel,

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/druglab.dmm b/_maps/map_files/RandomRuins/SpaceRuins/druglab.dmm
@@ -51,7 +51,7 @@
 /area/ruin/space/methlab)
 "l" = (
 /obj/structure/table,
-/obj/item/food/snacks/chips,
+/obj/item/food/chips,
 /turf/simulated/floor/plating,
 /area/ruin/space/methlab)
 "m" = (

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm b/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm
@@ -95,16 +95,16 @@
 /area/ruin/unpowered/BMPship/Delta)
 "ax" = (
 /obj/structure/closet/crate/freezer,
-/obj/item/food/snacks/meat,
-/obj/item/food/snacks/meat,
+/obj/item/food/meat,
+/obj/item/food/meat,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
 /turf/simulated/floor/plating,
 /area/ruin/unpowered/BMPship/Delta)
 "ay" = (
 /obj/structure/closet/crate/freezer,
-/obj/item/food/snacks/meat,
+/obj/item/food/meat,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
@@ -517,7 +517,7 @@
 "cb" = (
 /obj/structure/table,
 /obj/item/kitchen/knife/butcher,
-/obj/item/food/snacks/meat,
+/obj/item/food/meat,
 /turf/simulated/floor/plasteel{
 	icon_state = "barber"
 	},
@@ -600,7 +600,7 @@
 /turf/simulated/wall/mineral/titanium,
 /area/ruin/unpowered/BMPship/Aft)
 "cp" = (
-/obj/item/food/snacks/hugemushroomslice,
+/obj/item/food/hugemushroomslice,
 /turf/simulated/floor/plasteel{
 	icon_state = "bar"
 	},
@@ -699,7 +699,7 @@
 /turf/simulated/floor/carpet,
 /area/ruin/unpowered/BMPship/Fore)
 "cH" = (
-/obj/item/food/snacks/hugemushroomslice,
+/obj/item/food/hugemushroomslice,
 /turf/simulated/floor/plasteel,
 /area/ruin/unpowered/BMPship/Midship)
 "cI" = (
@@ -739,8 +739,8 @@
 /area/ruin/unpowered/BMPship/Aft)
 "cP" = (
 /obj/structure/closet/crate/freezer,
-/obj/item/food/snacks/meat,
-/obj/item/food/snacks/meat,
+/obj/item/food/meat,
+/obj/item/food/meat,
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
 	},
@@ -835,7 +835,7 @@
 	},
 /area/ruin/unpowered/BMPship/Midship)
 "di" = (
-/obj/item/food/snacks/meat,
+/obj/item/food/meat,
 /turf/simulated/floor/plasteel{
 	icon_state = "showroomfloor"
 	},
@@ -1819,7 +1819,7 @@
 /area/ruin/unpowered/BMPship/Fore)
 "fS" = (
 /obj/structure/closet/crate/freezer,
-/obj/item/food/snacks/meat,
+/obj/item/food/meat,
 /turf/simulated/floor/plasteel{
 	icon_state = "showroomfloor"
 	},
@@ -2252,7 +2252,7 @@
 /turf/simulated/floor/plating/airless,
 /area/ruin/powered)
 "hn" = (
-/obj/item/food/snacks/chips,
+/obj/item/food/chips,
 /turf/simulated/floor/plating/airless,
 /area/ruin/powered)
 "ho" = (
@@ -2354,8 +2354,8 @@
 /area/ruin/unpowered/BMPship/Midship)
 "IM" = (
 /obj/structure/closet/crate/freezer,
-/obj/item/food/snacks/meat,
-/obj/item/food/snacks/hugemushroomslice,
+/obj/item/food/meat,
+/obj/item/food/hugemushroomslice,
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
 	},

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/mechtransport.dmm b/_maps/map_files/RandomRuins/SpaceRuins/mechtransport.dmm
@@ -299,7 +299,7 @@
 /area/ruin/space/mech_transport)
 "uU" = (
 /obj/structure/table,
-/obj/item/food/snacks/cornchips{
+/obj/item/food/cornchips{
 	pixel_y = 4
 	},
 /turf/simulated/floor/mineral/plastitanium/red/airless,