Skip to content

Commit

Permalink
FIx: SpaceRuins atmos (#273)
Browse files Browse the repository at this point in the history 
<!-- Пишите **НИЖЕ** заголовков и **ВЫШЕ** комментариев, иначе что то
может пойти не так. -->
<!-- Вы можете прочитать Contributing.MD, если хотите узнать больше. -->

## Что этот PR делает

Фикс космических тайлов с активным атмосом на некоторых косморуинах:
whiteship, convoy_ambush, voxraiders_1, mechtransport_new. Фикс
положения кнопок на руине mechtransport_new. Фикс лампочек на некоторых
руинах.

## Почему это хорошо для игры

Меньше нагрузки - меньше нагрузки.

## Изображения изменений
<!-- Если вы не меняли карту или спрайты, можете опустить эту секцию.
Если хотите, можете вставить видео. -->

## Тестирование
Что это?

## Changelog

:cl:
fix: убрал ненужные тайлы с активным атмосом на картах whiteship,
convoy_ambush, voxraiders_1, mechtransport_new; починил лампочки там же.

/:cl:

<!-- Оба :cl:'а должны быть на месте, что-бы чейнджлог работал! Вы
можете написать свой ник справа от первого :cl:, если хотите. Иначе
будет использован ваш ник на ГитХабе. -->
<!-- Вы можете использовать несколько записей с одинаковым префиксом
(Они используются только для иконки в игре) и удалить ненужные. Помните,
что чейнджлог должен быть понятен обычным игроком. -->
<!-- Если чейнджлог не влияет на игроков(например, это рефактор), вы
можете исключить всю секцию. -->
  • Loading branch information
@konushi
konushi authored Oct 3, 2023
1 parent a451363 commit e5a9006
Show file tree
Hide file tree
Showing 5 changed files with 110 additions and 181 deletions.
18 changes: 8 additions & 10 deletions _maps/map_files220/RandomRuins/SpaceRuins/convoy_ambush.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,6 @@
/area/ruin/space/unpowered/unpowered_structures)
"eJ" = (
/obj/machinery/light_construct{
icon_state = "bulb-broken";
dir = 8
},
/obj/effect/landmark/damageturf,
Expand All @@ -163,7 +162,8 @@
},
/area/ruin/space/unpowered/unpowered_structures)
"fL" = (
/turf/simulated/floor/plasteel/stairs{
/turf/simulated/floor/plasteel/airless{
icon_state = "stairs";
dir = 8
},
/area/ruin/space/unpowered/unpowered_structures)
Expand Down Expand Up @@ -253,7 +253,8 @@
},
/area/ruin/space/unpowered/unpowered_structures)
"kd" = (
/turf/simulated/floor/plasteel/stairs{
/turf/simulated/floor/plasteel/airless{
icon_state = "stairs";
dir = 8
},
/area/ruin/space/powered)
Expand Down Expand Up @@ -340,7 +341,7 @@
color = "#FF0000";
dir = 1
},
/turf/simulated/floor,
/turf/simulated/floor/plating/airless,
/area/ruin/space/unpowered/unpowered_structures)
"nV" = (
/obj/item/flashlight,
Expand All @@ -357,7 +358,7 @@
/area/template_noop)
"oq" = (
/obj/effect/spawner/window/plastitanium,
/turf/simulated/floor,
/turf/simulated/floor/plating/airless,
/area/ruin/space/unpowered/unpowered_structures)
"oE" = (
/obj/item/stack/sheet/mineral/plastitanium,
Expand Down Expand Up @@ -903,7 +904,6 @@
/area/ruin/space/unpowered/unpowered_structures)
"KY" = (
/obj/machinery/light_construct{
icon_state = "bulb-broken";
dir = 8
},
/obj/structure/closet,
Expand Down Expand Up @@ -1057,7 +1057,7 @@
color = "#FF0000";
dir = 2
},
/turf/simulated/floor,
/turf/simulated/floor/plating/airless,
/area/ruin/space/unpowered/unpowered_structures)
"RP" = (
/turf/simulated/wall/mineral/titanium/nodiagonal,
Expand Down Expand Up @@ -1086,7 +1086,7 @@
color = "#FF0000";
dir = 2
},
/turf/simulated/floor,
/turf/simulated/floor/plating/airless,
/area/ruin/space/unpowered/unpowered_structures)
"Sn" = (
/obj/structure/closet/walllocker/emerglocker/west,
Expand Down Expand Up @@ -1160,7 +1160,6 @@
"TU" = (
/obj/structure/lattice,
/obj/machinery/light_construct{
icon_state = "bulb-broken";
dir = 8
},
/turf/template_noop,
Expand Down Expand Up @@ -1242,7 +1241,6 @@
/area/ruin/space/unpowered/unpowered_structures)
"YG" = (
/obj/machinery/light_construct{
icon_state = "bulb-broken";
dir = 8
},
/obj/structure/lattice,
Expand Down
42 changes: 5 additions & 37 deletions _maps/map_files220/RandomRuins/SpaceRuins/infected_ship.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,7 @@
/turf/simulated/floor/mineral/plastitanium,
/area/ruin/space/powered/requires_power_space)
"aY" = (
/obj/machinery/light_construct{
icon_state = "bulb-broken";
dir = 2
},
/obj/machinery/light_construct,
/obj/effect/decal/cleanable/blood/splatter,
/obj/effect/spawner/random_spawners/dirt_often,
/turf/simulated/floor/mineral/plastitanium,
Expand Down Expand Up @@ -191,17 +188,13 @@
/turf/simulated/floor/mineral/plastitanium,
/area/ruin/space/powered/requires_power_space)
"ez" = (
/obj/machinery/light_construct{
icon_state = "bulb-broken";
dir = 2
},
/obj/machinery/light_construct,
/obj/effect/spawner/random_spawners/dirt_often,
/turf/simulated/floor/plasteel/freezer,
/area/ruin/space/powered/requires_power_space)
"eC" = (
/obj/machinery/atmospherics/portable/canister,
/obj/machinery/light_construct{
icon_state = "bulb-broken";
dir = 4
},
/obj/effect/spawner/random_spawners/dirt_often,
Expand Down Expand Up @@ -238,7 +231,6 @@
name = "tesla coil"
},
/obj/machinery/light_construct{
icon_state = "bulb-broken";
dir = 1
},
/turf/simulated/floor,
Expand All @@ -256,7 +248,6 @@
/area/ruin/space/powered/requires_power_space)
"eT" = (
/obj/machinery/light_construct{
icon_state = "bulb-broken";
dir = 8
},
/obj/effect/decal/cleanable/glass,
Expand Down Expand Up @@ -312,7 +303,6 @@
/area/ruin/space/powered/requires_power_space)
"hn" = (
/obj/machinery/light_construct{
icon_state = "bulb-broken";
dir = 1
},
/obj/effect/turf_decal/stripes/white/line{
Expand Down Expand Up @@ -396,7 +386,6 @@
/area/ruin/space/powered/requires_power_space)
"iL" = (
/obj/machinery/light_construct{
icon_state = "bulb-broken";
dir = 8
},
/obj/structure/closet/crate/secure/weapon{
Expand Down Expand Up @@ -571,7 +560,6 @@
/area/ruin/space/powered/requires_power_space)
"lm" = (
/obj/machinery/light_construct{
icon_state = "bulb-broken";
dir = 8
},
/obj/item/trash/spentcasing{
Expand All @@ -581,10 +569,7 @@
/turf/simulated/floor/mineral/plastitanium,
/area/ruin/space/powered/requires_power_space)
"lt" = (
/obj/machinery/light_construct{
icon_state = "bulb-broken";
dir = 2
},
/obj/machinery/light_construct,
/obj/structure/mirror{
dir = 4;
pixel_y = 33;
Expand Down Expand Up @@ -699,7 +684,6 @@
/area/ruin/space/powered/requires_power_space)
"ol" = (
/obj/machinery/light_construct{
icon_state = "bulb-broken";
dir = 1
},
/turf/simulated/floor/mineral/plastitanium,
Expand Down Expand Up @@ -738,7 +722,6 @@
/area/ruin/space/powered/requires_power_space)
"pj" = (
/obj/machinery/light_construct{
icon_state = "bulb-broken";
dir = 8
},
/obj/structure/computerframe{
Expand Down Expand Up @@ -770,7 +753,6 @@
/area/ruin/space/powered/requires_power_space)
"pB" = (
/obj/machinery/light_construct{
icon_state = "bulb-broken";
dir = 1
},
/obj/effect/turf_decal/stripes/white/line{
Expand All @@ -793,10 +775,7 @@
/turf/simulated/floor,
/area/ruin/space/powered/requires_power_space)
"pO" = (
/obj/machinery/light_construct{
icon_state = "bulb-broken";
dir = 2
},
/obj/machinery/light_construct,
/obj/structure/closet/crate/can,
/obj/item/trash/syndi_cakes,
/obj/item/trash/raisins,
Expand Down Expand Up @@ -895,7 +874,6 @@
/area/ruin/space/powered/requires_power_space)
"tE" = (
/obj/machinery/light_construct{
icon_state = "bulb-broken";
dir = 1
},
/obj/machinery/atmospherics/unary/vent_pump{
Expand Down Expand Up @@ -968,7 +946,6 @@
/area/ruin/space/powered/requires_power_space)
"vk" = (
/obj/machinery/light_construct{
icon_state = "bulb-broken";
dir = 8
},
/obj/machinery/economy/vending/medical/syndicate_access,
Expand Down Expand Up @@ -1046,7 +1023,6 @@
/area/ruin/space/powered/requires_power_space)
"xG" = (
/obj/machinery/light_construct{
icon_state = "bulb-broken";
dir = 8
},
/obj/item/paper/crumpled,
Expand Down Expand Up @@ -1091,7 +1067,6 @@
/area/ruin/space/powered/requires_power_space)
"zq" = (
/obj/machinery/light_construct{
icon_state = "bulb-broken";
dir = 4
},
/obj/effect/decal/cleanable/blood/splatter,
Expand Down Expand Up @@ -1161,7 +1136,6 @@
/area/ruin/space/powered/requires_power_space)
"AV" = (
/obj/machinery/light_construct{
icon_state = "bulb-broken";
dir = 4
},
/obj/machinery/atmospherics/unary/vent_pump,
Expand Down Expand Up @@ -1223,7 +1197,6 @@
"ET" = (
/obj/machinery/atmospherics/portable/canister,
/obj/machinery/light_construct{
icon_state = "bulb-broken";
dir = 4
},
/turf/simulated/floor,
Expand Down Expand Up @@ -1372,10 +1345,7 @@
/turf/simulated/floor,
/area/ruin/space/powered/requires_power_space)
"Je" = (
/obj/machinery/light_construct{
icon_state = "bulb-broken";
dir = 2
},
/obj/machinery/light_construct,
/obj/effect/spawner/random_spawners/dirt_often,
/obj/item/trash/spentcasing{
icon_state = "r-casing";
Expand All @@ -1391,7 +1361,6 @@
/area/ruin/space/powered/requires_power_space)
"JH" = (
/obj/machinery/light_construct{
icon_state = "bulb-broken";
dir = 1
},
/obj/structure/dispenser/oxygen,
Expand Down Expand Up @@ -1596,7 +1565,6 @@
/area/ruin/space/powered/requires_power_space)
"QS" = (
/obj/machinery/light_construct{
icon_state = "bulb-broken";
dir = 8
},
/obj/machinery/suit_storage_unit/syndicate{
Expand Down
Loading

0 comments on commit e5a9006

Please sign in to comment.