shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adds 4 loadout jackets

Browse Source 
more clothing ported from RP/existing TG assets with minor edits on some. available in loadout for pre-round selection and character customization.

also fixes flannels by porting additional sprites so they can now be closed/opened. note: this changes some of the flannel /obj/ paths from example: /obj/item/clothing/suit/jacket/flannel/brown
TO
/obj/item/clothing/suit/toggle/jacket/flannel/brown

🆑
fix: flannels can now be toggled in style
add: ports more rp and existing tg assets with minor edits into loadout
/🆑
This commit is contained in:
buffyuwu
2021-09-20 19:04:47 -04:00
parent 605aa0aa11
commit eb43981dea
5 changed files with 73 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/suits/miscellaneous.dm
+30 -7
View File
@@ -427,25 +427,30 @@
desc = "Comfy and supposedly flammable."
icon_state = "flannel"
item_state = "flannel"
/obj/item/clothing/suit/jacket/flannel/red
/obj/item/clothing/suit/toggle/jacket/flannel/red
name = "red flannel jacket"
desc = "Comfy and supposedly flammable."
icon_state = "flannel_red"
item_state = "flannel_red"
/obj/item/clothing/suit/jacket/flannel/aqua
togglename = "buttons"
/obj/item/clothing/suit/toggle/jacket/flannel/aqua
name = "aqua flannel jacket"
desc = "Comfy and supposedly flammable."
icon_state = "flannel_aqua"
item_state = "flannel_aqua"
/obj/item/clothing/suit/jacket/flannel/brown
togglename = "buttons"
/obj/item/clothing/suit/toggle/jacket/flannel/brown
name = "brown flannel jacket"
desc = "Comfy and supposedly flammable."
icon_state = "flannel_brown"
item_state = "flannel_brown"
togglename = "buttons"
/obj/item/clothing/suit/toggle/jacket/whitehoodie
name = "soft hoodie"
desc = "A soft hoodie with a TailorCo brand on the tag."
icon_state = "white_hoodie"
item_state = "white_hoodie"
togglename = "zipper"
/obj/item/clothing/suit/jacket/purplehoodie
name = "purple hoodie"
desc = "A soft purple hoodie with a TailorCo brand on the tag."
@@ -482,6 +487,24 @@
icon_state = "gothic_shirtcross"
item_state = "gothic_shirtcross"
/obj/item/clothing/suit/jacket/gentlecoat
name = "grey jacket"
desc = "A grey coat with a TailorCo brand on the tag. Looks expensive."
icon_state = "gentlecoat"
item_state = "gentlecoat"
/obj/item/clothing/suit/toggle/jacket/greenjacket
name = "green outdoorsmans jacket"
desc = "A green jacket with a TailorCo brand on the tag. Looks expensive."
icon_state = "coatar"
item_state = "coatar"
togglename = "zipper"
/obj/item/clothing/suit/toggle/jacket/fancytrench
name = "grey trenchcoat"
desc = "A custom-tailored trenchcoat with a TailorCo brand on the tag."
icon_state = "fancytrench"
item_state = "fancytrench"
togglename = "buttons"
/obj/item/clothing/suit/jacket/leather
name = "leather jacket"
desc = "Pompadour not included."
code/modules/vending/clothesmate.dm
+14 -4
View File
@@ -15,9 +15,9 @@
/obj/item/clothing/glasses/monocle = 3,
/obj/item/clothing/suit/jacket = 4,
/obj/item/clothing/suit/jacket/flannel = 4,
/obj/item/clothing/suit/jacket/flannel/red = 4,
/obj/item/clothing/suit/jacket/flannel/aqua = 4,
/obj/item/clothing/suit/jacket/flannel/brown = 4,
/obj/item/clothing/suit/toggle/jacket/flannel/red = 4,
/obj/item/clothing/suit/toggle/jacket/flannel/aqua = 4,
/obj/item/clothing/suit/toggle/jacket/flannel/brown = 4,
/obj/item/clothing/suit/jacket/puffer/vest = 4,
/obj/item/clothing/suit/jacket/puffer = 4,
/obj/item/clothing/suit/hooded/cloak/david = 4,
@@ -219,7 +219,17 @@
/obj/item/clothing/under/misc/corporateuniform = 5,
/obj/item/clothing/suit/hooded/wintercoat/polychromic = 5,
/obj/item/clothing/suit/toggle/wbreakpoly/polychromic = 5,
/obj/item/clothing/shoes/sneakers/poly/polychromic = 10)
/obj/item/clothing/shoes/sneakers/poly/polychromic = 10,
/obj/item/clothing/suit/toggle/jacket/fancytrench = 4,
/obj/item/clothing/suit/toggle/jacket/greenjacket = 4,
/obj/item/clothing/suit/jacket/gentlecoat = 4,
/obj/item/clothing/suit/jacket/gothicshirtcross = 4,
/obj/item/clothing/suit/jacket/gothicshirt = 4,
/obj/item/clothing/suit/jacket/gothiccoat = 4,
/obj/item/clothing/suit/jacket/heartcoat = 4,
/obj/item/clothing/suit/jacket/purplehoodie = 4,
/obj/item/clothing/suit/jacket/bluehoodie = 4,
/obj/item/clothing/suit/toggle/jacket/whitehoodie = 4)
refill_canister = /obj/item/vending_refill/clothing
default_price = PRICE_CHEAP
extra_price = PRICE_BELOW_NORMAL
icons/mob/clothing/suit.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 473 KiB

After

Width:  |  Height:  |  Size: 489 KiB

icons/obj/clothing/suits.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 170 KiB

After

Width:  |  Height:  |  Size: 178 KiB

modular_citadel/code/modules/client/loadout/suit.dm
+29 -4
View File
@@ -27,22 +27,22 @@
/datum/gear/suit/jacketflannelblack // all of these are reskins of bomber jackets but with the vibe to make you look like a true lumberjack
name = "Black flannel jacket"
path = /obj/item/clothing/suit/jacket/flannel
path = /obj/item/clothing/suit/toggle/jacket/flannel
subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
/datum/gear/suit/jacketflannelred
name = "Red flannel jacket"
path = /obj/item/clothing/suit/jacket/flannel/red
path = /obj/item/clothing/suit/toggle/jacket/flannel/red
subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
/datum/gear/suit/jacketflannelaqua
name = "Aqua flannel jacket"
path = /obj/item/clothing/suit/jacket/flannel/aqua
path = /obj/item/clothing/suit/toggle/jacket/flannel/aqua
subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
/datum/gear/suit/jacketflannelbrown
name = "Brown flannel jacket"
path = /obj/item/clothing/suit/jacket/flannel/brown
path = /obj/item/clothing/suit/toggle/jacket/flannel/brown
subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
/datum/gear/suit/jacketleather
@@ -97,6 +97,12 @@
name = "Brass winter coat"
path = /obj/item/clothing/suit/hooded/wintercoat/ratvar/fake
/datum/gear/suit/whitehoodie
name = "Soft hoodie"
path = /obj/item/clothing/suit/toggle/jacket/whitehoodie
loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION
subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
/datum/gear/suit/jacketbluehoodie
name = "Blue hoodie"
path = /obj/item/clothing/suit/jacket/bluehoodie
@@ -132,6 +138,25 @@
loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION
subcategory = LOADOUT_SUBCATEGORY_SUIT_GENERAL
/datum/gear/suit/gentlecoat
name = "Grey coat"
path = /obj/item/clothing/suit/jacket/gentlecoat
loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION
subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
/datum/gear/suit/greenjacket
name = "Green outdoorsman jacket"
path = /obj/item/clothing/suit/toggle/jacket/greenjacket
loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION
subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
/datum/gear/suit/fancytrench
name = "Grey trenchcoat"
path = /obj/item/clothing/suit/toggle/jacket/fancytrench
loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION
subcategory = LOADOUT_SUBCATEGORY_SUIT_COATS
/datum/gear/suit/coat/polycoat
name = "Polychromic winter coat"
path = /obj/item/clothing/suit/hooded/wintercoat/polychromic