Merge pull request #1785 from comma/master

Sparks and some fixes.

baystation12.dme

@@ -966,10 +966,10 @@
 #include "code\modules\critters\critter_defenses.dm"
 #include "code\modules\critters\critters.dm"
 #include "code\modules\critters\hivebots\hivebot.dm"
-#include "code\modules\detectivework\detective_work.dm"
-#include "code\modules\detectivework\evidence.dm"
-#include "code\modules\detectivework\footprints_and_rag.dm"
-#include "code\modules\detectivework\scanner.dm"
+#include "code\modules\DetectiveWork\detective_work.dm"
+#include "code\modules\DetectiveWork\evidence.dm"
+#include "code\modules\DetectiveWork\footprints_and_rag.dm"
+#include "code\modules\DetectiveWork\scanner.dm"
 #include "code\modules\flufftext\Dreaming.dm"
 #include "code\modules\flufftext\Hallucination.dm"
 #include "code\modules\flufftext\TextFilters.dm"

code/game/machinery/doors/airlock.dm

@@ -828,7 +828,15 @@ About the new airlock wires panel:
 			src.aiHacking = 0
 			src.attack_ai(user)
 
-
+/obj/machinery/door/airlock/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
+	if (src.isElectrified())
+		if (istype(mover, /obj/item))
+			var/obj/item/i = mover
+			if (i.m_amt)
+				var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+				s.set_up(5, 1, src)
+				s.start()
+	return ..()
 /obj/machinery/door/airlock/attack_paw(mob/user as mob)
 	return src.attack_hand(user)
 

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

@@ -210,7 +210,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
 	if (!connection)
 		return
 
-	Broadcast_Message(connection, new /mob/living/silicon/ai(src),
+	Broadcast_Message(connection, new /mob/living/silicon/ai(src,null,null,1),
 						0, "*garbled automated announcement*", src,
 						message, from, "Automated Announcement", from, "synthesized voice",
 						4, 0, 1)

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -176,6 +176,8 @@
 		new /obj/item/clothing/under/det(src)
 		new /obj/item/clothing/suit/armor/det_suit(src)
 		new /obj/item/clothing/suit/det_suit(src)
+		new /obj/item/clothing/suit/forensics/blue(src)
+		new /obj/item/clothing/suit/forensics/red(src)
 		new /obj/item/clothing/gloves/black(src)
 		new /obj/item/clothing/head/det_hat(src)
 		new /obj/item/clothing/shoes/brown(src)

code/game/objects/structures/grille.dm

@@ -101,6 +101,16 @@
 			if (istype(mover, /obj/item/projectile))
 				return prob(30)
 			else
+				var/turf/T = get_turf(src)
+				var/obj/structure/cable/C = T.get_cable_node()
+				if(C)
+					if (C.powernet.avail)
+						if (istype(mover, /obj/item))
+							var/obj/item/i = mover
+							if (i.m_amt)
+								var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+								s.set_up(5, 1, src)
+								s.start()
 				return !src.density
 
 

code/modules/assembly/igniter.dm

@@ -14,6 +14,9 @@
 		if(!..())	return 0//Cooldown check
 		var/turf/location = get_turf(loc)
 		if(location)	location.hotspot_expose(1000,1000)
+		var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+		s.set_up(3, 1, src)
+		s.start()
 		return 1
 
 

code/modules/clothing/suits/jobs.dm

@@ -66,6 +66,25 @@
 	allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/cigpacket,/obj/item/weapon/lighter,/obj/item/device/detective_scanner,/obj/item/device/taperecorder)
 	armor = list(melee = 50, bullet = 10, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
 
+//Forensics
+/obj/item/clothing/suit/forensics
+	name = "jacket"
+	desc = "A forensics technician jacket."
+	item_state = "det_suit"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+	allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/cigpacket,/obj/item/weapon/lighter,/obj/item/device/detective_scanner,/obj/item/device/taperecorder)
+	armor = list(melee = 10, bullet = 10, laser = 15, energy = 10, bomb = 0, bio = 0, rad = 0)
+
+/obj/item/clothing/suit/forensics/red
+	name = "red jacket"
+	desc = "A red forensics technician jacket."
+	icon_state = "forensics_red"
+
+/obj/item/clothing/suit/forensics/blue
+	name = "blue jacket"
+	desc = "A blue forensics technician jacket."
+	icon_state = "forensics_blue"
+
 //Engineering
 /obj/item/clothing/suit/hazardvest
 	name = "hazard vest"

code/modules/mob/living/carbon/human/life.dm

@@ -1052,7 +1052,8 @@
 
 			if(stuttering)
 				stuttering = max(stuttering-1, 0)
-
+			if (src.slurring)
+				stuttering = max(slurring-1, 0)
 			if(silent)
 				silent = max(silent-1, 0)
 

code/modules/mob/new_player/new_player.dm

@@ -368,13 +368,16 @@
 
 	proc/AnnounceArrival(var/mob/living/carbon/human/character, var/rank)
 		if (ticker.current_state == GAME_STATE_PLAYING)
-			var/mob/living/silicon/ai/announcer = new (null,null,null,1)
 			var/obj/item/device/radio/intercom/a = new /obj/item/device/radio/intercom(null)// BS12 EDIT Arrivals Announcement Computer, rather than the AI.
+			a.autosay("\"[character.real_name],[character.wear_id.assignment ? " [character.wear_id.assignment]," : "" ] has arrived on the station.\"", "Arrivals Announcement Computer")
+			del(a)
+			/*
+			var/mob/living/silicon/ai/announcer = new (null)
 			announcer.name = "Arrivals Announcement Computer"
 			announcer.real_name = "Arrivals Announcement Computer"
 			a.autosay("\"[character.real_name],[character.wear_id.assignment ? " [character.wear_id.assignment]," : "" ] has arrived on the station.\"", announcer)
-			del(a)
 			del(announcer)
+			*/
 
 	proc/LateChoices()
 		var/mills = world.time // 1/10 of a second, not real milliseconds but whatever

code/modules/mob/new_player/sprite_accessories.dm

@@ -63,10 +63,22 @@
 		name = "Shoulder-length Hair"
 		icon_state = "hair_b"
 
+	longalt
+		name = "Shoulder-length Hair Alt"
+		icon_state = "hair_longfringe"
+
+	longish
+		name = "Longer Hair"
+		icon_state = "hair_b2"
+
 	longer
 		name = "Long Hair"
 		icon_state = "hair_vlong"
 
+	longeralt
+		name = "Long Hair Alt"
+		icon_state = "hair_vlongfringe"
+
 	longest
 		name = "Very Long Hair"
 		icon_state = "hair_longest"

code/modules/reagents/Chemistry-Reagents.dm

@@ -1639,7 +1639,7 @@ datum
 				if(!M) M = holder.my_atom
 				M.dizziness = 0
 				M.drowsyness = 0
-				M.stuttering = 0
+				M.slurring = 0
 				M.confused = 0
 				..()
 				return

html/changelog.html

@@ -57,22 +57,26 @@ should be listed in the changelog upon commit though. Thanks. -->
 
 <!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
 <div class="commit sansserif">
-	<h2 class="date">October 17th, 2012</h2>
+
+
+	<h2 class="date">17.10.2012</h2>
 	<h3 class="author">CIB updated:</h3>
 	<ul class="changes bgimages16">
 		<li class="rscadd">Ported limb selection on startup. Note that this may still be bugged, so use at own risk.</li>
         <li class="tweak">You can now select opposite gender hairstyles.</li>
 	</ul>
+	<h3 class="author">Chinsky updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="bugfix">Fixed arrivals announcment.</li>
+		<li class="bugfix">Slur will properly fade away with time now.</li>
+		<li class="bugfix">Anti-alco chem will get rid of slur now.</li>
+		<li class="tweak">Throwing metal item at eletrified grilles and doors will cause them to spark.</li>
+		<li class="rscadd">Added forensics tech jackets.</li>
+		<li class="rscadd">Ported some hairstyles from pre-merge code.</li>
+	</ul>
 </div>
 
 <div class="commit sansserif">
-	<h2 class="date">15.10.2012</h2>
-	<h3 class="author">Chinsky updated:</h3>
-	<ul class="changes bgimages16">
-		<li class="rscadd">Ported over surgery procedures (face surgery and bone surgery). Re-added delays on surgery steps. !!WARNING!! almost all surgery steps now damage patient if interrupted (user moved or changed active hand between starting message and ending message), so be careful.</li>
-		<li class="tweak">Now only cuting wounds and really bad blunt ones (>20 damage) will cause bleeding</li>
-	</ul>
-</div>
 
 <div class="commit sansserif">
 	<h2 class="date">October 13th, 2012</h2>