diff --git a/baystation12.dme b/baystation12.dme
index c434c879694..9e06a9bd13d 100644
--- a/baystation12.dme
+++ b/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"
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 716d05ae1b8..86e4b25cf72 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/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)
diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index f270b5a214b..c3144088e9f 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/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)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index 71c9aa4b3d6..4518a721534 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/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)
diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index 7b4687bf478..32f1bf697d6 100644
--- a/code/game/objects/structures/grille.dm
+++ b/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
diff --git a/code/modules/assembly/igniter.dm b/code/modules/assembly/igniter.dm
index 2259e244722..8e9efad5036 100644
--- a/code/modules/assembly/igniter.dm
+++ b/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
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index e992d49149a..4db772a936d 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/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"
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 99cd4f95926..a30e2532c2a 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/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)
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index f453be09e59..c8ebcfde6d2 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/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
diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm
index 7c0767f03b8..8bf5982eec4 100644
--- a/code/modules/mob/new_player/sprite_accessories.dm
+++ b/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"
diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
index 2a944ff9bc3..d454be6cb71 100644
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ b/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
diff --git a/html/changelog.html b/html/changelog.html
index e75b5033bb3..89c90138a2b 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -57,22 +57,26 @@ should be listed in the changelog upon commit though. Thanks. -->
-
October 17th, 2012
+
+
+
17.10.2012
CIB updated:
- Ported limb selection on startup. Note that this may still be bugged, so use at own risk.
- You can now select opposite gender hairstyles.
+
Chinsky updated:
+
+ - Fixed arrivals announcment.
+ - Slur will properly fade away with time now.
+ - Anti-alco chem will get rid of slur now.
+ - Throwing metal item at eletrified grilles and doors will cause them to spark.
+ - Added forensics tech jackets.
+ - Ported some hairstyles from pre-merge code.
+
-
15.10.2012
-
Chinsky updated:
-
- - 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.
- - Now only cuting wounds and really bad blunt ones (>20 damage) will cause bleeding
-
-
October 13th, 2012
diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi
index 7d121ab6146..ef13513ccf0 100644
Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index 10cee875847..3f4b469b4bf 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index cf0331d732f..057dc69a262 100755
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ