Merge branch 'master' into CIC-Power

code/datums/agents/tools/tracker.dm

@@ -12,7 +12,7 @@
 	overlays.Cut()
 
 	if(active && tracked_object)
-		overlays += icon(icon, "+tracker_arrow", get_dir(src, tracked_object))
+		overlays += icon(icon, "+tracker_arrow", Get_Compass_Dir(src, tracked_object))
 
 /obj/item/device/tracker/attack_self(mob/user)
 	if(!skillcheckexplicit(user, SKILL_ANTAG, SKILL_ANTAG_AGENT))

code/datums/supply_packs/black_market.dm

@@ -749,8 +749,8 @@ This is where the RO can reclaim their lost honor and purchase the M44 custom, t
 	dollar_cost = 10
 	containertype = /obj/structure/largecrate/black_market
 
-/datum/supply_packs/contraband/deep_storage/xm42b_pipe
-	name = "10x99mm XM42B casing"
+/datum/supply_packs/contraband/deep_storage/xm43e1_pipe
+	name = "10x99mm XM43E1 casing"
 	contains = list(/obj/item/prop/helmetgarb/bullet_pipe)
 	dollar_cost = 10
 	containertype = /obj/structure/largecrate/black_market

code/datums/supply_packs/spec_ammo.dm

@@ -109,10 +109,10 @@
 	containername = "M42A Incendiary Magazine Crate"
 	group = "Weapons Specialist Ammo"
 
-//XM42B - Disabled during testing per request.
+//XM43E1 - Disabled during testing per request.
 /*
 /datum/supply_packs/ammo_amr_marksman
-	name = "XM42B anti-materiel rifle marksman magazines crate (x5)"
+	name = "XM43E1 anti-materiel rifle marksman magazines crate (x5)"
 	contains = list(
 		/obj/item/ammo_magazine/sniper/anti_materiel,
 		/obj/item/ammo_magazine/sniper/anti_materiel,
@@ -122,7 +122,7 @@
 	)
 	cost = 30
 	containertype = /obj/structure/closet/crate/ammo
-	containername = "XM42B Anti-Materiel Magazine Crate"
+	containername = "XM43E1 Anti-Materiel Magazine Crate"
 	group = "Specialist Ammo"
 */
 //M4RA

code/game/cas_manager/datums/cas_fire_mission.dm

@@ -114,7 +114,7 @@
 		if(get_turf(M) == initial_turf)
 			relative_dir = 0
 		else
-			relative_dir = get_dir(M, initial_turf)
+			relative_dir = Get_Compass_Dir(M, initial_turf)
 
 		var/ds_identifier = "LARGE BIRD"
 		if (M.mob_flags & KNOWS_TECHNOLOGY)
@@ -132,7 +132,7 @@
 		if(get_turf(M) == initial_turf)
 			relative_dir = 0
 		else
-			relative_dir = get_dir(M, initial_turf)
+			relative_dir = Get_Compass_Dir(M, initial_turf)
 
 		var/ds_identifier = "LARGE BIRD"
 		if (M.mob_flags & KNOWS_TECHNOLOGY)

code/game/machinery/door_control.dm

@@ -64,7 +64,7 @@
 	if(is_mainship_level(z)) // on the almayer
 		return
 
-	shuttle.control_doors("lock", "all", force=FALSE)
+	shuttle.control_doors("force-lock", "all", force=FALSE)
 
 /obj/structure/machinery/door_control/proc/handle_door()
 	for(var/obj/structure/machinery/door/airlock/D in range(range))

code/game/machinery/doors/multi_tile.dm

@@ -275,6 +275,17 @@
 	name = "\improper Normandy cargo door"
 	icon = 'icons/obj/structures/doors/dropship2_cargo.dmi'
 
+/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside
+	width = 2
+
+/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/ds1
+	name = "\improper Alamo crew hatch"
+	icon = 'icons/obj/structures/doors/dropship1_side2.dmi'
+
+/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/ds2
+	name = "\improper Normandy crew hatch"
+	icon = 'icons/obj/structures/doors/dropship2_side2.dmi'
+
 /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/blastdoor
 	name = "bulkhead blast door"
 	icon = 'icons/obj/structures/doors/almayerblastdoor.dmi'

code/game/objects/effects/landmarks/corpsespawner.dm

@@ -135,7 +135,7 @@
 
 /obj/effect/landmark/corpsespawner/wy/manager/burst
 	name = "Burst Corporate Supervisor"
-	equip_path = /datum/equipment_preset/corpse/ua_riot/burst
+	equip_path = /datum/equipment_preset/corpse/wy/manager/burst
 
 
 ///////////Faction Specific Corpses//////////////////////

code/game/objects/items/devices/multitool.dm

@@ -53,8 +53,8 @@
 	var/area/A = get_area(src)
 	var/APC = A? A.get_apc() : null
 	if(APC)
-		to_chat(user, SPAN_NOTICE("The local APC is located at [SPAN_BOLD("[get_dist(src, APC)] units [dir2text(get_dir(src, APC))]")]."))
-		user.balloon_alert(user, "[get_dist(src, APC)] units [dir2text(get_dir(src, APC))]")
+		to_chat(user, SPAN_NOTICE("The local APC is located at [SPAN_BOLD("[get_dist(src, APC)] units [dir2text(Get_Compass_Dir(src, APC))]")]."))
+		user.balloon_alert(user, "[get_dist(src, APC)] units [dir2text(Get_Compass_Dir(src, APC))]")
 	else
 		to_chat(user, SPAN_WARNING("ERROR: Could not locate local APC."))
 		user.balloon_alert(user, "could not locate!")

code/game/objects/items/devices/personal_data_transmitter.dm

@@ -122,7 +122,7 @@
 		return
 
 	var/dist = get_dist(self_turf, bracelet_turf)
-	var/direction = dir2text_short(get_dir(self_turf, bracelet_turf))
+	var/direction = dir2text_short(Get_Compass_Dir(self_turf, bracelet_turf))
 	if(dist > 1)
 		to_chat(user, SPAN_BOLDNOTICE("The display on \the [src] lights up: <b>[dist]-[direction]</b>"))
 	else

code/game/objects/items/devices/pinpointer.dm

@@ -31,7 +31,7 @@
 		if(!the_disk)
 			icon_state = "pinonnull"
 			return
-	setDir(get_dir(src,the_disk))
+	setDir(Get_Compass_Dir(src,the_disk))
 	switch(get_dist(src,the_disk))
 		if(0)
 			icon_state = "pinondirect"
@@ -80,7 +80,7 @@
 	if(!location)
 		icon_state = "pinonnull"
 		return
-	setDir(get_dir(src,location))
+	setDir(Get_Compass_Dir(src,location))
 	switch(get_dist(src,location))
 		if(0)
 			icon_state = "pinondirect"
@@ -99,7 +99,7 @@
 	if(!target)
 		icon_state = "pinonnull"
 		return
-	setDir(get_dir(src,target))
+	setDir(Get_Compass_Dir(src,target))
 	switch(get_dist(src,target))
 		if(0)
 			icon_state = "pinondirect"

code/game/objects/items/props/helmetgarb.dm

@@ -502,8 +502,8 @@
 	icon_state = "trimmed_wire"
 
 /obj/item/prop/helmetgarb/bullet_pipe
-	name = "10x99mm XM42B casing pipe"
-	desc = "The XM42B was an experimental weapons platform briefly fielded by the USCM and Wey-Yu PMC teams. It was manufactured by ARMAT systems at the Atlas weapons facility. Unfortunately the project had its funding pulled alongside the M5 integrated gasmask program. This spent casing has been converted into a pipe, but there is too much tar in the mouthpiece for it to be useable."
+	name = "10x99mm XM43E1 casing pipe"
+	desc = "The XM43E1 was an experimental weapons platform briefly fielded by the USCM and Wey-Yu PMC teams. It was manufactured by ARMAT systems at the Atlas weapons facility. Unfortunately the project had its funding pulled alongside the M5 integrated gasmask program. This spent casing has been converted into a pipe, but there is too much tar in the mouthpiece for it to be useable."
 	icon_state = "bullet_pipe"
 
 /obj/item/prop/helmetgarb/chaplain_patch

code/game/objects/structures/extinguisher.dm

@@ -5,13 +5,15 @@
 	icon_state = "extinguisher"
 	anchored = TRUE
 	density = FALSE
-	var/obj/item/tool/extinguisher/has_extinguisher = new/obj/item/tool/extinguisher
+	var/obj/item/tool/extinguisher/has_extinguisher
 	var/opened = 0
 	var/base_icon
 
 /obj/structure/extinguisher_cabinet/Initialize()
 	. = ..()
 	base_icon = initial(icon_state)
+	has_extinguisher = new /obj/item/tool/extinguisher()
+	has_extinguisher.forceMove(src)
 
 /obj/structure/extinguisher_cabinet/lifeboat
 	name = "extinguisher cabinet"
@@ -21,15 +23,15 @@
 /obj/structure/extinguisher_cabinet/alt
 	icon_state = "extinguisher_alt"
 
-/obj/structure/extinguisher_cabinet/attackby(obj/item/O, mob/user)
+/obj/structure/extinguisher_cabinet/attackby(obj/item/item, mob/user)
 	if(isrobot(user))
 		return
-	if(istype(O, /obj/item/tool/extinguisher))
+	if(istype(item, /obj/item/tool/extinguisher))
 		if(!has_extinguisher && opened)
 			user.drop_held_item()
-			contents += O
-			has_extinguisher = O
-			to_chat(user, SPAN_NOTICE("You place [O] in [src]."))
+			item.forceMove(src)
+			has_extinguisher = item
+			to_chat(user, SPAN_NOTICE("You place [item] in [src]."))
 		else
 			opened = !opened
 	else
@@ -45,7 +47,7 @@
 		user.put_in_hands(has_extinguisher)
 		to_chat(user, SPAN_NOTICE("You take [has_extinguisher] from [src]."))
 		has_extinguisher = null
-		opened = 1
+		opened = TRUE
 	else
 		opened = !opened
 	update_icon()

code/game/verbs/who.dm

@@ -160,7 +160,7 @@
 	if(CONFIG_GET(flag/show_manager))
 		LAZYSET(mappings, "<B style='color:purple'>Management</B>", R_PERMISSIONS)
 	if(CONFIG_GET(flag/show_devs))
-		LAZYSET(mappings, "<B style='color:blue'>Maintainers</B>", R_PROFILER)
+		LAZYSET(mappings, "<B style='color:dodgerblue'>Maintainers</B>", R_PROFILER)
 	LAZYSET(mappings, "<B style='color:red'>Admins</B>", R_ADMIN)
 	if(CONFIG_GET(flag/show_mods))
 		LAZYSET(mappings, "<B style='color:orange'>Moderators</B>", R_MOD)

code/modules/client/preferences_gear.dm

@@ -350,7 +350,7 @@ var/global/list/gear_datums_by_name = list()
 	path = /obj/item/prop/helmetgarb/trimmed_wire
 
 /datum/gear/helmet_garb/bullet_pipe
-	display_name = "10x99mm XM42B casing pipe"
+	display_name = "10x99mm XM43E1 casing pipe"
 	path = /obj/item/prop/helmetgarb/bullet_pipe
 	allowed_origins = USCM_ORIGINS
 

code/modules/cm_marines/equipment/mortar/mortars.dm

@@ -314,7 +314,7 @@
 		if(get_turf(M) == target)
 			relative_dir = 0
 		else
-			relative_dir = get_dir(M, target)
+			relative_dir = Get_Compass_Dir(M, target)
 		M.show_message( \
 			SPAN_DANGER("A SHELL IS COMING DOWN [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_VISIBLE, \
 			SPAN_DANGER("YOU HEAR SOMETHING COMING DOWN [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_AUDIBLE \
@@ -324,7 +324,7 @@
 		if(get_turf(M) == target)
 			relative_dir = 0
 		else
-			relative_dir = get_dir(M, target)
+			relative_dir = Get_Compass_Dir(M, target)
 		M.show_message( \
 			SPAN_HIGHDANGER("A SHELL IS ABOUT TO IMPACT [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_VISIBLE, \
 			SPAN_HIGHDANGER("YOU HEAR SOMETHING VERY CLOSE COMING DOWN [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_AUDIBLE \

code/modules/cm_marines/orbital_cannon.dm

@@ -397,7 +397,7 @@ var/list/ob_type_fuel_requirements
 		if(get_turf(M) == target)
 			relative_dir = 0
 		else
-			relative_dir = get_dir(M, target)
+			relative_dir = Get_Compass_Dir(M, target)
 		M.show_message( \
 			SPAN_HIGHDANGER("The sky erupts into flames [SPAN_UNDERLINE(relative_dir ? ("to the " + dir2text(relative_dir)) : "right above you")]!"), SHOW_MESSAGE_VISIBLE, \
 			SPAN_HIGHDANGER("You hear a very loud sound coming from above to the [SPAN_UNDERLINE(relative_dir ? ("to the " + dir2text(relative_dir)) : "right above you")]!"), SHOW_MESSAGE_AUDIBLE \
@@ -408,7 +408,7 @@ var/list/ob_type_fuel_requirements
 		if(get_turf(M) == target)
 			relative_dir = 0
 		else
-			relative_dir = get_dir(M, target)
+			relative_dir = Get_Compass_Dir(M, target)
 		M.show_message( \
 			SPAN_HIGHDANGER("The sky roars louder [SPAN_UNDERLINE(relative_dir ? ("to the " + dir2text(relative_dir)) : "right above you")]!"), SHOW_MESSAGE_VISIBLE, \
 			SPAN_HIGHDANGER("The sound becomes louder [SPAN_UNDERLINE(relative_dir ? ("to the " + dir2text(relative_dir)) : "right above you")]!"), SHOW_MESSAGE_AUDIBLE \

code/modules/cm_marines/overwatch.dm

@@ -205,7 +205,7 @@
 						acting_sl = " (acting SL)"
 					is_squad_leader = TRUE
 				else if(current_turf && (current_turf.z == SL_z))
-					distance = "[get_dist(marine_human, current_squad.squad_leader)] ([dir2text_short(get_dir(current_squad.squad_leader, marine_human))])"
+					distance = "[get_dist(marine_human, current_squad.squad_leader)] ([dir2text_short(Get_Compass_Dir(current_squad.squad_leader, marine_human))])"
 
 
 			switch(marine_human.stat)

code/modules/cm_phone/phone.dm

@@ -26,6 +26,8 @@ GLOBAL_LIST_EMPTY_TYPED(transmitters, /obj/structure/transmitter)
 	var/enabled = TRUE
 	/// Whether or not the phone is receiving calls or not. Varies between on/off or forcibly on/off.
 	var/do_not_disturb = PHONE_DND_OFF
+	/// The Phone_ID of the last person to call this telephone.
+	var/last_caller
 
 	var/base_icon_state
 
@@ -138,6 +140,7 @@ GLOBAL_LIST_EMPTY_TYPED(transmitters, /obj/structure/transmitter)
 	var/list/data = list()
 
 	data["availability"] = do_not_disturb
+	data["last_caller"] = last_caller
 
 	return data
 
@@ -175,6 +178,7 @@ GLOBAL_LIST_EMPTY_TYPED(transmitters, /obj/structure/transmitter)
 
 	calling = T
 	T.caller = src
+	T.last_caller = src.phone_id
 	T.update_icon()
 
 	to_chat(user, SPAN_PURPLE("[icon2html(src, user)] Dialing [calling_phone_id].."))

code/modules/cm_preds/yaut_bracers.dm

@@ -496,7 +496,7 @@
 			if(dist < closest)
 				closest = dist
 				closest_item = tracked_item
-				direction = get_dir(M,loc)
+				direction = Get_Compass_Dir(M,loc)
 				areaLoc = loc
 	for(var/mob/living/carbon/human/Y as anything in GLOB.yautja_mob_list)
 		if(Y.stat != DEAD)
@@ -513,7 +513,7 @@
 			var/dist = get_dist(M,Y)
 			if(dist < closest)
 				closest = dist
-				direction = get_dir(M,Y)
+				direction = Get_Compass_Dir(M,Y)
 				areaLoc = loc
 
 	var/output = FALSE