Merge branch 'OrganRefactor' of https://github.com/Aurorablade/Paradise; branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -241,7 +241,6 @@
 		sleep(2)
 		new /obj/item/weapon/storage/briefcase(src)
 		new	/obj/item/weapon/storage/firstaid/adv(src)
-		new /obj/item/weapon/gun/projectile/revolver/detective(src)
 		new /obj/item/weapon/storage/belt/security/sec(src)
 		new /obj/item/weapon/grenade/flashbang(src)
 		new /obj/item/device/flash(src)

code/game/objects/structures/inflatable.dm

@@ -111,6 +111,13 @@
 	if(health <= 0)
 		deflate(1)
 
+/obj/structure/inflatable/AltClick()
+	if(usr.stat || usr.restrained())
+		return
+	if(!Adjacent(usr))
+		return
+	deflate()
+
 /obj/structure/inflatable/proc/deflate(var/violent=0)
 	playsound(loc, 'sound/machines/hiss.ogg', 75, 1)
 	if(violent)

code/game/objects/structures/tables_racks.dm

@@ -42,24 +42,28 @@
 
 /obj/structure/table/update_icon()
 	if(smooth && !flipped)
+		icon_state = initial(icon_state)
 		smooth_icon(src)
 		smooth_icon_neighbors(src)
 
 	if(flipped)
+		clear_smooth_overlays()
+
 		var/type = 0
-		var/tabledirs = 0
+		var/subtype = null
 		for(var/direction in list(turn(dir,90), turn(dir,-90)) )
 			var/obj/structure/table/T = locate(/obj/structure/table,get_step(src,direction))
 			if (T && T.flipped)
 				type++
-				tabledirs |= direction
+				if(type == 1)
+					subtype = direction == turn(dir,90) ? "-" : "+"
 		var/base = "table"
 		if (istype(src, /obj/structure/table/woodentable))
 			base = "wood"
 		if (istype(src, /obj/structure/table/reinforced))
 			base = "rtable"
 
-		icon_state = "[base]flip[type]"
+		icon_state = "[base]flip[type][type == 1 ? subtype : ""]"
 
 		return 1