Merge pull request #874 from Erthilo/master

Silences CentCom report with no auto code blue, fixes ERT headsets, adds a click sounds for empty guns, adds supervisor text for the AI, adds some A17 implants and sprites

code/defines/obj/toy.dm

@@ -110,6 +110,8 @@
 		src.add_fingerprint(user)
 		if (src.bullets < 1)
 			user.show_message("\red *click* *click*", 2)
+			for(var/mob/K in viewers(usr))
+				K << 'empty.ogg'
 			return
 		playsound(user, 'Gunshot.ogg', 100, 1)
 		src.bullets--

code/game/gamemodes/extended/extended.dm

@@ -6,21 +6,17 @@
 	uplink_welcome = "Syndicate Uplink Console:"
 	uplink_uses = 10
 
-// Enable this and the below to have command reports in extended
-//	var/const/waittime_l = 600 //lower bound on time before intercept arrives (in tenths of seconds)
-//	var/const/waittime_h = 1800
+	var/const/waittime_l = 600 //lower bound on time before intercept arrives (in tenths of seconds)
+	var/const/waittime_h = 1800
 
 /datum/game_mode/announce()
 	world << "<B>The current game mode is - Extended Role-Playing!</B>"
 	world << "<B>Just have fun and role-play!</B>"
 
 /datum/game_mode/extended/pre_setup()
-//	setup_sectors()
-//	spawn_exporation_packs()
 	return 1
 
-// Enable this and the above to have command reports in extended
-///datum/game_mode/extended/post_setup()
-//		send_intercept()
-//
-//	..()
+/datum/game_mode/extended/post_setup()
+	spawn (rand(waittime_l, waittime_h)) // To reduce extended meta.
+		send_intercept()
+	..()

code/game/gamemodes/game_mode.dm

@@ -232,11 +232,12 @@ Whitespace:Seperator;"}
 
 			comm.messagetitle.Add("Cent. Com. Status Summary")
 			comm.messagetext.Add(intercepttext)
+	world << sound('commandreport.ogg')
 
-	command_alert("Summary downloaded and printed out at all communications consoles.", "Enemy communication intercept. Security Level Elevated.")
+/*	command_alert("Summary downloaded and printed out at all communications consoles.", "Enemy communication intercept. Security Level Elevated.")
 	world << sound('intercept.ogg')
 	if(security_level < SEC_LEVEL_BLUE)
-		set_security_level(SEC_LEVEL_BLUE)
+		set_security_level(SEC_LEVEL_BLUE)*/
 
 
 /datum/game_mode/proc/get_players_for_role(var/role, override_jobbans=1)

code/game/jobs/job/silicon.dm

@@ -5,6 +5,7 @@
 	faction = "Station"
 	total_positions = 0
 	spawn_positions = 1
+	supervisors = "your laws"
 
 
 	equip(var/mob/living/carbon/human/H)

code/game/objects/devices/flash.dm

@@ -34,6 +34,8 @@
 
 		if(shots_left <= 0)
 			user.show_message("\red *click* *click*", 2)
+			for(var/mob/K in viewers(usr))
+				K << 'empty.ogg'
 			return
 
 		playsound(src.loc, 'flash.ogg', 100, 1)

code/game/objects/items/weapons/implants/implant.dm

@@ -335,4 +335,110 @@ the implant may become unstable and either pre-maturely inject the subject or si
 	implanted(mob/source as mob)
 		src.activation_emote = input("Choose activation emote:") in list("blink", "blink_r", "eyebrow", "chuckle", "twitch_s", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink")
 		source.mind.store_memory("Freedom implant can be activated by using the [src.activation_emote] emote, <B>say *[src.activation_emote]</B> to attempt to activate.", 0, 0)
-		source << "The implanted freedom implant can be activated by using the [src.activation_emote] emote, <B>say *[src.activation_emote]</B> to attempt to activate."
+		source << "The implanted freedom implant can be activated by using the [src.activation_emote] emote, <B>say *[src.activation_emote]</B> to attempt to activate."
+
+/*// --------------------LASERS WORK FROM HERE, AUGMENTATIONS SHIZZLE----------------------
+/obj/item/weapon/implant/augmentation/thermalscanner
+	name = "Thermal Scanner Augmentation"
+	desc = "Makes you see humans through walls"
+
+	get_data()
+		var/dat = {"
+<b>Implant Specifications:</b><BR>
+<b>Name:</b> NanoTrasen Thermal Implant<BR>
+<b>Life:</b> Ten years.<BR>
+<b>Important Notes:</b> Personnel injected with this device tend to be able to see lifeforms through life using thermal.<BR>
+<HR>
+<b>Implant Details:</b><BR>
+<b>Function:</b> Contains a small pod of nanobots that manipulate the host's eye functions.<BR>
+<b>Integrity:</b> Implant will occasionally be degraded by the body's immune system and thus will occasionally malfunction."}
+		return dat
+
+
+	implanted(M as mob)
+		if(istype(M, /mob/living/carbon/human))
+			vision_flags = SEE_MOBS
+			invisa_view = 2
+			usr << "You suddenly start seeing body temperatures of whoever is around you."
+		else
+			usr << "This implant is not compatible!"
+		return
+
+/obj/item/weapon/implant/augmentation/mesonscanner
+	name = "Meson Scanner Augmentation"
+	desc = "Makes you see floor and wall layouts through walls."
+
+	get_data()
+		var/dat = {"
+<b>Implant Specifications:</b><BR>
+<b>Name:</b> NanoTrasen Meson Implant<BR>
+<b>Life:</b> Ten years.<BR>
+<b>Important Notes:</b> Personnel injected with this device tend to be able to see floor and wall layouts through walls.<BR>
+<HR>
+<b>Implant Details:</b><BR>
+<b>Function:</b> Contains a small pod of nanobots that manipulate the host's eye functions.<BR>
+<b>Integrity:</b> Implant will occasionally be degraded by the body's immune system and thus will occasionally malfunction."}
+		return dat
+
+
+	implanted(M as mob)
+		if(istype(M, /mob/living/carbon/human))
+			vision_flags = SEE_TURFS
+			usr << "You suddenly start seeing body temperatures of whoever is around you."
+		else
+			usr << "This implant is not compatible!"
+		return
+
+/obj/item/weapon/implant/augmentation/medicalhud
+	name = "Medical HUD Augmentation"
+	desc = "Makes you see the medical condition of a person."
+
+	get_data()
+		var/dat = {"
+<b>Implant Specifications:</b><BR>
+<b>Name:</b> NanoTrasen Med HUD Implant<BR>
+<b>Life:</b> Ten years.<BR>
+<b>Important Notes:</b> Personnel injected with this device tend to be able to see the medical condition of a person.<BR>
+<HR>
+<b>Implant Details:</b><BR>
+<b>Function:</b> Contains a small pod of nanobots that manipulate the host's eye functions.<BR>
+<b>Integrity:</b> Implant will occasionally be degraded by the body's immune system and thus will occasionally malfunction."}
+		return dat
+
+
+	implanted(M as mob)
+		if(istype(M, /mob/living/carbon/human))
+
+			src.hud = new/obj/item/clothing/glasses/hud/health(src)
+			usr << "You suddenly start seeing body temperatures of whoever is around you."
+		else
+			usr << "This implant is not compatible!"
+		return
+
+/obj/item/weapon/implant/augmentation/securityhud
+	name = "Security HUD Augmentation"
+	desc = "Makes you see the Security standings of a person."
+
+	get_data()
+		var/dat = {"
+<b>Implant Specifications:</b><BR>
+<b>Name:</b> NanoTrasen Sec HUD Implant<BR>
+<b>Life:</b> Ten years.<BR>
+<b>Important Notes:</b> Personnel injected with this device tend to be able to see the security standings of a person.<BR>
+<HR>
+<b>Implant Details:</b><BR>
+<b>Function:</b> Contains a small pod of nanobots that manipulate the host's eye functions.<BR>
+<b>Integrity:</b> Implant will occasionally be degraded by the body's immune system and thus will occasionally malfunction."}
+		return dat
+
+
+	implanted(M as mob)
+		if(istype(M, /mob/living/carbon/human))
+			var/obj/item/clothing/glasses/hud/security/hud = null
+
+			src.hud = new/obj/item/clothing/glasses/hud/security(src)
+
+			usr << "You suddenly start seeing body temperatures of whoever is around you."
+		else
+			usr << "This implant is not compatible!"
+		return*/

code/game/objects/radio/headset.dm

@@ -150,6 +150,8 @@
 /obj/item/device/radio/headset/ert
 	name = "CentCom Response Team headset"
 	desc = "The headset of the boss's boss. Channels are as follows: :h - Response Team :c - command, :s - security, :e - engineering, :d - mining, :q - cargo, :m - medical, :n - science."
+	icon_state = "com_headset"
+	item_state = "headset"
 	freerange = 1
 	keyslot2 = new /obj/item/device/encryptionkey/ert
 

code/game/response_team.dm

@@ -196,7 +196,7 @@ proc/trigger_armed_response_team(var/force = 0)
 /mob/living/carbon/human/proc/equip_strike_team(leader_selected = 0)
 
 	//Special radio setup
-	equip_if_possible(new /obj/item/device/radio/headset/ert, slot_ears)
+	equip_if_possible(new /obj/item/device/radio/headset/ert(src), slot_ears)
 
 	//Adding Camera Network
 	var/obj/machinery/camera/camera = new /obj/machinery/camera(src) //Gives all the commandos internals cameras.

code/modules/projectiles/gun.dm

@@ -162,6 +162,8 @@
 		if(!special_check(user))	return
 		if(!load_into_chamber())
 			user.visible_message("*click click*", "\red <b>*click*</b>")
+			for(var/mob/K in viewers(usr))
+				K << 'empty.ogg'
 			return
 
 		if(!in_chamber)	return
@@ -250,6 +252,8 @@
 					told_cant_shoot = 0
 		else
 			usr.visible_message("*click click*", "\red <b>*click*</b>")
+			for(var/mob/K in viewers(usr))
+				K << 'empty.ogg'
 		var/dir_to_fire = sd_get_approx_dir(M,T)
 		if(dir_to_fire != M.dir)
 			M.dir = dir_to_fire