Further CI fixes and map fixes

Further CI fixes and map fixes

code/game/machinery/doors/poddoor/poddoor.dm

@@ -119,45 +119,45 @@
  // Hybrisa Shutters
 
 /obj/structure/machinery/door/poddoor/hybrisa
-    icon = 'icons/obj/structures/doors/zenithshutters.dmi'
-    icon_state = "almayer_pdoor1"
-    base_icon_state = "almayer_pdoor"
-    openspeed = 4
+	icon = 'icons/obj/structures/doors/zenithshutters.dmi'
+	icon_state = "almayer_pdoor1"
+	base_icon_state = "almayer_pdoor"
+	openspeed = 4
 
 /obj/structure/machinery/door/poddoor/hybrisa/open_shutters/Initialize()
-    . = ..()
-    if(opacity)
-        set_opacity(0)
+	. = ..()
+	if(opacity)
+		set_opacity(0)
 
 /obj/structure/machinery/door/poddoor/hybrisa/open_shutters
-    name = "\improper Shutters"
-    desc = null
-    icon_state = "almayer_pdoor1"
-    base_icon_state = "almayer_pdoor"
-    opacity = FALSE
+	name = "\improper Shutters"
+	desc = null
+	icon_state = "almayer_pdoor1"
+	base_icon_state = "almayer_pdoor"
+	opacity = FALSE
 
 /obj/structure/machinery/door/poddoor/hybrisa/shutters
-    name = "\improper Shutters"
-    desc = null
-    icon_state = "shutter1"
-    base_icon_state = "shutter"
+	name = "\improper Shutters"
+	desc = null
+	icon_state = "shutter1"
+	base_icon_state = "shutter"
 
 /obj/structure/machinery/door/poddoor/hybrisa/white
-    name = null
-    desc = "That looks like it doesn't open easily."
-    icon_state = "w_almayer_pdoor1"
-    base_icon_state = "w_almayer_pdoor"
-    unslashable = TRUE
+	name = null
+	desc = "That looks like it doesn't open easily."
+	icon_state = "w_almayer_pdoor1"
+	base_icon_state = "w_almayer_pdoor"
+	unslashable = TRUE
 
 /obj/structure/machinery/door/poddoor/hybrisa/secure_red_door
-    desc = "That looks like it doesn't open easily."
-    icon_state = "pdoor1"
-    base_icon_state = "pdoor"
-    unslashable = TRUE
+	desc = "That looks like it doesn't open easily."
+	icon_state = "pdoor1"
+	base_icon_state = "pdoor"
+	unslashable = TRUE
 
 /obj/structure/machinery/door/poddoor/hybrisa/open_shutters
-    name = "\improper Shutters"
-    desc = null
-    icon_state = "almayer_pdoor1"
-    base_icon_state = "almayer_pdoor"
-    opacity = FALSE
+	name = "\improper Shutters"
+	desc = null
+	icon_state = "almayer_pdoor1"
+	base_icon_state = "almayer_pdoor"
+	opacity = FALSE

code/game/objects/structures/fence.dm

@@ -280,11 +280,11 @@ GLOBAL_LIST_INIT(all_fences, list())
 			icon_state = "[basestate]_off"
 
 /obj/structure/fence/electrified/proc/toggle_power()
-    if(electrified)
-        electrified = FALSE
-    else
-        electrified = TRUE
-    src.update_icon()
+	if(electrified)
+		electrified = FALSE
+	else
+		electrified = TRUE
+	src.update_icon()
 
 /obj/structure/fence/electrified/Initialize()
 	..()

code/game/objects/structures/hybrisa_props.dm

@@ -42,50 +42,50 @@
 		if(0 to 500)
 			damage_state = 5
 	icon_state = "[initial(icon_state)]_damage_[damage_state]"
-var/damage_state = 0
+	damage_state = 0
 
 /obj/structure/prop/hybrisa/vehicles/proc/explode(dam, mob/M)
-    src.visible_message(SPAN_DANGER("<B>[src] blows apart!</B>"), null, null, 1)
-    playsound(loc, 'sound/effects/car_crush.ogg', 25)
-    var/turf/Tsec = get_turf(src)
-    new /obj/item/stack/rods(Tsec)
-    new /obj/item/stack/rods(Tsec)
-    new /obj/item/stack/sheet/metal(Tsec)
-    new /obj/item/stack/sheet/metal(Tsec)
-    new /obj/item/stack/cable_coil/cut(Tsec)
-
-    new /obj/effect/spawner/gibspawner/robot(Tsec)
-    new /obj/effect/decal/cleanable/blood/oil(src.loc)
-
-    deconstruct(FALSE)
+	src.visible_message(SPAN_DANGER("<B>[src] blows apart!</B>"), null, null, 1)
+	playsound(loc, 'sound/effects/car_crush.ogg', 25)
+	var/turf/Tsec = get_turf(src)
+	new /obj/item/stack/rods(Tsec)
+	new /obj/item/stack/rods(Tsec)
+	new /obj/item/stack/sheet/metal(Tsec)
+	new /obj/item/stack/sheet/metal(Tsec)
+	new /obj/item/stack/cable_coil/cut(Tsec)
+
+	new /obj/effect/spawner/gibspawner/robot(Tsec)
+	new /obj/effect/decal/cleanable/blood/oil(src.loc)
+
+	deconstruct(FALSE)
 /obj/structure/prop/hybrisa/vehicles/proc/take_damage(dam, mob/M)
-    if(health) //Prevents unbreakable objects from being destroyed
-        health -= dam
-        if(health <= 0)
-            explode()
-        else
-            update_icon()
+	if(health) //Prevents unbreakable objects from being destroyed
+		health -= dam
+		if(health <= 0)
+			explode()
+		else
+			update_icon()
 
 /obj/structure/prop/hybrisa/vehicles/bullet_act(obj/projectile/P)
-    if(P.ammo.damage)
-        take_damage(P.ammo.damage)
-        update_icon()
+	if(P.ammo.damage)
+		take_damage(P.ammo.damage)
+		update_icon()
 
 /obj/structure/prop/hybrisa/vehicles/suv
-    icon = 'icons/obj/structures/props/vehiclesexpanded.dmi'
-    icon_state = "SUV"
+	icon = 'icons/obj/structures/props/vehiclesexpanded.dmi'
+	icon_state = "SUV"
 
 /obj/structure/prop/hybrisa/vehicles/suvdamaged
-    icon = 'icons/obj/structures/props/vehiclesexpanded.dmi'
-    icon_state = "SUV_damaged"
+	icon = 'icons/obj/structures/props/vehiclesexpanded.dmi'
+	icon_state = "SUV_damaged"
 
 /obj/structure/prop/hybrisa/vehicles/largetruck
-    icon = 'icons/obj/structures/props/vehiclesexpanded.dmi'
-    icon_state = "zenithlongtruck3"
+	icon = 'icons/obj/structures/props/vehiclesexpanded.dmi'
+	icon_state = "zenithlongtruck3"
 
 /obj/structure/prop/hybrisa/vehicles/Car
-    icon = 'icons/obj/structures/props/vehiclesexpanded.dmi'
-    icon_state = "MeridianCar_1"
+	icon = 'icons/obj/structures/props/vehiclesexpanded.dmi'
+	icon_state = "MeridianCar_1"
 
 // Very Large Vehicles
 
@@ -274,7 +274,7 @@ var/damage_state = 0
 // Car Chassis
 
 /obj/structure/prop/hybrisa/vehicles/Car/Car_chassis
-    desc = "A Mono-Spectra chassis in the early stages of assembly."
+	desc = "A Mono-Spectra chassis in the early stages of assembly."
 
 /obj/structure/prop/hybrisa/vehicles/Car/Car_chassis
 	name = "Mono-Spectra Chassis"
@@ -283,8 +283,8 @@ var/damage_state = 0
 // damaged suv
 
 /obj/structure/prop/hybrisa/vehicles/suvdamaged
-    name = "heavily damaged SUV"
-    desc = "A shell of a vehicle, broken down beyond repair."
+	name = "heavily damaged SUV"
+	desc = "A shell of a vehicle, broken down beyond repair."
 
 /obj/structure/prop/hybrisa/vehicles/suvdamaged/suv_damaged0
 	icon_state = "SUV_damaged"
@@ -382,7 +382,7 @@ var/damage_state = 0
 	icon_state = "zenithlongtruckkellandmining1"
 
 /obj/structure/prop/hybrisa/vehicles/largetruck/largetruckmining
-    name = "Kelland mining mega-hauler truck"
+	name = "Kelland mining mega-hauler truck"
 
 /obj/structure/prop/hybrisa/vehicles/largetruck/largetruckmining/mining
 	icon_state = "zenithlongtruckkellandmining1"
@@ -394,7 +394,7 @@ var/damage_state = 0
 	icon_state = "zenithlongtruckweyland1"
 
 /obj/structure/prop/hybrisa/vehicles/largetruck/largetruckwy
-    name = "Weyland-Yutani mega-hauler truck"
+	name = "Weyland-Yutani mega-hauler truck"
 
 /obj/structure/prop/hybrisa/vehicles/largetruck/largetruckwy/wy1
 	icon_state = "zenithlongtruckweyland1"
@@ -436,7 +436,7 @@ var/damage_state = 0
 // science crawlers
 
 /obj/structure/prop/hybrisa/vehicles/colonycrawlers/science
-    name = "weyland-yutani colony crawler"
+	name = "weyland-yutani colony crawler"
 
 /obj/structure/prop/hybrisa/vehicles/colonycrawlers/science/science1
 	icon_state = "crawler_wy1"
@@ -449,7 +449,7 @@ var/damage_state = 0
 // Mining Crawlers
 
 /obj/structure/prop/hybrisa/vehicles/colonycrawlers/mining
-    name = "kelland mining colony crawler"
+	name = "kelland mining colony crawler"
 
 /obj/structure/prop/hybrisa/vehicles/colonycrawlers/mining/mining1
 	desc = "It is a tread bound crawler used in harsh conditions. Supplied by The Kelland Mining Company; A subsidiary of Weyland Yutani."
@@ -826,12 +826,12 @@ var/damage_state = 0
 
 // Furniture
 /obj/structure/prop/hybrisa/furniture
-    icon = 'icons/obj/structures/props/zenithtables.dmi'
-    icon_state = "blackmetaltable"
+	icon = 'icons/obj/structures/props/zenithtables.dmi'
+	icon_state = "blackmetaltable"
 
 /obj/structure/prop/hybrisa/furniture/tables
-    icon = 'icons/obj/structures/props/zenithtables.dmi'
-    icon_state = "table_pool"
+	icon = 'icons/obj/structures/props/zenithtables.dmi'
+	icon_state = "table_pool"
 
 /obj/structure/prop/hybrisa/furniture/tables/tableblack
 	name = "large metal table"
@@ -845,8 +845,8 @@ var/damage_state = 0
 	debris = list(/obj/item/stack/sheet/metal)
 
 /obj/structure/prop/hybrisa/furniture/tables/tableblack/blacktablecomputer
-    icon = 'icons/obj/structures/props/zenithtables.dmi'
-    icon_state = "blackmetaltable_computer"
+	icon = 'icons/obj/structures/props/zenithtables.dmi'
+	icon_state = "blackmetaltable_computer"
 
 /obj/structure/prop/hybrisa/furniture/tables/tablewood
 	name = "large wood table"
@@ -860,8 +860,8 @@ var/damage_state = 0
 	debris = list(/obj/item/stack/sheet/wood)
 
 /obj/structure/prop/hybrisa/furniture/tables/tablewood/woodtablecomputer
-    icon = 'icons/obj/structures/props/zenithtables.dmi'
-    icon_state = "brownlargetable_computer"
+	icon = 'icons/obj/structures/props/zenithtables.dmi'
+	icon_state = "brownlargetable_computer"
 
 /obj/structure/prop/hybrisa/furniture/tables/tablepool
 	name = "pool table"
@@ -889,8 +889,8 @@ var/damage_state = 0
 
 // Chairs
 /obj/structure/bed/hybrisa/chairs
-    name = "expensive chair"
-    desc = "A expensive looking chair"
+	name = "expensive chair"
+	desc = "A expensive looking chair"
 
 /obj/structure/bed/hybrisa/chairs/black
 	icon = 'icons/obj/structures/props/zenithrandomprops.dmi'
@@ -1563,7 +1563,7 @@ var/damage_state = 0
 
 
 /obj/structure/prop/hybrisa/misc/machinery/screens
-    name = "monitor"
+	name = "monitor"
 /obj/structure/prop/hybrisa/misc/machinery/screens/frame
 	icon_state = "frame"
 /obj/structure/prop/hybrisa/misc/machinery/screens/security
@@ -1621,7 +1621,7 @@ var/damage_state = 0
 	icon_state = "wallegg_on"
 
 /obj/structure/prop/hybrisa/misc/fake/pipes
-    name = "disposal pipe"
+	name = "disposal pipe"
 
 /obj/structure/prop/hybrisa/misc/fake/pipes/pipe1
 	layer = 2
@@ -1640,7 +1640,7 @@ var/damage_state = 0
 	icon_state = "pipe-b"
 
 /obj/structure/prop/hybrisa/misc/fake/wire
-    name = "power cable"
+	name = "power cable"
 
 /obj/structure/prop/hybrisa/misc/fake/wire/red
 	layer = 2
@@ -1654,7 +1654,7 @@ var/damage_state = 0
 
 
 /obj/structure/prop/hybrisa/misc/fake/heavydutywire
-    name = "heavy duty wire"
+	name = "heavy duty wire"
 
 /obj/structure/prop/hybrisa/misc/fake/heavydutywire/heavy1
 	layer = 2
@@ -1673,7 +1673,7 @@ var/damage_state = 0
 	icon_state = "1-2-4-8"
 
 /obj/structure/prop/hybrisa/misc/fake/lattice
-    name = "structural lattice"
+	name = "structural lattice"
 
 /obj/structure/prop/hybrisa/misc/fake/lattice/full
 	icon_state = "latticefull"
@@ -1894,7 +1894,7 @@ var/damage_state = 0
 /// Fake Platforms
 
 /obj/structure/prop/hybrisa/fakeplatforms
-    name = "platform"
+	name = "platform"
 
 /obj/structure/prop/hybrisa/fakeplatforms/platform1
 	icon = 'icons/obj/structures/props/zenithrandomprops.dmi'

code/game/objects/structures/platforms.dm

@@ -212,10 +212,10 @@
 /// Hybrisa Platforms
 
 /obj/structure/platform/hybrisa
-    icon_state = "hybrisa"
+	icon_state = "hybrisa"
 
 /obj/structure/platform_decoration/hybrisa
-    icon_state = "hybrisa"
+	icon_state = "hybrisa"
 
 /obj/structure/platform/hybrisa/engineer
 	icon_state = "engineer_platform"

code/game/turfs/open.dm

@@ -1281,7 +1281,7 @@
 
 
 /turf/open/floor/hybrisa/misc/marshallsemblem
-    icon_state = "marshallsemblem"
+	icon_state = "marshallsemblem"
 /turf/open/floor/hybrisa/misc/wybiglogo
 	name = "Weyland-Yutani corp. - bulding better worlds."
 	icon_state = "big8x8wylogo"

maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm

@@ -91397,7 +91397,6 @@
 /obj/effect/hybrisa/decal/dirt,
 /obj/structure/prop/hybrisa/misc/buildinggreeblies/greeble10{
 	dir = 8;
-	pixel_w = null;
 	pixel_x = 13;
 	pixel_y = 3
 	},
@@ -129206,7 +129205,7 @@
 "uUh" = (
 /obj/structure/bed/chair/comfy{
 	dir = 1;
-	tag = "icon-comfychair (NORTH)"
+
 	},
 /turf/open/floor/almayer{
 	allow_construction = 0;
@@ -140847,7 +140846,7 @@
 "wRp" = (
 /obj/structure/bed/chair/comfy{
 	dir = 1;
-	tag = "icon-comfychair (NORTH)"
+
 	},
 /obj/structure/machinery/light,
 /turf/open/floor/almayer{