Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items

# Conflicts:
#	code/controllers/configuration.dm
#	code/game/objects/items.dm

code/modules/shuttle/ferry.dm

@@ -1,33 +1,33 @@
-/obj/machinery/computer/shuttle/ferry
-	name = "transport ferry console"
-	circuit = /obj/item/weapon/circuitboard/computer/ferry
-	shuttleId = "ferry"
-	possible_destinations = "ferry_home;ferry_away"
-	req_access = list(GLOB.access_cent_general)
-
-	var/aiControlDisabled = 1
-
-/obj/machinery/computer/shuttle/ferry/proc/canAIControl(mob/user)
-	return ((aiControlDisabled != 1));
-
-/obj/machinery/computer/shuttle/ferry/attack_ai(mob/user)
-	if(!src.canAIControl(user))
-		return
-
-/obj/machinery/computer/shuttle/ferry/request
-	name = "ferry console"
-	circuit = /obj/item/weapon/circuitboard/computer/ferry/request
-	var/last_request //prevents spamming admins
-	var/cooldown = 600
-	possible_destinations = "ferry_home;ferry_away"
-	req_access = list(GLOB.access_cent_general)
-	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
-
-/obj/machinery/computer/shuttle/ferry/request/Topic(href, href_list)
-	..()
-	if(href_list["request"])
-		if(last_request && (last_request + cooldown > world.time))
-			return
-		last_request = world.time
-		to_chat(usr, "<span class='notice'>Your request has been recieved by Centcom.</span>")
+/obj/machinery/computer/shuttle/ferry
+	name = "transport ferry console"
+	circuit = /obj/item/weapon/circuitboard/computer/ferry
+	shuttleId = "ferry"
+	possible_destinations = "ferry_home;ferry_away"
+	req_access = list(GLOB.access_cent_general)
+
+	var/aiControlDisabled = 1
+
+/obj/machinery/computer/shuttle/ferry/proc/canAIControl(mob/user)
+	return ((aiControlDisabled != 1));
+
+/obj/machinery/computer/shuttle/ferry/attack_ai(mob/user)
+	if(!src.canAIControl(user))
+		return
+
+/obj/machinery/computer/shuttle/ferry/request
+	name = "ferry console"
+	circuit = /obj/item/weapon/circuitboard/computer/ferry/request
+	var/last_request //prevents spamming admins
+	var/cooldown = 600
+	possible_destinations = "ferry_home;ferry_away"
+	req_access = list(GLOB.access_cent_general)
+	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
+
+/obj/machinery/computer/shuttle/ferry/request/Topic(href, href_list)
+	..()
+	if(href_list["request"])
+		if(last_request && (last_request + cooldown > world.time))
+			return
+		last_request = world.time
+		to_chat(usr, "<span class='notice'>Your request has been recieved by Centcom.</span>")
 		to_chat(GLOB.admins, "<b>FERRY: <font color='blue'>[ADMIN_LOOKUPFLW(usr)] (<A HREF='?_src_=holder;secrets=moveferry'>Move Ferry</a>)</b> is requesting to move the transport ferry to Centcom.</font>")

code/modules/shuttle/shuttle.dm

@@ -754,4 +754,16 @@
 		for(var/obj/machinery/door/E in A)	//dumb, I know, but playing it on the engines doesn't do it justice
 			playsound(E, s, 100, FALSE, max(width, height) - world.view)
 
+/obj/docking_port/mobile/proc/is_in_shuttle_bounds(atom/A)
+	var/turf/T = get_turf(A)
+	if(T.z != z)
+		return FALSE
+	var/list/bounds= return_coords()
+	var/turf/T0 = locate(bounds[1],bounds[2],z)
+	var/turf/T1 = locate(bounds[3],bounds[4],z)
+	if(T in block(T0,T1))
+		return TRUE
+	return FALSE
+	
+
 #undef DOCKING_PORT_HIGHLIGHT

code/modules/shuttle/special.dm

@@ -60,7 +60,6 @@
 	obj_integrity = 1000
 	max_integrity = 1000
 	verb_say = "chants"
-	initial_languages = list(/datum/language/common)
 	var/obj/machinery/power/emitter/energycannon/magical/our_statue
 	var/list/mob/living/sleepers = list()
 	var/never_spoken = TRUE
@@ -148,11 +147,11 @@
 		3. Don't get messed up in their affairs."
 	status_flags = GODMODE // Please don't punch the barkeeper
 	unique_name = FALSE // disables the (123) number suffix
+	initial_language_holder = /datum/language_holder/universal
 
 /mob/living/simple_animal/drone/snowflake/bardrone/Initialize()
 	. = ..()
 	access_card.access |= GLOB.access_cent_bar
-	grant_all_languages(omnitongue=TRUE)
 
 /mob/living/simple_animal/hostile/alien/maid/barmaid
 	gold_core_spawnable = 0
@@ -163,6 +162,7 @@
 	unique_name = FALSE
 	AIStatus = AI_OFF
 	stop_automated_movement = TRUE
+	initial_language_holder = /datum/language_holder/universal
 
 /mob/living/simple_animal/hostile/alien/maid/barmaid/Initialize()
 	. = ..()
@@ -172,8 +172,6 @@
 	access_card.access |= GLOB.access_cent_bar
 	access_card.flags |= NODROP
 
-	grant_all_languages(omnitongue=TRUE)
-
 /mob/living/simple_animal/hostile/alien/maid/barmaid/Destroy()
 	qdel(access_card)
 	. = ..()