regex

shiptest-ss13 · Sep 13, 2024 · 34f272d · 34f272d
1 parent 5902a54
commit 34f272d
Show file tree

Hide file tree

Showing 24 changed files with 92 additions and 125 deletions.
diff --git a/_maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm b/_maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm
@@ -374,6 +374,7 @@
 	},
 /obj/item/gun/energy/lasercannon{
 	pixel_y = 5;
+
 	},
 /obj/item/gun/energy/lasercannon,
 /obj/effect/turf_decal/industrial/hatch,

diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_brazillianlab.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_brazillianlab.dmm
@@ -367,12 +367,6 @@
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
-"sf" = (
-/obj/structure/table/wood,
-/turf/open/floor/wood{
-	initial_gas_mix = "ICEMOON_ATMOS"
-	},
-/area/ruin/unpowered)
 "si" = (
 /obj/structure/flora/rock/jungle,
 /obj/structure/flora/grass/jungle/b,
@@ -1237,12 +1231,6 @@
 	},
 /turf/open/floor/plating/snowed/smoothed/icemoon,
 /area/ruin/unpowered)
-"Zs" = (
-/obj/structure/table/wood,
-/turf/open/floor/wood{
-	initial_gas_mix = "ICEMOON_ATMOS"
-	},
-/area/ruin/unpowered)
 
 (1,1,1) = {"
 aW
@@ -2240,7 +2228,7 @@ Hb
 aW
 WH
 jy
-Zs
+ib
 WH
 WH
 WH
@@ -2272,7 +2260,7 @@ Hb
 aW
 Br
 ib
-sf
+ib
 WH
 WH
 fB

diff --git a/_maps/RandomRuins/LavaRuins/lavaland_abandonedlisteningpost.dmm b/_maps/RandomRuins/LavaRuins/lavaland_abandonedlisteningpost.dmm
@@ -1324,7 +1324,7 @@
 /obj/item/cutting_board{
 	anchored = 1
 	},
-/obj/item/kitchen/knife,
+/obj/item/melee/knife/kitchen,
 /obj/effect/turf_decal/siding/thinplating/dark,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ruin/unpowered/listening_post/canteen)

diff --git a/_maps/RandomRuins/LavaRuins/lavaland_crashed_starwalker.dmm b/_maps/RandomRuins/LavaRuins/lavaland_crashed_starwalker.dmm
@@ -637,7 +637,7 @@
 /obj/structure/table,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light/small/directional/east,
-/obj/item/kitchen/knife{
+/obj/item/melee/knife/kitchen{
 	pixel_x = 7;
 	pixel_y = 10
 	},

diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm
@@ -1072,7 +1072,7 @@
 "qj" = (
 /obj/effect/turf_decal/corner/opaque/solgovblue/diagonal,
 /obj/structure/table/wood,
-/obj/item/kitchen/knife,
+/obj/item/melee/knife/kitchen,
 /turf/open/floor/plasteel/white,
 /area/ruin/unpowered/winter_biodome/living_quarters)
 "qr" = (

diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_buried_shrine.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_buried_shrine.dmm
@@ -1807,7 +1807,7 @@
 /area/ruin/unpowered/buried_shrine)
 "UF" = (
 /obj/structure/stone_tile/block,
-/obj/item/claymore/bone{
+/obj/item/melee/sword/bone{
 	pixel_x = 8;
 	pixel_y = 21
 	},
@@ -1823,7 +1823,7 @@
 /area/ruin/unpowered/buried_shrine)
 "VG" = (
 /obj/structure/table/wood,
-/obj/item/kitchen/knife/combat/bone,
+/obj/item/melee/knife/bone,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/buried_shrine)
 "Wd" = (

diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_lava_canyon.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_lava_canyon.dmm
@@ -345,7 +345,7 @@
 /obj/effect/mob_spawn/human/corpse{
 	mob_species = /datum/species/lizard/ashwalker
 	},
-/obj/item/melee/spear/bonespear{
+/obj/item/melee/spear/bone{
 	pixel_x = 10;
 	pixel_y = -2
 	},
@@ -888,6 +888,7 @@
 "zb" = (
 /mob/living/simple_animal/hostile/megafauna/blood_drunk_miner{
 	loot = list(/obj/item/melee/transforming/cleaving_saw,/obj/item/gun/energy/kinetic_accelerator,/obj/item/keycard/gatedrop/lavacanyon);
+
 	},
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/overmap_encounter/planetoid/cave/explored)
@@ -1706,7 +1707,7 @@
 	pixel_x = -2;
 	pixel_y = 1
 	},
-/obj/item/melee/spear/bonespear{
+/obj/item/melee/spear/bone{
 	pixel_x = 8;
 	pixel_y = 14
 	},

diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm
@@ -1098,7 +1098,7 @@
 /obj/effect/decal/cleanable/blood{
 	icon_state = "drip1"
 	},
-/obj/item/spear,
+/obj/item/melee/spear,
 /obj/item/bodypart/l_arm,
 /turf/open/floor/plasteel/dark,
 /area/ruin/lavaland/factory/dorms)
@@ -2691,8 +2691,8 @@
 /turf/open/floor/carpet/blue,
 /area/ruin/lavaland/factory/manager_office)
 "zl" = (
-/obj/item/kitchen/knife/combat/survival,
-/obj/item/kitchen/knife/combat/survival,
+/obj/item/melee/knife/survival,
+/obj/item/melee/knife/survival,
 /obj/structure/closet/crate/secure/gear,
 /turf/open/floor/plasteel/mono,
 /area/ruin/lavaland/factory/warehouse)
@@ -4302,7 +4302,7 @@
 "QM" = (
 /obj/structure/table/wood,
 /obj/item/cutting_board,
-/obj/item/kitchen/knife,
+/obj/item/melee/knife/kitchen,
 /turf/open/floor/wood,
 /area/ruin/lavaland/factory/adminstrative)
 "QR" = (

diff --git a/_maps/RandomRuins/ReebeRuins/reebe_arena.dmm b/_maps/RandomRuins/ReebeRuins/reebe_arena.dmm
@@ -45,9 +45,6 @@
 "pm" = (
 /turf/open/floor/bronze,
 /area/ruin/reebe)
-"pW" = (
-/turf/open/floor/bronze,
-/area/ruin/reebe)
 "qj" = (
 /mob/living/simple_animal/hostile/asteroid/goliath/beast/ancient/crystal,
 /obj/structure/fans/tiny/invisible,
@@ -224,10 +221,6 @@
 "UU" = (
 /turf/open/chasm/reebe_void,
 /area/ruin/reebe)
-"VT" = (
-/obj/structure/table/bronze,
-/turf/open/floor/bronze,
-/area/ruin/reebe)
 "Xr" = (
 /obj/machinery/door/airlock/bronze/seethru{
 	name = "Summoning Chamber"
@@ -2124,7 +2117,7 @@ Cj
 Cj
 Fz
 pm
-VT
+Ag
 Ib
 Cj
 FD
@@ -2183,7 +2176,7 @@ IC
 IC
 Cj
 Cj
-VT
+Ag
 Fz
 pm
 pm
@@ -2248,7 +2241,7 @@ la
 la
 pm
 pm
-pW
+pm
 pm
 xy
 pm
@@ -2502,7 +2495,7 @@ pm
 pm
 pm
 Cj
-VT
+Ag
 pm
 pm
 pm
@@ -2556,15 +2549,15 @@ pm
 Cj
 pm
 pm
-pW
+pm
 JC
 pm
 JC
 pm
 JC
 pm
 De
-VT
+Ag
 pm
 pm
 pm
@@ -2812,7 +2805,7 @@ pm
 JC
 pm
 De
-VT
+Ag
 pm
 pm
 pm
@@ -2874,7 +2867,7 @@ pm
 pm
 pm
 Cj
-VT
+Ag
 pm
 pm
 pm
@@ -2993,11 +2986,11 @@ JC
 pm
 pm
 Rc
-VT
+Ag
 Cj
 Ag
-VT
-VT
+Ag
+Ag
 pm
 pm
 pm
@@ -3050,7 +3043,7 @@ IC
 IC
 IC
 De
-VT
+Ag
 pm
 pm
 pm
@@ -3124,7 +3117,7 @@ pm
 pm
 pm
 pm
-VT
+Ag
 Cj
 pm
 pm
@@ -3175,7 +3168,7 @@ IC
 IC
 Cj
 Cj
-VT
+Ag
 hO
 pm
 hO
@@ -3185,7 +3178,7 @@ pm
 pm
 pm
 pm
-VT
+Ag
 Cj
 Cj
 pm
@@ -3239,14 +3232,14 @@ IC
 Cj
 Cj
 Pn
-VT
+Ag
 Pn
-VT
+Ag
 Cj
-VT
+Ag
 pm
 pm
-VT
+Ag
 Cj
 Cj
 pm