Trinary Perfection clothing (#8171)

On the occasion of The Trinary Perfection rework, a religion tab has been added to the loadout. All clothes related to this religion are available in this new tab.
In the future, it can also be used for other religions.
This commit is contained in:
TheGoret
2020-02-06 19:15:18 +01:00
committed by GitHub
parent 74702fa656
commit fe0ff37849
18 changed files with 106 additions and 8 deletions

View File

@@ -1289,6 +1289,7 @@
#include "code\modules\client\preference_setup\loadout\loadout_gloves.dm"
#include "code\modules\client\preference_setup\loadout\loadout_head.dm"
#include "code\modules\client\preference_setup\loadout\loadout_mask.dm"
#include "code\modules\client\preference_setup\loadout\loadout_religion.dm"
#include "code\modules\client\preference_setup\loadout\loadout_shoes.dm"
#include "code\modules\client\preference_setup\loadout\loadout_smoking.dm"
#include "code\modules\client\preference_setup\loadout\loadout_suit.dm"

View File

@@ -262,8 +262,4 @@
/datum/gear/accessory/sleeve_patch/New()
..()
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/accessory/rosary
display_name = "rosary"
path = /obj/item/clothing/accessory/rosary
gear_tweaks += gear_tweak_free_color_choice

View File

@@ -0,0 +1,20 @@
/datum/gear/religion
display_name = "trinary perfection robes"
path = /obj/item/clothing/suit/trinary_robes
sort_category = "Religion"
/datum/gear/religion/trinary/mask
display_name = "trinary perfection mask"
path = /obj/item/clothing/mask/trinary_mask
/datum/gear/religion/trinary/cape
display_name = "trinary perfection cape"
path = /obj/item/clothing/accessory/poncho/trinary
/datum/gear/religion/trinary/badge
display_name = "trinary perfection brooch"
path = /obj/item/clothing/accessory/badge/trinary
/datum/gear/religion/rosary
display_name = "rosary"
path = /obj/item/clothing/accessory/rosary

View File

@@ -76,6 +76,7 @@
antenna["antenna, double"] = /obj/item/clothing/head/antenna/double
antenna["antenna, left"] = /obj/item/clothing/head/antenna/double/left
antenna["antenna, right"] = /obj/item/clothing/head/antenna/double/right
antenna["antenna, trinary perfection"] = /obj/item/clothing/head/antenna/trinary_halo
gear_tweaks += new/datum/gear_tweak/path(antenna)
gear_tweaks += list(gear_tweak_free_color_choice)
@@ -102,4 +103,4 @@
idris["Brown Idris Unit trench coat"] = /obj/item/clothing/suit/armor/vest/idris/trenchcoat/brown
idris["Black Idris Unit duster coat"] = /obj/item/clothing/suit/armor/vest/idris/duster/black
idris["Brown Idris Unit duster coat"] = /obj/item/clothing/suit/armor/vest/idris/duster/brown
gear_tweaks += new/datum/gear_tweak/path(idris)
gear_tweaks += new/datum/gear_tweak/path(idris)

View File

@@ -593,6 +593,12 @@
icon_state = "right_robot_antennae"
item_state = "right_robot_antennae"
/obj/item/clothing/head/antenna/trinary_halo
name = "trinary perfection antenna"
desc = "A decorative antenna that is commonly worn by IPCs who serve the Trinary Perfection. It resembles a golden gear."
icon_state = "trinary_halo"
item_state = "trinary_halo"
/obj/item/clothing/head/fake_culthood
name = "occultist hood"
icon_state = "culthood"

View File

@@ -92,6 +92,17 @@
flags_inv = HIDEFACE
body_parts_covered = 0
/obj/item/clothing/mask/trinary_mask
name = "trinary perfection mask"
desc = "A simple lace mask worn by IPCs and organics alike while within the churches of the Trinary Perfection."
icon_state = "trinary_mask"
item_state = "trinary_mask"
w_class = ITEMSIZE_SMALL
body_parts_covered = FACE
item_flags = FLEXIBLEMATERIAL
down_body_parts_covered = null
adjustable = TRUE
//scarves (fit in in mask slot)
//None of these actually have on-mob sprites...
/obj/item/clothing/mask/bluescarf
@@ -210,7 +221,7 @@
return
if(user.get_equipped_item(slot_wear_mask) != src)
return
eye.possess(user)
to_chat(eye.owner, span("notice", "You feel disoriented for a moment as your mind connects to the camera network."))

View File

@@ -154,6 +154,12 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO
flags_inv = HIDEJUMPSUIT
/obj/item/clothing/suit/trinary_robes
name = "trinary perfection robe"
desc = "Robes worn by those who serve The Trinary Perfection."
icon_state = "trinary_robes"
item_state = "trinary_robes"
/*
* Misc
*/

View File

@@ -613,6 +613,13 @@
item_state = "galaxycape"
overlay_state = "galaxycape"
/obj/item/clothing/accessory/poncho/trinary
name = "trinary perfection cape"
desc = "A brilliant red and brown cape, commonly worn by those who serve the Trinary Perfection."
icon_state = "trinary_cape"
item_state = "trinary_cape"
overlay_state = "trinary_cape"
//tau ceti legion ribbons
/obj/item/clothing/accessory/legion
name = "seniority ribbons"

View File

@@ -227,4 +227,11 @@
desc = "A descriptive identification badge with the holder's credentials displayed with a harsh digital glow."
icon_state = "intelbadge"
overlay_state = "intelbadge"
badge_string = null
badge_string = null
/obj/item/clothing/accessory/badge/trinary
name = "trinary perfection brooch"
desc = "A metal brooch worn by those who serve or follow the beliefs of the Trinary Perfection. It resembles a gear with a triangle inside."
icon_state = "trinary_badge"
overlay_state = "trinary_badge"
badge_string = null

View File

@@ -0,0 +1,43 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
# admin
# backend
# security
# refactor
#################################
# Your name.
author: Goret
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "A religion tab in the loadout menu has been added. All Trinary related items are located inside, and could be used in the feature for other religions."
- rscadd: "Following the Trinary Perfection rework, clothing related to it has been added."
- rscadd: "A new antenna is available for the IPCs that serve the Trinary Perfection."

Binary file not shown.

Before

Width:  |  Height:  |  Size: 174 KiB

After

Width:  |  Height:  |  Size: 172 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 424 KiB

After

Width:  |  Height:  |  Size: 425 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 69 KiB

After

Width:  |  Height:  |  Size: 71 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 98 KiB

After

Width:  |  Height:  |  Size: 98 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 160 KiB

After

Width:  |  Height:  |  Size: 160 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 53 KiB

After

Width:  |  Height:  |  Size: 54 KiB