Skip to content

Commit

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

## Что этот PR делает
Возвращает решётки под окна, которые апстрим решил спиздить.

<!-- Вкратце опишите изменения, которые вносите. -->
<!-- Опишите **все** изменения, так как противное может сказаться на
рассмотрении этого PR'а! -->
<!-- Если вы исправляете Issue, добавьте "Fixes #1234" (где 1234 - номер
Issue) где-нибудь в описании PR'а. Это автоматически закроет Issue после
принятия PR'а. -->

## Почему это хорошо для игры
Потому что без них - кринж

<!-- Опишите, почему, по вашему, следует добавить эти изменения в игру.
-->

## Изображения изменений
Не должно быть, надеюсь никто не видел кошмар который был без решёток

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

## Тестирование
Нет, верю скрипту :Clueless:

<!-- Как вы тестировали свой PR, если делали это вовсе? -->

## Changelog

🆑
del: Отмена оффовского ПРа, который убирал решётки под окнами.
/🆑

<!-- Оба 🆑'а должны быть на месте, что-бы чейнджлог работал! Вы
можете написать свой ник справа от первого 🆑, если хотите. Иначе
будет использован ваш ник на ГитХабе. -->
<!-- Вы можете использовать несколько записей с одинаковым префиксом
(Они используются только для иконки в игре) и удалить ненужные. Помните,
что чейнджлог должен быть понятен обычным игроком. -->
<!-- Если чейнджлог не влияет на игроков(например, это рефактор), вы
можете исключить всю секцию. -->
  • Loading branch information
AyIong authored and Furrior committed Oct 22, 2023
1 parent 9ebf89e commit 97e9ee4
Show file tree
Hide file tree
Showing 14 changed files with 873 additions and 867 deletions.
2 changes: 1 addition & 1 deletion _maps/map_files220/RandomRuins/LavaRuins/scp_facility.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@
},
/area/ruin/unpowered/misc_lavaruin)
"oL" = (
/obj/effect/spawner/window/reinforced,
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating/lavaland_air,
/area/ruin/unpowered/misc_lavaruin)
"oN" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -750,7 +750,7 @@
/turf/simulated/floor/plating,
/area/ruin/space/powered)
"rJ" = (
/obj/effect/spawner/window/reinforced/polarized{
/obj/effect/spawner/window/reinforced/polarized/grilled{
id = "mech_toilet"
},
/obj/machinery/door/poddoor{
Expand Down
28 changes: 14 additions & 14 deletions _maps/map_files220/RandomRuins/SpaceRuins/spacehotel.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
/turf/simulated/floor/wood,
/area/ruin/space/spacehotelv1/centralhallway)
"aU" = (
/obj/effect/spawner/window/reinforced,
/obj/effect/spawner/window/reinforced/grilled,
/obj/structure/cable{
d1 = 4;
d2 = 8;
Expand All @@ -128,7 +128,7 @@
/turf/simulated/floor/plating,
/area/ruin/space/spacehotelv1/engi2)
"aW" = (
/obj/effect/spawner/window/reinforced,
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/ruin/space/spacehotelv1/restoraunt3)
"aX" = (
Expand Down Expand Up @@ -869,7 +869,7 @@
/turf/simulated/floor/plating,
/area/ruin/space/spacehotelv1/engi1)
"gC" = (
/obj/effect/spawner/window/reinforced,
/obj/effect/spawner/window/reinforced/grilled,
/obj/structure/cable{
d1 = 2;
d2 = 4;
Expand Down Expand Up @@ -1416,7 +1416,7 @@
/turf/simulated/floor/wood,
/area/ruin/space/spacehotelv1/reception)
"ky" = (
/obj/effect/spawner/window/reinforced,
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/ruin/space/spacehotelv1/bar)
"kB" = (
Expand Down Expand Up @@ -1472,7 +1472,7 @@
/turf/simulated/floor/wood,
/area/ruin/space/spacehotelv1/centralhallway)
"kV" = (
/obj/effect/spawner/window/reinforced,
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/ruin/space/spacehotelv1/restoraunt2)
"kX" = (
Expand Down Expand Up @@ -2251,7 +2251,7 @@
/turf/simulated/floor/plating,
/area/ruin/space/spacehotelv1/engi1)
"pS" = (
/obj/effect/spawner/window/reinforced,
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/ruin/space/spacehotelv1/centralhallway)
"pU" = (
Expand Down Expand Up @@ -2424,7 +2424,7 @@
/turf/simulated/floor/wood,
/area/ruin/space/spacehotelv1/forehallway)
"rm" = (
/obj/effect/spawner/window/reinforced,
/obj/effect/spawner/window/reinforced/grilled,
/obj/structure/cable{
d1 = 1;
d2 = 8;
Expand Down Expand Up @@ -2887,7 +2887,7 @@
/turf/simulated/floor/carpet/blue,
/area/ruin/space/spacehotelv1/guestroom3)
"uF" = (
/obj/effect/spawner/window/reinforced,
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/ruin/space/spacehotelv1/engi1)
"uI" = (
Expand Down Expand Up @@ -3631,7 +3631,7 @@
/turf/simulated/floor/plasteel,
/area/ruin/space/spacehotelv1/kitchen)
"zu" = (
/obj/effect/spawner/window/reinforced,
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/ruin/space/spacehotelv1/engi2)
"zv" = (
Expand Down Expand Up @@ -3794,7 +3794,7 @@
/turf/simulated/floor/carpet/cyan,
/area/ruin/space/spacehotelv1/guestroom5)
"Aq" = (
/obj/effect/spawner/window/reinforced,
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/ruin/space/spacehotelv1/restoraunt1)
"Ar" = (
Expand Down Expand Up @@ -5242,7 +5242,7 @@
/turf/simulated/floor/plating,
/area/ruin/space/spacehotelv1/engi1)
"KY" = (
/obj/effect/spawner/window/reinforced/polarized{
/obj/effect/spawner/window/reinforced/polarized/grilled{
id = "restoom2_tint"
},
/turf/simulated/floor/plating,
Expand Down Expand Up @@ -5287,7 +5287,7 @@
/turf/simulated/floor/plating,
/area/ruin/space/spacehotelv1/reception)
"Lk" = (
/obj/effect/spawner/window/reinforced,
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/ruin/space/spacehotelv1/forehallway)
"Ll" = (
Expand Down Expand Up @@ -5584,7 +5584,7 @@
/turf/simulated/floor/wood,
/area/ruin/space/spacehotelv1/forehallway)
"No" = (
/obj/effect/spawner/window/reinforced,
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/ruin/space/spacehotelv1/entryhallway)
"Nr" = (
Expand Down Expand Up @@ -7027,7 +7027,7 @@
/turf/simulated/floor/wood,
/area/ruin/space/spacehotelv1/bar)
"Yh" = (
/obj/effect/spawner/window/reinforced,
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/ruin/space/spacehotelv1/forestarboardmaints)
"Yq" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files220/RandomRuins/SpaceRuins/transit_bar.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
/turf/template_noop,
/area/template_noop)
"y" = (
/obj/effect/spawner/window/reinforced,
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/ruin/space/powered)
"z" = (
Expand Down
8 changes: 4 additions & 4 deletions _maps/map_files220/RandomZLevels/blackmarketpackers.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,7 @@
/area/awaymission/BMPship/Fore)
"bT" = (
/obj/effect/decal/warning_stripes/south,
/obj/effect/spawner/window/reinforced,
/obj/effect/spawner/window/reinforced/grilled,
/obj/structure/cable{
icon_state = "4-8"
},
Expand Down Expand Up @@ -608,7 +608,7 @@
/area/awaymission/BMPship/Armory)
"cd" = (
/obj/effect/decal/warning_stripes/southeast,
/obj/effect/spawner/window/reinforced,
/obj/effect/spawner/window/reinforced/grilled,
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
Expand Down Expand Up @@ -4556,7 +4556,7 @@
/turf/simulated/floor/plasteel,
/area/awaymission/BMPship/Kitchen)
"wt" = (
/obj/effect/spawner/window/reinforced,
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating/airless,
/area/awaymission/BMPship/MedBay)
"wv" = (
Expand Down Expand Up @@ -5857,7 +5857,7 @@
/area/awaymission/BMPship/Engines)
"Iy" = (
/obj/effect/decal/warning_stripes/north,
/obj/effect/spawner/window/reinforced,
/obj/effect/spawner/window/reinforced/grilled,
/obj/structure/cable{
icon_state = "4-8"
},
Expand Down
42 changes: 21 additions & 21 deletions _maps/map_files220/RandomZLevels/gate_lizard.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1280,7 +1280,7 @@
},
/area/awaymission/jungle_planet/outside/cave)
"bCI" = (
/obj/effect/spawner/window/reinforced,
/obj/effect/spawner/window/reinforced/grilled,
/obj/machinery/door/poddoor/shutters{
dir = 2;
id_tag = "Command";
Expand Down Expand Up @@ -2397,7 +2397,7 @@
/turf/simulated/floor/plasteel,
/area/awaymission/jungle_planet/inside/complex)
"cWO" = (
/obj/effect/spawner/window/reinforced,
/obj/effect/spawner/window/reinforced/grilled,
/obj/machinery/door/poddoor/shutters{
id_tag = "Sec in";
requires_power = 0
Expand Down Expand Up @@ -2592,7 +2592,7 @@
},
/area/awaymission/jungle_planet/outside/river)
"dmi" = (
/obj/effect/spawner/window/reinforced,
/obj/effect/spawner/window/reinforced/grilled,
/obj/machinery/door/poddoor/shutters{
dir = 8;
id_tag = "Hang in";
Expand Down Expand Up @@ -2637,7 +2637,7 @@
/turf/simulated/floor/indestructible/grass,
/area/awaymission/jungle_planet/outside/river)
"doE" = (
/obj/effect/spawner/window/reinforced,
/obj/effect/spawner/window/reinforced/grilled,
/obj/effect/mapping_helpers/damaged_window,
/turf/simulated/floor/plasteel,
/area/awaymission/jungle_planet/outside)
Expand Down Expand Up @@ -4603,7 +4603,7 @@
/turf/simulated/floor/indestructible/grass,
/area/awaymission/jungle_planet/outside)
"fMx" = (
/obj/effect/spawner/window/reinforced,
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/awaymission/jungle_planet/inside/complex)
"fNF" = (
Expand Down Expand Up @@ -7061,7 +7061,7 @@
},
/area/awaymission/jungle_planet/outside)
"iNw" = (
/obj/effect/spawner/window/reinforced,
/obj/effect/spawner/window/reinforced/grilled,
/obj/machinery/door/poddoor/shutters{
dir = 2;
id_tag = "gate_lizard_QM"
Expand Down Expand Up @@ -7187,7 +7187,7 @@
},
/area/awaymission/jungle_planet/inside/complex)
"iVc" = (
/obj/effect/spawner/window/reinforced,
/obj/effect/spawner/window/reinforced/grilled,
/obj/machinery/door/poddoor/shutters{
dir = 2;
id_tag = "CMDgate"
Expand Down Expand Up @@ -7688,7 +7688,7 @@
/turf/simulated/floor/plasteel,
/area/awaymission/jungle_planet/inside/complex)
"jAq" = (
/obj/effect/spawner/window/reinforced,
/obj/effect/spawner/window/reinforced/grilled,
/obj/machinery/door/poddoor/shutters{
dir = 8;
id_tag = "gate_lizard_QM"
Expand Down Expand Up @@ -8419,7 +8419,7 @@
/turf/simulated/floor/wood,
/area/awaymission/jungle_planet/outside/cave)
"ktw" = (
/obj/effect/spawner/window/reinforced,
/obj/effect/spawner/window/reinforced/grilled,
/obj/machinery/door/poddoor/shutters{
dir = 2;
id_tag = "Command";
Expand Down Expand Up @@ -11519,7 +11519,7 @@
},
/area/awaymission/jungle_planet/inside/complex)
"nTH" = (
/obj/effect/spawner/window/reinforced,
/obj/effect/spawner/window/reinforced/grilled,
/obj/machinery/door/poddoor/shutters{
dir = 8;
id_tag = "Command";
Expand Down Expand Up @@ -11699,7 +11699,7 @@
/turf/simulated/floor/indestructible/grass,
/area/awaymission/jungle_planet/outside)
"oiR" = (
/obj/effect/spawner/window/reinforced,
/obj/effect/spawner/window/reinforced/grilled,
/obj/machinery/door/poddoor/shutters{
dir = 2;
id_tag = "CMDgate"
Expand Down Expand Up @@ -12817,7 +12817,7 @@
},
/area/awaymission/jungle_planet/inside/complex)
"pxl" = (
/obj/effect/spawner/window/reinforced,
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plasteel,
/area/awaymission/jungle_planet/inside)
"pxm" = (
Expand Down Expand Up @@ -13565,7 +13565,7 @@
/turf/simulated/floor/plating,
/area/awaymission/jungle_planet/inside/complex)
"qxn" = (
/obj/effect/spawner/window/reinforced,
/obj/effect/spawner/window/reinforced/grilled,
/obj/machinery/door/poddoor/shutters{
dir = 8;
id_tag = "Command";
Expand Down Expand Up @@ -14123,7 +14123,7 @@
/turf/simulated/floor/plasteel,
/area/awaymission/jungle_planet/outside/river)
"riR" = (
/obj/effect/spawner/window/reinforced,
/obj/effect/spawner/window/reinforced/grilled,
/obj/machinery/door/poddoor/shutters{
id_tag = "Sec in";
requires_power = 0
Expand Down Expand Up @@ -14653,7 +14653,7 @@
/turf/simulated/floor/plasteel,
/area/awaymission/jungle_planet/outside/river)
"rNK" = (
/obj/effect/spawner/window/reinforced,
/obj/effect/spawner/window/reinforced/grilled,
/obj/machinery/door/poddoor/shutters{
id_tag = "Sec in";
requires_power = 0
Expand Down Expand Up @@ -15806,7 +15806,7 @@
/turf/simulated/floor/wood,
/area/awaymission/jungle_planet/outside/cave)
"tfh" = (
/obj/effect/spawner/window/reinforced,
/obj/effect/spawner/window/reinforced/grilled,
/obj/effect/mapping_helpers/damaged_window,
/turf/simulated/floor/plating,
/area/awaymission/jungle_planet/outside/abandoned)
Expand All @@ -15823,7 +15823,7 @@
/turf/simulated/floor/indestructible/grass,
/area/awaymission/jungle_planet/outside)
"tha" = (
/obj/effect/spawner/window/reinforced,
/obj/effect/spawner/window/reinforced/grilled,
/obj/effect/mapping_helpers/damaged_window,
/turf/simulated/floor/plating,
/area/awaymission/jungle_planet/inside)
Expand Down Expand Up @@ -17760,7 +17760,7 @@
},
/area/awaymission/jungle_planet/inside/complex)
"vrP" = (
/obj/effect/spawner/window/reinforced,
/obj/effect/spawner/window/reinforced/grilled,
/obj/machinery/door/poddoor/shutters{
id_tag = "Sec in";
dir = 8;
Expand Down Expand Up @@ -18805,7 +18805,7 @@
/turf/simulated/floor/mineral/titanium/blue,
/area/awaymission/jungle_planet/outside/abandoned)
"wFg" = (
/obj/effect/spawner/window/reinforced,
/obj/effect/spawner/window/reinforced/grilled,
/obj/machinery/door/poddoor/shutters{
id_tag = "Sec in";
requires_power = 0
Expand Down Expand Up @@ -19011,7 +19011,7 @@
/turf/simulated/wall/indestructible/syndishuttle,
/area/awaymission/jungle_planet/outside/abandoned)
"wQo" = (
/obj/effect/spawner/window/reinforced,
/obj/effect/spawner/window/reinforced/grilled,
/obj/effect/mapping_helpers/damaged_window,
/turf/simulated/floor/plating,
/area/awaymission/jungle_planet/inside/complex)
Expand Down Expand Up @@ -19670,7 +19670,7 @@
/turf/simulated/floor/plasteel,
/area/awaymission/jungle_planet/inside/complex)
"xDN" = (
/obj/effect/spawner/window/reinforced,
/obj/effect/spawner/window/reinforced/grilled,
/obj/machinery/door/poddoor/shutters{
dir = 8;
id_tag = "Hang in";
Expand Down
Loading

0 comments on commit 97e9ee4

Please sign in to comment.