diff --git a/code/_helpers/global_lists_vr.dm b/code/_helpers/global_lists_vr.dm index f879164ca1..2e06ed7ac0 100644 --- a/code/_helpers/global_lists_vr.dm +++ b/code/_helpers/global_lists_vr.dm @@ -510,6 +510,7 @@ var/global/list/remainless_species = list(SPECIES_PROMETHEAN, "Research Intern", "Security Cadet", "Jr. Cargo Tech", + "Jr. Explorer", // YW EDIT "Server", "Electrician", "Barista") diff --git a/code/datums/supplypacks/misc_vr.dm b/code/datums/supplypacks/misc_vr.dm index ea49c3eaa3..4120424d09 100644 --- a/code/datums/supplypacks/misc_vr.dm +++ b/code/datums/supplypacks/misc_vr.dm @@ -137,7 +137,7 @@ one_access = TRUE /datum/supply_pack/randomised/misc/explorer_shield - name = "Away Team shield" + name = "Explorer shield" // YW EDIT num_contained = 2 contains = list( /obj/item/weapon/shield/riot/explorer, @@ -146,7 +146,7 @@ cost = 75 containertype = /obj/structure/closet/crate/secure/gear containername = "exploration shield crate" - access = list(access_eva, + access = list(access_explorer, // YW EDIT access_pilot) one_access = TRUE diff --git a/code/datums/supplypacks/munitions_vr.dm b/code/datums/supplypacks/munitions_vr.dm index 3a25c1b7ce..d5d947ed65 100644 --- a/code/datums/supplypacks/munitions_vr.dm +++ b/code/datums/supplypacks/munitions_vr.dm @@ -1,4 +1,4 @@ -/* +// YW Changes start un-comments /datum/supply_pack/munitions/expeditionguns name = "Frontier phaser (station-locked) crate" contains = list( @@ -8,7 +8,7 @@ cost = 35 containertype = /obj/structure/closet/crate/secure containername = "frontier phaser crate" - access = access_security + access = access_explorer // YW EDIT /datum/supply_pack/munitions/expeditionbows name = "Frontier bows (station-locked) crate" @@ -18,8 +18,8 @@ cost = 20 containertype = /obj/structure/closet/crate/secure containername = "phaser handbow crate" - access = access_security -*/ + access = access_explorer // YW EDIT +// YW Changes End un-comments /datum/supply_pack/munitions/ofd_charge_emp name = "OFD Charge - EMP" @@ -69,4 +69,4 @@ cost = 50 containertype = /obj/structure/closet/crate/secure containername = "longsword" - access = access_armory \ No newline at end of file + access = access_armory diff --git a/code/datums/supplypacks/supply.dm b/code/datums/supplypacks/supply.dm index 5ef9749e00..ae96168f56 100644 --- a/code/datums/supplypacks/supply.dm +++ b/code/datums/supplypacks/supply.dm @@ -157,7 +157,7 @@ containername = "Cargo Train Trolley Crate" /datum/supply_pack/explorergear - name="Away Team gear" + name="Explorer gear" // YW EDIT contains = list ( /obj/item/device/cataloguer, /obj/item/device/geiger, @@ -178,7 +178,7 @@ ) cost=25 containertype = /obj/structure/closet/crate/secure/xion - containername = "Away Team equipment" + containername = "Explorer equipment" // YW EDIT access = list(access_eva, access_explorer) /datum/supply_pack/pilotgear @@ -198,7 +198,7 @@ /obj/item/weapon/material/knife/tacknife/survival, /obj/item/clothing/head/pilot_vr, /obj/item/clothing/under/rank/pilot1, - /obj/item/clothing/suit/storage/toggle/bomber/pilot + /obj/item/device/cataloguer/compact ) cost=20 containertype = /obj/structure/closet/crate/secure/xion diff --git a/code/game/jobs/job/assistant_vr.dm b/code/game/jobs/job/assistant_vr.dm index fa3b3bad9a..ab4027991b 100644 --- a/code/game/jobs/job/assistant_vr.dm +++ b/code/game/jobs/job/assistant_vr.dm @@ -21,6 +21,7 @@ "Research Intern" = /datum/alt_title/intern_sci, "Security Cadet" = /datum/alt_title/intern_sec, "Jr. Cargo Tech" = /datum/alt_title/intern_crg, + "Jr. Explorer" = /datum/alt_title/intern_exp, // YW EDIT "Server" = /datum/alt_title/server, "Assistant" = /datum/alt_title/assistant) job_description = "An Intern does whatever is requested of them, often doing so in process of learning \ @@ -57,13 +58,13 @@ title_blurb = "A Jr. Cargo Tech attempts to provide whatever the Cargo department needs. They are not proper Cargo Technicians, and are \ often in training to become a Cargo Technician. A Jr. Cargo Tech has no real authority." title_outfit = /decl/hierarchy/outfit/job/assistant/cargo -/* +// YW Changes start un-comment /datum/alt_title/intern_exp title = "Jr. Explorer" title_blurb = "A Jr. Explorer attempts to provide whatever the Exploration department needs. They are not proper Explorers, and are \ often in training to become an Explorer. A Jr. Explorer has no real authority." title_outfit = /decl/hierarchy/outfit/job/assistant/explorer -*/ +// YW Changes end un-comment /datum/alt_title/server title = "Server" title_blurb = "A Server helps out kitchen and diner staff with various tasks, primarily food delivery. A Server has no real authority." diff --git a/code/game/objects/effects/job_start_landmarks.dm b/code/game/objects/effects/job_start_landmarks.dm index 73d0bd39d8..0a49b03aad 100644 --- a/code/game/objects/effects/job_start_landmarks.dm +++ b/code/game/objects/effects/job_start_landmarks.dm @@ -44,14 +44,14 @@ name = "Cargo Technician" /obj/effect/landmark/start/miner name = "Shaft Miner" -/* //VOREStation Removal +// YW Change start un-comment /obj/effect/landmark/start/pf name = "Pathfinder" /obj/effect/landmark/start/explorer name = "Explorer" /obj/effect/landmark/start/fieldmedic name = "Field Medic" -*/ +// YW Change end un-comment /obj/effect/landmark/start/bartender name = "Bartender" /obj/effect/landmark/start/botanist diff --git a/code/game/objects/items/devices/radio/headset_vr.dm b/code/game/objects/items/devices/radio/headset_vr.dm index ea952cc515..a57097b0b9 100644 --- a/code/game/objects/items/devices/radio/headset_vr.dm +++ b/code/game/objects/items/devices/radio/headset_vr.dm @@ -91,15 +91,15 @@ icon_state = "pilot_headset_alt" /obj/item/device/radio/headset/explorer - name = "away team member's headset" - desc = "Headset used by the away team for exploring. Access to the away team channel." + name = "explorer's headset" // YW EDIT + desc = "Headset used by the away team for exploring. Access to the away team channel." // YW EDIT icon_state = "exp_headset" adhoc_fallback = TRUE ks2type = /obj/item/device/encryptionkey/explorer /obj/item/device/radio/headset/explorer/alt - name = "away team's bowman headset" - desc = "Bowman headset used by the away team for exploring. Access to the away team channel." + name = "explorer's bowman headset" // YW EDIT + desc = "Bowman headset used by the away team for exploring. Access to the away team channel." // YW EDIT icon_state = "exp_headset_alt" /obj/item/device/radio/headset/sar @@ -114,14 +114,14 @@ desc = "A bowman headset for field medics." icon_state = "sar_headset_alt" -/* //They're all volunteers now. +// YW Change start un-comment /obj/item/device/radio/headset/volunteer name = "volunteer's headset" desc = "A headset used by volunteers to expedition teams, has access to the Away Team channel." icon_state = "pilot_headset" adhoc_fallback = TRUE ks2type = /obj/item/device/encryptionkey/explorer -*/ +// YW Change end un-comment /obj/item/device/radio/headset/talon name = "talon headset" diff --git a/code/game/objects/items/weapons/shields_vr.dm b/code/game/objects/items/weapons/shields_vr.dm index baa4f94afa..34acbbc1a5 100644 --- a/code/game/objects/items/weapons/shields_vr.dm +++ b/code/game/objects/items/weapons/shields_vr.dm @@ -22,7 +22,7 @@ /obj/item/weapon/shield/riot/explorer - name = "green away team shield" + name = "green explorer shield" // YW EDIT desc = "A shield issued to exploration teams to help protect them when advancing into the unknown. It is lighter and cheaper but less protective than some of its counterparts. It has a flashlight straight in the middle to help draw attention." icon = 'icons/obj/weapons_vr.dmi' icon_state = "explorer_shield" @@ -74,7 +74,7 @@ icon_state = "explorer_shield" /obj/item/weapon/shield/riot/explorer/purple - name = "purple away team shield" + name = "purple explorer shield" // YW EDIT desc = "A shield issued to exploration teams to help protect them when advancing into the unknown. It is lighter and cheaper but less protective than some of its counterparts. It has a flashlight straight in the middle to help draw attention. This one is POURPEL" icon_state = "explorer_shield_P" diff --git a/code/game/objects/items/weapons/storage/boxes_vr.dm b/code/game/objects/items/weapons/storage/boxes_vr.dm index dd5ff003f4..3790458752 100644 --- a/code/game/objects/items/weapons/storage/boxes_vr.dm +++ b/code/game/objects/items/weapons/storage/boxes_vr.dm @@ -1,7 +1,7 @@ /obj/item/weapon/storage/box/explorerkeys name = "box of volunteer headsets" desc = "A box full of volunteer headsets, for issuing out to exploration volunteers." - starts_with = list(/obj/item/device/radio/headset/explorer = 7) + starts_with = list(/obj/item/device/radio/headset/volunteer = 7) // YW EDIT /obj/item/weapon/storage/box/commandkeys name = "box of command keys" @@ -38,4 +38,4 @@ starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/canned/brainzsnax/red = 6) /obj/item/weapon/storage/box/freezer - can_hold = list(/obj/item/organ, /obj/item/weapon/reagent_containers/blood, /obj/item/weapon/reagent_containers/glass, /obj/item/weapon/reagent_containers/food) \ No newline at end of file + can_hold = list(/obj/item/organ, /obj/item/weapon/reagent_containers/blood, /obj/item/weapon/reagent_containers/glass, /obj/item/weapon/reagent_containers/food) diff --git a/code/game/objects/structures/crates_lockers/closets/misc_vr.dm b/code/game/objects/structures/crates_lockers/closets/misc_vr.dm index d0f6d1892a..fa2cf75181 100644 --- a/code/game/objects/structures/crates_lockers/closets/misc_vr.dm +++ b/code/game/objects/structures/crates_lockers/closets/misc_vr.dm @@ -24,7 +24,7 @@ /obj/structure/closet/secure_closet/guncabinet/rifle name = "rifle cabinet" - req_one_access = list(access_brig) + req_one_access = list(access_explorer,access_brig) // YW EDIT starts_with = list( /obj/item/ammo_magazine/clip/c762/hunter = 9, @@ -38,8 +38,8 @@ return ..() /obj/structure/closet/secure_closet/guncabinet/phase - name = "away team weapon cabinet" - req_one_access = list(access_brig) + name = "explorer weapon cabinet" // YW EDIT + req_one_access = list(access_explorer,access_brig) // YW EDIT starts_with = list( /obj/item/weapon/gun/energy/phasegun = 2, @@ -51,7 +51,7 @@ * Explorer */ /obj/structure/closet/secure_closet/explorer - name = "away team locker" + name = "explorer locker" // YW EDIT req_access = list(access_explorer) closet_appearance = /decl/closet_appearance/secure_closet/expedition/explorer diff --git a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm index e1b39c5b99..7e4bd38b3a 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm @@ -52,7 +52,7 @@ //VOREStation Add Start /obj/structure/closet/secure_closet/guncabinet/excursion name = "expedition weaponry cabinet" - req_one_access = list(access_armory) + req_one_access = list(access_explorer,access_armory) // YW EDIT /obj/structure/closet/secure_closet/guncabinet/excursion/New() ..() @@ -60,4 +60,4 @@ new /obj/item/weapon/gun/energy/locked/frontier(src) for(var/i = 1 to 2) new /obj/item/weapon/gun/energy/locked/frontier/holdout(src) -//VOREStation Add End \ No newline at end of file +//VOREStation Add End diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm b/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm index bc545291de..e90d0e120f 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm @@ -1,9 +1,9 @@ /datum/gear/eyes/medical - allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist") + allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic") // YW EDIT Field medic /datum/gear/eyes/meson - display_name = "Optical Meson Scanners (Eng, Sci)" - allowed_roles = list("Engineer","Chief Engineer","Atmospheric Technician", "Scientist", "Research Director") + display_name = "Optical Meson Scanners (Eng, Sci, Explo)" // YW EDIT Field medic, Explo + allowed_roles = list("Engineer","Chief Engineer","Atmospheric Technician", "Scientist", "Research Director", "Explorer", "Pathfinder") // YW EDIT Field medic, Explo /datum/gear/eyes/arglasses display_name = "AR glasses" @@ -38,7 +38,7 @@ /datum/gear/eyes/arglasses/med display_name = "AR-M glasses (Medical)" path = /obj/item/clothing/glasses/omnihud/med - allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist") + allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic") // YW EDIT Field medic /datum/gear/eyes/arglasses/all display_name = "AR-B glasses (SM, HoP)" diff --git a/code/modules/client/preference_setup/loadout/loadout_head_vr.dm b/code/modules/client/preference_setup/loadout/loadout_head_vr.dm index 43f8451dbe..69f46a9379 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head_vr.dm @@ -1,7 +1,7 @@ /datum/gear/head/cap/med display_name = "cap, medical (Medical)" path = /obj/item/clothing/head/soft/med - allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic") + allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic", "Field Medic") // YW EDIT Field medic /*/datum/gear/head/cap/sol display_name = "cap, sol" diff --git a/code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm b/code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm index dab191f306..d0b1646007 100644 --- a/code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm @@ -1,5 +1,5 @@ /datum/gear/shoes/boots/winter/medical - allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist") + allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic") // YW EDIT Field medic /datum/gear/shoes/black/cuffs display_name = "legwraps, black" diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index 8e8ca4475e..ec161301ea 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -390,12 +390,12 @@ /datum/gear/suit/wintercoat/medical display_name = "winter coat, medical" path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical - allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist") + allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic") // YW EDIT Field medic /datum/gear/suit/wintercoat/medical/alt display_name = "winter coat, medical alt" path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/alt - allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist") + allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic") // YW EDIT Field medic /datum/gear/suit/wintercoat/medical/viro display_name = "winter coat, virologist" @@ -405,7 +405,7 @@ /datum/gear/suit/wintercoat/medical/para display_name = "winter coat, paramedic" path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/para - allowed_roles = list("Medical Doctor","Chief Medical Officer","Paramedic") + allowed_roles = list("Medical Doctor","Chief Medical Officer","Paramedic", "Field Medic") // YW EDIT Field medic /datum/gear/suit/wintercoat/medical/chemist display_name = "winter coat, chemist" @@ -420,7 +420,7 @@ /datum/gear/suit/wintercoat/medical/sar display_name = "winter coat, search and rescue" path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar - allowed_roles = list("Chief Medical Officer","Paramedic") + allowed_roles = list("Chief Medical Officer","Paramedic", "Field Medic") // YW EDIT Field medic /datum/gear/suit/wintercoat/science display_name = "winter coat, science" diff --git a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm index c1e706a7d6..13e76c42b2 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm @@ -1,5 +1,5 @@ /datum/gear/suit/snowsuit/medical - allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist") + allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic") // YW EDIT Field medic /datum/gear/suit/labcoat_colorable display_name = "labcoat, colorable" @@ -74,7 +74,7 @@ /datum/gear/suit/roles/medical/ems_jacket display_name = "first responder jacket" path = /obj/item/clothing/suit/storage/toggle/fr_jacket - allowed_roles = list("Chief Medical Officer","Paramedic","Medical Doctor") + allowed_roles = list("Chief Medical Officer","Paramedic","Medical Doctor", "Field Medic") // YW EDIT Field medic //imo-superior 'martian' style jacket with the star-of-life design /datum/gear/suit/roles/medical/ems_jacket/alt @@ -85,7 +85,7 @@ /datum/gear/suit/roles/medical/paramedic_vest display_name = "paramedic vest" path = /obj/item/clothing/suit/storage/toggle/paramedic - allowed_roles = list("Chief Medical Officer","Paramedic","Medical Doctor") + allowed_roles = list("Chief Medical Officer","Paramedic","Medical Doctor", "Field Medic") // YW EDIT Field medic //greek thing /datum/gear/suit/chiton @@ -113,7 +113,7 @@ Talon winter coat /datum/gear/suit/armor/combat/crusader_explo display_name = "knight, explo" path = /obj/item/clothing/suit/armor/combat/crusader_explo - allowed_roles = list("Explorer","Pathfinder") + allowed_roles = list("Explorer","Pathfinder", "Field Medic") // YW EDIT Field medic /datum/gear/suit/armor/combat/crusader_explo/FM display_name = "knight, Field Medic" diff --git a/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm b/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm index c740381f3b..0a08613131 100644 --- a/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm @@ -35,7 +35,7 @@ /datum/gear/utility/dufflebag/med display_name = "medical dufflebag" path = /obj/item/weapon/storage/backpack/dufflebag/med - allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist","Psychiatrist") + allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist","Psychiatrist", "Field Medic") // YW EDIT Field medic /datum/gear/utility/dufflebag/med/emt display_name = "EMT dufflebag" @@ -57,7 +57,7 @@ allowed_roles = list("Research Director","Scientist","Roboticist","Xenobiologist","Xenobotanist") /datum/gear/utility/dufflebag/explorer - display_name = "away team dufflebag" + display_name = "explorer dufflebag" // YW EDIT path = /obj/item/weapon/storage/backpack/dufflebag/explorer /datum/gear/utility/dufflebag/talon diff --git a/code/modules/clothing/shoes/boots.dm b/code/modules/clothing/shoes/boots.dm index 886364a44f..296626756f 100644 --- a/code/modules/clothing/shoes/boots.dm +++ b/code/modules/clothing/shoes/boots.dm @@ -169,7 +169,7 @@ icon_state = "winterboots_hydro" /obj/item/clothing/shoes/boots/winter/explorer - name = "away team winter boots" + name = "explorer winter boots" // YW EDIT desc = "Steel-toed winter boots for mining or exploration in hazardous environments. Very good at keeping toes warm and uncrushed." icon_state = "explorer" armor = list(melee = 30, bullet = 10, laser = 10, energy = 15, bomb = 20, bio = 0, rad = 0) diff --git a/code/modules/clothing/under/accessories/permits_vr.dm b/code/modules/clothing/under/accessories/permits_vr.dm index 425d3d2d21..b9648a4c25 100644 --- a/code/modules/clothing/under/accessories/permits_vr.dm +++ b/code/modules/clothing/under/accessories/permits_vr.dm @@ -2,5 +2,5 @@ desc = "A card issued by the EIO, indicating that the owner is a Drone Intelligence. Drones are mandated to carry this card within SolGov space, by law." //YW EDIT: SolGov /obj/item/clothing/accessory/permit/gun/planetside - name = "away team gun permit" - desc = "A card indicating that the owner is allowed to carry a firearm during active missions." + name = "explorer gun permit" // YW EDIT + desc = "A card indicating that the owner is allowed to carry a firearm during active exploration missions." // YW EDIT diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 60b8f57e5a..9b72990550 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -1114,7 +1114,7 @@ /obj/item/clothing/under/explorer desc = "A green uniform for operating in hazardous environments." - name = "away team's jumpsuit" + name = "explorer's jumpsuit" // YW EDIT icon_state = "explorer" /obj/item/clothing/under/explorer/armored diff --git a/code/modules/mining/ore_redemption_machine/survey_vendor.dm b/code/modules/mining/ore_redemption_machine/survey_vendor.dm index 29249cf9aa..2966b29ac0 100644 --- a/code/modules/mining/ore_redemption_machine/survey_vendor.dm +++ b/code/modules/mining/ore_redemption_machine/survey_vendor.dm @@ -54,7 +54,7 @@ EQUIPMENT("Defense Equipment - Plasteel Machete", /obj/item/weapon/material/knife/machete, 50), EQUIPMENT("Defense Equipment - Razor Drone Deployer", /obj/item/weapon/grenade/spawnergrenade/manhacks/station/locked, 100), EQUIPMENT("Defense Equipment - Sentry Drone Deployer", /obj/item/weapon/grenade/spawnergrenade/ward, 150), -// EQUIPMENT("Defense Equipment - Frontier Carbine", /obj/item/weapon/gun/energy/locked/frontier/carbine, 750), //VOREStation removal + EQUIPMENT("Defense Equipment - Frontier Carbine", /obj/item/weapon/gun/energy/locked/frontier/carbine, 750), //YW EDIT Un-Comment EQUIPMENT("Hybrid Equipment - Proto-Kinetic Dagger", /obj/item/weapon/kinetic_crusher/machete/dagger, 75), EQUIPMENT("Hybrid Equipment - Proto-Kinetic Machete", /obj/item/weapon/kinetic_crusher/machete, 250), EQUIPMENT("Fishing Net", /obj/item/weapon/material/fishing_net, 50),