cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 01:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15885 from BlueWildrose/pins

Browse Source 
Pins, New Loadout Category, CTRLclick for accessory above suit
This commit is contained in:
Lin
2022-12-12 19:12:53 -07:00
committed by GitHub
parent b8e3369d8f b747ab56f4
commit f758a55da3
7 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
code/modules/clothing/under/accessories.dm
View File

@@ -65,7 +65,7 @@
/obj/item/clothing/accessory/proc/on_uniform_dropped(obj/item/clothing/under/U, user)
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(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>"
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//
@@ -557,3 +557,18 @@
obj_flags = UNIQUE_RENAME
custom_materials = list(/datum/material/iron=100)
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",
)

1
code/modules/vending/clothesmate.dm
View File

@@ -11,6 +11,7 @@
/obj/item/clothing/head/beret/black = 3,
/obj/item/clothing/head/beret/purple = 3,
/obj/item/clothing/head/beret/blue = 3,
/obj/item/clothing/accessory/pride = 25,
/obj/item/clothing/glasses/monocle = 3,
/obj/item/clothing/suit/jacket = 4,
/obj/item/clothing/suit/jacket/flannel = 4,