From e84d30fe37200eb12c8ea2a69646d0a11f7ea606 Mon Sep 17 00:00:00 2001 From: Dorodomki Date: Thu, 3 Aug 2023 17:00:15 -0300 Subject: [PATCH 1/5] adds and rebalances items adds a vest, medkit, hardhat for the mt's and the CE to help them out in the shift, limiting their gear as FOB reinforcements since any mt was able to grab a marine armor and fight as one adds one pouch slot more to the civilian m3 vest to leave it at the same storage level of other marine armors --- .../structures/crates_lockers/closets/secure/engineering.dm | 6 +++++- code/modules/clothing/suits/marine_armor.dm | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index d2b4114df25b..c927717dcc7f 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -12,6 +12,7 @@ . = ..() new /obj/item/clothing/accessory/storage/webbing(src) new /obj/item/clothing/accessory/storage/black_vest/brown_vest(src) + new /obj/item/clothing/suit/storage/marine/light/vest(src) new /obj/item/clothing/head/hardhat/white(src) new /obj/item/clothing/head/welding(src) new /obj/item/clothing/gloves/yellow(src) @@ -119,15 +120,18 @@ if(!is_ground_level(z)) new /obj/item/device/radio/headset/almayer/mt(src) new /obj/item/clothing/accessory/storage/black_vest/brown_vest(src) - new /obj/item/clothing/suit/storage/hazardvest(src) + new /obj/item/clothing/suit/storage/marine/light/vest(src) + new /obj/item/clothing/head/hardhat/dblue(src) new /obj/item/storage/pouch/general(src) new /obj/item/storage/pouch/electronics(src) new /obj/item/storage/pouch/construction(src) new /obj/item/storage/pouch/medkit(src) + new /obj/item/storage/firstaid/regular(src) new /obj/item/storage/pouch/tools(src) new /obj/item/clothing/mask/gas(src) new /obj/item/device/flashlight(src) new /obj/item/storage/backpack/industrial(src) + new /obj/item/storage/backpack/marine/engineerpack/welder_chestrig(src) /obj/structure/closet/secure_closet/engineering_personal/select_gamemode_equipment(gamemode) if (SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) diff --git a/code/modules/clothing/suits/marine_armor.dm b/code/modules/clothing/suits/marine_armor.dm index 713b6df355c2..63bcc035083e 100644 --- a/code/modules/clothing/suits/marine_armor.dm +++ b/code/modules/clothing/suits/marine_armor.dm @@ -515,7 +515,7 @@ armor_bio = CLOTHING_ARMOR_VERYLOW armor_rad = CLOTHING_ARMOR_NONE armor_internaldamage = CLOTHING_ARMOR_MEDIUM - storage_slots = 1 + storage_slots = 2 time_to_unequip = 0.5 SECONDS time_to_equip = 1 SECONDS siemens_coefficient = 0.7 From b9c9050f09c14ea201318886fb83600cd8b1de6b Mon Sep 17 00:00:00 2001 From: Dorodomki Date: Thu, 3 Aug 2023 17:25:22 -0300 Subject: [PATCH 2/5] balance rebalances the civilian vest into an normal bulletproof vest for the mt's and Chief engineers, adds medket to the CE --- .../structures/crates_lockers/closets/secure/engineering.dm | 6 ++++-- code/modules/clothing/suits/marine_armor.dm | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index c927717dcc7f..5637e21fd78d 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -12,7 +12,7 @@ . = ..() new /obj/item/clothing/accessory/storage/webbing(src) new /obj/item/clothing/accessory/storage/black_vest/brown_vest(src) - new /obj/item/clothing/suit/storage/marine/light/vest(src) + new /obj/item/clothing/suit/armor/bulletproof(src) new /obj/item/clothing/head/hardhat/white(src) new /obj/item/clothing/head/welding(src) new /obj/item/clothing/gloves/yellow(src) @@ -28,6 +28,8 @@ new /obj/item/storage/pouch/general/medium(src) new /obj/item/storage/pouch/construction(src) new /obj/item/storage/pouch/tools(src) + new /obj/item/storage/pouch/medkit(src) + new /obj/item/storage/firstaid/regular(src) /obj/structure/closet/secure_closet/engineering_electrical name = "electrical supplies" @@ -120,7 +122,7 @@ if(!is_ground_level(z)) new /obj/item/device/radio/headset/almayer/mt(src) new /obj/item/clothing/accessory/storage/black_vest/brown_vest(src) - new /obj/item/clothing/suit/storage/marine/light/vest(src) + new /obj/item/clothing/suit/armor/bulletproof(src) new /obj/item/clothing/head/hardhat/dblue(src) new /obj/item/storage/pouch/general(src) new /obj/item/storage/pouch/electronics(src) diff --git a/code/modules/clothing/suits/marine_armor.dm b/code/modules/clothing/suits/marine_armor.dm index 63bcc035083e..713b6df355c2 100644 --- a/code/modules/clothing/suits/marine_armor.dm +++ b/code/modules/clothing/suits/marine_armor.dm @@ -515,7 +515,7 @@ armor_bio = CLOTHING_ARMOR_VERYLOW armor_rad = CLOTHING_ARMOR_NONE armor_internaldamage = CLOTHING_ARMOR_MEDIUM - storage_slots = 2 + storage_slots = 1 time_to_unequip = 0.5 SECONDS time_to_equip = 1 SECONDS siemens_coefficient = 0.7 From cdd7d14dace75081eda2b000bf366204bf87c214 Mon Sep 17 00:00:00 2001 From: Dorodomki Date: Sun, 6 Aug 2023 15:48:42 -0300 Subject: [PATCH 3/5] balanc 2 changes the previous vest for something less "defensive" --- .../structures/crates_lockers/closets/secure/engineering.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index 5637e21fd78d..63dbd11e8a5b 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -12,7 +12,8 @@ . = ..() new /obj/item/clothing/accessory/storage/webbing(src) new /obj/item/clothing/accessory/storage/black_vest/brown_vest(src) - new /obj/item/clothing/suit/armor/bulletproof(src) + new /obj/item/clothing/suit/storage/hazardvest/blue(src) + new /obj/item/clothing/suit/storage/apron/overalls(src) new /obj/item/clothing/head/hardhat/white(src) new /obj/item/clothing/head/welding(src) new /obj/item/clothing/gloves/yellow(src) @@ -122,7 +123,8 @@ if(!is_ground_level(z)) new /obj/item/device/radio/headset/almayer/mt(src) new /obj/item/clothing/accessory/storage/black_vest/brown_vest(src) - new /obj/item/clothing/suit/armor/bulletproof(src) + new /obj/item/clothing/suit/storage/hazardvest/blue(src) + new /obj/item/clothing/suit/storage/apron/overalls(src) new /obj/item/clothing/head/hardhat/dblue(src) new /obj/item/storage/pouch/general(src) new /obj/item/storage/pouch/electronics(src) From d0c132a4701b5f18fdf24ca38354eb268707616f Mon Sep 17 00:00:00 2001 From: Dorodomki Date: Mon, 7 Aug 2023 19:49:45 -0300 Subject: [PATCH 4/5] more balanc balances the storage of the lockers and adds the welder chestrig to the ce locker --- .../structures/crates_lockers/closets/secure/engineering.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index 63dbd11e8a5b..d4492c8c00d4 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -29,8 +29,8 @@ new /obj/item/storage/pouch/general/medium(src) new /obj/item/storage/pouch/construction(src) new /obj/item/storage/pouch/tools(src) - new /obj/item/storage/pouch/medkit(src) new /obj/item/storage/firstaid/regular(src) + new /obj/item/storage/backpack/marine/engineerpack/welder_chestrig(src) /obj/structure/closet/secure_closet/engineering_electrical name = "electrical supplies" @@ -129,7 +129,6 @@ new /obj/item/storage/pouch/general(src) new /obj/item/storage/pouch/electronics(src) new /obj/item/storage/pouch/construction(src) - new /obj/item/storage/pouch/medkit(src) new /obj/item/storage/firstaid/regular(src) new /obj/item/storage/pouch/tools(src) new /obj/item/clothing/mask/gas(src) From 134c9ebddde2965b88eaeede3a82b93e71c869ac Mon Sep 17 00:00:00 2001 From: Dorodomki Date: Wed, 9 Aug 2023 19:36:32 -0300 Subject: [PATCH 5/5] balanc for morrow deletes some gear from the locker and adds other gear to the vendor --- code/game/machinery/vending/vendor_types/crew/senior_officers.dm | 1 + .../structures/crates_lockers/closets/secure/engineering.dm | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/vending/vendor_types/crew/senior_officers.dm b/code/game/machinery/vending/vendor_types/crew/senior_officers.dm index 24b60079692b..0033e3239126 100644 --- a/code/game/machinery/vending/vendor_types/crew/senior_officers.dm +++ b/code/game/machinery/vending/vendor_types/crew/senior_officers.dm @@ -98,6 +98,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_chief_engineer, list( list("Orange Hazard Vest", 0, /obj/item/clothing/suit/storage/hazardvest, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), list("Yellow Hazard Vest", 0, /obj/item/clothing/suit/storage/hazardvest/yellow, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), list("USCM Service Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/service, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), + list("USCM Work Overalls", 0, /obj/item/clothing/suit/storage/apron/overalls, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), list("BACKPACK (CHOOSE 1)", 0, null, null, null), list("Leather Satchel", 0, /obj/item/storage/backpack/satchel, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR), diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index d4492c8c00d4..34a3d49d3e2a 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -30,7 +30,6 @@ new /obj/item/storage/pouch/construction(src) new /obj/item/storage/pouch/tools(src) new /obj/item/storage/firstaid/regular(src) - new /obj/item/storage/backpack/marine/engineerpack/welder_chestrig(src) /obj/structure/closet/secure_closet/engineering_electrical name = "electrical supplies"