Skip to content

Commit

Permalink
PGF Squad Leader Equipment + Fixes (#2863)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

This PR adds equipment for the Marine Sergeant role of the PGF,
including:
- The Marine commander cap
- The Marine commander flap hat

This PR also fixes military webbing.

PGF armor stats now resembles standard-issue military armor of the
biggest military in the galaxy

Finally, this PR gives the captain an unique cloak design.

## Why It's Good For The Game

There was a discussion about making the sergeant more unique visually,
and I wasn't really impressed with the design presented, since they
aren't a high-ranking command role.

So I came up with this: much better and more identifiable, while the
captain has new cloak now!


![Screenshot_12047](https://github.com/shiptest-ss13/Shiptest/assets/58402542/d393ee22-0e9a-4866-a441-1e73e42aa955)

![Screenshot_12052](https://github.com/shiptest-ss13/Shiptest/assets/58402542/0048ab55-5c6f-4d42-83cc-62767488d6d7)

![Screenshot_12053](https://github.com/shiptest-ss13/Shiptest/assets/58402542/d10c89dc-a19f-4814-b804-3f7c30c69e4d)

![Screenshot_12055](https://github.com/shiptest-ss13/Shiptest/assets/58402542/d77275c7-2fd6-47c2-b3ba-dd606bd79716)


## Changelog

:cl:
add: adds PGF Sergeant clothing!
add: PGF Captain now has a new cloak design!
balance: PGF armor now has similar stats to bulletproof armor!
/:cl:
  • Loading branch information
rye-rice authored Mar 27, 2024
1 parent 3be5c9c commit 4b13946
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 7 deletions.
1 change: 0 additions & 1 deletion code/game/objects/items/storage/belt.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
34 changes: 31 additions & 3 deletions code/modules/clothing/factions/gezena.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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."
Expand All @@ -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"

Expand Down Expand Up @@ -230,6 +245,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"
Expand All @@ -253,6 +269,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."
Expand All @@ -263,10 +285,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"
7 changes: 4 additions & 3 deletions code/modules/clothing/outfits/factions/gezena.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
Binary file modified icons/mob/clothing/faction/gezena/head.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/faction/gezena/neck.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/faction/gezena/head.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/faction/gezena/neck.dmi
Binary file not shown.

0 comments on commit 4b13946

Please sign in to comment.