diff --git a/code/modules/detectivework/forensics.dm b/code/modules/detectivework/forensics.dm index 5488587c..3a25292f 100644 --- a/code/modules/detectivework/forensics.dm +++ b/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 diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm index b8901498..4f6a1146 100644 --- a/code/modules/mob/new_player/sprite_accessories.dm +++ b/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" diff --git a/code/modules/projectiles/ammunition/bullets.dm b/code/modules/projectiles/ammunition/bullets.dm index 3dcb0b9f..3ce29735 100644 --- a/code/modules/projectiles/ammunition/bullets.dm +++ b/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 diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi index 7d8af589..f1f53bf0 100644 Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 7a24eb9a..4f7abdfa 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi index fbbc31b9..31c0b458 100644 Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi index 7f5064f9..882de67f 100644 Binary files a/icons/mob/items_lefthand.dmi and b/icons/mob/items_lefthand.dmi differ diff --git a/icons/mob/items_righthand.dmi b/icons/mob/items_righthand.dmi index a03017a2..a720fe27 100644 Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 0df9b2e4..0259bceb 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 91af9569..e8c230d0 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index ee833553..59989716 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi index 7f4cdb6b..a3aa2ab7 100644 Binary files a/icons/obj/gun.dmi and b/icons/obj/gun.dmi differ