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

Jump to bottom

adding vendors for maintenance technician #5749

Merged
merged 11 commits into from
Feb 26, 2024
Merged

adding vendors for maintenance technician #5749

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a673f66
adding new vendor for MT
Feb 18, 2024
b21d258
dme updated
Feb 18, 2024
0703421
adding the vendor in almayer
Feb 18, 2024
b30913e
fix it i think
Feb 18, 2024
b12b62b
remove CE suit
Feb 18, 2024
cf26e77
giguigiu
Feb 18, 2024
3b1cd2b
revert lockers back in and changed mt vendor place.
Feb 20, 2024
1f7165e
Merge remote-tracking branch 'upstream/master' into mtvendor
Feb 20, 2024
81fd61a
Merge remote-tracking branch 'upstream/master' into mtvendor
Feb 22, 2024
1f62995
made changes around backpacks.
Feb 26, 2024
e7a4342
Update engineering.dm
Huffie56 Feb 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
72 changes: 72 additions & 0 deletions code/game/machinery/vending/vendor_types/crew/engineering.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
//------------ 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("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,
)
Huffie56 marked this conversation as resolved.
Show resolved Hide resolved
7 changes: 0 additions & 7 deletions code/modules/gear_presets/uscm_ship.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Huffie56 marked this conversation as resolved.
Show resolved Hide resolved

/datum/equipment_preset/uscm_ship/maint/load_rank(mob/living/carbon/human/new_human)
Expand Down
1 change: 1 addition & 0 deletions colonialmarines.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
32 changes: 14 additions & 18 deletions maps/map_files/USS_Almayer/USS_Almayer.dmm
View file
Open in desktop
Huffie56 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -66694,11 +66700,9 @@
},
/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{
dir = 10;
icon_state = "cargo"
icon_state = "plate"
},
/area/almayer/engineering/upper_engineering)
"sxu" = (
Expand Down Expand Up @@ -67505,14 +67509,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;
Expand Down Expand Up @@ -130304,7 +130300,7 @@ aYj
apd
hwC
rcS
amx
nlS
swN
alO
axL
Expand Down Expand Up @@ -130507,7 +130503,7 @@ aYj
apd
alR
amA
atq
nlS
swN
alO
alO
Expand Down Expand Up @@ -130710,8 +130706,8 @@ aDZ
apd
alR
amA
atq
sOx
nlS
swN
alO
axM
amA
Expand Down Expand Up @@ -130913,8 +130909,8 @@ aDZ
apd
alR
amA
atq
sOx
nlS
swN
alO
axN
azq
Expand Down
Loading