diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_russianbunker.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_russianbunker.dmm
index e4ad9ddb2f88e..851351553d152 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_russianbunker.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_russianbunker.dmm
@@ -116,15 +116,6 @@
},
/turf/open/floor/wood,
/area/ruin/unpowered/russianbunker)
-"ay" = (
-/obj/effect/mine/explosive{
- range_flash = 6;
- range_heavy = 2;
- range_light = 4;
- range_devastation = 1
- },
-/turf/open/floor/wood,
-/area/ruin/unpowered/russianbunker)
"aA" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/snacks/meat/steak/bear,
@@ -161,10 +152,6 @@
/turf/open/floor/plating,
/area/ruin/unpowered/russianbunker)
"aI" = (
-/obj/machinery/light{
- dir = 8;
- icon_state = "tube1"
- },
/obj/structure/table/reinforced,
/obj/machinery/turretid{
ailock = 1;
@@ -180,6 +167,9 @@
},
/obj/item/clothing/suit/armor/heavy/juggernaut,
/obj/item/clothing/head/helmet/juggernaut,
+/obj/machinery/light{
+ dir = 8
+ },
/turf/open/floor/circuit/off,
/area/ruin/unpowered/russianbunker)
"aJ" = (
@@ -228,6 +218,12 @@
/area/ruin/unpowered/russianbunker)
"aL" = (
/obj/effect/decal/cleanable/blood/splatter,
+/obj/effect/mine/explosive{
+ range_flash = 6;
+ range_heavy = 2;
+ range_light = 4;
+ range_devastation = 1
+ },
/turf/open/floor/wood{
icon_state = "wood-broken4"
},
@@ -305,7 +301,7 @@
"be" = (
/obj/effect/decal/cleanable/blood/splatter,
/mob/living/simple_animal/hostile/bear/snow{
- name = "Миша Белый"
+ name = "Медведь Белый"
},
/turf/open/floor/grass/snow,
/area/ruin/unpowered/russianbunker)
@@ -344,6 +340,7 @@
faction = list("russian");
name = "Russ-erator"
},
+/obj/item/gun/ballistic/revolver/nagant,
/turf/open/floor/wood,
/area/ruin/unpowered/russianbunker)
"br" = (
@@ -416,7 +413,7 @@
"gj" = (
/obj/item/weldingtool/experimental,
/mob/living/simple_animal/hostile/bear{
- name = "Миша"
+ name = "Медведыч"
},
/turf/open/floor/grass/snow,
/area/ruin/unpowered/russianbunker)
@@ -458,10 +455,6 @@
},
/turf/open/floor/wood,
/area/ruin/unpowered/russianbunker)
-"js" = (
-/obj/effect/mine/gas/plasma,
-/turf/open/floor/pod,
-/area/ruin/unpowered/russianbunker)
"kN" = (
/obj/structure/sign/poster/contraband/d_day_promo,
/turf/closed/wall/r_wall,
@@ -617,6 +610,12 @@
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/pod,
/area/ruin/unpowered/russianbunker)
+"zK" = (
+/mob/living/simple_animal/hostile/russian/ranged/trooper{
+ name = "Валерьевич"
+ },
+/turf/open/floor/wood,
+/area/ruin/unpowered/russianbunker)
"Am" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/snacks/meat/steak/bear,
@@ -781,6 +780,12 @@
"Ni" = (
/turf/closed/indestructible/opshuttle,
/area/ruin/unpowered/russianbunker)
+"NL" = (
+/mob/living/simple_animal/hostile/bear{
+ name = "Михаил"
+ },
+/turf/open/floor/grass/snow,
+/area/ruin/unpowered/russianbunker)
"NU" = (
/obj/effect/decal/cleanable/blood/drip,
/mob/living/simple_animal/hostile/russian/ranged/trooper{
@@ -922,6 +927,12 @@
},
/turf/closed/wall/r_wall,
/area/ruin/unpowered/russianbunker)
+"Zk" = (
+/mob/living/simple_animal/hostile/bear{
+ name = "Медведьев"
+ },
+/turf/open/floor/grass/snow,
+/area/ruin/unpowered/russianbunker)
"ZD" = (
/obj/effect/decal/cleanable/blood/drip,
/mob/living/simple_animal/hostile/viscerator{
@@ -940,7 +951,7 @@
"ZU" = (
/obj/effect/decal/cleanable/blood/old,
/mob/living/simple_animal/hostile/bear{
- name = "Миша"
+ name = "Мишутко"
},
/turf/open/floor/grass/snow,
/area/ruin/unpowered/russianbunker)
@@ -1407,8 +1418,8 @@ aF
AY
YQ
Yi
-xP
-xP
+Zk
+NL
IF
Cf
YQ
@@ -1437,7 +1448,7 @@ ag
ak
ag
DW
-ay
+ag
ZD
aL
Vh
@@ -1518,7 +1529,7 @@ ww
YQ
YQ
zB
-js
+aY
aY
aY
aY
@@ -1549,7 +1560,7 @@ ag
ag
ag
OY
-ag
+zK
hU
ZP
hU
@@ -1594,7 +1605,7 @@ QW
aY
aY
aY
-js
+aY
aY
aK
bt
@@ -1630,7 +1641,7 @@ au
GM
Cu
yw
-js
+aY
GM
aY
br
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index beb8a7eccf7d1..fd85fc5e238e3 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -9070,6 +9070,9 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
/turf/open/floor/plasteel,
/area/hallway/primary/port)
"aNU" = (
@@ -9081,6 +9084,9 @@
dir = 1
},
/obj/machinery/atmospherics/pipe/manifold4w/supply,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/plasteel,
/area/hallway/primary/port)
"aNW" = (
@@ -9516,6 +9522,9 @@
/obj/machinery/door/airlock/public/glass{
name = "Art Storage"
},
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plasteel,
/area/commons/storage/art)
"aPI" = (
@@ -9848,6 +9857,10 @@
/turf/open/floor/plasteel,
/area/commons/storage/art)
"aRa" = (
+/obj/machinery/power/apc/auto_name/east,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
/turf/open/floor/plasteel,
/area/commons/storage/art)
"aRb" = (
@@ -9861,6 +9874,9 @@
/obj/machinery/door/airlock{
name = "Port Emergency Storage"
},
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plating,
/area/commons/storage/emergency/port)
"aRd" = (
@@ -10108,6 +10124,10 @@
/turf/open/floor/plating,
/area/commons/storage/emergency/port)
"aSm" = (
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/machinery/power/apc/auto_name/north,
/turf/open/floor/plating,
/area/commons/storage/emergency/port)
"aSn" = (
@@ -10157,18 +10177,9 @@
/turf/open/floor/plasteel,
/area/commons/storage/tools)
"aSX" = (
-/obj/machinery/power/apc{
- areastring = "/area/commons/storage/art";
- dir = 1;
- name = "Art Storage";
- pixel_y = 23
- },
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/structure/cable{
- icon_state = "0-8"
- },
/obj/structure/cable{
icon_state = "4-8"
},
@@ -10899,20 +10910,12 @@
/turf/closed/wall,
/area/commons/toilet/locker)
"aWz" = (
-/obj/machinery/power/apc{
- areastring = "/area/commons/storage/emergency/port";
- dir = 1;
- name = "Port Emergency Storage APC";
- pixel_y = 23
- },
-/obj/structure/cable{
- icon_state = "0-8"
- },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "1-8"
},
-/turf/open/floor/plating,
-/area/maintenance/port)
+/turf/open/floor/plasteel,
+/area/cargo/warehouse)
"aWA" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -11141,6 +11144,9 @@
name = "Cargo Bay Warehouse Maintenance";
req_access_txt = "31"
},
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plating,
/area/maintenance/port)
"aXN" = (
@@ -11570,11 +11576,18 @@
"aZA" = (
/obj/machinery/portable_atmospherics/scrubber,
/obj/effect/turf_decal/delivery,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/plasteel,
/area/commons/locker)
"aZB" = (
/obj/machinery/portable_atmospherics/pump,
/obj/effect/turf_decal/delivery,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/machinery/power/apc/auto_name/west,
/turf/open/floor/plasteel,
/area/commons/locker)
"aZC" = (
@@ -12340,6 +12353,9 @@
name = "Locker Room Maintenance";
req_access_txt = "12"
},
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plating,
/area/maintenance/port)
"bcv" = (
@@ -13126,9 +13142,6 @@
/obj/structure/disposalpipe/segment{
dir = 6
},
-/obj/structure/cable{
- icon_state = "1-2"
- },
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -13365,15 +13378,6 @@
/turf/closed/wall,
/area/maintenance/disposal)
"bfc" = (
-/obj/machinery/power/apc{
- areastring = "/area/commons/locker";
- dir = 1;
- name = "Locker Room APC";
- pixel_y = 23
- },
-/obj/structure/cable{
- icon_state = "0-2"
- },
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 6
},
@@ -13389,6 +13393,9 @@
/area/maintenance/port)
"bfe" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plating,
/area/maintenance/port)
"bff" = (
@@ -35754,6 +35761,9 @@
dir = 4;
pixel_x = -24
},
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plasteel/dark,
/area/commons/dorms)
"cmo" = (
@@ -40667,6 +40677,9 @@
"cNu" = (
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/west,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plasteel,
/area/commons/fitness)
"cNv" = (
@@ -42267,6 +42280,12 @@
/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel,
/area/commons/fitness)
+"dwj" = (
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/floor/plating,
+/area/commons/storage/emergency/port)
"dwU" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -43098,6 +43117,13 @@
},
/turf/open/floor/plasteel,
/area/security/processing)
+"dSD" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/open/floor/plasteel,
+/area/commons/locker)
"dSG" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 1
@@ -45472,6 +45498,9 @@
/obj/machinery/door/airlock/public/glass{
name = "Fitness Room"
},
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plasteel,
/area/commons/fitness)
"frF" = (
@@ -45923,6 +45952,13 @@
},
/turf/open/floor/plasteel,
/area/security/prison)
+"fGo" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/dark,
+/area/commons/dorms)
"fHi" = (
/obj/machinery/atmospherics/pipe/simple/cyan/visible{
dir = 10
@@ -47133,6 +47169,9 @@
dir = 8
},
/obj/machinery/vending/kink,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/plasteel,
/area/commons/locker)
"gsE" = (
@@ -49500,6 +49539,16 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/dark,
/area/medical/morgue)
+"hYn" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/commons/dorms)
"hYQ" = (
/obj/machinery/door/airlock/grunge{
name = "Permanent Cell 6";
@@ -52317,6 +52366,9 @@
/obj/structure/cable{
icon_state = "1-4"
},
+/obj/machinery/light{
+ dir = 1
+ },
/turf/open/floor/plasteel,
/area/commons/fitness)
"jLJ" = (
@@ -52337,6 +52389,12 @@
},
/turf/open/floor/wood/wood_large,
/area/service/chapel/office)
+"jMr" = (
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/floor/plasteel,
+/area/commons/storage/art)
"jMx" = (
/obj/effect/turf_decal/weather/dirt{
dir = 9
@@ -54906,6 +54964,12 @@
},
/turf/open/floor/carpet/royalblue,
/area/maintenance/starboard/aft)
+"ltM" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/port)
"ltW" = (
/obj/structure/chair/comfy/brown{
dir = 4
@@ -56293,6 +56357,15 @@
},
/turf/open/floor/plasteel/dark,
/area/security/detectives_office/private_investigators_office)
+"mnL" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/dark,
+/area/commons/dorms)
"moe" = (
/obj/effect/turf_decal/stripes/line{
dir = 5
@@ -58344,6 +58417,9 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/plasteel,
/area/commons/fitness)
"nCU" = (
@@ -58997,6 +59073,18 @@
/obj/structure/grille,
/turf/open/floor/plating,
/area/maintenance/port/fore)
+"nXm" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/port)
"nXq" = (
/obj/structure/cable{
icon_state = "0-8"
@@ -59702,6 +59790,9 @@
dir = 4;
pixel_x = -24
},
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plasteel/dark,
/area/commons/dorms)
"ouQ" = (
@@ -63938,6 +64029,21 @@
},
/turf/open/floor/wood,
/area/service/bar)
+"rfC" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/open/floor/plating,
+/area/maintenance/port)
"rfG" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
@@ -67323,6 +67429,9 @@
dir = 8
},
/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/plasteel/dark,
/area/commons/dorms)
"tnn" = (
@@ -69323,6 +69432,13 @@
/obj/structure/rack,
/turf/open/floor/plating,
/area/maintenance/port/fore)
+"uFd" = (
+/obj/machinery/power/apc/auto_name/north,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plasteel,
+/area/cargo/warehouse)
"uFp" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -70131,6 +70247,12 @@
},
/turf/open/floor/plasteel,
/area/service/hydroponics)
+"vlq" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/commons/storage/art)
"vlN" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -70165,22 +70287,17 @@
/turf/open/floor/plating,
/area/commons/fitness)
"vnI" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/structure/disposalpipe/segment,
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "4-8"
},
-/obj/machinery/power/apc{
- areastring = "/area/cargo/warehouse";
- dir = 4;
- name = "Cargo Warehouse APC";
- pixel_x = 24
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
},
/obj/structure/cable{
- icon_state = "0-2"
+ icon_state = "2-8"
},
-/turf/open/floor/plating,
-/area/maintenance/port)
+/turf/open/floor/plasteel,
+/area/hallway/primary/port)
"vnK" = (
/obj/machinery/light{
dir = 1
@@ -71674,6 +71791,9 @@
/obj/structure/cable{
icon_state = "2-8"
},
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/plasteel,
/area/commons/dorms)
"wce" = (
@@ -72426,9 +72546,6 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/light{
- dir = 8
- },
/turf/open/floor/plasteel,
/area/commons/fitness)
"wAl" = (
@@ -72680,6 +72797,18 @@
},
/turf/open/floor/plating,
/area/security/prison/upper)
+"wLn" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/port)
"wLG" = (
/obj/effect/turf_decal/tile/red{
dir = 8
@@ -73830,6 +73959,15 @@
/obj/item/clothing/suit/straight_jacket,
/turf/open/floor/plasteel/dark,
/area/security/prison)
+"xyJ" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/open/floor/plating,
+/area/maintenance/port)
"xyR" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance{
@@ -74185,6 +74323,9 @@
/obj/machinery/light{
dir = 8
},
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plasteel/dark,
/area/commons/dorms)
"xJW" = (
@@ -94731,10 +94872,10 @@ aYU
aYU
aYU
aYU
-aYU
+dSD
bcu
bfe
-aYb
+rfC
aZE
bjm
bjr
@@ -95491,17 +95632,17 @@ byS
ddI
aPO
aMT
-aOl
+wLn
aPH
-aRa
-aRa
+vlq
+jMr
aTG
aPG
aWu
aYc
aZD
aZD
-vnI
+aZD
aZD
aZD
bff
@@ -95748,7 +95889,7 @@ aJe
hug
aLE
aMS
-aOl
+nXm
aPF
aQZ
aRa
@@ -96270,7 +96411,7 @@ aRb
aRb
aWx
aXE
-baS
+uFd
baS
bbP
bcR
@@ -96525,9 +96666,9 @@ aPK
aPK
aPK
aPK
-aWA
+xyJ
aXM
-bfi
+aWz
cBi
bbS
bcS
@@ -96782,7 +96923,7 @@ aPK
aSl
aTH
aPK
-aWz
+aWA
aWC
ihR
baS
@@ -97033,10 +97174,10 @@ gXs
aKB
ngV
aMS
-aOv
-aLE
+vnI
+ltM
aRc
-aSm
+dwj
aTJ
aPK
aWA
@@ -110890,14 +111031,14 @@ wzX
fZg
pgv
cNu
-fHG
+nTQ
fqR
-ylp
+mnL
ouO
xJJ
-xYx
+fGo
cmm
-mGF
+hYn
ylp
ghn
eAW
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index afda6ff11c230..e8dbd5801fc0c 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -49255,10 +49255,6 @@
/area/maintenance/department/medical/morgue)
"dDZ" = (
/obj/structure/closet/secure_closet/medical2,
-/obj/machinery/light{
- dir = 8;
- light_color = "#e8eaff"
- },
/obj/effect/turf_decal/tile/red{
dir = 8
},
@@ -57181,6 +57177,7 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/obj/structure/extinguisher_cabinet/directional/south,
/turf/open/floor/plasteel,
/area/security/brig)
"dUv" = (
@@ -71550,9 +71547,6 @@
/obj/item/reagent_containers/syringe{
name = "steel point"
},
-/obj/machinery/light{
- light_color = "#c9d3e8"
- },
/obj/structure/cable{
icon_state = "4-8"
},
@@ -78789,10 +78783,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 9
},
-/obj/machinery/light{
- dir = 4;
- light_color = "#c1caff"
- },
/turf/open/floor/plasteel/white,
/area/security/brig/brig_medical)
"iXK" = (
@@ -81844,6 +81834,14 @@
},
/turf/open/floor/plasteel/dark,
/area/command/bridge)
+"jNY" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/structure/extinguisher_cabinet/directional/west,
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
"jOm" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/conveyor{
@@ -82936,7 +82934,13 @@
pixel_y = -32
},
/obj/effect/turf_decal/bot,
-/obj/machinery/vending/hydronutrients,
+/obj/item/watertank,
+/obj/item/reagent_containers/spray/plantbgone,
+/obj/item/reagent_containers/spray/plantbgone{
+ pixel_x = 16
+ },
+/obj/structure/table/glass,
+/obj/item/grenade/chem_grenade/antiweed,
/turf/open/floor/plasteel,
/area/service/hydroponics)
"kdA" = (
@@ -83605,17 +83609,11 @@
/turf/open/space,
/area/solars/port/fore)
"kmn" = (
-/obj/structure/table/glass,
-/obj/item/reagent_containers/spray/plantbgone,
-/obj/item/reagent_containers/spray/plantbgone{
- pixel_x = 16
- },
-/obj/item/watertank,
-/obj/item/grenade/chem_grenade/antiweed,
/obj/effect/turf_decal/bot,
/obj/structure/sign/poster/official/ian{
pixel_y = -32
},
+/obj/machinery/vending/hydronutrients,
/turf/open/floor/plasteel,
/area/service/hydroponics)
"kmz" = (
@@ -83758,6 +83756,13 @@
},
/turf/open/floor/plasteel/chapel_floor,
/area/security/prison/upper)
+"kpM" = (
+/obj/effect/turf_decal/tile/red/half{
+ dir = 1
+ },
+/obj/structure/extinguisher_cabinet/directional/north,
+/turf/open/floor/plasteel/dark,
+/area/security/prison)
"kpU" = (
/obj/structure/table/wood,
/obj/structure/cable/white{
@@ -84441,6 +84446,9 @@
"kzL" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/item/defibrillator,
+/obj/machinery/light{
+ dir = 8
+ },
/turf/open/floor/plasteel/white,
/area/security/brig/brig_medical)
"kAf" = (
@@ -91044,6 +91052,9 @@
/obj/effect/turf_decal/tile/red{
dir = 1
},
+/obj/machinery/light{
+ dir = 8
+ },
/turf/open/floor/plasteel/white,
/area/security/brig/brig_medical)
"mBy" = (
@@ -106468,6 +106479,7 @@
/obj/effect/turf_decal/tile/blue{
dir = 8
},
+/obj/machinery/light,
/turf/open/floor/plasteel/white,
/area/security/brig/brig_medical)
"qXZ" = (
@@ -115086,6 +115098,7 @@
/obj/structure/cable/white{
icon_state = "0-2"
},
+/obj/structure/chair/sofa/right/maroon,
/turf/open/floor/plasteel,
/area/security/brig)
"tsO" = (
@@ -116802,6 +116815,7 @@
/obj/effect/turf_decal/tile/red{
dir = 4
},
+/obj/structure/extinguisher_cabinet/directional/north,
/turf/open/floor/plasteel/dark,
/area/security/prison)
"tSq" = (
@@ -116932,16 +116946,6 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 8
},
-/obj/structure/lattice/catwalk,
-/obj/docking_port/stationary{
- shuttle_id = "lambda_station";
- name = "Lambda Shuttle Dock";
- dwidth = 5;
- width = 10;
- dheight = 5;
- height = 10;
- dir = 4
- },
/turf/open/floor/plasteel/dark,
/area/security/prison)
"tUf" = (
@@ -121403,6 +121407,16 @@
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/aisat/exterior)
+"vgL" = (
+/obj/effect/turf_decal/tile/red/half{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/extinguisher_cabinet/directional/north,
+/turf/open/floor/plasteel,
+/area/security/brig)
"vgN" = (
/obj/structure/cable/white{
icon_state = "2-8"
@@ -122162,6 +122176,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/structure/extinguisher_cabinet/directional/north,
/turf/open/floor/plasteel,
/area/security/brig_briefing)
"vtq" = (
@@ -126145,6 +126160,16 @@
},
/turf/open/floor/plasteel,
/area/cargo/storage)
+"wCL" = (
+/obj/effect/turf_decal/tile/red/half{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/chair/sofa/middle/maroon,
+/turf/open/floor/plasteel,
+/area/security/brig)
"wCO" = (
/obj/structure/chair,
/obj/machinery/shower{
@@ -126564,6 +126589,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/structure/chair/sofa/left/maroon,
/turf/open/floor/plasteel,
/area/security/brig)
"wHQ" = (
@@ -126963,6 +126989,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/structure/extinguisher_cabinet/directional/north,
/turf/open/floor/iron/dark,
/area/security/detectives_office/private_investigators_office/investigators_room)
"wNR" = (
@@ -175210,7 +175237,7 @@ bun
bwY
bXj
bvL
-bvL
+jNY
bwY
bvL
bvL
@@ -184715,7 +184742,7 @@ sPY
nVC
xYZ
mOt
-gHo
+wCL
gJO
rJV
bYk
@@ -187771,7 +187798,7 @@ oPe
smV
bYj
aFm
-qGa
+kpM
iRe
squ
aFm
@@ -188299,7 +188326,7 @@ qgU
aaa
aaa
bgZ
-wOr
+vgL
jLZ
sWJ
aKZ
diff --git a/_maps/map_files/Mining/Lavaland_novaya.dmm b/_maps/map_files/Mining/Lavaland_novaya.dmm
index 0cf7378eb2ddc..d60c7cb2ae9fe 100644
--- a/_maps/map_files/Mining/Lavaland_novaya.dmm
+++ b/_maps/map_files/Mining/Lavaland_novaya.dmm
@@ -9396,6 +9396,9 @@
/obj/machinery/power/apc/auto_name/west{
pixel_x = -24
},
+/obj/structure/cable/yellow{
+ icon_state = "0-2"
+ },
/turf/open/floor/plasteel,
/area/mine/laborcamp/security)
"jrg" = (
diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm
index d6f714843a2bc..4d0cc083078ea 100644
--- a/code/_onclick/hud/alert.dm
+++ b/code/_onclick/hud/alert.dm
@@ -332,6 +332,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
icon_state = "default"
var/mob/living/carbon/offerer
var/obj/item/receiving
+ var/offerer_name //is used specally for clear_alert() to prevent infinite alert when object "offerer" suddenly changes its name during item transfering.
/**
* Handles assigning most of the variables for the alert that pops up when an item is offered
@@ -351,6 +352,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
add_overlay(receiving)
src.receiving = receiving
src.offerer = offerer
+ offerer_name = offerer.name
RegisterSignal(taker, COMSIG_MOVABLE_MOVED, PROC_REF(check_in_range), override = TRUE) //Override to prevent runtimes when people offer a item multiple times
/atom/movable/screen/alert/give/Click(location, control, params)
@@ -372,7 +374,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
if(!offerer.CanReach(taker))
to_chat(owner, span_warning("You moved out of range of [offerer]!"))
- owner.clear_alert("[offerer]")
+ owner.clear_alert("[offerer_name]")
/atom/movable/screen/alert/give/highfive/setup(mob/living/carbon/taker, mob/living/carbon/offerer, obj/item/receiving)
. = ..()
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 86c7fbdb64dca..66bcaf935d12a 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -369,8 +369,8 @@
armor = list(MELEE = 95, BULLET = 80, LASER = 50, ENERGY = 60, BOMB = 80, BIO = 100, RAD = 50, FIRE = 95, ACID = 95)
strip_delay = 120
resistance_flags = FIRE_PROOF | ACID_PROOF
- heat_protection = HEAD
clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL
+ heat_protection = HEAD
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
flash_protect = TRUE
obj_flags = IMMUTABLE_SLOW
@@ -389,10 +389,10 @@
armor = list(MELEE = 95, BULLET = 80, LASER = 50, ENERGY = 60, BOMB = 80, BIO = 100, RAD = 50, FIRE = 95, ACID = 95)
resistance_flags = FIRE_PROOF | ACID_PROOF
cold_protection = CHEST|GROIN|LEGS|ARMS|FEET
- heat_protection = CHEST|GROIN|LEGS|ARMS|FEET
clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
- max_heat_protection_temperature = COAT_MAX_TEMP_PROTECT
+ heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
+ max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
strip_delay = 120
slowdown = 0.5
obj_flags = IMMUTABLE_SLOW
diff --git a/code/modules/events/holiday/xmas.dm b/code/modules/events/holiday/xmas.dm
index 16b3301edf022..ad5833097cb08 100644
--- a/code/modules/events/holiday/xmas.dm
+++ b/code/modules/events/holiday/xmas.dm
@@ -47,11 +47,9 @@
/obj/effect/landmark/xmastree/Initialize(mapload)
..()
- if((NEW_YEAR in SSevents.holidays) && christmas_tree) // Я запрещаю вам отмену Нового Года.
+ if((FESTIVE_SEASON in SSevents.holidays) && festive_tree)
new christmas_tree(get_turf(src))
- if((CHRISTMAS in SSevents.holidays) && christmas_tree) // Я запрещаю вам отмену Нового Года.
- new christmas_tree(get_turf(src))
- else if((FESTIVE_SEASON in SSevents.holidays) && festive_tree)
+ else if(((NEW_YEAR in SSevents.holidays) && christmas_tree) || ((CHRISTMAS in SSevents.holidays) && christmas_tree))
new festive_tree(get_turf(src))
return INITIALIZE_HINT_QDEL
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index 24aa8c65c513f..2aa8a364221e9 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -58,8 +58,8 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
"е" = RADIO_CHANNEL_SYNDICATE,
"н" = RADIO_CHANNEL_CENTCOM,
// Ghostrole
- "ф" = RADIO_CHANNEL_DS1,
- "й" = RADIO_CHANNEL_DS2,
+ "й" = RADIO_CHANNEL_DS1,
+ "ц" = RADIO_CHANNEL_DS2,
// Admin
"з" = MODE_ADMIN,
diff --git a/html/changelogs/AutoChangeLog-pr-843.yml b/html/changelogs/AutoChangeLog-pr-843.yml
deleted file mode 100644
index 1055f5540e9c9..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-843.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Darkest08
-delete-after: true
-changes:
- - tgs: has something to do with tgs
diff --git a/html/changelogs/archive/2024-12.yml b/html/changelogs/archive/2024-12.yml
index c6eb22daaa93c..b61102017893f 100644
--- a/html/changelogs/archive/2024-12.yml
+++ b/html/changelogs/archive/2024-12.yml
@@ -63,3 +63,6 @@
- rscadd: cum rum to booze-o-mat
- rscadd: femcum whiskey to booze-o-mat
- rscadd: bloodwine to booze-o-mat
+2024-12-14:
+ Darkest08:
+ - tgs: has something to do with tgs
diff --git a/modular_bluemoon/fluffs/code/donator.dm b/modular_bluemoon/fluffs/code/donator.dm
index e40a82f3942d2..e0acddb53f98e 100644
--- a/modular_bluemoon/fluffs/code/donator.dm
+++ b/modular_bluemoon/fluffs/code/donator.dm
@@ -1049,7 +1049,6 @@
restricted_desc = "Head of Security, Warden, Detective, Security Officer, Brig Physician, Peacekeeper, Blueshield."
restricted_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", "Peacekeeper", "Blueshield")
-
/datum/gear/donator/bm/soviet_coat
name = "Soviet coat"
slot = ITEM_SLOT_OCLOTHING
@@ -1077,3 +1076,10 @@
path = /obj/item/modkit/razorsong_kit
ckeywhitelist = list("xaeshkavd")
subcategory = LOADOUT_SUBCATEGORIES_DON02
+
+/datum/gear/donator/bm/agentcape
+ name = "Marketing agent's cape"
+ slot = ITEM_SLOT_OCLOTHING
+ path = /obj/item/clothing/suit/donator/bm/agentcape
+ ckeywhitelist = list("sosnovskii")
+ subcategory = LOADOUT_SUBCATEGORIES_DON02
diff --git a/modular_bluemoon/fluffs/code/suit.dm b/modular_bluemoon/fluffs/code/suit.dm
index 35b54d81513c6..0163a4d0e955f 100644
--- a/modular_bluemoon/fluffs/code/suit.dm
+++ b/modular_bluemoon/fluffs/code/suit.dm
@@ -281,3 +281,20 @@
desc = "Красивая красная кожанная шуба, которая пахнет старостью, она довольно тёплая, но кажется её комфортно носить везде."
icon_state = "soviet_trench"
item_state = "soviet_trench"
+
+/obj/item/clothing/suit/donator/bm/agentcape
+ name = "Marketing agent's cape"
+ desc = "The advertising agent's cape is saturated with the smell of instant noodles."
+ icon_state = "agentcape"
+ item_state = "agentcape"
+
+
+/obj/item/clothing/suit/donator/bm/agentcape
+ name = "Marketing agent's cape"
+ desc = "The advertising agent's cape is saturated with the smell of instant noodles."
+ icon = 'modular_bluemoon/fluffs/icons/obj/clothing/suit.dmi'
+ mob_overlay_icon = 'modular_bluemoon/fluffs/icons/mob/clothing/suit.dmi'
+ icon_state = "agentcape"
+ item_state = "agentcape"
+ body_parts_covered = CHEST
+ mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON
diff --git a/modular_bluemoon/fluffs/icons/mob/clothing/suit.dmi b/modular_bluemoon/fluffs/icons/mob/clothing/suit.dmi
index 3fcd63d656680..31c07a778a147 100644
Binary files a/modular_bluemoon/fluffs/icons/mob/clothing/suit.dmi and b/modular_bluemoon/fluffs/icons/mob/clothing/suit.dmi differ
diff --git a/modular_bluemoon/fluffs/icons/obj/clothing/suit.dmi b/modular_bluemoon/fluffs/icons/obj/clothing/suit.dmi
index 83318987fc637..856e32fdcc23f 100644
Binary files a/modular_bluemoon/fluffs/icons/obj/clothing/suit.dmi and b/modular_bluemoon/fluffs/icons/obj/clothing/suit.dmi differ
diff --git a/modular_bluemoon/kovac_shitcode/code/sprite_update.dm b/modular_bluemoon/kovac_shitcode/code/sprite_update.dm
index 2108d28eabc37..357e350494e1f 100644
--- a/modular_bluemoon/kovac_shitcode/code/sprite_update.dm
+++ b/modular_bluemoon/kovac_shitcode/code/sprite_update.dm
@@ -542,6 +542,7 @@
maxHealth = 250
health = 250
gender = MALE
+ speak = list("*meow", "*meow2", "*meow3", "*meow4", "*meow5", "*meow6", "*mrrp", "*mrrp3", "*purr", "*oink1")
icon = 'modular_bluemoon/kovac_shitcode/icons/animals.dmi'
/mob/living/simple_animal/pet/cat/alta
@@ -553,6 +554,7 @@
held_icon = "alta"
unique_pet = TRUE
gender = FEMALE
+ speak = list("*meow", "*meow2", "*meow3", "*meow4", "*meow5", "*meow6", "*mrrp", "*mrrp3", "*purr")
icon = 'modular_bluemoon/kovac_shitcode/icons/animals.dmi'
/mob/living/simple_animal/pet/cat/space/alta
@@ -564,6 +566,7 @@
held_icon = "spacealta"
unique_pet = TRUE
gender = FEMALE
+ speak = list("*meow", "*meow2", "*meow3", "*meow4", "*meow5", "*meow6", "*mrrp", "*mrrp3", "*purr")
icon = 'modular_bluemoon/kovac_shitcode/icons/animals.dmi'
/mob/living/simple_animal/pet/dog/corgi/Lisa/ada
diff --git a/modular_bluemoon/oni3288/code/catcrin_stuff.dm b/modular_bluemoon/oni3288/code/catcrin_stuff.dm
index 81bfb392b287b..a83fe0d30a2c9 100644
--- a/modular_bluemoon/oni3288/code/catcrin_stuff.dm
+++ b/modular_bluemoon/oni3288/code/catcrin_stuff.dm
@@ -594,6 +594,7 @@
lefthand_file = 'modular_bluemoon/oni3288/icons/weapons/hands/guns_left.dmi'
righthand_file = 'modular_bluemoon/oni3288/icons/weapons/hands/guns_right.dmi'
mob_overlay_icon = 'modular_bluemoon/oni3288/icons/weapons/mob/back.dmi'
+ hitsound = 'modular_bluemoon/oni3288/sounds/weapons/hopesh.ogg'
///////////////////////////////////////////////////////////////////////////////////////////////////////////Слот масок.
diff --git a/modular_bluemoon/oni3288/sounds/weapons/hopesh.ogg b/modular_bluemoon/oni3288/sounds/weapons/hopesh.ogg
new file mode 100644
index 0000000000000..2186147621a7c
Binary files /dev/null and b/modular_bluemoon/oni3288/sounds/weapons/hopesh.ogg differ
diff --git a/modular_bluemoon/station_agents_cards/cards_id.dm b/modular_bluemoon/station_agents_cards/cards_id.dm
index 6f10c86d6ec92..fafe1ad642ef6 100644
--- a/modular_bluemoon/station_agents_cards/cards_id.dm
+++ b/modular_bluemoon/station_agents_cards/cards_id.dm
@@ -4,13 +4,13 @@
/obj/item/card/id/syndicate/civilian
name = "civilian agent card"
desc = "A card used to provide ID and determine access across the station. It has a small graved in label, marking it as \"One-Use Electromagnetic Access Copier Device\". \
- The technology is well known and illegal to use in almost all nations and private organizations, but seems like the Pact solds them as souvenirs at its territory."
+ The technology is well known and illegal to use in almost all nations and private organizations, but seems like the Pact sells them as souvenirs at its territory."
uses = 1
anyone = TRUE // все могут изменять характеристики
/obj/item/card/id/syndicate/civilian/vending // для раздатчиков
desc = "A card used to provide ID and determine access across the station. It has a small graved in label, marking it as \"Appearence Changing ID\". \
- The technology is well known and illegal to use in almost all nations and private organizations, but seems like the Pact solds them as souvenirs at its territory."
+ The technology is well known and illegal to use in almost all nations and private organizations, but seems like the Pact sells them as souvenirs at its territory."
uses = 0
/obj/item/card/id/syndicate/civilian/vending/loadout // для лодаута, сохраняем описание карты из автомата
@@ -29,8 +29,8 @@
if(my_owner) // копирование свойств старой карты и её замена
var/obj/item/card/id/id_card = my_owner.get_item_by_slot(ITEM_SLOT_ID)
- if(istype(id_card, /obj/item/card/id/inteq) || istype(id_card, /obj/item/card/id/syndicate))
- to_chat(my_owner, span_warning("Ваша карта уже обладает свойствами, доступными гражданской карте синдиката! Лишняя была удалена."))
+ if(istype(id_card, /obj/item/card/id/inteq) || istype(id_card, /obj/item/card/id/syndicate) || istype(id_card, /obj/item/card/id/prisoner))
+ to_chat(my_owner, span_warning("Ваша карта уже обладает свойствами, доступными гражданской карте синдиката или принадлежит заключенному! Лишняя была удалена."))
qdel(src)
return
diff --git a/modular_sand/code/modules/clothing/outfits/standard.dm b/modular_sand/code/modules/clothing/outfits/standard.dm
index 4ad64401f17c2..d26c9e0f40879 100644
--- a/modular_sand/code/modules/clothing/outfits/standard.dm
+++ b/modular_sand/code/modules/clothing/outfits/standard.dm
@@ -90,7 +90,7 @@
mask = /obj/item/clothing/mask/gas/welding/up
gloves = /obj/item/clothing/gloves/tackler/combat/insulated
belt = /obj/item/storage/belt/military/abductor/full/debug
- shoes = /obj/item/clothing/shoes/combat/debug
+ shoes = /obj/item/clothing/shoes/magboots/advance/debug
id = /obj/item/card/id/debug/bst
back = /obj/item/storage/backpack/holding/duffel/debug
box = /obj/item/storage/box/debugtools
@@ -106,6 +106,7 @@
/obj/item/lightreplacer/blue=1,\
/obj/item/debug/human_spawner=1,\
/obj/item/gun/energy/pulse=1,\
+ /obj/item/storage/lockbox/anti_singulo=1,\
/obj/item/gun/energy/taser/debug,\
)
implants = list(/obj/item/implant/mindshield, /obj/item/implant/deathrattle/centcom, /obj/item/implant/weapons_auth, /obj/item/implant/radio/centcom)