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

kuddles big fashion update #3213

Closed
wants to merge 1 commit into from
Closed

kuddles big fashion update #3213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 17 additions & 0 deletions code/modules/clothing/suits/arfsuits.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,15 @@
item_state = "lb_suit"
pocket_storage_component_path = /datum/component/storage/concrete/pockets/service/overalls

/obj/item/clothing/suit/armor/outfit/vest/bartender/samsvestkuddles
name = "Sams custom punkvest"
desc = "A distressed black denim vest, adorned with decorations such as paint stains and sewn on patches. The back says 'Search & Destroy' in red spray paint, and a pink patch on the chest says '2 horny 2 die'. There's various band patches on the front as well."
icon_state = "samsvestkuddles"
item_state = "samsvestkuddles"
mob_overlay_icon = 'icons/fallout/onmob/clothes/armor_light.dmi'
icon = 'icons/fallout/clothing/armored_light.dmi'
pocket_storage_component_path = /datum/component/storage/concrete/pockets/service/overalls

/obj/item/clothing/suit/armor/outfit/vest/cowboy/grey
name = "grey vest"
desc = "A grey vest, typically worn by wannabe cowboys and prospectors. It has a few pockets for tiny items."
Expand Down Expand Up @@ -1683,6 +1692,14 @@
icon_state = "light_plates"
body_parts_hidden = CHEST

/obj/item/clothing/suit/armor/light/kit/samsarmorvestkuddles
name = "Sams armored punkvest"
desc = "A vest over leather armor pieces that does a decent job of protecting the wearer, for what it is, and retains Sams signature look entirely while doing it."
icon_state = "samsarmorvestkuddles"
item_state = "samsarmorvestkuddles"
icon = 'icons/fallout/clothing/armored_light.dmi'
mob_overlay_icon = 'icons/fallout/onmob/clothes/armor_light.dmi'

/* /obj/item/clothing/suit/armor/light/kit/Initialize()
. = ..()
AddComponent(/datum/component/armor_plate) */
Expand Down
120 changes: 120 additions & 0 deletions code/modules/clothing/under/f13.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,126 @@
mob_overlay_icon = 'icons/fallout/onmob/clothes/uniform.dmi'
icon = 'icons/fallout/clothing/uniforms.dmi'

/obj/item/clothing/under/f13/olivecargo
name = "Olive Cargo Pants"
desc = "A pair of long, baggy cargo pants in a muted green color. Very skatepunk of you."
icon_state = "olivecargo"
item_state = "olivecargo"
mob_overlay_icon = 'icons/fallout/onmob/clothes/uniform.dmi'
icon = 'icons/fallout/clothing/uniforms.dmi'

/obj/item/clothing/under/f13/brownpunkpants
name = "Punk Leather Pants"
desc = "Something about these pants just makes you want to rebel against the establishment."
icon_state = "brownpunkpants"
item_state = "brownpunkpants"
mob_overlay_icon = 'icons/fallout/onmob/clothes/uniform.dmi'
icon = 'icons/fallout/clothing/uniforms.dmi'

/obj/item/clothing/under/f13/rattycyberpunk
name = "odd cyberpunk skirt"
desc = "An overly vibrant pink fake leather jacket over a white tank top paired with a black skirt. This outfit sticks out like a sore thumb; you'd have to be quite a gonk to wear this, choom."
icon_state = "rattycyberpunk"
item_state = "rattycyberpunk"
mob_overlay_icon = 'icons/fallout/onmob/clothes/uniform.dmi'
icon = 'icons/fallout/clothing/uniforms.dmi'

/obj/item/clothing/under/f13/rattyskirtgreen
name = "ratty green skirt"
desc = "A practical cropped jacket over a comfortable tshirt, with a long course skirt. An outfit probably put together with scavenged pieces by a wasteland settler."
icon_state = "rattyskirtgreen"
item_state = "rattyskirtgreen"
mob_overlay_icon = 'icons/fallout/onmob/clothes/uniform.dmi'
icon = 'icons/fallout/clothing/uniforms.dmi'

/obj/item/clothing/under/f13/rattyskirtyellow
name = "ratty yellow skirt"
desc = "A practical cropped jacket over a comfortable tshirt, with a long course skirt. An outfit probably put together with scavenged pieces by a wasteland settler."
icon_state = "rattyskirtyellow"
item_state = "rattyskirtyellow"
mob_overlay_icon = 'icons/fallout/onmob/clothes/uniform.dmi'
icon = 'icons/fallout/clothing/uniforms.dmi'

/obj/item/clothing/under/f13/rattyskirtpink
name = "ratty pink skirt"
desc = "A practical cropped jacket over a comfortable tshirt, with a long course skirt. An outfit probably put together with scavenged pieces by a wasteland settler."
icon_state = "rattyskirtpink"
item_state = "rattyskirtpink"
mob_overlay_icon = 'icons/fallout/onmob/clothes/uniform.dmi'
icon = 'icons/fallout/clothing/uniforms.dmi'

/obj/item/clothing/under/f13/whiteflannel
name = "white flannel shirt"
desc = "A rugged flannel shirt paired with a sturdy pair of jeans for a simple, timeless outfit. Colorful too!"
icon_state = "whiteflannel"
item_state = "whiteflannel"
mob_overlay_icon = 'icons/fallout/onmob/clothes/uniform.dmi'
icon = 'icons/fallout/clothing/uniforms.dmi'

/obj/item/clothing/under/f13/redflannel
name = "red flannel shirt"
desc = "A rugged flannel shirt paired with a sturdy pair of jeans for a simple, timeless outfit. Colorful too!"
icon_state = "redflannel"
item_state = "redflannel"
mob_overlay_icon = 'icons/fallout/onmob/clothes/uniform.dmi'
icon = 'icons/fallout/clothing/uniforms.dmi'

/obj/item/clothing/under/f13/blueflannel
name = "blue flannel shirt"
desc = "A rugged flannel shirt paired with a sturdy pair of jeans for a simple, timeless outfit. Colorful too!"
icon_state = "blueflannel"
item_state = "blueflannel"
mob_overlay_icon = 'icons/fallout/onmob/clothes/uniform.dmi'
icon = 'icons/fallout/clothing/uniforms.dmi'

/obj/item/clothing/under/f13/tealflannel
name = "teal flannel shirt"
desc = "A rugged flannel shirt paired with a sturdy pair of jeans for a simple, timeless outfit. Colorful too!"
icon_state = "tealflannel"
item_state = "tealflannel"
mob_overlay_icon = 'icons/fallout/onmob/clothes/uniform.dmi'
icon = 'icons/fallout/clothing/uniforms.dmi'

/obj/item/clothing/under/f13/pinkflannel
name = "pink flannel shirt"
desc = "A rugged flannel shirt paired with a sturdy pair of jeans for a simple, timeless outfit. Colorful too!"
icon_state = "pinkflannel"
item_state = "pinkflannel"
mob_overlay_icon = 'icons/fallout/onmob/clothes/uniform.dmi'
icon = 'icons/fallout/clothing/uniforms.dmi'

/obj/item/clothing/under/f13/purpleflannel
name = "purple flannel shirt"
desc = "A rugged flannel shirt paired with a sturdy pair of jeans for a simple, timeless outfit. Colorful too!"
icon_state = "purpleflannel"
item_state = "purpleflannel"
mob_overlay_icon = 'icons/fallout/onmob/clothes/uniform.dmi'
icon = 'icons/fallout/clothing/uniforms.dmi'

/obj/item/clothing/under/f13/yellowflannel
name = "yellow flannel shirt"
desc = "A rugged flannel shirt paired with a sturdy pair of jeans for a simple, timeless outfit. Colorful too!"
icon_state = "yellowflannel"
item_state = "yellowflannel"
mob_overlay_icon = 'icons/fallout/onmob/clothes/uniform.dmi'
icon = 'icons/fallout/clothing/uniforms.dmi'

/obj/item/clothing/under/f13/orangeflannel
name = "orange flannel shirt"
desc = "A rugged flannel shirt paired with a sturdy pair of jeans for a simple, timeless outfit. Colorful too!"
icon_state = "orangeflannel"
item_state = "orangeflannel"
mob_overlay_icon = 'icons/fallout/onmob/clothes/uniform.dmi'
icon = 'icons/fallout/clothing/uniforms.dmi'

/obj/item/clothing/under/f13/greenflannel
name = "green flannel shirt"
desc = "A rugged flannel shirt paired with a sturdy pair of jeans for a simple, timeless outfit. Colorful too!"
icon_state = "greenflannel"
item_state = "greemflannel"
mob_overlay_icon = 'icons/fallout/onmob/clothes/uniform.dmi'
icon = 'icons/fallout/clothing/uniforms.dmi'

/obj/item/clothing/under/f13/futuredresses
name = "Blue lined sci-fi themed dress"
desc = "A futurstic and geometric themed dress. Comfortable and fashionable"
Expand Down
Binary file modified icons/fallout/clothing/armored_light.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/fallout/clothing/uniforms.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/fallout/onmob/clothes/armor_light.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/fallout/onmob/clothes/uniform.dmi
View file
Open in desktop
Binary file not shown.
13 changes: 11 additions & 2 deletions modular_citadel/code/modules/client/loadout/__donator.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,12 +742,21 @@

/datum/gear/donator/kits/LilKuddles
name = "MelMels Belongings"
path = /obj/item/storage/box/large/custom_kit/kuddles2
path = /obj/item/storage/box/large/custom_kit/kuddles1
ckeywhitelist = list("LilKuddles")

/obj/item/storage/box/large/custom_kit/kuddles2/PopulateContents()
/obj/item/storage/box/large/custom_kit/kuddles1/PopulateContents()
new /obj/item/clothing/under/f13/customelody(src)

/datum/gear/donator/kits/LilKuddles2
name = "Sams Belongings"
path = /obj/item/storage/box/large/custom_kit/kuddles2
ckeywhitelist = list("LilKuddles")

/obj/item/storage/box/large/custom_kit/kuddles1/PopulateContents()
new /obj/item/clothing/under/f13/olivecargo(src)
new /obj/item/clothing/suit/armor/light/kit/samsarmorvestkuddles(src)
new /obj/item/clothing/suit/armor/outfit/vest/bartender/samsvestkuddles(src)

/datum/gear/donator/kits/lifelessghoul
name = "Ancient Memories"
Expand Down
2 changes: 1 addition & 1 deletion tgui/public/tgui-panel.bundle.js
View file
Open in desktop

Large diffs are not rendered by default.