Ports custom medals from Nova (#4815)

## About The Pull Request

Part one of porting Nova Drip. The gags stuff. After this I might do the
camo outfits, but I really want
https://github.com/tgstation/tgstation/pull/93312 to get merged first.


<img width="466" height="586" alt="image"
src="https://github.com/user-attachments/assets/3e00070d-12d1-4cbf-b428-91577f2c6f11"
/>

## Why It's Good For The Game

Drip good. Syndis getting medals is cool.

## Proof Of Testing
<details>
<summary>Screenshots/Videos</summary>

</details>

## Changelog
🆑 OriontheFox, RealWinterFox, Compass by Jamie Lidell and that one
Star Wars Scene
add: More cosmetic medals have been added. Wahoo, yippie!! 
add: Changed NTR and Blueshield to wear new medals roundstart. 
add: Syndi Admirals can now give out medals. Agents have to buy them.
add: GalFed 911 now have medals on. Cosmetic only.
code: Moves Comdrobe to the vending folder.
/🆑

---------

Co-authored-by: Artur Lang <24881678+Arturlang@users.noreply.github.com>
This commit is contained in:
Cursor
2025-10-27 23:16:17 +00:00
committed by GitHub
parent 979c33b29a
commit 8342a3c884
37 changed files with 2579 additions and 284 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1016 B

After

Width:  |  Height:  |  Size: 9.5 KiB

View File

@@ -1578,22 +1578,6 @@ TREK
icon_file = 'modular_skyrat/modules/hyposprays/icons/vials.dmi' icon_file = 'modular_skyrat/modules/hyposprays/icons/vials.dmi'
json_config = 'modular_skyrat/modules/GAGS/json_configs/items/hypovial.json' json_config = 'modular_skyrat/modules/GAGS/json_configs/items/hypovial.json'
/datum/greyscale_config/umbrella
name = "Umbrella"
icon_file = 'modular_zubbers/icons/obj/equipment/umbrella.dmi'
json_config = 'modular_skyrat/modules/GAGS/json_configs/items/_umbrella.json'
/datum/greyscale_config/umbrella_inhand_left
name = "Held Umbrella, Left, Closed"
icon_file = 'modular_zubbers/icons/obj/equipment/umbrella_inhand_l.dmi'
json_config = 'modular_skyrat/modules/GAGS/json_configs/items/_umbrella_inhand.json'
/datum/greyscale_config/umbrella_inhand_right
name = "Held Umbrella, Right, Closed"
icon_file = 'modular_zubbers/icons/obj/equipment/umbrella_inhand_r.dmi'
json_config = 'modular_skyrat/modules/GAGS/json_configs/items/_umbrella_inhand.json'
// Evil primitive catgirl clothing // Evil primitive catgirl clothing
/datum/greyscale_config/primitive_catgirl_wraps /datum/greyscale_config/primitive_catgirl_wraps
@@ -1662,3 +1646,4 @@ TREK
/datum/greyscale_config/turret/toolbox /datum/greyscale_config/turret/toolbox
name = "Donksoft Turret" name = "Donksoft Turret"
json_config = 'modular_skyrat/modules/GAGS/json_configs/turret/turret_toolbox.json' json_config = 'modular_skyrat/modules/GAGS/json_configs/turret/turret_toolbox.json'

View File

@@ -62,6 +62,7 @@
box = /obj/item/storage/box/survival/security box = /obj/item/storage/box/survival/security
belt = /obj/item/modular_computer/pda/blueshield belt = /obj/item/modular_computer/pda/blueshield
suit_store = /obj/item/gun/energy/e_gun/blueshield suit_store = /obj/item/gun/energy/e_gun/blueshield
accessory = /obj/item/clothing/accessory/bubber/acc_medal/neckpin/centcom
id_trim = /datum/id_trim/job/blueshield id_trim = /datum/id_trim/job/blueshield

View File

@@ -1,234 +0,0 @@
/obj/machinery/vending/access/command
name = "\improper Command Outfitting Station"
desc = "A vending machine for specialised clothing for members of Command."
product_ads = "File paperwork in style!;It's red so you can't see the blood!;You have the right to be fashionable!;Now you can be the fashion police you always wanted to be!"
icon = 'modular_skyrat/modules/command_vendor/icons/vending.dmi'
icon_state = "commdrobe"
light_mask = "wardrobe-light-mask"
vend_reply = "Thank you for using the CommDrobe!"
auto_build_products = TRUE
payment_department = ACCOUNT_CMD
allow_custom = TRUE
refill_canister = /obj/item/vending_refill/wardrobe/comm_wardrobe
payment_department = ACCOUNT_CMD
light_color = COLOR_COMMAND_BLUE
/obj/item/vending_refill/wardrobe/comm_wardrobe
machine_name = "CommDrobe"
/obj/machinery/vending/access/command/build_access_list(list/access_lists)
access_lists["[ACCESS_CAPTAIN]"] = list(
// CAPTAIN
/obj/item/clothing/head/hats/caphat = 1,
/obj/item/clothing/head/caphat/beret = 1,
/obj/item/clothing/head/caphat/beret/alt = 1,
/obj/item/clothing/head/hats/imperial/cap = 1,
/obj/item/clothing/under/rank/captain = 1,
/obj/item/clothing/under/rank/captain/skirt = 1,
/obj/item/clothing/under/rank/captain/dress = 1,
/obj/item/clothing/under/rank/captain/skyrat/kilt = 1,
/obj/item/clothing/under/rank/captain/skyrat/shipdress = 1,
/obj/item/clothing/under/rank/captain/skyrat/imperial = 1,
/obj/item/clothing/under/rank/captain/skyrat/pilot = 1,
/obj/item/clothing/under/rank/captain/skyrat/pilot/skirt = 1,
/obj/item/clothing/head/hats/caphat/parade = 1,
/obj/item/clothing/head/costume/crown/fancy = 1,
/obj/item/clothing/head/hats/caphat/bicorne = 1,
/obj/item/clothing/head/hats/caphat/sonnensoldner = 1,
/obj/item/clothing/under/rank/captain/parade = 1,
/obj/item/clothing/suit/armor/vest/capcarapace/captains_formal = 1,
/obj/item/clothing/suit/armor/vest/capcarapace/jacket = 1,
/obj/item/clothing/suit/armor/vest/capcarapace/robe = 1,
/obj/item/clothing/suit/armor/vest/capcarapace/robe/overseer = 1,
/obj/item/clothing/suit/armor/vest/capcarapace/bathrobe = 1,
/obj/item/clothing/suit/armor/vest/capcarapace/suitjacket = 1,
/obj/item/clothing/suit/armor/vest/capcarapace/gambison = 1,
/obj/item/clothing/suit/armor/vest/capcarapace/winterovercoat = 1,
/obj/item/clothing/suit/armor/vest/capcarapace/overcoat = 1,
/obj/item/clothing/suit/jacket/capjacket = 1,
/obj/item/clothing/suit/hooded/wintercoat/captain = 1,
/obj/item/clothing/neck/cloak/cap = 1,
/obj/item/clothing/neck/mantle/capmantle = 1,
/obj/item/storage/backpack/captain = 1,
/obj/item/storage/backpack/satchel/cap = 1,
/obj/item/storage/backpack/duffelbag/captain = 1,
/obj/item/storage/backpack/messenger/cap = 1,
/obj/item/clothing/shoes/sneakers/brown = 1,
// BLUESHIELD
/obj/item/clothing/head/beret/blueshield = 1,
/obj/item/clothing/head/beret/blueshield/navy = 1,
/obj/item/clothing/under/rank/blueshield = 1,
/obj/item/clothing/under/rank/blueshield/skirt = 1,
/obj/item/clothing/under/rank/blueshield/turtleneck = 1,
/obj/item/clothing/under/rank/blueshield/turtleneck/skirt = 1,
/obj/item/clothing/under/rank/blueshield/consult = 1,
/obj/item/clothing/under/rank/blueshield/consult/skirt = 1,
/obj/item/clothing/under/rank/blueshield/russian = 1,
/obj/item/clothing/under/rank/blueshield/formal = 1,
/obj/item/clothing/under/rank/blueshield/naval = 1,
/obj/item/clothing/suit/armor/vest/blueshield = 1,
/obj/item/clothing/suit/armor/vest/blueshield/jacket = 1,
/obj/item/clothing/neck/mantle/bsmantle = 1,
/obj/item/storage/backpack/blueshield = 1,
/obj/item/storage/backpack/satchel/blueshield = 1,
/obj/item/storage/backpack/duffelbag/blueshield = 1,
/obj/item/storage/backpack/messenger/blueshield = 1,
/obj/item/clothing/shoes/laceup = 1,
)
access_lists["[ACCESS_HOP]"] = list( // Best head btw
/obj/item/clothing/head/hats/hopcap = 1,
/obj/item/clothing/head/hopcap/beret = 1,
/obj/item/clothing/head/hopcap/beret/alt = 1,
/obj/item/clothing/head/hats/imperial/hop = 1,
/obj/item/clothing/under/rank/civilian/head_of_personnel = 1,
/obj/item/clothing/under/rank/civilian/head_of_personnel/skirt = 1,
/obj/item/clothing/under/rank/civilian/head_of_personnel/skyrat/turtleneck = 1,
/obj/item/clothing/under/rank/civilian/head_of_personnel/skyrat/turtleneck/skirt = 1,
/obj/item/clothing/under/rank/civilian/head_of_personnel/skyrat/parade = 1,
/obj/item/clothing/under/rank/civilian/head_of_personnel/skyrat/parade/female = 1,
/obj/item/clothing/under/rank/civilian/head_of_personnel/skyrat/imperial = 1,
/obj/item/clothing/suit/armor/vest/hop/hop_formal = 1,
/obj/item/clothing/suit/hooded/wintercoat/hop = 1,
/obj/item/clothing/neck/cloak/hop = 1,
/obj/item/clothing/neck/mantle/hopmantle = 1,
/obj/item/storage/backpack/head_of_personnel = 1,
/obj/item/storage/backpack/satchel/head_of_personnel = 1,
/obj/item/storage/backpack/duffelbag/head_of_personnel = 1,
/obj/item/storage/backpack/messenger/head_of_personnel = 1,
/obj/item/clothing/shoes/sneakers/brown = 1,
)
access_lists["[ACCESS_CMO]"] = list(
/obj/item/clothing/head/beret/medical/cmo = 1,
/obj/item/clothing/head/beret/medical/cmo/alt = 1,
/obj/item/clothing/head/hats/imperial/cmo = 1,
/obj/item/clothing/head/utility/surgerycap/cmo = 1,
/obj/item/clothing/under/rank/medical/chief_medical_officer = 1,
/obj/item/clothing/under/rank/medical/chief_medical_officer/skirt = 1,
/obj/item/clothing/under/rank/medical/chief_medical_officer/turtleneck = 1,
/obj/item/clothing/under/rank/medical/chief_medical_officer/skyrat/imperial = 1,
/obj/item/clothing/under/rank/medical/chief_medical_officer/scrubs = 1,
/obj/item/clothing/suit/hooded/wintercoat/medical/cmo = 1,
/obj/item/clothing/neck/cloak/cmo = 1,
/obj/item/clothing/neck/mantle/cmomantle = 1,
/obj/item/clothing/shoes/sneakers/brown = 1,
)
access_lists["[ACCESS_RD]"] = list(
/obj/item/clothing/head/beret/science/rd = 1,
/obj/item/clothing/head/beret/science/rd/alt = 1,
/obj/item/clothing/under/rank/rnd/research_director = 1,
/obj/item/clothing/under/rank/rnd/research_director/skirt = 1,
/obj/item/clothing/under/rank/rnd/research_director/alt = 1,
/obj/item/clothing/under/rank/rnd/research_director/turtleneck = 1,
/obj/item/clothing/under/rank/rnd/research_director/turtleneck/skirt = 1,
/obj/item/clothing/under/rank/rnd/research_director/skyrat/jumpsuit = 1,
/obj/item/clothing/under/rank/rnd/research_director/skyrat/jumpsuit/skirt = 1,
/obj/item/clothing/under/rank/rnd/research_director/skyrat/imperial = 1,
/obj/item/clothing/neck/cloak/rd = 1,
/obj/item/clothing/neck/mantle/rdmantle = 1,
/obj/item/clothing/suit/toggle/labcoat = 1,
/obj/item/clothing/suit/toggle/labcoat/skyrat/rd = 1,
/obj/item/clothing/suit/toggle/labcoat/research_director = 1,
/obj/item/clothing/suit/hooded/wintercoat/science/rd = 1,
/obj/item/clothing/shoes/sneakers/brown = 1,
)
access_lists["[ACCESS_CE]"] = list(
/obj/item/clothing/head/beret/engi/ce = 1,
/obj/item/clothing/head/utility/hardhat/white = 1,
/obj/item/clothing/head/utility/hardhat/welding/white = 1,
/obj/item/clothing/head/hats/imperial/ce = 1,
/obj/item/clothing/under/rank/engineering/chief_engineer = 1,
/obj/item/clothing/under/rank/engineering/chief_engineer/turtleneck = 1,
/obj/item/clothing/under/rank/engineering/chief_engineer/skirt = 1,
/obj/item/clothing/under/rank/engineering/chief_engineer/turtleneck/skirt = 1,
/obj/item/clothing/under/rank/engineering/chief_engineer/skyrat/imperial = 1,
/obj/item/clothing/suit/hooded/wintercoat/engineering/ce = 1,
/obj/item/clothing/neck/cloak/ce = 1,
/obj/item/clothing/neck/mantle/cemantle = 1,
/obj/item/clothing/shoes/sneakers/brown = 1,
)
access_lists["[ACCESS_HOS]"] = list(
/obj/item/clothing/head/hats/hos/cap = 1,
/obj/item/clothing/head/hats/hos/beret/navyhos = 1,
/obj/item/clothing/head/hats/imperial/hos = 1,
/obj/item/clothing/head/hats/hos/beret = 1,
/obj/item/clothing/under/rank/security/head_of_security/peacekeeper = 1,
/obj/item/clothing/under/rank/security/head_of_security/alt = 1,
/obj/item/clothing/under/rank/security/head_of_security/alt/skirt = 1,
/obj/item/clothing/under/rank/security/head_of_security/grey = 1,
/obj/item/clothing/under/rank/security/head_of_security/skyrat/imperial = 1,
/obj/item/clothing/suit/jacket/hos/blue = 1,
/obj/item/clothing/suit/armor/hos = 1,
/obj/item/clothing/suit/armor/hos/trenchcoat = 1,
/obj/item/clothing/suit/armor/hos/trenchcoat/winter = 1,
/obj/item/clothing/suit/armor/vest/leather = 1,
/obj/item/clothing/under/rank/security/head_of_security/parade = 1,
/obj/item/clothing/under/rank/security/head_of_security/parade/female = 1,
/obj/item/clothing/suit/armor/hos/hos_formal = 1,
/obj/item/clothing/neck/cloak/hos = 1,
/obj/item/clothing/neck/cloak/hos/redsec = 1,
/obj/item/clothing/neck/mantle/hosmantle = 1,
/obj/item/clothing/glasses/hud/security/sunglasses/eyepatch = 1,
/obj/item/clothing/glasses/hud/security/sunglasses/gars/giga = 1,
/obj/item/clothing/mask/gas/sechailer/swat = 1,
/obj/item/clothing/shoes/sneakers/brown = 1,
)
access_lists["[ACCESS_QM]"] = list(
/obj/item/clothing/head/beret/cargo/qm = 1,
/obj/item/clothing/head/beret/cargo/qm/alt = 1,
/obj/item/clothing/neck/cloak/qm = 1,
/obj/item/clothing/neck/mantle/qm = 1,
/obj/item/clothing/under/rank/cargo/qm = 1,
/obj/item/clothing/under/rank/cargo/qm/skirt = 1,
/obj/item/clothing/under/rank/cargo/qm/skyrat/gorka = 1,
/obj/item/clothing/under/rank/cargo/qm/skyrat/turtleneck = 1,
/obj/item/clothing/under/rank/cargo/qm/skyrat/turtleneck/skirt = 1,
/obj/item/clothing/suit/brownfurrich = 1,
/obj/item/clothing/under/rank/cargo/qm/skyrat/casual = 1,
/obj/item/clothing/suit/toggle/jacket/supply/head = 1,
/obj/item/clothing/under/rank/cargo/qm/skyrat/formal = 1,
/obj/item/clothing/under/rank/cargo/qm/skyrat/formal/skirt = 1,
/obj/item/clothing/shoes/sneakers/brown = 1,
)
access_lists["[ACCESS_CENT_GENERAL]"] = list( // CC Rep Shiz
/obj/item/clothing/head/nanotrasen_consultant = 1,
/obj/item/clothing/head/nanotrasen_consultant/beret = 1,
/obj/item/clothing/head/beret/centcom_formal/nt_consultant = 1,
/obj/item/clothing/head/nanotrasen_consultant/beret/officer = 1,
/obj/item/clothing/head/hats/centhat = 1,
/obj/item/clothing/head/hats/caphat/naval = 1,
/obj/item/clothing/neck/cloak/admiral = 1,
/obj/item/clothing/under/rank/nanotrasen_consultant = 1,
/obj/item/clothing/under/rank/nanotrasen_consultant/skirt = 1,
/obj/item/clothing/under/rank/centcom/skyrat/naval = 1,
/obj/item/clothing/under/rank/centcom/skyrat/naval/commander = 1,
/obj/item/clothing/under/rank/centcom/skyrat/naval/admiral = 1,
/obj/item/clothing/under/rank/centcom/skyrat/naval/fleet_admiral = 1,
/obj/item/clothing/under/rank/nanotrasen_consultant/naval = 1,
/obj/item/clothing/suit/armor/centcom_formal/nt_consultant = 1,
/obj/item/clothing/suit/armor/vest/nanotrasen_consultant/green = 1,
/obj/item/clothing/gloves/combat/naval/nanotrasen_consultant = 1,
)
access_lists["[ACCESS_COMMAND]"] = list(
/obj/item/clothing/head/hats/imperial = 5,
/obj/item/clothing/head/hats/imperial/grey = 5,
/obj/item/clothing/head/hats/imperial/white = 2,
/obj/item/clothing/head/hats/imperial/red = 5,
/obj/item/clothing/head/hats/imperial/helmet = 5,
/obj/item/clothing/suit/armor/vest/bridge = 5,
/obj/item/clothing/glasses/sunglasses/gar/giga = 5,
/obj/item/clothing/head/hats/caphat/naval/fleet_admiral = 5,
/obj/item/clothing/neck/cloak/fleet_admiral = 5,
/obj/item/clothing/under/rank/captain/skyrat/imperial/generic = 5,
/obj/item/clothing/under/rank/captain/skyrat/imperial/generic/grey = 5,
/obj/item/clothing/under/rank/captain/skyrat/imperial/generic/pants = 5,
/obj/item/clothing/under/rank/captain/skyrat/imperial/generic/red = 5,
/obj/item/clothing/under/rank/bridge_assistant = 5,
/obj/item/clothing/under/rank/bridge_assistant/skirt = 5,
/obj/item/clothing/under/rank/bridge_assistant/turtle = 5,
/obj/item/clothing/under/rank/bridge_assistant/turtle/skirt = 5,
)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

View File

@@ -375,6 +375,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
r_pocket = /obj/item/flashlight/seclite r_pocket = /obj/item/flashlight/seclite
l_pocket = /obj/item/gun/ballistic/revolver/sol l_pocket = /obj/item/gun/ballistic/revolver/sol
id = /obj/item/card/id/advanced/terragov id = /obj/item/card/id/advanced/terragov
accessory = /obj/item/clothing/accessory/bubber/acc_medal/neckpin/galfed911
backpack_contents = list( backpack_contents = list(
/obj/item/storage/box/survival = 1, /obj/item/storage/box/survival = 1,
/obj/item/ammo_box/c35sol = 1, /obj/item/ammo_box/c35sol = 1,
@@ -410,6 +411,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
id = /obj/item/card/id/advanced/terragov id = /obj/item/card/id/advanced/terragov
r_pocket = /obj/item/modular_computer/pda/request_911/atmos r_pocket = /obj/item/modular_computer/pda/request_911/atmos
l_pocket = /obj/item/holosign_creator/atmos l_pocket = /obj/item/holosign_creator/atmos
accessory = /obj/item/clothing/accessory/bubber/acc_medal/neckpin/galfed811
backpack_contents = list(/obj/item/storage/box/rcd_ammo = 1, backpack_contents = list(/obj/item/storage/box/rcd_ammo = 1,
/obj/item/storage/box/smart_metal_foam = 1, /obj/item/storage/box/smart_metal_foam = 1,
/obj/item/multitool = 1, /obj/item/multitool = 1,
@@ -463,6 +465,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
r_pocket = /obj/item/flashlight/seclite r_pocket = /obj/item/flashlight/seclite
l_pocket = /obj/item/storage/medkit/civil_defense l_pocket = /obj/item/storage/medkit/civil_defense
r_hand = /obj/item/storage/backpack/duffelbag/deforest_surgical/stocked r_hand = /obj/item/storage/backpack/duffelbag/deforest_surgical/stocked
accessory = /obj/item/clothing/accessory/bubber/acc_medal/neckpin/galfed
backpack_contents = list( backpack_contents = list(
/obj/item/storage/box/survival = 1, /obj/item/storage/box/survival = 1,
/obj/item/emergency_bed = 1, /obj/item/emergency_bed = 1,
@@ -513,6 +516,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
l_pocket = /obj/item/restraints/handcuffs l_pocket = /obj/item/restraints/handcuffs
id = /obj/item/card/id/advanced/terragov id = /obj/item/card/id/advanced/terragov
l_hand = /obj/item/gun/ballistic/automatic/sol_rifle l_hand = /obj/item/gun/ballistic/automatic/sol_rifle
accessory = /obj/item/clothing/accessory/bubber/galfedribbon/rank4
backpack_contents = list( backpack_contents = list(
/obj/item/storage/box/survival = 1, /obj/item/storage/box/survival = 1,
/obj/item/melee/baton/telescopic = 1, /obj/item/melee/baton/telescopic = 1,

View File

@@ -324,6 +324,9 @@
uniform = /obj/item/clothing/under/rank/captain/skyrat/utility/syndicate uniform = /obj/item/clothing/under/rank/captain/skyrat/utility/syndicate
suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate
back = /obj/item/storage/backpack/satchel back = /obj/item/storage/backpack/satchel
backpack_contents = list(
/obj/item/storage/lockbox/medal/bubber/synd = 1,
)
belt = /obj/item/storage/belt/sheath/sabre belt = /obj/item/storage/belt/sheath/sabre
head = /obj/item/clothing/head/hats/hos/cap/syndicate head = /obj/item/clothing/head/hats/hos/cap/syndicate
id = /obj/item/card/id/advanced/gold/generic id = /obj/item/card/id/advanced/gold/generic

View File

@@ -64,7 +64,7 @@
messenger = /obj/item/storage/backpack/messenger messenger = /obj/item/storage/backpack/messenger
implants = list(/obj/item/implant/mindshield) implants = list(/obj/item/implant/mindshield)
accessory = /obj/item/clothing/accessory/medal/gold/nanotrasen_consultant accessory = /obj/item/clothing/accessory/bubber/acc_medal/neckpin/centcom
chameleon_extras = list(/obj/item/gun/energy/e_gun, /obj/item/stamp/centcom) chameleon_extras = list(/obj/item/gun/energy/e_gun, /obj/item/stamp/centcom)

View File

@@ -0,0 +1,102 @@
{
"medal": [
{
"type": "icon_state",
"icon_state": "ribbon_arrow",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_2",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_3",
"blend_mode": "overlay",
"color_ids": [3]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_4",
"blend_mode": "overlay",
"color_ids": [4]
},
{
"type": "icon_state",
"icon_state": "bar",
"blend_mode": "overlay",
"color_ids": [5]
},
{
"type": "icon_state",
"icon_state": "blank",
"blend_mode": "overlay"
}
],
"medal_bar_ribbon": [
{
"type": "icon_state",
"icon_state": "ribbon_bars",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "ribbon_bars_2",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "ribbon_bars_3",
"blend_mode": "overlay",
"color_ids": [3]
},
{
"type": "icon_state",
"icon_state": "bar",
"blend_mode": "overlay",
"color_ids": [4]
},
{
"type": "icon_state",
"icon_state": "blank",
"blend_mode": "overlay"
}
],
"medal_hollow": [
{
"type": "icon_state",
"icon_state": "ribbon_arrow",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_2",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_3",
"blend_mode": "overlay",
"color_ids": [3]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_4",
"blend_mode": "overlay",
"color_ids": [4]
},
{
"type": "icon_state",
"icon_state": "bar_h",
"blend_mode": "overlay",
"color_ids": [5]
}
]
}

View File

@@ -0,0 +1,160 @@
{
"medal": [
{
"type": "icon_state",
"icon_state": "ribbon_arrow",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_2",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_3",
"blend_mode": "overlay",
"color_ids": [3]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_4",
"blend_mode": "overlay",
"color_ids": [4]
},
{
"type": "icon_state",
"icon_state": "circle",
"blend_mode": "overlay",
"color_ids": [5]
}
],
"medal_bar_ribbon": [
{
"type": "icon_state",
"icon_state": "ribbon_bars",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "ribbon_bars_2",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "ribbon_bars_3",
"blend_mode": "overlay",
"color_ids": [3]
},
{
"type": "icon_state",
"icon_state": "circle",
"blend_mode": "overlay",
"color_ids": [4]
},
{
"type": "icon_state",
"icon_state": "blank",
"blend_mode": "overlay"
}
],
"medal_alt": [
{
"type": "icon_state",
"icon_state": "ribbon_arrow",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_2",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_3",
"blend_mode": "overlay",
"color_ids": [3]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_4",
"blend_mode": "overlay",
"color_ids": [4]
},
{
"type": "icon_state",
"icon_state": "circle_alt",
"blend_mode": "overlay",
"color_ids": [5]
}
],
"medal_hollow": [
{
"type": "icon_state",
"icon_state": "ribbon_arrow",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_2",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_3",
"blend_mode": "overlay",
"color_ids": [3]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_4",
"blend_mode": "overlay",
"color_ids": [4]
},
{
"type": "icon_state",
"icon_state": "circle_h",
"blend_mode": "overlay",
"color_ids": [5]
}
],
"medal_hollow_bar_ribbon": [
{
"type": "icon_state",
"icon_state": "ribbon_bars",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "ribbon_bars_2",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "ribbon_bars_3",
"blend_mode": "overlay",
"color_ids": [3]
},
{
"type": "icon_state",
"icon_state": "circle_h",
"blend_mode": "overlay",
"color_ids": [4]
},
{
"type": "icon_state",
"icon_state": "blank",
"blend_mode": "overlay"
}
]
}

View File

@@ -0,0 +1,142 @@
{
"ribbon1": [
{
"type": "icon_state",
"icon_state": "ribbonbase_1",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "ribbonbase_2",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrdown",
"blend_mode": "overlay",
"color_ids": [3]
}
],
"ribbon2": [
{
"type": "icon_state",
"icon_state": "ribbonbase_1",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "ribbonbase_2",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "ribbon_slash",
"blend_mode": "overlay",
"color_ids": [3]
}
],
"ribbon3": [
{
"type": "icon_state",
"icon_state": "ribbonbase_1",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "ribbonbase_2",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrup",
"blend_mode": "overlay",
"color_ids": [3]
}
],
"ribbon4": [
{
"type": "icon_state",
"icon_state": "ribbonbase_1",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "ribbonbase_2",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "ribbon_line",
"blend_mode": "overlay",
"color_ids": [3]
}
],
"ribbon5": [
{
"type": "icon_state",
"icon_state": "ribbonbase_1",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "ribbonbase_2",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "ribbon_dual",
"blend_mode": "overlay",
"color_ids": [3]
}
],
"ribbon6": [
{
"type": "icon_state",
"icon_state": "ribbonbase_1",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "ribbonbase_2",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "ribbon_flat",
"blend_mode": "overlay",
"color_ids": [3]
}
],
"ribbon7": [
{
"type": "icon_state",
"icon_state": "ribbonbase_1",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "ribbonbase_2",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "ribbon_twotone",
"blend_mode": "overlay",
"color_ids": [3]
}
]
}

View File

@@ -0,0 +1,128 @@
{
"medal": [
{
"type": "icon_state",
"icon_state": "ribbon_arrow",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_2",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_3",
"blend_mode": "overlay",
"color_ids": [3]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_4",
"blend_mode": "overlay",
"color_ids": [4]
},
{
"type": "icon_state",
"icon_state": "crown",
"blend_mode": "overlay",
"color_ids": [5]
}
],
"medal_bar_ribbon": [
{
"type": "icon_state",
"icon_state": "ribbon_bars",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "ribbon_bars_2",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "ribbon_bars_3",
"blend_mode": "overlay",
"color_ids": [3]
},
{
"type": "icon_state",
"icon_state": "crown",
"blend_mode": "overlay",
"color_ids": [4]
},
{
"type": "icon_state",
"icon_state": "blank",
"blend_mode": "overlay"
}
],
"medal_hollow": [
{
"type": "icon_state",
"icon_state": "ribbon_arrow",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_2",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_3",
"blend_mode": "overlay",
"color_ids": [3]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_4",
"blend_mode": "overlay",
"color_ids": [4]
},
{
"type": "icon_state",
"icon_state": "crown_h",
"blend_mode": "overlay",
"color_ids": [5]
}
],
"medal_hollow_bar_ribbon": [
{
"type": "icon_state",
"icon_state": "ribbon_bars",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "ribbon_bars_2",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "ribbon_bars_3",
"blend_mode": "overlay",
"color_ids": [3]
},
{
"type": "icon_state",
"icon_state": "crown_h",
"blend_mode": "overlay",
"color_ids": [4]
},
{
"type": "icon_state",
"icon_state": "blank",
"blend_mode": "overlay"
}
]
}

View File

@@ -0,0 +1,132 @@
{
"necklace_bar": [
{
"type": "icon_state",
"icon_state": "necklace",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "glowbar",
"blend_mode": "overlay",
"color_ids": [1]
}
],
"necklace_bar_hollow": [
{
"type": "icon_state",
"icon_state": "necklace",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "glowbar_hlw",
"blend_mode": "overlay",
"color_ids": [1]
}
],
"necklace_diamond": [
{
"type": "icon_state",
"icon_state": "necklace",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "glowdiamond",
"blend_mode": "overlay",
"color_ids": [1]
}
],
"necklace_diamond_hollow": [
{
"type": "icon_state",
"icon_state": "necklace",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "glowdiamond_hlw",
"blend_mode": "overlay",
"color_ids": [1]
}
],
"necklace_shard": [
{
"type": "icon_state",
"icon_state": "necklace",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "glowshard",
"blend_mode": "overlay",
"color_ids": [1]
}
],
"necklace_shard_hollow": [
{
"type": "icon_state",
"icon_state": "necklace",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "glowshard_hlw",
"blend_mode": "overlay",
"color_ids": [1]
}
],
"necklace_triangle": [
{
"type": "icon_state",
"icon_state": "necklace",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "glowtri",
"blend_mode": "overlay",
"color_ids": [1]
}
],
"necklace_triangle_hollow": [
{
"type": "icon_state",
"icon_state": "necklace",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "glowtri_hlw",
"blend_mode": "overlay",
"color_ids": [1]
}
],
"necklace_crystal": [
{
"type": "icon_state",
"icon_state": "necklace",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "glowcrystal",
"blend_mode": "overlay",
"color_ids": [1]
}
],
"necklace_circle": [
{
"type": "icon_state",
"icon_state": "necklace",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "glowcircle",
"blend_mode": "overlay",
"color_ids": [1]
}
]
}

View File

@@ -0,0 +1,128 @@
{
"medal": [
{
"type": "icon_state",
"icon_state": "ribbon_arrow",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_2",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_3",
"blend_mode": "overlay",
"color_ids": [3]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_4",
"blend_mode": "overlay",
"color_ids": [4]
},
{
"type": "icon_state",
"icon_state": "heart",
"blend_mode": "overlay",
"color_ids": [5]
}
],
"medal_bar_ribbon": [
{
"type": "icon_state",
"icon_state": "ribbon_bars",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "ribbon_bars_2",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "ribbon_bars_3",
"blend_mode": "overlay",
"color_ids": [3]
},
{
"type": "icon_state",
"icon_state": "heart",
"blend_mode": "overlay",
"color_ids": [4]
},
{
"type": "icon_state",
"icon_state": "blank",
"blend_mode": "overlay"
}
],
"medal_special": [
{
"type": "icon_state",
"icon_state": "ribbon_arrow",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_2",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_3",
"blend_mode": "overlay",
"color_ids": [3]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_4",
"blend_mode": "overlay",
"color_ids": [4]
},
{
"type": "icon_state",
"icon_state": "heart_s",
"blend_mode": "overlay",
"color_ids": [5]
}
],
"medal_special_bar_ribbon": [
{
"type": "icon_state",
"icon_state": "ribbon_bars",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "ribbon_bars_2",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "ribbon_bars_3",
"blend_mode": "overlay",
"color_ids": [3]
},
{
"type": "icon_state",
"icon_state": "heart_s",
"blend_mode": "overlay",
"color_ids": [4]
},
{
"type": "icon_state",
"icon_state": "blank",
"blend_mode": "overlay"
}
]
}

View File

@@ -0,0 +1,59 @@
{
"ribbon1": [
{
"type": "icon_state",
"icon_state": "1tone",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "blank",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "blank",
"blend_mode": "overlay"
}
],
"ribbon2": [
{
"type": "icon_state",
"icon_state": "2tone_1",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "2tone_2",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "blank",
"blend_mode": "overlay"
}
],
"ribbon3": [
{
"type": "icon_state",
"icon_state": "3tone_1",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "3tone_2",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "3tone_3",
"blend_mode": "overlay",
"color_ids": [3]
}
]
}

View File

@@ -0,0 +1,182 @@
{
"ntpin": [
{
"type": "icon_state",
"icon_state": "pin_border",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "pin_back",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "pinnt",
"blend_mode": "overlay",
"color_ids": [1]
}
],
"ccpin": [
{
"type": "icon_state",
"icon_state": "pin_border",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "pin_back",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "pincc",
"blend_mode": "overlay",
"color_ids": [1]
}
],
"sfpin": [
{
"type": "icon_state",
"icon_state": "pin_border",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "pin_back",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "pinsf",
"blend_mode": "overlay",
"color_ids": [1]
}
],
"911pin": [
{
"type": "icon_state",
"icon_state": "pin_border",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "pin_back",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "pin911",
"blend_mode": "overlay",
"color_ids": [1]
}
],
"811pin": [
{
"type": "icon_state",
"icon_state": "pin_border",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "pin_back",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "pin811",
"blend_mode": "overlay",
"color_ids": [1]
}
],
"shieldpin": [
{
"type": "icon_state",
"icon_state": "pin_border",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "pin_back",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "pinshield",
"blend_mode": "overlay",
"color_ids": [1]
}
],
"syndipin": [
{
"type": "icon_state",
"icon_state": "pin_border",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "pin_back",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "pinsynd",
"blend_mode": "overlay",
"color_ids": [1]
}
],
"ippin": [
{
"type": "icon_state",
"icon_state": "pin_border",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "pin_back",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "pinip",
"blend_mode": "overlay",
"color_ids": [1]
}
],
"ptpin": [
{
"type": "icon_state",
"icon_state": "pin_border",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "pin_back",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "pinpt",
"blend_mode": "overlay",
"color_ids": [1]
}
]
}

View File

@@ -0,0 +1,26 @@
{
"star": [
{
"type": "icon_state",
"icon_state": "rankpin_star",
"blend_mode": "overlay",
"color_ids": [1]
}
],
"bar": [
{
"type": "icon_state",
"icon_state": "rankpin_bar",
"blend_mode": "overlay",
"color_ids": [1]
}
],
"two_bar": [
{
"type": "icon_state",
"icon_state": "rankpin_bar_2",
"blend_mode": "overlay",
"color_ids": [1]
}
]
}

View File

@@ -0,0 +1,261 @@
{
"arr_ribbon_1": [
{
"type": "icon_state",
"icon_state": "sfribbon",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "arr_mid",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
],
"arr_ribbon_2": [
{
"type": "icon_state",
"icon_state": "sfribbon",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "arr_mid",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "arr_btm",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
],
"arr_ribbon_3": [
{
"type": "icon_state",
"icon_state": "sfribbon",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "arr_mid",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "arr_btm",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "arr_top",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
],
"sw_ribbon_1": [
{
"type": "icon_state",
"icon_state": "sfribbon",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "sw_mid",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
],
"sw_ribbon_2": [
{
"type": "icon_state",
"icon_state": "sfribbon",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "sw_mid",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "sw_btm",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
],
"sw_ribbon_3": [
{
"type": "icon_state",
"icon_state": "sfribbon",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "sw_mid",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "sw_btm",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "sw_top",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
],
"star_arr_ribbon_1": [
{
"type": "icon_state",
"icon_state": "sfribbon",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "star_top",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "arr_mid",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
],
"star_arr_ribbon_2": [
{
"type": "icon_state",
"icon_state": "sfribbon",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "star_top",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "arr_mid",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "arr_btm",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
],
"star_sw_ribbon_1": [
{
"type": "icon_state",
"icon_state": "sfribbon",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "star_top",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "sw_mid",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
],
"star_sw_ribbon_2": [
{
"type": "icon_state",
"icon_state": "sfribbon",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "star_top",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "sw_mid",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "sw_btm",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
],
"star_ribbon_1": [
{
"type": "icon_state",
"icon_state": "sfribbon",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "star_top",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
],
"star_ribbon_2": [
{
"type": "icon_state",
"icon_state": "sfribbon",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "star_top",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "star_mid",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
],
"star_ribbon_3": [
{
"type": "icon_state",
"icon_state": "sfribbon",
"blend_mode": "overlay"
},
{
"type": "icon_state",
"icon_state": "star_top",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "star_mid",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "star_btm",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
]
}

View File

@@ -0,0 +1,97 @@
{
"medal": [
{
"type": "icon_state",
"icon_state": "ribbon_arrow",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_2",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_3",
"blend_mode": "overlay",
"color_ids": [3]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_4",
"blend_mode": "overlay",
"color_ids": [4]
},
{
"type": "icon_state",
"icon_state": "shield",
"blend_mode": "overlay",
"color_ids": [5]
}
],
"medal_bar_ribbon": [
{
"type": "icon_state",
"icon_state": "ribbon_bars",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "ribbon_bars_2",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "ribbon_bars_3",
"blend_mode": "overlay",
"color_ids": [3]
},
{
"type": "icon_state",
"icon_state": "shield",
"blend_mode": "overlay",
"color_ids": [4]
},
{
"type": "icon_state",
"icon_state": "blank",
"blend_mode": "overlay"
}
],
"medal_hollow": [
{
"type": "icon_state",
"icon_state": "ribbon_arrow",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_2",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_3",
"blend_mode": "overlay",
"color_ids": [3]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_4",
"blend_mode": "overlay",
"color_ids": [4]
},
{
"type": "icon_state",
"icon_state": "shield_h",
"blend_mode": "overlay",
"color_ids": [5]
}
]
}

View File

@@ -0,0 +1,194 @@
{
"medal_robust": [
{
"type": "icon_state",
"icon_state": "ribbon_arrow",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_2",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_3",
"blend_mode": "overlay",
"color_ids": [3]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_4",
"blend_mode": "overlay",
"color_ids": [4]
},
{
"type": "icon_state",
"icon_state": "shield_eagle",
"blend_mode": "overlay",
"color_ids": [5]
}
],
"medal_espi": [
{
"type": "icon_state",
"icon_state": "ribbon_arrow",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_2",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_3",
"blend_mode": "overlay",
"color_ids": [3]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_4",
"blend_mode": "overlay",
"color_ids": [4]
},
{
"type": "icon_state",
"icon_state": "circle_alt",
"blend_mode": "overlay",
"color_ids": [5]
}
],
"medal_inter": [
{
"type": "icon_state",
"icon_state": "ribbon_arrow",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_2",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_3",
"blend_mode": "overlay",
"color_ids": [3]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_4",
"blend_mode": "overlay",
"color_ids": [4]
},
{
"type": "icon_state",
"icon_state": "bar_h",
"blend_mode": "overlay",
"color_ids": [5]
}
],
"medal_intel": [
{
"type": "icon_state",
"icon_state": "ribbon_arrow",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_2",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_3",
"blend_mode": "overlay",
"color_ids": [3]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_4",
"blend_mode": "overlay",
"color_ids": [4]
},
{
"type": "icon_state",
"icon_state": "paper",
"blend_mode": "overlay",
"color_ids": [5]
}
],
"medal_dili": [
{
"type": "icon_state",
"icon_state": "ribbon_arrow",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_2",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_3",
"blend_mode": "overlay",
"color_ids": [3]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_4",
"blend_mode": "overlay",
"color_ids": [4]
},
{
"type": "icon_state",
"icon_state": "bar",
"blend_mode": "overlay",
"color_ids": [5]
}
],
"medal_comms": [
{
"type": "icon_state",
"icon_state": "ribbon_arrow",
"blend_mode": "overlay",
"color_ids": [1]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_2",
"blend_mode": "overlay",
"color_ids": [2]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_3",
"blend_mode": "overlay",
"color_ids": [3]
},
{
"type": "icon_state",
"icon_state": "ribbon_arrow_4",
"blend_mode": "overlay",
"color_ids": [4]
},
{
"type": "icon_state",
"icon_state": "paper",
"blend_mode": "overlay",
"color_ids": [5]
}
]
}

View File

@@ -5,3 +5,27 @@
/obj/item/storage/box/disks_plantgene/PopulateContents() /obj/item/storage/box/disks_plantgene/PopulateContents()
for(var/i in 1 to 7) for(var/i in 1 to 7)
new /obj/item/disk/plantgene(src) new /obj/item/disk/plantgene(src)
// Syndicate Admiral's Medals box
/obj/item/storage/lockbox/medal/bubber/synd
name = "syndicate medal box"
desc = "A locked box used to store medals of honor."
icon = 'modular_zubbers/icons/obj/box.dmi'
icon_state = "syndbox+l"
inhand_icon_state = "syringe_kit"
lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
w_class = WEIGHT_CLASS_NORMAL
req_access = list(ACCESS_SYNDICATE_LEADER)
icon_locked = "syndbox+l"
icon_closed = "syndbox"
icon_broken = "syndbox+b"
icon_open = "syndboxopen"
/obj/item/storage/lockbox/medal/bubber/synd/PopulateContents()
new /obj/item/clothing/accessory/medal/bubber/syndicate(src)
new /obj/item/clothing/accessory/medal/bubber/syndicate/espionage(src)
new /obj/item/clothing/accessory/medal/bubber/syndicate/interrogation(src)
new /obj/item/clothing/accessory/medal/bubber/syndicate/intelligence(src)
new /obj/item/clothing/accessory/medal/bubber/syndicate/diligence(src)
new /obj/item/clothing/accessory/medal/bubber/syndicate/communications(src)

View File

@@ -143,3 +143,133 @@
/datum/greyscale_config/sleeveless_crop_jacket/worn /datum/greyscale_config/sleeveless_crop_jacket/worn
name = "Tailored Jacket (Sleeveless, Worn)" name = "Tailored Jacket (Sleeveless, Worn)"
icon_file = 'modular_zubbers/icons/obj/clothing/suits/crop_jacket_worn.dmi' icon_file = 'modular_zubbers/icons/obj/clothing/suits/crop_jacket_worn.dmi'
//ITEMS
/datum/greyscale_config/umbrella
name = "Umbrella"
icon_file = 'modular_zubbers/icons/obj/equipment/umbrella.dmi'
json_config = 'modular_zubbers/code/datums/greyscale/json_configs/items/_umbrella.json'
/datum/greyscale_config/umbrella_inhand_left
name = "Held Umbrella, Left, Closed"
icon_file = 'modular_zubbers/icons/obj/equipment/umbrella_inhand_l.dmi'
json_config = 'modular_zubbers/code/datums/greyscale/json_configs/items/_umbrella_inhand.json'
/datum/greyscale_config/umbrella_inhand_right
name = "Held Umbrella, Right, Closed"
icon_file = 'modular_zubbers/icons/obj/equipment/umbrella_inhand_r.dmi'
json_config = 'modular_zubbers/code/datums/greyscale/json_configs/items/_umbrella_inhand.json'
/*
*
* Greyscaled Medals
*
*/
/datum/greyscale_config/medals
name = "Debug Medal Config"
//This sets the Obj icon. Worn configs still seperately change this to /mob/clothing/accessories.dmi
icon_file = 'modular_zubbers/icons/obj/clothing/accessories.dmi'
//This needs a json_config to work. Touch hacky, however, I *really* want this /medals for the subtyping.
json_config = 'modular_zubbers/code/datums/greyscale/json_configs/accessories/medals/bar_medal.json'
//Medals
/datum/greyscale_config/medals/syndicate
name = "Syndicate Medal"
json_config = 'modular_zubbers/code/datums/greyscale/json_configs/accessories/medals/syndicate.json'
/datum/greyscale_config/medals/syndicate/worn
name = "Syndicate Medal (Worn)"
icon_file = 'modular_zubbers/icons/mob/clothing/accessories.dmi'
/datum/greyscale_config/medals/shield
name = "Shield Medal"
json_config = 'modular_zubbers/code/datums/greyscale/json_configs/accessories/medals/shield_medal.json'
/datum/greyscale_config/medals/shield/worn
name = "Shield Medal (Worn)"
icon_file = 'modular_zubbers/icons/mob/clothing/accessories.dmi'
/datum/greyscale_config/medals/bar
name = "Bar Medal"
json_config = 'modular_zubbers/code/datums/greyscale/json_configs/accessories/medals/bar_medal.json'
/datum/greyscale_config/medals/bar/worn
name = "Bar Medal (Worn)"
icon_file = 'modular_zubbers/icons/mob/clothing/accessories.dmi'
/datum/greyscale_config/medals/circle
name = "Circle Medal"
json_config = 'modular_zubbers/code/datums/greyscale/json_configs/accessories/medals/circle_medal.json'
/datum/greyscale_config/medals/circle/worn
name = "Circle Medal (Worn)"
icon_file = 'modular_zubbers/icons/mob/clothing/accessories.dmi'
/datum/greyscale_config/medals/heart
name = "Heart Medal"
json_config = 'modular_zubbers/code/datums/greyscale/json_configs/accessories/medals/heart_medal.json'
/datum/greyscale_config/medals/heart/worn
name = "Heart Medal (Worn)"
icon_file = 'modular_zubbers/icons/mob/clothing/accessories.dmi'
/datum/greyscale_config/medals/crown
name = "Crown Medal"
json_config = 'modular_zubbers/code/datums/greyscale/json_configs/accessories/medals/crown_medal.json'
/datum/greyscale_config/medals/crown/worn
name = "Crown Medal (Worn)"
icon_file = 'modular_zubbers/icons/mob/clothing/accessories.dmi'
/datum/greyscale_config/medals/glow
name = "Glow Medal"
json_config = 'modular_zubbers/code/datums/greyscale/json_configs/accessories/medals/glow_medal.json'
/datum/greyscale_config/medals/glow/worn
name = "Glow Medal (Worn)"
icon_file = 'modular_zubbers/icons/mob/clothing/accessories.dmi'
//Pins
/datum/greyscale_config/medals/neckpins
name = "Neckpin Medal"
json_config = 'modular_zubbers/code/datums/greyscale/json_configs/accessories/medals/neckpins.json'
/datum/greyscale_config/medals/neckpins/worn
name = "Neckpin Medal (Worn)"
icon_file = 'modular_zubbers/icons/mob/clothing/accessories.dmi'
/datum/greyscale_config/medals/rank_pins
name = "Rank Pins"
json_config = 'modular_zubbers/code/datums/greyscale/json_configs/accessories/medals/rankpins.json'
/datum/greyscale_config/medals/rank_pins/worn
name = "Rank Pins (Worn)"
icon_file = 'modular_zubbers/icons/mob/clothing/accessories.dmi'
//Ribbons
/datum/greyscale_config/medals/color_ribbon
name = "Color Ribbon"
json_config = 'modular_zubbers/code/datums/greyscale/json_configs/accessories/medals/color_ribbon.json'
/datum/greyscale_config/medals/color_ribbon/worn
name = "Color Ribbon (Worn)"
icon_file = 'modular_zubbers/icons/mob/clothing/accessories.dmi'
/datum/greyscale_config/medals/military_ribbon
name = "Military Ribbon"
json_config = 'modular_zubbers/code/datums/greyscale/json_configs/accessories/medals/militaryribbon.json'
/datum/greyscale_config/medals/military_ribbon/worn
name = "Military Ribbon (Worn)"
icon_file = 'modular_zubbers/icons/mob/clothing/accessories.dmi'
// GalFed Accessories
/datum/greyscale_config/galfedribbons
name = "GalFed Ribbons"
icon_file = 'modular_zubbers/icons/obj/clothing/accessories.dmi'
json_config = 'modular_zubbers/code/datums/greyscale/json_configs/accessories/medals/sfranks.json'
/datum/greyscale_config/galfedribbons/worn
name = "GalFed Ribbons (Worn)"
icon_file = 'modular_zubbers/icons/mob/clothing/accessories.dmi'

View File

@@ -86,3 +86,428 @@
resistance_flags = FIRE_PROOF // its metal, and funny to leave behind when you dust. resistance_flags = FIRE_PROOF // its metal, and funny to leave behind when you dust.
attachment_slot = NONE attachment_slot = NONE
above_suit = TRUE above_suit = TRUE
/*
Greyscaled Medals
Highly modular and customizable spriteset.
Just a note - the .jsons will NOT agree with having different amounts of components per icon.
Use the 'blank' icon to keep the medals all sorted in their correct file,
even if they have different numbers of components.
Potential future ideas:
- Tie to job hours
- Unlock in Loadout when a requirement is met (i.e. job hours, as above)
- Department medals (adding to TG's existing medal lockboxes)
*/
/*
// AWARDABLE MEDALS
// These can be pinned onto others to 'award' them, appearing in the round-end screen
*/
/obj/item/clothing/accessory/medal/bubber
name = "medal of robustness"
desc = "A medal dedicated to those who display robustness in many fields."
icon = 'icons/map_icons/clothing/accessory.dmi'
icon_state = "/obj/item/clothing/accessory/medal/bubber"
post_init_icon_state = "medal_robust"
greyscale_config = /datum/greyscale_config/medals/syndicate
greyscale_config_worn = /datum/greyscale_config/medals/syndicate/worn
greyscale_colors = "#ffff66#990000#ffff66#990000#ffffff"
minimize_when_attached = TRUE
attachment_slot = NONE
flags_1 = IS_PLAYER_COLORABLE_1
// DS-2/Syndicate Medals
/obj/item/clothing/accessory/medal/bubber/syndicate
name = "syndicate medal of robustness"
desc = "A medal dedicated to true syndicate agents for robustness in many fields."
icon_state = "/obj/item/clothing/accessory/medal/bubber/syndicate"
post_init_icon_state = "medal_robust"
/obj/item/clothing/accessory/medal/bubber/syndicate/espionage
name = "syndicate medal of espionage"
desc = "A medal dedicated to those who have proven themselves capable at covert operations."
icon_state = "/obj/item/clothing/accessory/medal/bubber/syndicate/espionage"
post_init_icon_state = "medal_espi"
/obj/item/clothing/accessory/medal/bubber/syndicate/interrogation
name = "syndicate medal of interrogation"
desc = "A medal dedicated to those who have proven themselves capable at interrogating even the most resilient members of an enemy corporation."
icon_state = "/obj/item/clothing/accessory/medal/bubber/syndicate/interrogation"
post_init_icon_state = "medal_inter"
/obj/item/clothing/accessory/medal/bubber/syndicate/intelligence
name = "syndicate medal of intelligence"
desc = "A medal dedicated to agents of particular talent at both gathering information on competetors (in ways both subtle and overt) and protecting \
their own employers' confidentiality."
icon_state = "/obj/item/clothing/accessory/medal/bubber/syndicate/intelligence"
post_init_icon_state = "medal_intel"
/obj/item/clothing/accessory/medal/bubber/syndicate/diligence
name = "syndicate medal of diligence"
desc = "A medal dedicated to a rarer agent, one who doesn't rush in; this is for agents who, through patient observation and strategizing, seize the \
perfect moment to act. Like our emblematic snake, they wait to strike until the enemy shows their throat, and deliver the perfect killing blow."
icon_state = "/obj/item/clothing/accessory/medal/bubber/syndicate/diligence"
post_init_icon_state = "medal_dili"
/obj/item/clothing/accessory/medal/bubber/syndicate/communications
name = "syndicate medal of communication"
desc = "A medal dedicated to those whom have proven themselves as capable counter-communications specialists."
icon_state = "/obj/item/clothing/accessory/medal/bubber/syndicate/communications"
post_init_icon_state = "medal_comms"
/*
// ACCESSORY MEDALS
// These ones are purely cosmetic attachments
*/
/obj/item/clothing/accessory/bubber/acc_medal
name = "circle medal"
desc = "You shouldn't have this, make a bug report!"
icon = 'icons/map_icons/clothing/accessory.dmi'
icon_state = "/obj/item/clothing/accessory/bubber/acc_medal"
post_init_icon_state = "medal_alt"
greyscale_config = /datum/greyscale_config/medals/circle
greyscale_config_worn = /datum/greyscale_config/medals/circle/worn
greyscale_colors = "#9900cc#ffffff#9900cc#ff99ff#ffffff"
minimize_when_attached = TRUE
attachment_slot = NONE
flags_1 = IS_PLAYER_COLORABLE_1
/*
// Circle Medals
// The default acc_medal is already the 'alt_circle' and defines our configs
*/
/obj/item/clothing/accessory/bubber/acc_medal/circle
icon = 'icons/map_icons/clothing/accessory.dmi'
icon_state = "/obj/item/clothing/accessory/bubber/acc_medal/circle"
post_init_icon_state = "medal"
/obj/item/clothing/accessory/bubber/acc_medal/circle/bar_ribbon
icon_state = "/obj/item/clothing/accessory/bubber/acc_medal/circle/bar_ribbon"
post_init_icon_state = "medal_bar_ribbon"
/obj/item/clothing/accessory/bubber/acc_medal/circle/hollow
icon_state = "/obj/item/clothing/accessory/bubber/acc_medal/circle/hollow"
post_init_icon_state = "medal_hollow"
/obj/item/clothing/accessory/bubber/acc_medal/circle/hollow/bar_ribbon
icon_state = "/obj/item/clothing/accessory/bubber/acc_medal/circle/hollow/bar_ribbon"
post_init_icon_state = "medal_hollow_bar_ribbon"
/*
// Shield Medals
*/
/obj/item/clothing/accessory/bubber/acc_medal/shield
name = "shield medal"
desc = "A regular everyday medal."
icon_state = "/obj/item/clothing/accessory/bubber/acc_medal/shield"
post_init_icon_state = "medal"
greyscale_config = /datum/greyscale_config/medals/shield
greyscale_config_worn = /datum/greyscale_config/medals/shield/worn
/obj/item/clothing/accessory/bubber/acc_medal/shield/bar_ribbon
icon_state = "/obj/item/clothing/accessory/bubber/acc_medal/shield/bar_ribbon"
post_init_icon_state = "medal_bar_ribbon"
/obj/item/clothing/accessory/bubber/acc_medal/shield/hollow
icon_state = "/obj/item/clothing/accessory/bubber/acc_medal/shield/hollow"
post_init_icon_state = "medal_hollow"
/*
// Bar Medals
*/
/obj/item/clothing/accessory/bubber/acc_medal/bar
name = "bar medal"
desc = "A regular everyday medal."
icon_state = "/obj/item/clothing/accessory/bubber/acc_medal/bar"
post_init_icon_state = "medal"
greyscale_config = /datum/greyscale_config/medals/bar
greyscale_config_worn = /datum/greyscale_config/medals/bar/worn
/obj/item/clothing/accessory/bubber/acc_medal/bar/bar_ribbon
icon_state = "/obj/item/clothing/accessory/bubber/acc_medal/bar/bar_ribbon"
post_init_icon_state = "medal_bar_ribbon"
/obj/item/clothing/accessory/bubber/acc_medal/bar/hollow
icon_state = "/obj/item/clothing/accessory/bubber/acc_medal/bar/hollow"
post_init_icon_state = "medal_hollow"
/*
// Heart Medals
*/
/obj/item/clothing/accessory/bubber/acc_medal/heart
name = "heart medal"
desc = "A regular everyday medal."
icon = 'icons/map_icons/clothing/accessory.dmi'
icon_state = "/obj/item/clothing/accessory/bubber/acc_medal/heart"
post_init_icon_state = "medal"
greyscale_config = /datum/greyscale_config/medals/heart
greyscale_config_worn = /datum/greyscale_config/medals/heart/worn
/obj/item/clothing/accessory/bubber/acc_medal/heart/bar_ribbon
icon_state = "/obj/item/clothing/accessory/bubber/acc_medal/heart/bar_ribbon"
post_init_icon_state = "medal_bar_ribbon"
/obj/item/clothing/accessory/bubber/acc_medal/heart/special
icon_state = "/obj/item/clothing/accessory/bubber/acc_medal/heart/special"
post_init_icon_state = "medal_special"
/obj/item/clothing/accessory/bubber/acc_medal/heart/special/bar_ribbon
icon_state = "/obj/item/clothing/accessory/bubber/acc_medal/heart/special/bar_ribbon"
post_init_icon_state = "medal_special_bar_ribbon"
/*
// Crown Medals
*/
/obj/item/clothing/accessory/bubber/acc_medal/crown
name = "crown medal"
desc = "A regular everyday medal."
icon = 'icons/map_icons/clothing/accessory.dmi'
icon_state = "/obj/item/clothing/accessory/bubber/acc_medal/crown"
post_init_icon_state = "medal"
greyscale_config = /datum/greyscale_config/medals/crown
greyscale_config_worn = /datum/greyscale_config/medals/crown/worn
/obj/item/clothing/accessory/bubber/acc_medal/crown/bar_ribbon
icon_state = "/obj/item/clothing/accessory/bubber/acc_medal/crown/bar_ribbon"
post_init_icon_state = "medal_bar_ribbon"
/obj/item/clothing/accessory/bubber/acc_medal/crown/hollow
icon_state = "/obj/item/clothing/accessory/bubber/acc_medal/crown/hollow"
post_init_icon_state = "medal_hollow"
/obj/item/clothing/accessory/bubber/acc_medal/crown/hollow/bar_ribbon
icon_state = "/obj/item/clothing/accessory/bubber/acc_medal/crown/hollow/bar_ribbon"
post_init_icon_state = "medal_hollow_bar_ribbon"
/*
// Special Medals
*/
/obj/item/clothing/accessory/bubber/acc_medal/glowcrystal
name = "glowcrystal necklace"
desc = "A glowing rock strung from a necklace, a token of gratitude similar to a medal."
icon = 'icons/map_icons/clothing/accessory.dmi'
icon_state = "/obj/item/clothing/accessory/bubber/acc_medal/glowcrystal"
post_init_icon_state = "necklace_crystal"
greyscale_config = /datum/greyscale_config/medals/glow
greyscale_config_worn = /datum/greyscale_config/medals/glow/worn
greyscale_colors = "#7effff"
unique_reskin = list(
"Crystal" = "necklace_crystal",
"Bar" = "necklace_bar",
"Hollow Bar" = "necklace_bar_hollow",
"Diamond" = "necklace_diamond",
"Hollow Diamond" = "necklace_diamond_hollow",
"Shard" = "necklace_shard",
"Hollow Shard" = "necklace_shard_hollow",
"Triangle" = "necklace_triangle",
"Hollow Triangle" = "necklace_triangle_hollow",
"Circle" = "necklace_circle",
)
/*
// Rank pins
*/
/obj/item/clothing/accessory/bubber/acc_medal/rankpin
name = "rank pin"
desc = "A pin used to display accomplishments, advancements, or otherwise earned recognition."
icon = 'icons/map_icons/clothing/accessory.dmi'
icon_state = "/obj/item/clothing/accessory/bubber/acc_medal/rankpin"
post_init_icon_state = "star"
greyscale_config = /datum/greyscale_config/medals/rank_pins
greyscale_config_worn = /datum/greyscale_config/medals/rank_pins/worn
greyscale_colors = "#FFFFFF"
/obj/item/clothing/accessory/bubber/acc_medal/rankpin/bar
icon_state = "/obj/item/clothing/accessory/bubber/acc_medal/rankpin/bar"
post_init_icon_state = "bar"
/obj/item/clothing/accessory/bubber/acc_medal/rankpin/two_bar
icon_state = "/obj/item/clothing/accessory/bubber/acc_medal/rankpin/two_bar"
post_init_icon_state = "two_bar"
/*
// Neckpins
*/
/obj/item/clothing/accessory/bubber/acc_medal/neckpin
name = "\improper NT company neckpin"
desc = "A pin specially dedicated to show loyalty to your company!"
icon = 'icons/map_icons/clothing/accessory.dmi'
icon_state = "/obj/item/clothing/accessory/bubber/acc_medal/neckpin"
post_init_icon_state = "ntpin"
greyscale_config = /datum/greyscale_config/medals/neckpins
greyscale_config_worn = /datum/greyscale_config/medals/neckpins/worn
greyscale_colors = "#FFFFFF#CCCED1"
/obj/item/clothing/accessory/bubber/acc_medal/neckpin/centcom
name = "\improper Central Command neckpin"
icon_state = "/obj/item/clothing/accessory/bubber/acc_medal/neckpin/centcom"
post_init_icon_state = "ccpin"
/obj/item/clothing/accessory/bubber/acc_medal/neckpin/galfed
name = "\improper GalFed neckpin"
desc = "A pin specially dedicated to show loyalty to your federation!"
icon_state = "/obj/item/clothing/accessory/bubber/acc_medal/neckpin/galfed"
post_init_icon_state = "sfpin"
/obj/item/clothing/accessory/bubber/acc_medal/neckpin/galfed911
name = "\improper GalFed 911 neckpin"
desc = "A pin specially dedicated to show loyalty to your federation!"
icon_state = "/obj/item/clothing/accessory/bubber/acc_medal/neckpin/galfed911"
post_init_icon_state = "911pin"
/obj/item/clothing/accessory/bubber/acc_medal/neckpin/galfed811
name = "\improper GalFed 811 neckpin"
desc = "A pin specially dedicated to show loyalty to your federation!"
icon_state = "/obj/item/clothing/accessory/bubber/acc_medal/neckpin/galfed811"
post_init_icon_state = "811pin"
/obj/item/clothing/accessory/bubber/acc_medal/neckpin/syndicate
name = "\improper Syndicate neckpin"
desc = "A pin specially dedicated to show loyalty to the Syndicate!"
icon_state = "/obj/item/clothing/accessory/bubber/acc_medal/neckpin/syndicate"
post_init_icon_state = "syndipin"
greyscale_colors = "#262626#9c0000"
/obj/item/clothing/accessory/bubber/acc_medal/neckpin/interdyne
name = "\improper Interdyne neckpin"
icon_state = "/obj/item/clothing/accessory/bubber/acc_medal/neckpin/interdyne"
post_init_icon_state = "ippin"
greyscale_colors = "#FFFFFF#3aba1e"
/obj/item/clothing/accessory/bubber/acc_medal/neckpin/porttarkon
name = "\improper Port Tarkon neckpin"
icon_state = "/obj/item/clothing/accessory/bubber/acc_medal/neckpin/porttarkon"
post_init_icon_state = "ptpin"
/*
// Military Bar Ribbons
*/
/obj/item/clothing/accessory/bubber/military_ribbon
name = "military ribbon"
desc = "An average military ribbon"
icon = 'icons/map_icons/clothing/accessory.dmi'
icon_state = "/obj/item/clothing/accessory/bubber/military_ribbon"
post_init_icon_state = "ribbon1"
greyscale_config = /datum/greyscale_config/medals/military_ribbon
greyscale_config_worn = /datum/greyscale_config/medals/military_ribbon/worn
greyscale_colors = "#ff0000#04ff00#0008ff"
minimize_when_attached = TRUE
attachment_slot = NONE
flags_1 = IS_PLAYER_COLORABLE_1
/obj/item/clothing/accessory/bubber/military_ribbon/two
icon_state = "/obj/item/clothing/accessory/bubber/military_ribbon/two"
post_init_icon_state = "ribbon2"
/obj/item/clothing/accessory/bubber/military_ribbon/three
icon_state = "/obj/item/clothing/accessory/bubber/military_ribbon/three"
post_init_icon_state = "ribbon3"
/*
// Ribbons
*/
/obj/item/clothing/accessory/bubber/ribbon
name = "ribbon"
desc = "A normal everyday ribbon."
icon = 'icons/map_icons/clothing/accessory.dmi'
icon_state = "/obj/item/clothing/accessory/bubber/ribbon"
post_init_icon_state = "ribbon1"
greyscale_config = /datum/greyscale_config/medals/color_ribbon
greyscale_config_worn = /datum/greyscale_config/medals/color_ribbon/worn
greyscale_colors = "#ffffff#664200#fff700"
minimize_when_attached = TRUE
attachment_slot = NONE
flags_1 = IS_PLAYER_COLORABLE_1
/obj/item/clothing/accessory/bubber/ribbon/ribbon_slash
icon_state = "/obj/item/clothing/accessory/bubber/ribbon/ribbon_slash"
post_init_icon_state = "ribbon2"
/obj/item/clothing/accessory/bubber/ribbon/ribbon_arrup
icon_state = "/obj/item/clothing/accessory/bubber/ribbon/ribbon_arrup"
post_init_icon_state = "ribbon3"
/obj/item/clothing/accessory/bubber/ribbon/ribbon_line
icon_state = "/obj/item/clothing/accessory/bubber/ribbon/ribbon_line"
post_init_icon_state = "ribbon4"
/obj/item/clothing/accessory/bubber/ribbon/ribbon_dual
icon_state = "/obj/item/clothing/accessory/bubber/ribbon/ribbon_dual"
post_init_icon_state = "ribbon5"
/obj/item/clothing/accessory/bubber/ribbon/ribbon_flat
icon_state = "/obj/item/clothing/accessory/bubber/ribbon/ribbon_flat"
post_init_icon_state = "ribbon6"
/obj/item/clothing/accessory/bubber/ribbon/ribbon_twotone
icon_state = "/obj/item/clothing/accessory/bubber/ribbon/ribbon_twotone"
post_init_icon_state = "ribbon7"
/// GalFed Accessories
/obj/item/clothing/accessory/bubber/galfedribbon
name = "\improper GalFed rank ribbon"
desc = "An average military ribbon."
icon = 'icons/map_icons/clothing/accessory.dmi'
icon_state = "/obj/item/clothing/accessory/bubber/galfedribbon"
post_init_icon_state = "star_arr_ribbon_1"
greyscale_colors = "#FFD700"
greyscale_config = /datum/greyscale_config/galfedribbons
greyscale_config_worn = /datum/greyscale_config/galfedribbons/worn
minimize_when_attached = TRUE
/obj/item/clothing/accessory/bubber/galfedribbon/rank2
icon_state = "/obj/item/clothing/accessory/bubber/galfedribbon/rank2"
post_init_icon_state = "star_arr_ribbon_2"
/obj/item/clothing/accessory/bubber/galfedribbon/rank3
icon_state = "/obj/item/clothing/accessory/bubber/galfedribbon/rank3"
post_init_icon_state = "star_sw_ribbon_1"
/obj/item/clothing/accessory/bubber/galfedribbon/rank4
icon_state = "/obj/item/clothing/accessory/bubber/galfedribbon/rank4"
post_init_icon_state = "star_sw_ribbon_2"
/obj/item/clothing/accessory/bubber/galfedribbon/rank5
icon_state = "/obj/item/clothing/accessory/bubber/galfedribbon/rank5"
post_init_icon_state = "star_ribbon_1"
/obj/item/clothing/accessory/bubber/galfedribbon/rank6
icon_state = "/obj/item/clothing/accessory/bubber/galfedribbon/rank6"
post_init_icon_state = "star_ribbon_2"
/obj/item/clothing/accessory/bubber/galfedribbon/rank7
icon_state = "/obj/item/clothing/accessory/bubber/galfedribbon/rank7"
post_init_icon_state = "star_ribbon_3"
/obj/item/clothing/accessory/bubber/galfedribbon/rank8
icon_state = "/obj/item/clothing/accessory/bubber/galfedribbon/rank8"
post_init_icon_state = "arr_ribbon_1"
/obj/item/clothing/accessory/bubber/galfedribbon/rank9
icon_state = "/obj/item/clothing/accessory/bubber/galfedribbon/rank8"
post_init_icon_state = "arr_ribbon_2"
/obj/item/clothing/accessory/bubber/galfedribbon/rank10
icon_state = "/obj/item/clothing/accessory/bubber/galfedribbon/rank9"
post_init_icon_state = "arr_ribbon_3"
/obj/item/clothing/accessory/bubber/galfedribbon/rank11
icon_state = "/obj/item/clothing/accessory/bubber/galfedribbon/rank10"
post_init_icon_state = "sw_ribbon_1"
/obj/item/clothing/accessory/bubber/galfedribbon/rank12
icon_state = "/obj/item/clothing/accessory/bubber/galfedribbon/rank11"
post_init_icon_state = "sw_ribbon_2"
/obj/item/clothing/accessory/bubber/galfedribbon/rank13
icon_state = "/obj/item/clothing/accessory/bubber/galfedribbon/rank12"
post_init_icon_state = "sw_ribbon_3"
/obj/item/clothing/accessory/nova/acc_medal/neckpin/galfed/official
name = "\improper GalFed Official neckpin"
desc = "A special golden neckpin to show true loyalty to the Federation."
greyscale_colors = "#ffff66#0099ff"

View File

@@ -15,3 +15,119 @@
/datum/loadout_item/accessory/dogtags /datum/loadout_item/accessory/dogtags
name = "Dogtags" name = "Dogtags"
item_path = /obj/item/clothing/accessory/dogtags item_path = /obj/item/clothing/accessory/dogtags
/*
*
* Accessory Medals
*
*/
/datum/loadout_item/accessory/medal
abstract_type = /datum/loadout_item/accessory/medal
group = "Medals"
/datum/loadout_item/accessory/medal/shield
name = "Medal - Shield"
item_path = /obj/item/clothing/accessory/bubber/acc_medal/shield
/datum/loadout_item/accessory/medal/shield_br
name = "Medal - Shield (Bar-Ribbon)"
item_path = /obj/item/clothing/accessory/bubber/acc_medal/shield/bar_ribbon
/datum/loadout_item/accessory/medal/shield_h
name = "Medal - Shield (Hollow)"
item_path = /obj/item/clothing/accessory/bubber/acc_medal/shield/hollow
/datum/loadout_item/accessory/medal/bar
name = "Medal - Bar"
item_path = /obj/item/clothing/accessory/bubber/acc_medal/bar
/datum/loadout_item/accessory/medal/bar_br
name = "Medal - Bar (Bar-Ribbon)"
item_path = /obj/item/clothing/accessory/bubber/acc_medal/bar/bar_ribbon
/datum/loadout_item/accessory/medal/bar_h
name = "Medal - Bar (Hollow)"
item_path = /obj/item/clothing/accessory/bubber/acc_medal/bar/hollow
/datum/loadout_item/accessory/medal/circle
name = "Medal - Circle"
item_path = /obj/item/clothing/accessory/bubber/acc_medal/circle
/datum/loadout_item/accessory/medal/circle_br
name = "Medal - Circle (Bar-Ribbon)"
item_path = /obj/item/clothing/accessory/bubber/acc_medal/circle/bar_ribbon
/datum/loadout_item/accessory/medal/circle_alt
name = "Medal - Circle (Alt)"
item_path = /obj/item/clothing/accessory/bubber/acc_medal
//This is actually the default setup for our medals!
/datum/loadout_item/accessory/medal/circle_h
name = "Medal - Circle (Hollow)"
item_path = /obj/item/clothing/accessory/bubber/acc_medal/circle/hollow
/datum/loadout_item/accessory/medal/circle_h_br
name = "Medal - Circle (Hollow, Bar-Ribbon)"
item_path = /obj/item/clothing/accessory/bubber/acc_medal/circle/hollow/bar_ribbon
/datum/loadout_item/accessory/medal/heart
name = "Medal - Heart"
item_path = /obj/item/clothing/accessory/bubber/acc_medal/heart
/datum/loadout_item/accessory/medal/heart_br
name = "Medal - Heart (Bar-Ribbon)"
item_path = /obj/item/clothing/accessory/bubber/acc_medal/heart/bar_ribbon
/datum/loadout_item/accessory/medal/heart_s
name = "Medal - Heart (Special)"
item_path = /obj/item/clothing/accessory/bubber/acc_medal/heart/special
/datum/loadout_item/accessory/medal/heart_s_br
name = "Medal - Heart (Special, Bar-Ribbon)"
item_path = /obj/item/clothing/accessory/bubber/acc_medal/heart/special/bar_ribbon
/datum/loadout_item/accessory/medal/crown
name = "Medal - Crown"
item_path = /obj/item/clothing/accessory/bubber/acc_medal/crown
/datum/loadout_item/accessory/medal/crown_br
name = "Medal - Crown (Bar-Ribbon)"
item_path = /obj/item/clothing/accessory/bubber/acc_medal/crown/bar_ribbon
/datum/loadout_item/accessory/medal/crown_h
name = "Medal - Crown (Hollow)"
item_path = /obj/item/clothing/accessory/bubber/acc_medal/crown/hollow
/datum/loadout_item/accessory/medal/crown_h_br
name = "Medal - Crown (Hollow, Bar-Ribbon)"
item_path = /obj/item/clothing/accessory/bubber/acc_medal/crown/hollow/bar_ribbon
/datum/loadout_item/accessory/medal/rankpin_star
name = "Rankpin (Star)"
item_path = /obj/item/clothing/accessory/bubber/acc_medal/rankpin
/datum/loadout_item/accessory/medal/rankpin_bar
name = "Rankpin (Bar)"
item_path = /obj/item/clothing/accessory/bubber/acc_medal/rankpin/bar
/datum/loadout_item/accessory/medal/rankpin_twobar
name = "Rankpin (Double Bars)"
item_path = /obj/item/clothing/accessory/bubber/acc_medal/rankpin/two_bar
/*
* Special Pins
*/
/datum/loadout_item/accessory/medal/cc_pin
name = "Neckpin - CentCom"
item_path = /obj/item/clothing/accessory/bubber/acc_medal/neckpin/centcom
restricted_roles = list(JOB_NT_REP, JOB_CAPTAIN, JOB_BLUESHIELD)
/datum/loadout_item/accessory/medal/nt_pin
name = "Neckpin - Nanotrasen"
item_path = /obj/item/clothing/accessory/bubber/acc_medal/neckpin
/datum/loadout_item/accessory/medal/pt_pin
name = "Neckpin - Port Tarkon"
item_path = /obj/item/clothing/accessory/bubber/acc_medal/neckpin/porttarkon

View File

@@ -3,3 +3,9 @@
desc = "For agents in the field requiring urgent emotional support." desc = "For agents in the field requiring urgent emotional support."
item = /obj/item/toy/plush/nukeplushie item = /obj/item/toy/plush/nukeplushie
cost = 1 cost = 1
/datum/uplink_item/badass/medalbox
name = "Syndicate Medal Box"
desc = "For Nuclear Leaders wanting to reward their Crew. Or helping collaborators. Access not included."
item = /obj/item/storage/lockbox/medal/bubber/synd
cost = 1

View File

@@ -1,87 +1,305 @@
/obj/machinery/vending/access/command
name = "\improper Command Outfitting Station"
desc = "A vending machine for specialised clothing for members of Command."
product_ads = "File paperwork in style!;It's red so you can't see the blood!;You have the right to be fashionable!;Now you can be the fashion police you always wanted to be!"
icon = 'modular_zubbers/icons/obj/machines/vending.dmi'
icon_state = "commdrobe"
light_mask = "wardrobe-light-mask"
vend_reply = "Thank you for using the CommDrobe!"
auto_build_products = TRUE
payment_department = ACCOUNT_CMD
allow_custom = TRUE
refill_canister = /obj/item/vending_refill/wardrobe/comm_wardrobe
payment_department = ACCOUNT_CMD
light_color = COLOR_COMMAND_BLUE
/obj/item/vending_refill/wardrobe/comm_wardrobe
machine_name = "CommDrobe"
/obj/machinery/vending/access/command/build_access_list(list/access_lists) /obj/machinery/vending/access/command/build_access_list(list/access_lists)
. = ..() access_lists["[ACCESS_CAPTAIN]"] = list(
access_lists["[ACCESS_CAPTAIN]"] += list( // CAPTAIN
/obj/item/clothing/head/hats/caphat = 1,
/obj/item/clothing/head/caphat/beret = 1,
/obj/item/clothing/head/caphat/beret/alt = 1,
/obj/item/clothing/head/hats/imperial/cap = 1,
/obj/item/clothing/head/hats/warden/drill/captain = 1, /obj/item/clothing/head/hats/warden/drill/captain = 1,
/obj/item/clothing/head/hats/warden/drill/blueshield = 1, /obj/item/clothing/head/hats/warden/drill/blueshield = 1,
/obj/item/clothing/head/hats/caphat/parade = 1,
/obj/item/clothing/head/costume/crown/fancy = 1,
/obj/item/clothing/head/hats/caphat/bicorne = 1,
/obj/item/clothing/head/hats/caphat/sonnensoldner = 1,
/obj/item/clothing/head/hats/caphat/bunnyears_captain = 1,
/obj/item/clothing/under/rank/captain = 1,
/obj/item/clothing/under/rank/captain/skirt = 1,
/obj/item/clothing/under/rank/captain/dress = 1,
/obj/item/clothing/under/rank/captain/skyrat/kilt = 1,
/obj/item/clothing/under/rank/captain/skyrat/shipdress = 1,
/obj/item/clothing/under/rank/captain/skyrat/imperial = 1,
/obj/item/clothing/under/rank/captain/skyrat/pilot = 1,
/obj/item/clothing/under/rank/captain/skyrat/pilot/skirt = 1,
/obj/item/clothing/under/rank/captain/dress = 1, /obj/item/clothing/under/rank/captain/dress = 1,
/obj/item/clothing/under/rank/blueshield/netra = 1, /obj/item/clothing/under/rank/blueshield/netra = 1,
/obj/item/clothing/gloves/netra = 1, //These are meant to go with the dress above it. /obj/item/clothing/under/rank/captain/parade = 1,
/obj/item/clothing/under/bimpcap = 1, /obj/item/clothing/under/bimpcap = 1,
/obj/item/clothing/suit/armor/vest/capcarapace/captains_formal = 1,
/obj/item/clothing/suit/armor/vest/capcarapace/jacket = 1,
/obj/item/clothing/suit/armor/vest/capcarapace/robe = 1,
/obj/item/clothing/suit/armor/vest/capcarapace/robe/overseer = 1,
/obj/item/clothing/suit/armor/vest/capcarapace/bathrobe = 1,
/obj/item/clothing/suit/armor/vest/capcarapace/suitjacket = 1,
/obj/item/clothing/suit/armor/vest/capcarapace/gambison = 1,
/obj/item/clothing/suit/armor/vest/capcarapace/winterovercoat = 1,
/obj/item/clothing/suit/armor/vest/capcarapace/overcoat = 1,
/obj/item/clothing/suit/jacket/capjacket = 1,
/obj/item/clothing/suit/hooded/wintercoat/captain = 1,
/obj/item/clothing/neck/cloak/cap = 1,
/obj/item/clothing/neck/mantle/capmantle = 1,
/obj/item/clothing/gloves/netra = 1,
/obj/item/storage/backpack/captain = 1,
/obj/item/storage/backpack/satchel/cap = 1,
/obj/item/storage/backpack/duffelbag/captain = 1,
/obj/item/storage/backpack/messenger/cap = 1,
/obj/item/clothing/shoes/sneakers/brown = 1,
/obj/item/clothing/head/hats/caphat/bunnyears_captain = 1, /obj/item/clothing/head/hats/caphat/bunnyears_captain = 1,
/obj/item/clothing/under/rank/captain/bunnysuit = 1, /obj/item/clothing/under/rank/captain/bunnysuit = 1,
/obj/item/clothing/suit/armor/vest/capcarapace/tailcoat_captain = 1, /obj/item/clothing/suit/armor/vest/capcarapace/tailcoat_captain = 1,
/obj/item/clothing/neck/tie/bunnytie/captain = 1, /obj/item/clothing/neck/tie/bunnytie/captain = 1,
// BLUESHIELD
/obj/item/clothing/head/beret/blueshield = 1,
/obj/item/clothing/head/beret/blueshield/navy = 1,
/obj/item/clothing/under/rank/blueshield = 1,
/obj/item/clothing/under/rank/blueshield/skirt = 1,
/obj/item/clothing/under/rank/blueshield/turtleneck = 1,
/obj/item/clothing/under/rank/blueshield/turtleneck/skirt = 1,
/obj/item/clothing/under/rank/blueshield/consult = 1,
/obj/item/clothing/under/rank/blueshield/consult/skirt = 1,
/obj/item/clothing/under/rank/blueshield/russian = 1,
/obj/item/clothing/under/rank/blueshield/formal = 1,
/obj/item/clothing/under/rank/blueshield/naval = 1,
/obj/item/clothing/suit/armor/vest/blueshield = 1,
/obj/item/clothing/suit/armor/vest/blueshield/jacket = 1,
/obj/item/clothing/neck/mantle/bsmantle = 1,
/obj/item/storage/backpack/blueshield = 1,
/obj/item/storage/backpack/satchel/blueshield = 1,
/obj/item/storage/backpack/duffelbag/blueshield = 1,
/obj/item/storage/backpack/messenger/blueshield = 1,
/obj/item/clothing/shoes/laceup = 1,
) )
access_lists["[ACCESS_HOS]"] += list( access_lists["[ACCESS_HOP]"] = list( // Best head btw
/obj/item/clothing/head/hats/warden/drill/hos = 1, /obj/item/clothing/head/hats/hopcap = 1,
/obj/item/clothing/under/rank/security/head_of_security/alt/roselia = 1, /obj/item/clothing/head/hopcap/beret = 1,
/obj/item/clothing/glasses/hud/security/sunglasses/gars/giga/roselia = 1, /obj/item/clothing/head/hopcap/beret/alt = 1,
/obj/item/clothing/under/rank/security/head_of_security/redsec = 1, /obj/item/clothing/head/hats/imperial/hop = 1,
/obj/item/clothing/under/rank/security/head_of_security/parade/redsec = 1, /obj/item/clothing/under/rank/civilian/head_of_personnel = 1,
/obj/item/clothing/under/rank/security/head_of_security/parade/female/redsec = 1, /obj/item/clothing/under/rank/civilian/head_of_personnel/skirt = 1,
/obj/item/clothing/head/hats/hos/elofy = 1, /obj/item/clothing/under/rank/civilian/head_of_personnel/skyrat/turtleneck = 1,
/obj/item/clothing/suit/armor/hos/elofy = 1, /obj/item/clothing/under/rank/civilian/head_of_personnel/skyrat/turtleneck/skirt = 1,
/obj/item/clothing/gloves/elofy = 1, //Part of a set so... /obj/item/clothing/under/rank/civilian/head_of_personnel/skyrat/parade = 1,
/obj/item/clothing/shoes/jackboots/elofy = 1, /obj/item/clothing/under/rank/civilian/head_of_personnel/skyrat/parade/female = 1,
/obj/item/clothing/head/playbunnyears/hos = 1, /obj/item/clothing/under/rank/civilian/head_of_personnel/skyrat/imperial = 1,
/obj/item/clothing/under/rank/security/head_of_security/bunnysuit = 1, /obj/item/clothing/suit/armor/vest/hop/hop_formal = 1,
/obj/item/clothing/suit/armor/hos_tailcoat = 1, /obj/item/clothing/suit/hooded/wintercoat/hop = 1,
/obj/item/clothing/under/rank/security/peacekeeper/skirt_hos = 1, /obj/item/clothing/neck/cloak/hop = 1,
) /obj/item/clothing/neck/mantle/hopmantle = 1,
/obj/item/storage/backpack/head_of_personnel = 1,
access_lists["[ACCESS_HOP]"] += list( /obj/item/storage/backpack/satchel/head_of_personnel = 1,
/obj/item/storage/backpack/duffelbag/head_of_personnel = 1,
/obj/item/storage/backpack/messenger/head_of_personnel = 1,
/obj/item/clothing/shoes/sneakers/brown = 1,
/obj/item/clothing/head/playbunnyears/hop = 1, /obj/item/clothing/head/playbunnyears/hop = 1,
/obj/item/clothing/under/rank/civilian/hop_bunnysuit = 1, /obj/item/clothing/under/rank/civilian/hop_bunnysuit = 1,
/obj/item/clothing/suit/armor/hop_tailcoat = 1, /obj/item/clothing/suit/armor/hop_tailcoat = 1,
/obj/item/clothing/neck/tie/bunnytie/hop = 1, /obj/item/clothing/neck/tie/bunnytie/hop = 1,
) )
access_lists["[ACCESS_CMO]"] += list( access_lists["[ACCESS_CMO]"] = list(
/obj/item/clothing/head/beret/medical/cmo = 1,
/obj/item/clothing/head/beret/medical/cmo/alt = 1,
/obj/item/clothing/head/hats/imperial/cmo = 1,
/obj/item/clothing/head/utility/surgerycap/cmo = 1,
/obj/item/clothing/under/rank/medical/chief_medical_officer = 1,
/obj/item/clothing/under/rank/medical/chief_medical_officer/skirt = 1,
/obj/item/clothing/under/rank/medical/chief_medical_officer/turtleneck = 1,
/obj/item/clothing/under/rank/medical/chief_medical_officer/skyrat/imperial = 1,
/obj/item/clothing/under/rank/medical/chief_medical_officer/scrubs = 1,
/obj/item/clothing/suit/hooded/wintercoat/medical/cmo = 1,
/obj/item/clothing/neck/cloak/cmo = 1,
/obj/item/clothing/neck/mantle/cmomantle = 1,
/obj/item/clothing/shoes/sneakers/brown = 1,
/obj/item/clothing/head/playbunnyears/cmo = 1, /obj/item/clothing/head/playbunnyears/cmo = 1,
/obj/item/clothing/under/rank/medical/cmo_bunnysuit = 1, /obj/item/clothing/under/rank/medical/cmo_bunnysuit = 1,
/obj/item/clothing/suit/toggle/labcoat/cmo/doctor_tailcoat = 1, /obj/item/clothing/suit/toggle/labcoat/cmo/doctor_tailcoat = 1,
/obj/item/clothing/neck/tie/bunnytie/cmo = 1, /obj/item/clothing/neck/tie/bunnytie/cmo = 1,
) )
access_lists["[ACCESS_RD]"] += list( access_lists["[ACCESS_RD]"] = list(
/obj/item/clothing/head/beret/science/rd = 1,
/obj/item/clothing/head/beret/science/rd/alt = 1,
/obj/item/clothing/under/rank/rnd/research_director = 1,
/obj/item/clothing/under/rank/rnd/research_director/skirt = 1,
/obj/item/clothing/under/rank/rnd/research_director/alt = 1,
/obj/item/clothing/under/rank/rnd/research_director/turtleneck = 1,
/obj/item/clothing/under/rank/rnd/research_director/turtleneck/skirt = 1,
/obj/item/clothing/under/rank/rnd/research_director/skyrat/jumpsuit = 1,
/obj/item/clothing/under/rank/rnd/research_director/skyrat/jumpsuit/skirt = 1,
/obj/item/clothing/under/rank/rnd/research_director/skyrat/imperial = 1,
/obj/item/clothing/neck/cloak/rd = 1,
/obj/item/clothing/neck/mantle/rdmantle = 1,
/obj/item/clothing/suit/toggle/labcoat = 1,
/obj/item/clothing/suit/toggle/labcoat/skyrat/rd = 1,
/obj/item/clothing/suit/toggle/labcoat/research_director = 1,
/obj/item/clothing/suit/hooded/wintercoat/science/rd = 1,
/obj/item/clothing/shoes/sneakers/brown = 1,
/obj/item/clothing/head/playbunnyears/rd = 1, /obj/item/clothing/head/playbunnyears/rd = 1,
/obj/item/clothing/under/rank/rnd/research_director/bunnysuit = 1, /obj/item/clothing/under/rank/rnd/research_director/bunnysuit = 1,
/obj/item/clothing/suit/toggle/labcoat/research_director/tailcoat = 1, /obj/item/clothing/suit/toggle/labcoat/research_director/tailcoat = 1,
/obj/item/clothing/neck/tie/bunnytie/rd = 1, /obj/item/clothing/neck/tie/bunnytie/rd = 1,
) )
access_lists["[ACCESS_CE]"] += list( access_lists["[ACCESS_CE]"] = list(
/obj/item/clothing/head/beret/engi/ce = 1,
/obj/item/clothing/head/utility/hardhat/white = 1,
/obj/item/clothing/head/utility/hardhat/welding/white = 1,
/obj/item/clothing/head/hats/imperial/ce = 1,
/obj/item/clothing/under/rank/engineering/chief_engineer = 1,
/obj/item/clothing/under/rank/engineering/chief_engineer/turtleneck = 1,
/obj/item/clothing/under/rank/engineering/chief_engineer/skirt = 1,
/obj/item/clothing/under/rank/engineering/chief_engineer/turtleneck/skirt = 1,
/obj/item/clothing/under/rank/engineering/chief_engineer/skyrat/imperial = 1,
/obj/item/clothing/suit/hooded/wintercoat/engineering/ce = 1,
/obj/item/clothing/neck/cloak/ce = 1,
/obj/item/clothing/neck/mantle/cemantle = 1,
/obj/item/clothing/shoes/sneakers/brown = 1,
/obj/item/clothing/head/playbunnyears/ce = 1, /obj/item/clothing/head/playbunnyears/ce = 1,
/obj/item/clothing/under/rank/engineering/chief_engineer/bunnysuit = 1, /obj/item/clothing/under/rank/engineering/chief_engineer/bunnysuit = 1,
/obj/item/clothing/suit/utility/fire/ce_tailcoat = 1, /obj/item/clothing/suit/utility/fire/ce_tailcoat = 1,
/obj/item/clothing/neck/tie/bunnytie/ce = 1, /obj/item/clothing/neck/tie/bunnytie/ce = 1,
) )
access_lists["[ACCESS_QM]"] += list( access_lists["[ACCESS_HOS]"] = list(
/obj/item/clothing/head/hats/hos/cap = 1,
/obj/item/clothing/head/hats/hos/beret/navyhos = 1,
/obj/item/clothing/head/hats/imperial/hos = 1,
/obj/item/clothing/head/hats/hos/beret = 1,
/obj/item/clothing/head/hats/warden/drill/hos = 1,
/obj/item/clothing/head/hats/hos/elofy = 1,
/obj/item/clothing/under/rank/security/head_of_security/peacekeeper = 1,
/obj/item/clothing/under/rank/security/head_of_security/alt = 1,
/obj/item/clothing/under/rank/security/head_of_security/alt/skirt = 1,
/obj/item/clothing/under/rank/security/head_of_security/grey = 1,
/obj/item/clothing/under/rank/security/head_of_security/skyrat/imperial = 1,
/obj/item/clothing/under/rank/security/head_of_security/alt/roselia = 1,
/obj/item/clothing/under/rank/security/head_of_security/parade = 1,
/obj/item/clothing/under/rank/security/head_of_security/parade/female = 1,
/obj/item/clothing/under/rank/security/head_of_security/redsec = 1,
/obj/item/clothing/under/rank/security/head_of_security/parade/redsec = 1,
/obj/item/clothing/under/rank/security/head_of_security/parade/female/redsec = 1,
/obj/item/clothing/under/rank/security/peacekeeper/skirt_hos = 1,
/obj/item/clothing/suit/jacket/hos/blue = 1,
/obj/item/clothing/suit/armor/hos = 1,
/obj/item/clothing/suit/armor/hos/trenchcoat = 1,
/obj/item/clothing/suit/armor/hos/trenchcoat/winter = 1,
/obj/item/clothing/suit/armor/vest/leather = 1,
/obj/item/clothing/suit/armor/hos/hos_formal = 1,
/obj/item/clothing/neck/cloak/hos = 1,
/obj/item/clothing/neck/cloak/hos/redsec = 1,
/obj/item/clothing/neck/mantle/hosmantle = 1,
/obj/item/clothing/glasses/hud/security/sunglasses/eyepatch = 1,
/obj/item/clothing/glasses/hud/security/sunglasses/gars/giga = 1,
/obj/item/clothing/glasses/hud/security/sunglasses/gars/giga/roselia = 1,
/obj/item/clothing/gloves/elofy = 1,
/obj/item/clothing/mask/gas/sechailer/swat = 1,
/obj/item/clothing/shoes/sneakers/brown = 1,
/obj/item/clothing/shoes/jackboots/elofy = 1,
/obj/item/clothing/head/playbunnyears/hos = 1,
/obj/item/clothing/under/rank/security/head_of_security/bunnysuit = 1,
/obj/item/clothing/suit/armor/hos_tailcoat = 1,
)
access_lists["[ACCESS_QM]"] = list(
/obj/item/clothing/head/beret/cargo/qm = 1,
/obj/item/clothing/head/beret/cargo/qm/alt = 1,
/obj/item/clothing/neck/cloak/qm = 1,
/obj/item/clothing/neck/mantle/qm = 1,
/obj/item/clothing/under/rank/cargo/qm = 1,
/obj/item/clothing/under/rank/cargo/qm/skirt = 1,
/obj/item/clothing/under/rank/cargo/qm/skyrat/gorka = 1,
/obj/item/clothing/under/rank/cargo/qm/skyrat/turtleneck = 1,
/obj/item/clothing/under/rank/cargo/qm/skyrat/turtleneck/skirt = 1,
/obj/item/clothing/suit/brownfurrich = 1,
/obj/item/clothing/under/rank/cargo/qm/skyrat/casual = 1,
/obj/item/clothing/suit/toggle/jacket/supply/head = 1,
/obj/item/clothing/under/rank/cargo/qm/skyrat/formal = 1,
/obj/item/clothing/under/rank/cargo/qm/skyrat/formal/skirt = 1,
/obj/item/clothing/shoes/sneakers/brown = 1,
/obj/item/clothing/head/playbunnyears/quartermaster = 1, /obj/item/clothing/head/playbunnyears/quartermaster = 1,
/obj/item/clothing/under/rank/cargo/quartermaster_bunnysuit = 1, /obj/item/clothing/under/rank/cargo/quartermaster_bunnysuit = 1,
/obj/item/clothing/suit/jacket/tailcoat/quartermaster = 1, /obj/item/clothing/suit/jacket/tailcoat/quartermaster = 1,
/obj/item/clothing/neck/tie/bunnytie/cargo = 1, /obj/item/clothing/neck/tie/bunnytie/cargo = 1,
) )
access_lists["[ACCESS_CENT_GENERAL]"] += list( access_lists["[ACCESS_CENT_GENERAL]"] = list( // CC Rep Shiz
/obj/item/clothing/head/nanotrasen_consultant = 1,
/obj/item/clothing/head/nanotrasen_consultant/beret = 1,
/obj/item/clothing/head/beret/centcom_formal/nt_consultant = 1,
/obj/item/clothing/head/nanotrasen_consultant/beret/officer = 1,
/obj/item/clothing/head/hats/centhat = 1,
/obj/item/clothing/head/hats/caphat/naval = 1,
/obj/item/clothing/head/hats/warden/drill/nanotrasen = 1, /obj/item/clothing/head/hats/warden/drill/nanotrasen = 1,
/obj/item/clothing/head/nanotrasen_consultant/hubert = 1,
/obj/item/clothing/head/razurathhat = 1,
/obj/item/clothing/neck/cloak/admiral = 1,
/obj/item/clothing/under/rank/nanotrasen_consultant = 1,
/obj/item/clothing/under/rank/nanotrasen_consultant/skirt = 1,
/obj/item/clothing/under/rank/centcom/skyrat/naval = 1,
/obj/item/clothing/under/rank/centcom/skyrat/naval/commander = 1,
/obj/item/clothing/under/rank/centcom/skyrat/naval/admiral = 1,
/obj/item/clothing/under/rank/centcom/skyrat/naval/fleet_admiral = 1,
/obj/item/clothing/under/rank/nanotrasen_consultant/naval = 1,
/obj/item/clothing/under/rank/nanotrasen_consultant/stripper = 1, /obj/item/clothing/under/rank/nanotrasen_consultant/stripper = 1,
/obj/item/clothing/under/nt_idol_skirt = 1, /obj/item/clothing/under/nt_idol_skirt = 1,
/obj/item/clothing/head/nanotrasen_consultant/hubert = 1,
/obj/item/clothing/suit/armor/vest/nanotrasen_consultant/hubert = 1,
/obj/item/clothing/under/rank/nanotrasen_consultant/hubert = 1, /obj/item/clothing/under/rank/nanotrasen_consultant/hubert = 1,
/obj/item/clothing/head/razurathhat = 1, /obj/item/clothing/suit/armor/centcom_formal/nt_consultant = 1,
/obj/item/clothing/suit/armor/vest/nanotrasen_consultant/green = 1,
/obj/item/clothing/suit/armor/vest/nanotrasen_consultant/hubert = 1,
/obj/item/clothing/suit/razurathcoat = 1, /obj/item/clothing/suit/razurathcoat = 1,
/obj/item/clothing/gloves/combat/naval/nanotrasen_consultant = 1,
/obj/item/clothing/head/playbunnyears/centcom = 1, /obj/item/clothing/head/playbunnyears/centcom = 1,
/obj/item/clothing/neck/tie/bunnytie/centcom = 1, /obj/item/clothing/neck/tie/bunnytie/centcom = 1,
/obj/item/clothing/suit/jacket/tailcoat/centcom = 1, /obj/item/clothing/suit/jacket/tailcoat/centcom = 1,
/obj/item/clothing/under/costume/playbunny/centcom = 1, /obj/item/clothing/under/costume/playbunny/centcom = 1,
) )
access_lists["[ACCESS_COMMAND]"] += list( access_lists["[ACCESS_COMMAND]"] = list(
/obj/item/clothing/head/hats/imperial = 5,
/obj/item/clothing/head/hats/imperial/grey = 5,
/obj/item/clothing/head/hats/imperial/white = 5,
/obj/item/clothing/head/hats/imperial/red = 5,
/obj/item/clothing/head/hats/imperial/helmet = 5,
/obj/item/clothing/head/hats/caphat/naval/fleet_admiral = 5,
/obj/item/clothing/suit/armor/vest/bridge = 5,
/obj/item/clothing/suit/armor/skyy = 5,
/obj/item/clothing/glasses/sunglasses/gar/giga = 5,
/obj/item/clothing/neck/cloak/fleet_admiral = 5,
/obj/item/clothing/under/rank/captain/skyrat/imperial/generic = 5,
/obj/item/clothing/under/rank/captain/skyrat/imperial/generic/grey = 5,
/obj/item/clothing/under/rank/captain/skyrat/imperial/generic/pants = 5,
/obj/item/clothing/under/rank/captain/skyrat/imperial/generic/red = 5,
/obj/item/clothing/under/rank/bridge_assistant = 5,
/obj/item/clothing/under/rank/bridge_assistant/skirt = 5,
/obj/item/clothing/under/rank/bridge_assistant/turtle = 5,
/obj/item/clothing/under/rank/bridge_assistant/turtle/skirt = 5,
/obj/item/clothing/under/rank/civilian/head_of_personnel/stripper = 5, //Multiple for heads. Urgh. /obj/item/clothing/under/rank/civilian/head_of_personnel/stripper = 5, //Multiple for heads. Urgh.
/obj/item/clothing/suit/armor/skyy = 2, /obj/item/clothing/accessory/bubber/acc_medal/neckpin = 5,
/obj/item/clothing/accessory/bubber/acc_medal/neckpin/centcom = 5,
) )

View File

@@ -1,7 +1,7 @@
/obj/machinery/vending/wardrobe/sec_wardrobe /obj/machinery/vending/wardrobe/sec_wardrobe
name = "\improper MultiSec Outfitting Station" name = "\improper MultiSec Outfitting Station"
desc = "A vending machine stocked with a multitude of security outfits, including standardized uniforms in multiple colors and general equipment. Now with more Multi!" desc = "A vending machine stocked with a multitude of security outfits, including standardized uniforms in multiple colors and general equipment. Now with more Multi!"
icon = 'modular_zubbers/icons/obj/machines/multisec.dmi' icon = 'modular_zubbers/icons/obj/machines/vending.dmi'
icon_state = "multisec" icon_state = "multisec"
light_mask = null light_mask = null
products = list() // Overriding this to the default to prevent any issues when building the product menu products = list() // Overriding this to the default to prevent any issues when building the product menu

Binary file not shown.

Before

Width:  |  Height:  |  Size: 292 B

After

Width:  |  Height:  |  Size: 6.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 546 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 463 B

After

Width:  |  Height:  |  Size: 8.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

View File

@@ -344,6 +344,12 @@
uniform = /obj/item/clothing/under/rank/captain/skyrat/utility/syndicate uniform = /obj/item/clothing/under/rank/captain/skyrat/utility/syndicate
suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate
back = /obj/item/storage/backpack/satchel back = /obj/item/storage/backpack/satchel
backpack_contents = list(
/obj/item/storage/box/survival = 1,
/obj/item/crowbar = 1,
/obj/item/choice_beacon/syndicateoffstation/morale = 1,
/obj/item/storage/lockbox/medal/bubber/synd = 1,
)
belt = /obj/item/gun/ballistic/automatic/pistol/aps belt = /obj/item/gun/ballistic/automatic/pistol/aps
head = /obj/item/clothing/head/hats/hos/cap/syndicate head = /obj/item/clothing/head/hats/hos/cap/syndicate
id = /obj/item/card/id/advanced/gold/generic id = /obj/item/card/id/advanced/gold/generic

View File

@@ -383,6 +383,7 @@
/obj/item/storage/box/survival = 1, /obj/item/storage/box/survival = 1,
/obj/item/crowbar = 1, /obj/item/crowbar = 1,
/obj/item/choice_beacon/syndicateoffstation/morale = 1, /obj/item/choice_beacon/syndicateoffstation/morale = 1,
/obj/item/storage/lockbox/medal/bubber/synd = 1,
) )
head = /obj/item/clothing/head/hats/hos/cap/syndicate head = /obj/item/clothing/head/hats/hos/cap/syndicate
id = /obj/item/card/id/advanced/gold/generic id = /obj/item/card/id/advanced/gold/generic

View File

@@ -7661,7 +7661,6 @@
#include "modular_skyrat\modules\colony_fabricator\code\machines\stirling_generator.dm" #include "modular_skyrat\modules\colony_fabricator\code\machines\stirling_generator.dm"
#include "modular_skyrat\modules\colony_fabricator\code\machines\thermomachine.dm" #include "modular_skyrat\modules\colony_fabricator\code\machines\thermomachine.dm"
#include "modular_skyrat\modules\colony_fabricator\code\tools\tools.dm" #include "modular_skyrat\modules\colony_fabricator\code\tools\tools.dm"
#include "modular_skyrat\modules\command_vendor\code\vending.dm"
#include "modular_skyrat\modules\company_imports\code\armament_component.dm" #include "modular_skyrat\modules\company_imports\code\armament_component.dm"
#include "modular_skyrat\modules\company_imports\code\company_datums.dm" #include "modular_skyrat\modules\company_imports\code\company_datums.dm"
#include "modular_skyrat\modules\company_imports\code\armament_datums\_armament_basetype.dm" #include "modular_skyrat\modules\company_imports\code\armament_datums\_armament_basetype.dm"