From 8ffc0cccfb9df68e5a6b1e4eb5843566b056eaaa Mon Sep 17 00:00:00 2001 From: Cobraman202 Date: Fri, 21 Feb 2020 00:09:36 -0600 Subject: [PATCH 1/3] changed "Monk's frock" to the modern term, "Monk's habit" --- code/modules/clothing/suits/chaplainsuits.dm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/code/modules/clothing/suits/chaplainsuits.dm b/code/modules/clothing/suits/chaplainsuits.dm index 20409af040f..8cc3a02a239 100644 --- a/code/modules/clothing/suits/chaplainsuits.dm +++ b/code/modules/clothing/suits/chaplainsuits.dm @@ -1,5 +1,5 @@ //Chaplain Suit Subtypes -//If any new staple chaplain items get added, put them in these lists +//If any new staple chaplain items get added, put them in these lists /obj/item/clothing/suit/chaplainsuit allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) @@ -30,7 +30,7 @@ item_state = "bishoprobe" body_parts_covered = CHEST|GROIN|LEGS|ARMS flags_inv = HIDEJUMPSUIT - + /obj/item/clothing/suit/chaplainsuit/studentuni name = "student robe" desc = "The uniform of a bygone institute of learning." @@ -45,15 +45,15 @@ item_state = "witchhunter" body_parts_covered = CHEST|GROIN|LEGS|ARMS -/obj/item/clothing/suit/hooded/chaplainsuit/monkfrock - name = "monk's frock" +/obj/item/clothing/suit/hooded/chaplainsuit/monkhabit + name = "monk's habit" desc = "A few steps above rended sackcloth." - icon_state = "monkfrock" - item_state = "monkfrock" + icon_state = "monkhabit" + item_state = "monkhabit" body_parts_covered = CHEST|GROIN|LEGS|ARMS - hoodtype = /obj/item/clothing/head/hooded/monkfrock - -/obj/item/clothing/head/hooded/monkfrock + hoodtype = /obj/item/clothing/head/hooded/monkhabit + +/obj/item/clothing/head/hooded/monkhabit name = "monk's hood" desc = "For when a man wants to cover up his tonsure." icon_state = "monkhood" @@ -76,7 +76,7 @@ item_state = "whiterobe" body_parts_covered = CHEST|GROIN|LEGS|ARMS flags_inv = HIDEJUMPSUIT - + /obj/item/clothing/suit/chaplainsuit/clownpriest name = "Robes of the Honkmother" desc = "Meant for a clown of the cloth." From 586621e786ecd8a426c2be513d3518d210163d42 Mon Sep 17 00:00:00 2001 From: Cobraman202 Date: Fri, 21 Feb 2020 00:12:38 -0600 Subject: [PATCH 2/3] Changed "Monk's Frock" to the more modern term of "Monk's Habit" --- .../objects/structures/crates_lockers/closets/job_closets.dm | 2 +- code/modules/vending/wardrobes.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index 5d618a1cd92..f7558a46c69 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -104,7 +104,7 @@ new /obj/item/clothing/shoes/sneakers/black(src) new /obj/item/clothing/suit/chaplainsuit/nun(src) new /obj/item/clothing/head/nun_hood(src) - new /obj/item/clothing/suit/hooded/chaplainsuit/monkfrock(src) + new /obj/item/clothing/suit/hooded/chaplainsuit/monkhabit(src) new /obj/item/clothing/suit/chaplainsuit/holidaypriest(src) new /obj/item/storage/backpack/cultpack(src) new /obj/item/storage/fancy/candle_box(src) diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index 51446c8c980..0e03f465081 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -347,7 +347,7 @@ /obj/item/clothing/suit/chaplainsuit/nun = 1, /obj/item/clothing/head/nun_hood = 1, /obj/item/clothing/suit/chaplainsuit/holidaypriest = 1, - /obj/item/clothing/suit/hooded/chaplainsuit/monkfrock = 1, + /obj/item/clothing/suit/hooded/chaplainsuit/monkhabit = 1, /obj/item/storage/fancy/candle_box = 2, /obj/item/clothing/head/kippah = 3, /obj/item/clothing/suit/chaplainsuit/whiterobe = 1, From ef3e35bb25cdf4f087a7d48ade011f85a13dd3e0 Mon Sep 17 00:00:00 2001 From: Cobraman202 Date: Fri, 21 Feb 2020 01:09:14 -0600 Subject: [PATCH 3/3] Fixed the itemstate of my last push --- code/modules/clothing/suits/chaplainsuits.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/suits/chaplainsuits.dm b/code/modules/clothing/suits/chaplainsuits.dm index 8cc3a02a239..949265f8337 100644 --- a/code/modules/clothing/suits/chaplainsuits.dm +++ b/code/modules/clothing/suits/chaplainsuits.dm @@ -48,8 +48,8 @@ /obj/item/clothing/suit/hooded/chaplainsuit/monkhabit name = "monk's habit" desc = "A few steps above rended sackcloth." - icon_state = "monkhabit" - item_state = "monkhabit" + icon_state = "monkfrock" + item_state = "monkfrock" body_parts_covered = CHEST|GROIN|LEGS|ARMS hoodtype = /obj/item/clothing/head/hooded/monkhabit