diff --git a/code/game/objects/effects/spawners/structure.dm b/code/game/objects/effects/spawners/structure.dm index a523cd00720..ee6c103befd 100644 --- a/code/game/objects/effects/spawners/structure.dm +++ b/code/game/objects/effects/spawners/structure.dm @@ -46,7 +46,7 @@ again. spawn_list = list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/east, /obj/structure/window/spawner/west) if(WEST) spawn_list = list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/north, /obj/structure/window/spawner/west) - . = ..() + return ..() /obj/effect/spawner/structure/window/hollow/middle icon_state = "hwindow_spawner_middle" @@ -57,7 +57,7 @@ again. spawn_list = list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/north) if(EAST,WEST) spawn_list = list(/obj/structure/grille, /obj/structure/window/spawner/east, /obj/structure/window/spawner/west) - . = ..() + return ..() /obj/effect/spawner/structure/window/hollow/directional icon_state = "hwindow_spawner_directional" @@ -80,7 +80,7 @@ again. spawn_list = list(/obj/structure/grille, /obj/structure/window/spawner/west) if(NORTHWEST) spawn_list = list(/obj/structure/grille, /obj/structure/window/spawner/north, /obj/structure/window/spawner/west) - . = ..() + return ..() //reinforced @@ -107,7 +107,7 @@ again. spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/east, /obj/structure/window/reinforced/spawner/west) if(WEST) spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/north, /obj/structure/window/reinforced/spawner/west) - . = ..() + return ..() /obj/effect/spawner/structure/window/hollow/reinforced/middle icon_state = "hrwindow_spawner_middle" @@ -118,7 +118,7 @@ again. spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/north) if(EAST,WEST) spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/east, /obj/structure/window/reinforced/spawner/west) - . = ..() + return ..() /obj/effect/spawner/structure/window/hollow/reinforced/directional icon_state = "hrwindow_spawner_directional" @@ -141,7 +141,7 @@ again. spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/west) if(NORTHWEST) spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/north, /obj/structure/window/reinforced/spawner/west) - . = ..() + return ..() //tinted @@ -192,7 +192,7 @@ again. /obj/effect/spawner/structure/window/hollow/survival_pod name = "hollow pod window spawner" icon_state = "podwindow_spawner_full" - spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/shuttle/survival_pod, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/north, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/east, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/west) + spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/survival_pod, /obj/structure/window/reinforced/survival_pod/spawner/north, /obj/structure/window/reinforced/survival_pod/spawner/east, /obj/structure/window/reinforced/survival_pod/spawner/west) /obj/effect/spawner/structure/window/hollow/survival_pod/end icon_state = "podwindow_spawner_end" @@ -200,14 +200,14 @@ again. /obj/effect/spawner/structure/window/hollow/survival_pod/end/Initialize(mapload) switch(dir) if(NORTH) - spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/north, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/east, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/west) + spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/survival_pod/spawner/north, /obj/structure/window/reinforced/survival_pod/spawner/east, /obj/structure/window/reinforced/survival_pod/spawner/west) if(EAST) - spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/shuttle/survival_pod, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/north, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/east) + spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/survival_pod, /obj/structure/window/reinforced/survival_pod/spawner/north, /obj/structure/window/reinforced/survival_pod/spawner/east) if(SOUTH) - spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/shuttle/survival_pod, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/east, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/west) + spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/survival_pod, /obj/structure/window/reinforced/survival_pod/spawner/east, /obj/structure/window/reinforced/survival_pod/spawner/west) if(WEST) - spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/shuttle/survival_pod, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/north, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/west) - . = ..() + spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/survival_pod, /obj/structure/window/reinforced/survival_pod/spawner/north, /obj/structure/window/reinforced/survival_pod/spawner/west) + return ..() /obj/effect/spawner/structure/window/hollow/survival_pod/middle icon_state = "podwindow_spawner_middle" @@ -215,10 +215,10 @@ again. /obj/effect/spawner/structure/window/hollow/survival_pod/middle/Initialize(mapload) switch(dir) if(NORTH,SOUTH) - spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/shuttle/survival_pod, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/north) + spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/survival_pod, /obj/structure/window/reinforced/survival_pod/spawner/north) if(EAST,WEST) - spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/east, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/west) - . = ..() + spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/survival_pod/spawner/east, /obj/structure/window/reinforced/survival_pod/spawner/west) + return ..() /obj/effect/spawner/structure/window/hollow/survival_pod/directional icon_state = "podwindow_spawner_directional" @@ -226,22 +226,22 @@ again. /obj/effect/spawner/structure/window/hollow/survival_pod/directional/Initialize(mapload) switch(dir) if(NORTH) - spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/north) + spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/survival_pod/spawner/north) if(NORTHEAST) - spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/north, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/east) + spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/survival_pod/spawner/north, /obj/structure/window/reinforced/survival_pod/spawner/east) if(EAST) - spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/east) + spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/survival_pod/spawner/east) if(SOUTHEAST) - spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/shuttle/survival_pod, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/east) + spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/survival_pod, /obj/structure/window/reinforced/survival_pod/spawner/east) if(SOUTH) - spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/shuttle/survival_pod) + spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/survival_pod) if(SOUTHWEST) - spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/shuttle/survival_pod, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/west) + spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/survival_pod, /obj/structure/window/reinforced/survival_pod/spawner/west) if(WEST) - spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/west) + spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/survival_pod/spawner/west) if(NORTHWEST) - spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/north, /obj/structure/window/reinforced/shuttle/survival_pod/spawner/west) - . = ..() + spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/survival_pod/spawner/north, /obj/structure/window/reinforced/survival_pod/spawner/west) + return ..() //plasma windows @@ -269,7 +269,7 @@ again. spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/east, /obj/structure/window/plasma/spawner/west) if(WEST) spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/north, /obj/structure/window/plasma/spawner/west) - . = ..() + return ..() /obj/effect/spawner/structure/window/hollow/plasma/middle icon_state = "phwindow_spawner_middle" @@ -280,7 +280,7 @@ again. spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/north) if(EAST,WEST) spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/spawner/east, /obj/structure/window/plasma/spawner/west) - . = ..() + return ..() /obj/effect/spawner/structure/window/hollow/plasma/directional icon_state = "phwindow_spawner_directional" @@ -303,7 +303,7 @@ again. spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/spawner/west) if(NORTHWEST) spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/spawner/north, /obj/structure/window/plasma/spawner/west) - . = ..() + return ..() //reinforced plasma @@ -330,7 +330,7 @@ again. spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/plasma, /obj/structure/window/reinforced/plasma/spawner/east, /obj/structure/window/reinforced/plasma/spawner/west) if(WEST) spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/plasma, /obj/structure/window/reinforced/plasma/spawner/north, /obj/structure/window/reinforced/plasma/spawner/west) - . = ..() + return ..() /obj/effect/spawner/structure/window/hollow/reinforced/plasma/middle icon_state = "phrwindow_spawner_middle" @@ -341,7 +341,7 @@ again. spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/plasma, /obj/structure/window/reinforced/plasma/spawner/north) if(EAST,WEST) spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/plasma/spawner/east, /obj/structure/window/reinforced/plasma/spawner/west) - . = ..() + return ..() /obj/effect/spawner/structure/window/hollow/reinforced/plasma/directional icon_state = "phrwindow_spawner_directional" @@ -364,7 +364,7 @@ again. spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/plasma/spawner/west) if(NORTHWEST) spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/plasma/spawner/north, /obj/structure/window/reinforced/plasma/spawner/west) - . = ..() + return ..() /obj/effect/spawner/structure/electrified_grille name = "electrified grill spawner" diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm index a4328929e1f..f2752962072 100644 --- a/code/modules/mining/equipment/survival_pod.dm +++ b/code/modules/mining/equipment/survival_pod.dm @@ -91,20 +91,20 @@ smoothing_groups = list(SMOOTH_GROUP_SURVIVAL_TITANIUM_POD, SMOOTH_GROUP_SHUTTLE_PARTS) canSmoothWith = list(SMOOTH_GROUP_SURVIVAL_TITANIUM_POD) -/obj/structure/window/reinforced/shuttle/survival_pod/spawner/north - dir = NORTH - -/obj/structure/window/reinforced/shuttle/survival_pod/spawner/east - dir = EAST - -/obj/structure/window/reinforced/shuttle/survival_pod/spawner/west - dir = WEST - /obj/structure/window/reinforced/survival_pod name = "pod window" icon = 'icons/obj/lavaland/survival_pod.dmi' icon_state = "pwindow" +/obj/structure/window/reinforced/survival_pod/spawner/north + dir = NORTH + +/obj/structure/window/reinforced/survival_pod/spawner/east + dir = EAST + +/obj/structure/window/reinforced/survival_pod/spawner/west + dir = WEST + //Door /obj/machinery/door/airlock/survival_pod name = "Airlock"