From a673f66ff30211710af7385d370307c0fd33aafd Mon Sep 17 00:00:00 2001 From: Julien Date: Sun, 18 Feb 2024 12:45:54 +0100 Subject: [PATCH 1/9] adding new vendor for MT --- .../vending/vendor_types/crew/engineering.dm | 74 +++++++++++++++++++ code/modules/gear_presets/uscm_ship.dm | 7 -- maps/map_files/USS_Almayer/USS_Almayer.dmm | 31 ++++---- 3 files changed, 88 insertions(+), 24 deletions(-) create mode 100644 code/game/machinery/vending/vendor_types/crew/engineering.dm diff --git a/code/game/machinery/vending/vendor_types/crew/engineering.dm b/code/game/machinery/vending/vendor_types/crew/engineering.dm new file mode 100644 index 000000000000..85ae44644e9a --- /dev/null +++ b/code/game/machinery/vending/vendor_types/crew/engineering.dm @@ -0,0 +1,74 @@ +//------------ MT CLOTHING VENDOR--------------- + +GLOBAL_LIST_INIT(cm_vending_clothing_maintenance_technician, list( + list("MAINTENANCE SET (MANDATORY)", 0, null, null, null), + list("Essential Maintenance Set", 0, /obj/effect/essentials_set/maintenance, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), + + list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), + list("Insulated Gloves", 0, /obj/item/clothing/gloves/yellow, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY), + list("Headset", 0, /obj/item/device/radio/headset/almayer/mt, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), + list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), + list("Map", 0, /obj/item/map/current_map, MARINE_CAN_BUY_KIT, VENDOR_ITEM_MANDATORY), + + list("HELMET (CHOOSE 1)", 0, null, null, null), + list("Beret, Engineering", 0, /obj/item/clothing/head/beret/eng, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), + list("White Hardhat", 0, /obj/item/clothing/head/hardhat/white, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), + list("Orange Hardhat", 0, /obj/item/clothing/head/hardhat/orange, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), + list("Blue Hardhat", 0, /obj/item/clothing/head/hardhat/dblue, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), + list("Welding Helmet", 0, /obj/item/clothing/head/welding, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), + + list("SUIT (CHOOSE 1)", 0, null, null, null), + list("Black Hazard Vest", 0, /obj/item/clothing/suit/storage/hazardvest/black, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), + list("Blue Hazard Vest", 0, /obj/item/clothing/suit/storage/hazardvest/blue, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), + 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("BACKPACK (CHOOSE 1)", 0, null, null, null), + list("Technician Backpack", 0, /obj/item/storage/backpack/marine/tech, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR), + list("Technician Satchel", 0, /obj/item/storage/backpack/marine/satchel/tech, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR), + + + list("BELT (CHOOSE 1)", 0, null, null, null), + list("G8-A General Utility Pouch", 0, /obj/item/storage/backpack/general_belt, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), + list("M276 Toolbelt Rig (Full)", 0, /obj/item/storage/belt/utility/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_MANDATORY), + + list("POUCHES (CHOOSE 2)", 0, null, null, null), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Construction Pouch", 0, /obj/item/storage/pouch/construction, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + + list("MASK (CHOOSE 1)", 0, null, null, null), + list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + list("Rebreather", 0, /obj/item/clothing/mask/rebreather, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + + list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), + list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + )) + +/obj/structure/machinery/cm_vending/clothing/maintenance_technician + name = "\improper ColMarTech Maintenance Technician Equipment Rack" + desc = "An automated rack hooked up to a colossal storage of Maintenance Technician standard-issue equipment." + req_access = list(ACCESS_MARINE_ENGINEERING) + vendor_role = list(JOB_MAINT_TECH) + +/obj/structure/machinery/cm_vending/clothing/maintenance_technician/get_listed_products(mob/user) + return GLOB.cm_vending_clothing_maintenance_technician + + /obj/effect/essentials_set/maintenance + spawned_gear_list = list( + /obj/item/device/lightreplacer, + /obj/item/device/demo_scanner, + /obj/item/storage/bag/trash, + /obj/item/storage/toolbox/mechanical, + /obj/item/device/flashlight, + /obj/item/storage/backpack/industrial + ) diff --git a/code/modules/gear_presets/uscm_ship.dm b/code/modules/gear_presets/uscm_ship.dm index 578df21b67df..d080b4125020 100644 --- a/code/modules/gear_presets/uscm_ship.dm +++ b/code/modules/gear_presets/uscm_ship.dm @@ -252,16 +252,9 @@ if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine/tech - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mt(new_human), WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/engi(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/welding(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST) new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/device/demo_scanner(new_human), WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/bag/trash(new_human), WEAR_L_HAND) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/engineerpack/welder_chestrig, (new_human), WEAR_R_HAND) /datum/equipment_preset/uscm_ship/maint/load_rank(mob/living/carbon/human/new_human) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 3cd01dcd50f2..5b01ffc1b8e5 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -52223,6 +52223,12 @@ icon_state = "cargo_arrow" }, /area/almayer/living/briefing) +"nlS" = ( +/turf/open/floor/almayer{ + dir = 10; + icon_state = "cargo" + }, +/area/almayer/engineering/upper_engineering) "nlW" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/largecrate/random/barrel/green, @@ -66697,8 +66703,7 @@ /obj/structure/closet/secure_closet/engineering_personal, /obj/item/clothing/suit/storage/hazardvest/blue, /turf/open/floor/almayer{ - dir = 10; - icon_state = "cargo" + icon_state = "plate" }, /area/almayer/engineering/upper_engineering) "sxu" = ( @@ -67505,14 +67510,6 @@ icon_state = "plate" }, /area/almayer/living/basketball) -"sOx" = ( -/obj/structure/closet/secure_closet/engineering_personal, -/obj/item/clothing/suit/storage/hazardvest/yellow, -/turf/open/floor/almayer{ - dir = 10; - icon_state = "cargo" - }, -/area/almayer/engineering/upper_engineering) "sOy" = ( /obj/structure/stairs/perspective{ dir = 1; @@ -130304,7 +130301,7 @@ aYj apd hwC rcS -amx +nlS swN alO axL @@ -130507,8 +130504,8 @@ aYj apd alR amA -atq -swN +nlS +alR alO alO cHc @@ -130710,8 +130707,8 @@ aDZ apd alR amA -atq -sOx +nlS +alR alO axM amA @@ -130913,8 +130910,8 @@ aDZ apd alR amA -atq -sOx +nlS +alR alO axN azq From b21d25885493ad9d39a20e8edf6d647bbe1838a1 Mon Sep 17 00:00:00 2001 From: Julien Date: Sun, 18 Feb 2024 12:56:42 +0100 Subject: [PATCH 2/9] dme updated --- code/game/machinery/vending/vendor_types/crew/engineering.dm | 1 - colonialmarines.dme | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/vending/vendor_types/crew/engineering.dm b/code/game/machinery/vending/vendor_types/crew/engineering.dm index 85ae44644e9a..ec883398120e 100644 --- a/code/game/machinery/vending/vendor_types/crew/engineering.dm +++ b/code/game/machinery/vending/vendor_types/crew/engineering.dm @@ -28,7 +28,6 @@ GLOBAL_LIST_INIT(cm_vending_clothing_maintenance_technician, list( list("Technician Backpack", 0, /obj/item/storage/backpack/marine/tech, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR), list("Technician Satchel", 0, /obj/item/storage/backpack/marine/satchel/tech, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR), - list("BELT (CHOOSE 1)", 0, null, null, null), list("G8-A General Utility Pouch", 0, /obj/item/storage/backpack/general_belt, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("M276 Toolbelt Rig (Full)", 0, /obj/item/storage/belt/utility/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_MANDATORY), diff --git a/colonialmarines.dme b/colonialmarines.dme index f3dc6f1f81d9..71bb715bf103 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -971,6 +971,7 @@ #include "code\game\machinery\vending\vendor_types\antag\antag_guns_snowflake.dm" #include "code\game\machinery\vending\vendor_types\antag\antag_guns_sorted.dm" #include "code\game\machinery\vending\vendor_types\crew\commanding_officer.dm" +#include "code\game\machinery\vending\vendor_types\crew\engineering.dm" #include "code\game\machinery\vending\vendor_types\crew\medical.dm" #include "code\game\machinery\vending\vendor_types\crew\mp.dm" #include "code\game\machinery\vending\vendor_types\crew\pilot_officer.dm" From 0703421a2611d256b39653325cf84df7bedce21f Mon Sep 17 00:00:00 2001 From: Julien Date: Sun, 18 Feb 2024 13:02:04 +0100 Subject: [PATCH 3/9] adding the vendor in almayer --- maps/map_files/USS_Almayer/USS_Almayer.dmm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 5b01ffc1b8e5..bc805a586156 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -66700,8 +66700,7 @@ }, /area/almayer/lifeboat_pumps/south2) "swN" = ( -/obj/structure/closet/secure_closet/engineering_personal, -/obj/item/clothing/suit/storage/hazardvest/blue, +/obj/structure/machinery/cm_vending/clothing/maintenance_technician, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -130505,7 +130504,7 @@ apd alR amA nlS -alR +swN alO alO cHc @@ -130708,7 +130707,7 @@ apd alR amA nlS -alR +swN alO axM amA @@ -130911,7 +130910,7 @@ apd alR amA nlS -alR +swN alO axN azq From b30913e5b570d67327fd94b21dd565783cb5156c Mon Sep 17 00:00:00 2001 From: Julien Date: Sun, 18 Feb 2024 13:17:19 +0100 Subject: [PATCH 4/9] fix it i think --- code/game/machinery/vending/vendor_types/crew/engineering.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/vending/vendor_types/crew/engineering.dm b/code/game/machinery/vending/vendor_types/crew/engineering.dm index ec883398120e..6c51f2ef93f3 100644 --- a/code/game/machinery/vending/vendor_types/crew/engineering.dm +++ b/code/game/machinery/vending/vendor_types/crew/engineering.dm @@ -62,7 +62,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_maintenance_technician, list( /obj/structure/machinery/cm_vending/clothing/maintenance_technician/get_listed_products(mob/user) return GLOB.cm_vending_clothing_maintenance_technician - /obj/effect/essentials_set/maintenance +/obj/effect/essentials_set/maintenance spawned_gear_list = list( /obj/item/device/lightreplacer, /obj/item/device/demo_scanner, From b12b62b2eb37bbb75b125351fab35a652916de7e Mon Sep 17 00:00:00 2001 From: Julien Date: Sun, 18 Feb 2024 13:28:01 +0100 Subject: [PATCH 5/9] remove CE suit --- code/game/machinery/vending/vendor_types/crew/engineering.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/machinery/vending/vendor_types/crew/engineering.dm b/code/game/machinery/vending/vendor_types/crew/engineering.dm index 6c51f2ef93f3..6800547d723a 100644 --- a/code/game/machinery/vending/vendor_types/crew/engineering.dm +++ b/code/game/machinery/vending/vendor_types/crew/engineering.dm @@ -22,7 +22,6 @@ GLOBAL_LIST_INIT(cm_vending_clothing_maintenance_technician, list( list("Blue Hazard Vest", 0, /obj/item/clothing/suit/storage/hazardvest/blue, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), 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("BACKPACK (CHOOSE 1)", 0, null, null, null), list("Technician Backpack", 0, /obj/item/storage/backpack/marine/tech, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR), From cf26e77bcfa96a586b0968b82062b01f5bb31ac8 Mon Sep 17 00:00:00 2001 From: Julien Date: Sun, 18 Feb 2024 13:42:28 +0100 Subject: [PATCH 6/9] giguigiu --- code/game/machinery/vending/vendor_types/crew/engineering.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/vending/vendor_types/crew/engineering.dm b/code/game/machinery/vending/vendor_types/crew/engineering.dm index 6800547d723a..86d15814f290 100644 --- a/code/game/machinery/vending/vendor_types/crew/engineering.dm +++ b/code/game/machinery/vending/vendor_types/crew/engineering.dm @@ -68,5 +68,5 @@ GLOBAL_LIST_INIT(cm_vending_clothing_maintenance_technician, list( /obj/item/storage/bag/trash, /obj/item/storage/toolbox/mechanical, /obj/item/device/flashlight, - /obj/item/storage/backpack/industrial + /obj/item/storage/backpack/industrial, ) From 3b1cd2b287ed6d38c1de4593312c0df36a864e6a Mon Sep 17 00:00:00 2001 From: Julien Date: Tue, 20 Feb 2024 09:30:47 +0100 Subject: [PATCH 7/9] revert lockers back in and changed mt vendor place. --- maps/map_files/USS_Almayer/USS_Almayer.dmm | 124 ++++++++++----------- 1 file changed, 59 insertions(+), 65 deletions(-) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index bc805a586156..c0d2268f4f99 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -25693,8 +25693,10 @@ }, /area/almayer/maint/hull/lower/l_a_p) "dod" = ( -/obj/structure/closet/crate/trashcart, -/turf/open/floor/almayer, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "cargo" + }, /area/almayer/engineering/upper_engineering/port) "dof" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor{ @@ -27889,6 +27891,14 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/stern) +"eeH" = ( +/obj/structure/closet/secure_closet/engineering_personal, +/obj/item/clothing/suit/storage/hazardvest/yellow, +/turf/open/floor/almayer{ + dir = 10; + icon_state = "cargo" + }, +/area/almayer/engineering/upper_engineering) "eeR" = ( /obj/structure/surface/rack, /obj/item/frame/table, @@ -29727,10 +29737,6 @@ "eNi" = ( /turf/closed/wall/almayer, /area/almayer/engineering/ce_room) -"eNv" = ( -/obj/structure/largecrate/random, -/turf/open/floor/almayer, -/area/almayer/engineering/upper_engineering/port) "eNI" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 4; @@ -45848,21 +45854,9 @@ }, /area/almayer/living/pilotbunks) "kUw" = ( -/obj/structure/surface/rack, -/obj/item/storage/bag/trash{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/storage/bag/trash{ - pixel_x = -8; - pixel_y = 4 - }, -/obj/item/storage/bag/trash{ - pixel_x = -3; - pixel_y = -2 - }, +/obj/structure/machinery/cm_vending/clothing/maintenance_technician, /turf/open/floor/almayer{ - icon_state = "cargo" + icon_state = "plate" }, /area/almayer/engineering/upper_engineering/port) "kUL" = ( @@ -52223,12 +52217,6 @@ icon_state = "cargo_arrow" }, /area/almayer/living/briefing) -"nlS" = ( -/turf/open/floor/almayer{ - dir = 10; - icon_state = "cargo" - }, -/area/almayer/engineering/upper_engineering) "nlW" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/largecrate/random/barrel/green, @@ -53185,19 +53173,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/medical_science) -"nDL" = ( -/obj/structure/barricade/handrail{ - dir = 4 - }, -/obj/structure/surface/rack, -/obj/item/stack/tile/carpet{ - amount = 20 - }, -/obj/item/stack/sheet/wood/large_stack, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/engineering/upper_engineering/port) "nDM" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -63762,9 +63737,27 @@ }, /area/almayer/command/computerlab) "rxV" = ( -/obj/structure/barricade/handrail, -/obj/structure/largecrate/supply/generator, -/turf/open/floor/almayer, +/obj/structure/surface/table/almayer, +/obj/item/cell/high{ + pixel_x = -8; + pixel_y = 8 + }, +/obj/item/ashtray/plastic{ + icon_state = "ashtray_full_bl"; + pixel_x = 5; + pixel_y = 1 + }, +/obj/item/trash/cigbutt{ + pixel_x = -10; + pixel_y = 13 + }, +/obj/item/trash/cigbutt{ + pixel_x = -6; + pixel_y = -9 + }, +/turf/open/floor/almayer{ + icon_state = "mono" + }, /area/almayer/engineering/upper_engineering/port) "ryt" = ( /obj/structure/pipes/standard/manifold/visible, @@ -66700,9 +66693,11 @@ }, /area/almayer/lifeboat_pumps/south2) "swN" = ( -/obj/structure/machinery/cm_vending/clothing/maintenance_technician, +/obj/structure/closet/secure_closet/engineering_personal, +/obj/item/clothing/suit/storage/hazardvest/blue, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 10; + icon_state = "cargo" }, /area/almayer/engineering/upper_engineering) "sxu" = ( @@ -70855,14 +70850,12 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_a_s) "tZP" = ( -/obj/structure/surface/rack, -/obj/item/clothing/glasses/meson, -/obj/item/clothing/glasses/meson, +/obj/structure/machinery/cm_vending/clothing/maintenance_technician, /obj/structure/machinery/light/small{ dir = 1 }, /turf/open/floor/almayer{ - icon_state = "cargo" + icon_state = "plate" }, /area/almayer/engineering/upper_engineering/port) "tZZ" = ( @@ -79088,12 +79081,13 @@ }, /area/almayer/lifeboat_pumps/south1) "wTJ" = ( -/obj/structure/barricade/handrail, -/obj/structure/barricade/handrail{ - dir = 4 +/obj/effect/decal/cleanable/vomit, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_21" + }, +/turf/open/floor/almayer{ + icon_state = "mono" }, -/obj/structure/largecrate/random, -/turf/open/floor/almayer, /area/almayer/engineering/upper_engineering/port) "wTM" = ( /turf/closed/wall/almayer/research/containment/wall/south, @@ -130300,7 +130294,7 @@ aYj apd hwC rcS -nlS +amx swN alO axL @@ -130503,7 +130497,7 @@ aYj apd alR amA -nlS +atq swN alO alO @@ -130706,8 +130700,8 @@ aDZ apd alR amA -nlS -swN +atq +eeH alO axM amA @@ -130909,8 +130903,8 @@ aDZ apd alR amA -nlS -swN +atq +eeH alO axN azq @@ -131740,7 +131734,7 @@ apd jWh kUw dod -eNv +vyI rxV thV fCL @@ -131942,10 +131936,10 @@ aYj apd jWh tZP -hSk -hSk +dod +vyI +vyI vyI -thV fCL uIv hSk @@ -132144,8 +132138,8 @@ aEp lIw aEp jWh -nDL -vyI +kUw +dod vyI wTJ thV From 1f629955c687455542cb64cdb0c1cdce4d10013b Mon Sep 17 00:00:00 2001 From: Julien Date: Mon, 26 Feb 2024 09:49:50 +0100 Subject: [PATCH 8/9] made changes around backpacks. --- code/game/machinery/vending/vendor_types/crew/engineering.dm | 4 +++- code/modules/gear_presets/uscm_ship.dm | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/vending/vendor_types/crew/engineering.dm b/code/game/machinery/vending/vendor_types/crew/engineering.dm index 86d15814f290..29907860147a 100644 --- a/code/game/machinery/vending/vendor_types/crew/engineering.dm +++ b/code/game/machinery/vending/vendor_types/crew/engineering.dm @@ -26,6 +26,9 @@ GLOBAL_LIST_INIT(cm_vending_clothing_maintenance_technician, list( list("BACKPACK (CHOOSE 1)", 0, null, null, null), list("Technician Backpack", 0, /obj/item/storage/backpack/marine/tech, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR), list("Technician Satchel", 0, /obj/item/storage/backpack/marine/satchel/tech, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR), + list("Technician Welderpack", 0, /obj/item/storage/backpack/marine/engineerpack, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), + list("Technician Welder-Satchel", 0, /obj/item/storage/backpack/marine/engineerpack/satchel, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR), + list("Technician Welder Chestrig", 0, /obj/item/storage/backpack/marine/engineerpack/welder_chestrig, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), list("BELT (CHOOSE 1)", 0, null, null, null), list("G8-A General Utility Pouch", 0, /obj/item/storage/backpack/general_belt, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), @@ -68,5 +71,4 @@ GLOBAL_LIST_INIT(cm_vending_clothing_maintenance_technician, list( /obj/item/storage/bag/trash, /obj/item/storage/toolbox/mechanical, /obj/item/device/flashlight, - /obj/item/storage/backpack/industrial, ) diff --git a/code/modules/gear_presets/uscm_ship.dm b/code/modules/gear_presets/uscm_ship.dm index d080b4125020..681fbd1f47ef 100644 --- a/code/modules/gear_presets/uscm_ship.dm +++ b/code/modules/gear_presets/uscm_ship.dm @@ -255,7 +255,6 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/engi(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(new_human), WEAR_FEET) new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/engineerpack/welder_chestrig, (new_human), WEAR_R_HAND) /datum/equipment_preset/uscm_ship/maint/load_rank(mob/living/carbon/human/new_human) if(new_human.client) From e7a4342590ce7d6d078940d91c8f7dcdcadbe7de Mon Sep 17 00:00:00 2001 From: Julian56 <117036822+Huffie56@users.noreply.github.com> Date: Mon, 26 Feb 2024 16:22:42 +0100 Subject: [PATCH 9/9] Update engineering.dm removing having two mandatory backpack and put one as recommended instead. --- .../game/machinery/vending/vendor_types/crew/engineering.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/vending/vendor_types/crew/engineering.dm b/code/game/machinery/vending/vendor_types/crew/engineering.dm index 29907860147a..9d5a809e52f7 100644 --- a/code/game/machinery/vending/vendor_types/crew/engineering.dm +++ b/code/game/machinery/vending/vendor_types/crew/engineering.dm @@ -26,9 +26,9 @@ GLOBAL_LIST_INIT(cm_vending_clothing_maintenance_technician, list( list("BACKPACK (CHOOSE 1)", 0, null, null, null), list("Technician Backpack", 0, /obj/item/storage/backpack/marine/tech, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR), list("Technician Satchel", 0, /obj/item/storage/backpack/marine/satchel/tech, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR), - list("Technician Welderpack", 0, /obj/item/storage/backpack/marine/engineerpack, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), - list("Technician Welder-Satchel", 0, /obj/item/storage/backpack/marine/engineerpack/satchel, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR), - list("Technician Welder Chestrig", 0, /obj/item/storage/backpack/marine/engineerpack/welder_chestrig, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), + list("Technician Welderpack", 0, /obj/item/storage/backpack/marine/engineerpack, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR), + list("Technician Welder-Satchel", 0, /obj/item/storage/backpack/marine/engineerpack/satchel, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_RECOMMENDED), + list("Technician Welder Chestrig", 0, /obj/item/storage/backpack/marine/engineerpack/welder_chestrig, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR), list("BELT (CHOOSE 1)", 0, null, null, null), list("G8-A General Utility Pouch", 0, /obj/item/storage/backpack/general_belt, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),