mirror of
https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git
synced 2025-12-10 09:54:52 +00:00
Pins, New Loadout Category, CTRLclick for accessory above suit
This commit is contained in:
@@ -7,6 +7,7 @@
|
|||||||
//backpack
|
//backpack
|
||||||
#define LOADOUT_CATEGORY_BACKPACK "In backpack"
|
#define LOADOUT_CATEGORY_BACKPACK "In backpack"
|
||||||
#define LOADOUT_SUBCATEGORY_BACKPACK_GENERAL "General" //basically anything that there's not enough of to have its own subcategory
|
#define LOADOUT_SUBCATEGORY_BACKPACK_GENERAL "General" //basically anything that there's not enough of to have its own subcategory
|
||||||
|
#define LOADOUT_SUBCATEGORY_BACKPACK_ACCESSORIES "Accessories" //maybe one day someone will make loadouts have accessory compatibility
|
||||||
#define LOADOUT_SUBCATEGORY_BACKPACK_TOYS "Toys"
|
#define LOADOUT_SUBCATEGORY_BACKPACK_TOYS "Toys"
|
||||||
//neck
|
//neck
|
||||||
#define LOADOUT_CATEGORY_NECK "Neck"
|
#define LOADOUT_CATEGORY_NECK "Neck"
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
GLOBAL_LIST_INIT(loadout_categories, list(
|
GLOBAL_LIST_INIT(loadout_categories, list(
|
||||||
LOADOUT_CATEGORY_BACKPACK = list(LOADOUT_SUBCATEGORY_BACKPACK_GENERAL, LOADOUT_SUBCATEGORY_BACKPACK_TOYS),
|
LOADOUT_CATEGORY_BACKPACK = list(LOADOUT_SUBCATEGORY_BACKPACK_GENERAL, LOADOUT_SUBCATEGORY_BACKPACK_ACCESSORIES, LOADOUT_SUBCATEGORY_BACKPACK_TOYS),
|
||||||
LOADOUT_CATEGORY_NECK = list(LOADOUT_SUBCATEGORY_NECK_GENERAL, LOADOUT_SUBCATEGORY_NECK_TIE, LOADOUT_SUBCATEGORY_NECK_SCARVES),
|
LOADOUT_CATEGORY_NECK = list(LOADOUT_SUBCATEGORY_NECK_GENERAL, LOADOUT_SUBCATEGORY_NECK_TIE, LOADOUT_SUBCATEGORY_NECK_SCARVES),
|
||||||
LOADOUT_CATEGORY_MASK = LOADOUT_SUBCATEGORIES_NONE,
|
LOADOUT_CATEGORY_MASK = LOADOUT_SUBCATEGORIES_NONE,
|
||||||
LOADOUT_CATEGORY_HANDS = LOADOUT_SUBCATEGORIES_NONE,
|
LOADOUT_CATEGORY_HANDS = LOADOUT_SUBCATEGORIES_NONE,
|
||||||
|
|||||||
@@ -65,7 +65,7 @@
|
|||||||
/obj/item/clothing/accessory/proc/on_uniform_dropped(obj/item/clothing/under/U, user)
|
/obj/item/clothing/accessory/proc/on_uniform_dropped(obj/item/clothing/under/U, user)
|
||||||
return
|
return
|
||||||
|
|
||||||
/obj/item/clothing/accessory/AltClick(mob/user)
|
/obj/item/clothing/accessory/CtrlClick(mob/user)
|
||||||
. = ..()
|
. = ..()
|
||||||
if(istype(user) && user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
|
if(istype(user) && user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
|
||||||
if(initial(above_suit))
|
if(initial(above_suit))
|
||||||
@@ -77,7 +77,7 @@
|
|||||||
. = ..()
|
. = ..()
|
||||||
. += "<span class='notice'>\The [src] can be attached to a uniform. Alt-click to remove it once attached.</span>"
|
. += "<span class='notice'>\The [src] can be attached to a uniform. Alt-click to remove it once attached.</span>"
|
||||||
if(initial(above_suit))
|
if(initial(above_suit))
|
||||||
. += "<span class='notice'>\The [src] can be worn above or below your suit. Alt-click to toggle.</span>"
|
. += "<span class='notice'>\The [src] can be worn above or below your suit. Ctrl-click to toggle.</span>"
|
||||||
|
|
||||||
//////////////
|
//////////////
|
||||||
//Waistcoats//
|
//Waistcoats//
|
||||||
@@ -557,3 +557,18 @@
|
|||||||
obj_flags = UNIQUE_RENAME
|
obj_flags = UNIQUE_RENAME
|
||||||
custom_materials = list(/datum/material/iron=100)
|
custom_materials = list(/datum/material/iron=100)
|
||||||
resistance_flags = FIRE_PROOF
|
resistance_flags = FIRE_PROOF
|
||||||
|
|
||||||
|
|
||||||
|
/obj/item/clothing/accessory/pride
|
||||||
|
name = "pride pin"
|
||||||
|
desc = "A Nanotrasen Diversity & Inclusion Center-sponsored holographic pin to show off your pride of sexuality or gender identity, reminding the crew of their unwavering commitment to equity, diversity, and inclusion!"
|
||||||
|
icon_state = "pride"
|
||||||
|
above_suit = TRUE
|
||||||
|
obj_flags = UNIQUE_RENAME
|
||||||
|
unique_reskin = list("Rainbow Pride" = "pride",
|
||||||
|
"Bisexual Pride" = "pride_bi",
|
||||||
|
"Pansexual Pride" = "pride_pan",
|
||||||
|
"Asexual Pride" = "pride_ace",
|
||||||
|
"Non-binary Pride" = "pride_enby",
|
||||||
|
"Transgender Pride" = "pride_trans",
|
||||||
|
)
|
||||||
|
|||||||
@@ -11,6 +11,7 @@
|
|||||||
/obj/item/clothing/head/beret/black = 3,
|
/obj/item/clothing/head/beret/black = 3,
|
||||||
/obj/item/clothing/head/beret/purple = 3,
|
/obj/item/clothing/head/beret/purple = 3,
|
||||||
/obj/item/clothing/head/beret/blue = 3,
|
/obj/item/clothing/head/beret/blue = 3,
|
||||||
|
/obj/item/clothing/accessory/pride = 25,
|
||||||
/obj/item/clothing/glasses/monocle = 3,
|
/obj/item/clothing/glasses/monocle = 3,
|
||||||
/obj/item/clothing/suit/jacket = 4,
|
/obj/item/clothing/suit/jacket = 4,
|
||||||
/obj/item/clothing/suit/jacket/flannel = 4,
|
/obj/item/clothing/suit/jacket/flannel = 4,
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 30 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 19 KiB |
@@ -172,12 +172,21 @@
|
|||||||
path = /obj/item/storage/fancy/ringbox/diamond
|
path = /obj/item/storage/fancy/ringbox/diamond
|
||||||
cost = 5
|
cost = 5
|
||||||
|
|
||||||
/datum/gear/backpack/necklace//this is here because loadout doesn't support proper accessories
|
/datum/gear/backpack/necklace //this is here because loadout doesn't support proper accessories
|
||||||
name = "A renameable necklace"
|
name = "A renameable necklace"
|
||||||
path = /obj/item/clothing/accessory/necklace
|
path = /obj/item/clothing/accessory/necklace
|
||||||
|
subcategory = LOADOUT_SUBCATEGORY_BACKPACK_ACCESSORIES
|
||||||
|
|
||||||
/datum/gear/backpack/polymaidapron //this is ALSO here because loadout doesn't support proper accessories
|
/datum/gear/backpack/polymaidapron //this is ALSO here because loadout doesn't support proper accessories
|
||||||
name = "Polychromic maid apron"
|
name = "Polychromic maid apron"
|
||||||
path = /obj/item/clothing/accessory/maidapron/polychromic
|
path = /obj/item/clothing/accessory/maidapron/polychromic
|
||||||
loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC
|
loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC
|
||||||
loadout_initial_colors = list("#333333", "#FFFFFF")
|
loadout_initial_colors = list("#333333", "#FFFFFF")
|
||||||
|
subcategory = LOADOUT_SUBCATEGORY_BACKPACK_ACCESSORIES
|
||||||
|
|
||||||
|
/datum/gear/backpack/pridepin //what the two comments above said
|
||||||
|
name = "Pride pin"
|
||||||
|
path = /obj/item/clothing/accessory/pride
|
||||||
|
loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION
|
||||||
|
subcategory = LOADOUT_SUBCATEGORY_BACKPACK_ACCESSORIES
|
||||||
|
cost = 0
|
||||||
|
|||||||
Reference in New Issue
Block a user