Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "feat(accessories): removes absence of pride pins" #11284

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion baystation12.dme
Original file line number Diff line number Diff line change
Expand Up @@ -1778,7 +1778,6 @@
#include "code\modules\clothing\under\accessories\holster.dm"
#include "code\modules\clothing\under\accessories\lockets.dm"
#include "code\modules\clothing\under\accessories\medals.dm"
#include "code\modules\clothing\under\accessories\pins.dm"
#include "code\modules\clothing\under\accessories\stethoscope.dm"
#include "code\modules\clothing\under\accessories\storage.dm"
#include "code\modules\clothing\under\accessories\ties.dm"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,20 +133,6 @@
dogtag.stored_blood_type = H.b_type

/datum/gear/accessory/pride_pin
display_name = "pride pin selection"
description = "A holographic pin to show off your pride, reminding the crew of their unwavering commitment to equity, diversity, and inclusion!"
path = /obj/item/clothing/accessory/pride_pin

/datum/gear/accessory/pride_pin/New()
..()
var/prides = list()
prides["rainbow pride pin"] = /obj/item/clothing/accessory/pride_pin
prides["bisexual pride pin"] = /obj/item/clothing/accessory/pride_pin/bi
prides["pansexual pride pin"] = /obj/item/clothing/accessory/pride_pin/pan
prides["asexual pride pin"] = /obj/item/clothing/accessory/pride_pin/ace
prides["non-binary pride pin"] = /obj/item/clothing/accessory/pride_pin/enby
prides["transgender pride pin"] = /obj/item/clothing/accessory/pride_pin/trans
prides["intersex pride pin"] = /obj/item/clothing/accessory/pride_pin/intersex
prides["lesbian pride pin"] = /obj/item/clothing/accessory/pride_pin/lesbian

gear_tweaks += new /datum/gear_tweak/path(prides)
display_name = "Ukrainian pin"
description = "Glory to Ukraine!"
path = /obj/item/clothing/accessory/medal/ukraine_pin
7 changes: 7 additions & 0 deletions code/modules/clothing/under/accessories/medals.dm
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,10 @@
desc = "An iron medal awarded to NanoTrasen employees for merit."
icon_state = "iron_nt"
item_state = "iron_nt"

// pin
/obj/item/clothing/accessory/medal/ukraine_pin
name = "\improper Ukraine pin"
desc = "Glory to Ukraine!"
icon_state = "ukraine_pin"
item_state = "ukraine_pin"
35 changes: 0 additions & 35 deletions code/modules/clothing/under/accessories/pins.dm

This file was deleted.

Binary file modified icons/inv_slots/acessories/icon.dmi
Binary file not shown.
Binary file modified icons/inv_slots/acessories/mob.dmi
Binary file not shown.
Binary file modified icons/inv_slots/acessories/mob_fat.dmi
Binary file not shown.
Binary file modified icons/inv_slots/acessories/mob_slim.dmi
Binary file not shown.
Binary file modified icons/inv_slots/acessories/mob_slim_m.dmi
Binary file not shown.
Binary file modified icons/inv_slots/acessories/mob_vox.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/ties.dmi
Binary file not shown.
Loading