Merge pull request #275 from Aurorastation/master

Updating Dumb

code/modules/detectivework/forensics.dm

@@ -194,6 +194,9 @@
 	set category = "Object"
 	set name = "Empty Slide"
 	set src in usr
+	if(usr.stat || !(istype(usr,/mob/living/carbon/human)))
+		usr << "No."
+		return
 
 	if(issilicon(usr))
 		return
@@ -337,6 +340,9 @@
 	set category = "Object"
 	set name = "Remove Sample"
 	set src in oview(1)
+	if(usr.stat || !(istype(usr,/mob/living/carbon/human)))
+		usr << "No."
+		return
 
 	if(issilicon(usr))
 		return
@@ -639,6 +645,9 @@
 	set category = "Object"
 	set name = "Toggle Lid"
 	set src in oview(1)
+	if(usr.stat || !(istype(usr,/mob/living/carbon/human)))
+		usr << "No."
+		return
 
 	if(issilicon(usr))
 		return

code/modules/mob/new_player/sprite_accessories.dm

@@ -126,6 +126,11 @@
 		name = "Ponytail 4"
 		icon_state = "hair_ponytail4"
 
+	ponytail5
+		name = "Ponytail 5"
+		icon_state = "hair_ponytail5"
+		gender = FEMALE
+
 	sideponytail
 		name = "Side Ponytail"
 		icon_state = "hair_stail"
@@ -390,6 +395,29 @@
 		icon_state = "hair_joestar"
 		gender = MALE
 
+	dad
+		name = "Father"
+		icon_state = "hair_father"
+		gender = MALE
+
+	reversemohawk
+		name = "Reverse Mohawk"
+		icon_state = "hair_reversemohawk"
+
+	beehive2
+		name = "Beehive 2"
+		icon_state = "hair_beehive2"
+		gender = FEMALE
+
+	shortbraid
+		name = "Short Braid"
+		icon_state = "hair_shortbraid"
+		gender = FEMALE
+
+	emolong
+		name = "Long Emo"
+		icon_state = "hair_emolong"
+
 	bald
 		name = "Bald"
 		icon_state = "bald"

code/modules/projectiles/ammunition/bullets.dm

@@ -29,7 +29,7 @@
 /obj/item/ammo_casing/c38
 	desc = "A .38 bullet casing."
 	caliber = "38"
-	projectile_type = "/obj/item/projectile/bullet/weakbullet"
+	projectile_type = "/obj/item/projectile/bullet/midbullet2"
 
 
 /obj/item/ammo_casing/c9mm