From e12500a5519349343214c83606168320bb4d0b19 Mon Sep 17 00:00:00 2001 From: Terra1 Date: Mon, 15 Apr 2024 00:42:08 +0200 Subject: [PATCH 1/2] Bunch of small map fixes for Constantinopoli --- maps/WIP/landing_at_constantinopoli.dmm | 1080 +++++++++++++---------- 1 file changed, 632 insertions(+), 448 deletions(-) diff --git a/maps/WIP/landing_at_constantinopoli.dmm b/maps/WIP/landing_at_constantinopoli.dmm index cc530efbd4..10645b3a09 100644 --- a/maps/WIP/landing_at_constantinopoli.dmm +++ b/maps/WIP/landing_at_constantinopoli.dmm @@ -90,6 +90,12 @@ /obj/item/ammo_magazine/ak74/ak74m, /turf/floor/plating/steel, /area/caribbean/roofed) +"bi" = ( +/obj/structure/window/classic/metal, +/obj/structure/barricade/steel, +/obj/covers/jail/steeljail, +/turf/floor/plating/steel, +/area/caribbean) "bj" = ( /obj/structure/table/modern/table, /obj/structure/radiorecorder{ @@ -295,6 +301,13 @@ /obj/effect/floor_decal/corner_oldtile/white/diagonal, /turf/floor/plating/steel, /area/caribbean/roofed) +"cM" = ( +/obj/covers/catwalk, +/obj/structure/boat_spawn_lever/north{ + x_offset = -2 + }, +/turf/floor/beach/water/shallowsaltwater, +/area/caribbean/roofed) "cT" = ( /obj/structure/shower{ icon_state = "shower"; @@ -343,7 +356,7 @@ /obj/structure/lamp/lamp_big/alwayson{ dir = 4 }, -/obj/structure/closet/anchored, +/obj/structure/closet/crate/sandbags, /turf/floor/plating/steel, /area/caribbean/roofed) "dq" = ( @@ -379,6 +392,14 @@ /obj/structure/table/rack/shelf, /turf/floor/plating/tiled/dark, /area/caribbean/roofed) +"dN" = ( +/obj/structure/table/modern/table, +/obj/structure/computer/nopower{ + dir = 1; + pixel_y = 5 + }, +/turf/floor/wood, +/area/caribbean/roofed) "dS" = ( /obj/covers/catwalk, /obj/structure/lamp/lamp_big/alwayson{ @@ -407,6 +428,11 @@ }, /turf/floor/plating/steel, /area/caribbean/roofed) +"es" = ( +/obj/structure/lamp/lamp_big/alwayson, +/obj/structure/closet/crate/sandbags, +/turf/floor/plating/tiled/dark, +/area/caribbean/roofed) "ez" = ( /obj/structure/closet/crate/ww2, /obj/item/ammo_magazine/a50cal_can, @@ -531,6 +557,13 @@ }, /turf/floor/dirt, /area/caribbean) +"fG" = ( +/obj/structure/lamp/lamp_big/alwayson{ + dir = 4 + }, +/obj/structure/closet/crate/sandbags, +/turf/floor/plating/tiled/dark, +/area/caribbean/roofed) "fR" = ( /obj/item/weapon/gun/projectile/submachinegun/g3, /obj/item/weapon/gun/projectile/submachinegun/g3, @@ -1144,6 +1177,15 @@ /obj/structure/railing/steel, /turf/floor/plating/cobblestone/vertical, /area/caribbean) +"kd" = ( +/obj/structure/table/rack/shelf, +/obj/item/weapon/grenade/antitank/rpg40, +/obj/item/weapon/grenade/antitank/rpg40, +/obj/item/weapon/grenade/antitank/rpg40, +/obj/item/weapon/grenade/antitank/rpg40, +/obj/item/weapon/grenade/antitank/rpg40, +/turf/floor/plating/steel, +/area/caribbean/roofed) "ke" = ( /obj/structure/railing/steel{ dir = 8 @@ -2232,7 +2274,7 @@ /obj/structure/lamp/lamp_big/alwayson{ dir = 4 }, -/obj/structure/closet/anchored, +/obj/structure/closet/crate/sandbags, /turf/floor/plating/steel, /area/caribbean/roofed) "tn" = ( @@ -2347,6 +2389,34 @@ /obj/structure/lamp/lamp_big/alwayson, /turf/floor/plating/tiled, /area/caribbean/roofed) +"uv" = ( +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/structure/table/rack/shelf, +/obj/effect/floor_decal/corner_steel_grid/diagonal, +/obj/effect/floor_decal/corner_steel_grid/diagonal{ + dir = 4 + }, +/turf/floor/plating/steel, +/area/caribbean/roofed) "uz" = ( /obj/structure/closet/crate/musketball, /obj/effect/decal/cleanable/dirt, @@ -2969,6 +3039,14 @@ /obj/item/weapon/reagent_containers/glass/barrel/fueltank/tank/fueledgasoline, /turf/floor/plating/steel, /area/caribbean/roofed) +"zL" = ( +/obj/structure/lamp/lamp_big/alwayson{ + dir = 1; + icon_state = "tube" + }, +/obj/structure/closet/crate/sandbags, +/turf/floor/plating/steel, +/area/caribbean/roofed) "zM" = ( /obj/item/weapon/reagent_containers/glass/bucket, /obj/item/weapon/reagent_containers/glass/bucket, @@ -3063,6 +3141,35 @@ }, /turf/floor/plating/steel, /area/caribbean/roofed) +"AV" = ( +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/structure/table/rack/shelf, +/obj/effect/floor_decal/corner_steel_grid/diagonal, +/obj/effect/floor_decal/corner_steel_grid/diagonal{ + dir = 4 + }, +/obj/structure/lamp/lamp_big/alwayson, +/turf/floor/plating/steel, +/area/caribbean/roofed) "AW" = ( /obj/structure/window/barrier/railing/stone{ dir = 1 @@ -3196,7 +3303,7 @@ /obj/structure/lamp/lamp_big/alwayson{ dir = 8 }, -/obj/structure/closet/anchored, +/obj/structure/closet/crate/sandbags, /turf/floor/plating/steel, /area/caribbean/roofed) "BS" = ( @@ -3929,6 +4036,10 @@ /obj/item/weapon/gun/projectile/automatic/stationary/maxim, /turf/floor/ship/wood_ship, /area/caribbean) +"HW" = ( +/obj/structure/closet/crate/sandbags, +/turf/floor/plating/tiled/dark, +/area/caribbean/roofed) "Ia" = ( /obj/structure/toilet, /obj/structure/lamp/lamp_big/alwayson{ @@ -4254,6 +4365,16 @@ /obj/item/weapon/reagent_containers/food/snacks/MRE/generic/french, /turf/floor/plating/tiled/dark, /area/caribbean/roofed) +"Km" = ( +/obj/structure/railing/steel{ + dir = 1 + }, +/obj/structure/lamp/lamp_big/alwayson{ + dir = 8 + }, +/obj/structure/closet/crate/sandbags, +/turf/floor/plating/steel, +/area/caribbean/roofed) "Ko" = ( /obj/covers/cement_wall, /turf/floor/dirt, @@ -4481,6 +4602,15 @@ /obj/structure/multiz/ladder/ww2/stairsdown, /turf/floor/plating/steel, /area/caribbean/roofed) +"Mp" = ( +/obj/structure/table/modern, +/obj/item/weapon/siegeladder/metal, +/obj/item/weapon/siegeladder/metal, +/obj/structure/sign/flag/russia/empire{ + pixel_y = 32 + }, +/turf/floor/plating/steel, +/area/caribbean/roofed) "Mu" = ( /obj/structure/wild/tallgrass2, /turf/floor/dirt/dust, @@ -4541,7 +4671,6 @@ /area/caribbean/roofed) "Nr" = ( /obj/structure/table/modern/table, -/obj/structure/computer/nopower, /obj/structure/lamp/lamp_big/alwayson, /turf/floor/wood, /area/caribbean/roofed) @@ -4589,10 +4718,15 @@ /turf/wall/cement, /area/caribbean/roofed) "NJ" = ( -/obj/structure/vehicle/boat/rhib/premade{ - dir = 1 +/obj/structure/lamp/lamp_big/alwayson{ + dir = 1; + icon_state = "tube" }, -/turf/floor/beach/water/shallowsaltwater, +/obj/structure/closet/crate/sandbags, +/obj/structure/railing/steel{ + dir = 4 + }, +/turf/floor/plating/steel, /area/caribbean/roofed) "NL" = ( /obj/structure/barricade/sandstone_v, @@ -4693,13 +4827,7 @@ /turf/floor/plating/tiled/dark, /area/caribbean/roofed) "OH" = ( -/obj/structure/railing/steel{ - dir = 1 - }, -/obj/structure/lamp/lamp_big/alwayson{ - dir = 8 - }, -/obj/structure/closet/anchored, +/obj/structure/closet/crate/sandbags, /turf/floor/plating/steel, /area/caribbean/roofed) "OL" = ( @@ -5127,9 +5255,6 @@ /area/caribbean) "Ri" = ( /obj/structure/table/modern/table, -/obj/structure/computer/nopower{ - dir = 4 - }, /obj/structure/lamp/lamp_big/alwayson, /obj/structure/sign/flag/usa{ pixel_x = -32 @@ -5272,6 +5397,38 @@ /obj/structure/window/barrier/railing/stone, /turf/floor/plating/cobblestone/vertical, /area/caribbean) +"Sr" = ( +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/item/cannon_ball/shell/naval/HE380, +/obj/structure/table/rack/shelf, +/obj/effect/floor_decal/corner_steel_grid/diagonal, +/obj/effect/floor_decal/corner_steel_grid/diagonal{ + dir = 4 + }, +/obj/structure/lamp/lamp_big/alwayson{ + dir = 1; + icon_state = "tube" + }, +/turf/floor/plating/steel, +/area/caribbean/roofed) "St" = ( /obj/structure/closet/crate/ww2/mortar_shells, /turf/floor/plating/tiled, @@ -5376,6 +5533,19 @@ }, /turf/floor/plating/cobblestone/vertical/dark, /area/caribbean) +"Tl" = ( +/obj/structure/lamp/lamp_big/alwayson{ + dir = 1; + icon_state = "tube" + }, +/obj/structure/table/rack/shelf, +/obj/item/weapon/grenade/antitank/rpg40, +/obj/item/weapon/grenade/antitank/rpg40, +/obj/item/weapon/grenade/antitank/rpg40, +/obj/item/weapon/grenade/antitank/rpg40, +/obj/item/weapon/grenade/antitank/rpg40, +/turf/floor/plating/steel, +/area/caribbean/roofed) "Tq" = ( /obj/covers/cement_wall{ layer = 11 @@ -5496,12 +5666,12 @@ /turf/floor/plating/cobblestone/vertical, /area/caribbean) "UK" = ( -/obj/structure/table/modern/table, -/obj/structure/computer/nopower{ - dir = 4 +/obj/item/weapon/bedsheet/brown, +/obj/effect/landmark{ + name = "JoinLateRO" }, -/obj/structure/lamp/lamp_big/alwayson, -/turf/floor/wood, +/obj/structure/bed/wood, +/turf/floor/plating/steel, /area/caribbean/roofed) "UM" = ( /obj/structure/multiz/ladder/ww2/stairsup{ @@ -5720,10 +5890,28 @@ }, /turf/floor/beach/water/shallowsaltwater, /area/caribbean/roofed) +"Xi" = ( +/obj/structure/lamp/lamp_big/alwayson{ + dir = 1; + icon_state = "tube" + }, +/obj/structure/closet/crate/sandbags, +/obj/structure/railing/steel{ + dir = 8 + }, +/turf/floor/plating/steel, +/area/caribbean/roofed) "Xk" = ( /obj/item/weapon/beartrap/armed, /turf/floor/dirt/dust, /area/caribbean) +"Xn" = ( +/obj/covers/catwalk, +/obj/structure/boat_spawn_lever/north{ + x_offset = 2 + }, +/turf/floor/beach/water/shallowsaltwater, +/area/caribbean/roofed) "Xq" = ( /obj/structure/window/barrier/railing{ icon_state = "sandstone"; @@ -5961,10 +6149,6 @@ /turf/floor/plating/cobblestone/vertical/dark, /area/caribbean) "Zy" = ( -/obj/structure/lamp/lamp_big/alwayson{ - dir = 1; - icon_state = "tube" - }, /obj/structure/fob_spawnpoint{ faction_text = "RUSSIAN"; pickedname = "Apraksin"; @@ -6899,7 +7083,7 @@ sl sl sl sl -sl +HW Tq tQ YY @@ -7102,7 +7286,7 @@ sl xr Tq SX -sl +HW Tq YY YY @@ -8078,9 +8262,9 @@ Ic Ic Ic Tq -YY -YY -YY +uv +Zz +uv Tq sl Tq @@ -8281,9 +8465,9 @@ Ic Ic Ic Tq -iI -YY -IF +Sr +Zz +AV Tq sl Tq @@ -8436,7 +8620,7 @@ Zz Zz EC XA -bK +Mp Zz Zz XA @@ -8484,9 +8668,9 @@ Ic Ic Ic Tq -YY -YY -YY +uv +Zz +uv Tq sl Tq @@ -9444,7 +9628,7 @@ Zz Zz Zz MM -Zz +Zy MM Zz Zz @@ -9702,9 +9886,9 @@ Ic Ic Ic Tq -YY -YY -YY +uv +Zz +uv Tq sl Tq @@ -9905,9 +10089,9 @@ Ic Ic Ic Tq -iI -YY -IF +Sr +Zz +AV Tq sl Tq @@ -9935,7 +10119,7 @@ Tq Tq Tq Tq -sl +HW tn Tq dJ @@ -10108,9 +10292,9 @@ Ic Ic Ic Tq -YY -YY -YY +uv +Zz +uv Tq sl Tq @@ -10138,7 +10322,7 @@ Gl Gl Gl Tq -sl +HW sl sl sl @@ -10466,7 +10650,7 @@ mL Zz gN XA -bK +Mp Zz Zz XA @@ -11278,7 +11462,7 @@ mL Zz FH XA -mq +Fv Zz Zz XA @@ -11326,9 +11510,9 @@ Ic Ic Ic Tq -YY -YY -YY +uv +Zz +uv Tq sl Tq @@ -11481,7 +11665,7 @@ Zz Zz iL XA -mq +Fv Zz Zz XA @@ -11529,9 +11713,9 @@ Ic Ic Ic Tq -iI -YY -IF +Sr +Zz +AV Tq sl Tq @@ -11732,9 +11916,9 @@ Ic Ic Ic Tq -YY -YY -YY +uv +Zz +uv Tq sl Tq @@ -15442,7 +15626,7 @@ Ic Tq BP WZ -xU +Km Tq Ic Ic @@ -15541,7 +15725,7 @@ Zz Zz EC XA -bK +Mp Zz Zz XA @@ -16031,8 +16215,8 @@ Jk sl sl sl -sl -sl +HW +HW Jk sl Ng @@ -16429,9 +16613,9 @@ sl sl LA sl -sl -Ng -sl +es +Tq +SX sl sl sl @@ -16549,7 +16733,7 @@ Zz Zz Zz MM -Zz +ZH MM Zz Zz @@ -16839,8 +17023,8 @@ sl Ng sl sl -MG -sl +fG +HW sl sl sl @@ -17571,7 +17755,7 @@ mL Zz gN XA -bK +Mp Zz Zz XA @@ -17876,9 +18060,9 @@ Ic Ic Ic Tq -BP +iT WZ -OH +xU Tq Ic Ic @@ -18051,7 +18235,7 @@ sl sl sl sl -sl +HW Tq Ic Tq @@ -18253,8 +18437,8 @@ sl sl sl sl -sl -tn +HW +es Tq Ic Tq @@ -21070,9 +21254,9 @@ Ic Ic Ic Tq -YY -YY -YY +uv +Zz +uv Tq sl Tq @@ -21273,9 +21457,9 @@ Ic Ic Ic Tq -iI -YY -IF +Sr +Zz +AV Tq sl Tq @@ -21476,9 +21660,9 @@ Ic Ic Ic Tq -YY -YY -YY +uv +Zz +uv Tq sl Tq @@ -22646,7 +22830,7 @@ Zz Zz EC XA -bK +Mp Zz Zz XA @@ -22694,9 +22878,9 @@ Ic Ic Ic Tq -YY -YY -YY +uv +Zz +uv Tq sl Tq @@ -22897,9 +23081,9 @@ Ic Ic Ic Tq -iI -YY -IF +Sr +Zz +AV Tq sl Bw @@ -22927,6 +23111,7 @@ Tq RT Zz Tq +HW sl sl sl @@ -22935,8 +23120,7 @@ sl sl sl sl -sl -sl +HW Tq YY YY @@ -23100,9 +23284,9 @@ Ic Ic Ic Tq -YY -YY -YY +uv +Zz +uv Tq sl Tq @@ -23130,7 +23314,7 @@ Tq RT dX Tq -sl +HW tn Tq fq @@ -23139,7 +23323,7 @@ sl xr Tq SX -sl +HW Tq Vb gI @@ -23654,7 +23838,7 @@ Zz Zz Zz MM -Zz +jW MM Zz Zz @@ -24318,9 +24502,9 @@ Ic Ic Ic Tq -YY -YY -YY +uv +Zz +uv Tq sl Tq @@ -24521,9 +24705,9 @@ Ic Ic Ic Tq -iI -YY -IF +Sr +Zz +AV Tq sl Tq @@ -24676,7 +24860,7 @@ mL Zz gN XA -bK +Mp Zz Zz XA @@ -24724,9 +24908,9 @@ Ic Ic Ic Tq -YY -YY -YY +uv +Zz +uv Tq sl Tq @@ -27755,7 +27939,7 @@ sw rr kl Fg -EA +dN Cc FA FA @@ -28382,7 +28566,7 @@ hD Ar Cm jn -hD +bi qJ IY bx @@ -28507,8 +28691,8 @@ MQ lY XA XA -TK -Zz +Tl +kd Zz kj Zz @@ -29147,7 +29331,7 @@ XA XA XA XA -TK +Xi Zz Zz dX @@ -29325,7 +29509,7 @@ Fw Fw PX Fw -Fw +Xn Fw PX Fw @@ -29333,7 +29517,7 @@ Fw Fw PX Fw -Fw +Xn Fw PX Fw @@ -29343,14 +29527,14 @@ Fw Fw PX Fw -Fw +Xn Fw Fw Fw Fw ok Gy -Zz +OH Zz ro Zz @@ -29522,38 +29706,38 @@ MQ lY Od ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki Fw XA -Zz +OH Zz nL Zz @@ -29756,7 +29940,7 @@ ki ki Fw XA -Zz +OH Zz Sy Zz @@ -29928,38 +30112,38 @@ MQ lY Od ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki Fw XA -Zz +OH Zz Zz Zz @@ -29988,7 +30172,7 @@ sw Yh kl kY -UK +Nr kl FA FA @@ -30006,7 +30190,7 @@ hD Ar Cm jn -hD +bi qJ IY bx @@ -30162,7 +30346,7 @@ ki ki Fw XA -Zz +OH Zz Zz Zz @@ -30191,7 +30375,7 @@ sw rr kl Fg -EA +dN Cc FA FA @@ -30365,7 +30549,7 @@ Xf Fw ok Gy -Zy +zL Zz Zz dX @@ -30537,38 +30721,38 @@ MQ lY Od ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki Fw XA -Zz +OH Zz Zz Zz @@ -30771,7 +30955,7 @@ ki ki Fw XA -Zz +OH Zz Zz Zz @@ -30943,38 +31127,38 @@ MQ lY Od ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki Fw XA -Zz +OH Zz WO Zz @@ -31177,7 +31361,7 @@ ki ki Fw XA -Zz +OH Zz WO Zz @@ -31355,7 +31539,7 @@ Fw Fw dS Fw -Fw +cM Fw dS Fw @@ -31363,7 +31547,7 @@ Fw Fw dS Fw -Fw +cM Fw dS Fw @@ -31373,14 +31557,14 @@ Fw Fw dS Fw -Fw +cM Fw Fw Fw Fw ok Gy -Zz +OH Zz fs Zz @@ -31583,7 +31767,7 @@ XA XA XA XA -TK +NJ Zz Zz dX @@ -31630,7 +31814,7 @@ hD Ar Cm jn -hD +bi qJ IY bx @@ -32161,8 +32345,8 @@ MQ lY XA XA -TK -Zz +Tl +kd Zz kj Zz @@ -32424,7 +32608,7 @@ sw rr kl Fg -EA +dN Cc FA FA @@ -32454,11 +32638,11 @@ bx bx Cg ge -RO -RO -RO -RO -RO +UK +UK +UK +UK +UK dX ge cj @@ -33254,7 +33438,7 @@ hD Ar Cm jn -hD +bi qJ IY bx @@ -33266,11 +33450,11 @@ bx bx Cg ge -RO -RO -RO -RO -RO +UK +UK +UK +UK +UK dX ge cj @@ -33469,11 +33653,11 @@ bx bx bI ge -RO -RO -RO -RO -RO +UK +UK +UK +UK +UK dX ge cj @@ -34281,11 +34465,11 @@ bx bx bI ge -RO -RO -RO -RO -RO +UK +UK +UK +UK +UK dX ge cj @@ -34657,7 +34841,7 @@ sw Yh kl kY -UK +Nr kl FA FA @@ -34860,7 +35044,7 @@ sw rr kl Fg -EA +dN Cc FA FA @@ -35093,11 +35277,11 @@ bx bx bI ge -RO -RO -RO -RO -RO +UK +UK +UK +UK +UK dX ge cj @@ -35612,8 +35796,8 @@ MQ lY XA XA -TK -Zz +Tl +kd Zz kj Zz @@ -35905,11 +36089,11 @@ sf sf bI ge -RO -RO -RO -RO -RO +UK +UK +UK +UK +UK dX ge cj @@ -36252,7 +36436,7 @@ XA XA XA XA -TK +Xi Zz Zz dX @@ -36311,11 +36495,11 @@ bx bx bI ge -RO -RO -RO -RO -RO +UK +UK +UK +UK +UK dX ge cj @@ -36430,7 +36614,7 @@ Fw Fw PX Fw -Fw +Xn Fw PX Fw @@ -36438,7 +36622,7 @@ Fw Fw PX Fw -Fw +Xn Fw PX Fw @@ -36448,14 +36632,14 @@ Fw Fw PX Fw -Fw +Xn Fw Fw Fw Fw ok BY -Zz +OH Zz ro Zz @@ -36627,38 +36811,38 @@ MQ lY Od ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki Fw XA -Zz +OH Zz nL Zz @@ -36861,7 +37045,7 @@ ki ki Fw XA -Zz +OH Zz Sy Zz @@ -37033,38 +37217,38 @@ MQ lY Od ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki Fw XA -Zz +OH Zz Zz Zz @@ -37267,7 +37451,7 @@ ki ki Fw XA -Zz +OH Zz Zz Zz @@ -37470,7 +37654,7 @@ Xf Fw ok BY -ZH +OH Zz Zz Zz @@ -37642,38 +37826,38 @@ MQ lY Od ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki Fw XA -Zz +OH Zz Zz Zz @@ -37876,7 +38060,7 @@ ki ki Fw XA -Zz +OH Zz Zz Zz @@ -38048,38 +38232,38 @@ MQ lY Od ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki Fw XA -Zz +OH Zz WO Zz @@ -38282,7 +38466,7 @@ ki ki Fw XA -Zz +OH Zz WO Zz @@ -38341,10 +38525,10 @@ bx bx bI ge -RO -RO -RO -RO +UK +UK +UK +UK RO dX ge @@ -38460,7 +38644,7 @@ Fw Fw dS Fw -Fw +cM Fw dS Fw @@ -38468,7 +38652,7 @@ Fw Fw dS Fw -Fw +cM Fw dS Fw @@ -38478,14 +38662,14 @@ Fw Fw dS Fw -Fw +cM Fw Fw Fw Fw ok BY -Zz +OH Zz fs Zz @@ -38688,7 +38872,7 @@ XA XA XA XA -TK +NJ Zz Zz dX @@ -38747,11 +38931,11 @@ sf sf bI ge -RO -RO -RO -RO -RO +UK +UK +UK +UK +UK dX ge cj @@ -39266,8 +39450,8 @@ MQ lY XA XA -TK -Zz +Tl +kd Zz kj Zz @@ -39559,11 +39743,11 @@ bx bx bI ge -RO -RO -RO -RO -RO +UK +UK +UK +UK +UK dX ge cj @@ -39732,7 +39916,7 @@ sw rr kl Fg -EA +dN Cc FA FA @@ -40371,11 +40555,11 @@ bx bx bI ge -RO -RO -RO -RO -RO +UK +UK +UK +UK +UK dX ge cj @@ -41183,11 +41367,11 @@ bx bx bI ge -RO -RO -RO -RO -RO +UK +UK +UK +UK +UK dX ge cj @@ -41374,7 +41558,7 @@ hD Ar Cm jn -hD +bi qJ IY bx @@ -41386,11 +41570,11 @@ bx bx Cg ge -RO -RO -RO -RO -RO +UK +UK +UK +UK +UK dX ge cj @@ -42168,7 +42352,7 @@ sw rr kl vN -EA +dN Cc FA FA @@ -42198,11 +42382,11 @@ bx bx Cg ge +UK +UK RO -RO -RO -RO -RO +UK +UK dX ge cj @@ -42717,8 +42901,8 @@ MQ lY XA XA -TK -Zz +Tl +kd Zz kj Zz @@ -42998,7 +43182,7 @@ hD Ar Cm jn -hD +bi qJ IY bx @@ -43357,7 +43541,7 @@ XA XA XA XA -TK +Xi Zz Zz dX @@ -43535,7 +43719,7 @@ Fw Fw PX Fw -Fw +Xn Fw PX Fw @@ -43543,7 +43727,7 @@ Fw Fw PX Fw -Fw +Xn Fw PX Fw @@ -43553,14 +43737,14 @@ Fw Fw PX Fw -Fw +Xn Fw Fw Fw Fw ok NE -Zz +OH Zz ro Zz @@ -43732,38 +43916,38 @@ MQ lY Od ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki Fw XA -Zz +OH Zz nL Zz @@ -43966,7 +44150,7 @@ ki ki Fw XA -Zz +OH Zz Sy Zz @@ -44138,38 +44322,38 @@ MQ lY Od ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki Fw XA -Zz +OH Zz Zz Zz @@ -44372,7 +44556,7 @@ ki ki Fw XA -Zz +OH Zz Zz Zz @@ -44401,7 +44585,7 @@ sw rr kl Fg -EA +dN Cc FA FA @@ -44575,7 +44759,7 @@ Xf Fw ok NE -jW +OH Zz Zz Zz @@ -44622,7 +44806,7 @@ hD Ar Cm jn -hD +bi qJ IY bx @@ -44747,38 +44931,38 @@ MQ lY Od ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki Fw XA -Zz +OH Zz Zz Zz @@ -44981,7 +45165,7 @@ ki ki Fw XA -Zz +OH Zz Zz Zz @@ -45153,38 +45337,38 @@ MQ lY Od ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ ki -NJ +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki +ki Fw XA -Zz +OH Zz WO Zz @@ -45387,7 +45571,7 @@ ki ki Fw XA -Zz +OH Zz WO Zz @@ -45565,7 +45749,7 @@ Fw Fw dS Fw -Fw +cM Fw dS Fw @@ -45573,7 +45757,7 @@ Fw Fw dS Fw -Fw +cM Fw dS Fw @@ -45583,14 +45767,14 @@ Fw Fw dS Fw -Fw +cM Fw Fw Fw Fw ok NE -Zz +OH Zz fs Zz @@ -45793,7 +45977,7 @@ XA XA XA XA -TK +NJ Zz Zz dX @@ -46246,7 +46430,7 @@ hD Ar Cm jn -hD +bi qJ IY bx @@ -46371,8 +46555,8 @@ MQ lY XA XA -TK -Zz +Tl +kd Zz kj Zz @@ -46634,7 +46818,7 @@ sw Yh kl kY -UK +Nr kl FA FA @@ -46837,7 +47021,7 @@ sw rr kl Fg -EA +dN Cc FA FA From 48e666620b33f3afd52c0ae8625e83eb2a579f05 Mon Sep 17 00:00:00 2001 From: Terra1 Date: Tue, 16 Apr 2024 17:55:48 +0200 Subject: [PATCH 2/2] Disables hardcore on Barbarossa --- code/game/objects/map_metadata/barbarossa.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/map_metadata/barbarossa.dm b/code/game/objects/map_metadata/barbarossa.dm index d19a51a76f..fb857e73b1 100644 --- a/code/game/objects/map_metadata/barbarossa.dm +++ b/code/game/objects/map_metadata/barbarossa.dm @@ -5,7 +5,7 @@ caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall,/area/caribbean/no_mans_land/invisible_wall/two) respawn_delay = 1200 no_winner ="The Border stays under Soviet control, stalling the German advance." - no_hardcore = FALSE + no_hardcore = TRUE faction_organization = list( RUSSIAN, GERMAN)