diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 157f9c611f30..fee07ffad050 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -441,7 +441,6 @@ "Snow" = "militarywebbing_snow", "Urban" = "militarywebbing_urban", ) - unique_reskin = null //this might seem obtuse instead of setting allow_post_reskins to TRUE, but reskin menu would open every time on alt click, which is not good for this /obj/item/storage/belt/military/examine(mob/user) diff --git a/code/modules/clothing/factions/gezena.dm b/code/modules/clothing/factions/gezena.dm index 5dd227a4d323..5697982f4fd1 100644 --- a/code/modules/clothing/factions/gezena.dm +++ b/code/modules/clothing/factions/gezena.dm @@ -86,12 +86,14 @@ desc = "Raksha - a Kalixcian word for 'protection of the heart'. Sturdy and reliable." icon_state = "marinevest" item_state = "marinevest" + armor = list("melee" = 35, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 40, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) //the laser gun country should probably have laser armor /obj/item/clothing/suit/armor/gezena/marinecoat name = "coated Raksha-plating" desc = "Less practical with the coat than without." icon_state = "marinecoat" item_state = "bluecloth" + armor = list("melee" = 35, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 40, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) //same //Spacesuits @@ -151,6 +153,18 @@ icon_state = "marineflap" item_state = "marinecloth" +/obj/item/clothing/head/gezena/marine/lead + name = "\improper PGFMC Commander Cap" + desc = "The standard cap of the PGF military, in Marine Corps colors. The silver markings denote it as a commander's cap." + icon_state = "squadhat" + item_state = "marinecloth" + +/obj/item/clothing/head/gezena/marine/lead/flap + name = "\improper PGFMC Commander's' Betzu-il cap" + desc = "The standard cap of the PGF military, in Marine Corps colors. “betzu-il”, translating to “sun-blocker”, refers to the flap at the back for protection against natural hazards such as sunburns, sandstorms, and biting insects. The silver markings denote it as a commander's cap." + icon_state = "squadflap" + item_state = "marinecloth" + /obj/item/clothing/head/gezena/medic name = "\improper PGF medic cap" desc = "The standard cap of the PGF military. The coloring indicates the wearer as a medical officer." @@ -176,6 +190,7 @@ mob_overlay_icon = 'icons/mob/clothing/faction/gezena/head.dmi' lefthand_file = 'icons/mob/inhands/faction/gezena/gezena_lefthand.dmi' righthand_file = 'icons/mob/inhands/faction/gezena/gezena_righthand.dmi' + armor = list("melee" = 35, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 40, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) //the laser gun country should probably have laser armor icon_state = "marinehelmet" item_state = "marinehelm" @@ -234,6 +249,7 @@ righthand_file = 'icons/mob/inhands/faction/gezena/gezena_righthand.dmi' icon_state = "pouches" item_state = "bluecloth" + unique_reskin = null /obj/item/storage/belt/medical/gezena name = "\improper PGF Medical Iho-Usks" @@ -257,6 +273,12 @@ icon_state = "cape" item_state = "blackcloth" +/obj/item/clothing/neck/cloak/gezena/lead + name = "officer's Azuilhauz" + desc = "The “Aziulhauz”, or “rank-cape”, is the method with which PGF military members display their rank to others. Wearing one while on duty is required by uniform code. This variant displays the wearer's rank as a squad commander." + icon_state = "squadcape" + item_state = "blackcloth" + /obj/item/clothing/neck/cloak/gezena/engi name = "engineering Aziulhauz" desc = "The “Aziulhauz”, or “rank-cape”, is the method with which PGF military members display their rank to others. Wearing one while on duty is required by uniform code. This variant displays the wearer's rank as an officer with an engineering specialization." @@ -267,10 +289,16 @@ name = "medical Aziulhauz" desc = "The “Aziulhauz”, or “rank-cape”, is the method with which PGF military members display their rank to others. Wearing one while on duty is required by uniform code. This variant displays the wearer's rank as an officer with a medical specialization." icon_state = "medcape" - item_state = "blackcloth" + item_state = "whitecloth" -/obj/item/clothing/neck/cloak/gezena/captain +/obj/item/clothing/neck/cloak/gezena/command name = "officer's Azuilhauz" + desc = "The “Aziulhauz”, or “rank-cape”, is the method with which PGF military members display their rank to others. Wearing one while on duty is required by uniform code. This variant displays the wearer's rank as an officer." + icon_state = "commandcape" + item_state = "whitecloth" + +/obj/item/clothing/neck/cloak/gezena/captain + name = "captain's Azuilhauz" desc = "The “Aziulhauz”, or “rank-cape”, is the method with which PGF military members display their rank to others. Wearing one while on duty is required by uniform code. This variant displays the wearer's rank as a high ranking officer." icon_state = "captaincape" - item_state = "blackcloth" + item_state = "whitecloth" diff --git a/code/modules/clothing/outfits/factions/gezena.dm b/code/modules/clothing/outfits/factions/gezena.dm index e2262eb77891..819e21551517 100644 --- a/code/modules/clothing/outfits/factions/gezena.dm +++ b/code/modules/clothing/outfits/factions/gezena.dm @@ -55,8 +55,9 @@ job_icon = "headofsecurity" uniform = /obj/item/clothing/under/gezena/marine + head = /obj/item/clothing/head/gezena/marine/lead shoes = /obj/item/clothing/shoes/combat/gezena - neck = /obj/item/clothing/neck/cloak/gezena/captain + neck = /obj/item/clothing/neck/cloak/gezena/lead /datum/outfit/job/gezena/captain name = "PGF - Captain" @@ -127,11 +128,11 @@ uniform = /obj/item/clothing/under/gezena/marine suit = /obj/item/clothing/suit/armor/gezena/marine - head = /obj/item/clothing/head/helmet/gezena + head = /obj/item/clothing/head/gezena/marine/lead belt = /obj/item/storage/belt/military/gezena gloves = /obj/item/clothing/gloves/gezena/marine shoes = /obj/item/clothing/shoes/combat/gezena - neck = /obj/item/clothing/neck/cloak/gezena/captain + neck = /obj/item/clothing/neck/cloak/gezena/lead r_hand = /obj/item/gun/energy/kalix/pgf /datum/outfit/job/gezena/paramedic diff --git a/icons/mob/clothing/faction/gezena/head.dmi b/icons/mob/clothing/faction/gezena/head.dmi index c2c20b63e559..9ce4d05d3c2c 100644 Binary files a/icons/mob/clothing/faction/gezena/head.dmi and b/icons/mob/clothing/faction/gezena/head.dmi differ diff --git a/icons/mob/clothing/faction/gezena/neck.dmi b/icons/mob/clothing/faction/gezena/neck.dmi index 9b3fa0c9bbab..50b6d05fa9cc 100644 Binary files a/icons/mob/clothing/faction/gezena/neck.dmi and b/icons/mob/clothing/faction/gezena/neck.dmi differ diff --git a/icons/obj/clothing/faction/gezena/head.dmi b/icons/obj/clothing/faction/gezena/head.dmi index 11454b333921..faf3c7ac11ef 100644 Binary files a/icons/obj/clothing/faction/gezena/head.dmi and b/icons/obj/clothing/faction/gezena/head.dmi differ diff --git a/icons/obj/clothing/faction/gezena/neck.dmi b/icons/obj/clothing/faction/gezena/neck.dmi index 19d51f6a64ae..89617ced9bbf 100644 Binary files a/icons/obj/clothing/faction/gezena/neck.dmi and b/icons/obj/clothing/faction/gezena/neck.dmi differ