Merge pull request #20 from Aurorastation/master

Title

code/controllers/configuration.dm

@@ -104,7 +104,7 @@
 	var/health_threshold_dead = -100
 
 	var/organ_health_multiplier = 1
-	var/organ_regeneration_multiplier = 1
+	var/organ_regeneration_multiplier = 0
 
 	var/bones_can_break = 0
 	var/limbs_can_break = 0

code/game/machinery/telecomms/traffic_control.dm

@@ -15,7 +15,7 @@
 	var/list/viewingcode = list()
 	var/obj/machinery/telecomms/server/SelectedServer
 
-	var/network = "NULL"		// the network to probe
+	var/network = "tcommsat"		// the network to probe
 	var/temp = ""				// temporary feedback messages
 
 	var/storedcode = ""			// code stored

code/modules/clothing/head/helmet.dm

@@ -19,6 +19,12 @@
 	icon_state = "policehelm"
 	flags_inv = 0
 
+/obj/item/clothing/head/helmet/secfcap
+	name = "officer's cap"
+	desc = "A security officer's cap."
+	icon_state = "officercap"
+	flags_inv = 0
+
 /obj/item/clothing/head/helmet/riot
 	name = "riot helmet"
 	desc = "It's a helmet specifically designed to protect against close range attacks."

code/modules/clothing/suits/armor.dm

@@ -32,6 +32,11 @@
 	icon_state = "warden_jacket"
 	item_state = "armor"
 
+/obj/item/clothing/suit/armor/vest/warden/jacket
+	name = "Warden's jacket"
+	desc = "An armoured jacket with silver rank pips and livery."
+	icon_state = "formal_warden"
+	item_state = "formal_warden"
 
 /obj/item/clothing/suit/armor/riot
 	name = "Riot Suit"

code/modules/clothing/under/jobs/security.dm

@@ -58,6 +58,16 @@
 	item_state = "warden_corporate"
 	item_color = "warden_corporate"
 
+/obj/item/clothing/under/rank/security/formal
+	icon_state = "sec_f"
+	item_state = "sec_f"
+	item_color = "sec_f"
+
+/obj/item/clothing/under/rank/warden/formal
+	icon_state = "warden_f"
+	item_state = "warden_f"
+	item_color = "warden_f"
+
 /obj/item/clothing/under/tactical
 	name = "tactical jumpsuit"
 	desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for robust protection."
@@ -128,6 +138,11 @@
 	item_state = "hos_corporate"
 	item_color = "hos_corporate"
 
+/obj/item/clothing/under/rank/head_of_security/formal
+	icon_state = "hos_f"
+	item_state = "hos_f"
+	item_color = "hos_f"
+
 /obj/item/clothing/head/helmet/HoS
 	name = "Head of Security Hat"
 	desc = "The hat of the Head of Security. For showing the officers who's in charge."
@@ -156,6 +171,11 @@
 	flags_inv = 0
 	siemens_coefficient = 0.6
 
+/obj/item/clothing/suit/armor/hos/formal
+	name = "Head of Security's jacket"
+	desc = "An armoured jacket with golden rank pips and livery."
+	icon_state = "formal_hos"
+	item_state = "formal_hos"
 
 /obj/item/clothing/head/helmet/HoS/dermal
 	name = "Dermal Armour Patch"

code/modules/mob/hear_say.dm

@@ -71,9 +71,13 @@
 		return
 
 	var/track = null
-
+	var/speaker_name
 	var/style = "body"
 
+	if(!language)
+		language = new /datum/language/common
+//	if(!speaker)
+
 	//non-verbal languages are garbled if you can't see the speaker. Yes, this includes if they are inside a closet.
 	if (language && (language.flags & NONVERBAL))
 		if (!speaker || (src.sdisabilities & BLIND || src.blinded) || !(speaker in view(src)))
@@ -94,13 +98,13 @@
 
 	if(hard_to_hear)
 		message = stars(message)
-
-	var/speaker_name = speaker.name
+	if(speaker)
+		speaker_name = speaker.name
 
 	if(vname)
 		speaker_name = vname
 
-	if(istype(speaker, /mob/living/carbon/human))
+	if(speaker && (istype(speaker, /mob/living/carbon/human)))
 		var/mob/living/carbon/human/H = speaker
 		if(H.voice)
 			speaker_name = H.voice
@@ -114,7 +118,7 @@
 		var/jobname // the mob's "job"
 		var/mob/living/carbon/human/impersonating //The crewmember being impersonated, if any.
 
-		if (ishuman(speaker))
+		if (speaker && (ishuman(speaker)))
 			var/mob/living/carbon/human/H = speaker
 
 			if((H.wear_id && istype(H.wear_id,/obj/item/weapon/card/id/syndicate)) && (H.wear_mask && istype(H.wear_mask,/obj/item/clothing/mask/gas/voice)))

data/investigate/gravity.html

@@ -1,6 +1,22 @@
-<small>04:09 [0x20078fb] (92,152,1)</small> || the gravitational generator has regained power.<br>
-<small>04:09 [0x20078fb] (92,152,1)</small> || the gravitational generator is now charging.<br>
-<small>04:10 [0x20078fb] (92,152,1)</small> || the gravitational generator has regained power.<br>
-<small>04:10 [0x20078fb] (92,152,1)</small> || the gravitational generator is now charging.<br>
-<small>04:10 [0x20078fb] (92,152,1)</small> || the gravitational generator has regained power.<br>
-<small>04:10 [0x20078fb] (92,152,1)</small> || the gravitational generator is now charging.<br>
+<small>03:56 [0x20078f6] (92,152,1)</small> || the gravitational generator has regained power.<br>
+<small>03:56 [0x20078f6] (92,152,1)</small> || the gravitational generator is now charging.<br>
+<small>03:56 [0x20078f6] (92,152,1)</small> || the gravitational generator has regained power.<br>
+<small>03:56 [0x20078f6] (92,152,1)</small> || the gravitational generator is now charging.<br>
+<small>03:56 [0x20078f6] (92,152,1)</small> || the gravitational generator has regained power.<br>
+<small>03:56 [0x20078f6] (92,152,1)</small> || the gravitational generator is now charging.<br>
+<small>04:01 [0x20078f6] (92,152,1)</small> || the gravitational generator has regained power.<br>
+<small>04:01 [0x20078f6] (92,152,1)</small> || the gravitational generator is now charging.<br>
+<small>04:06 [0x20078f6] (92,152,1)</small> || the gravitational generator has regained power.<br>
+<small>04:06 [0x20078f6] (92,152,1)</small> || the gravitational generator is now charging.<br>
+<small>04:11 [0x20078f6] (92,152,1)</small> || the gravitational generator has regained power.<br>
+<small>04:11 [0x20078f6] (92,152,1)</small> || the gravitational generator is now charging.<br>
+<small>04:16 [0x20078f6] (92,152,1)</small> || the gravitational generator has regained power.<br>
+<small>04:16 [0x20078f6] (92,152,1)</small> || the gravitational generator is now charging.<br>
+<small>04:21 [0x20078f6] (92,152,1)</small> || the gravitational generator has regained power.<br>
+<small>04:21 [0x20078f6] (92,152,1)</small> || the gravitational generator is now charging.<br>
+<small>04:26 [0x20078f6] (92,152,1)</small> || the gravitational generator has regained power.<br>
+<small>04:26 [0x20078f6] (92,152,1)</small> || the gravitational generator is now charging.<br>
+<small>04:31 [0x20078f6] (92,152,1)</small> || the gravitational generator has regained power.<br>
+<small>04:31 [0x20078f6] (92,152,1)</small> || the gravitational generator is now charging.<br>
+<small>04:36 [0x20078f6] (92,152,1)</small> || the gravitational generator has regained power.<br>
+<small>04:36 [0x20078f6] (92,152,1)</small> || the gravitational generator is now charging.<br>

html/changelog.html

@@ -56,6 +56,23 @@ should be listed in the changelog upon commit though. Thanks. -->
 
 <!-- DO NOT REMOVE, MOVE, OR COPY THIS COMMENT! THIS MUST BE THE LAST NON-EMPTY LINE BEFORE THE LOGS #ADDTOCHANGELOGMARKER# -->
 
+<div class='commit sansserif'>
+	<h2 class='date'>22 January 2015</h2>
+	<h3 class='author'>SoundScopes updated:</h3>
+	<ul class='changes bgimages16'>
+		<li class='rscadd'>Mutiny Mode</li>
+		<li class='rscadd'>New IDs and PDAs for testing/opinions</li>
+		<li class='rscadd'>New Z-level 2 layout</li>
+		<li class='rscdel'>Organ Failure event</li>
+		<li class='tweak'>Detective and Forensic Tech access unclustered</li>
+		<li class='tweak'>Automatic Healing tweaked</li>
+		<li class='bugfix'>Custom Item Spawning fixed to issue out multiple items again</li>
+		<li class='bugfix'>TeleCommunications code fixes</li>
+		<li class='bugfix'>Vox shuttle has more N2 tiles</li>
+	</ul>
+</div>
+
+
 <div class='commit sansserif'>
 	<h2 class='date'>21 January 2015</h2>
 	<h3 class='author'>SoundScopes updated:</h3>