diff --git a/code/datums/outfits/ert/ert.dm b/code/datums/outfits/ert/ert.dm index b5619b1e56e..fbf49c51412 100644 --- a/code/datums/outfits/ert/ert.dm +++ b/code/datums/outfits/ert/ert.dm @@ -92,7 +92,7 @@ name = "TCFL Dropship Pilot" uniform = /obj/item/clothing/under/legion/pilot head = /obj/item/clothing/head/helmet/legion_pilot - suit = /obj/item/clothing/suit/storage/toggle/leather_jacket/flight/legion + suit = /obj/item/clothing/suit/storage/toggle/leather_jacket/flight/legion/alt gloves = null back = null belt = /obj/item/storage/belt/security/tactical diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index 4732786a11e..c4f1a76b8d1 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -54,6 +54,14 @@ display_name = "beret, purple" path = /obj/item/clothing/head/beret/purple +/datum/gear/head/beret/color + display_name = "beret (colorable)" + path = /obj/item/clothing/head/beret/misc + +/datum/gear/head/beret/color/New() + ..() + gear_tweaks += gear_tweak_free_color_choice + /datum/gear/head/beret/sec display_name = "beret, security" path = /obj/item/clothing/head/beret/sec @@ -228,6 +236,9 @@ ..() gear_tweaks += gear_tweak_free_color_choice +/datum/gear/head/nonla + display_name = "non la hat" + path = /obj/item/clothing/head/nonla /datum/gear/head/iacberet display_name = "IAC Beret" diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index 35e94497c5f..0ac9c40998d 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -247,10 +247,18 @@ coat["dominia great coat, alternative black"] = /obj/item/clothing/suit/storage/toggle/dominia/black/alt gear_tweaks += new/datum/gear_tweak/path(coat) -/datum/gear/suit/legion_jacket - display_name = "Tau Ceti Foreign Legion jacket" +/datum/gear/suit/tcfl + display_name = "Tau Ceti Foreign Legion jacket selection" + description = "A selection of fine, surplus jackets of the Foreign Legion." path = /obj/item/clothing/suit/storage/legion +/datum/gear/suit/tcfl/New() + ..() + var/tcfljac = list() + tcfljac ["tcfl jacket"] = /obj/item/clothing/suit/storage/legion + tcfljac ["tcfl jacket, flight"] = /obj/item/clothing/suit/storage/toggle/leather_jacket/flight/legion + gear_tweaks += new/datum/gear_tweak/path(tcfljac) + /datum/gear/suit/dep_jacket display_name = "department jackets selection" description = "A selection of department jackets." diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 8c575fa9d49..429e702b5e1 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -8,7 +8,7 @@ /datum/gear/uniform/kilt display_name = "kilt" path = /obj/item/clothing/under/kilt - + /datum/gear/uniform/formalblouse display_name = "formal blouse" path = /obj/item/clothing/under/formalblouse @@ -65,6 +65,7 @@ ..() var/skirts = list() skirts["casual skirt"] = /obj/item/clothing/under/skirt/casual + skirts["casual skirt, alt"] = /obj/item/clothing/under/skirt/casual/alt skirts["long skirt"] = /obj/item/clothing/under/skirt/long skirts["pencil skirt"] = /obj/item/clothing/under/skirt/pencil skirts["swept skirt"] = /obj/item/clothing/under/skirt/swept @@ -213,6 +214,18 @@ pants["khaki shorts shorts"] = /obj/item/clothing/under/shorts/khaki/female gear_tweaks += new/datum/gear_tweak/path(pants) +/datum/gear/uniform/colorpants + display_name = "pants (recolorable)" + path = /obj/item/clothing/under/pants/dress + +/datum/gear/uniform/colorpants/New() + ..() + var/colorpants = list() + colorpants["dress pants"] = /obj/item/clothing/under/pants/dress + colorpants["striped pants"] = /obj/item/clothing/under/pants/striped + gear_tweaks += new/datum/gear_tweak/path(colorpants) + gear_tweaks += list(gear_tweak_free_color_choice) + /datum/gear/uniform/turtleneck display_name = "tacticool turtleneck" path = /obj/item/clothing/under/syndicate/tacticool diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index fae08579657..d4cce74f850 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -138,6 +138,12 @@ desc = "A white beret adorned with the crest of an ERT detachment. Worn by commanders of Nanotrasen response teams." icon_state = "centcomcaptain" +/obj/item/clothing/head/beret/misc + name = "beret" + desc = "A colorful beret, treasured by artists and the French." + icon_state = "miscberet" + item_state = "miscberet" + //Medical /obj/item/clothing/head/surgery name = "surgical cap" diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 306b3389909..663aefb761c 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -683,4 +683,10 @@ icon_state = "helmet_tac_sol" item_state = "helmet_tac_sol" armor = list(melee = 60, bullet = 60, laser = 60, energy = 40, bomb = 40, bio = 0, rad = 0) - contained_sprite = 1 \ No newline at end of file + contained_sprite = 1 + +/obj/item/clothing/head/nonla + name = "non la" + desc = "A conical straw hat enjoyed particularly by residents of New Hai Phong, to protect the head from sweltering suns and heavy rains." + icon_state = "nonla" + item_state = "nonla" \ No newline at end of file diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index d38617f06ac..9eed2316ec1 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -300,11 +300,16 @@ /obj/item/clothing/suit/storage/toggle/leather_jacket/flight/legion name = "tcfl flight jacket" - desc = "A Tau Ceti Foreign Legion pilot's jacket made from a silky, shiny nanonylon material and lined with tough, protective synthfabrics." + desc = "A Tau Ceti Foreign Legion pilot's jacket. This is the more common, less durable variety, which typically finds itself percolating amongst all ranks of the TCFL." icon_state = "lflight" item_state = "lflight" icon_open = "lflight_open" icon_closed = "lflight" + armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) + siemens_coefficient = 0.75 + +/obj/item/clothing/suit/storage/toggle/leather_jacket/flight/legion/alt + desc = "A Tau Ceti Foreign Legion pilot's jacket made from a silky, shiny nanonylon material and lined with tough, protective synthfabrics." armor = list(melee = 40, bullet = 10, laser = 20, energy = 10, bomb = 30, bio = 0, rad = 0) siemens_coefficient = 0.35 diff --git a/code/modules/clothing/under/shorts.dm b/code/modules/clothing/under/shorts.dm index 2bef102fcb8..7884566ba1d 100644 --- a/code/modules/clothing/under/shorts.dm +++ b/code/modules/clothing/under/shorts.dm @@ -206,3 +206,15 @@ desc = "Dark denim jeans carefully distressed to perfection. They're not as rugged as they look." icon_state = "designer_jeans" item_state = "designer_jeans" + +/obj/item/clothing/under/pants/dress + name = "dress pants" + desc = "A pair of suit trousers. The rest of the outfit can't have gone far." + icon_state = "dresspants" + item_state = "dresspants" + +/obj/item/clothing/under/pants/striped + name = "striped pants" + desc = "A pair of striped pants. Typically seen among privateers." + icon_state = "stripedpants" + item_state = "stripedpants" \ No newline at end of file diff --git a/code/modules/clothing/under/skirts.dm b/code/modules/clothing/under/skirts.dm index 438e9efadfb..3a507d77d75 100644 --- a/code/modules/clothing/under/skirts.dm +++ b/code/modules/clothing/under/skirts.dm @@ -21,6 +21,10 @@ icon_state = "skirt_casual" worn_state = "skirt_casual" +/obj/item/clothing/under/skirt/casual/alt + icon_state = "skirt_casual_alt" + worn_state = "skirt_casual_alt" + /obj/item/clothing/under/skirt/long name = "long skirt" desc = "A long, modest skirt." diff --git a/html/changelogs/paradoxspace-trousers.yml b/html/changelogs/paradoxspace-trousers.yml new file mode 100644 index 00000000000..839deb449c2 --- /dev/null +++ b/html/changelogs/paradoxspace-trousers.yml @@ -0,0 +1,43 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: ParadoxSpace + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds two kinds of recolorable pants, dress and striped, as well as a recolorable beret and an alt version of the casual skirt." + - rscadd: "Adds a non la conical hat." + - rscadd: "You can now get an armorless version of the TCFL flight jacket in the loadout." diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index d32126067c4..a88e92bf9d1 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 6f666230bf0..e9f5a69dbf2 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 7e674cf234e..14ac012ff5b 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 9790e7a2236..959f9274320 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/icons/obj/pants.dmi b/icons/obj/pants.dmi index 020bc2011fd..ad4ead4a33b 100644 Binary files a/icons/obj/pants.dmi and b/icons/obj/pants.dmi differ