Merge pull request DDMers#82 from Kmc2000/MISSIONS!!!!

More missions

DS13/code/game/areas.dm

@@ -70,7 +70,15 @@
 	if(L.client && L.client.prefs.toggles & SOUND_SHIP_AMBIENCE)
 		L.client.ambience_playing = 1
 		SEND_SOUND(L, sound(looping_ambience, repeat = 1, wait = 0, volume = 100, channel = CHANNEL_BUZZ)) //DeepSpace13 - engine hum
-
+	if(prob(35))
+		if(!ambientsounds.len)
+			return
+		var/sound = pick(ambientsounds)
+
+		if(!L.client.played)
+			SEND_SOUND(L, sound(sound, repeat = 0, wait = 0, volume = 25, channel = CHANNEL_AMBIENCE))
+			L.client.played = TRUE
+			addtimer(CALLBACK(L.client, /client/proc/ResetAmbiencePlayed), 600)
 
 /area/Exited(atom/movable/M)
 	SEND_SIGNAL(src, COMSIG_AREA_EXITED, M)

DS13/code/game/objects/item_changes.dm

@@ -37,11 +37,31 @@
 	icon = 'DS13/icons/obj/tools.dmi'
 	usesound = 'DS13/sound/effects/items/laser_scalpel.ogg'
 
+/obj/item/screwdriver
+	name = "Phase discriminator"
+	icon = 'DS13/icons/obj/tools.dmi'
+	desc = "A screwdriver like device which allows you to open all kinds of access ports"
+
+/obj/item/screwdriver/Initialize()
+	. = ..()
+	usesound = 'DS13/sound/effects/items/screwdriver.ogg'
+
+/obj/item/weldingtool
+	name = "Plasma welder"
+	icon = 'DS13/icons/obj/tools.dmi'
+	desc = "A powerful welding tool for cutting and mending"
+
 /obj/item/multitool
 	name = "ODN Scanner"
 	desc = "Used for testing isolinear circuitry by sending controlled electrical pulses."
 	icon = 'DS13/icons/obj/tools.dmi'
 
+/obj/item/wirecutters
+	name = "Phase calipers"
+	desc = "These calipers can cut through a lot of things with their inbuilt micro laser."
+	icon = 'DS13/icons/obj/tools.dmi'
+	usesound = 'DS13/sound/effects/items/laser_scalpel.ogg'
+
 /obj/item/defibrillator/compact
 	name = "Cortical stimulator"
 	desc = "A belt mounted device which allows you to resuscitate a patient when applied to the chest."

DS13/code/modules/borg/antag_datum.dm

@@ -17,7 +17,7 @@
 	O.owner = owner
 	objectives += O
 	borgify(owner.current)
-	to_chat(owner.current, "<span class='cult'><font size=3>We are a <B>borg drone</B>! We must help our fellow drones at all costs, and convert 70% of [station_name()]'s crew.</font></span>")
+	to_chat(owner.current, "<font size=6 color=red>We are a <B>borg drone</B>! <br>We must help our fellow drones at all costs, and convert 70% of [station_name()]'s crew.</font>")
 
 /datum/antagonist/borg_drone/on_removal()
 	to_chat(owner.current,  "We are no longer a <font color='red'><B>borg drone</B></font>")
@@ -86,8 +86,8 @@
 	return "(auxiliary subprocessor of [GLOB.borg_collective.name])"
 
 /datum/antagonist/borg_drone/proc/unborgify(mob/living/carbon/human/H = owner.current)
-	H.real_name = initial(H.name)
-	H.name = initial(H.real_name)
+	H.real_name = H.dna.species.random_name()
+	H.name = H.real_name
 	H.underwear = initial(H.underwear)
 	H.skin_tone = initial(H.skin_tone)
 	H.hair_style = initial(H.hair_style)

DS13/code/modules/borg/items+structures.dm

@@ -240,8 +240,8 @@
 	max_integrity = 100
 
 /obj/structure/chair/borg/conversion
-	name = "Assimilation bench"
-	desc = "Submit yourself to the collective"
+	name = "Assimilation chamber"
+	desc = "A horrifying machine used to rob people of their individuality."
 	icon_state = "borg_off"
 	icon = 'DS13/icons/borg/borg.dmi'
 	anchored = TRUE
@@ -273,6 +273,7 @@
 	playsound(loc, 'DS13/sound/effects/borg/machines/convert_table2.ogg', 50, 1, -1)
 	icon_state = "borg_off"
 	M.equipOutfit(/datum/outfit/borg, visualsOnly = FALSE) //Outfit handles name etc.
+	playsound(src.loc, 'DS13/sound/effects/borg/machines/assimilation_chamber.ogg', 100, 0)
 	cut_overlays()
 	overlays -= armoverlay
 	overlays -= armoroverlay

DS13/code/modules/clothing/under/trek.dm

@@ -86,7 +86,8 @@
 	gloves = /obj/item/clothing/gloves/color/black
 	head = null
 	id = /obj/item/card/id
-	ears = /obj/item/radio/headset
+	ears = /obj/item/radio/headset/heads/captain
+	back = /obj/item/storage/backpack/satchel
 
 /datum/outfit/admiral/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	if(visualsOnly)
@@ -138,6 +139,8 @@
 	id = /obj/item/card/id
 	back = /obj/item/storage/backpack/satchel
 	ears = /obj/item/radio/headset/syndicate/alt
+	back = /obj/item/storage/backpack/satchel
+	backpack_contents = list(/obj/item/book/granter/martial/cqc=1)
 
 /datum/outfit/romulan/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	if(visualsOnly)

DS13/code/modules/jobs/job_types/bridge.dm

@@ -23,7 +23,7 @@ Bridge crew
 	uniform = /obj/item/clothing/under/trek/command/ds9
 	accessory = /obj/item/clothing/accessory/ds9_jacket
 	shoes = /obj/item/clothing/shoes/jackboots
-	ears = /obj/item/radio/headset
+	ears = /obj/item/radio/headset/heads/hop
 	id = /obj/item/card/id
 
 /obj/effect/landmark/start/bridge_officer

DS13/code/modules/overmap/ai.dm

@@ -8,6 +8,7 @@
 	var/range = 15 //Firing range.
 	var/list/taunts = list("You will meet your end!", "Death awaits you!", "Fools! How dare you challenge our might!", "We will crush you!", "For the empire!", "Your death will be swift.", "Surrender now, or be destroyed!", "Fools! You will feel our wrath!")
 	var/list/taunt_sounds = list()
+	var/datum/overmap_event/linked_event
 
 /obj/structure/overmap/ai
 	name = "Romulan warbird class light cruiser"
@@ -20,7 +21,6 @@
 	damage = 10 //Will turn into 20 assuming weapons powered
 	AI_enabled = TRUE //Start with an AI by default
 	faction = "romulan" //Placeholder
-	var/datum/overmap_event/linked_event
 	turnspeed = 1.2
 	max_health = 130
 	max_speed = 2 //Slower than every ship.
@@ -155,6 +155,29 @@
 	taunt_sounds = list('DS13/sound/effects/borg/resistanceisfutile.ogg', 'DS13/sound/effects/borg/announce.ogg')
 	weapon_sounds = list('DS13/sound/effects/weapons/borg_cut.ogg')
 
+/obj/structure/overmap/ai/assimilated/cube
+	name = "Assimilation cube"
+	desc = "One of the most terrifying sights in the galaxy. A cube spanning hundreds of miles. It is highly inadvisable to attempt to fight one without weakening it first."
+	icon = 'DS13/icons/overmap/borg_cube.dmi'
+	icon_state = "cube"
+	max_health = 800 //These stats get weakened as people take down its nodes.
+	class = "borg-cube"
+	damage_states = FALSE
+	taunts = list("We are the borg. Lower your shields and surrender your ship.", "Your biological and technological distinctiveness will be added to our own", "Resistance is futile", "Existence as you know it is over", "You will adapt to service us")
+	taunt_sounds = list('DS13/sound/effects/borg/resistanceisfutile.ogg', 'DS13/sound/effects/borg/announce.ogg')
+	weapon_sounds = list('DS13/sound/effects/weapons/borg_cut.ogg')
+	turnspeed = 0.05
+	acceleration = 0.05
+	range = 13
+
+/obj/structure/overmap/ai/assimilated/cube/take_control()
+	. = ..()
+	shield_power = 0
+	engine_power = 1
+	max_weapon_power = 6
+	weapon_power = 6
+	check_power()
+
 /obj/structure/overmap/ai/miranda/take_control()
 	. = ..()
 	engine_power = 0

DS13/code/modules/overmap/combat.dm

@@ -277,7 +277,7 @@
 				continue
 			var/sound/S = pick('DS13/sound/effects/damage/shiphit.ogg','DS13/sound/effects/damage/shiphit2.ogg','DS13/sound/effects/damage/shiphit3.ogg','DS13/sound/effects/damage/shiphit4.ogg','DS13/sound/effects/damage/FTL/explosionfar_2.ogg','DS13/sound/effects/damage/FTL/explosionfar_3.ogg','DS13/sound/effects/damage/FTL/explosionfar_4.ogg','DS13/sound/effects/damage/FTL/explosionfar_5.ogg','DS13/sound/effects/damage/FTL/explosionfar_6.ogg')
 			SEND_SOUND(player, S)
-	for(0 to rand(1,5))
+	for(var/i = 0 to rand(1,5))
 		if(components.len)
 			var/obj/structure/X = pick(components)
 			X.explode_effect()