Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fixxxxx

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

@@ -3,7 +3,7 @@
 /obj/structure/closet/crate
 	name = "crate"
 	desc = "A rectangular steel crate."
-	icon = 'icons/obj/storage.dmi'
+	icon = 'icons/obj/crates.dmi'
 	icon_state = "crate"
 	icon_opened = "crateopen"
 	icon_closed = "crate"
@@ -490,7 +490,6 @@
 /obj/structure/closet/crate/large
 	name = "large crate"
 	desc = "A hefty metal crate."
-	icon = 'icons/obj/storage.dmi'
 	icon_state = "largemetal"
 	icon_opened = "largemetalopen"
 	icon_closed = "largemetal"
@@ -515,7 +514,6 @@
 /obj/structure/closet/crate/secure/large
 	name = "large crate"
 	desc = "A hefty metal crate with an electronic locking system."
-	icon = 'icons/obj/storage.dmi'
 	icon_state = "largemetal"
 	icon_opened = "largemetalopen"
 	icon_closed = "largemetal"

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

@@ -1,8 +1,8 @@
 /obj/structure/largecrate
 	name = "large crate"
 	desc = "A hefty wooden crate."
-	icon = 'icons/obj/storage.dmi'
-	icon_state = "densecrate"
+	icon = 'icons/obj/crates.dmi'
+	icon_state = "largecrate"
 	density = 1
 	var/obj/item/weapon/paper/manifest/manifest
 
@@ -49,7 +49,6 @@
 		return attack_hand(user)
 
 /obj/structure/largecrate/mule
-	icon_state = "mulecrate"
 
 /obj/structure/largecrate/lisa
 	icon_state = "lisacrate"

code/game/objects/structures/curtains.dm

@@ -27,7 +27,7 @@
 	..()
 
 /obj/structure/curtain/proc/toggle()
-	opacity = !opacity
+	set_opacity(!opacity)
 	if(opacity)
 		icon_state = "closed"
 		layer = SHOWER_CLOSED_LAYER

code/game/objects/structures/mineral_doors.dm

@@ -191,7 +191,7 @@
 
 	Close()
 		..()
-		opacity = 0
+		set_opacity(0)
 
 /obj/structure/mineral_door/transparent/plasma
 	mineralType = "plasma"
@@ -228,7 +228,7 @@
 		flick("[mineralType]opening",src)
 		sleep(10)
 		density = 0
-		opacity = 0
+		set_opacity(0)
 		state = 1
 		update_icon()
 		isSwitchingStates = 0
@@ -239,7 +239,7 @@
 		flick("[mineralType]closing",src)
 		sleep(10)
 		density = 1
-		opacity = 1
+		set_opacity(1)
 		state = 0
 		update_icon()
 		isSwitchingStates = 0
@@ -265,7 +265,7 @@
 		flick("[mineralType]opening",src)
 		sleep(10)
 		density = 0
-		opacity = 0
+		set_opacity(0)
 		state = 1
 		update_icon()
 		isSwitchingStates = 0
@@ -280,7 +280,7 @@
 		flick("[mineralType]closing",src)
 		sleep(10)
 		density = 1
-		opacity = 1
+		set_opacity(1)
 		state = 0
 		update_icon()
 		isSwitchingStates = 0

code/game/objects/structures/spirit_board.dm

@@ -55,11 +55,10 @@
 	//lighting check
 	var/light_amount = 0
 	var/turf/T = get_turf(src)
-	var/atom/movable/lighting_overlay/LO = locate(/atom/movable/lighting_overlay) in T
-	if(LO)
-		light_amount = LO.get_clamped_lum(0.5)*10
+	if(T)
+		light_amount = T.get_lumcount(0.5) * 10
 	else
-		light_amount =  10
+		light_amount = 10
 
 	if(light_amount > 2)
 		to_chat(M, "<span class='warning'>It's too bright here to use [src.name]!</span>")