diff --git a/mod_celadon/elysium_stuff/code/head.dm b/mod_celadon/elysium_stuff/code/head.dm index 3506493b5123..e064dc7a1459 100644 --- a/mod_celadon/elysium_stuff/code/head.dm +++ b/mod_celadon/elysium_stuff/code/head.dm @@ -6,17 +6,17 @@ /obj/item/clothing/head/bandana/elysium/black name = "Чёрная бандана" - icon_state = "bandana_black_elysiun" + icon_state = "bandana_black_elysium" mob_overlay_state = "bandana_black_elysium" /obj/item/clothing/head/bandana/elysium/white name = "Белая бандана" - icon_state = "bandana_white_elysiun" + icon_state = "bandana_white_elysium" mob_overlay_state = "bandana_white_elysium" /obj/item/clothing/head/bandana/elysium/green name = "Зелёная бандана" - icon_state = "bandana_green_elysiun" + icon_state = "bandana_green_elysium" mob_overlay_state = "bandana_green_elysium" /obj/item/clothing/head/turban diff --git a/mod_celadon/elysium_stuff/icons/mob/elysium_banner_left.dmi b/mod_celadon/elysium_stuff/icons/mob/elysium_banner_left.dmi index 44cce5157ab3..fee936419f49 100644 Binary files a/mod_celadon/elysium_stuff/icons/mob/elysium_banner_left.dmi and b/mod_celadon/elysium_stuff/icons/mob/elysium_banner_left.dmi differ diff --git a/mod_celadon/elysium_stuff/icons/mob/elysium_banner_right.dmi b/mod_celadon/elysium_stuff/icons/mob/elysium_banner_right.dmi index 7b738c7618aa..337878b4ee6e 100644 Binary files a/mod_celadon/elysium_stuff/icons/mob/elysium_banner_right.dmi and b/mod_celadon/elysium_stuff/icons/mob/elysium_banner_right.dmi differ diff --git a/mod_celadon/elysium_stuff/icons/obj/elysium_patriots.dmi b/mod_celadon/elysium_stuff/icons/obj/elysium_patriots.dmi index a1f162486b00..ddb10ce93d1c 100644 Binary files a/mod_celadon/elysium_stuff/icons/obj/elysium_patriots.dmi and b/mod_celadon/elysium_stuff/icons/obj/elysium_patriots.dmi differ diff --git a/mod_celadon/elysium_stuff/icons/obj/hats.dmi b/mod_celadon/elysium_stuff/icons/obj/hats.dmi index e549b3109e24..83ae2843722f 100644 Binary files a/mod_celadon/elysium_stuff/icons/obj/hats.dmi and b/mod_celadon/elysium_stuff/icons/obj/hats.dmi differ diff --git a/mod_celadon/solfed_stuff/code/solfed_decal.dm b/mod_celadon/solfed_stuff/code/solfed_decal.dm index d22e1cefb419..6245f8aabd65 100644 --- a/mod_celadon/solfed_stuff/code/solfed_decal.dm +++ b/mod_celadon/solfed_stuff/code/solfed_decal.dm @@ -1,5 +1,5 @@ /obj/effect/turf_decal/solgov - icon = 'mod_celadon/solfed_stuff/icon/sol_fed_Logo.dmi' + icon = 'mod_celadon/solfed_stuff/icons/sol_fed_Logo.dmi' icon_state = "11" /obj/effect/turf_decal/solgov/top diff --git a/mod_celadon/solfed_stuff/code/solfed_other_stuff.dm b/mod_celadon/solfed_stuff/code/solfed_other_stuff.dm index 8b5045bfe232..eb039461322f 100644 --- a/mod_celadon/solfed_stuff/code/solfed_other_stuff.dm +++ b/mod_celadon/solfed_stuff/code/solfed_other_stuff.dm @@ -1,18 +1,18 @@ /obj/item/banner/solfed name = "Solar Federation baner" desc = "This is the Solar Federation banner, it looks quite democratic" - icon = 'mod_celadon/solfed_stuff/icon/sol_fed_patriots.dmi' + icon = 'mod_celadon/solfed_stuff/icons/sol_fed_patriots.dmi' icon_state = "solfed_baner" item_state = "solfed_baner" - lefthand_file = 'mod_celadon/solfed_stuff/icon/mob/sol_fed_banner_lefthand.dmi' - righthand_file = 'mod_celadon/solfed_stuff/icon/mob/sol_fed_banner_righthand.dmi' + lefthand_file = 'mod_celadon/solfed_stuff/icons/mob/sol_fed_banner_lefthand.dmi' + righthand_file = 'mod_celadon/solfed_stuff/icons/mob/sol_fed_banner_righthand.dmi' warcry = "Glory to Solar Federation!" /obj/structure/sign/solfed name = "\improper Solar Federation Logo" sign_change_name = "Solar Federation Logo" desc = "It's the logo of the Solar Federation. Most likely, this structure belongs to the armed forces of the Solar Federation." - icon = 'mod_celadon/solfed_stuff/icon/sol_fed_patriots.dmi' + icon = 'mod_celadon/solfed_stuff/icons/sol_fed_patriots.dmi' icon_state = "sol_fed_wall_logo" is_editable = TRUE @@ -20,7 +20,7 @@ name = "\improper Elysium Brigade Logo" sign_change_name = "Elysium Brigade logo" desc = "The logo of the Solar Federation's Elysium Brigade. It is inscribed above the “Freedom” chevron. Most likely this ship belongs to the Elysium Brigade and is part of the Solar Federation army. The Elysium Brigade is a volunteer regiment of the Solar Federation that maintains order on the territory of the Elysium Republic." - icon = 'mod_celadon/solfed_stuff/icon/elysium_brigade.dmi' + icon = 'mod_celadon/solfed_stuff/icons/elysium_brigade.dmi' icon_state = "elysium_brigade_logo" is_editable = TRUE @@ -32,7 +32,7 @@ /obj/structure/sign/poster/solfed/random name = "random solfed poster" icon_state = "random_solfed" - icon = 'mod_celadon/solfed_stuff/icon/sol_fed_patriots.dmi' + icon = 'mod_celadon/solfed_stuff/icons/sol_fed_patriots.dmi' never_random = TRUE random_basetype = /obj/structure/sign/poster/solfed random_type = POSTER_SUBTYPES @@ -62,22 +62,22 @@ name = "Elysium Brigade poster" desc = "A poster of the Solar Federation's Elysium Brigade. The Elysium Brigade is a volunteer regiment of the Solar Federation that maintains order on the territory of the Elysium Republic. Can they be considered traitors to the homeland?" icon_state = "elysium_brigade_poster" - icon = 'mod_celadon/solfed_stuff/icon/elysium_brigade.dmi' + icon = 'mod_celadon/solfed_stuff/icons/elysium_brigade.dmi' never_random = TRUE /obj/item/bedsheet/solfed name = "\improper Solar Federation bedsheet" desc = "IIt's a quilt made in the style of the Solar Federation flag. Cover yourself with it and feel the warm embrace of your big brother." - icon = 'mod_celadon/solfed_stuff/icon/sol_fed_patriots.dmi' - mob_overlay_icon = 'mod_celadon/solfed_stuff/icon/mob/neck.dmi' + icon = 'mod_celadon/solfed_stuff/icons/sol_fed_patriots.dmi' + mob_overlay_icon = 'mod_celadon/solfed_stuff/icons/mob/neck.dmi' icon_state = "solfed_bedsheet" item_state = "solfed_bedsheet" /obj/item/clothing/under/solfed name = "Solar Federation marine form" desc = "This is the standard uniform of the Solar Federation Marines. It's colored dark blue." - icon = 'mod_celadon/solfed_stuff/icon/sol_fed_patriots.dmi' - mob_overlay_icon = 'mod_celadon/solfed_stuff/icon/mob/under.dmi' + icon = 'mod_celadon/solfed_stuff/icons/sol_fed_patriots.dmi' + mob_overlay_icon = 'mod_celadon/solfed_stuff/icons/mob/under.dmi' icon_state = "solfed_camo" item_state = "solfed_camo" armor = list("melee" = 10, "bullet" = 10, "laser" = 10,"energy" = 10, "bomb" = 20, "bio" = 40, "rad" = 40, "fire" = 30, "acid" = 30) @@ -85,16 +85,16 @@ /obj/item/clothing/under/solfed/elysium name = "Solar Federation marine form" desc = "This is the standard uniform of the Solar Federation Marines. It's colored dark blue." - icon = 'mod_celadon/solfed_stuff/icon/elysium_brigade.dmi' - mob_overlay_icon = 'mod_celadon/solfed_stuff/icon/mob/under.dmi' + icon = 'mod_celadon/solfed_stuff/icons/elysium_brigade.dmi' + mob_overlay_icon = 'mod_celadon/solfed_stuff/icons/mob/under.dmi' icon_state = "elysium_brigade_form" item_state = "elysium_brigade_form" /obj/item/storage/belt/military/solfed name = "Solar Federation chest rig" desc = "These are the military webbing of the Solar Federation. It has the Solar Federation logo on the back." - icon = 'mod_celadon/solfed_stuff/icon/sol_fed_patriots.dmi' - mob_overlay_icon = 'mod_celadon/solfed_stuff/icon/mob/belt.dmi' + icon = 'mod_celadon/solfed_stuff/icons/sol_fed_patriots.dmi' + mob_overlay_icon = 'mod_celadon/solfed_stuff/icons/mob/belt.dmi' icon_state = "solfed_webbing" item_state = "solfed_webbing" resistance_flags = FIRE_PROOF @@ -102,8 +102,8 @@ /obj/item/storage/belt/military/solfed/elysium name = "Elysium Brigade chest rig" desc = "These are the military webbing of the Solar Federation Elysium Brigade. It has the Solar Federation logo on the back." - icon = 'mod_celadon/solfed_stuff/icon/elysium_brigade.dmi' - mob_overlay_icon = 'mod_celadon/solfed_stuff/icon/mob/belt.dmi' + icon = 'mod_celadon/solfed_stuff/icons/elysium_brigade.dmi' + mob_overlay_icon = 'mod_celadon/solfed_stuff/icons/mob/belt.dmi' icon_state = "elysium_brigade_webbing" item_state = "elysium_brigade_webbing" resistance_flags = FIRE_PROOF @@ -111,16 +111,16 @@ /obj/item/clothing/head/solfed/elysium/beret name = "Elysium Brigade beret" desc = "This is a beret of the Solar Federation's Elysium Brigade. It's made in a dark green color. It has the Solar Federation flag on the front." - icon = 'mod_celadon/solfed_stuff/icon/elysium_brigade.dmi' - mob_overlay_icon = 'mod_celadon/solfed_stuff/icon/mob/head.dmi' + icon = 'mod_celadon/solfed_stuff/icons/elysium_brigade.dmi' + mob_overlay_icon = 'mod_celadon/solfed_stuff/icons/mob/head.dmi' icon_state = "elysium_brigade_beret" item_state = "elysium_brigade_beret" /obj/item/clothing/head/solfed/elysium/turban name = "Elysium Brigade turban" desc = "This is the dark green turban of the Solar Federation Elysium Brigade. Initially, the Solar Federation leadership was against the wearing of turbans, but citing the Solar Federation's commitment to allow the cultural practices of its citizens, the turban was allowed to be worn on duty." - icon = 'mod_celadon/solfed_stuff/icon/elysium_brigade.dmi' - mob_overlay_icon = 'mod_celadon/solfed_stuff/icon/mob/head.dmi' + icon = 'mod_celadon/solfed_stuff/icons/elysium_brigade.dmi' + mob_overlay_icon = 'mod_celadon/solfed_stuff/icons/mob/head.dmi' icon_state = "elysium_brigade_turban" item_state = "elysium_brigade_turban" @@ -128,24 +128,24 @@ /obj/item/clothing/head/helmet/solfedm11 name = "Solar Federation m11 helmet" desc = "It's an m11 helmet in Solar Federation coloring. On its left side you can see the flag of the Solar Federation. It is usually worn by Solar Federation soldiers." - icon = 'mod_celadon/solfed_stuff/icon/sol_fed_patriots.dmi' - mob_overlay_icon = 'mod_celadon/solfed_stuff/icon/mob/head.dmi' + icon = 'mod_celadon/solfed_stuff/icons/sol_fed_patriots.dmi' + mob_overlay_icon = 'mod_celadon/solfed_stuff/icons/mob/head.dmi' icon_state = "solfed_m11" item_state = "solfed_m11" /obj/item/clothing/head/helmet/solfedm11/elysium name = "Elysium Brigade m11 helmet" desc = "It's an m11 helmet in Solar Federation in desert coloring. On its left side you can see the flag of the Solar Federation. It is usually worn by Solar Federation soldiers." - icon = 'mod_celadon/solfed_stuff/icon/elysium_brigade.dmi' - mob_overlay_icon = 'mod_celadon/solfed_stuff/icon/mob/head.dmi' + icon = 'mod_celadon/solfed_stuff/icons/elysium_brigade.dmi' + mob_overlay_icon = 'mod_celadon/solfed_stuff/icons/mob/head.dmi' icon_state = "elysium_brigade_m11" item_state = "elysium_brigade_m11" /obj/item/clothing/suit/armor/solfed/elysium/jacket name = "Elysium Brigade formal jacket" desc = "The dark green vest of the Solar Federation's Elysium Brigade. It has a Solar Federation flag on the shoulder." - icon = 'mod_celadon/solfed_stuff/icon/elysium_brigade.dmi' - mob_overlay_icon = 'mod_celadon/solfed_stuff/icon/mob/suit.dmi' + icon = 'mod_celadon/solfed_stuff/icons/elysium_brigade.dmi' + mob_overlay_icon = 'mod_celadon/solfed_stuff/icons/mob/suit.dmi' icon_state = "elysium_brigade_jacket" item_state = "elysium_brigade_jacket" body_parts_covered = CHEST|GROIN|ARMS @@ -159,8 +159,8 @@ /obj/item/clothing/suit/armor/solfed/elysium/formal name = "Elysium Brigade formal form" desc = "ormal uniforms worn by members of the Solar Federation Elysium Brigade. It features the Solar Federation flag on the shoulder. It is usually worn by Captains or when you want to look more dressy." - icon = 'mod_celadon/solfed_stuff/icon/elysium_brigade.dmi' - mob_overlay_icon = 'mod_celadon/solfed_stuff/icon/mob/suit.dmi' + icon = 'mod_celadon/solfed_stuff/icons/elysium_brigade.dmi' + mob_overlay_icon = 'mod_celadon/solfed_stuff/icons/mob/suit.dmi' icon_state = "elysium_brigade_formal" item_state = "elysium_brigade_formal" body_parts_covered = CHEST|GROIN|ARMS|LEGS @@ -174,8 +174,8 @@ /obj/item/clothing/head/helmet/space/hardsuit/solfed/elysium name = "Elysium Brigade hardsuit helmet" desc = "This is the hardsuit helmet of the Solar Federation Elysium Brigade. It's a dark green color, and its panes glow green." - icon = 'mod_celadon/solfed_stuff/icon/elysium_brigade.dmi' - mob_overlay_icon = 'mod_celadon/solfed_stuff/icon/mob/head.dmi' + icon = 'mod_celadon/solfed_stuff/icons/elysium_brigade.dmi' + mob_overlay_icon = 'mod_celadon/solfed_stuff/icons/mob/head.dmi' icon_state = "elysium_brigade_rig_head" item_state = "elysium_brigade_rig_head" armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 50, "bio" = 100, "rad" = 75, "fire" = 75, "acid" = 75) @@ -186,8 +186,8 @@ /obj/item/clothing/suit/space/hardsuit/solfed/elysium name = "Elysium Brigade hardsuit" desc = "This is a hardsuit of the Solar Federation Elysium Brigade. It is in dark green colors and has the Solar Federation flag on its back." - icon = 'mod_celadon/solfed_stuff/icon/elysium_brigade.dmi' - mob_overlay_icon = 'mod_celadon/solfed_stuff/icon/mob/suit.dmi' + icon = 'mod_celadon/solfed_stuff/icons/elysium_brigade.dmi' + mob_overlay_icon = 'mod_celadon/solfed_stuff/icons/mob/suit.dmi' icon_state = "elysium_brigade_rig" item_state = "elysium_brigade_rig" hardsuit_type = "elysium" diff --git a/mod_celadon/solfed_stuff/icons/elysium_brigade.dmi b/mod_celadon/solfed_stuff/icons/elysium_brigade.dmi new file mode 100644 index 000000000000..d3c604b29348 Binary files /dev/null and b/mod_celadon/solfed_stuff/icons/elysium_brigade.dmi differ diff --git a/mod_celadon/solfed_stuff/icons/mob/belt.dmi b/mod_celadon/solfed_stuff/icons/mob/belt.dmi new file mode 100644 index 000000000000..3aef49500f6f Binary files /dev/null and b/mod_celadon/solfed_stuff/icons/mob/belt.dmi differ diff --git a/mod_celadon/solfed_stuff/icons/mob/head.dmi b/mod_celadon/solfed_stuff/icons/mob/head.dmi new file mode 100644 index 000000000000..ff2346dfaf44 Binary files /dev/null and b/mod_celadon/solfed_stuff/icons/mob/head.dmi differ diff --git a/mod_celadon/solfed_stuff/icons/mob/neck.dmi b/mod_celadon/solfed_stuff/icons/mob/neck.dmi new file mode 100644 index 000000000000..28f30d7552b0 Binary files /dev/null and b/mod_celadon/solfed_stuff/icons/mob/neck.dmi differ diff --git a/mod_celadon/solfed_stuff/icons/mob/sol_fed_banner_lefthand.dmi b/mod_celadon/solfed_stuff/icons/mob/sol_fed_banner_lefthand.dmi new file mode 100644 index 000000000000..b75955b9a6fc Binary files /dev/null and b/mod_celadon/solfed_stuff/icons/mob/sol_fed_banner_lefthand.dmi differ diff --git a/mod_celadon/solfed_stuff/icons/mob/sol_fed_banner_righthand.dmi b/mod_celadon/solfed_stuff/icons/mob/sol_fed_banner_righthand.dmi new file mode 100644 index 000000000000..cd87fc252220 Binary files /dev/null and b/mod_celadon/solfed_stuff/icons/mob/sol_fed_banner_righthand.dmi differ diff --git a/mod_celadon/solfed_stuff/icons/mob/suit.dmi b/mod_celadon/solfed_stuff/icons/mob/suit.dmi new file mode 100644 index 000000000000..fe2d429c7f69 Binary files /dev/null and b/mod_celadon/solfed_stuff/icons/mob/suit.dmi differ diff --git a/mod_celadon/solfed_stuff/icons/mob/under.dmi b/mod_celadon/solfed_stuff/icons/mob/under.dmi new file mode 100644 index 000000000000..603f6dc31e9d Binary files /dev/null and b/mod_celadon/solfed_stuff/icons/mob/under.dmi differ diff --git a/mod_celadon/solfed_stuff/icons/sol_fed_logo.dmi b/mod_celadon/solfed_stuff/icons/sol_fed_logo.dmi new file mode 100644 index 000000000000..c37428f56b30 Binary files /dev/null and b/mod_celadon/solfed_stuff/icons/sol_fed_logo.dmi differ diff --git a/mod_celadon/solfed_stuff/icons/sol_fed_patriots.dmi b/mod_celadon/solfed_stuff/icons/sol_fed_patriots.dmi new file mode 100644 index 000000000000..75ee15575735 Binary files /dev/null and b/mod_celadon/solfed_stuff/icons/sol_fed_patriots.dmi differ