diff --git a/code/game/jobs/job/civilian_chaplain.dm b/code/game/jobs/job/civilian_chaplain.dm index 489f5433ab2..b24719b92b6 100644 --- a/code/game/jobs/job/civilian_chaplain.dm +++ b/code/game/jobs/job/civilian_chaplain.dm @@ -20,7 +20,7 @@ H.equip_if_possible(new /obj/item/clothing/shoes/black(H), H.slot_shoes) spawn(0) var/religion_name = "Christianity" - var/new_religion = input(H, "You are the Chaplain / Councelor. For game mechanics purposes, you need to choose a religion either way. Would you like to change your religion? Default is Christianity, in SPACE.", "Name change", religion_name) + var/new_religion = input(H, "You are the Chaplain / Counselor. For game mechanics purposes, you need to choose a religion either way. Would you like to change your religion? Default is Christianity, in SPACE.", "Name change", religion_name) if ((length(new_religion) == 0) || (new_religion == "Christianity")) new_religion = religion_name diff --git a/code/game/objects/storage/belt.dm b/code/game/objects/storage/belt.dm index 2626bfb4f13..d1eaf734a04 100644 --- a/code/game/objects/storage/belt.dm +++ b/code/game/objects/storage/belt.dm @@ -101,6 +101,7 @@ "/obj/item/weapon/reagent_containers/pill", "/obj/item/weapon/reagent_containers/syringe", "/obj/item/weapon/reagent_containers/glass/dispenser", + "/obj/item/weapon/reagent_containers/hypospray", "/obj/item/weapon/zippo", "/obj/item/weapon/cigpacket", "/obj/item/weapon/storage/pill_bottle", diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 38c8d339116..1a9883c7b04 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1295,8 +1295,8 @@ else if (gender == FEMALE) g = "f" - stand_icon = new /icon('human.dmi', "torso_s") - lying_icon = new /icon('human.dmi', "torso_l") + stand_icon = new /icon('human.dmi', "torso_[g]_s") + lying_icon = new /icon('human.dmi', "torso_[g]_l") var/husk = (mutations & HUSK) var/obese = (mutations & FAT) diff --git a/config/custom_items.txt b/config/custom_items.txt index 44849ab3060..45ff0f9e8e9 100644 --- a/config/custom_items.txt +++ b/config/custom_items.txt @@ -3,8 +3,7 @@ spaceman96: Trenna Seber: /obj/item/weapon/pen/multi, /obj/item/clothing/suit/st asanadas: Book Berner: /obj/item/clothing/under/chameleon/psyche tastyfish: Cindy Robertson: /obj/item/weapon/wrapping_paper eternal248: Maximilian Haynes: /obj/item/weapon/paper/certificate -searif: Yuki Matsuda: /obj/item/weapon/paper/certificate +searif: Yuki Matsuda: /obj/item/weapon/paper/certificate, /obj/item/clothing/under/jumpsuitdown erthilo: Farah Lants: /obj/item/clothing/under/rank/medical_sleeve, /obj/item/clothing/suit/storage/labcoat/red compactninja: Ysyr Rylias: /obj/item/weapon/reagent_containers/food/drinks/dry_ramen, /obj/item/weapon/reagent_containers/food/drinks/dry_ramen, /obj/item/weapon/reagent_containers/food/drinks/dry_ramen, /obj/item/weapon/reagent_containers/food/drinks/dry_ramen -tzefa: Wes Solari: /obj/item/fluff/wes_solari_1 -searif: Yuki Matsuda: /obj/item/clothing/under/jumpsuitdown \ No newline at end of file +tzefa: Wes Solari: /obj/item/fluff/wes_solari_1 \ No newline at end of file diff --git a/icons/mob/human.dmi b/icons/mob/human.dmi index ae8fd76d54b..5664fa370e5 100644 Binary files a/icons/mob/human.dmi and b/icons/mob/human.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 58aeb8a20b9..f6c7a8c29de 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ