Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PGF Squad Leader Equipment + Fixes #2863

Merged
merged 2 commits into from
Mar 27, 2024
Merged

PGF Squad Leader Equipment + Fixes #2863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8f0d44
sargent eqipment
rye-rice Mar 26, 2024
e2b08c0
Oops
rye-rice Mar 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion code/game/objects/items/storage/belt.dm
View file
Open in desktop
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
View file
Open in desktop
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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thats quite a lot of armor in total

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I accidentally deleted my draft comment because groggy but tldr;

Bulletproof armor has 60 bullet armor
Ablative armor has 60 laser
Regular has 35 melee

Lorewise it makes sense for laser centric planet to have good laser armor
Since frontier is one of the few places that use ballistics, they also equip frontier units with ballistic armor

Gameplay wise it's so the pgf can interact better with the gunplay balancing, but also you can just fucking shoot the arms/legs which aren't protected, just like the Regular bulletproo/Ablative 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 @@ -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"
Expand All @@ -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."
Expand All @@ -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"
7 changes: 4 additions & 3 deletions code/modules/clothing/outfits/factions/gezena.dm
View file
Open in desktop
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
View file
Open in desktop
Binary file not shown.
Binary file modified icons/mob/clothing/faction/gezena/neck.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/clothing/faction/gezena/head.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/clothing/faction/gezena/neck.dmi
View file
Open in desktop
Binary file not shown.
Loading