Dos2unix

code/__DEFINES/vv.dm

@@ -122,7 +122,6 @@
 
 // misc
 #define VV_HK_SPACEVINE_PURGE "spacevine_purge"
-#define VV_HK_REMOVE_PAINTING "remove_painting"
 
 // paintings
 #define VV_HK_REMOVE_PAINTING "remove_painting"

code/modules/admin/verbs/shuttlepanel.dm

@@ -1,76 +1,76 @@
-/datum/admins/proc/open_shuttlepanel()
+/datum/admins/proc/open_shuttlepanel()
-	set category = "Admin"
+	set category = "Admin"
-	set name = "Shuttle Manipulator"
+	set name = "Shuttle Manipulator"
-	set desc = "Opens the shuttle manipulator UI."
+	set desc = "Opens the shuttle manipulator UI."
-
+
-	if(!check_rights(R_ADMIN))
+	if(!check_rights(R_ADMIN))
-		return
+		return
-
+
-	SSshuttle.ui_interact(usr)
+	SSshuttle.ui_interact(usr)
-
+
-
+
-/obj/docking_port/mobile/proc/admin_fly_shuttle(mob/user)
+/obj/docking_port/mobile/proc/admin_fly_shuttle(mob/user)
-	var/list/options = list()
+	var/list/options = list()
-
+
-	for(var/port in SSshuttle.stationary)
+	for(var/port in SSshuttle.stationary)
-		if (istype(port, /obj/docking_port/stationary/transit))
+		if (istype(port, /obj/docking_port/stationary/transit))
-			continue  // please don't do this
+			continue  // please don't do this
-		var/obj/docking_port/stationary/S = port
+		var/obj/docking_port/stationary/S = port
-		if (canDock(S) == SHUTTLE_CAN_DOCK)
+		if (canDock(S) == SHUTTLE_CAN_DOCK)
-			options[S.name || S.id] = S
+			options[S.name || S.id] = S
-
+
-	options += "--------"
+	options += "--------"
-	options += "Infinite Transit"
+	options += "Infinite Transit"
-	options += "Delete Shuttle"
+	options += "Delete Shuttle"
-	options += "Into The Sunset (delete & greentext 'escape')"
+	options += "Into The Sunset (delete & greentext 'escape')"
-
+
-	var/selection = input(user, "Select where to fly [name || id]:", "Fly Shuttle") as null|anything in options
+	var/selection = input(user, "Select where to fly [name || id]:", "Fly Shuttle") as null|anything in options
-	if(!selection)
+	if(!selection)
-		return
+		return
-
+
-	switch(selection)
+	switch(selection)
-		if("Infinite Transit")
+		if("Infinite Transit")
-			destination = null
+			destination = null
-			mode = SHUTTLE_IGNITING
+			mode = SHUTTLE_IGNITING
-			setTimer(ignitionTime)
+			setTimer(ignitionTime)
-
+
-		if("Delete Shuttle")
+		if("Delete Shuttle")
-			if(alert(user, "Really delete [name || id]?", "Delete Shuttle", "Cancel", "Really!") != "Really!")
+			if(alert(user, "Really delete [name || id]?", "Delete Shuttle", "Cancel", "Really!") != "Really!")
-				return
+				return
-			jumpToNullSpace()
+			jumpToNullSpace()
-
+
-		if("Into The Sunset (delete & greentext 'escape')")
+		if("Into The Sunset (delete & greentext 'escape')")
-			if(alert(user, "Really delete [name || id] and greentext escape objectives?", "Delete Shuttle", "Cancel", "Really!") != "Really!")
+			if(alert(user, "Really delete [name || id] and greentext escape objectives?", "Delete Shuttle", "Cancel", "Really!") != "Really!")
-				return
+				return
-			intoTheSunset()
+			intoTheSunset()
-
+
-		else
+		else
-			if(options[selection])
+			if(options[selection])
-				request(options[selection])
+				request(options[selection])
-
+
-/obj/docking_port/mobile/emergency/admin_fly_shuttle(mob/user)
+/obj/docking_port/mobile/emergency/admin_fly_shuttle(mob/user)
-	return  // use the existing verbs for this
+	return  // use the existing verbs for this
-
+
-/obj/docking_port/mobile/arrivals/admin_fly_shuttle(mob/user)
+/obj/docking_port/mobile/arrivals/admin_fly_shuttle(mob/user)
-	switch(alert(user, "Would you like to fly the arrivals shuttle once or change its destination?", "Fly Shuttle", "Fly", "Retarget", "Cancel"))
+	switch(alert(user, "Would you like to fly the arrivals shuttle once or change its destination?", "Fly Shuttle", "Fly", "Retarget", "Cancel"))
-		if("Cancel")
+		if("Cancel")
-			return
+			return
-		if("Fly")
+		if("Fly")
-			return ..()
+			return ..()
-
+
-	var/list/options = list()
+	var/list/options = list()
-
+
-	for(var/port in SSshuttle.stationary)
+	for(var/port in SSshuttle.stationary)
-		if (istype(port, /obj/docking_port/stationary/transit))
+		if (istype(port, /obj/docking_port/stationary/transit))
-			continue  // please don't do this
+			continue  // please don't do this
-		var/obj/docking_port/stationary/S = port
+		var/obj/docking_port/stationary/S = port
-		if (canDock(S) == SHUTTLE_CAN_DOCK)
+		if (canDock(S) == SHUTTLE_CAN_DOCK)
-			options[S.name || S.id] = S
+			options[S.name || S.id] = S
-
+
-	var/selection = input(user, "Select the new arrivals destination:", "Fly Shuttle") as null|anything in options
+	var/selection = input(user, "Select the new arrivals destination:", "Fly Shuttle") as null|anything in options
-	if(!selection)
+	if(!selection)
-		return
+		return
-	target_dock = options[selection]
+	target_dock = options[selection]
-	if(!QDELETED(target_dock))
+	if(!QDELETED(target_dock))
-		destination = target_dock
+		destination = target_dock
-
+

code/modules/asset_cache/asset_cache_item.dm

@@ -1,21 +1,21 @@
-/**
+/**
-	* # asset_cache_item
+	* # asset_cache_item
-	* 
+	* 
-	* An internal datum containing info on items in the asset cache. Mainly used to cache md5 info for speed.
+	* An internal datum containing info on items in the asset cache. Mainly used to cache md5 info for speed.
-**/
+**/
-/datum/asset_cache_item
+/datum/asset_cache_item
-	var/name
+	var/name
-	var/md5
+	var/md5
-	var/resource
+	var/resource
-
+
-/datum/asset_cache_item/New(name, file)
+/datum/asset_cache_item/New(name, file)
-	if (!isfile(file))
+	if (!isfile(file))
-		file = fcopy_rsc(file)
+		file = fcopy_rsc(file)
-	md5 = md5(file)
+	md5 = md5(file)
-	if (!md5)
+	if (!md5)
-		md5 = md5(fcopy_rsc(file))
+		md5 = md5(fcopy_rsc(file))
-		if (!md5)
+		if (!md5)
-			CRASH("invalid asset sent to asset cache")
+			CRASH("invalid asset sent to asset cache")
-		debug_world_log("asset cache unexpected success of second fcopy_rsc")
+		debug_world_log("asset cache unexpected success of second fcopy_rsc")
-	src.name = name
+	src.name = name
-	resource = file
+	resource = file