Tad and layer fixes and changes.

_maps/map_files/Talos/TGS_Talos.dmm

@@ -4344,7 +4344,7 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/liquid_fuel,
-/obj/machinery/light/mainship/floor{
+/obj/machinery/light/floor{
 	dir = 8
 	},
 /turf/open/floor/mainship/metal/full,
@@ -8418,7 +8418,7 @@
 /turf/open/floor/carpet,
 /area/mainship/command/corporateliaison)
 "eNx" = (
-/obj/machinery/light/mainship/floor,
+/obj/machinery/light/floor,
 /turf/open/floor/mainship/orange{
 	dir = 1
 	},
@@ -15008,7 +15008,7 @@
 /turf/closed/wall/mainship/alt,
 /area/mainship/engineering/port_atmos)
 "jeh" = (
-/obj/machinery/light/mainship/floor,
+/obj/machinery/light/floor,
 /turf/open/floor/mainship/red{
 	dir = 1
 	},
@@ -17291,7 +17291,7 @@
 	dir = 8;
 	id = "supply_elevator_railing"
 	},
-/obj/machinery/light/mainship/floor{
+/obj/machinery/light/floor{
 	dir = 8;
 	pixel_x = null
 	},
@@ -19341,7 +19341,7 @@
 	dir = 1;
 	id = "supply_elevator_railing"
 	},
-/obj/machinery/light/mainship/floor{
+/obj/machinery/light/floor{
 	dir = 1;
 	pixel_x = null
 	},
@@ -20994,7 +20994,7 @@
 	dir = 8
 	},
 /obj/structure/prop/mainship/hangar_stencil,
-/obj/machinery/light/mainship/floor{
+/obj/machinery/light/floor{
 	dir = 8
 	},
 /turf/open/floor/mainship/metal/full,
@@ -21677,7 +21677,7 @@
 	},
 /area/mainship/squads/alpha)
 "mPy" = (
-/obj/machinery/light/mainship/floor{
+/obj/machinery/light/floor{
 	dir = 1
 	},
 /turf/open/floor/mainship/blue,
@@ -23730,7 +23730,7 @@
 	dir = 4
 	},
 /obj/effect/ai_node,
-/obj/machinery/light/mainship/floor{
+/obj/machinery/light/floor{
 	dir = 8
 	},
 /turf/open/floor/mainship/metal/full,
@@ -24122,7 +24122,7 @@
 /obj/effect/turf_decal/siding/dark{
 	dir = 4
 	},
-/obj/machinery/light/mainship/floor{
+/obj/machinery/light/floor{
 	dir = 4
 	},
 /turf/open/floor/mainship/metal/full,
@@ -24943,7 +24943,7 @@
 /turf/open/floor/plating,
 /area/mainship/hull/upper_hull)
 "oMw" = (
-/obj/machinery/light/mainship/floor{
+/obj/machinery/light/floor{
 	dir = 1
 	},
 /turf/open/floor/mainship/emerald,
@@ -29465,7 +29465,7 @@
 /obj/effect/turf_decal/warning_stripes/thin{
 	dir = 8
 	},
-/obj/machinery/light/mainship/floor{
+/obj/machinery/light/floor{
 	dir = 4
 	},
 /turf/open/floor/mainship/metal/full,
@@ -30267,7 +30267,7 @@
 	dir = 2;
 	id = "supply_elevator_railing"
 	},
-/obj/machinery/light/mainship/floor,
+/obj/machinery/light/floor,
 /turf/open/floor/prison/yellow{
 	dir = 1
 	},
@@ -33420,7 +33420,7 @@
 /obj/machinery/door/poddoor/railing{
 	id = "supply_elevator_railing"
 	},
-/obj/machinery/light/mainship/floor{
+/obj/machinery/light/floor{
 	dir = 4;
 	pixel_x = null
 	},
@@ -36123,7 +36123,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
 	dir = 8
 	},
-/obj/machinery/light/mainship/floor{
+/obj/machinery/light/floor{
 	dir = 1;
 	pixel_y = 4
 	},
@@ -38584,7 +38584,7 @@
 /turf/open/floor/prison/marked,
 /area/mainship/command/self_destruct)
 "xjK" = (
-/obj/machinery/light/mainship/floor,
+/obj/machinery/light/floor,
 /obj/structure/sign/semiotic/bathmens{
 	pixel_y = 24;
 	pixel_x = 8
@@ -40135,7 +40135,7 @@
 /obj/effect/turf_decal/siding/dark{
 	dir = 8
 	},
-/obj/machinery/light/mainship/floor{
+/obj/machinery/light/floor{
 	dir = 8
 	},
 /turf/open/floor/mainship/metal/full,

_maps/shuttles/minidropship_combat_tad.dmm

@@ -23,8 +23,8 @@
 /obj/structure/barricade/plasteel{
 	dir = 8
 	},
-/obj/machinery/light{
-	dir = 1
+/obj/machinery/light/floor{
+	dir = 8
 	},
 /turf/open/floor/mainship/mono,
 /area/shuttle/minidropship)
@@ -58,12 +58,12 @@
 /turf/open/floor/mainship/mono,
 /area/shuttle/minidropship)
 "s" = (
-/obj/machinery/light,
+/obj/machinery/light/floor,
 /turf/open/floor/plating/plating_catwalk,
 /area/shuttle/minidropship)
 "u" = (
-/obj/machinery/light,
 /obj/machinery/telecomms/relay/preset/telecomms/onboard/nondense,
+/obj/machinery/light/floor,
 /turf/open/floor/plating/plating_catwalk,
 /area/shuttle/minidropship)
 "v" = (
@@ -103,8 +103,8 @@
 /obj/structure/barricade/plasteel{
 	dir = 4
 	},
-/obj/machinery/light{
-	dir = 1
+/obj/machinery/light/floor{
+	dir = 4
 	},
 /turf/open/floor/mainship/mono,
 /area/shuttle/minidropship)

_maps/shuttles/minidropship_factorio.dmm

@@ -84,7 +84,8 @@
 	id = "minidropship_podlock"
 	},
 /obj/machinery/light{
-	dir = 1
+	dir = 1;
+	pixel_y_offset = 0
 	},
 /turf/open/floor/mainship/mono,
 /area/shuttle/minidropship)
@@ -169,7 +170,8 @@
 	id = "minidropship_podlock"
 	},
 /obj/machinery/light{
-	dir = 1
+	dir = 1;
+	pixel_y_offset = 0
 	},
 /turf/open/floor/mainship/mono,
 /area/shuttle/minidropship)

_maps/shuttles/minidropship_standard.dmm

@@ -1,10 +1,5 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "a" = (
-/obj/machinery/door_control{
-	dir = 1;
-	id = "minidropship_podlock";
-	name = "outer door-control"
-	},
 /obj/structure/dropship_piece/tadpole/tadpole_nose/right{
 	dir = 1;
 	pixel_y = 32
@@ -184,7 +179,8 @@
 	id = "minidropship_podlock"
 	},
 /obj/machinery/light{
-	dir = 1
+	dir = 1;
+	pixel_y_offset = 0
 	},
 /obj/machinery/door/poddoor/shutters/transit/nonsmoothing,
 /turf/open/floor/mainship/mono,
@@ -218,7 +214,8 @@
 	id = "minidropship_podlock"
 	},
 /obj/machinery/light{
-	dir = 1
+	dir = 1;
+	pixel_y_offset = 0
 	},
 /obj/machinery/door/poddoor/shutters/transit/nonsmoothing,
 /turf/open/floor/mainship/mono,

_maps/shuttles/minidropship_umbilical.dmm

@@ -63,6 +63,13 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/shuttle/minidropship)
+"n" = (
+/obj/structure/bed/chair/dropship/passenger{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/transparent/dark_blue/full,
+/turf/open/floor/mainship/mono,
+/area/shuttle/minidropship)
 "q" = (
 /turf/open/floor/plating/plating_catwalk,
 /area/shuttle/minidropship)
@@ -87,9 +94,8 @@
 /turf/open/floor/mainship/floor,
 /area/shuttle/minidropship)
 "u" = (
-/obj/effect/turf_decal/tile/transparent/dark_blue/full,
 /obj/docking_port/mobile/marine_dropship/minidropship,
-/turf/open/floor/mainship/mono,
+/turf/open/floor/plating/plating_catwalk,
 /area/shuttle/minidropship)
 "v" = (
 /obj/effect/attach_point/crew_weapon/minidropship,
@@ -143,7 +149,8 @@
 /obj/structure/bed/chair/dropship/passenger{
 	dir = 8
 	},
-/turf/open/floor/plating/plating_catwalk,
+/obj/effect/turf_decal/tile/transparent/dark_blue/full,
+/turf/open/floor/mainship/mono,
 /area/shuttle/minidropship)
 "J" = (
 /obj/structure/bed/chair/dropship/passenger{
@@ -253,8 +260,8 @@ s
 l
 l
 F
-F
 X
+R
 "}
 (4,1,1) = {"
 t
@@ -264,8 +271,8 @@ J
 u
 q
 D
+n
 F
-R
 "}
 (5,1,1) = {"
 x
@@ -274,9 +281,9 @@ Z
 q
 v
 q
+q
 C
 F
-F
 "}
 (6,1,1) = {"
 E
@@ -286,8 +293,8 @@ S
 e
 I
 j
+I
 F
-N
 "}
 (7,1,1) = {"
 P
@@ -297,6 +304,6 @@ a
 a
 a
 F
-F
 f
+N
 "}

code/game/objects/machinery/door_control.dm

@@ -8,17 +8,19 @@
 	icon_state = "doorctrl0"
 	desc = "A remote control-switch for a door."
 	power_channel = ENVIRON
+	anchored = TRUE
+	use_power = IDLE_POWER_USE
+	idle_power_usage = 2
+	active_power_usage = 4
 	var/id = null
 	var/range = 10
 	var/normaldoorcontrol = CONTROL_POD_DOORS
-	var/desiredstate = 0 // Zero is closed, 1 is open.
+	/// Zero is closed, 1 is open.
+	var/desiredstate = 0
 	var/specialfunctions = 1
-	var/directional = TRUE //if true we apply directional offsets, if not the door control is free floating
-	anchored = TRUE
+	/// if true we apply directional offsets, if not the door control is free floating
+	var/directional = TRUE
 	var/pressed = FALSE
-	use_power = IDLE_POWER_USE
-	idle_power_usage = 2
-	active_power_usage = 4
 
 /obj/machinery/door_control/unmeltable
 	resistance_flags = RESIST_ALL

code/game/objects/structures/crates_lockers/walllocker.dm

@@ -20,13 +20,13 @@
 		dir = ndir
 	switch(dir)
 		if(NORTH)
-			pixel_y = -32
+			pixel_y = -48
 		if(SOUTH)
-			pixel_y = 32
+			pixel_y = 16
 		if(EAST)
-			pixel_x = -32
+			pixel_x = -48
 		if(WEST)
-			pixel_x = 32
+			pixel_x = 16
 
 /obj/structure/closet/walllocker/emerglocker //wall mounted emergency closet
 	name = "emergency locker"

code/game/objects/structures/dropship_equipment.dm

@@ -107,6 +107,7 @@
 	name = "rear attach point"
 	base_category = DROPSHIP_CREW_WEAPON
 	density = FALSE
+	layer = BELOW_OBJ_LAYER
 
 /obj/effect/attach_point/crew_weapon/dropship1
 	ship_tag = SHUTTLE_ALAMO

code/game/objects/structures/window.dm

@@ -442,7 +442,7 @@
 	name = "reinforced window"
 	desc = "A glass window with a special rod matrice inside a wall frame. It looks rather strong. Might take a few good hits to shatter it."
 	icon = 'icons/obj/smooth_objects/ship_window.dmi'
-	icon_state = "window-reinforced"
+	icon_state = "ship_window-0"
 	basestate = "ship_window"
 	base_icon_state = "ship_window"
 	max_integrity = 100 //Was 600
@@ -483,11 +483,10 @@
 /obj/structure/window/framed/mainship/hull
 	name = "hull window"
 	desc = "A glass window with a special rod matrice inside a wall frame. This one was made out of exotic materials to prevent hull breaches. No way to get through here."
-	//icon_state = "rwindow0_debug" //Uncomment to check hull in the map editor
+	icon_state = "ship_window_invincible"
 	damageable = FALSE
 	deconstructable = FALSE
 	resistance_flags = RESIST_ALL
-	icon_state = "window-invincible"
 	max_integrity = 1000000 //Failsafe, shouldn't matter
 
 /obj/structure/window/framed/mainship/hull/canterbury //So we can wallsmooth properly.
@@ -505,7 +504,6 @@
 	desc = "A borosilicate glass window infused with kevlar fibres and mounted within a special shock-absorbing frame, this is gonna be seriously hard to break through."
 	max_integrity = 1000
 	deconstructable = FALSE
-	icon_state = "window-reinforced"
 
 /obj/structure/window/framed/mainship/white
 	icon = 'icons/obj/smooth_objects/wwindow.dmi'