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

All hail glorious leader tigercat

code/modules/shuttle/emergency.dm

@@ -17,11 +17,11 @@
 		return
 	if(shuttle_master.emergency.timeLeft() < 11)
 		return
-	if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
-		if (istype(W, /obj/item/device/pda))
+	if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
+		if(istype(W, /obj/item/device/pda))
 			var/obj/item/device/pda/pda = W
 			W = pda.id
-		if (!W:access) //no access
+		if(!W:access) //no access
 			to_chat(user, "The access level of [W:registered_name]\'s card is not high enough. ")
 			return
 

code/modules/shuttle/shuttle.dm

@@ -307,10 +307,10 @@
 	dir = angle2dir(rotation+dir2angle(dir))
 
 	//rotate the pixel offsets too.
-	if (pixel_x || pixel_y)
-		if (rotation < 0)
+	if(pixel_x || pixel_y)
+		if(rotation < 0)
 			rotation += 360
-		for (var/turntimes=rotation/90;turntimes>0;turntimes--)
+		for(var/turntimes=rotation/90;turntimes>0;turntimes--)
 			var/oldPX = pixel_x
 			var/oldPY = pixel_y
 			pixel_x = oldPY
@@ -352,7 +352,7 @@
 	var/list/L1 = return_ordered_turfs(S1.x, S1.y, S1.z, S1.dir)
 
 	var/rotation = dir2angle(S1.dir)-dir2angle(dir)
-	if ((rotation % 90) != 0)
+	if((rotation % 90) != 0)
 		rotation += (rotation % 90) //diagonal rotations not allowed, round up
 	rotation = SimplifyDegrees(rotation)
 
@@ -392,10 +392,10 @@
 
 
 		for(var/atom/movable/AM in T0)
-			if (rotation)
+			if(rotation)
 				AM.shuttleRotate(rotation)
 
-			if (istype(AM,/obj))
+			if(istype(AM,/obj))
 				var/obj/O = AM
 				if(istype(O, /obj/docking_port/stationary))
 					continue
@@ -414,7 +414,7 @@
 									door_unlock_list += A
 							else
 								Door.close()
-			else if (istype(AM,/mob))
+			else if(istype(AM,/mob))
 				var/mob/M = AM
 				if(!M.move_on_shuttle)
 					continue
@@ -432,7 +432,7 @@
 						M.Weaken(3)
 
 
-		if (rotation)
+		if(rotation)
 			T1.shuttleRotate(rotation)
 
 		//lighting stuff

code/modules/shuttle/supply.dm

@@ -484,7 +484,7 @@
 	if(..())
 		return 1
 
-	if (href_list["doorder"])
+	if(href_list["doorder"])
 		if(world.time < reqtime)
 			visible_message("<b>[src]</b>'s monitor flashes, \"[world.time - reqtime] seconds remaining until another requisition form may be printed.\"")
 			nanomanager.update_uis(src)
@@ -528,7 +528,7 @@
 			if(i == 1)
 				O.generateRequisition(loc)
 
-	else if (href_list["rreq"])
+	else if(href_list["rreq"])
 		var/ordernum = text2num(href_list["rreq"])
 		var/obj/item/weapon/card/id/I = usr.get_id_card()
 		for(var/i=1, i<=shuttle_master.requestlist.len, i++)
@@ -537,11 +537,11 @@
 				shuttle_master.requestlist.Cut(i,i+1)
 				break
 
-	else if (href_list["last_viewed_group"])
+	else if(href_list["last_viewed_group"])
 		content_pack = null
 		last_viewed_group = text2num(href_list["last_viewed_group"])
 
-	else if (href_list["contents"])
+	else if(href_list["contents"])
 		var/topic = href_list["contents"]
 		if(topic == 1)
 			content_pack = null
@@ -658,7 +658,7 @@
 		else if(!shuttle_master.supply.request(shuttle_master.getDock("supply_home")))
 			post_signal("supply")
 
-	else if (href_list["doorder"])
+	else if(href_list["doorder"])
 		if(world.time < reqtime)
 			visible_message("<b>[src]</b>'s monitor flashes, \"[world.time - reqtime] seconds remaining until another requisition form may be printed.\"")
 			nanomanager.update_uis(src)
@@ -721,7 +721,7 @@
 					to_chat(usr, "<span class='warning'>There are insufficient supply points for this request.</span>")
 				break
 
-	else if (href_list["rreq"])
+	else if(href_list["rreq"])
 		var/ordernum = text2num(href_list["rreq"])
 		for(var/i=1, i<=shuttle_master.requestlist.len, i++)
 			var/datum/supply_order/SO = shuttle_master.requestlist[i]
@@ -729,11 +729,11 @@
 				shuttle_master.requestlist.Cut(i,i+1)
 				break
 
-	else if (href_list["last_viewed_group"])
+	else if(href_list["last_viewed_group"])
 		content_pack = null
 		last_viewed_group = text2num(href_list["last_viewed_group"])
 
-	else if (href_list["contents"])
+	else if(href_list["contents"])
 		var/topic = href_list["contents"]
 		if(topic == 1)
 			content_pack = null
@@ -790,10 +790,10 @@
 		return prob(60)
 
 	var/obj/structure/stool/bed/B = A
-	if (istype(A, /obj/structure/stool/bed) && B.buckled_mob)//if it's a bed/chair and someone is buckled, it will not pass
+	if(istype(A, /obj/structure/stool/bed) && B.buckled_mob)//if it's a bed/chair and someone is buckled, it will not pass
 		return 0
 
-	if (istype(A, /obj/structure/closet/cardboard))
+	if(istype(A, /obj/structure/closet/cardboard))
 		var/obj/structure/closet/cardboard/C = A
 		if(C.move_delay)
 			return 0
@@ -830,13 +830,13 @@
 
 /obj/structure/plasticflaps/ex_act(severity)
 	switch(severity)
-		if (1)
+		if(1)
 			qdel(src)
-		if (2)
-			if (prob(50))
+		if(2)
+			if(prob(50))
 				qdel(src)
-		if (3)
-			if (prob(5))
+		if(3)
+			if(prob(5))
 				qdel(src)
 
 /obj/structure/plasticflaps/mining //A specific type for mining that doesn't allow airflow because of them damn crates