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

Sec Vest Breakpoints & Armor Rebalances #3216

Merged
merged 2 commits into from
Aug 28, 2024
Merged

Sec Vest Breakpoints & Armor Rebalances #3216

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
65e6561
armor rebalance time
Apogee-dev Jul 17, 2024
bad16a3
Merge remote-tracking branch 'upstream/master' into secvest-breakpoints
Apogee-dev Aug 28, 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
6 changes: 3 additions & 3 deletions _maps/shuttles/solgov/solgov_chronicle.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@
/obj/item/door_remote/captain,
/obj/item/storage/belt/sabre/solgov,
/obj/item/clothing/under/solgov/dress,
/obj/item/clothing/suit/armor/vest/bulletproof/solgov/captain,
/obj/item/clothing/suit/armor/vest/solgov/captain,
/obj/item/stamp/solgov,
/obj/item/clothing/suit/armor/solgov_trenchcoat,
/obj/item/spacecash/bundle/loadsamoney,
Expand Down Expand Up @@ -955,7 +955,7 @@
/obj/item/clothing/gloves/combat,
/obj/item/radio/headset/solgov/alt,
/obj/item/storage/backpack,
/obj/item/clothing/suit/armor/vest/bulletproof/solgov,
/obj/item/clothing/suit/armor/vest/solgov,
/obj/effect/turf_decal/techfloor{
dir = 1
},
Expand Down Expand Up @@ -4105,7 +4105,7 @@
/area/ship/crew/office)
"OU" = (
/obj/item/clothing/neck/cloak/overseer,
/obj/item/clothing/suit/armor/vest/bulletproof/solgov/overseer,
/obj/item/clothing/suit/armor/vest/solgov/overseer,
/obj/structure/closet/secure_closet/head_of_personnel{
anchored = 1;
name = "\proper overseer's locker";
Expand Down
14 changes: 7 additions & 7 deletions _maps/shuttles/solgov/solgov_inkwell.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
/obj/item/clothing/gloves/combat,
/obj/item/radio/headset/solgov/alt,
/obj/item/storage/backpack,
/obj/item/clothing/suit/armor/vest/bulletproof/solgov,
/obj/item/clothing/suit/armor/vest/solgov,
/obj/effect/turf_decal/techfloor,
/obj/effect/turf_decal/industrial/outline/red,
/obj/structure/window/reinforced{
Expand Down Expand Up @@ -308,7 +308,7 @@
/obj/item/clothing/gloves/combat,
/obj/item/radio/headset/solgov/alt,
/obj/item/storage/backpack,
/obj/item/clothing/suit/armor/vest/bulletproof/solgov,
/obj/item/clothing/suit/armor/vest/solgov,
/obj/effect/turf_decal/techfloor,
/obj/effect/turf_decal/industrial/outline/red,
/obj/structure/window/reinforced{
Expand Down Expand Up @@ -1526,9 +1526,9 @@
/obj/structure/closet/cabinet{
name = "armor cabinet"
},
/obj/item/clothing/suit/armor/vest/bulletproof/solgov,
/obj/item/clothing/suit/armor/vest/bulletproof/solgov,
/obj/item/clothing/suit/armor/vest/bulletproof/solgov,
/obj/item/clothing/suit/armor/vest/solgov,
/obj/item/clothing/suit/armor/vest/solgov,
/obj/item/clothing/suit/armor/vest/solgov,
/obj/item/clothing/head/solgov/sonnensoldner,
/obj/item/clothing/head/solgov/sonnensoldner,
/obj/item/clothing/head/solgov/sonnensoldner,
Expand Down Expand Up @@ -3647,7 +3647,7 @@
/obj/item/clothing/gloves/combat,
/obj/item/radio/headset/solgov/alt,
/obj/item/storage/backpack,
/obj/item/clothing/suit/armor/vest/bulletproof/solgov,
/obj/item/clothing/suit/armor/vest/solgov,
/obj/effect/turf_decal/techfloor,
/obj/effect/turf_decal/industrial/outline/red,
/turf/open/floor/plasteel/white,
Expand Down Expand Up @@ -5839,7 +5839,7 @@
/area/ship/cargo)
"LB" = (
/obj/item/clothing/head/solgov/captain,
/obj/item/clothing/suit/armor/vest/bulletproof/solgov/captain,
/obj/item/clothing/suit/armor/vest/solgov/captain,
/obj/item/clothing/under/solgov/formal/captain,
/obj/item/clothing/shoes/laceup,
/obj/item/clothing/gloves/combat,
Expand Down
4 changes: 2 additions & 2 deletions _maps/shuttles/solgov/solgov_paracelsus.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2463,7 +2463,7 @@
/area/ship/bridge)
"ye" = (
/obj/item/clothing/neck/cloak/overseer,
/obj/item/clothing/suit/armor/vest/bulletproof/solgov/overseer,
/obj/item/clothing/suit/armor/vest/solgov/overseer,
/obj/structure/closet/secure_closet/head_of_personnel{
anchored = 1;
name = "\proper overseer's locker";
Expand Down Expand Up @@ -3560,7 +3560,7 @@
/area/ship/crew/crewtwo)
"IX" = (
/obj/item/clothing/head/solgov/captain,
/obj/item/clothing/suit/armor/vest/bulletproof/solgov/captain,
/obj/item/clothing/suit/armor/vest/solgov/captain,
/obj/item/clothing/under/solgov/formal/captain,
/obj/item/clothing/shoes/laceup,
/obj/item/clothing/gloves/combat,
Expand Down
6 changes: 3 additions & 3 deletions _maps/shuttles/syndicate/syndicate_panacea.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2877,7 +2877,7 @@
pixel_x = 8;
pixel_y = -6
},
/obj/item/clothing/suit/armor/vest/bulletproof/suns/xo{
/obj/item/clothing/suit/armor/vest/suns/xo{
pixel_y = 7;
pixel_x = -5
},
Expand Down Expand Up @@ -3100,7 +3100,7 @@
pixel_x = 6;
pixel_y = -9
},
/obj/item/clothing/suit/armor/vest/bulletproof/suns/captain{
/obj/item/clothing/suit/armor/vest/suns/captain{
pixel_y = -1
},
/obj/item/clothing/under/syndicate/suns/captain{
Expand Down Expand Up @@ -4895,7 +4895,7 @@
pixel_x = -1;
pixel_y = 4
},
/obj/item/clothing/suit/armor/vest/bulletproof/suns{
/obj/item/clothing/suit/armor/vest/suns{
pixel_y = 4;
pixel_x = 8
},
Expand Down
4 changes: 2 additions & 2 deletions _maps/shuttles/syndicate/syndicate_twinkleshine.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7323,8 +7323,8 @@
/obj/item/clothing/glasses/hud/security/suns,
/obj/item/clothing/gloves/tackler/dolphin/suns,
/obj/item/clothing/suit/toggle/suns/pkcoat,
/obj/item/clothing/suit/armor/vest/bulletproof/suns/hos,
/obj/item/clothing/suit/armor/vest/bulletproof/suns/ehos,
/obj/item/clothing/suit/armor/vest/suns/hos,
/obj/item/clothing/suit/armor/vest/suns/ehos,
/obj/item/clothing/head/welding/suns/hos,
/obj/item/clothing/under/syndicate/suns/pkuniform,
/obj/item/radio/headset/syndicate/alt{
Expand Down
8 changes: 4 additions & 4 deletions code/modules/clothing/factions/clip.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,10 @@

icon_state = "clip_trenchcoat"
item_state = "trenchcoat_solgov"
body_parts_covered = CHEST|LEGS|ARMS
body_parts_covered = CHEST|GROIN
armor = list("melee" = 25, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 0)
cold_protection = CHEST|LEGS|ARMS
heat_protection = CHEST|LEGS|ARMS
cold_protection = CHEST|GROIN|LEGS|ARMS
heat_protection = CHEST|GROIN|LEGS|ARMS

supports_variations = DIGITIGRADE_VARIATION_SAME_ICON_FILE

Expand All @@ -156,7 +156,7 @@

icon_state = "clip_captaincoat"
item_state = "clip_captaincoat"
body_parts_covered = CHEST|LEGS|ARMS
body_parts_covered = CHEST
armor = list("melee" = 25, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 0)
cold_protection = CHEST|LEGS|ARMS
heat_protection = CHEST|LEGS|ARMS
Expand Down
8 changes: 4 additions & 4 deletions code/modules/clothing/factions/frontiersmen.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,21 +73,21 @@
name = "reinforced fur coat"
desc = "A stiff olive-green coat, meant for frigid conditions. Commonly worn by Frontiersmen command."
icon_state = "frontier_coat"
body_parts_covered = CHEST|GROIN|ARMS
body_parts_covered = CHEST|GROIN
cold_protection = CHEST|GROIN|ARMS
heat_protection = CHEST|GROIN|ARMS
icon_state = "frontier_coat"
item_state = "frontier_coat"
blood_overlay_type = "coat"
armor = list("melee" = 35, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
armor = list("melee" = 35, "bullet" = 35, "laser" = 35, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
icon = 'icons/obj/clothing/faction/frontiersmen/suits.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/frontiersmen/suits.dmi'

/obj/item/clothing/suit/armor/frontier/fireproof
name = "frontiersmen fireproof coat"
desc = "A stiff olive-green coat, used particularly by Frontiersmen flame troopers. It seems to be lined with asbestos, to provide maximum heat and fire deterrence... At the cost of comfort. And mesothelioma."
icon_state = "frontier_fireproof_suit"
armor = list("melee" = 35, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
armor = list("melee" = 35, "bullet" = 35, "laser" = 35, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
w_class = WEIGHT_CLASS_BULKY
gas_transfer_coefficient = 0.9
permeability_coefficient = 0.5
Expand Down Expand Up @@ -144,7 +144,7 @@
name = "\improper Frontiersmen officer beret"
desc = "A scratchy olive green beret emblazoned with the Frontiersmen insignia, worn by Frontiersmen who want to look good while intimidating freighter captains."
icon_state = "frontier_officer_beret"
armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)

/obj/item/clothing/head/frontier
name = "frontier surgical cap"
Expand Down
8 changes: 4 additions & 4 deletions code/modules/clothing/factions/hardliners.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,22 +69,22 @@
/obj/item/clothing/suit/armor/hardliners/sergeant
name = "hardliners sergeant jacket"
desc = "An armored jacket typically worn by sergeant of the Hardliners. They're reminiscent of the garb worn by old Gorlex navymen, prior to its destruction."
body_parts_covered = CHEST|GROIN|ARMS
body_parts_covered = CHEST|GROIN
icon_state = "hl_sergeant"
item_state = "hl_sergeant"
blood_overlay_type = "coat"
armor = list("melee" = 35, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
armor = list("melee" = 35, "bullet" = 35, "laser" = 35, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)

/obj/item/clothing/suit/toggle/armor/vest/hardliners
name = "hardliners captain coat"
desc = "An imposing armored coat worn by captains of Hardliner fleets, hand-designed by Cybersun tailors to provide maximum protection to its wearer."
body_parts_covered = CHEST|GROIN|ARMS
body_parts_covered = CHEST|GROIN
icon_state = "hl_captain"
item_state = "hl_captain"
icon = 'icons/obj/clothing/faction/hardliners/suits.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/suits.dmi'
blood_overlay_type = "coat"
armor = list("melee" = 35, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
armor = list("melee" = 35, "bullet" = 35, "laser" = 35, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
togglename = "buttons"

///////////////
Expand Down
10 changes: 5 additions & 5 deletions code/modules/clothing/factions/nanotrasen.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@
icon_state = "armor"
item_state = "blackcloth"
body_parts_covered = CHEST|GROIN
armor = list("melee" = 30, "bullet" = 40, "laser" = 30, "energy" = 50, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 90)
armor = list("melee" = 35, "bullet" = 35, "laser" = 35, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
resistance_flags = FIRE_PROOF

/obj/item/clothing/suit/armor/nanotrasen/slim
Expand All @@ -241,24 +241,24 @@
name = "security director's overcoat"
desc = "A tailored black overcoat, made from cutting-edge ballistic fabrics and composites. Vigilitas's 'VI' logo is embossed on every button. Intimidating and profoundly stylish."
icon_state = "command_coat"
body_parts_covered = CHEST|GROIN|ARMS
armor = list("melee" = 30, "bullet" = 0, "laser" = 30, "energy" = 20, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 90)
body_parts_covered = CHEST|GROIN
armor = list("melee" = 35, "bullet" = 35, "laser" = 35, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 90)

/obj/item/clothing/suit/armor/nanotrasen/captain
name = "captain's jacket"
desc = "A sturdy jacket in Nanotrasen Blue, accentuated with gold thread and lined with a layer of ballistic fabric. Its large, shiny belt buckle is embossed with Nanotrasen's corporate logo."
icon_state = "armor_captain"
item_state = "bluecloth"
body_parts_covered = CHEST|GROIN
armor = list("melee" = 50, "bullet" = 60, "laser" = 60, "energy" = 50, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 90)
armor = list("melee" = 50, "bullet" = 40, "laser" = 50, "energy" = 50, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 90)
resistance_flags = FIRE_PROOF

/obj/item/clothing/suit/armor/nanotrasen/captain/parade
name = "ostentatious captain's coat"
desc = "An exquisitely-decorated fine blue jacket, suitable for especially formal situations, or for a commanding officer who wants to flaunt their status even more than usual. Richly decorated with gold thread and embroidered Nanotrasen logos."
icon_state = "captain_formal"
item_state = "bluecloth"
body_parts_covered = CHEST|GROIN|ARMS
body_parts_covered = CHEST|GROIN
armor = list("melee" = 30, "bullet" = 0, "laser" = 30, "energy" = 20, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 90)

// Hats //
Expand Down
9 changes: 4 additions & 5 deletions code/modules/clothing/factions/ngr.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,20 +82,20 @@
/obj/item/clothing/suit/armor/ngr/lieutenant
name = "\improper 2nd Battlegroup overcoat"
desc = "An armored overcoat worn by the lieutenants of the New Gorlex Republic's 2nd Battlegroup."
body_parts_covered = CHEST|GROIN|ARMS
body_parts_covered = CHEST|GROIN
icon_state = "ngr_lieutenant"
item_state = "ngr_lieutenant"
blood_overlay_type = "coat"
armor = list("melee" = 35, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
armor = list("melee" = 35, "bullet" = 35, "laser" = 35, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)

/obj/item/clothing/suit/armor/ngr/captain
name = "\improper 2nd Battlegroup coat"
desc = "An armored coat worn by captains the New Gorlex Republic's 2nd Battlegroup."
body_parts_covered = CHEST|GROIN|ARMS
body_parts_covered = CHEST|GROIN
icon_state = "ngr_captain"
item_state = "ngr_captain"
blood_overlay_type = "coat"
armor = list("melee" = 35, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
armor = list("melee" = 35, "bullet" = 35, "laser" = 35, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)

///////////////
//Spacesuits//
Expand Down Expand Up @@ -143,7 +143,6 @@
icon_state = "ngr_garrison"
icon = 'icons/obj/clothing/faction/ngr/head.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/ngr/head.dmi'
armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)

/obj/item/clothing/head/ngr/flap
name = "beige flap cap"
Expand Down
12 changes: 6 additions & 6 deletions code/modules/clothing/factions/srm.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
desc = "A coat made from hard leather. Meant to withstand long hunts in harsh wilderness."
icon_state = "armor_rouma"
item_state = "rouma_coat"
body_parts_covered = CHEST|GROIN|ARMS
body_parts_covered = CHEST|GROIN
cold_protection = CHEST|GROIN|ARMS
heat_protection = CHEST|GROIN|ARMS
icon = 'icons/obj/clothing/faction/srm/suits.dmi'
Expand All @@ -41,7 +41,7 @@
icon = 'icons/obj/clothing/faction/srm/suits.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/srm/suits.dmi'
icon_state = "rouma_med_coat"
armor = list("melee" = 35, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 50, "rad" = 0, "fire" = 50, "acid" = 50)
armor = list("melee" = 35, "bullet" = 35, "laser" = 35, "energy" = 40, "bomb" = 25, "bio" = 50, "rad" = 0, "fire" = 50, "acid" = 50)
supports_variations = KEPORI_VARIATION

/obj/item/clothing/suit/hazardvest/roumain
Expand All @@ -51,7 +51,7 @@
mob_overlay_icon = 'icons/mob/clothing/faction/srm/suits.dmi'
icon_state = "armor_rouma_machinist"
item_state = "rouma_coat"
armor = list("melee" = 30, "bullet" = 20, "laser" = 20, "energy" = 40, "bomb" = 35, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 60)
armor = list("melee" = 35, "bullet" = 20, "laser" = 20, "energy" = 40, "bomb" = 35, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 60)

/obj/item/clothing/suit/armor/roumain/flamebearer
name = "saint-roumain flamebearer robes"
Expand All @@ -64,7 +64,7 @@
desc = "A well-maintained hard leather coat typically worn to denote the rank of Colligne, a trainee Hunter Montagne. It is treated with bullet-resistant materials, and lined with the dark fur of Illestrian dire wolves."
icon_state = "armor_rouma_colligne"
item_state = "rouma_coat"
body_parts_covered = CHEST|GROIN|ARMS|LEGS
body_parts_covered = CHEST|GROIN
cold_protection = CHEST|GROIN|LEGS|ARMS
heat_protection = CHEST|GROIN|LEGS|ARMS
supports_variations = KEPORI_VARIATION
Expand All @@ -74,8 +74,8 @@
desc = "A stylish red coat to indicate that you are, in fact, a Hunter Montagne. Made of extra hard exotic leather, treated with bullet-resistant materials, and lined with the fur of some unidentifiable creature."
icon_state = "armor_rouma_montagne"
item_state = "rouma_montagne_coat"
body_parts_covered = CHEST|GROIN|ARMS|LEGS
armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 90)
body_parts_covered = CHEST|GROIN
armor = list("melee" = 35, "bullet" = 35, "laser" = 35, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
cold_protection = CHEST|GROIN|LEGS|ARMS
heat_protection = CHEST|GROIN|LEGS|ARMS
supports_variations = KEPORI_VARIATION
Expand Down
Loading
Loading