diff --git a/_maps/configs/syndicate_aegis.json b/_maps/configs/syndicate_aegis.json index 6863c4e11279..5946a8e78343 100644 --- a/_maps/configs/syndicate_aegis.json +++ b/_maps/configs/syndicate_aegis.json @@ -18,7 +18,7 @@ ], "job_slots": { "Captain": { - "outfit": "/datum/outfit/job/syndicate/captain", + "outfit": "/datum/outfit/job/syndicate/captain/suns", "officer": true, "slots": 1 }, @@ -34,7 +34,7 @@ }, "Mechanic": { - "outfit": "/datum/outfit/job/syndicate/engineer", + "outfit": "/datum/outfit/job/syndicate/engineer/suns", "slots": 1 }, diff --git a/code/modules/clothing/factions/suns.dm b/code/modules/clothing/factions/suns.dm new file mode 100644 index 000000000000..019cb82224d9 --- /dev/null +++ b/code/modules/clothing/factions/suns.dm @@ -0,0 +1,615 @@ + + +////////////// +//Jumpsuits// +///////////// + + +/obj/item/clothing/under/syndicate/suns + name = "\improper SUNS formal suit" + desc = "A fancy-looking tailored suit with purple slacks. Worn typically by students in the first half of their academic journey." + icon_state = "suns_uniform1" + item_state = "suns_uniwhite" + armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40) + can_adjust = TRUE + icon = 'icons/obj/clothing/faction/suns/uniforms.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/suns/uniforms.dmi' + lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi' + righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi' + +/obj/item/clothing/under/syndicate/suns/alt + name = "\improper SUNS formal suit" + desc = "A fancy-looking tailored shirt with a purple skirt. Worn typically by students in the first half of their academic journey." + icon_state = "suns_uniskirt1" + item_state = "suns_uniwhite" + +/obj/item/clothing/under/syndicate/suns/uniform2 + desc = "A uniform typically worn by students in the final years of their academic journey." + icon_state = "suns_uniform2" + item_state = "suns_uniwhite" + can_adjust = TRUE + +/obj/item/clothing/under/syndicate/suns/uniform2/alt + desc = "A long skirt and blouse typically worn by students in the final years of their academic journey." + icon_state = "suns_uniskirt2" + item_state = "suns_uniwhite" + +/obj/item/clothing/under/syndicate/suns/uniform3 + desc = "A suit typically worn by SUNS graduates and SUNS academic staff. You've come a long way, friend." + icon_state = "suns_uniform3" + item_state = "suns_unipurple" + can_adjust = TRUE + +/obj/item/clothing/under/syndicate/suns/uniform3/alt + desc = "A skirt and blouse typically worn by SUNS graduates and SUNS academic staff. You've come a long way, friend." + icon_state = "suns_uniskirt3" + item_state = "suns_unipurple" + +/obj/item/clothing/under/syndicate/suns/pkuniform + name = "\improper SUNS peacekeeper uniform" + desc = "A uniform designed for ease of movement for both the classroom and the frontier." + icon_state = "suns_pkuniform" + item_state = "suns_uniblack" + +/obj/item/clothing/under/syndicate/suns/workerjumpsuit + name = "\improper SUNS work jumpsuit" + desc = "A casual uniform worn by students and staff to protect from blue collar work." + icon_state = "suns_workerjumpsuit" + item_state = "suns_unipurple" + can_adjust = TRUE + +/obj/item/clothing/under/syndicate/suns/captain + name = "\improper SUNS captain suit" + desc = "An elaborate uniform to set high ranking staff from academia apart from the rest." + icon_state = "suns_captain" + item_state = "suns_uniblack" + can_adjust = TRUE + +/obj/item/clothing/under/syndicate/suns/xo + name = "\improper SUNS academic suit" + desc = "A style of suit typically worn by academic staff." + icon_state = "suns_xo" + item_state = "suns_uniblack" + can_adjust = TRUE + +/obj/item/clothing/under/syndicate/suns/sciencejumpsuit + name = "\improper SUNS lab jumpsuit" + desc = "A comfortable suit meant to protect the individual from exposure to harmful objects." + icon_state = "suns_sciencejumpsuit" + item_state = "suns_uniwhite" + can_adjust = FALSE + +/obj/item/clothing/under/syndicate/suns/doctorscrubs + name = "\improper SUNS medical scrubs" + desc = "Work safe medical scrubs for both the professionals and the trainees." + icon_state = "suns_doctorscrubs" + item_state = "suns_unipurple" + can_adjust = FALSE + + +//////////////////// +//Unarmored suits// +/////////////////// + + +/obj/item/clothing/suit/toggle/suns + name = "\improper SUNS jacket" + desc = "A plain purple SUNS jacket, used fairly often on the frontier." + icon_state = "suns_jacket" + item_state = "suns_overpurple" + icon = 'icons/obj/clothing/faction/suns/suits.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/suns/suits.dmi' + lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi' + righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi' + +/obj/item/clothing/suit/toggle/suns/alt + name = "black school jacket" + desc = "A plain black jacket with gold detailing. Found in universities all over the galaxy." + icon_state = "suns_schooljacket" + item_state = "suns_overblack" + +/obj/item/clothing/suit/toggle/suns/workervest + name = "SUNS work vest" + desc = "A protective vest worn by some of the more practically minded students and staff during field work." + icon_state = "suns_workervest" + item_state = "suns_overblack" + +/obj/item/clothing/suit/toggle/labcoat/suns/cmo + name = "medical instructor coat" + desc = "A labcoat often worn by the more eccentric medical instructors." + icon_state = "suns_cmocoat" + item_state = "suns_overblack" + icon = 'icons/obj/clothing/faction/suns/suits.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/suns/suits.dmi' + lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi' + righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi' + +/obj/item/clothing/suit/toggle/labcoat/suns/doctorlabcoat + name = "SUNS work vest" + desc = "A stylized white labcoat frequently worn by SUNS medical staff." + icon_state = "suns_doctorlabcoat" + item_state = "suns_overwhite" + icon = 'icons/obj/clothing/faction/suns/suits.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/suns/suits.dmi' + lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi' + righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi' + +/obj/item/clothing/suit/hooded/suns + name = "\improper SUNS labcoat" + desc = "An academic labcoat designed to protect the wearer from chemical and non chemical spills." + icon_state = "suns_labcoat" + item_state = "suns_overwhite" + hoodtype = /obj/item/clothing/head/hooded/hood/suns + allowed = list(/obj/item/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/telescopic, /obj/item/soap, /obj/item/sensor_device, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) + armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 50, "rad" = 0, "fire" = 50, "acid" = 50) + icon = 'icons/obj/clothing/faction/suns/suits.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/suns/suits.dmi' + lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi' + righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi' + +/obj/item/clothing/head/hooded/hood/suns + name = "\improper SUNS labcoat hood" + desc = "A hood to protect you from chemical spills." + icon_state = "suns_labcoathood" + item_state = "suns_labcoathood" + armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 50, "rad" = 0, "fire" = 50, "acid" = 50) + icon = 'icons/obj/clothing/faction/suns/head.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/suns/head.dmi' + + +////////////////// +//Armored suits// +///////////////// + + +/obj/item/clothing/suit/armor/vest/bulletproof/suns + name = "peacekeeper plating" + desc = "A standard issue set of plate assigned to peacekeepers, both durable and stylish." + icon_state = "suns_pkarmor" + item_state = "suns_pkarmor" + icon = 'icons/obj/clothing/faction/suns/suits.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/suns/suits.dmi' + lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi' + righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi' + +/obj/item/clothing/suit/armor/vest/bulletproof/suns/hos + name = "gilded peacekeeper plating" + desc = "A set of plate assigned to peacekeepers, both durable and stylish. This one has a gold lining to indicate rank." + icon_state = "suns_lpkarmor" + item_state = "suns_pkarmor" + +/obj/item/clothing/suit/armor/vest/bulletproof/suns/ehos //remind me to make this something to buy + name = "peacekeeper greatcoat" + desc = "A funky armored coat worn by eccentric peacekeepers. Closing the coat is socially improper." + icon_state = "suns_greatcoat" + item_state = "suns_greatcoat" + +/obj/item/clothing/suit/toggle/suns/pkcoat + name = "peacekeeper coat" + desc = "An armored coat used during special occasions. This one is used in academic security." + icon_state = "suns_pkjacket" + item_state = "suns_overblack" + armor = list("melee" = 15, "bullet" = 30, "laser" = 10, "energy" = 10, "bomb" = 20, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 25) + lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi' + righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi' + +/obj/item/clothing/suit/armor/vest/bulletproof/suns/captain + name = "decorated academic coat" + desc = "An armored coat intended for SUNS captains on the frontier. Go forth, and spread the message of the academy." + icon_state = "suns_captaincoat" + item_state = "suns_overblack" + +/obj/item/clothing/suit/armor/vest/bulletproof/suns/xo + name = "academic staff coat" + desc = "A white coat used by SUNS academic staff. It designates the second in command on the ship." + icon_state = "suns_xojacket" + item_state = "suns_overwhite" + + +/////////////// +//Spacesuits// +////////////// + + +/obj/item/clothing/head/helmet/space/syndicate/suns + name = "SUNS space helmet" + icon_state = "suns_vachelm" + item_state = "suns_vachelm" + desc = "An academic standard spacesuit helmet. Normally reserved for low budget tasks in space." + icon = 'icons/obj/clothing/faction/suns/head.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/suns/head.dmi' + lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi' + righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi' + +/obj/item/clothing/suit/space/syndicate/suns + name = "SUNS spacesuit" + icon_state = "suns_vacsuit" + item_state = "suns_vacsuit" + desc = "An academic standard spacesuit. Normally reserved for low budget tasks in space." + icon = 'icons/obj/clothing/faction/suns/suits.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/suns/suits.dmi' + lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi' + righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi' + +/obj/item/clothing/head/helmet/space/hardsuit/security/suns + name = "\improper SUNS peacekeeper hardsuit helmet" + icon_state = "hardsuit0-suns_pk" + item_state = "hardsuit0-suns_pk" + icon = 'icons/obj/clothing/faction/suns/head.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/suns/head.dmi' + hardsuit_type = "suns_pk" + +/obj/item/clothing/suit/space/hardsuit/security/suns + name = "\improper SUNS peacekeeper hardsuit" + icon_state = "suns_pkhardsuit" + item_state = "suns_pkhardsuit" + icon = 'icons/obj/clothing/faction/suns/suits.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/suns/suits.dmi' + hardsuit_type = "suns_pk" + helmettype = /obj/item/clothing/head/helmet/space/hardsuit/security/suns + lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi' + righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi' + +/obj/item/clothing/head/helmet/space/hardsuit/mining/suns + name = "\improper SUNS industrial hardsuit helmet" + icon_state = "hardsuit0-suns_mining" + item_state = "hardsuit0-suns_mining" + icon = 'icons/obj/clothing/faction/suns/head.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/suns/head.dmi' + hardsuit_type = "suns_mining" + +/obj/item/clothing/suit/space/hardsuit/mining/suns + name = "\improper SUNS industrial hardsuit" + icon_state = "suns_miningsuit" + item_state = "suns_miningsuit" + icon = 'icons/obj/clothing/faction/suns/suits.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/suns/suits.dmi' + hardsuit_type = "suns_mining" + helmettype = /obj/item/clothing/head/helmet/space/hardsuit/mining/suns + lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi' + righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi' + +/obj/item/clothing/head/helmet/space/hardsuit/solgov/suns + name = "\improper SUNS captain's hardsuit helmet" + icon_state = "hardsuit0-suns_solgov" + item_state = "hardsuit0-suns_solgov" + icon = 'icons/obj/clothing/faction/suns/head.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/suns/head.dmi' + hardsuit_type = "suns_solgov" + desc = "An armored spaceproof helmet, the white glass on the side signifies a captain level rank." + +/obj/item/clothing/suit/space/hardsuit/solgov/suns + name = "\improper SUNS captain's hardsuit" + desc = "A well decorated spaceworthy suit. The design was co-created by SolGov and SUNS academics." + icon_state = "suns_commandsuit" + item_state = "suns_commandsuit" + icon = 'icons/obj/clothing/faction/suns/suits.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/suns/suits.dmi' + hardsuit_type = "suns_solgov" + helmettype = /obj/item/clothing/head/helmet/space/hardsuit/solgov/suns + lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi' + righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi' + + +///////// +//Hats// +//////// + + +/obj/item/clothing/head/suns + name = "academic staff beret" + desc = "A soft beret sporting a discontinued inkwell quill feather. If only it could hold ink once more." + icon_state = "suns_xoberet" + item_state = "suns_captainberet" + icon = 'icons/obj/clothing/faction/suns/head.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/suns/head.dmi' + lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi' + righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi' + +/obj/item/clothing/head/safety_helmet/suns + desc = "A piece of headgear used in dangerous working conditions to protect the head." + icon_state = "suns_workerhelmet" + item_state = "suns_workerhelmet" + icon = 'icons/obj/clothing/faction/suns/head.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/suns/head.dmi' + lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi' + righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi' + +/obj/item/clothing/head/HoS/syndicate/suns //remind me to make this something to buy + name = "peacekeeper cap" + desc = "A black cap worn by the more eccentric peacekeepers." + icon_state = "suns_pkcap" + item_state = "suns_pkcap" + icon = 'icons/obj/clothing/faction/suns/head.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/suns/head.dmi' + lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi' + righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi' + +/obj/item/clothing/head/suns/surgery + name = "\improper SUNS surgery cap" + desc = "A surgery cap used by academic students and profesionals alike." + icon_state = "suns_doctorcap" + item_state = "suns_doctorcap" + +/obj/item/clothing/head/welding/suns + name = "peacekeeper visor" + desc = "A head-mounted helmet designed to protect those on the field from bright lights, while also allowing a life support connection. The warnings on this helmet suggest it is not spaceworthy." + icon_state = "sunsvisor" + item_state = "suns_pkhelmet" + tint = 0 + clothing_flags = BLOCK_GAS_SMOKE_EFFECT | ALLOWINTERNALS //Why? Because I'm not giving PK's sec masks nor hud sunglasses. + icon = 'icons/obj/clothing/faction/suns/head.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/suns/head.dmi' + lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi' + righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi' + +/obj/item/clothing/head/welding/suns/hos + name = "gilded peacekeeper visor" + desc = "A head-mounted helmet designed to protect those on the field, this one has a gold lining to indicate rank. The warnings on this helmet suggest it is not spaceworthy." + icon_state = "sunslpkvisor" + item_state = "suns_pkhelmet" + +/obj/item/clothing/head/suns/captain + name = "\improper SUNS bicorne hat" + desc = "A unique bicorne hat given to SUNS Captains to display academic seniority." + icon_state = "suns_captainbicorne" + item_state = "suns_captainbicorne" + worn_y_offset = 2 + dog_fashion = null + +/obj/item/clothing/head/suns/cmo //I was told I get one plague doctor outfit and I'm using it + name = "medical instructor hat" + desc = "A hat worn by the more eccentric medical staff." + icon_state = "suns_doctorhat" + item_state = "suns_doctorhat" + permeability_coefficient = 0.01 + + +//////////// +//Glasses// +/////////// + + +/obj/item/clothing/glasses/science/suns //This needs a sprite/lense in the eye of the mask to show its science goggles + name = "eye mask science goggles" + desc = "A fancy looking mask to help against chemical spills. This one is fitted with an analyzer for scanning items and reagents." + icon_state = "suns_sciencemask" + item_state = "suns_sciencemask" + glass_colour_type = /datum/client_colour/glass_colour/purple + icon = 'icons/obj/clothing/faction/suns/eyes.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/suns/eyes.dmi' + lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi' + righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi' + +/obj/item/clothing/glasses/hud/health/suns //I need to figure out a way to make the masks toggleable for #style points. + name = "eye mask health scanner HUD" + desc = "A peculiar looking mask commonly seen at academic functions. This one has a health HUD lense in it." + icon_state = "suns_doctormask" + item_state = "suns_doctormask" + glass_colour_type = /datum/client_colour/glass_colour/lightblue + icon = 'icons/obj/clothing/faction/suns/eyes.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/suns/eyes.dmi' + lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi' + righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi' + +/obj/item/clothing/glasses/hud/security/suns + name = "eye mask security HUD" + desc = "A peculiar looking mask commonly seen at academic functions. This one gives a heads-up display that scans the humanoids in view and provides accurate data about their ID status and security records." + icon_state = "suns_pkmask" + item_state = "suns_pkmask" + glass_colour_type = /datum/client_colour/glass_colour/red + icon = 'icons/obj/clothing/faction/suns/eyes.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/suns/eyes.dmi' + lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi' + righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi' + + +////////// +//Masks// +///////// + + +/obj/item/clothing/mask/gas/suns //someone mentioned they were interested in using this sprite as the regular gasmask re-sprite, I forgor who so we'll deal with that when I PR this + name = "black gas mask" + desc = "A black face covering that allows the user to connect to a personal gas supply. Suprisingly not great at preventing gas inhalation." + icon_state = "suns_gasmask" + item_state = "suns_gasmask2" + icon = 'icons/obj/clothing/faction/suns/mask.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/suns/mask.dmi' + lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi' + righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi' + +/obj/item/clothing/mask/surgical/suns + name = "purple sterile mask" + desc = "A sterile mask designed to help prevent the spread of diseases. Now in purple! Pretty!" + icon_state = "suns_sterile" + item_state = "suns_doctorcap" + icon = 'icons/obj/clothing/faction/suns/mask.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/suns/mask.dmi' + lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi' + righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi' + +/obj/item/clothing/mask/breath/suns + name = "\improper SUNS half face mask" + desc = "A close-fitting mask that covers JUST enough to connect an air supply." + icon_state = "suns_captainmask" + item_state = "suns_captainmask" + icon = 'icons/obj/clothing/faction/suns/mask.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/suns/mask.dmi' + lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi' + righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi' + + +/////////// +//Gloves// +////////// + +// The following employ a slapjob fix to remove the /color subtype, as per maintainer request. +// These should be addressed in any future glove refactor, as that is out of the scope of this PR. +/obj/item/clothing/gloves/suns + name = "stitched fingerless gloves" + desc = "These gloves offer style, purely and plainly." + icon_state = "suns_glovesfingerless" + item_state = "suns_blackgloves" + icon = 'icons/obj/clothing/faction/suns/hands.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/suns/hands.dmi' + lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi' + righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi' + +/obj/item/clothing/gloves/suns/captain + name = "\improper SUNS captain's gloves" + desc = "Fancy black gloves for trusted SUNS members. Sports a complex lining that prevents the wearer from being shocked." + icon_state = "suns_captaingloves" + item_state = "suns_blackgloves" + siemens_coefficient = 0 + permeability_coefficient = 0.05 + cold_protection = HANDS + min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT + heat_protection = HANDS + max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 50) + +/obj/item/clothing/gloves/suns/xo + name = "academic staff gloves" + desc = "White gloves that offer a good grip with writing utensils." + icon_state = "suns_xogloves" + item_state = "suns_whitegloves" + +/obj/item/clothing/gloves/suns/yellow + name = "insulated gloves" + desc = "Padded academic gloves that hopefully keep students out of the nurses office." + icon_state = "suns_insulated" + item_state = "suns_blackgloves" + siemens_coefficient = 0 + permeability_coefficient = 0.05 + +/obj/item/clothing/gloves/color/latex/nitrile/suns + name = "white nitrile gloves" + desc = "Thick sterile white gloves that reach up to the elbows. The nanochips that transfer basic paramedic knowledge are disabled during finals week." + icon_state = "suns_latexgloves" + item_state = "suns_whitegloves" + icon = 'icons/obj/clothing/faction/suns/hands.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/suns/hands.dmi' + lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi' + righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi' + +/obj/item/clothing/gloves/tackler/dolphin/suns + name = "peacekeeper tackle gloves" + desc = "Sleek tackle gloves that allows the user to sail through the air. The main cause of accidents during finals week." + icon_state = "suns_longglovesblack" + item_state = "suns_blackgloves" + icon = 'icons/obj/clothing/faction/suns/hands.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/suns/hands.dmi' + lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi' + righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi' + + +////////// +//Shoes// +///////// + + +/obj/item/clothing/shoes/sneakers/suns + name = "white clogs" + desc = "Comfortable clogs for general use." + icon_state = "suns_doctorclogs" + item_state = "suns_doctorclogs" //I know what the state says, I'm not fixing it. + icon = 'icons/obj/clothing/faction/suns/feet.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/suns/feet.dmi' + lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi' + righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi' + +/obj/item/clothing/shoes/combat/suns + name = "fancy combat boots" + desc = "Decent traction combat boots worn by high ranking academic staff." + icon_state = "suns_captainboots" + item_state = "suns_blackboots" + icon = 'icons/obj/clothing/faction/suns/feet.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/suns/feet.dmi' + lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi' + righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi' + +/obj/item/clothing/shoes/jackboots/suns + name = "work safe jackboots" + desc = "Academic issued steel toed boots. For those with physically demanding majors." + icon_state = "suns_jackboots" + item_state = "suns_blackboots" + icon = 'icons/obj/clothing/faction/suns/feet.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/suns/feet.dmi' + lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi' + righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi' + +/obj/item/clothing/shoes/jackboots/suns/long + name = "peacekeeper longboots" + desc = "Longboots worn by academic security staff and trainees." + icon_state = "suns_longboots" + item_state = "suns_blackboots" + +/obj/item/clothing/shoes/laceup/suns + name = "academy laceup shoes" + desc = "Standard issue laceups from the syndicates resident academy." + icon_state = "suns_laceups" + item_state = "suns_blackboots" + icon = 'icons/obj/clothing/faction/suns/feet.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/suns/feet.dmi' + lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi' + righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi' + + +////////// +//Cloaks// +////////// + + +/obj/item/clothing/neck/cloak/suns + name = "\improper SUNS short cloak" + desc = "Worn by both the young and old alike. You can almost feel the academic pride." + icon_state = "suns_shouldercape" + item_state = "suns_overpurple" + icon = 'icons/obj/clothing/faction/suns/neck.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/suns/neck.dmi' + lefthand_file = 'icons/mob/inhands/faction/suns/suns_lefthand.dmi' + righthand_file = 'icons/mob/inhands/faction/suns/suns_righthand.dmi' + +/obj/item/clothing/neck/cloak/suns/xo + name = "\improper SUNS academic staff cloak" + desc = "Worn by SUNS staff, you can almost smell all of the failing grades this cloak has given." + icon_state = "suns_xocape" + item_state = "suns_xocape" + +/obj/item/clothing/neck/cloak/suns/cap + name = "\improper SUNS captain's cloak" + desc = "Worn by SUNS captains. This cloak has a very imposing aura to it." + icon_state = "suns_captaincloak" + item_state = "suns_captaincloak" + + +/////////////// +//Accessories// +/////////////// + +//These are stored in clothing/accessories.dmi instead of a factional variant due to accessory code being dogwater +//Please transfer them over to a factional file if accessory code is ever fixed + +/obj/item/clothing/accessory/waistcoat/suns + name = "\improper SUNS waistcoat" + desc = "An academic issued run of the mill waistcoat." + icon_state = "suns_waistcoat" + icon = 'icons/obj/clothing/accessories.dmi' + mob_overlay_icon = 'icons/mob/clothing/accessories.dmi' + minimize_when_attached = TRUE + +/obj/item/clothing/accessory/waistcoat/suns/ribbon + name = "\improper SUNS ribbon" + desc = "An academic issued bow, for when you want to feel pretty." + icon_state = "suns_ribbon" + +/obj/item/clothing/accessory/waistcoat/suns/gembow + name = "\improper SUNS gem bow" + desc = "An academic issued bow, for when you want to feel REALLY pretty." + icon_state = "suns_gembow" + +/obj/item/clothing/accessory/waistcoat/suns/poof + name = "\improper SUNS chest poof" + desc = "An academic issued bow, for when you want to feel sophisticated." + icon_state = "suns_poof" diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 9df87d4a5f51..94de3eda735d 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -520,3 +520,4 @@ name = "SolGov surgery cap" desc = "It's a surgery cap utilized by solarian doctors." icon_state = "solgov_surgery" + diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index f0ef95aca729..eeea7622b4d9 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -375,3 +375,4 @@ . = ..() if(!warped) warp_up() + diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm index c5c53a20b699..8ff4e6bcb0d9 100644 --- a/code/modules/clothing/masks/breath.dm +++ b/code/modules/clothing/masks/breath.dm @@ -35,3 +35,4 @@ item_state = "m_mask" permeability_coefficient = 0.01 equip_delay_other = 10 + diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 467377f722dd..9d1bdc939fd3 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -273,3 +273,4 @@ item_state = "hunter" resistance_flags = FIRE_PROOF | ACID_PROOF flags_inv = HIDEFACIALHAIR|HIDEFACE|HIDEEYES|HIDEEARS|HIDEHAIR + diff --git a/code/modules/clothing/outfits/factions/syndicate.dm b/code/modules/clothing/outfits/factions/syndicate.dm index 75158dd577ff..bf78be44fc62 100644 --- a/code/modules/clothing/outfits/factions/syndicate.dm +++ b/code/modules/clothing/outfits/factions/syndicate.dm @@ -100,6 +100,35 @@ assign_codename(H) +/datum/outfit/job/syndicate/assistant/suns + name = "Syndicate - Freshman (SUNS)" + + uniform = /obj/item/clothing/under/syndicate/suns + alt_uniform = /obj/item/clothing/under/syndicate/suns/alt + suit = /obj/item/clothing/suit/toggle/suns/alt + alt_suit = /obj/item/clothing/suit/toggle/suns + shoes = /obj/item/clothing/shoes/laceup/suns + gloves = null + ears = null + box = /obj/item/storage/box/survival + + backpack = /obj/item/storage/backpack + satchel = /obj/item/storage/backpack/satchel + duffelbag = /obj/item/storage/backpack/duffelbag + courierbag = /obj/item/storage/backpack/messenger + +/datum/outfit/job/syndicate/assistant/suns/halfway + name = "Syndicate - Junior (SUNS)" + + uniform = /obj/item/clothing/under/syndicate/suns/uniform2 + alt_uniform = /obj/item/clothing/under/syndicate/suns/uniform2/alt + +/datum/outfit/job/syndicate/assistant/suns/complete + name = "Syndicate - Graduate (SUNS)" + + uniform = /obj/item/clothing/under/syndicate/suns/uniform3 + alt_uniform = /obj/item/clothing/under/syndicate/suns/uniform3 + //atmos techs /datum/outfit/job/syndicate/atmos @@ -199,11 +228,18 @@ /datum/outfit/job/syndicate/botanist/suns name = "Syndicate - Botanist-Chemist (SUNS)" + uniform = /obj/item/clothing/under/syndicate/suns/sciencejumpsuit id = /obj/item/card/id/syndicate_command/crew_id - shoes = /obj/item/clothing/shoes/jackboots - glasses = /obj/item/clothing/glasses/science - suit = /obj/item/clothing/suit/toggle/labcoat/chemist + shoes = /obj/item/clothing/shoes/sneakers/suns + glasses = /obj/item/clothing/glasses/science/suns + suit = /obj/item/clothing/suit/hooded/suns suit_store = null + neck = /obj/item/clothing/neck/cloak/suns + + backpack = /obj/item/storage/backpack + satchel = /obj/item/storage/backpack/satchel + duffelbag = /obj/item/storage/backpack/duffelbag + courierbag = /obj/item/storage/backpack/messenger //Capitan @@ -268,6 +304,21 @@ head = /obj/item/clothing/head/HoS/cybersun gloves = /obj/item/clothing/gloves/combat +/datum/outfit/job/syndicate/captain/suns + name = "Syndicate - Captain (SUNS)" + + uniform = /obj/item/clothing/under/syndicate/suns/captain + shoes = /obj/item/clothing/shoes/combat/suns + head = /obj/item/clothing/head/suns/captain + gloves = /obj/item/clothing/gloves/suns/captain + suit = /obj/item/clothing/suit/armor/vest/bulletproof/suns/captain + mask = /obj/item/clothing/mask/breath/suns + neck = /obj/item/clothing/neck/cloak/suns/cap + + backpack = /obj/item/storage/backpack + satchel = /obj/item/storage/backpack/satchel + duffelbag = /obj/item/storage/backpack/duffelbag + courierbag = /obj/item/storage/backpack/messenger //cargo tech @@ -381,18 +432,25 @@ backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1) /datum/outfit/job/syndicate/cmo/suns - name = "Syndicate - Medical Director (SUNS)" + name = "Syndicate - Medical Instructor (SUNS)" - uniform = /obj/item/clothing/under/syndicate + uniform = /obj/item/clothing/under/syndicate/suns/doctorscrubs ears = /obj/item/radio/headset/syndicate/alt/captain id = /obj/item/card/id/syndicate_command/captain_id - shoes = /obj/item/clothing/shoes/jackboots + shoes = /obj/item/clothing/shoes/combat/suns l_pocket = /obj/item/pinpointer/crew - shoes = /obj/item/clothing/shoes/sneakers/brown - suit = /obj/item/clothing/suit/toggle/labcoat/cmo + suit = /obj/item/clothing/suit/toggle/labcoat/suns/cmo l_hand = /obj/item/storage/firstaid/medical suit_store = /obj/item/flashlight/pen backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1) + gloves = /obj/item/clothing/gloves/color/latex/nitrile/suns + glasses = /obj/item/clothing/glasses/hud/health/suns + head = /obj/item/clothing/head/suns/cmo + + backpack = /obj/item/storage/backpack + satchel = /obj/item/storage/backpack/satchel + duffelbag = /obj/item/storage/backpack/duffelbag + courierbag = /obj/item/storage/backpack/messenger //"Head Of Personnel" @@ -425,6 +483,23 @@ r_pocket = /obj/item/kitchen/knife/combat/survival glasses = /obj/item/clothing/glasses/sunglasses +/datum/outfit/job/syndicate/head_of_personnel/suns + name = "Syndicate - Academic Staff (SUNS)" + + uniform = /obj/item/clothing/under/syndicate/suns/xo + suit = /obj/item/clothing/suit/armor/vest/bulletproof/suns/xo + shoes = /obj/item/clothing/shoes/combat/suns + head = /obj/item/clothing/head/suns + gloves = /obj/item/clothing/gloves/suns/xo + neck = /obj/item/clothing/neck/cloak/suns/xo + r_pocket = null + glasses = /obj/item/clothing/glasses/science/suns + + backpack = /obj/item/storage/backpack + satchel = /obj/item/storage/backpack/satchel + duffelbag = /obj/item/storage/backpack/duffelbag + courierbag = /obj/item/storage/backpack/messenger + //head of security /datum/outfit/job/syndicate/hos @@ -476,6 +551,26 @@ . = ..() assign_codename(H) +/datum/outfit/job/syndicate/hos/suns/ + name = "Syndicate - Senior Peacekeeper (SUNS)" + uniform = /obj/item/clothing/under/syndicate/suns/pkuniform + suit = /obj/item/clothing/suit/armor/vest/bulletproof/suns/hos + gloves = /obj/item/clothing/gloves/tackler/dolphin/suns + shoes = /obj/item/clothing/shoes/combat/suns + head = /obj/item/clothing/head/welding/suns/hos + glasses = /obj/item/clothing/glasses/hud/security/suns + suit_store = /obj/item/gun/ballistic/automatic/powered/gauss/modelh + + backpack = /obj/item/storage/backpack + satchel = /obj/item/storage/backpack/satchel + duffelbag = /obj/item/storage/backpack/duffelbag + courierbag = /obj/item/storage/backpack/messenger + +/datum/outfit/job/syndicate/hos/suns/alt + name = "Syndicate - Senior Peacekeeper Alt (SUNS)" + suit = /obj/item/clothing/suit/armor/vest/bulletproof/suns/ehos + head = /obj/item/clothing/head/HoS/syndicate/suns + //medical doctors (assorted) /datum/outfit/job/syndicate/doctor @@ -493,6 +588,19 @@ /datum/outfit/job/syndicate/doctor/suns name = "Syndicate - Medical Doctor (SUNS)" + uniform = /obj/item/clothing/under/syndicate/suns/doctorscrubs + shoes = /obj/item/clothing/shoes/sneakers/suns + suit = /obj/item/clothing/suit/toggle/labcoat/suns/doctorlabcoat + gloves = /obj/item/clothing/gloves/color/latex/nitrile/suns + head = /obj/item/clothing/head/suns/surgery + glasses = /obj/item/clothing/glasses/hud/health/suns + mask = /obj/item/clothing/mask/surgical/suns + + backpack = /obj/item/storage/backpack + satchel = /obj/item/storage/backpack/satchel + duffelbag = /obj/item/storage/backpack/duffelbag + courierbag = /obj/item/storage/backpack/messenger + /datum/outfit/job/syndicate/doctor/cybersun name = "Syndicate - Medical Doctor (Cybersun)" @@ -588,7 +696,19 @@ pda_slot = ITEM_SLOT_BELT /datum/outfit/job/syndicate/psychologist/suns - name = "Ship Psychologist (SUNS)" + name = "Syndicate - Psychologist (SUNS)" + + uniform = /obj/item/clothing/under/syndicate/suns/uniform3 + alt_uniform = /obj/item/clothing/under/syndicate/suns/uniform3/alt + suit = /obj/item/clothing/suit/toggle/suns + alt_suit = /obj/item/clothing/suit/toggle/suns/alt + shoes = /obj/item/clothing/shoes/laceup/suns + accessory = /obj/item/clothing/accessory/waistcoat/suns/poof + + backpack = /obj/item/storage/backpack + satchel = /obj/item/storage/backpack/satchel + duffelbag = /obj/item/storage/backpack/duffelbag + courierbag = /obj/item/storage/backpack/messenger //patient (prisoner) @@ -630,6 +750,30 @@ ears = /obj/item/radio/headset/syndicate/alt shoes = /obj/item/clothing/shoes/laceup +//scientists + +/datum/outfit/job/syndicate/science + name = "Syndicate - Scientist" + jobtype = /datum/job/scientist + job_icon = "scientist" + + suit = /obj/item/clothing/suit/toggle/labcoat/science + dcoat = /obj/item/clothing/suit/hooded/wintercoat/science + +/datum/outfit/job/syndicate/science/suns + name = "Syndicate - Scientist (SUNS)" +//more futureproofing than anything, the Aegis currently uses /datum/outfit/job/syndicate/botanist/suns for a similar role + uniform = /obj/item/clothing/under/syndicate/suns/sciencejumpsuit + suit = /obj/item/clothing/suit/hooded/suns + shoes = /obj/item/clothing/shoes/sneakers/suns + glasses = /obj/item/clothing/glasses/science/suns + neck = /obj/item/clothing/neck/cloak/suns + + backpack = /obj/item/storage/backpack + satchel = /obj/item/storage/backpack/satchel + duffelbag = /obj/item/storage/backpack/duffelbag + courierbag = /obj/item/storage/backpack/messenger + //security officers /datum/outfit/job/syndicate/security @@ -685,6 +829,22 @@ . = ..() assign_codename(H) +/datum/outfit/job/syndicate/security/suns + name = "Syndicate - Peacekeeper (SUNS)" + uniform = /obj/item/clothing/under/syndicate/suns/pkuniform + suit = /obj/item/clothing/suit/armor/vest/bulletproof/suns + alt_suit = /obj/item/clothing/suit/toggle/suns/pkcoat + belt = null + gloves = /obj/item/clothing/gloves/tackler/dolphin/suns + shoes = /obj/item/clothing/shoes/jackboots/suns/long + head = /obj/item/clothing/head/welding/suns + glasses = /obj/item/clothing/glasses/hud/security/suns + + backpack = /obj/item/storage/backpack + satchel = /obj/item/storage/backpack/satchel + duffelbag = /obj/item/storage/backpack/duffelbag + courierbag = /obj/item/storage/backpack/messenger + //Miners /datum/outfit/job/syndicate/miner @@ -830,3 +990,19 @@ r_pocket = /obj/item/radio head = /obj/item/clothing/head/soft/cybersun accessory = /obj/item/clothing/accessory/armband/engine + +/datum/outfit/job/syndicate/engineer/suns + name = "Syndicate - Ship Engineer (SUNS)" + + uniform = /obj/item/clothing/under/syndicate/suns/workerjumpsuit + suit = /obj/item/clothing/suit/toggle/suns/workervest + gloves = /obj/item/clothing/gloves/suns/yellow + shoes = /obj/item/clothing/shoes/jackboots/suns + head = /obj/item/clothing/head/safety_helmet/suns + accessory = null + glasses = null + + backpack = /obj/item/storage/backpack + satchel = /obj/item/storage/backpack/satchel + duffelbag = /obj/item/storage/backpack/duffelbag + courierbag = /obj/item/storage/backpack/messenger diff --git a/code/modules/clothing/spacesuits/syndi.dm b/code/modules/clothing/spacesuits/syndi.dm index 4bdafe4f7f41..e5a98c7215e5 100644 --- a/code/modules/clothing/spacesuits/syndi.dm +++ b/code/modules/clothing/spacesuits/syndi.dm @@ -111,7 +111,6 @@ item_state = "syndicate-black" allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/tank/internals, /obj/item/storage/firstaid, /obj/item/healthanalyzer, /obj/item/stack/medical) - //Black-orange syndicate space suit /obj/item/clothing/head/helmet/space/syndicate/black/orange name = "black space helmet" diff --git a/code/modules/clothing/suits/hoodies.dm b/code/modules/clothing/suits/hoodies.dm index f07d46420c5b..1feea7adfd0f 100644 --- a/code/modules/clothing/suits/hoodies.dm +++ b/code/modules/clothing/suits/hoodies.dm @@ -114,3 +114,4 @@ desc = "A hood for your RILENA themed hoodie." icon_state = "hoodie_rilena" item_state = "hoodie_rilena" + diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 17bb0329cfef..12a44cbbd252 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -312,3 +312,4 @@ item_state = "enginseerhood" body_parts_covered = HEAD flags_inv = HIDEHAIR|HIDEEARS|HIDEFACE|HIDEFACIALHAIR + diff --git a/icons/mob/clothing/accessories.dmi b/icons/mob/clothing/accessories.dmi index bfde13162237..aef500b67da9 100644 Binary files a/icons/mob/clothing/accessories.dmi and b/icons/mob/clothing/accessories.dmi differ diff --git a/icons/mob/clothing/faction/suns/accessory.dmi b/icons/mob/clothing/faction/suns/accessory.dmi new file mode 100644 index 000000000000..00e868d303fd Binary files /dev/null and b/icons/mob/clothing/faction/suns/accessory.dmi differ diff --git a/icons/mob/clothing/faction/suns/eyes.dmi b/icons/mob/clothing/faction/suns/eyes.dmi new file mode 100644 index 000000000000..0dd74b201876 Binary files /dev/null and b/icons/mob/clothing/faction/suns/eyes.dmi differ diff --git a/icons/mob/clothing/faction/suns/feet.dmi b/icons/mob/clothing/faction/suns/feet.dmi new file mode 100644 index 000000000000..0c665a29cda6 Binary files /dev/null and b/icons/mob/clothing/faction/suns/feet.dmi differ diff --git a/icons/mob/clothing/faction/suns/hands.dmi b/icons/mob/clothing/faction/suns/hands.dmi new file mode 100644 index 000000000000..c84e17e76662 Binary files /dev/null and b/icons/mob/clothing/faction/suns/hands.dmi differ diff --git a/icons/mob/clothing/faction/suns/head.dmi b/icons/mob/clothing/faction/suns/head.dmi new file mode 100644 index 000000000000..22eb273e8041 Binary files /dev/null and b/icons/mob/clothing/faction/suns/head.dmi differ diff --git a/icons/mob/clothing/faction/suns/mask.dmi b/icons/mob/clothing/faction/suns/mask.dmi new file mode 100644 index 000000000000..9068c5c74abc Binary files /dev/null and b/icons/mob/clothing/faction/suns/mask.dmi differ diff --git a/icons/mob/clothing/faction/suns/neck.dmi b/icons/mob/clothing/faction/suns/neck.dmi new file mode 100644 index 000000000000..0c8243bbb09b Binary files /dev/null and b/icons/mob/clothing/faction/suns/neck.dmi differ diff --git a/icons/mob/clothing/faction/suns/suits.dmi b/icons/mob/clothing/faction/suns/suits.dmi new file mode 100644 index 000000000000..11d1b5142b99 Binary files /dev/null and b/icons/mob/clothing/faction/suns/suits.dmi differ diff --git a/icons/mob/clothing/faction/suns/uniforms.dmi b/icons/mob/clothing/faction/suns/uniforms.dmi new file mode 100644 index 000000000000..a354f10437f5 Binary files /dev/null and b/icons/mob/clothing/faction/suns/uniforms.dmi differ diff --git a/icons/mob/clothing/feet.dmi b/icons/mob/clothing/feet.dmi index e9e6444a4795..6b974d5a8199 100644 Binary files a/icons/mob/clothing/feet.dmi and b/icons/mob/clothing/feet.dmi differ diff --git a/icons/mob/clothing/suits/hooded.dmi b/icons/mob/clothing/suits/hooded.dmi index 5988b39e8a6a..a4be6f11f793 100644 Binary files a/icons/mob/clothing/suits/hooded.dmi and b/icons/mob/clothing/suits/hooded.dmi differ diff --git a/icons/mob/inhands/faction/suns/suns_lefthand.dmi b/icons/mob/inhands/faction/suns/suns_lefthand.dmi new file mode 100644 index 000000000000..f608d69ff95f Binary files /dev/null and b/icons/mob/inhands/faction/suns/suns_lefthand.dmi differ diff --git a/icons/mob/inhands/faction/suns/suns_righthand.dmi b/icons/mob/inhands/faction/suns/suns_righthand.dmi new file mode 100644 index 000000000000..2738ccdd2903 Binary files /dev/null and b/icons/mob/inhands/faction/suns/suns_righthand.dmi differ diff --git a/icons/obj/clothing/accessories.dmi b/icons/obj/clothing/accessories.dmi index dff8070e67e4..0b48ccfaf785 100644 Binary files a/icons/obj/clothing/accessories.dmi and b/icons/obj/clothing/accessories.dmi differ diff --git a/icons/obj/clothing/faction/suns/accessory.dmi b/icons/obj/clothing/faction/suns/accessory.dmi new file mode 100644 index 000000000000..fed96f7c2ee2 Binary files /dev/null and b/icons/obj/clothing/faction/suns/accessory.dmi differ diff --git a/icons/obj/clothing/faction/suns/eyes.dmi b/icons/obj/clothing/faction/suns/eyes.dmi new file mode 100644 index 000000000000..5695d1868d4d Binary files /dev/null and b/icons/obj/clothing/faction/suns/eyes.dmi differ diff --git a/icons/obj/clothing/faction/suns/feet.dmi b/icons/obj/clothing/faction/suns/feet.dmi new file mode 100644 index 000000000000..478e4d9110a5 Binary files /dev/null and b/icons/obj/clothing/faction/suns/feet.dmi differ diff --git a/icons/obj/clothing/faction/suns/hands.dmi b/icons/obj/clothing/faction/suns/hands.dmi new file mode 100644 index 000000000000..6c7f9455773a Binary files /dev/null and b/icons/obj/clothing/faction/suns/hands.dmi differ diff --git a/icons/obj/clothing/faction/suns/head.dmi b/icons/obj/clothing/faction/suns/head.dmi new file mode 100644 index 000000000000..71855c39bdc3 Binary files /dev/null and b/icons/obj/clothing/faction/suns/head.dmi differ diff --git a/icons/obj/clothing/faction/suns/mask.dmi b/icons/obj/clothing/faction/suns/mask.dmi new file mode 100644 index 000000000000..1417e85a42db Binary files /dev/null and b/icons/obj/clothing/faction/suns/mask.dmi differ diff --git a/icons/obj/clothing/faction/suns/neck.dmi b/icons/obj/clothing/faction/suns/neck.dmi new file mode 100644 index 000000000000..617118e56be5 Binary files /dev/null and b/icons/obj/clothing/faction/suns/neck.dmi differ diff --git a/icons/obj/clothing/faction/suns/suits.dmi b/icons/obj/clothing/faction/suns/suits.dmi new file mode 100644 index 000000000000..03a003703f73 Binary files /dev/null and b/icons/obj/clothing/faction/suns/suits.dmi differ diff --git a/icons/obj/clothing/faction/suns/uniforms.dmi b/icons/obj/clothing/faction/suns/uniforms.dmi new file mode 100644 index 000000000000..69908b5e7988 Binary files /dev/null and b/icons/obj/clothing/faction/suns/uniforms.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 3a77a2e55885..11a1d9f84857 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index e0a755c5ca83..10eab742cfa6 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/suits/hooded.dmi b/icons/obj/clothing/suits/hooded.dmi index 366b69d85139..06d98acf2358 100644 Binary files a/icons/obj/clothing/suits/hooded.dmi and b/icons/obj/clothing/suits/hooded.dmi differ diff --git a/shiptest.dme b/shiptest.dme index 4f42a582878f..9840f4d4cc9c 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -1923,6 +1923,7 @@ #include "code\modules\clothing\towels.dm" #include "code\modules\clothing\ears\_ears.dm" #include "code\modules\clothing\factions\gezena.dm" +#include "code\modules\clothing\factions\suns.dm" #include "code\modules\clothing\glasses\_glasses.dm" #include "code\modules\clothing\glasses\engine_goggles.dm" #include "code\modules\clothing\glasses\hud.dm"