Skip to content

Commit

Permalink
Merge pull request #3934 from MistakeNot4892/rework/accessories_shoul…
Browse files Browse the repository at this point in the history
…dercapes

Repathed shouldercapes off /accessory.
  • Loading branch information
out-of-phaze authored Apr 22, 2024
2 parents e98707f + 0762a07 commit 97c16ad
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 27 deletions.
22 changes: 0 additions & 22 deletions code/modules/clothing/suits/alien.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,3 @@
desc = "A scarf of coarse fabric. Seems to have ear-holes."
icon = 'icons/clothing/head/headscarf.dmi'
body_parts_covered = SLOT_HEAD|SLOT_FACE

/obj/item/clothing/accessory/shouldercape
name = "shoulder cape"
desc = "A simple-looking cape with a couple of runes woven into the fabric."
icon = 'icons/clothing/accessories/clothing/cape_grunt.dmi'
accessory_slot = ACCESSORY_SLOT_INSIGNIA // Adding again in case we want to change it in the future.

/obj/item/clothing/accessory/shouldercape/officer
name = "officer's cape"
desc = "A decorated cape. Runed patterns have been woven into the fabric."
icon = 'icons/clothing/accessories/clothing/cape_officer.dmi'

/obj/item/clothing/accessory/shouldercape/command
name = "command cape"
desc = "A heavily decorated cape with rank emblems on the shoulders signifying prestige. An ornate runed design has been woven into the fabric of it"
icon = 'icons/clothing/accessories/clothing/cape_commander.dmi'

/obj/item/clothing/accessory/shouldercape/general
name = "general's cape"
desc = "An extremely decorated cape with an intricately runed design has been woven into the fabric of this cape with great care."
icon = 'icons/clothing/accessories/clothing/cape_leader.dmi'
matter = list(/decl/material/solid/metal/gold = MATTER_AMOUNT_TRACE)
21 changes: 21 additions & 0 deletions code/modules/clothing/suits/shouldercapes.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
/obj/item/clothing/suit/shouldercape
name = "shoulder cape"
desc = "A simple-looking cape with a couple of runes woven into the fabric."
icon = 'icons/clothing/accessories/clothing/cape_grunt.dmi'
accessory_slot = ACCESSORY_SLOT_INSIGNIA // Adding again in case we want to change it in the future.

/obj/item/clothing/suit/shouldercape/officer
name = "officer's cape"
desc = "A decorated cape. Runed patterns have been woven into the fabric."
icon = 'icons/clothing/accessories/clothing/cape_officer.dmi'

/obj/item/clothing/suit/shouldercape/command
name = "command cape"
desc = "A heavily decorated cape with rank emblems on the shoulders signifying prestige. An ornate runed design has been woven into the fabric of it"
icon = 'icons/clothing/accessories/clothing/cape_commander.dmi'

/obj/item/clothing/suit/shouldercape/general
name = "general's cape"
desc = "An extremely decorated cape with an intricately runed design has been woven into the fabric of this cape with great care."
icon = 'icons/clothing/accessories/clothing/cape_leader.dmi'
matter = list(/decl/material/solid/metal/gold = MATTER_AMOUNT_TRACE)
10 changes: 5 additions & 5 deletions code/modules/fabrication/designs/textile/gimmick.dm
Original file line number Diff line number Diff line change
Expand Up @@ -127,16 +127,16 @@
path = /obj/item/clothing/head/santahat

/datum/fabricator_recipe/textiles/gimmick/cape
path = /obj/item/clothing/accessory/shouldercape
path = /obj/item/clothing/suit/shouldercape

/datum/fabricator_recipe/textiles/gimmick/capegrunt
path = /obj/item/clothing/accessory/shouldercape
path = /obj/item/clothing/suit/shouldercape

/datum/fabricator_recipe/textiles/gimmick/capeofficer
path = /obj/item/clothing/accessory/shouldercape/officer
path = /obj/item/clothing/suit/shouldercape/officer

/datum/fabricator_recipe/textiles/gimmick/capecommand
path = /obj/item/clothing/accessory/shouldercape/command
path = /obj/item/clothing/suit/shouldercape/command

/datum/fabricator_recipe/textiles/gimmick/capegeneral
path = /obj/item/clothing/accessory/shouldercape/general
path = /obj/item/clothing/suit/shouldercape/general
Binary file modified icons/clothing/accessories/clothing/cape_commander.dmi
Binary file not shown.
Binary file modified icons/clothing/accessories/clothing/cape_grunt.dmi
Binary file not shown.
Binary file modified icons/clothing/accessories/clothing/cape_leader.dmi
Binary file not shown.
Binary file modified icons/clothing/accessories/clothing/cape_officer.dmi
Binary file not shown.
1 change: 1 addition & 0 deletions nebula.dme
Original file line number Diff line number Diff line change
Expand Up @@ -1996,6 +1996,7 @@
#include "code\modules\clothing\suits\miscellaneous.dm"
#include "code\modules\clothing\suits\poncho.dm"
#include "code\modules\clothing\suits\robes.dm"
#include "code\modules\clothing\suits\shouldercapes.dm"
#include "code\modules\clothing\suits\toggles.dm"
#include "code\modules\clothing\suits\utility.dm"
#include "code\modules\clothing\suits\wiz_robe.dm"
Expand Down

0 comments on commit 97c16ad

Please sign in to comment.