Skip to content

Commit

Permalink
Merge pull request #3344 from FluffyTox/MOAR-loadouts-and-stuff
Browse files Browse the repository at this point in the history
(Able to be merged when possible) Adds new flags
  • Loading branch information
Tk420634 authored Oct 9, 2023
2 parents 9a90342 + ca3fc84 commit 6e4e4ff
Show file tree
Hide file tree
Showing 9 changed files with 218 additions and 1 deletion.
2 changes: 1 addition & 1 deletion code/modules/clothing/neck/_neck.dm
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ obj/item/clothing/neck/neckerchief

/obj/item/clothing/neck/customfleur
name = "Fluer's necklace"
desc = "A simple but handmade necklace. The chain was of a soft, glistening gold, carefully linked together. On the end of the necklace was a small heart in the most pristine sliver. Gently glistening in the light. On the back, in-graved in small careful words was, 'Never lose sight of hope or love.' Along with an image of two tails carefully intertwining."
desc = "A simple but handmade necklace. The chain was of a soft, glistening silver, carefully linked together. On the end of the necklace was a small heart in the most pristine sliver. Gently glistening in the light. On the back, in-graved in small careful words was, 'Never lose sight of hope or love.' Along with an image of two tails carefully intertwining."
icon_state = "fleurnecklace"
item_state = "fleurnecklace"
icon = 'icons/fallout/clothing/mantles.dmi'
Expand Down
65 changes: 65 additions & 0 deletions code/modules/clothing/neck/mantle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -414,3 +414,68 @@
mob_overlay_icon = 'icons/fallout/onmob/clothes/mantle.dmi'
icon_state = "swedena"
item_state = "swedena"

/obj/item/clothing/neck/tie/flagcapesaccessories/no9
name = "Imperial Tsar flag cape"
desc = "A flag cape!"
icon = 'icons/fallout/clothing/mantles.dmi'
mob_overlay_icon = 'icons/fallout/onmob/clothes/mantle.dmi'
icon_state = "imperialrusa"
item_state = "imperialrusa"

/obj/item/clothing/neck/tie/flagcapesaccessories/no10
name = "Irish flag cape"
desc = "A flag cape!"
icon = 'icons/fallout/clothing/mantles.dmi'
mob_overlay_icon = 'icons/fallout/onmob/clothes/mantle.dmi'
icon_state = "irelanda"
item_state = "irelanda"

/obj/item/clothing/neck/tie/flagcapesaccessories/no11
name = "Brazilian flag cape"
desc = "A flag cape!"
icon = 'icons/fallout/clothing/mantles.dmi'
mob_overlay_icon = 'icons/fallout/onmob/clothes/mantle.dmi'
icon_state = "brazila"
item_state = "brazila"

/obj/item/clothing/neck/tie/flagcapesaccessories/no12
name = "Canadian flag cape"
desc = "A flag cape!"
icon = 'icons/fallout/clothing/mantles.dmi'
mob_overlay_icon = 'icons/fallout/onmob/clothes/mantle.dmi'
icon_state = "canadaa"
item_state = "canadaa"

/obj/item/clothing/neck/tie/flagcapesaccessories/no13
name = "British flag cape"
desc = "A flag cape!"
icon = 'icons/fallout/clothing/mantles.dmi'
mob_overlay_icon = 'icons/fallout/onmob/clothes/mantle.dmi'
icon_state = "uka"
item_state = "uka"

/obj/item/clothing/neck/tie/flagcapesaccessories/no14
name = "Australian flag cape"
desc = "A flag cape!"
icon = 'icons/fallout/clothing/mantles.dmi'
mob_overlay_icon = 'icons/fallout/onmob/clothes/mantle.dmi'
icon_state = "australiaa"
item_state = "australiaa"

/obj/item/clothing/neck/tie/flagcapesaccessories/no15
name = "New Zealander flag cape"
desc = "A flag cape!"
icon = 'icons/fallout/clothing/mantles.dmi'
mob_overlay_icon = 'icons/fallout/onmob/clothes/mantle.dmi'
icon_state = "newzealanda"
item_state = "newzealanda"


/obj/item/clothing/neck/tie/flagcapesaccessories/no16
name = "Italian flag cape"
desc = "A flag cape!"
icon = 'icons/fallout/clothing/mantles.dmi'
mob_overlay_icon = 'icons/fallout/onmob/clothes/mantle.dmi'
icon_state = "italya"
item_state = "italya"
64 changes: 64 additions & 0 deletions code/modules/clothing/suits/arfsuits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -728,6 +728,70 @@
icon_state = "france"
item_state = "france"

/obj/item/clothing/suit/armor/outfit/flagcapes/tsaristrussia
name = "Armored Tsarist flag cape"
desc = "A cape made to resemble the flag of the Tsar."
icon = 'icons/fallout/clothing/armored_light.dmi'
mob_overlay_icon = 'icons/fallout/onmob/clothes/armor_light.dmi'
icon_state = "imperialrus"
item_state = "imperialrus"

/obj/item/clothing/suit/armor/outfit/flagcapes/ireland
name = "Armored Irish flag cape"
desc = "A cape made to resemble the flag of Ireland."
icon = 'icons/fallout/clothing/armored_light.dmi'
mob_overlay_icon = 'icons/fallout/onmob/clothes/armor_light.dmi'
icon_state = "ireland"
item_state = "ireland"

/obj/item/clothing/suit/armor/outfit/flagcapes/brazil
name = "Armored Brazilian flag cape"
desc = "A cape made to resemble the flag of Brazil"
icon = 'icons/fallout/clothing/armored_light.dmi'
mob_overlay_icon = 'icons/fallout/onmob/clothes/armor_light.dmi'
icon_state = "brazil"
item_state = "brazil"

/obj/item/clothing/suit/armor/outfit/flagcapes/italy
name = "Armored Italian flag cape"
desc = "A cape made to resemble the flag of Italy"
icon = 'icons/fallout/clothing/armored_light.dmi'
mob_overlay_icon = 'icons/fallout/onmob/clothes/armor_light.dmi'
icon_state = "italy"
item_state = "italy"

/obj/item/clothing/suit/armor/outfit/flagcapes/canada
name = "Armored Canadian flag cape"
desc = "A cape made to resemble the flag of Canada."
icon = 'icons/fallout/clothing/armored_light.dmi'
mob_overlay_icon = 'icons/fallout/onmob/clothes/armor_light.dmi'
icon_state = "canada"
item_state = "canada"

/obj/item/clothing/suit/armor/outfit/flagcapes/unitedkingdom
name = "Armored british flag cape"
desc = "A cape made to resemble the flag of the United Kingdom"
icon = 'icons/fallout/clothing/armored_light.dmi'
mob_overlay_icon = 'icons/fallout/onmob/clothes/armor_light.dmi'
icon_state = "uk"
item_state = "uk"

/obj/item/clothing/suit/armor/outfit/flagcapes/australia
name = "Armored Australian flag cape"
desc = "A cape made to resemble the flag of Australia"
icon = 'icons/fallout/clothing/armored_light.dmi'
mob_overlay_icon = 'icons/fallout/onmob/clothes/armor_light.dmi'
icon_state = "australia"
item_state = "australia"

/obj/item/clothing/suit/armor/outfit/flagcapes/newzealand
name = "Armored New Zealander flag cape"
desc = "A cape made to resemble the flag of New Zealand"
icon = 'icons/fallout/clothing/armored_light.dmi'
mob_overlay_icon = 'icons/fallout/onmob/clothes/armor_light.dmi'
icon_state = "newzealand"
item_state = "newzealand"

// until togglesuits are made into normal suits, treat these as jackets

/obj/item/clothing/suit/toggle/labcoat
Expand Down
Binary file modified icons/fallout/clothing/armored_light.dmi
Binary file not shown.
Binary file modified icons/fallout/clothing/mantles.dmi
Binary file not shown.
Binary file modified icons/fallout/onmob/clothes/armor_light.dmi
Binary file not shown.
Binary file modified icons/fallout/onmob/clothes/mantle.dmi
Binary file not shown.
40 changes: 40 additions & 0 deletions modular_citadel/code/modules/client/loadout/neck.dm
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,46 @@
path = /obj/item/clothing/neck/tie/flagcapesaccessories/no8
cost = 0

/datum/gear/neck/tsarcape
name = "Tsar Cape"
path = /obj/item/clothing/neck/tie/flagcapesaccessories/no9
cost = 0

/datum/gear/neck/irecape
name = "Irish Cape"
path = /obj/item/clothing/neck/tie/flagcapesaccessories/no10
cost = 0

/datum/gear/neck/brazcape
name = "Brazilian Cape"
path = /obj/item/clothing/neck/tie/flagcapesaccessories/no11
cost = 0

/datum/gear/neck/cancape
name = "Canadian Cape"
path = /obj/item/clothing/neck/tie/flagcapesaccessories/no12
cost = 0

/datum/gear/neck/ukcape
name = "British Cape"
path = /obj/item/clothing/neck/tie/flagcapesaccessories/no13
cost = 0

/datum/gear/neck/auscape
name = "Australian Cape"
path = /obj/item/clothing/neck/tie/flagcapesaccessories/no14
cost = 0

/datum/gear/neck/nzeacape
name = "New Zealand Cape"
path = /obj/item/clothing/neck/tie/flagcapesaccessories/no15
cost = 0

/datum/gear/neck/italiancape
name = "Italian Cape"
path = /obj/item/clothing/neck/tie/flagcapesaccessories/no16
cost = 0

/datum/gear/neck/domcapefull
name = "Dominia Cape, full"
path = /obj/item/clothing/neck/tie/aurora/dominian_doublecape
Expand Down
48 changes: 48 additions & 0 deletions modular_citadel/code/modules/client/loadout/suit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -724,6 +724,54 @@
subcategory = LOADOUT_SUBCATEGORY_SUIT_GENERAL
cost = 1

/datum/gear/suit/armor/flagcapesclothing/tsar
name = "Armored Tsaraist flag cape"
path = /obj/item/clothing/suit/armor/outfit/flagcapes/tsaristrussia
subcategory = LOADOUT_SUBCATEGORY_SUIT_GENERAL
cost = 1

/datum/gear/suit/armor/flagcapesclothing/irla
name = "Armored Irish flag cape"
path = /obj/item/clothing/suit/armor/outfit/flagcapes/ireland
subcategory = LOADOUT_SUBCATEGORY_SUIT_GENERAL
cost = 1

/datum/gear/suit/armor/flagcapesclothing/braz
name = "Armored Brazilian flag cape"
path = /obj/item/clothing/suit/armor/outfit/flagcapes/brazil
subcategory = LOADOUT_SUBCATEGORY_SUIT_GENERAL
cost = 1

/datum/gear/suit/armor/flagcapesclothing/ily
name = "Armored Italian flag cape"
path = /obj/item/clothing/suit/armor/outfit/flagcapes/italy
subcategory = LOADOUT_SUBCATEGORY_SUIT_GENERAL
cost = 1

/datum/gear/suit/armor/flagcapesclothing/cn
name = "Armored Canadian flag cape"
path = /obj/item/clothing/suit/armor/outfit/flagcapes/canada
subcategory = LOADOUT_SUBCATEGORY_SUIT_GENERAL
cost = 1

/datum/gear/suit/armor/flagcapesclothing/uk
name = "Armored British flag cape"
path = /obj/item/clothing/suit/armor/outfit/flagcapes/unitedkingdom
subcategory = LOADOUT_SUBCATEGORY_SUIT_GENERAL
cost = 1

/datum/gear/suit/armor/flagcapesclothing/aus
name = "Armored Australian flag cape"
path = /obj/item/clothing/suit/armor/outfit/flagcapes/australia
subcategory = LOADOUT_SUBCATEGORY_SUIT_GENERAL
cost = 1

/datum/gear/suit/armor/flagcapesclothing/nz
name = "Armored New Zealander flag cape"
path = /obj/item/clothing/suit/armor/outfit/flagcapes/newzealand
subcategory = LOADOUT_SUBCATEGORY_SUIT_GENERAL
cost = 1

/datum/gear/suit/armor/ncrmedium
name = "Texas militia breastplate"
path = /obj/item/clothing/suit/armor/texasmed
Expand Down

0 comments on commit 6e4e4ff

Please sign in to comment.