diff --git a/code/game/machinery/vendors/generic_vendors.dm b/code/game/machinery/vendors/generic_vendors.dm index 61f6014df19..ce175726a63 100644 --- a/code/game/machinery/vendors/generic_vendors.dm +++ b/code/game/machinery/vendors/generic_vendors.dm @@ -753,6 +753,12 @@ /obj/item/clothing/under/misc/pinkhawaiianshirt = 1, /obj/item/clothing/under/misc/bluehawaiianshirt = 1, /obj/item/clothing/under/misc/orangehawaiianshirt = 1, + /obj/item/clothing/under/misc/baseball = 1, + /obj/item/clothing/under/misc/baseball/solgov = 1, + /obj/item/clothing/under/misc/baseball/nanotrasen = 1, + /obj/item/clothing/head/soft/black = 1, + /obj/item/clothing/head/soft/baseball_tsf = 1, + /obj/item/clothing/head/soft/baseball_nt = 1, /obj/item/clothing/suit/jacket/varsity = 1, /obj/item/clothing/suit/jacket/varsity_sport = 1, /obj/item/clothing/suit/jacket/varsity_blood = 1, @@ -892,6 +898,12 @@ /obj/item/clothing/under/misc/pinkhawaiianshirt = 75, /obj/item/clothing/under/misc/bluehawaiianshirt = 75, /obj/item/clothing/under/misc/orangehawaiianshirt = 75, + /obj/item/clothing/under/misc/baseball = 75, + /obj/item/clothing/under/misc/baseball/solgov = 75, + /obj/item/clothing/under/misc/baseball/nanotrasen = 75, + /obj/item/clothing/head/soft/black = 50, + /obj/item/clothing/head/soft/baseball_tsf = 50, + /obj/item/clothing/head/soft/baseball_nt = 50, /obj/item/clothing/suit/jacket/varsity = 200, /obj/item/clothing/suit/jacket/varsity_sport = 200, /obj/item/clothing/suit/jacket/varsity_blood = 200, diff --git a/code/modules/client/preference/loadout/loadout_hat.dm b/code/modules/client/preference/loadout/loadout_hat.dm index 6cc89241da2..ae87e1639d9 100644 --- a/code/modules/client/preference/loadout/loadout_hat.dm +++ b/code/modules/client/preference/loadout/loadout_hat.dm @@ -152,6 +152,14 @@ display_name = "Cap, yellow" path = /obj/item/clothing/head/soft/yellow +/datum/gear/hat/capbaseballtsf + display_name = "Cap, trans-solar federation baseball" + path = /obj/item/clothing/head/soft/baseball_tsf + +/datum/gear/hat/capbaseballnt + display_name = "Cap, nanotrasen baseball" + path = /obj/item/clothing/head/soft/baseball_nt + /datum/gear/hat/cowboyhat display_name = "Cowboy hat, brown" path = /obj/item/clothing/head/cowboyhat diff --git a/code/modules/client/preference/loadout/loadout_uniform.dm b/code/modules/client/preference/loadout/loadout_uniform.dm index 1aa9515891d..8b9dc4f1023 100644 --- a/code/modules/client/preference/loadout/loadout_uniform.dm +++ b/code/modules/client/preference/loadout/loadout_uniform.dm @@ -722,3 +722,15 @@ display_name = "Orange Hawaiian T-Shirt" description = "A nice t-shirt to remind about warm beaches. This one is orange." path = /obj/item/clothing/under/misc/orangehawaiianshirt + +/datum/gear/uniform/suit/baseball + display_name = "Baseball Uniform, Generic" + path = /obj/item/clothing/under/misc/baseball + +/datum/gear/uniform/suit/baseballtsf + display_name = "Baseball Uniform, Trans-Solar Federation" + path = /obj/item/clothing/under/misc/baseball/solgov + +/datum/gear/uniform/suit/baseballnt + display_name = "Baseball Uniform, Nanotrasen" + path = /obj/item/clothing/under/misc/baseball/nanotrasen diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index 7e6925948e5..dfa20b2ce17 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -154,6 +154,16 @@ desc = "It's a black baseball hat with a red research shield." icon_state = "robo" +/obj/item/clothing/head/soft/baseball_tsf + name = "baseball cap" + desc = "It's a blue baseball hat with a gold brim, belonging to the Trans-Solar Flares." + icon_state = "baseballtsf" + +/obj/item/clothing/head/soft/baseball_nt + name = "baseball cap" + desc = "It's a white baseball hat with a blue brim, belonging to the Cerebron Catchers." + icon_state = "baseballnt" + /obj/item/clothing/head/soft/sec name = "security cap" desc = "It's baseball hat in tasteful red colour." diff --git a/code/modules/clothing/under/misc_jumpsuits.dm b/code/modules/clothing/under/misc_jumpsuits.dm index d5b387b7859..f539043b21e 100644 --- a/code/modules/clothing/under/misc_jumpsuits.dm +++ b/code/modules/clothing/under/misc_jumpsuits.dm @@ -185,6 +185,28 @@ desc = "An orange and blue wetsuit with long legs and no sleeves." icon_state = "wetsuit_orange" +/obj/item/clothing/under/misc/baseball + name = "baseball uniform" + desc = "A generic white and black uniform belonging to no team. Socks included!" + icon_state = "baseball" + sprite_sheets = list( + "Drask" = 'icons/mob/clothing/species/drask/under/misc.dmi', + "Grey" = 'icons/mob/clothing/species/grey/under/misc.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/under/misc.dmi', + "Vox" = 'icons/mob/clothing/species/vox/under/misc.dmi', + "Skkulakin" = 'icons/mob/clothing/species/skkulakin/under/misc.dmi' + ) + +/obj/item/clothing/under/misc/baseball/solgov + name = "federation baseball uniform" + desc = "A blue and gold uniform belonging to the Trans-Solar Flares, which won a match against the Cerebron Catchers scoring 11 points. Socks included!" + icon_state = "baseball_tsf" + +/obj/item/clothing/under/misc/baseball/nanotrasen + name = "nanotrasen baseball uniform" + desc = "A white and blue uniform belonging to the Cerebron Catchers, which lost a match against the Trans-Solar Flares scoring 5 points. Socks included!" + icon_state = "baseball_nt" + /obj/item/clothing/under/misc/acj name = "administrative cybernetic jumpsuit" desc = "it's a cybernetically enhanced jumpsuit used for administrative duties." diff --git a/icons/mob/clothing/head/softcap.dmi b/icons/mob/clothing/head/softcap.dmi index a59ea14feed..9a9727bd5b8 100644 Binary files a/icons/mob/clothing/head/softcap.dmi and b/icons/mob/clothing/head/softcap.dmi differ diff --git a/icons/mob/clothing/species/drask/under/misc.dmi b/icons/mob/clothing/species/drask/under/misc.dmi index bde63bb0b56..0df7c822980 100644 Binary files a/icons/mob/clothing/species/drask/under/misc.dmi and b/icons/mob/clothing/species/drask/under/misc.dmi differ diff --git a/icons/mob/clothing/species/grey/under/misc.dmi b/icons/mob/clothing/species/grey/under/misc.dmi index 4711165e15b..dce3dc78b88 100644 Binary files a/icons/mob/clothing/species/grey/under/misc.dmi and b/icons/mob/clothing/species/grey/under/misc.dmi differ diff --git a/icons/mob/clothing/species/kidan/head/softcap.dmi b/icons/mob/clothing/species/kidan/head/softcap.dmi index 1e87b851102..9bddb0da712 100644 Binary files a/icons/mob/clothing/species/kidan/head/softcap.dmi and b/icons/mob/clothing/species/kidan/head/softcap.dmi differ diff --git a/icons/mob/clothing/species/kidan/under/misc.dmi b/icons/mob/clothing/species/kidan/under/misc.dmi index 2b0d9f6a490..1d87593b2e8 100644 Binary files a/icons/mob/clothing/species/kidan/under/misc.dmi and b/icons/mob/clothing/species/kidan/under/misc.dmi differ diff --git a/icons/mob/clothing/species/skkulakin/under/misc.dmi b/icons/mob/clothing/species/skkulakin/under/misc.dmi index 7aba13c033c..b273fc155dd 100644 Binary files a/icons/mob/clothing/species/skkulakin/under/misc.dmi and b/icons/mob/clothing/species/skkulakin/under/misc.dmi differ diff --git a/icons/mob/clothing/species/vox/head/softcap.dmi b/icons/mob/clothing/species/vox/head/softcap.dmi index 1b8a7106c75..0b86baed6f1 100644 Binary files a/icons/mob/clothing/species/vox/head/softcap.dmi and b/icons/mob/clothing/species/vox/head/softcap.dmi differ diff --git a/icons/mob/clothing/species/vox/under/misc.dmi b/icons/mob/clothing/species/vox/under/misc.dmi index 9f6b16576b3..ab2993baf3b 100644 Binary files a/icons/mob/clothing/species/vox/under/misc.dmi and b/icons/mob/clothing/species/vox/under/misc.dmi differ diff --git a/icons/mob/clothing/under/misc.dmi b/icons/mob/clothing/under/misc.dmi index cb6b834faab..65edc96a3ab 100644 Binary files a/icons/mob/clothing/under/misc.dmi and b/icons/mob/clothing/under/misc.dmi differ diff --git a/icons/obj/clothing/head/softcap.dmi b/icons/obj/clothing/head/softcap.dmi index 94eafbda7ad..d877ed7c1de 100644 Binary files a/icons/obj/clothing/head/softcap.dmi and b/icons/obj/clothing/head/softcap.dmi differ diff --git a/icons/obj/clothing/under/misc.dmi b/icons/obj/clothing/under/misc.dmi index 8f3e8ff2d9e..135a2e35aac 100644 Binary files a/icons/obj/clothing/under/misc.dmi and b/icons/obj/clothing/under/misc.dmi differ