fixes merge conflict, updates to master

code/game/objects/items/blueprints.dm

@@ -221,6 +221,12 @@
 		A.contents += thing
 		thing.change_area(old_area, A)
 
+	var/area/oldA = get_area(get_turf(usr))
+	var/list/firedoors = oldA.firedoors
+	for(var/door in firedoors)
+		var/obj/machinery/door/firedoor/FD = door
+		FD.CalculateAffectingAreas()
+
 	interact()
 	area_created = TRUE
 	return area_created
@@ -236,6 +242,10 @@
 		return
 	set_area_machinery_title(A,str,prevname)
 	A.name = str
+	if(A.firedoors)
+		for(var/D in A.firedoors)
+			var/obj/machinery/door/firedoor/FD = D
+			FD.CalculateAffectingAreas()
 	to_chat(usr, "<span class='notice'>You rename the '[prevname]' to '[str]'.</span>")
 	interact()
 	return 1

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

@@ -1,192 +0,0 @@
-//copy pasta of the space piano, don't hurt me -Pete
-/obj/item/instrument
-	name = "generic instrument"
-	icon = 'icons/obj/musician.dmi'
-	lefthand_file = 'icons/mob/inhands/equipment/instruments_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/equipment/instruments_righthand.dmi'
-	resistance_flags = FLAMMABLE
-	max_integrity = 100
-	var/datum/song/handheld/song
-	var/instrumentId = "generic"
-	var/instrumentExt = "mid"
-
-/obj/item/instrument/New()
-	song = new(instrumentId, src, instrumentExt)
-	..()
-
-/obj/item/instrument/Destroy()
-	QDEL_NULL(song)
-	return ..()
-
-/obj/item/instrument/suicide_act(mob/user)
-	user.visible_message("<span class='suicide'>[user] begins to play 'Gloomy Sunday'! It looks like [user.p_theyre()] trying to commit suicide!</span>")
-	return BRUTELOSS
-
-/obj/item/instrument/Initialize(mapload)
-	song.tempo = song.sanitize_tempo(song.tempo) // tick_lag isn't set when the map is loaded
-	..()
-
-/obj/item/instrument/attack_self(mob/user)
-	ui_interact(user)
-
-/obj/item/instrument/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1)
-	if(!isliving(user) || user.incapacitated())
-		return
-
-	song.ui_interact(user, ui_key, ui, force_open)
-
-/obj/item/instrument/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state)
-	return song.ui_data(user, ui_key, state)
-
-/obj/item/instrument/Topic(href, href_list)
-	song.Topic(href, href_list)
-
-/obj/item/instrument/violin
-	name = "space violin"
-	desc = "A wooden musical instrument with four strings and a bow. \"The devil went down to space, he was looking for an assistant to grief.\""
-	icon_state = "violin"
-	item_state = "violin"
-	instrumentExt = "ogg"
-	force = 10
-	hitsound = "swing_hit"
-	instrumentId = "violin"
-
-/obj/item/instrument/violin/golden
-	name = "golden violin"
-	desc = "A golden musical instrument with four strings and a bow. \"The devil went down to space, he was looking for an assistant to grief.\""
-	icon_state = "golden_violin"
-	item_state = "golden_violin"
-	resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
-
-/obj/item/instrument/piano_synth
-	name = "synthesizer"
-	desc = "An advanced electronic synthesizer that can be used as various instruments."
-	icon_state = "synth"
-	item_state = "synth"
-	instrumentId = "piano"
-	instrumentExt = "ogg"
-	var/static/list/insTypes = list("accordion" = "mid", "glockenspiel" = "mid", "guitar" = "ogg", "eguitar" = "ogg", "harmonica" = "mid", "piano" = "ogg", "recorder" = "mid", "saxophone" = "mid", "trombone" = "mid", "violin" = "ogg", "xylophone" = "mid")
-	actions_types = list(/datum/action/item_action/synthswitch)
-
-/obj/item/instrument/piano_synth/proc/changeInstrument(name = "piano")
-	song.instrumentDir = name
-	song.instrumentExt = insTypes[name]
-
-/obj/item/instrument/guitar
-	name = "guitar"
-	desc = "It's made of wood and has bronze strings."
-	icon_state = "guitar"
-	item_state = "guitar"
-	instrumentExt = "ogg"
-	force = 10
-	attack_verb = list("played metal on", "serenaded", "crashed", "smashed")
-	hitsound = 'sound/effects/guitarsmash.ogg'
-	instrumentId = "guitar"
-
-/obj/item/instrument/eguitar
-	name = "electric guitar"
-	desc = "Makes all your shredding needs possible."
-	icon_state = "eguitar"
-	item_state = "eguitar"
-	instrumentExt = "ogg"
-	force = 12
-	attack_verb = list("played metal on", "shredded", "crashed", "smashed")
-	hitsound = 'sound/weapons/stringsmash.ogg'
-	instrumentId = "eguitar"
-
-/obj/item/instrument/glockenspiel
-	name = "glockenspiel"
-	desc = "Smooth metal bars perfect for any marching band."
-	icon_state = "glockenspiel"
-	item_state = "glockenspiel"
-	instrumentId = "glockenspiel"
-
-/obj/item/instrument/accordion
-	name = "accordion"
-	desc = "Pun-Pun not included."
-	icon_state = "accordion"
-	item_state = "accordion"
-	instrumentId = "accordion"
-
-/obj/item/instrument/saxophone
-	name = "saxophone"
-	desc = "This soothing sound will be sure to leave your audience in tears."
-	icon_state = "saxophone"
-	item_state = "saxophone"
-	instrumentId = "saxophone"
-
-/obj/item/instrument/trombone
-	name = "trombone"
-	desc = "How can any pool table ever hope to compete?"
-	icon_state = "trombone"
-	item_state = "trombone"
-	instrumentId = "trombone"
-
-/obj/item/instrument/recorder
-	name = "recorder"
-	desc = "Just like in school, playing ability and all."
-	icon_state = "recorder"
-	item_state = "recorder"
-	instrumentId = "recorder"
-
-/obj/item/instrument/harmonica
-	name = "harmonica"
-	desc = "For when you get a bad case of the space blues."
-	icon_state = "harmonica"
-	item_state = "harmonica"
-	instrumentId = "harmonica"
-	force = 5
-	w_class = WEIGHT_CLASS_SMALL
-
-/obj/item/instrument/xylophone
-	name = "xylophone"
-	desc = "a percussion instrument with a bright tone."
-	icon_state = "xylophone"
-	item_state = "xylophone"
-	instrumentId = "xylophone"
-
-/obj/item/instrument/bikehorn
-	name = "gilded bike horn"
-	desc = "An exquisitely decorated bike horn, capable of honking in a variety of notes."
-	icon_state = "bike_horn"
-	item_state = "bike_horn"
-	lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/items_righthand.dmi'
-	attack_verb = list("beautifully honks")
-	instrumentId = "bikehorn"
-	instrumentExt = "ogg"
-	w_class = WEIGHT_CLASS_TINY
-	force = 0
-	throw_speed = 3
-	throw_range = 7
-	hitsound = 'sound/items/bikehorn.ogg'
-
-/datum/crafting_recipe/violin
-	name = "Violin"
-	result = /obj/item/instrument/violin
-	reqs = list(/obj/item/stack/sheet/wood = 5,
-				/obj/item/stack/cable_coil = 6,
-				/obj/item/stack/tape_roll = 5)
-	tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
-	time = 80
-	category = CAT_MISC
-
-/datum/crafting_recipe/guitar
-	name = "Guitar"
-	result = /obj/item/instrument/guitar
-	reqs = list(/obj/item/stack/sheet/wood = 5,
-				/obj/item/stack/cable_coil = 6,
-				/obj/item/stack/tape_roll = 5)
-	tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
-	time = 80
-	category = CAT_MISC
-
-/datum/crafting_recipe/eguitar
-	name = "Electric Guitar"
-	result = /obj/item/instrument/eguitar
-	reqs = list(/obj/item/stack/sheet/metal = 5,
-				/obj/item/stack/cable_coil = 6,
-				/obj/item/stack/tape_roll = 5)
-	tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
-	time = 80
-	category = CAT_MISC

code/game/objects/items/devices/radio/intercom.dm

@@ -186,10 +186,10 @@
 	update_icon()
 	START_PROCESSING(SSobj, src)
 	for(var/i, i<= 5, i++)
-		wires.UpdateCut(i,1)
+		wires.on_cut(i, 1)
 
 /obj/item/radio/intercom/wirecutter_act(mob/user, obj/item/I)
-	if(!(buildstage == 3 && b_stat && wires.IsAllCut()))
+	if(!(buildstage == 3 && b_stat && wires.is_all_cut()))
 		return
 	. = TRUE
 	if(!I.use_tool(src, user, 0, volume = I.tool_volume))
@@ -270,4 +270,4 @@
 
 /obj/item/radio/intercom/locked/prison/New()
 	..()
-	wires.CutWireIndex(RADIO_WIRE_TRANSMIT)
+	wires.cut(WIRE_RADIO_TRANSMIT)

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

@@ -76,6 +76,7 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
 	GLOB.global_radios |= src
 
 /obj/item/radio/Destroy()
+	SStgui.close_uis(wires)
 	QDEL_NULL(wires)
 	if(SSradio)
 		SSradio.remove_object(src, frequency)
@@ -127,8 +128,8 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
 	data["freq"] = format_frequency(frequency)
 	data["rawfreq"] = num2text(frequency)
 
-	data["mic_cut"] = (wires.IsIndexCut(RADIO_WIRE_TRANSMIT) || wires.IsIndexCut(RADIO_WIRE_SIGNAL))
-	data["spk_cut"] = (wires.IsIndexCut(RADIO_WIRE_RECEIVE) || wires.IsIndexCut(RADIO_WIRE_SIGNAL))
+	data["mic_cut"] = (wires.is_cut(WIRE_RADIO_TRANSMIT) || wires.is_cut(WIRE_RADIO_SIGNAL))
+	data["spk_cut"] = (wires.is_cut(WIRE_RADIO_RECEIVER) || wires.is_cut(WIRE_RADIO_SIGNAL))
 
 	var/list/chanlist = list_channels(user)
 	if(islist(chanlist) && chanlist.len)
@@ -184,10 +185,10 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
 	return can_admin_interact()
 
 /obj/item/radio/proc/ToggleBroadcast()
-	broadcasting = !broadcasting && !(wires.IsIndexCut(RADIO_WIRE_TRANSMIT) || wires.IsIndexCut(RADIO_WIRE_SIGNAL))
+	broadcasting = !broadcasting && !(wires.is_cut(WIRE_RADIO_TRANSMIT) || wires.is_cut(WIRE_RADIO_SIGNAL))
 
 /obj/item/radio/proc/ToggleReception()
-	listening = !listening && !(wires.IsIndexCut(RADIO_WIRE_RECEIVE) || wires.IsIndexCut(RADIO_WIRE_SIGNAL))
+	listening = !listening && !(wires.is_cut(WIRE_RADIO_RECEIVER) || wires.is_cut(WIRE_RADIO_SIGNAL))
 
 /obj/item/radio/Topic(href, href_list)
 	if(..())
@@ -334,7 +335,7 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
 
 	//  Uncommenting this. To the above comment:
 	// 	The permacell radios aren't suppose to be able to transmit, this isn't a bug and this "fix" is just making radio wires useless. -Giacom
-	if(wires.IsIndexCut(RADIO_WIRE_TRANSMIT)) // The device has to have all its wires and shit intact
+	if(wires.is_cut(WIRE_RADIO_TRANSMIT)) // The device has to have all its wires and shit intact
 		return 0
 
 	if(!M.IsVocal())
@@ -515,7 +516,7 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
 	var/is_listening = TRUE
 	if(!on)
 		is_listening = FALSE
-	if(!wires || wires.IsIndexCut(RADIO_WIRE_RECEIVE))
+	if(!wires || wires.is_cut(WIRE_RADIO_RECEIVER))
 		is_listening = FALSE
 	if(!listening)
 		is_listening = FALSE

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

@@ -72,8 +72,7 @@ REAGENT SCANNER
 						var/turf/U = O.loc
 						if(U && U.intact)
 							O.invisibility = 101
-				if(O)
-					O.alpha = 255
+						O.alpha = 255
 		for(var/mob/living/M in T.contents)
 			var/oldalpha = M.alpha
 			if(M.alpha < 255 && istype(M))

code/game/objects/items/flag.dm

@@ -251,6 +251,7 @@
 		message_admins("[key_name_admin(user)] has lit the [src] trapped with [boobytrap] by [key_name_admin(trapper)] at <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[bombturf.x];Y=[bombturf.y];Z=[bombturf.z]'>[A.name] (JMP)</a>.")
 		log_game("[key_name_admin(user)] has lit the [src] trapped with [boobytrap] by [key_name_admin(trapper)] at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]).")
 		investigate_log("[key_name_admin(user)] has lit the [src] trapped with [boobytrap] by [key_name_admin(trapper)] at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]).", INVESTIGATE_BOMB)
+		burn()
 	else
 		return ..()
 
@@ -267,8 +268,16 @@
 
 /obj/item/flag/chameleon/burn()
 	if(boobytrap)
-		boobytrap.prime()
-	..()
+		fire_act()
+		addtimer(CALLBACK(src, .proc/prime_boobytrap), boobytrap.det_time)
+	else
+		..()
+
+/obj/item/flag/chameleon/proc/prime_boobytrap()
+	boobytrap.forceMove(get_turf(loc))
+	boobytrap.prime()
+	boobytrap = null
+	burn()
 
 /obj/item/flag/chameleon/updateFlagIcon()
 	icon_state = updated_icon_state

code/game/objects/items/weapons/garrote.dm

@@ -104,7 +104,7 @@
 	playsound(src.loc, 'sound/weapons/cablecuff.ogg', 15, 1, -1)
 
 	M.visible_message("<span class='danger'>[U] comes from behind and begins garroting [M] with the [src]!</span>", \
-				  "<span class='userdanger'>[U]\ begins garroting you with the [src]![improvised ? "" : " You are unable to speak!"]</span>", \
+				  "<span class='userdanger'>[U] begins garroting you with the [src]![improvised ? "" : " You are unable to speak!"]</span>", \
 				  "You hear struggling and wire strain against flesh!")
 
 	return

code/game/objects/items/weapons/grenades/smokebomb.dm

@@ -19,7 +19,7 @@
 
 /obj/item/grenade/smokebomb/prime()
 	playsound(src.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
-	src.smoke.set_up(10, 0, usr.loc)
+	smoke.set_up(10, 0)
 	spawn(0)
 		src.smoke.start()
 		sleep(10)

code/game/objects/items/weapons/storage/backpack.dm

@@ -372,6 +372,15 @@
 	new /obj/item/ammo_box/magazine/m12g/buckshot(src)
 	new /obj/item/ammo_box/magazine/m12g/dragon(src)
 
+/obj/item/storage/backpack/duffel/syndie/ammo/shotgunXLmags
+	desc = "A large duffelbag, containing three types of extended drum magazines."
+
+/obj/item/storage/backpack/duffel/syndie/ammo/shotgunXLmags/New()
+	..()
+	new /obj/item/ammo_box/magazine/m12g/XtrLrg(src)
+	new /obj/item/ammo_box/magazine/m12g/XtrLrg/buckshot(src)
+	new /obj/item/ammo_box/magazine/m12g/XtrLrg/dragon(src)
+
 /obj/item/storage/backpack/duffel/mining_conscript/
 	name = "mining conscription kit"
 	desc = "A kit containing everything a crewmember needs to support a shaft miner in the field."

code/game/objects/items/weapons/storage/bags.dm

@@ -380,12 +380,13 @@
 	w_class = WEIGHT_CLASS_BULKY
 	flags = CONDUCT
 	materials = list(MAT_METAL=3000)
+	cant_hold = list(/obj/item/disk/nuclear) // Prevents some cheesing
 
-/obj/item/storage/bag/tray/attack(mob/living/M as mob, mob/living/user as mob)
+/obj/item/storage/bag/tray/attack(mob/living/M, mob/living/user)
 	..()
 	// Drop all the things. All of them.
 	var/list/obj/item/oldContents = contents.Copy()
-	quick_empty()
+	drop_inventory(user)
 
 	// Make each item scatter a bit
 	for(var/obj/item/I in oldContents)

code/game/objects/items/weapons/storage/storage.dm

@@ -438,8 +438,11 @@
 	if((!ishuman(usr) && (src.loc != usr)) || usr.stat || usr.restrained())
 		return
 
+	drop_inventory(usr)
+
+/obj/item/storage/proc/drop_inventory(user)
 	var/turf/T = get_turf(src)
-	hide_from(usr)
+	hide_from(user)
 	for(var/obj/item/I in contents)
 		remove_from_storage(I, T)
 		CHECK_TICK
@@ -499,10 +502,9 @@
 
 /obj/item/storage/attack_self(mob/user)
 
-	//Clicking on itself will empty it, if it has the verb to do that.
-	if(user.is_in_active_hand(src))
-		if(verbs.Find(/obj/item/storage/verb/quick_empty))
-			quick_empty()
+	//Clicking on itself will empty it, if allow_quick_empty is TRUE
+	if(allow_quick_empty && user.is_in_active_hand(src))
+		drop_inventory(user)
 
 //Returns the storage depth of an atom. This is the number of storage items the atom is contained in before reaching toplevel (the area).
 //Returns -1 if the atom was not found on container.

code/game/objects/items/weapons/tanks/tanks.dm

@@ -43,35 +43,31 @@
 /obj/item/tank/proc/toggle_internals(mob/user, silent = FALSE)
 	var/mob/living/carbon/C = user
 	if(!istype(C))
-		return 0
+		return FALSE
 
 	if(C.internal == src)
 		to_chat(C, "<span class='notice'>You close \the [src] valve.</span>")
 		C.internal = null
 	else
-		var/can_open_valve = 0
-		if(C.get_organ_slot("breathing_tube"))
-			can_open_valve = 1
-		else if(C.wear_mask && C.wear_mask.flags & AIRTIGHT)
-			can_open_valve = 1
-		else if(ishuman(C))
-			var/mob/living/carbon/human/H = C
-			if(H.head && H.head.flags & AIRTIGHT)
-				can_open_valve = 1
+		if(!C.get_organ_slot("breathing_tube")) // Breathing tubes can always use internals, if they have one, skip ahead and turn internals on/off
+			if(!C.wear_mask) // Do we have a mask equipped?
+				return FALSE
 
-		if(can_open_valve)
+			var/obj/item/clothing/mask/M = C.wear_mask
+			// If the "mask" isn't actually a mask OR That mask isn't internals compatible AND Their headgear isn't internals compatible
+			if(!istype(M) || (!(initial(M.flags) & AIRTIGHT) && !(C.head.flags & AIRTIGHT)))
+				if(!silent)
+					to_chat(C, "<span class='warning'>You are not wearing a suitable mask or helmet.</span>")
+				return FALSE
+			if(M.mask_adjusted) // If the mask is equipped but pushed down
+				M.adjustmask(C) // Adjust it back
+
+		if(!silent)
 			if(C.internal)
-				if(!silent)
-					to_chat(C, "<span class='notice'>You switch your internals to [src].</span>")
+				to_chat(C, "<span class='notice'>You switch your internals to [src].</span>")
 			else
-				if(!silent)
-					to_chat(C, "<span class='notice'>You open \the [src] valve.</span>")
-			C.internal = src
-		else
-			if(!silent)
-				to_chat(C, "<span class='notice'>You are not wearing a suitable mask or helmet.</span>")
-			return 0
-
+				to_chat(C, "<span class='notice'>You open \the [src] valve.</span>")
+		C.internal = src
 	C.update_action_buttons_icon()