Merge branch 'master' into translate

ss220club · Mar 10, 2024 · 0bf3d3d · 0bf3d3d
2 parents 5863164 + c841702
commit 0bf3d3d
Show file tree

Hide file tree

Showing 9 changed files with 2,013 additions and 1,858 deletions.
diff --git a/_maps/map_files220/MetaStation/MetaStation.dmm b/_maps/map_files220/MetaStation/MetaStation.dmm
diff --git a/_maps/map_files220/RandomZLevels/blackmarketpackers.dmm b/_maps/map_files220/RandomZLevels/blackmarketpackers.dmm
@@ -293,8 +293,7 @@
 /obj/item/reagent_containers/drinks/bottle/patron,
 /obj/item/flashlight/lamp/green{
 	pixel_x = -5;
-	pixel_y = 12;
-	on = 0
+	pixel_y = 12
 	},
 /obj/effect/landmark/damageturf,
 /turf/simulated/floor/wood/oak,
@@ -1224,8 +1223,7 @@
 "dJ" = (
 /obj/item/flashlight/lamp/bananalamp{
 	pixel_x = -6;
-	pixel_y = 10;
-	on = 0
+	pixel_y = 10
 	},
 /obj/structure/alien/weeds,
 /obj/item/paperplane{

diff --git a/_maps/map_files220/RandomZLevels/blackmesa.dmm b/_maps/map_files220/RandomZLevels/blackmesa.dmm
@@ -11465,9 +11465,7 @@
 /area/awaymission/black_mesa/entrance_lobby)
 "oao" = (
 /obj/structure/table,
-/obj/item/flashlight/lamp{
-	on = 0
-	},
+/obj/item/flashlight/lamp,
 /turf/simulated/floor/plasteel,
 /area/awaymission/black_mesa/entrance_lobby)
 "oaH" = (
@@ -16780,9 +16778,7 @@
 /area/awaymission/black_mesa/xen/freeman_hallway)
 "uEY" = (
 /obj/structure/table,
-/obj/item/flashlight/lamp{
-	on = 0
-	},
+/obj/item/flashlight/lamp,
 /turf/simulated/floor/plasteel,
 /area/awaymission/black_mesa/hecu_zone_test_chambers)
 "uFe" = (

diff --git a/_maps/map_files220/RandomZLevels/caves.dmm b/_maps/map_files220/RandomZLevels/caves.dmm
@@ -558,7 +558,6 @@
 "ct" = (
 /obj/structure/table,
 /obj/item/flashlight/lamp{
-	on = 0;
 	pixel_y = 10;
 	pixel_x = -5
 	},
@@ -877,9 +876,7 @@
 	pixel_x = 5;
 	pixel_y = 8
 	},
-/obj/item/flashlight/lamp{
-	on = 0
-	},
+/obj/item/flashlight/lamp,
 /obj/effect/turf_decal/siding/wood,
 /obj/effect/spawner/random_spawners/dirt_often,
 /turf/simulated/floor/wood/oak,
@@ -5655,9 +5652,7 @@
 /area/awaymission/caves)
 "CP" = (
 /obj/structure/table/wood,
-/obj/item/flashlight/lamp{
-	on = 0
-	},
+/obj/item/flashlight/lamp,
 /turf/simulated/floor/wood/lavaland_air{
 	icon_state = "wood-broken"
 	},

diff --git a/_maps/map_files220/RandomZLevels/gate_lizard.dmm b/_maps/map_files220/RandomZLevels/gate_lizard.dmm
@@ -2012,8 +2012,7 @@
 /obj/structure/table/glass,
 /obj/item/flashlight/lamp/green{
 	pixel_x = 10;
-	pixel_y = -6;
-	on = 0
+	pixel_y = -6
 	},
 /obj/item/paper_bin{
 	pixel_x = 6;
@@ -6220,9 +6219,7 @@
 /area/awaymission/jungle_planet/inside)
 "icJ" = (
 /obj/structure/table,
-/obj/item/flashlight/lamp{
-	on = 0
-	},
+/obj/item/flashlight/lamp,
 /obj/item/flash,
 /obj/machinery/firealarm{
 	name = "north fire alarm";