diff --git a/html/changelogs/hazelmouse-begrudgery.yml b/html/changelogs/hazelmouse-begrudgery.yml
new file mode 100644
index 00000000000..0e13ce3219d
--- /dev/null
+++ b/html/changelogs/hazelmouse-begrudgery.yml
@@ -0,0 +1,59 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# - (fixes bugs)
+# wip
+# - (work in progress)
+# qol
+# - (quality of life)
+# soundadd
+# - (adds a sound)
+# sounddel
+# - (removes a sound)
+# rscadd
+# - (adds a feature)
+# rscdel
+# - (removes a feature)
+# imageadd
+# - (adds an image or sprite)
+# imagedel
+# - (removes an image or sprite)
+# spellcheck
+# - (fixes spelling or grammar)
+# experiment
+# - (experimental change)
+# balance
+# - (balance changes)
+# code_imp
+# - (misc internal code change)
+# refactor
+# - (refactors code)
+# config
+# - (makes a change to the config files)
+# admin
+# - (makes changes to administrator tools)
+# server
+# - (miscellaneous changes to server)
+#################################
+
+# Your name.
+author: hazelmouse
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
+# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - qol: "Resolved a number of broken and otherwise improper bits of mapping in several offsites, including broken icons."
+ - rscdel: "Deleted an empty .dm file for a previously removed offsite. "
diff --git a/maps/away/away_site/big_derelict/bigderelict.dmm b/maps/away/away_site/big_derelict/bigderelict.dmm
index 2f1cc6bf0b0..7814b176d79 100644
--- a/maps/away/away_site/big_derelict/bigderelict.dmm
+++ b/maps/away/away_site/big_derelict/bigderelict.dmm
@@ -171,18 +171,6 @@
},
/turf/simulated/floor/airless,
/area/derelict)
-"aT" = (
-/obj/structure/grille/broken,
-/turf/simulated/floor/airless{
- icon_state = "dmg2"
- },
-/area/derelict)
-"aU" = (
-/obj/structure/grille,
-/turf/simulated/floor/airless{
- icon_state = "dmg2"
- },
-/area/derelict)
"aV" = (
/obj/machinery/door/airlock/glass_command{
name = "Bridge";
@@ -209,20 +197,12 @@
/area/derelict)
"aZ" = (
/obj/machinery/door/blast/shutters,
-/turf/simulated/floor/airless{
- icon_state = "dmg2"
- },
+/turf/simulated/floor/airless,
/area/derelict)
"ba" = (
/obj/machinery/door/blast/shutters/open,
/turf/simulated/floor/airless,
/area/derelict)
-"bb" = (
-/obj/structure/table,
-/turf/simulated/floor/airless{
- icon_state = "dmg2"
- },
-/area/derelict)
"bc" = (
/obj/structure/table,
/obj/machinery/door/blast/shutters/open,
@@ -232,11 +212,6 @@
/obj/structure/girder/displaced,
/turf/simulated/floor/airless,
/area/derelict)
-"be" = (
-/turf/simulated/floor/airless{
- icon_state = "dmg2"
- },
-/area/derelict)
"bf" = (
/turf/simulated/floor/wood/airless,
/area/derelict)
@@ -950,12 +925,6 @@
/obj/machinery/recharge_station,
/turf/simulated/floor/tiled/dark/airless,
/area/derelict)
-"di" = (
-/obj/machinery/light/small/emergency,
-/turf/simulated/floor/airless{
- icon_state = "dmg2"
- },
-/area/derelict)
"dk" = (
/obj/structure/lattice,
/obj/structure/extinguisher_cabinet/west{
@@ -1681,12 +1650,6 @@
},
/turf/simulated/floor/airless,
/area/derelict)
-"fF" = (
-/obj/structure/closet/crate/loot,
-/turf/simulated/floor/airless{
- icon_state = "dmg2"
- },
-/area/derelict)
"fG" = (
/obj/structure/table/rack,
/turf/simulated/floor/tiled/dark/airless,
@@ -1811,12 +1774,6 @@
/obj/structure/grille,
/turf/space,
/area/derelict)
-"jp" = (
-/obj/structure/girder/displaced,
-/turf/simulated/floor/airless{
- icon_state = "dmg2"
- },
-/area/derelict)
"jw" = (
/obj/machinery/door/airlock/maintenance_hatch{
dir = 1
@@ -21207,7 +21164,7 @@ fb
bh
cD
bh
-be
+fk
cD
cD
cD
@@ -22236,7 +22193,7 @@ bh
dO
fk
fk
-be
+fk
cD
cD
fb
@@ -23262,7 +23219,7 @@ bh
cD
fk
cD
-be
+fk
cD
cD
dO
@@ -24018,7 +23975,7 @@ bh
cD
dO
fk
-be
+fk
dO
cD
bh
@@ -24546,7 +24503,7 @@ fb
bh
cD
fk
-be
+fk
fk
fk
fk
@@ -24806,7 +24763,7 @@ fk
cD
cQ
cD
-be
+fk
dO
cD
fb
@@ -25572,7 +25529,7 @@ fb
fb
fb
cD
-be
+fk
fk
dO
fk
@@ -25816,7 +25773,7 @@ cD
cD
cD
dO
-be
+fk
fk
dO
cD
@@ -26331,7 +26288,7 @@ dO
cQ
cQ
fk
-be
+fk
fk
im
cD
@@ -26589,7 +26546,7 @@ fk
fk
fk
fk
-be
+fk
gV
cD
cD
@@ -26604,7 +26561,7 @@ fk
fk
dO
cQ
-be
+fk
fk
dO
cD
@@ -27357,7 +27314,7 @@ bh
bh
dO
fk
-be
+fk
dO
dO
dO
@@ -27372,11 +27329,11 @@ cD
bh
cD
fk
-be
+fk
dO
fU
fk
-be
+fk
dO
cD
cD
@@ -27675,16 +27632,16 @@ fb
fb
dO
dO
-aT
+gV
dO
dO
fk
eh
-jp
+bd
gV
eh
eh
-aU
+im
eh
fb
fb
@@ -28402,7 +28359,7 @@ dO
dO
dO
dO
-be
+fk
fk
cQ
dO
@@ -28626,7 +28583,7 @@ cD
dO
cQ
cQ
-be
+fk
fk
cQ
fk
@@ -28636,13 +28593,13 @@ cQ
fk
cQ
fk
-be
+fk
cQ
cQ
cQ
cD
cD
-be
+fk
cQ
fk
fk
@@ -28651,9 +28608,9 @@ fk
fk
cQ
fk
-be
+fk
cQ
-be
+fk
fk
cQ
fk
@@ -28663,7 +28620,7 @@ cQ
fk
fk
fk
-be
+fk
cQ
fk
fk
@@ -28671,13 +28628,13 @@ cQ
cQ
aI
fk
-be
+fk
fk
cQ
cQ
cQ
fk
-be
+fk
cQ
fk
fk
@@ -28881,7 +28838,7 @@ dO
dO
dO
dO
-be
+fk
cQ
cQ
fk
@@ -28889,7 +28846,7 @@ fk
cQ
cQ
fk
-be
+fk
cQ
cQ
cQ
@@ -28905,13 +28862,13 @@ fk
fk
fk
cQ
-be
+fk
fk
cQ
fk
cQ
fk
-be
+fk
cD
fk
cQ
@@ -28923,21 +28880,21 @@ cQ
fk
cQ
fk
-be
+fk
cQ
cQ
fk
cQ
fk
-be
fk
-be
+fk
+fk
cQ
cQ
fk
cQ
cQ
-be
+fk
dp
cD
cD
@@ -28978,7 +28935,7 @@ cQ
cD
cD
fk
-be
+fk
fk
fk
fU
@@ -29240,7 +29197,7 @@ cQ
fk
fk
cD
-jp
+bd
bh
bh
fb
@@ -29450,7 +29407,7 @@ cD
dO
dO
fk
-be
+fk
dO
dO
du
@@ -29653,7 +29610,7 @@ aJ
bf
dO
cQ
-be
+fk
fN
dO
fk
@@ -29685,13 +29642,13 @@ dO
dO
dO
dO
-be
+fk
dO
cQ
fk
cQ
dO
-be
+fk
dO
dO
dO
@@ -29939,7 +29896,7 @@ cD
dO
cT
fk
-be
+fk
fk
fk
fk
@@ -30005,10 +29962,10 @@ fb
dO
cD
fk
-be
+fk
cQ
iu
-bb
+ie
fk
cQ
cD
@@ -30167,8 +30124,8 @@ bf
bf
aS
fk
-be
-be
+fk
+fk
dO
fk
dO
@@ -30210,7 +30167,7 @@ dO
aa
fk
fk
-di
+fN
dO
cD
bh
@@ -30425,7 +30382,7 @@ aM
dO
fk
cQ
-be
+fk
jw
fN
dO
@@ -30456,7 +30413,7 @@ dO
dO
dO
dO
-be
+fk
fk
fk
cQ
@@ -30512,7 +30469,7 @@ dO
hV
ie
hV
-jp
+bd
fb
fb
fb
@@ -30668,7 +30625,7 @@ im
fk
fk
fk
-be
+fk
fk
jw
fk
@@ -30698,7 +30655,7 @@ dO
fk
dO
fk
-be
+fk
gV
cD
bh
@@ -30712,8 +30669,8 @@ de
dO
fk
cQ
-be
-be
+fk
+fk
fk
fk
cQ
@@ -30935,7 +30892,7 @@ au
au
aF
fk
-be
+fk
im
fk
cQ
@@ -30973,8 +30930,8 @@ aI
cQ
fk
aI
-be
-be
+fk
+fk
cD
cQ
cD
@@ -31038,7 +30995,7 @@ fk
cQ
iV
cQ
-fF
+aa
cD
fa
dO
@@ -31193,7 +31150,7 @@ bf
bf
bf
af
-be
+fk
cQ
fk
cQ
@@ -31211,7 +31168,7 @@ cA
dO
fk
dO
-be
+fk
fk
cR
cD
@@ -31224,7 +31181,7 @@ dO
fk
cQ
cQ
-be
+fk
aI
cQ
fk
@@ -31238,7 +31195,7 @@ fk
fk
cQ
aI
-be
+fk
fk
dO
dO
@@ -31292,7 +31249,7 @@ bh
eS
fk
eT
-fF
+aa
eV
eX
dO
@@ -31450,7 +31407,7 @@ au
au
bf
aO
-aT
+gV
cQ
cQ
fN
@@ -31481,7 +31438,7 @@ fk
fk
cQ
fk
-be
+fk
fk
cQ
fk
@@ -31494,13 +31451,13 @@ fk
cD
fk
cD
-be
+fk
cD
fk
cD
jw
fk
-be
+fk
fk
dO
cD
@@ -31547,7 +31504,7 @@ fb
fb
bh
fk
-be
+fk
fA
dO
iK
@@ -31707,7 +31664,7 @@ bf
bf
bf
aN
-aU
+im
fk
cQ
cQ
@@ -31736,7 +31693,7 @@ dO
dO
fk
cQ
-be
+fk
cQ
fk
gV
@@ -31827,7 +31784,7 @@ dO
aI
fk
fk
-be
+fk
fk
cQ
fk
@@ -31966,7 +31923,7 @@ bf
bf
dO
fk
-be
+fk
fk
dO
fk
@@ -31992,8 +31949,8 @@ fk
dO
fk
fk
-be
-be
+fk
+fk
fk
fk
fk
@@ -32248,7 +32205,7 @@ fk
gO
dO
fk
-be
+fk
fk
fk
fk
@@ -32276,7 +32233,7 @@ fk
dO
cD
gV
-be
+fk
fk
fk
ds
@@ -32349,7 +32306,7 @@ fk
cQ
cQ
fk
-be
+fk
dO
fo
cQ
@@ -32524,7 +32481,7 @@ cD
cD
fk
fk
-be
+fk
cQ
cQ
dO
@@ -32729,7 +32686,7 @@ cQ
cQ
gj
fk
-be
+fk
dO
dO
aG
@@ -32746,7 +32703,7 @@ fk
fk
dO
fk
-be
+fk
dO
fk
dO
@@ -32787,7 +32744,7 @@ cQ
fk
dO
fk
-be
+fk
fk
dO
cQ
@@ -32995,7 +32952,7 @@ im
dO
fk
cQ
-be
+fk
dO
dO
dO
@@ -33018,7 +32975,7 @@ dO
dO
dO
fk
-be
+fk
fk
cQ
dO
@@ -33252,13 +33209,13 @@ fk
aV
cQ
cQ
-be
+fk
fk
cQ
cQ
fk
fk
-be
+fk
fk
cQ
cQ
@@ -33269,12 +33226,12 @@ cQ
cQ
fk
cQ
-be
+fk
cQ
fk
cQ
fk
-be
+fk
fk
cQ
fk
@@ -33315,18 +33272,18 @@ fk
cQ
cQ
fk
-be
fk
-be
+fk
+fk
cQ
cQ
-be
+fk
cQ
cQ
fk
cQ
cQ
-be
+fk
fk
fk
cQ
@@ -33340,12 +33297,12 @@ fk
cQ
fk
fk
-be
+fk
aI
cQ
cQ
fk
-be
+fk
cQ
fk
fk
@@ -33355,7 +33312,7 @@ fk
cQ
cQ
fk
-be
+fk
cQ
cQ
fk
@@ -33511,20 +33468,20 @@ cQ
fk
fk
cQ
-be
+fk
cQ
cQ
cQ
fk
fk
cQ
-be
+fk
cQ
cQ
cQ
cQ
fk
-be
+fk
cQ
cQ
fk
@@ -33563,18 +33520,18 @@ cQ
cQ
cQ
fk
-be
fk
-be
+fk
+fk
fk
cQ
cQ
-be
+fk
fk
cQ
fk
fk
-be
+fk
cQ
fk
cQ
@@ -33588,7 +33545,7 @@ fk
cQ
fk
cQ
-be
+fk
cQ
fk
fk
@@ -33604,7 +33561,7 @@ cQ
fk
cQ
cQ
-be
+fk
cQ
cQ
cQ
@@ -33616,7 +33573,7 @@ fk
cQ
fk
fk
-be
+fk
fk
fd
fk
@@ -33761,7 +33718,7 @@ cQ
cQ
aC
fk
-be
+fk
cQ
aV
cQ
@@ -33780,7 +33737,7 @@ fk
cD
cQ
cQ
-be
+fk
cQ
fk
cQ
@@ -33790,7 +33747,7 @@ fk
cQ
fk
cQ
-be
+fk
fk
dO
cQ
@@ -33812,7 +33769,7 @@ dO
cQ
fk
fk
-be
+fk
cQ
fk
cQ
@@ -33826,13 +33783,13 @@ cQ
fk
cQ
cQ
-be
+fk
fk
cQ
fk
cQ
fk
-be
+fk
fk
cQ
fk
@@ -33851,11 +33808,11 @@ fk
eP
fk
fk
-be
+fk
fk
cQ
fk
-be
+fk
fk
fk
fk
@@ -33868,7 +33825,7 @@ cQ
cQ
fk
fk
-be
+fk
fk
cQ
fk
@@ -34010,7 +33967,7 @@ cD
bh
dO
dO
-be
+fk
fk
fk
cQ
@@ -34039,7 +33996,7 @@ fk
cQ
fk
cS
-be
+fk
dO
de
dO
@@ -34048,7 +34005,7 @@ dO
cQ
cQ
cS
-be
+fk
dO
dO
dO
@@ -34093,12 +34050,12 @@ dO
dO
fk
fk
-be
+fk
cQ
cQ
fk
fk
-be
+fk
fN
dO
dO
@@ -34278,7 +34235,7 @@ fk
fk
aQ
dO
-be
+fk
cQ
cQ
dO
@@ -34303,7 +34260,7 @@ fk
fk
dO
fk
-be
+fk
cQ
fk
fk
@@ -34333,7 +34290,7 @@ fk
fk
dO
cQ
-be
+fk
dO
dO
dO
@@ -34352,7 +34309,7 @@ fk
fk
fk
fk
-be
+fk
cQ
cQ
cQ
@@ -34542,13 +34499,13 @@ dO
fk
fk
fk
-be
+fk
dO
bY
ce
dO
fk
-be
+fk
fk
fk
dO
@@ -34595,7 +34552,7 @@ dO
fk
fk
fk
-be
+fk
cQ
fk
cQ
@@ -34792,7 +34749,7 @@ fk
fk
cQ
aY
-be
+fk
cQ
cQ
dO
@@ -34810,17 +34767,17 @@ dO
fk
dO
cQ
-be
+fk
cR
cD
dO
fk
fk
dO
-be
+fk
cQ
cQ
-be
+fk
gV
gV
cD
@@ -34842,7 +34799,7 @@ cQ
cQ
dO
fk
-be
+fk
dO
cD
fk
@@ -34857,7 +34814,7 @@ cQ
fk
cQ
fk
-be
+fk
cQ
cQ
fk
@@ -34912,7 +34869,7 @@ fk
fk
cQ
cQ
-be
+fk
fk
cQ
cQ
@@ -35045,7 +35002,7 @@ dO
aw
fk
ax
-be
+fk
ax
fN
dO
@@ -35053,7 +35010,7 @@ cQ
cQ
fk
dO
-be
+fk
dO
bt
bI
@@ -35105,7 +35062,7 @@ cD
im
fk
cQ
-be
+fk
cQ
fk
fk
@@ -35323,7 +35280,7 @@ cF
dO
fk
dO
-be
+fk
cQ
gV
cD
@@ -35429,10 +35386,10 @@ fk
cQ
cQ
cQ
-be
fk
fk
-be
+fk
+fk
cQ
iK
cQ
@@ -35561,7 +35518,7 @@ ax
fk
aH
fk
-be
+fk
ba
fk
fk
@@ -35592,7 +35549,7 @@ jw
fk
cQ
cQ
-be
+fk
cQ
fk
fk
@@ -35606,19 +35563,19 @@ fk
fk
cQ
cQ
-be
+fk
fk
cQ
aI
jw
fk
-be
+fk
fk
dO
cD
fk
fk
-be
+fk
fk
cQ
fk
@@ -35860,7 +35817,7 @@ fk
fk
cQ
fk
-be
+fk
cQ
fk
fk
@@ -35876,7 +35833,7 @@ cD
im
cQ
fk
-aT
+gV
fk
fk
fk
@@ -35888,10 +35845,10 @@ dO
hP
dO
fk
-be
+fk
eo
cQ
-be
+fk
aI
cQ
cQ
@@ -36071,15 +36028,15 @@ dO
fk
dO
ie
-be
+fk
ah
fk
fk
ax
-bb
+ie
cQ
cQ
-be
+fk
dO
fk
dO
@@ -36111,7 +36068,7 @@ fk
cQ
fk
cQ
-be
+fk
fk
fk
cQ
@@ -36391,7 +36348,7 @@ im
cQ
cQ
im
-be
+fk
fk
fk
fk
@@ -36409,7 +36366,7 @@ cQ
fk
cQ
fk
-be
+fk
fk
cQ
eH
@@ -36428,7 +36385,7 @@ fk
fk
fk
fk
-be
+fk
dO
fk
fk
@@ -36578,21 +36535,21 @@ bh
fk
fk
fk
-be
+fk
fk
fk
dO
fk
dO
aD
-be
+fk
ax
fk
ax
fk
dO
cQ
-be
+fk
fk
jw
fk
@@ -36628,7 +36585,7 @@ fk
fk
fk
fk
-be
+fk
bk
fk
dO
@@ -36645,8 +36602,8 @@ cD
cD
cD
fk
-be
-be
+fk
+fk
fk
fk
fk
@@ -36846,7 +36803,7 @@ ax
fk
ax
aL
-be
+fk
bd
cQ
cQ
@@ -36892,7 +36849,7 @@ dO
fk
fk
fk
-be
+fk
dO
cD
bh
@@ -36904,7 +36861,7 @@ cD
gV
fk
cQ
-aT
+gV
fk
cQ
cQ
@@ -37123,7 +37080,7 @@ dO
fk
dO
fk
-be
+fk
gV
bh
cD
@@ -37136,7 +37093,7 @@ dO
fk
fk
fk
-be
+fk
aI
fk
dO
@@ -37145,7 +37102,7 @@ cQ
fk
dO
fk
-be
+fk
fk
fk
aa
@@ -37364,10 +37321,10 @@ cQ
dO
fk
fk
-be
+fk
dO
fk
-be
+fk
dO
dO
dO
@@ -37377,7 +37334,7 @@ dO
dO
dO
fk
-be
+fk
dO
cQ
cQ
@@ -37423,7 +37380,7 @@ cQ
fk
fk
fk
-be
+fk
fk
fk
fk
@@ -37442,7 +37399,7 @@ dO
eA
eI
dO
-be
+fk
dO
cD
cD
@@ -37673,7 +37630,7 @@ cD
cD
dO
dO
-be
+fk
fk
dO
dO
@@ -37870,14 +37827,14 @@ dO
dO
fk
fk
-be
+fk
fk
fk
fk
fk
jw
fk
-be
+fk
cQ
fk
dO
@@ -38133,7 +38090,7 @@ dO
dO
dO
dO
-be
+fk
cQ
cQ
cQ
@@ -38142,7 +38099,7 @@ cQ
cQ
fk
fk
-be
+fk
cQ
fk
fk
@@ -38150,7 +38107,7 @@ cQ
cQ
cQ
cQ
-be
+fk
fk
fk
cQ
@@ -38162,18 +38119,18 @@ cQ
cQ
fk
cQ
-be
+fk
fk
cQ
fk
fk
fk
-be
+fk
cQ
fk
cQ
cQ
-be
+fk
fk
cQ
fk
@@ -38199,13 +38156,13 @@ cQ
cQ
fk
cD
-be
+fk
cD
fk
fk
cQ
fk
-be
+fk
cQ
fk
fk
@@ -38402,7 +38359,7 @@ fk
cQ
cQ
fk
-be
+fk
cQ
cQ
fk
@@ -38412,13 +38369,13 @@ fk
cD
fk
cQ
-be
+fk
fk
cQ
fk
cQ
fk
-be
+fk
cD
cQ
cQ
@@ -38437,7 +38394,7 @@ fk
cQ
cQ
cQ
-be
+fk
cQ
fk
fk
@@ -38446,12 +38403,12 @@ fk
cQ
cQ
cQ
-be
+fk
fk
fk
cQ
cQ
-be
+fk
cQ
fk
fk
@@ -38467,7 +38424,7 @@ fk
cD
cQ
cQ
-be
+fk
cD
cQ
cD
@@ -38648,7 +38605,7 @@ fb
cD
dO
cQ
-be
+fk
fk
fU
dO
@@ -38666,7 +38623,7 @@ dO
fk
fk
fk
-be
+fk
dO
dO
dO
@@ -38928,7 +38885,6 @@ dO
fk
fk
fk
-be
fk
fk
fk
@@ -38936,7 +38892,8 @@ fk
fk
fk
fk
-be
+fk
+fk
fk
dO
fk
@@ -38983,7 +38940,7 @@ cD
cD
cD
cD
-be
+fk
cD
dO
cD
@@ -39177,12 +39134,12 @@ bh
bh
cD
dO
-be
fk
fk
fk
fk
-be
+fk
+fk
dO
dO
dO
@@ -39437,7 +39394,7 @@ dO
dO
fk
fk
-be
+fk
fk
fN
dO
@@ -39969,7 +39926,7 @@ fb
dO
fk
cQ
-di
+fN
dO
cD
fb
@@ -40210,10 +40167,10 @@ fb
fb
fb
cD
-be
+fk
dO
fk
-be
+fk
fk
fb
fb
@@ -41253,7 +41210,7 @@ fb
fb
cD
fk
-be
+fk
cQ
cD
fb
@@ -41754,7 +41711,7 @@ fI
fb
cD
bh
-be
+fk
fk
cD
fb
@@ -42280,7 +42237,7 @@ fb
fb
fb
cD
-be
+fk
cD
fk
cD
@@ -42527,7 +42484,7 @@ cD
cD
fk
fk
-be
+fk
fb
fb
fb
@@ -43310,7 +43267,7 @@ fb
cD
bh
fk
-be
+fk
cD
fb
fb
diff --git a/maps/away/away_site/blueriver/blueriver.dmm b/maps/away/away_site/blueriver/blueriver.dmm
index f4edd684a52..bf6f12840ec 100644
--- a/maps/away/away_site/blueriver/blueriver.dmm
+++ b/maps/away/away_site/blueriver/blueriver.dmm
@@ -93,7 +93,7 @@
/turf/simulated/floor/tiled/white,
/area/bluespaceriver/ship)
"dZ" = (
-/obj/effect/map_effect/window_spawner/reinforced/firedoor,
+/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
/turf/simulated/floor,
/area/bluespaceriver/ship)
"ef" = (
@@ -166,7 +166,7 @@
/turf/simulated/floor/tiled/white,
/area/bluespaceriver/ship)
"it" = (
-/obj/effect/map_effect/window_spawner/reinforced/firedoor,
+/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
/turf/simulated/floor/plating,
/area/bluespaceriver/ship)
"iJ" = (
@@ -317,10 +317,6 @@
dir = 8;
level = 2
},
-/obj/machinery/alarm/west{
- pixel_x = -25;
- rcon_setting = 3
- },
/turf/simulated/floor/tiled/white,
/area/bluespaceriver/ship)
"rq" = (
@@ -400,6 +396,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
+/obj/machinery/alarm/east{
+ req_one_access = list(24,11,55)
+ },
/turf/simulated/floor/tiled/white,
/area/bluespaceriver/ship)
"tS" = (
@@ -501,7 +500,9 @@
/turf/simulated/floor/tiled/white,
/area/bluespaceriver/ship)
"yp" = (
-/obj/random/loot,
+/obj/machinery/vending/boozeomat{
+ req_access = list()
+ },
/turf/simulated/floor/tiled/white,
/area/bluespaceriver/ship)
"yz" = (
@@ -541,7 +542,11 @@
/area/bluespaceriver/ship)
"zO" = (
/obj/structure/table/steel,
-/obj/item/storage/box/drinkingglasses,
+/obj/item/storage/box/drinkingglasses{
+ pixel_x = -16;
+ pixel_y = 9
+ },
+/obj/random/loot,
/turf/simulated/floor/tiled/white,
/area/bluespaceriver/ship)
"Ad" = (
@@ -607,12 +612,6 @@
temperature = 250
},
/area/bluespaceriver/ground)
-"Fe" = (
-/obj/machinery/vending/boozeomat{
- req_access = list()
- },
-/turf/simulated/wall/titanium,
-/area/bluespaceriver/ship)
"Fn" = (
/obj/effect/shuttle_landmark/nav_blueriv/nav2,
/turf/simulated/floor/exoplanet/snow{
@@ -899,7 +898,9 @@
/turf/simulated/wall/titanium,
/area/bluespaceriver/ship)
"Re" = (
-/obj/machinery/alarm/north,
+/obj/machinery/alarm/south{
+ req_one_access = list(24,11,55)
+ },
/turf/simulated/floor/tiled/white,
/area/bluespaceriver/ship)
"Rf" = (
@@ -947,7 +948,9 @@
/turf/simulated/floor/tiled/white,
/area/bluespaceriver/ship)
"St" = (
-/obj/machinery/door/blast/regular,
+/obj/machinery/door/blast/regular{
+ dir = 4
+ },
/turf/simulated/floor/tiled/dark,
/area/bluespaceriver/ship)
"SM" = (
@@ -14016,7 +14019,7 @@ TZ
TZ
dZ
dZ
-Fe
+dm
yp
mW
mW
diff --git a/maps/away/away_site/civ_station/civilian_station.dm b/maps/away/away_site/civ_station/civilian_station.dm
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/maps/away/away_site/magshield/magshield.dmm b/maps/away/away_site/magshield/magshield.dmm
index 08b8c02e36c..c81473d4582 100644
--- a/maps/away/away_site/magshield/magshield.dmm
+++ b/maps/away/away_site/magshield/magshield.dmm
@@ -138,9 +138,7 @@
/turf/simulated/floor/airless,
/area/space)
"ao" = (
-/obj/item/stack/rods{
- icon_state = "rods-1"
- },
+/obj/item/stack/rods,
/turf/template_noop,
/area/space)
"ap" = (
@@ -1284,9 +1282,7 @@
/turf/simulated/floor/tiled/white/airless,
/area/magshield/south)
"dF" = (
-/obj/item/stack/rods{
- icon_state = "rods-1"
- },
+/obj/item/stack/rods,
/turf/simulated/floor/airless,
/area/magshield/north)
"dG" = (
@@ -2751,15 +2747,11 @@
/turf/simulated/floor/carpet/lightblue,
/area/magshield/west)
"ic" = (
-/obj/item/stack/rods{
- icon_state = "rods-1"
- },
+/obj/item/stack/rods,
/turf/simulated/floor/tiled/dark/airless,
/area/magshield/west)
"id" = (
-/obj/item/stack/rods{
- icon_state = "rods-1"
- },
+/obj/item/stack/rods,
/turf/space/dynamic,
/area/magshield/west)
"ie" = (
@@ -3686,9 +3678,7 @@
/turf/simulated/floor/tiled/airless,
/area/magshield/south)
"ls" = (
-/obj/item/stack/rods{
- icon_state = "rods-1"
- },
+/obj/item/stack/rods,
/turf/template_noop,
/area/magshield/south)
"lt" = (
@@ -3984,9 +3974,7 @@
/turf/simulated/floor/airless,
/area/magshield/engine)
"IN" = (
-/obj/item/stack/rods{
- icon_state = "rods-1"
- },
+/obj/item/stack/rods,
/turf/template_noop,
/area/magshield/north)
"Ji" = (
diff --git a/maps/away/away_site/racers/racers.dmm b/maps/away/away_site/racers/racers.dmm
index 3c6020e89b7..13947d64314 100644
--- a/maps/away/away_site/racers/racers.dmm
+++ b/maps/away/away_site/racers/racers.dmm
@@ -136,7 +136,6 @@
"aou" = (
/obj/structure/table/stone/marble,
/obj/effect/spider/stickyweb,
-/obj/item/tape/medical,
/obj/structure/blocker,
/obj/structure/curtain/black,
/turf/simulated/floor/tiled/white,
@@ -817,20 +816,13 @@
/obj/effect/decal/cleanable/blood/drip,
/turf/simulated/floor/holofloor/tiled,
/area/racers)
-"dsR" = (
-/obj/structure/railing/mapped,
-/obj/structure/bed/stool/chair/office,
-/turf/simulated/floor/plating,
-/area/racers)
"dtl" = (
/obj/structure/railing/mapped,
/obj/structure/bed/stool/bar/padded,
/turf/simulated/floor/plating,
/area/racers)
"dtY" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/liquid_fuel,
-/turf/simulated/wall/shuttle/space_ship,
+/turf/simulated/wall/shuttle,
/area/racers)
"dvQ" = (
/obj/structure/table/stone/marble,
@@ -963,7 +955,7 @@
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 10
},
-/turf/simulated/wall/shuttle/space_ship,
+/turf/simulated/wall/shuttle,
/area/shuttle/racers_red)
"eBa" = (
/obj/effect/floor_decal/corner/grey/diagonal,
@@ -1129,12 +1121,6 @@
/obj/item/trash/ramen,
/turf/simulated/floor/lino/diamond,
/area/racers)
-"fpS" = (
-/obj/machinery/light{
- icon_state = "tube_empty"
- },
-/turf/template_noop,
-/area/space)
"frf" = (
/obj/effect/floor_decal/corner/grey/diagonal,
/obj/structure/closet/secure_closet/refrigerator/standard,
@@ -1480,9 +1466,7 @@
/area/racers)
"hkp" = (
/obj/item/material/sword/amohdan_sword,
-/obj/machinery/door/blast/shutters/open,
-/obj/effect/map_effect/window_spawner/full/borosilicate/reinforced,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/carpet,
/area/racers)
"hkT" = (
/obj/structure/table/reinforced/wood,
@@ -1507,8 +1491,12 @@
/turf/simulated/floor/wood,
/area/racers)
"hnS" = (
-/obj/structure/shuttle/window,
-/obj/structure/grille,
+/obj/effect/map_effect/window_spawner/full/shuttle{
+ spawn_firedoor = 1;
+ spawn_grille = 1;
+ frame_color = "#ffffff";
+ color = "#ffffff"
+ },
/turf/simulated/floor/tiled/rust,
/area/racers)
"hoF" = (
@@ -1838,7 +1826,6 @@
dir = 8;
pixel_x = 32
},
-/obj/item/tape/medical,
/obj/item/reagent_containers/food/drinks/cans/zorasoda/hozm,
/obj/structure/blocker,
/obj/structure/curtain/black,
@@ -2235,7 +2222,7 @@
/turf/simulated/floor/plating,
/area/racers)
"kHl" = (
-/turf/simulated/wall/shuttle/space_ship,
+/turf/simulated/wall/shuttle,
/area/shuttle/racers_blue)
"kHp" = (
/obj/machinery/atmospherics/pipe/simple/visible{
@@ -2246,7 +2233,6 @@
"kJp" = (
/obj/structure/table/stone/marble,
/obj/effect/floor_decal/corner/grey/diagonal,
-/obj/item/tape/medical,
/obj/structure/blocker,
/obj/structure/curtain/black,
/turf/simulated/floor/tiled/white,
@@ -2319,13 +2305,6 @@
},
/turf/simulated/floor/wood,
/area/racers)
-"liU" = (
-/obj/machinery/light{
- dir = 8;
- icon_state = "tube_empty"
- },
-/turf/template_noop,
-/area/space)
"ljo" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -2453,7 +2432,7 @@
/turf/simulated/floor/tiled/rust/airless,
/area/racers)
"lMF" = (
-/turf/simulated/wall/shuttle/space_ship,
+/turf/simulated/wall/shuttle,
/area/shuttle/racers_red)
"lNR" = (
/obj/item/spacecash/c1{
@@ -2640,11 +2619,11 @@
/area/racers)
"mHN" = (
/obj/structure/sign/flag/nanotrasen,
-/turf/simulated/wall/shuttle/space_ship,
+/turf/simulated/wall/shuttle,
/area/racers)
"mKU" = (
/obj/effect/decal/cleanable/blood/splatter,
-/turf/simulated/wall/shuttle/space_ship,
+/turf/simulated/wall/shuttle,
/area/racers)
"mMz" = (
/obj/machinery/recharge_station,
@@ -2780,9 +2759,6 @@
/obj/structure/reagent_dispensers/fueltank,
/turf/simulated/floor/tiled/rust,
/area/racers)
-"nup" = (
-/turf/simulated/wall/shuttle/space_ship,
-/area/racers)
"nuH" = (
/obj/effect/map_effect/window_spawner/full/shuttle,
/obj/effect/landmark/entry_point/aft{
@@ -2849,7 +2825,7 @@
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 6
},
-/turf/simulated/wall/shuttle/space_ship,
+/turf/simulated/wall/shuttle,
/area/shuttle/racers_red)
"nOM" = (
/obj/effect/spider/stickyweb,
@@ -2865,12 +2841,6 @@
},
/turf/simulated/floor/carpet,
/area/racers)
-"nRF" = (
-/obj/item/melee/ceremonial_sword,
-/obj/machinery/door/blast/shutters/open,
-/obj/effect/map_effect/window_spawner/full/borosilicate/reinforced,
-/turf/simulated/floor/plating,
-/area/racers)
"nUG" = (
/obj/structure/closet/secure_closet/miner,
/turf/simulated/floor/tiled/rust/airless,
@@ -3011,7 +2981,7 @@
/obj/effect/landmark/entry_point/starboard{
name = "port"
},
-/turf/simulated/wall/shuttle/space_ship,
+/turf/simulated/wall/shuttle,
/area/shuttle/racers_red)
"oqx" = (
/obj/item/trash/liquidfood,
@@ -3131,11 +3101,6 @@
/obj/effect/decal/cleanable/liquid_fuel,
/turf/simulated/floor/tiled/rust/airless,
/area/racers)
-"phk" = (
-/obj/structure/lattice,
-/obj/machinery/shipsensors,
-/turf/simulated/floor/airless,
-/area/racers)
"piw" = (
/obj/structure/table/stone/marble,
/obj/item/reagent_containers/food/drinks/drinkingglass,
@@ -3563,9 +3528,8 @@
/turf/simulated/floor/plating,
/area/racers)
"qZQ" = (
-/obj/machinery/shipsensors,
-/obj/structure/lattice,
-/turf/simulated/floor/airless,
+/obj/item/melee/ceremonial_sword,
+/turf/simulated/floor/plating,
/area/racers)
"raW" = (
/obj/effect/floor_decal/industrial/warning{
@@ -3686,13 +3650,6 @@
/obj/machinery/mech_recharger,
/turf/simulated/floor/plating,
/area/racers)
-"rDo" = (
-/obj/machinery/light{
- dir = 1;
- icon_state = "tube_empty"
- },
-/turf/template_noop,
-/area/space)
"rIG" = (
/obj/machinery/chem_master,
/turf/simulated/floor/plating,
@@ -3761,16 +3718,16 @@
/turf/simulated/floor/plating,
/area/racers)
"rZF" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/wall/shuttle/space_ship,
+/obj/item/clothing/head/unathi/maxtlatl{
+ pixel_y = -4
+ },
+/turf/simulated/floor/plating,
/area/racers)
"sae" = (
/obj/structure/railing/mapped,
/obj/structure/railing/mapped{
dir = 8
},
-/obj/structure/bed/stool/chair/office,
/turf/simulated/floor/plating,
/area/racers)
"sci" = (
@@ -3925,14 +3882,6 @@
},
/turf/simulated/floor/tiled/white/airless,
/area/racers)
-"sOd" = (
-/obj/item/clothing/head/unathi/maxtlatl{
- pixel_y = -4
- },
-/obj/machinery/door/blast/shutters/open,
-/obj/effect/map_effect/window_spawner/full/borosilicate/reinforced,
-/turf/simulated/floor/plating,
-/area/racers)
"sOQ" = (
/obj/effect/shuttle_landmark/blue_racer_transit,
/turf/space/transit,
@@ -4014,7 +3963,7 @@
/area/racers)
"tlw" = (
/obj/effect/decal/cleanable/dirt,
-/turf/simulated/wall/shuttle/space_ship,
+/turf/simulated/wall/shuttle,
/area/racers)
"tmd" = (
/obj/machinery/disposal/small/west,
@@ -4411,7 +4360,7 @@
/obj/effect/landmark/entry_point/port{
name = "starboard"
},
-/turf/simulated/wall/shuttle/space_ship,
+/turf/simulated/wall/shuttle,
/area/shuttle/racers_red)
"vgN" = (
/obj/item/material/hatchet/unathiknife,
@@ -4435,7 +4384,7 @@
/obj/effect/landmark/entry_point/port{
name = "starboard"
},
-/turf/simulated/wall/shuttle/space_ship,
+/turf/simulated/wall/shuttle,
/area/shuttle/racers_blue)
"vps" = (
/turf/simulated/floor/tiled/white/airless,
@@ -4670,7 +4619,7 @@
/turf/simulated/floor/tiled/rust,
/area/racers)
"wkV" = (
-/turf/simulated/wall/shuttle/space_ship,
+/turf/simulated/wall/shuttle,
/area/space)
"wlu" = (
/obj/structure/table/wood/gamblingtable,
@@ -5146,7 +5095,7 @@
/obj/effect/landmark/entry_point/starboard{
name = "port"
},
-/turf/simulated/wall/shuttle/space_ship,
+/turf/simulated/wall/shuttle,
/area/shuttle/racers_blue)
"yle" = (
/obj/item/clothing/mask/gas/old,
@@ -24287,10 +24236,10 @@ arm
arm
arm
arm
-nup
-nup
-nup
-arm
+dtY
+dtY
+dtY
+dtY
arm
arm
arm
@@ -24522,12 +24471,12 @@ ctn
ctn
pJZ
huE
-aOU
+xRX
nfm
xjB
xjB
nfm
-ixi
+xRX
huE
qHQ
jko
@@ -24541,10 +24490,10 @@ nxI
arm
thx
thx
-rZF
-nup
-nup
-nup
+dtY
+dtY
+dtY
+dtY
dDf
kHp
ink
@@ -25049,15 +24998,15 @@ arm
arm
arm
thx
-arm
-tlw
+dtY
+dtY
bGI
-nup
-tlw
-tlw
-tlw
-nup
-vps
+dtY
+dtY
+dtY
+dtY
+dtY
+dtY
vps
pOk
xYv
@@ -25306,19 +25255,19 @@ thx
thx
arm
odX
-tlw
+dtY
vtq
eTw
vps
shZ
-nup
+dtY
uAm
vps
vps
vps
jYS
tlw
-thx
+dtY
arm
arm
arm
@@ -25574,10 +25523,10 @@ nYM
vps
cJV
mCN
-nup
-nup
-nup
-nup
+dtY
+dtY
+dtY
+dtY
arm
arm
arm
@@ -26340,14 +26289,14 @@ mrH
vps
vps
cXz
-nup
+dtY
ves
vps
vps
npM
-nup
-nup
-nup
+dtY
+dtY
+dtY
tlw
thx
arm
@@ -26591,19 +26540,19 @@ thx
thx
arm
thx
-tlw
+dtY
nhS
uMQ
bdV
qvR
-tlw
+dtY
bcn
qsS
vps
vps
qgM
-nup
-arm
+dtY
+dtY
arm
arm
arm
@@ -26848,16 +26797,16 @@ thx
thx
arm
thx
-arm
-mKU
dtY
mKU
-tlw
-tlw
-tlw
-tlw
+dtY
+dtY
+dtY
+dtY
+dtY
+dtY
+dtY
hPg
-vps
sHm
xdP
ink
@@ -27368,10 +27317,10 @@ uoh
pdE
arm
arm
-nup
-nup
-nup
-nup
+dtY
+dtY
+dtY
+dtY
jBY
sHm
ink
@@ -27606,12 +27555,12 @@ ctn
ctn
jIJ
huE
-aOU
+xRX
nfm
xjB
hoF
nfm
-ixi
+xRX
huE
pPd
abB
@@ -27628,10 +27577,10 @@ arm
arm
arm
arm
-nup
-nup
-nup
-arm
+dtY
+dtY
+dtY
+dtY
arm
thx
arm
@@ -29148,12 +29097,12 @@ ctn
ctn
pJZ
huE
-aOU
+xRX
nfm
qJq
qJq
nfm
-ixi
+xRX
huE
pbt
jko
@@ -30690,12 +30639,12 @@ ctn
ctn
pJZ
huE
-aOU
+xRX
nfm
qJq
qJq
nfm
-ixi
+xRX
huE
ctn
cLC
@@ -32232,12 +32181,12 @@ ctn
ctn
odf
huE
-aOU
+xRX
nfm
xjB
prw
nfm
-ixi
+xRX
huE
ctn
cLC
@@ -34802,12 +34751,12 @@ lvc
ctn
mBP
huE
-aOU
+xRX
nfm
xjB
xjB
nfm
-ixi
+xRX
huE
jaL
cLC
@@ -37629,12 +37578,12 @@ huE
huE
huE
huE
-aOU
+xRX
pPZ
fZJ
fZJ
pPZ
-ixi
+xRX
huE
huE
huE
@@ -37892,7 +37841,7 @@ xjB
vBl
nfm
xRX
-vWJ
+xRX
xRX
xRX
xRX
@@ -38149,7 +38098,7 @@ xjB
xjB
nfm
xRX
-vWJ
+xRX
xRX
xRX
xRX
@@ -38406,7 +38355,7 @@ fZJ
fZJ
nfm
pPZ
-vWJ
+xRX
xRX
xRX
xRX
@@ -38920,12 +38869,12 @@ nbK
jIR
dis
ujY
-ble
-ble
-ble
-ble
-ble
-phk
+xRX
+xRX
+xRX
+xRX
+xRX
+xRX
xRX
xRX
xRX
@@ -39423,8 +39372,8 @@ xRX
xRX
bSn
xRX
-nup
-nup
+dtY
+dtY
xRX
ble
ndF
@@ -39681,7 +39630,7 @@ jIp
xRX
xRX
eNp
-nup
+dtY
fjZ
xRX
oav
@@ -44319,7 +44268,7 @@ bhm
lwM
vLM
lsG
-dsR
+lKN
xjB
rnH
xjB
@@ -44576,7 +44525,7 @@ xjB
xvb
xvb
xjB
-dsR
+lKN
rzs
uuC
xjB
@@ -44833,7 +44782,7 @@ rfa
acU
nZC
xjB
-dsR
+lKN
kcN
naE
vvu
@@ -46611,7 +46560,7 @@ xRX
xRX
xRX
xRX
-oYR
+nfm
nfm
nfm
nfm
@@ -47153,7 +47102,7 @@ xjB
xjB
xjB
xjB
-xjB
+rZF
huE
xRX
xRX
@@ -47377,11 +47326,11 @@ xRX
xRX
xRX
xRX
-qZQ
-ble
-ble
-ble
-ble
+xRX
+xRX
+xRX
+xRX
+xRX
nfm
wNk
rgE
@@ -47409,14 +47358,14 @@ vAO
eYu
pPW
sBs
-xjB
+qZQ
nxJ
huE
-ble
-ble
-ble
-ble
-phk
+xRX
+xRX
+xRX
+xRX
+xRX
xRX
ruQ
xRX
@@ -47664,12 +47613,12 @@ upu
iwl
huE
pPZ
-hkp
-sOd
-nRF
+pPZ
+pPZ
+pPZ
+huE
huE
huE
-nfm
xRX
xRX
xRX
@@ -47896,7 +47845,7 @@ xRX
xRX
xRX
xRX
-oYR
+nfm
nfm
nfm
nfm
@@ -48158,10 +48107,10 @@ xRX
xRX
xRX
xRX
-oYR
xRX
xRX
-ble
+xRX
+xRX
xRX
nfm
qsu
@@ -48181,7 +48130,7 @@ xEy
hkT
wMv
xIf
-piW
+hkp
fzS
nfm
xRX
@@ -48418,7 +48367,7 @@ xRX
xRX
xRX
xRX
-ble
+xRX
xRX
nfm
jrF
@@ -48428,7 +48377,7 @@ nfm
xLR
xRX
xRX
-ble
+xRX
xRX
xRX
nfm
@@ -48440,7 +48389,7 @@ lIg
piW
piW
nfm
-xRX
+nfm
xRX
xRX
xRX
@@ -48675,7 +48624,7 @@ xRX
xRX
xRX
xRX
-qZQ
+xRX
xRX
nfm
nfm
@@ -48685,7 +48634,7 @@ nfm
xRX
xRX
xRX
-qZQ
+xRX
xRX
xRX
nfm
@@ -48944,8 +48893,8 @@ xLR
xRX
xLR
xRX
-fpS
-huE
+xRX
+nfm
cUG
upu
upu
@@ -48953,8 +48902,8 @@ upu
upu
upu
nfm
-huE
-rDo
+nfm
+xRX
xRX
xRX
xRX
@@ -49202,15 +49151,15 @@ xRX
xRX
xRX
xRX
-liU
+nfm
qUf
oXH
vIW
upu
twh
vcf
-xRX
-liU
+nfm
+oYR
xRX
xRX
xRX
@@ -49460,12 +49409,12 @@ xLR
xRX
xRX
xRX
-xRX
+nfm
qUf
qUf
qUf
qUf
-xRX
+nfm
xRX
xRX
xRX
@@ -49719,7 +49668,7 @@ xRX
xRX
xRX
xRX
-ble
+xRX
xRX
xRX
xRX
@@ -49976,7 +49925,7 @@ xRX
xRX
xRX
xRX
-ble
+xRX
xRX
xRX
xRX
@@ -50233,7 +50182,7 @@ xRX
xRX
xRX
xRX
-ble
+xRX
xRX
xRX
xRX
@@ -50490,7 +50439,7 @@ xRX
xRX
xRX
xRX
-ble
+xRX
xRX
xRX
xRX
@@ -50747,7 +50696,7 @@ xRX
xRX
xRX
xRX
-ble
+xRX
xRX
xRX
xRX