Fix Travis grep script to use PCRE to actually match things (#47065)

Several of the greps were missing the `-P` switch which caused them to 
fail to match things. The EOL grep also wasn't working right so I 
replaced it with the one I added to TGMC.

.travis.yml

@@ -16,6 +16,7 @@ matrix:
             - python3
             - python3-pip
             - python3-setuptools
+            - pcregrep
       install:
         - tools/travis/install_build_tools.sh
         - tools/travis/install_spaceman_dmm.sh dreamchecker

_maps/map_files/Donutstation/Donutstation.dmm

@@ -12919,9 +12919,7 @@
 /area/science/xenobiology)
 "aJv" = (
 /turf/closed/wall,
-/area/medical/patients_rooms/room_a{
+/area/medical/surgery/room_b)
-	name = "Surgery B"
-	})
 "aJw" = (
 /obj/machinery/computer/operating,
 /obj/effect/turf_decal/tile/blue{
@@ -12934,9 +12932,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel/white,
-/area/medical/patients_rooms/room_a{
+/area/medical/surgery/room_b)
-	name = "Surgery B"
-	})
 "aJx" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
 	dir = 6
@@ -13141,9 +13137,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel/white,
-/area/medical/patients_rooms/room_a{
+/area/medical/surgery/room_b)
-	name = "Surgery B"
-	})
 "aJV" = (
 /obj/structure/closet/l3closet,
 /obj/effect/turf_decal/stripes/line{
@@ -13226,9 +13220,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/white,
-/area/medical/patients_rooms/room_a{
+/area/medical/surgery/room_b)
-	name = "Surgery B"
-	})
 "aKg" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
@@ -13307,9 +13299,7 @@
 /obj/item/reagent_containers/blood/random,
 /obj/effect/spawner/lootdrop/organ_spawner,
 /turf/open/floor/plasteel,
-/area/medical/patients_rooms/room_a{
+/area/medical/surgery/room_b)
-	name = "Surgery B"
-	})
 "aKp" = (
 /obj/machinery/door/window/southleft{
 	name = "Genetics Pen";
@@ -13380,9 +13370,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/white,
-/area/medical/patients_rooms/room_a{
+/area/medical/surgery/room_b)
-	name = "Surgery B"
-	})
 "aKx" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3,
 /obj/machinery/keycard_auth{
@@ -16657,9 +16645,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel/white,
-/area/medical/patients_rooms/room_a{
+/area/medical/surgery/room_b)
-	name = "Surgery B"
-	})
 "aUt" = (
 /obj/structure/table,
 /obj/item/storage/firstaid/regular,
@@ -17785,9 +17771,7 @@
 	name = "privacy shutters"
 	},
 /turf/open/floor/plating,
-/area/medical/patients_rooms/room_a{
+/area/medical/surgery/room_b)
-	name = "Surgery B"
-	})
 "aXq" = (
 /obj/structure/table/reinforced,
 /obj/item/folder/white,
@@ -17809,9 +17793,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/white,
-/area/medical/patients_rooms/room_a{
+/area/medical/surgery/room_b)
-	name = "Surgery B"
-	})
 "aXs" = (
 /obj/structure/table/reinforced,
 /obj/machinery/cell_charger,
@@ -17940,9 +17922,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/white,
-/area/medical/patients_rooms/room_a{
+/area/medical/surgery/room_b)
-	name = "Surgery B"
-	})
 "aXL" = (
 /obj/machinery/holopad,
 /turf/open/floor/plasteel,
@@ -18057,9 +18037,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/white,
-/area/medical/patients_rooms/room_a{
+/area/medical/surgery/room_b)
-	name = "Surgery B"
-	})
 "aXZ" = (
 /obj/machinery/door/airlock/maintenance{
 	name = "Surgery Maintenance Access";
@@ -18162,9 +18140,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel/white,
-/area/medical/patients_rooms/room_a{
+/area/medical/surgery/room_b)
-	name = "Surgery B"
-	})
 "aYm" = (
 /obj/effect/landmark/blobstart,
 /turf/open/floor/plasteel/dark,
@@ -20146,9 +20122,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel/white,
-/area/medical/patients_rooms/room_a{
+/area/medical/surgery/room_b)
-	name = "Surgery B"
-	})
 "bdl" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
 	dir = 8
@@ -21073,9 +21047,7 @@
 	pixel_y = 26
 	},
 /turf/open/floor/plasteel/white,
-/area/medical/patients_rooms/room_a{
+/area/medical/surgery/room_b)
-	name = "Surgery B"
-	})
 "bft" = (
 /obj/effect/turf_decal/tile/neutral{
 	dir = 4
@@ -21180,9 +21152,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/white,
-/area/medical/patients_rooms/room_a{
+/area/medical/surgery/room_b)
-	name = "Surgery B"
-	})
 "bfF" = (
 /obj/effect/turf_decal/tile/blue{
 	dir = 4
@@ -34492,9 +34462,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel/white,
-/area/medical/patients_rooms/room_a{
+/area/medical/surgery/room_b)
-	name = "Surgery B"
-	})
 "bMf" = (
 /obj/structure/table/optable,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
@@ -45157,9 +45125,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel/white,
-/area/medical/patients_rooms/room_a{
+/area/medical/surgery/room_b)
-	name = "Surgery B"
-	})
 "mlN" = (
 /obj/structure/closet/secure_closet/freezer/cream_pie,
 /obj/item/radio/intercom{
@@ -46117,9 +46083,7 @@
 /area/quartermaster/storage)
 "onl" = (
 /turf/open/floor/plasteel/white,
-/area/medical/patients_rooms/room_a{
+/area/medical/surgery/room_b)
-	name = "Surgery B"
-	})
 "onT" = (
 /obj/structure/table/reinforced,
 /obj/machinery/door/window/westleft{
@@ -50413,9 +50377,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/white,
-/area/medical/patients_rooms/room_a{
+/area/medical/surgery/room_b)
-	name = "Surgery B"
-	})
 "xyz" = (
 /obj/machinery/atmospherics/pipe/manifold/dark/visible{
 	dir = 1

_maps/map_files/MetaStation/MetaStation.dmm

@@ -56226,9 +56226,7 @@
 	},
 /obj/structure/cable,
 /turf/open/floor/plasteel/white,
-/area/medical/patients_rooms/room_a{
+/area/medical/surgery/room_b)
-	name = "Surgery B"
-	})
 "cts" = (
 /obj/effect/turf_decal/tile/blue{
 	dir = 1
@@ -56238,18 +56236,14 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/white,
-/area/medical/patients_rooms/room_a{
+/area/medical/surgery/room_b)
-	name = "Surgery B"
-	})
 "ctt" = (
 /obj/structure/cable,
 /obj/machinery/light_switch{
 	pixel_y = 26
 	},
 /turf/open/floor/plasteel/white,
-/area/medical/patients_rooms/room_a{
+/area/medical/surgery/room_b)
-	name = "Surgery B"
-	})
 "ctu" = (
 /obj/machinery/door/airlock/medical{
 	name = "Surgery B";
@@ -56257,9 +56251,7 @@
 	},
 /obj/structure/cable,
 /turf/open/floor/plasteel/white,
-/area/medical/patients_rooms/room_a{
+/area/medical/surgery/room_b)
-	name = "Surgery B"
-	})
 "ctw" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -56613,17 +56605,13 @@
 	},
 /obj/structure/cable,
 /turf/open/floor/plasteel/white,
-/area/medical/patients_rooms/room_a{
+/area/medical/surgery/room_b)
-	name = "Surgery B"
-	})
 "cul" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on{
 	dir = 4
 	},
 /turf/open/floor/plasteel/white,
-/area/medical/patients_rooms/room_a{
+/area/medical/surgery/room_b)
-	name = "Surgery B"
-	})
 "cum" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -56634,9 +56622,7 @@
 	},
 /obj/effect/turf_decal/tile/blue,
 /turf/open/floor/plasteel/white,
-/area/medical/patients_rooms/room_a{
+/area/medical/surgery/room_b)
-	name = "Surgery B"
-	})
 "cun" = (
 /obj/effect/spawner/structure/window,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -56647,9 +56633,7 @@
 	name = "privacy shutters"
 	},
 /turf/open/floor/plating,
-/area/medical/patients_rooms/room_a{
+/area/medical/surgery/room_b)
-	name = "Surgery B"
-	})
 "cuo" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
 	dir = 1
@@ -57099,15 +57083,11 @@
 	network = list("ss13","medbay")
 	},
 /turf/open/floor/plasteel/white,
-/area/medical/patients_rooms/room_a{
+/area/medical/surgery/room_b)
-	name = "Surgery B"
-	})
 "cvp" = (
 /obj/effect/landmark/start/medical_doctor,
 /turf/open/floor/plasteel/white,
-/area/medical/patients_rooms/room_a{
+/area/medical/surgery/room_b)
-	name = "Surgery B"
-	})
 "cvq" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -57587,17 +57567,13 @@
 	pixel_x = -28
 	},
 /turf/open/floor/plasteel/white,
-/area/medical/patients_rooms/room_a{
+/area/medical/surgery/room_b)
-	name = "Surgery B"
-	})
 "cwp" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on{
 	dir = 4
 	},
 /turf/open/floor/plasteel/white,
-/area/medical/patients_rooms/room_a{
+/area/medical/surgery/room_b)
-	name = "Surgery B"
-	})
 "cwq" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -57610,9 +57586,7 @@
 	},
 /obj/effect/turf_decal/tile/blue,
 /turf/open/floor/plasteel/white,
-/area/medical/patients_rooms/room_a{
+/area/medical/surgery/room_b)
-	name = "Surgery B"
-	})
 "cwr" = (
 /obj/effect/spawner/structure/window,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -57623,9 +57597,7 @@
 	name = "privacy shutters"
 	},
 /turf/open/floor/plating,
-/area/medical/patients_rooms/room_a{
+/area/medical/surgery/room_b)
-	name = "Surgery B"
-	})
 "cws" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -58025,9 +57997,7 @@
 	pixel_x = -32
 	},
 /turf/open/floor/plasteel/white,
-/area/medical/patients_rooms/room_a{
+/area/medical/surgery/room_b)
-	name = "Surgery B"
-	})
 "cxf" = (
 /obj/effect/turf_decal/tile/blue,
 /obj/effect/turf_decal/tile/blue{
@@ -58035,9 +58005,7 @@
 	},
 /obj/machinery/light,
 /turf/open/floor/plasteel/white,
-/area/medical/patients_rooms/room_a{
+/area/medical/surgery/room_b)
-	name = "Surgery B"
-	})
 "cxg" = (
 /obj/effect/turf_decal/tile/blue,
 /obj/effect/turf_decal/tile/blue{
@@ -58049,9 +58017,7 @@
 /obj/effect/turf_decal/tile/blue,
 /obj/machinery/smartfridge/organ,
 /turf/open/floor/plasteel/white,
-/area/medical/patients_rooms/room_a{
+/area/medical/surgery/room_b)
-	name = "Surgery B"
-	})
 "cxh" = (
 /obj/effect/spawner/structure/window,
 /obj/machinery/door/poddoor/preopen{
@@ -58059,9 +58025,7 @@
 	name = "privacy shutters"
 	},
 /turf/open/floor/plating,
-/area/medical/patients_rooms/room_a{
+/area/medical/surgery/room_b)
-	name = "Surgery B"
-	})
 "cxi" = (
 /obj/effect/turf_decal/tile/blue{
 	dir = 1
@@ -74978,9 +74942,7 @@
 	pixel_y = 4
 	},
 /turf/open/floor/plasteel/white,
-/area/medical/patients_rooms/room_a{
+/area/medical/surgery/room_b)
-	name = "Surgery B"
-	})
 "nIb" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/mining{
@@ -75005,9 +74967,7 @@
 /area/science/research)
 "nMe" = (
 /turf/closed/wall,
-/area/medical/patients_rooms/room_a{
+/area/medical/surgery/room_b)
-	name = "Surgery B"
-	})
 "nPC" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{

code/game/area/Space_Station_13_areas.dm

@@ -679,6 +679,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Surgery"
 	icon_state = "surgery"
 
+/area/medical/surgery/room_b
+	name = "Surgery B"
+	icon_state = "surgery"
+
 /area/medical/cryo
 	name = "Cryogenics"
 	icon_state = "cryo"

code/modules/atmospherics/machinery/pipes/layermanifold.dm

@@ -136,4 +136,3 @@
 /obj/machinery/atmospherics/pipe/layer_manifold/visible
 	level = PIPE_VISIBLE_LEVEL
 	layer = GAS_PIPE_VISIBLE_LAYER
-	

tools/travis/check_grep.sh

@@ -14,30 +14,30 @@ if grep -P '^\ttag = \"icon' _maps/**/*.dmm;	then
     echo "ERROR: tag vars from icon state generation detected in maps, please remove them."
     st=1
 fi;
-if grep 'step_[xy]' _maps/**/*.dmm;	then
+if grep -P 'step_[xy]' _maps/**/*.dmm;	then
     echo "ERROR: step_x/step_y variables detected in maps, please remove them."
     st=1
 fi;
-if grep 'pixel_[xy] = 0' _maps/**/*.dmm;	then
+if grep -P 'pixel_[xy] = 0' _maps/**/*.dmm;	then
     echo "WARNING: pixel_x/pixel_y = 0 variables detected in maps, please review to ensure they are not dirty varedits."
 fi;
 if grep -P '\td[1-2] =' _maps/**/*.dmm;	then
     echo "ERROR: d1/d2 cable variables detected in maps, please remove them."
     st=1
 fi;
-if grep '^/area/.+[\{]' _maps/**/*.dmm;	then
+if grep -P '^/area/.+[\{]' _maps/**/*.dmm;	then
     echo "ERROR: Vareditted /area path use detected in maps, please replace with proper paths."
     st=1
 fi;
-if grep '\W\/turf\s*[,\){]' _maps/**/*.dmm; then
+if grep -P '\W\/turf\s*[,\){]' _maps/**/*.dmm; then
     echo "ERROR: base /turf path use detected in maps, please replace with proper paths."
     st=1
 fi;
-if grep '^/*var/' code/**/*.dm; then
+if grep -P '^/*var/' code/**/*.dm; then
     echo "ERROR: Unmanaged global var use detected in code, please use the helpers."
     st=1
 fi;
-if grep '(^(?!(.*\n)).*$)' code/**/*.dm; then
+if pcregrep --buffer-size=100K -LMr '\n$' code/**/*.dm; then
     echo "ERROR: No newline at end of file detected"
     st=1
 fi;