Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

[BOUNTY] Lin's Coat to Loadout #3705

Merged
merged 6 commits into from
Oct 7, 2024
Merged

[BOUNTY] Lin's Coat to Loadout #3705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c4daabe
coatworking
manray0 Oct 6, 2024
caab1db
coatworking
manray0 Oct 6, 2024
75f65ff
Merge branch 'lincoat2' of https://github.com/manray0/Monkestation2.0…
manray0 Oct 6, 2024
113904f
oops
manray0 Oct 6, 2024
30df0ec
newline
manray0 Oct 6, 2024
dfa7bb4
change to ornate coat
manray0 Oct 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions code/datums/greyscale/config_types/greyscale_configs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1299,3 +1299,13 @@
name = "Manipulator Hand"
icon_file = 'monkestation/code/modules/factory_type_beat/icons/big_manipulator_hand.dmi'
json_config = 'code/datums/greyscale/json_configs/manipulator_hand.json'

/datum/greyscale_config/linjacket
name = "Tassled Jacket"
icon_file = 'monkestation/icons/obj/clothing/necks.dmi'
json_config = 'code/datums/greyscale/json_configs/linjacket.json'

/datum/greyscale_config/linjacket_worn
name = "Worn Tassled Jacket"
icon_file = 'monkestation/icons/mob/clothing/neck.dmi'
json_config = 'code/datums/greyscale/json_configs/linjacket_worn.json'
16 changes: 16 additions & 0 deletions code/datums/greyscale/json_configs/linjacket.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"linjacket": [
{
"type": "icon_state",
"icon_state": "linjacket",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "tassle",
"blend_mode": "overlay",
"color_ids": [ 2 ]
}
]
}
16 changes: 16 additions & 0 deletions code/datums/greyscale/json_configs/linjacket_worn.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"linjacket": [
{
"type": "icon_state",
"icon_state": "linjacket",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "tassle",
"blend_mode": "overlay",
"color_ids": [ 2 ]
}
]
}
23 changes: 22 additions & 1 deletion monkestation/code/modules/clothing/neck/cloaks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,4 +162,25 @@
/datum/store_item/neck/helldivercape
name = "Helldiver Cape"
item_path = /obj/item/clothing/neck/helldivercape
item_cost = 20000
item_cost = 20000

/obj/item/clothing/neck/linjacket
name = "oranate coat"
desc = "You'll hold this weight."
icon = 'monkestation/icons/obj/clothing/necks.dmi'
worn_icon = 'monkestation/icons/mob/clothing/neck.dmi'
icon_state = "linjacket"
worn_icon_state = "linjacket"
greyscale_config = /datum/greyscale_config/linjacket
greyscale_config_worn = /datum/greyscale_config/linjacket_worn
greyscale_colors = "#283c55#c4c36d"
flags_1 = IS_PLAYER_COLORABLE_1

/datum/loadout_item/neck/linjacket
name = "Ornate Coat"
item_path = /obj/item/clothing/neck/linjacket

/datum/store_item/neck/linjacket
name = "Ornate Coat"
item_path = /obj/item/clothing/neck/linjacket
item_cost = 5000
Binary file modified monkestation/icons/mob/clothing/neck.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/icons/obj/clothing/necks.dmi
View file
Open in desktop
Binary file not shown.
Loading