From ebab096e992b1084cc4f97790bbc89001a2306b4 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Wed, 4 Dec 2019 03:58:51 -0300 Subject: [PATCH] Adds the rosary to the loadout (#7548) What it says in the title. --- code/game/objects/items/weapons/storage/bible.dm | 3 --- .../client/preference_setup/loadout/loadout_accessories.dm | 6 +++++- html/changelogs/alberyk-rosary.yml | 7 +++++++ 3 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 html/changelogs/alberyk-rosary.yml diff --git a/code/game/objects/items/weapons/storage/bible.dm b/code/game/objects/items/weapons/storage/bible.dm index 6941de07938..e1d2ac77d05 100644 --- a/code/game/objects/items/weapons/storage/bible.dm +++ b/code/game/objects/items/weapons/storage/bible.dm @@ -60,15 +60,12 @@ if("Bible") icon_state = "bible" item_state = "bible" - new /obj/item/clothing/accessory/rosary(src) if("White Bible") icon_state = "white" item_state = "white" - new /obj/item/clothing/accessory/rosary(src) if("Melted Bible") icon_state = "melted" item_state = "melted" - new /obj/item/clothing/accessory/rosary(src) if("Quran") icon_state = "quran" item_state = "quran" diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index 8f35e238692..91ee8d8b4e2 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -258,4 +258,8 @@ /datum/gear/accessory/sleeve_patch/New() ..() - gear_tweaks += gear_tweak_free_color_choice \ No newline at end of file + gear_tweaks += gear_tweak_free_color_choice + +/datum/gear/accessory/rosary + display_name = "rosary" + path = /obj/item/clothing/accessory/rosary \ No newline at end of file diff --git a/html/changelogs/alberyk-rosary.yml b/html/changelogs/alberyk-rosary.yml new file mode 100644 index 00000000000..732e5841ff1 --- /dev/null +++ b/html/changelogs/alberyk-rosary.yml @@ -0,0 +1,7 @@ +author: Alberyk + +delete-after: True + +changes: + - rscadd: "Added the rosary to the loadout options." + - tweak: "The rosary no longer automatically spawns in holy books that have bible sprites."