diff --git a/aurorastation.dme b/aurorastation.dme index f353e8078e4..3fc3d4c728c 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1031,7 +1031,6 @@ #include "code\game\objects\structures\weapon_rack.dm" #include "code\game\objects\structures\windoor_assembly.dm" #include "code\game\objects\structures\window.dm" -#include "code\game\objects\structures\window_spawner.dm" #include "code\game\objects\structures\crates_lockers\closets.dm" #include "code\game\objects\structures\crates_lockers\crates.dm" #include "code\game\objects\structures\crates_lockers\largecrate.dm" @@ -1548,6 +1547,7 @@ #include "code\modules\effects\map_effects\portal.dm" #include "code\modules\effects\map_effects\screen_shaker.dm" #include "code\modules\effects\map_effects\sound_emitter.dm" +#include "code\modules\effects\map_effects\window_spawner.dm" #include "code\modules\effects\sparks\procs.dm" #include "code\modules\effects\sparks\spawner.dm" #include "code\modules\effects\sparks\visuals.dm" diff --git a/code/game/objects/items/weapons/RFD.dm b/code/game/objects/items/weapons/RFD.dm index 4768ede225c..271d70b6ff1 100644 --- a/code/game/objects/items/weapons/RFD.dm +++ b/code/game/objects/items/weapons/RFD.dm @@ -222,7 +222,7 @@ RFD Construction-Class build_cost = 3 build_delay = 20 build_type = "window and grille section" - build_atom = /obj/effect/wingrille_spawn/reinforced + build_atom = /obj/effect/map_effect/wingrille_spawn/reinforced else if(mode == RFD_AIRLOCK) if(istype(T, /turf/simulated/floor)) build_cost = 3 diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 223151052f8..9f437346e4a 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -261,3 +261,21 @@ if(air_group) return 0 //Make sure air doesn't drain ..() + +/obj/structure/grille/crescent/attack_hand() + return + +/obj/structure/grille/crescent/attackby() + return + +/obj/structure/grille/crescent/attack_generic() + return + +/obj/structure/grille/crescent/ex_act(var/severity = 2.0) + return + +/obj/structure/grille/crescent/hitby() + return + +/obj/structure/grille/crescent/bullet_act() + return \ No newline at end of file diff --git a/code/game/objects/structures/window_spawner.dm b/code/game/objects/structures/window_spawner.dm deleted file mode 100644 index d904ed91e94..00000000000 --- a/code/game/objects/structures/window_spawner.dm +++ /dev/null @@ -1,96 +0,0 @@ -// Ported from Haine and WrongEnd with much gratitude! -/* ._.-'~'-._.-'~'-._.-'~'-._.-'~'-._.-'~'-._.-'~'-._.-'~'-._. */ -/*-=-=-=-=-=-=-=-=-=-=-=-=-=WHAT-EVER=-=-=-=-=-=-=-=-=-=-=-=-=-*/ -/* '~'-._.-'~'-._.-'~'-._.-'~'-._.-'~'-._.-'~'-._.-'~'-._.-'~' */ - -/obj/effect/wingrille_spawn - name = "window grille spawner" - icon = 'icons/obj/structures.dmi' - icon_state = "wingrille" - density = 1 - anchored = 1.0 - var/win_path = /obj/structure/window/basic - var/activated - -// stops ZAS expanding zones past us, the windows will block the zone anyway -/obj/effect/wingrille_spawn/CanPass() - return 0 - -/obj/effect/wingrille_spawn/attack_hand() - attack_generic() - -/obj/effect/wingrille_spawn/attack_ghost() - attack_generic() - -/obj/effect/wingrille_spawn/attack_generic() - activate() - -/obj/effect/wingrille_spawn/Initialize(mapload) - if (!win_path) - return INITIALIZE_HINT_QDEL - - ..() - - activate() - - return INITIALIZE_HINT_LATEQDEL - -/obj/effect/wingrille_spawn/proc/activate() - if(activated) return - if (!locate(/obj/structure/grille) in get_turf(src)) - var/obj/structure/grille/G = new /obj/structure/grille(src.loc) - handle_grille_spawn(G) - var/list/neighbours = list() - for (var/dir in cardinal) - var/turf/T = get_step(src, dir) - var/obj/effect/wingrille_spawn/other = locate(/obj/effect/wingrille_spawn) in T - if(!other) - var/found_connection - if(locate(/obj/structure/grille) in T) - for(var/obj/structure/window/W in T) - if(W.type == win_path && W.dir == get_dir(T,src)) - found_connection = 1 - qdel(W) - if(!found_connection) - var/obj/structure/window/new_win = new win_path(src.loc) - new_win.set_dir(dir) - handle_window_spawn(new_win) - else - neighbours |= other - activated = 1 - -/obj/effect/wingrille_spawn/proc/handle_window_spawn(var/obj/structure/window/W) - return - -// Currently unused, could be useful for pre-wired electrified windows. -/obj/effect/wingrille_spawn/proc/handle_grille_spawn(var/obj/structure/grille/G) - return - -/obj/effect/wingrille_spawn/reinforced - name = "reinforced window grille spawner" - icon_state = "r-wingrille" - win_path = /obj/structure/window/reinforced - -/obj/effect/wingrille_spawn/reinforced/crescent - name = "Crescent window grille spawner" - win_path = /obj/structure/window/reinforced/crescent - -/obj/effect/wingrille_spawn/phoron - name = "phoron window grille spawner" - icon_state = "p-wingrille" - win_path = /obj/structure/window/phoronbasic - -/obj/effect/wingrille_spawn/reinforced_phoron - name = "reinforced phoron window grille spawner" - icon_state = "pr-wingrille" - win_path = /obj/structure/window/phoronreinforced - -/obj/effect/wingrille_spawn/reinforced/polarized - name = "polarized window grille spawner" - color = "#444444" - win_path = /obj/structure/window/reinforced/polarized - var/id - -/obj/effect/wingrille_spawn/reinforced/polarized/handle_window_spawn(var/obj/structure/window/reinforced/polarized/P) - if(id) - P.id = id diff --git a/code/modules/effects/map_effects/window_spawner.dm b/code/modules/effects/map_effects/window_spawner.dm new file mode 100644 index 00000000000..1d5a37f01ab --- /dev/null +++ b/code/modules/effects/map_effects/window_spawner.dm @@ -0,0 +1,100 @@ +/obj/effect/map_effect/wingrille_spawn + name = "window grille spawner" + icon_state = "wingrille" + var/win_path = /obj/structure/window/basic + var/grill_path = /obj/structure/grille + var/spawn_firedoor = FALSE + var/activated + +// stops ZAS expanding zones past us, the windows will block the zone anyway +/obj/effect/map_effect/wingrille_spawn/CanPass() + return 0 + +/obj/effect/map_effect/wingrille_spawn/attack_hand() + attack_generic() + +/obj/effect/map_effect/wingrille_spawn/attack_ghost() + attack_generic() + +/obj/effect/map_effect/wingrille_spawn/attack_generic() + activate() + +/obj/effect/map_effect/wingrille_spawn/Initialize(mapload) + if (!win_path) + return INITIALIZE_HINT_QDEL + + ..() + + activate() + + return INITIALIZE_HINT_LATEQDEL + +/obj/effect/map_effect/wingrille_spawn/proc/activate() + if(activated) + return + if(spawn_firedoor) + new /obj/machinery/door/firedoor(loc) + if (!locate(grill_path) in get_turf(src)) + var/obj/structure/grille/G = new grill_path(src.loc) + handle_grille_spawn(G) + var/list/neighbours = list() + for (var/dir in cardinal) + var/turf/T = get_step(src, dir) + var/obj/effect/map_effect/wingrille_spawn/other = locate(/obj/effect/map_effect/wingrille_spawn) in T + if(!other) + var/found_connection + if(locate(grill_path) in T) + for(var/obj/structure/window/W in T) + if(W.type == win_path && W.dir == get_dir(T,src)) + found_connection = 1 + qdel(W) + if(!found_connection) + var/obj/structure/window/new_win = new win_path(src.loc) + new_win.set_dir(dir) + handle_window_spawn(new_win) + else + neighbours |= other + activated = 1 + +/obj/effect/map_effect/wingrille_spawn/proc/handle_window_spawn(var/obj/structure/window/W) + return + +// Currently unused, could be useful for pre-wired electrified windows. +/obj/effect/map_effect/wingrille_spawn/proc/handle_grille_spawn(var/obj/structure/grille/G) + return + +/obj/effect/map_effect/wingrille_spawn/reinforced + name = "reinforced window grille spawner" + icon_state = "r-wingrille" + win_path = /obj/structure/window/reinforced + +/obj/effect/map_effect/wingrille_spawn/reinforced/firedoor + spawn_firedoor = TRUE + +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent + name = "Crescent window grille spawner" + win_path = /obj/structure/window/reinforced/crescent + grill_path = /obj/structure/grille/crescent + +/obj/effect/map_effect/wingrille_spawn/phoron + name = "phoron window grille spawner" + icon_state = "p-wingrille" + win_path = /obj/structure/window/phoronbasic + +/obj/effect/map_effect/wingrille_spawn/reinforced_phoron + name = "reinforced phoron window grille spawner" + icon_state = "pr-wingrille" + win_path = /obj/structure/window/phoronreinforced + +/obj/effect/map_effect/wingrille_spawn/reinforced_phoron/firedoor + spawn_firedoor = TRUE + +/obj/effect/map_effect/wingrille_spawn/reinforced/polarized + name = "polarized window grille spawner" + color = "#444444" + win_path = /obj/structure/window/reinforced/polarized + var/id + +/obj/effect/map_effect/wingrille_spawn/reinforced/polarized/handle_window_spawn(var/obj/structure/window/reinforced/polarized/P) + if(id) + P.id = id \ No newline at end of file diff --git a/icons/effects/map_effects.dmi b/icons/effects/map_effects.dmi index b8f8f2fac00..ef9246ee152 100644 Binary files a/icons/effects/map_effects.dmi and b/icons/effects/map_effects.dmi differ diff --git a/icons/obj/structures.dmi b/icons/obj/structures.dmi index 7542895005c..ec1e67cbace 100644 Binary files a/icons/obj/structures.dmi and b/icons/obj/structures.dmi differ diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm index f98cc726ab5..27efd69e409 100644 --- a/maps/aurora/aurora-1_centcomm.dmm +++ b/maps/aurora/aurora-1_centcomm.dmm @@ -2225,7 +2225,7 @@ /turf/simulated/floor/shuttle, /area/template_noop) "aiY" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /turf/unsimulated/floor/plating, /area/antag/raider) "ajd" = ( @@ -3680,7 +3680,7 @@ /turf/unsimulated/floor, /area/centcom/holding) "avR" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /turf/unsimulated/floor/plating, /area/centcom/bar) "avT" = ( @@ -3711,7 +3711,7 @@ /turf/unsimulated/floor, /area/centcom/holding) "awh" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /turf/unsimulated/floor{ icon_state = "plating" }, @@ -3783,7 +3783,7 @@ /turf/unsimulated/floor/plating, /area/centcom/specops) "ayw" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /turf/unsimulated/floor/plating, /area/centcom/control) "ayG" = ( @@ -3997,7 +3997,7 @@ /turf/unsimulated/floor, /area/centcom/spawning) "aCm" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /turf/unsimulated/floor{ icon_state = "plating" }, @@ -4114,7 +4114,7 @@ /turf/unsimulated/floor/plating, /area/shuttle/specops) "aDb" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /turf/unsimulated/floor/plating, /area/centcom/holding) "aDf" = ( @@ -5485,7 +5485,7 @@ }, /area/shuttle/skipjack) "aKZ" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /turf/unsimulated/floor{ icon_state = "plating" }, @@ -5521,7 +5521,7 @@ /turf/unsimulated/floor/plating, /area/shuttle/arrival) "aLi" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /turf/simulated/floor, /area/tdome/tdome2) "aLk" = ( @@ -7656,7 +7656,7 @@ }, /area/centcom/legion/hangar5) "biK" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /turf/simulated/floor, /area/tdome/tdome1) "bjr" = ( @@ -10515,7 +10515,7 @@ }, /area/shuttle/escape) "cZw" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /turf/unsimulated/floor/plating, /area/centcom/distress_prep) "cZH" = ( @@ -11118,7 +11118,7 @@ }, /area/shuttle/administration) "dtU" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /obj/structure/sign/staff_only{ pixel_y = 4 }, @@ -13170,7 +13170,7 @@ /turf/unsimulated/floor, /area/antag/mercenary) "eJc" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /turf/simulated/floor, /area/centcom/holding) "eJU" = ( @@ -14578,7 +14578,7 @@ }, /area/centcom/control) "fFe" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /obj/structure/disposalpipe/segment, /turf/unsimulated/floor/plating, /area/tdome/tdomeadmin) @@ -17647,7 +17647,7 @@ }, /area/centcom/holding) "hpC" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /obj/machinery/atmospherics/pipe/simple/visible, /turf/unsimulated/floor/plating, /area/tdome/tdomeadmin) @@ -18071,7 +18071,7 @@ /turf/unsimulated/floor/plating, /area/shuttle/administration) "hHP" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /turf/unsimulated/floor/plating, /area/centcom/ferry) "hHX" = ( @@ -18131,7 +18131,7 @@ }, /area/centcom/control) "hLS" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /obj/structure/sign/pods{ desc = "A direction sign which reads 'DROPPODS'."; name = "\improper DROPPODS" @@ -20365,7 +20365,7 @@ }, /area/centcom/bar) "jcG" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /turf/unsimulated/floor/plating, /area/centcom/legion) "jdm" = ( @@ -22241,7 +22241,7 @@ }, /area/shuttle/merchant) "krP" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /obj/structure/disposalpipe/segment, /turf/unsimulated/floor/plating, /area/tdome/tdomeobserve) @@ -23813,7 +23813,7 @@ /turf/simulated/floor/shuttle/black, /area/shuttle/distress) "lvs" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /turf/unsimulated/floor/plating, /area/tdome/tdomeobserve) "lvy" = ( @@ -24690,7 +24690,7 @@ /turf/space/dynamic, /area/shuttle/merchant) "lWl" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /obj/machinery/door/blast/odin{ dir = 2; icon_state = "shutter1"; @@ -24878,7 +24878,7 @@ /turf/simulated/floor/shuttle/dark_blue, /area/shuttle/escape) "mbM" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /turf/unsimulated/floor{ icon_state = "plating" }, @@ -27809,7 +27809,7 @@ /turf/unsimulated/floor, /area/centcom/ferry) "nQZ" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /turf/unsimulated/floor/plating, /area/tdome/tdomeadmin) "nRo" = ( @@ -30256,7 +30256,7 @@ /turf/simulated/floor/tiled/dark, /area/centcom/bar) "pAs" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /obj/structure/sign/staff_only, /turf/unsimulated/floor/plating, /area/centcom/bar) @@ -31209,7 +31209,7 @@ }, /area/antag/ninja) "qce" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /obj/machinery/status_display/arrivals_display, /turf/unsimulated/floor{ icon_state = "plating" @@ -31545,7 +31545,7 @@ }, /area/shuttle/legion) "qrB" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /obj/structure/sign/directions/medical{ dir = 1; pixel_y = -5 @@ -32267,7 +32267,7 @@ /turf/space/transit/west, /area/template_noop) "qSn" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /obj/structure/sign/directions/com{ dir = 8; pixel_y = -4 @@ -33053,7 +33053,7 @@ }, /area/antag/raider) "rvN" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /obj/structure/sign/directions/tram{ dir = 1; pixel_x = 1; @@ -34151,7 +34151,7 @@ }, /area/centcom/control) "smt" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /obj/structure/sign/greencross{ name = "Emergency Room" }, @@ -35224,7 +35224,7 @@ }, /area/antag/mercenary) "tbV" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /turf/space, /area/centcom/spawning) "tbX" = ( @@ -35462,7 +35462,7 @@ /turf/unsimulated/floor/plating, /area/shuttle/escape) "tix" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /obj/machinery/door/blast/odin{ icon_state = "shutter1"; icon_state_closed = "shutter1"; @@ -35762,7 +35762,7 @@ /turf/unsimulated/floor/plating, /area/shuttle/specops) "tvn" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /turf/unsimulated/floor/plating, /area/antag/mercenary) "tvo" = ( @@ -36863,7 +36863,7 @@ /turf/unsimulated/floor, /area/centcom/bar) "ujN" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /turf/unsimulated/floor/plating, /area/centcom/specops) "ujT" = ( @@ -39724,7 +39724,7 @@ /turf/unsimulated/floor, /area/centcom/spawning) "weG" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /obj/structure/sign/vacuum, /turf/unsimulated/floor/plating, /area/antag/raider) @@ -41857,7 +41857,7 @@ /turf/unsimulated/floor/plating, /area/shuttle/escape) "xkw" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /turf/unsimulated/floor/plating, /area/centcom/legion/hangar5) "xkH" = ( @@ -42798,7 +42798,7 @@ /turf/unsimulated/floor/plating, /area/shuttle/specops) "xQs" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /obj/structure/sign/directions/com{ dir = 8; pixel_y = 5 @@ -43346,7 +43346,7 @@ /turf/simulated/floor/holofloor/grass, /area/holodeck/source_dininghall) "yhJ" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /turf/unsimulated/floor/plating, /area/antag/wizard) "yil" = ( diff --git a/maps/exodus/exodus-2_centcomm.dmm b/maps/exodus/exodus-2_centcomm.dmm index 05c0227d131..d316f8ddaee 100644 --- a/maps/exodus/exodus-2_centcomm.dmm +++ b/maps/exodus/exodus-2_centcomm.dmm @@ -4204,7 +4204,7 @@ }, /area/shuttle/administration) "aqN" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /turf/simulated/floor/plating, /area/shuttle/administration) "aqQ" = ( @@ -5018,7 +5018,7 @@ }, /area/centcom/specops) "atU" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /turf/unsimulated/floor, /area/centcom/living) "auc" = ( @@ -10638,7 +10638,7 @@ /turf/simulated/floor/carpet, /area/merchant_station) "aMO" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /turf/unsimulated/floor/plating, /area/centcom/living) "aMP" = ( @@ -11035,7 +11035,7 @@ }, /area/centcom/holding) "aNM" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /turf/unsimulated/floor{ icon_state = "white" }, @@ -11339,7 +11339,7 @@ }, /area/centcom/control) "aOv" = ( -/obj/effect/wingrille_spawn/reinforced_phoron, +/obj/effect/map_effect/wingrille_spawn/reinforced_phoron, /turf/unsimulated/floor{ icon_state = "whiteshiny" }, @@ -11949,7 +11949,7 @@ }, /area/centcom/spawning) "aPT" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /turf/unsimulated/floor/plating, /area/centcom/holding) "aPU" = ( @@ -12514,7 +12514,7 @@ }, /area/centcom/specops) "aRn" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /turf/unsimulated/floor, /area/centcom/holding) "aRo" = ( @@ -13626,7 +13626,7 @@ }, /area/centcom/control) "aTR" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /turf/unsimulated/floor, /area/centcom/control) "aTT" = ( @@ -13967,7 +13967,7 @@ /turf/simulated/floor/plating, /area/shuttle/merchant) "aUH" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /turf/unsimulated/floor/plating, /area/centcom/spawning) "aUI" = ( @@ -15138,7 +15138,7 @@ }, /area/centcom/living) "aXs" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /turf/unsimulated/floor/plating, /area/centcom/specops) "aXt" = ( @@ -15287,7 +15287,7 @@ }, /area/centcom/spawning) "aXP" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /turf/unsimulated/floor/plating, /area/centcom/control) "aXQ" = ( @@ -15916,7 +15916,7 @@ }, /area/centcom/control) "aZo" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /turf/unsimulated/floor{ dir = 8; icon_state = "vault" @@ -16555,7 +16555,7 @@ }, /area/centcom/holding) "cXm" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /turf/template_noop, /area/centcom/holding) "daC" = ( @@ -16677,7 +16677,7 @@ /area/shuttle/legion) "dAB" = ( /obj/structure/lattice, -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /turf/template_noop, /area/centcom/holding) "dDS" = ( @@ -16761,7 +16761,7 @@ }, /area/centcom/shared_dream) "efu" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /turf/simulated/floor, /area/tdome) "egp" = ( @@ -17622,7 +17622,7 @@ }, /area/centcom/spawning) "hnE" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /obj/machinery/status_display/arrivals_display, /turf/unsimulated/floor/plating, /area/centcom/spawning) @@ -18034,7 +18034,7 @@ }, /area/centcom/spawning) "iEK" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -18347,7 +18347,7 @@ /turf/simulated/floor/shuttle/black, /area/shuttle/legion) "kWr" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /obj/structure/disposalpipe/segment, /turf/simulated/floor, /area/tdome) @@ -18877,7 +18877,7 @@ }, /area/centcom/spawning) "okH" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/floor, /area/tdome) @@ -18912,7 +18912,7 @@ }, /area/centcom/shared_dream) "oxQ" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /turf/unsimulated/wall/riveted, /area/centcom/holding) "oGc" = ( @@ -18987,7 +18987,7 @@ /turf/simulated/floor/shuttle/white, /area/shuttle/escape) "oXD" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /obj/machinery/door/blast/odin{ id = "CentComArrivalsAftChkpt"; name = "Security Doors" @@ -19430,7 +19430,7 @@ /turf/simulated/floor/shuttle/white, /area/shuttle/escape) "rgE" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /turf/simulated/floor/tiled/dark, /area/centcom/legion) "rgL" = ( @@ -19729,7 +19729,7 @@ /turf/unsimulated/floor/plating, /area/shuttle/escape) "sSH" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /turf/unsimulated/floor/plating, /area/centcom/ferry) "sWB" = ( @@ -20076,7 +20076,7 @@ /turf/simulated/floor/tiled/dark, /area/centcom/legion) "upZ" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /obj/machinery/door/blast/odin{ id = "CentComArrivalsForeChkpt"; name = "Security Doors" @@ -20602,7 +20602,7 @@ }, /area/centcom/spawning) "xaM" = ( -/obj/effect/wingrille_spawn/reinforced/crescent, +/obj/effect/map_effect/wingrille_spawn/reinforced/crescent, /turf/unsimulated/floor/plating, /area/tdome) "xcE" = ( diff --git a/maps/runtime/runtime-1.dmm b/maps/runtime/runtime-1.dmm index da13c66fe6a..5f8759cadeb 100644 --- a/maps/runtime/runtime-1.dmm +++ b/maps/runtime/runtime-1.dmm @@ -143,7 +143,7 @@ /turf/simulated/floor/tiled, /area/engineering/gravity_gen) "as" = ( -/obj/effect/wingrille_spawn/reinforced, +/obj/effect/map_effect/wingrille_spawn/reinforced, /obj/structure/sign/securearea{ desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; @@ -272,7 +272,7 @@ /turf/simulated/floor/tiled, /area/engineering/gravity_gen) "aH" = ( -/obj/effect/wingrille_spawn/reinforced, +/obj/effect/map_effect/wingrille_spawn/reinforced, /turf/simulated/floor/plating, /area/engineering/gravity_gen) "aI" = ( @@ -544,7 +544,7 @@ /turf/simulated/wall/r_wall, /area/bridge) "bs" = ( -/obj/effect/wingrille_spawn/reinforced, +/obj/effect/map_effect/wingrille_spawn/reinforced, /turf/simulated/floor/plating, /area/bridge) "bt" = ( @@ -750,11 +750,11 @@ /turf/simulated/floor/tiled, /area/hallway/secondary/entry) "bU" = ( -/obj/effect/wingrille_spawn/reinforced, +/obj/effect/map_effect/wingrille_spawn/reinforced, /turf/simulated/floor/plating, /area/maintenance/maintcentral) "bV" = ( -/obj/effect/wingrille_spawn/reinforced, +/obj/effect/map_effect/wingrille_spawn/reinforced, /turf/simulated/floor/plating, /area/hallway/primary/central_one) "bW" = ( @@ -793,7 +793,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/central_one) "bZ" = ( -/obj/effect/wingrille_spawn/reinforced, +/obj/effect/map_effect/wingrille_spawn/reinforced, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -837,7 +837,7 @@ /turf/simulated/floor/tiled, /area/bridge) "cd" = ( -/obj/effect/wingrille_spawn/reinforced, +/obj/effect/map_effect/wingrille_spawn/reinforced, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -1135,7 +1135,7 @@ /turf/simulated/floor/tiled, /area/construction) "cO" = ( -/obj/effect/wingrille_spawn/reinforced, +/obj/effect/map_effect/wingrille_spawn/reinforced, /turf/simulated/floor/plating, /area/construction) "cP" = ( @@ -1399,7 +1399,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/central_one) "ie" = ( -/obj/effect/wingrille_spawn/reinforced, +/obj/effect/map_effect/wingrille_spawn/reinforced, /obj/structure/cable{ d1 = 4; d2 = 8; diff --git a/maps/runtime/runtime-2.dmm b/maps/runtime/runtime-2.dmm index 91d44bd23dd..ad47f1ebaea 100644 --- a/maps/runtime/runtime-2.dmm +++ b/maps/runtime/runtime-2.dmm @@ -789,7 +789,7 @@ }, /area/tcommsat/chamber) "GJ" = ( -/obj/effect/wingrille_spawn/reinforced, +/obj/effect/map_effect/wingrille_spawn/reinforced, /turf/simulated/floor/tiled{ name = "cooled floor"; temperature = 278