From 77f95e89f51e9c52d594af3854cb4f7314745ff8 Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Sun, 10 Dec 2023 16:35:29 +0800 Subject: [PATCH 1/4] InitalCommit --- .../vendor_types/crew/senior_officers.dm | 70 ++++++++++++++++++- maps/map_files/USS_Almayer/USS_Almayer.dmm | 58 +++++++-------- 2 files changed, 96 insertions(+), 32 deletions(-) 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 d5b12a264665..d4b7a66ae1fa 100644 --- a/code/game/machinery/vending/vendor_types/crew/senior_officers.dm +++ b/code/game/machinery/vending/vendor_types/crew/senior_officers.dm @@ -268,6 +268,67 @@ GLOBAL_LIST_INIT(cm_vending_clothing_cmo, list( //------------ EXECUTIVE OFFFICER --------------- + +//------------WEAPON VENDOR--------------- +GLOBAL_LIST_INIT(cm_vending_gear_executive_officer, list( + list("CAPTAIN'S PRIMARY (CHOOSE 1)", 0, null, null, null), + list("M41A MK1 Pulse Rifle", 0, /obj/item/storage/box/guncase/m41aMK1AP, MARINE_CAN_BUY_KIT, VENDOR_ITEM_MANDATORY), + list("MK221 Tactical Shotgun", 0, /obj/effect/essentials_set/xo/shotgunpreset, MARINE_CAN_BUY_KIT, VENDOR_ITEM_MANDATORY), + + list("PRIMARY AMMUNITION", 0, null, null, null), + list("M41A MK1 Magazine", 40, /obj/item/ammo_magazine/rifle/m41aMK1, null, VENDOR_ITEM_RECOMMENDED), + list("M41A MK1 AP Magazine", 60, /obj/item/ammo_magazine/rifle/m41aMK1/ap, null, VENDOR_ITEM_RECOMMENDED), + list("Buckshot Shells", 20, /obj/item/ammo_magazine/shotgun/buckshot, null, VENDOR_ITEM_REGULAR), + list("Shotgun Slugs", 20, /obj/item/ammo_magazine/shotgun/slugs, null, VENDOR_ITEM_REGULAR), + list("Flechette Shells", 20, /obj/item/ammo_magazine/shotgun/flechette, null, VENDOR_ITEM_REGULAR), + + list("EXPLOSIVES", 0, null, null, null), + list("HEDP Grenade Pack", 15, /obj/item/storage/box/packet/high_explosive, null, VENDOR_ITEM_REGULAR), + list("HEFA Grenade Pack", 15, /obj/item/storage/box/packet/hefa, null, VENDOR_ITEM_REGULAR), + list("WP Grenade Pack", 15, /obj/item/storage/box/packet/phosphorus, null, VENDOR_ITEM_REGULAR), + + list("RAIL ATTACHMENTS", 0, null, null, null), + list("Red-Dot Sight", 15, /obj/item/attachable/reddot, null, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 15, /obj/item/attachable/reflex, null, VENDOR_ITEM_REGULAR), + list("S4 2x Telescopic Mini-Scope", 15, /obj/item/attachable/scope/mini, null, VENDOR_ITEM_REGULAR), + + list("Helmet Visors", 0, null, null, null), + list("Welding Visor", 5, /obj/item/device/helmet_visor/welding_visor, null, VENDOR_ITEM_RECOMMENDED), + + list("UNDERBARREL ATTACHMENTS", 0, null, null, null), + list("Laser Sight", 15, /obj/item/attachable/lasersight, null, VENDOR_ITEM_REGULAR), + list("Angled Grip", 15, /obj/item/attachable/angledgrip, null, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 15, /obj/item/attachable/verticalgrip, null, VENDOR_ITEM_REGULAR), + list("Underbarrel Shotgun", 15, /obj/item/attachable/attached_gun/shotgun, null, VENDOR_ITEM_REGULAR), + list("Underbarrel Extinguisher", 15, /obj/item/attachable/attached_gun/extinguisher, null, VENDOR_ITEM_REGULAR), + list("Underbarrel Flamethrower", 15, /obj/item/attachable/attached_gun/flamer, null, VENDOR_ITEM_REGULAR), + list("Underbarrel Grenade Launcher", 5, /obj/item/attachable/attached_gun/grenade, null, VENDOR_ITEM_REGULAR), + + list("BARREL ATTACHMENTS", 0, null, null, null), + list("Extended Barrel", 15, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), + list("Recoil Compensator", 15, /obj/item/attachable/compensator, null, VENDOR_ITEM_REGULAR), + list("Suppressor", 15, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), + )) + +/obj/effect/essentials_set/xo/shotgunpreset + spawned_gear_list = list( + /obj/item/weapon/gun/shotgun/combat, + /obj/item/ammo_magazine/shotgun/buckshot, + /obj/item/ammo_magazine/shotgun/slugs, + ) + +/obj/structure/machinery/cm_vending/gear/executive_officer + name = "\improper ColMarTech Executive Officer Weapon Rack" + desc = "An automated weapons rack for the Executive Officer. It features a decent selection of weaponry meant only for the second in command of a ship." + req_access = list(ACCESS_MARINE_SENIOR) + vendor_role = list(JOB_XO) + icon_state = "guns" + use_snowflake_points = TRUE + +/obj/structure/machinery/cm_vending/gear/executive_officer/get_listed_products(mob/user) + return GLOB.cm_vending_gear_executive_officer + +//------------UNIFORM/GEAR VENDOR--------------- GLOBAL_LIST_INIT(cm_vending_clothing_xo, list( list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), @@ -285,6 +346,14 @@ GLOBAL_LIST_INIT(cm_vending_clothing_xo, list( list("Mod 88 Pistol", 0, /obj/item/storage/belt/gun/m4a3/mod88, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_REGULAR), list("M44 Revolver", 0, /obj/item/storage/belt/gun/m44/mp, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_REGULAR), + list("BELTS (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_RECOMMENDED), + list("Military Police Belt", 0, /obj/item/storage/belt/security/MP/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), + list("M276 Medical Storage Rig", 0, /obj/item/storage/belt/medical/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), + list("M276 Ammo Load Rig", 0, /obj/item/storage/belt/marine, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), + list("M276 Holster Toolrig", 0, /obj/item/storage/belt/gun/utility/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), + list("M276 M82F Holster Rig", 0, /obj/item/storage/belt/gun/flaregun, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), + list("COMBAT EQUIPMENT (TAKE ALL)", 0, null, null, null), list("Officer M3 Armor", 0, /obj/item/clothing/suit/storage/marine/MP/SO, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), list("Officer M10 Helmet", 0, /obj/item/clothing/head/helmet/marine/MP/SO, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY), @@ -312,7 +381,6 @@ GLOBAL_LIST_INIT(cm_vending_clothing_xo, list( list("Document Pouch", 0, /obj/item/storage/pouch/document, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index d940706c547c..1018093e3728 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -9282,11 +9282,9 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/command/telecomms) "aFj" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_21" +/obj/structure/machinery/cm_vending/clothing/senior_officer{ + density = 0; + pixel_y = 30 }, /turf/open/floor/almayer{ icon_state = "plate" @@ -9328,8 +9326,12 @@ }, /area/almayer/engineering/upper_engineering) "aFo" = ( -/obj/structure/closet/secure_closet/personal/cabinet{ - req_access = null +/obj/structure/machinery/cm_vending/gear/executive_officer{ + pixel_y = 30; + density = 0 + }, +/obj/structure/machinery/power/apc/almayer{ + dir = 4 }, /turf/open/floor/almayer{ icon_state = "plate" @@ -10522,6 +10524,9 @@ /area/almayer/hallways/aft_hallway) "aKE" = ( /obj/structure/machinery/light, +/obj/structure/closet/secure_closet/personal/cabinet{ + req_access = null + }, /turf/open/floor/almayer, /area/almayer/living/numbertwobunks) "aKF" = ( @@ -35165,8 +35170,7 @@ "fuR" = ( /obj/structure/bed/bedroll{ desc = "A bed of cotton fabric, purposely made for a cat to comfortably sleep on."; - name = "cat bed"; - pixel_y = 0 + name = "cat bed" }, /mob/living/simple_animal/cat/Jones{ dir = 8 @@ -42302,12 +42306,8 @@ /obj/structure/machinery/light{ dir = 4 }, -/obj/item/bedsheet/hop{ - pixel_y = 0 - }, -/obj/structure/bed{ - pixel_y = 0 - }, +/obj/item/bedsheet/hop, +/obj/structure/bed, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) "isC" = ( @@ -49167,13 +49167,6 @@ }, /turf/open/floor/plating, /area/almayer/living/cryo_cells) -"lgK" = ( -/obj/structure/machinery/cm_vending/clothing/senior_officer{ - density = 0; - pixel_y = 30 - }, -/turf/open/floor/almayer, -/area/almayer/living/numbertwobunks) "lgX" = ( /obj/structure/sign/safety/storage{ pixel_y = 32 @@ -55595,7 +55588,6 @@ /area/almayer/command/lifeboat) "nKs" = ( /obj/structure/machinery/cm_vending/clothing/dress{ - pixel_y = 0; req_access = list(1) }, /turf/open/floor/almayer{ @@ -70184,9 +70176,7 @@ }, /area/almayer/hallways/aft_hallway) "tMu" = ( -/obj/structure/machinery/cm_vending/clothing/commanding_officer{ - pixel_y = 0 - }, +/obj/structure/machinery/cm_vending/clothing/commanding_officer, /turf/open/floor/almayer{ icon_state = "cargo" }, @@ -71058,9 +71048,7 @@ /area/almayer/shipboard/brig/evidence_storage) "ueD" = ( /obj/structure/machinery/light, -/obj/structure/machinery/cm_vending/gear/commanding_officer{ - pixel_y = 0 - }, +/obj/structure/machinery/cm_vending/gear/commanding_officer, /turf/open/floor/almayer{ icon_state = "cargo" }, @@ -76368,6 +76356,14 @@ "wcn" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_s) +"wcK" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_21" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/numbertwobunks) "wcN" = ( /obj/structure/machinery/status_display{ pixel_y = 30 @@ -104826,7 +104822,7 @@ dum wVW wVW wVW -lgK +rvA aGZ awF cST @@ -105637,7 +105633,7 @@ amO avj awF aFo -aGY +wcK rvA aqm awF From e3f5d1430596e7812bb7abe176017e984c4fc8bb Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Fri, 15 Dec 2023 20:23:55 +0800 Subject: [PATCH 2/4] Fix --- maps/map_files/USS_Almayer/USS_Almayer.dmm | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 39211c2d0ec4..0f63aab2e97f 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -70842,22 +70842,6 @@ }, /area/almayer/hull/upper_hull/u_a_s) "tZE" = ( -/obj/structure/bed/bedroll{ - desc = "A bed of cotton fabric, purposely made for a cat to comfortably sleep on."; - name = "cat bed" - }, -/mob/living/simple_animal/cat/Jones{ - dir = 8 - }, -/obj/structure/machinery/firealarm{ - pixel_x = -1; - pixel_y = 28 - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/structure/bed/bedroll{ name = "cat bed"; desc = "A bed of cotton fabric, purposely made for a cat to comfortably sleep on." From eca7a1afd36ed1059b67c0f212a3b14fe68d8697 Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Sun, 17 Dec 2023 10:57:02 +0800 Subject: [PATCH 3/4] MoveCloset --- maps/map_files/USS_Almayer/USS_Almayer.dmm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 80f484610c0a..d8e05518eb7e 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -52712,6 +52712,14 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_a_p) +"mIr" = ( +/obj/structure/closet/secure_closet/personal/cabinet{ + req_access = null; + pixel_y = 17; + pixel_x = 1 + }, +/turf/open/floor/almayer, +/area/almayer/living/numbertwobunks) "mIy" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -59339,9 +59347,6 @@ /area/almayer/shipboard/port_missiles) "puo" = ( /obj/structure/machinery/light, -/obj/structure/closet/secure_closet/personal/cabinet{ - req_access = null - }, /turf/open/floor/almayer, /area/almayer/living/numbertwobunks) "pur" = ( @@ -104825,7 +104830,7 @@ dum wVW wVW wVW -rvA +mIr aGZ awF cST From b022076a8b3765b963812d78e11a1a91bf6a651b Mon Sep 17 00:00:00 2001 From: Steelpoint <6595389+Steelpoint@users.noreply.github.com> Date: Mon, 25 Dec 2023 08:45:35 +0800 Subject: [PATCH 4/4] Update senior_officers.dm --- .../machinery/vending/vendor_types/crew/senior_officers.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 d4b7a66ae1fa..9d9c519c285f 100644 --- a/code/game/machinery/vending/vendor_types/crew/senior_officers.dm +++ b/code/game/machinery/vending/vendor_types/crew/senior_officers.dm @@ -270,7 +270,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_cmo, list( //------------ EXECUTIVE OFFFICER --------------- //------------WEAPON VENDOR--------------- -GLOBAL_LIST_INIT(cm_vending_gear_executive_officer, list( +GLOBAL_LIST_INIT(cm_vending_gear_xo, list( list("CAPTAIN'S PRIMARY (CHOOSE 1)", 0, null, null, null), list("M41A MK1 Pulse Rifle", 0, /obj/item/storage/box/guncase/m41aMK1AP, MARINE_CAN_BUY_KIT, VENDOR_ITEM_MANDATORY), list("MK221 Tactical Shotgun", 0, /obj/effect/essentials_set/xo/shotgunpreset, MARINE_CAN_BUY_KIT, VENDOR_ITEM_MANDATORY), @@ -326,7 +326,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_executive_officer, list( use_snowflake_points = TRUE /obj/structure/machinery/cm_vending/gear/executive_officer/get_listed_products(mob/user) - return GLOB.cm_vending_gear_executive_officer + return GLOB.cm_vending_gear_xo //------------UNIFORM/GEAR VENDOR--------------- GLOBAL_LIST_INIT(cm_vending_clothing_xo, list(