Skip to content

Commit

Permalink
PMC/Goon/CLF access sets.
Browse files Browse the repository at this point in the history 
Also removes duplicate access code, and a duplicate entry for CLF commander.
  • Loading branch information
@realforest2001
realforest2001 committed Aug 11, 2023
1 parent e77998b commit 29896c3
Show file tree
Hide file tree
Showing 7 changed files with 57 additions and 181 deletions.
2 changes: 2 additions & 0 deletions code/__DEFINES/access.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,5 +194,7 @@ most of them are tied into map-placed objects. This should be reworked in the fu
///All access levels associated with UPP
#define ACCESS_LIST_UPP_ALL "UPP (ALL)"

///Generic/basic access to CLF stuff
#define ACCESS_LIST_CLF_BASE "CLF (Basic)"
///All access levels associated with CLF
#define ACCESS_LIST_CLF_ALL "CLF (ALL)"
14 changes: 10 additions & 4 deletions code/game/jobs/access.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,23 +247,29 @@
ACCESS_WY_MEDICAL,
ACCESS_WY_SECURITY,
ACCESS_WY_RESEARCH,
ACCESS_WY_ARMORY,
) + get_access(ACCESS_LIST_COLONIAL_ALL) + get_access(ACCESS_LIST_EMERGENCY_RESPONSE)

if(ACCESS_LIST_WY_PMC)
return list(
ACCESS_WY_ARMORY,
ACCESS_WY_PMC,
ACCESS_WY_ENGINEERING,
ACCESS_WY_FLIGHT,
) + get_access(ACCESS_LIST_WY_GOON)

if(ACCESS_LIST_CLF_ALL)
return list(
ACCESS_CLF_GENERAL,
ACCESS_CLF_MEDICAL,
ACCESS_CLF_ENGINEERING,
ACCESS_CLF_SECURITY,
ACCESS_CLF_ARMORY,
ACCESS_CLF_LEADERSHIP,
ACCESS_CLF_SENIOR_LEAD,
) + get_access(ACCESS_LIST_CLF_BASE)

if(ACCESS_LIST_CLF_BASE)
return list(
ACCESS_CLF_GENERAL,
ACCESS_CLF_MEDICAL,
ACCESS_CLF_ENGINEERING,
) + get_access(ACCESS_LIST_COLONIAL_ALL) + get_access(ACCESS_LIST_EMERGENCY_RESPONSE)

if(ACCESS_LIST_UPP_ALL)
Expand Down
174 changes: 32 additions & 142 deletions code/modules/gear_presets/clf.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

/datum/equipment_preset/clf/New()
. = ..()
access = get_access(ACCESS_LIST_CLF_ALL) //ACCESS_COME_BACK_TO_ME
access = get_access(ACCESS_LIST_CLF_BASE)

/datum/equipment_preset/clf/load_name(mob/living/carbon/human/new_human, randomise)
new_human.gender = pick(60;MALE, 40;FEMALE)
Expand Down Expand Up @@ -439,6 +439,10 @@
role_comm_title = "SPC"
skills = /datum/skills/clf/specialist

/datum/equipment_preset/clf/specialist/New()
. = ..()
access = get_access(ACCESS_LIST_CLF_BASE) + list(ACCESS_CLF_ARMORY)

/datum/equipment_preset/clf/specialist/load_gear(mob/living/carbon/human/new_human)

//jumpsuit and their webbing
Expand Down Expand Up @@ -550,131 +554,6 @@

//*****************************************************************************************************/

/datum/equipment_preset/clf/commander
name = "CLF Cell Commander"
flags = EQUIPMENT_PRESET_EXTRA
assignment = JOB_CLF_COMMANDER
rank = JOB_CLF_COMMANDER
role_comm_title = "CMDR"
skills = /datum/skills/clf/commander

/datum/equipment_preset/clf/commander/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/mercenary/miner(new_human), WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CLF/command(new_human), WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/clf(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/militia/smartgun(new_human), WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/mateba/highimpact(new_human), WEAR_IN_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/mateba/highimpact(new_human), WEAR_IN_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun/clf(new_human), WEAR_J_STORE)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/smartgunner/clf/full(new_human), WEAR_WAIST)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp(new_human), WEAR_FEET)

new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/full(new_human), WEAR_L_STORE)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(new_human), WEAR_R_STORE)

/datum/equipment_preset/clf/commander/get_antag_clothing_equipment()
return list(
list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null),
list("Combat Boots", 0, /obj/item/clothing/shoes/combat, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY),
list("CLF Uniform", 0, /obj/item/clothing/under/colonist/clf, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
list("CLF Smartgun Armor", 0, /obj/item/clothing/suit/storage/militia/smartgun, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY),
list("Black Gloves", 0, /obj/item/clothing/gloves/black, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY),
list("CLF Smartgunner Belt", 0, /obj/item/storage/belt/gun/smartgunner/clf, MARINE_CAN_BUY_BELT, VENDOR_ITEM_MANDATORY),
list("Headset", 0, /obj/item/device/radio/headset/distress/CLF/command, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY),
list("Flashlight", 0, /obj/item/device/flashlight, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY),
list("Combat Pack", 0, /obj/item/storage/backpack/lightpack, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY),

list("HELMET (CHOOSE 1)", 0, null, null, null),
list("Y8 Miner Helmet", 0, /obj/item/clothing/head/helmet/marine/veteran/mercenary/miner, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR),

list("POUCHES (CHOOSE 2)", 0, null, null, null),
list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, 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_REGULAR),
list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED),
list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED),
list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),

list("ATTACHMENTS (CHOOSE 1)", 0, null, null, null),
list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR),
list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR),
list("Gyroscopic Stabilizer", 0, /obj/item/attachable/gyro, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR),
list("Laser Sight", 0, /obj/item/attachable/lasersight, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR),
list("Masterkey Shotgun", 0, /obj/item/attachable/attached_gun/shotgun, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR),
list("Recoil Compensator", 0, /obj/item/attachable/compensator, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR),
list("Red-Dot Sight", 0, /obj/item/attachable/reddot, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR),
list("Reflex Sight", 0, /obj/item/attachable/reflex, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR),
list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR),
list("Vertical Grip", 0, /obj/item/attachable/verticalgrip, MARINE_CAN_BUY_ATTACHMENT, 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)
)

/datum/equipment_preset/clf/commander/get_antag_gear_equipment()
return list(
list("CELL LEADER SET (MANDATORY)", 0, null, null, null),
list("Essential Leader Set", 0, /obj/effect/essentials_set/leader/upp, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY),

list("GENERAL SUPPLIES", 0, null, null, null),
list("Megaphone", 5, /obj/item/device/megaphone, null, VENDOR_ITEM_REGULAR),
list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR),

list("ENGINEERING SUPPLIES", 0, null, null, null),
list("Entrenching Tool", 2, /obj/item/tool/shovel/etool, null, VENDOR_ITEM_REGULAR),
list("Insulated Gloves", 3, /obj/item/clothing/gloves/yellow, null, VENDOR_ITEM_REGULAR),
list("Metal x10", 5, /obj/item/stack/sheet/metal/small_stack, null, VENDOR_ITEM_RECOMMENDED),
list("Plasteel x10", 7, /obj/item/stack/sheet/plasteel/small_stack, null, VENDOR_ITEM_RECOMMENDED),
list("Sandbags x25", 10, /obj/item/stack/sandbags_empty/half, null, VENDOR_ITEM_RECOMMENDED),
list("Tools Pouch (Full)", 5, /obj/item/storage/pouch/tools/full, null, VENDOR_ITEM_REGULAR),
list("Welding Goggles", 5, /obj/item/clothing/glasses/welding, null, VENDOR_ITEM_REGULAR),

list("MEDICAL SUPPLIES", 0, null, null, null),
list("Adv Burn Kit", 2, /obj/item/stack/medical/advanced/ointment, null, VENDOR_ITEM_REGULAR),
list("Adv Trauma Kit", 2, /obj/item/stack/medical/advanced/bruise_pack, null, VENDOR_ITEM_REGULAR),
list("Advanced Firstaid Kit", 12, /obj/item/storage/firstaid/adv, null, VENDOR_ITEM_REGULAR),
list("Medical Splints", 1, /obj/item/stack/medical/splint, null, VENDOR_ITEM_REGULAR),

list("Injector (Bicaridine)", 1, /obj/item/reagent_container/hypospray/autoinjector/bicaridine, null, VENDOR_ITEM_REGULAR),
list("Injector (Dexalin+)", 1, /obj/item/reagent_container/hypospray/autoinjector/dexalinp, null, VENDOR_ITEM_REGULAR),
list("Injector (Inaprovaline)", 1, /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, null, VENDOR_ITEM_REGULAR),
list("Injector (Kelotane)", 1, /obj/item/reagent_container/hypospray/autoinjector/kelotane, null, VENDOR_ITEM_REGULAR),
list("Injector (Oxycodone)", 2, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR),
list("Injector (Tramadol)", 1, /obj/item/reagent_container/hypospray/autoinjector/tramadol, null, VENDOR_ITEM_REGULAR),
list("Injector (Tricord)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR),

list("Health Analyzer", 4, /obj/item/device/healthanalyzer, null, VENDOR_ITEM_REGULAR),
list("Sensor Medical HUD", 4, /obj/item/clothing/glasses/hud/sensor, null, VENDOR_ITEM_MANDATORY),

list("SPECIAL AMMUNITION", 0, null, null, null),
list("M16 AP Magazine (5.56x45mm)", 10, /obj/item/ammo_magazine/rifle/m16/ap, null, VENDOR_ITEM_REGULAR),
list("MAR Extended Magazine (7.62x39mm)", 10, /obj/item/ammo_magazine/rifle/mar40/extended, null, VENDOR_ITEM_REGULAR),
list("Shotgun Incendiary Shells (Handful)", 15, /obj/item/ammo_magazine/handful/shotgun/incendiary, null, VENDOR_ITEM_REGULAR),

list("EXPLOSIVES", 0, null, null, null),
list("EMP Grenade", 10, /obj/item/explosive/grenade/empgrenade, null, VENDOR_ITEM_REGULAR),
list("Improvised Explosive Device", 15, /obj/item/explosive/grenade/custom/ied, null, VENDOR_ITEM_REGULAR),
list("Improvised Firebomb", 10, /obj/item/explosive/grenade/incendiary/molotov, null, VENDOR_ITEM_REGULAR),
list("Incendiary IED", 15, /obj/item/explosive/grenade/custom/ied_incendiary, null, VENDOR_ITEM_REGULAR),
list("Improvised Phosphorus Bomb", 20, /obj/item/explosive/grenade/phosphorus/clf, null, VENDOR_ITEM_REGULAR),
list("Smoke Grenade", 5, /obj/item/explosive/grenade/smokebomb, null, VENDOR_ITEM_REGULAR),

list("UTILITIES", 0, null, null, null),
list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR),
list("Large General Pouch", 10, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR),
list("Random Useful (Or Not) Item", 5, /obj/effect/essentials_set/random/clf_bonus_item, null, VENDOR_ITEM_REGULAR),
list("Shoulder Holster", 10, /obj/item/clothing/accessory/storage/holster, null, VENDOR_ITEM_REGULAR),
list("Webbing", 10, /obj/item/clothing/accessory/storage/webbing, null, VENDOR_ITEM_REGULAR)
)

//*****************************************************************************************************/

/datum/equipment_preset/clf/leader
name = "CLF Leader"
flags = EQUIPMENT_PRESET_EXTRA
Expand All @@ -683,6 +562,10 @@
role_comm_title = "LDR"
skills = /datum/skills/clf/leader

/datum/equipment_preset/clf/leader/New()
. = ..()
access = get_access(ACCESS_LIST_CLF_BASE) + list(ACCESS_CLF_ARMORY, ACCESS_CLF_LEADERSHIP, ACCESS_CLF_FLIGHT)

/datum/equipment_preset/clf/leader/load_gear(mob/living/carbon/human/new_human)

//No random armor, so that it's more clear that he's the leader
Expand Down Expand Up @@ -828,6 +711,9 @@
rank = JOB_CLF_SYNTH
role_comm_title = "Syn"

/datum/equipment_preset/clf/synth/New()
. = ..()
access = get_access(ACCESS_LIST_CLF_ALL)

/datum/equipment_preset/clf/synth/load_name(mob/living/carbon/human/new_human, randomise)
new_human.gender = pick(50;MALE,50;FEMALE)
Expand Down Expand Up @@ -1014,20 +900,24 @@
role_comm_title = "CMDR"
skills = /datum/skills/clf/commander

/datum/equipment_preset/clf/commander/load_gear(mob/living/carbon/human/H)
H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/mercenary/miner(H), WEAR_HEAD)
H.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CLF/command(H), WEAR_L_EAR)
H.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/clf(H), WEAR_BODY)
H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/militia/smartgun(H), WEAR_JACKET)
H.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/mateba/highimpact(H), WEAR_IN_JACKET)
H.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/mateba/highimpact(H), WEAR_IN_JACKET)
H.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun/clf(H), WEAR_J_STORE)
H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), WEAR_HANDS)
H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/smartgunner/clf/full(H), WEAR_WAIST)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp(H), WEAR_FEET)

H.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/full(H), WEAR_L_STORE)
H.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(H), WEAR_R_STORE)
/datum/equipment_preset/clf/commander/New()
. = ..()
access = get_access(ACCESS_LIST_CLF_ALL)

/datum/equipment_preset/clf/commander/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/mercenary/miner(new_human), WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CLF/command(new_human), WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/clf(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/militia/smartgun(new_human), WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/mateba/highimpact(new_human), WEAR_IN_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/mateba/highimpact(new_human), WEAR_IN_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun/clf(new_human), WEAR_J_STORE)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/smartgunner/clf/full(new_human), WEAR_WAIST)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp(new_human), WEAR_FEET)

new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/full(new_human), WEAR_L_STORE)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(new_human), WEAR_R_STORE)

/datum/equipment_preset/clf/commander/get_antag_clothing_equipment()
return list(
Expand Down Expand Up @@ -1092,8 +982,8 @@
list("Welding Goggles", 5, /obj/item/clothing/glasses/welding, null, VENDOR_ITEM_REGULAR),

list("MEDICAL SUPPLIES", 0, null, null, null),
list("Burn Kit", 2, /obj/item/stack/medical/advanced/ointment, null, VENDOR_ITEM_REGULAR),
list("Trauma Kit", 2, /obj/item/stack/medical/advanced/bruise_pack, null, VENDOR_ITEM_REGULAR),
list("Adv Burn Kit", 2, /obj/item/stack/medical/advanced/ointment, null, VENDOR_ITEM_REGULAR),
list("Adv Trauma Kit", 2, /obj/item/stack/medical/advanced/bruise_pack, null, VENDOR_ITEM_REGULAR),
list("Advanced Firstaid Kit", 12, /obj/item/storage/firstaid/adv, null, VENDOR_ITEM_REGULAR),
list("Medical Splints", 1, /obj/item/stack/medical/splint, null, VENDOR_ITEM_REGULAR),

Expand Down
15 changes: 0 additions & 15 deletions code/modules/gear_presets/contractor.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -549,11 +549,6 @@
skills = /datum/skills/contractor/heavy
faction = FACTION_CONTRACTOR


/datum/equipment_preset/contractor/covert/heavy/New()
. = ..()
access = get_access(ACCESS_LIST_WY_PMC)

/datum/equipment_preset/contractor/covert/heavy/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/ua_civvies, WEAR_BODY)
Expand Down Expand Up @@ -602,11 +597,6 @@
skills = /datum/skills/contractor/engi
faction = FACTION_CONTRACTOR


/datum/equipment_preset/contractor/covert/engi/New()
. = ..()
access = get_access(ACCESS_LIST_WY_PMC)

/datum/equipment_preset/contractor/covert/engi/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/wy_davisone, WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/black_vest/tool_webbing, WEAR_ACCESSORY)
Expand Down Expand Up @@ -654,11 +644,6 @@
skills = /datum/skills/contractor/medic
faction = FACTION_CONTRACTOR


/datum/equipment_preset/contractor/covert/medic/New()
. = ..()
access = get_access(ACCESS_LIST_WY_PMC)

/datum/equipment_preset/contractor/covert/medic/load_gear(mob/living/carbon/human/new_human)
//clothing
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/wy_davisone, WEAR_BODY)
Expand Down
21 changes: 1 addition & 20 deletions code/modules/gear_presets/other.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@

/datum/equipment_preset/other/elite_merc/New()
. = ..()
access = get_access(ACCESS_LIST_EMERGENCY_RESPONSE) //ACCESS_COME_BACK_TO_ME
access = get_access(ACCESS_LIST_EMERGENCY_RESPONSE)

/datum/equipment_preset/other/elite_merc/load_name(mob/living/carbon/human/new_human, randomise)
new_human.gender = pick(70;MALE,30;FEMALE)
Expand Down Expand Up @@ -278,10 +278,6 @@
skills = /datum/skills/mercenary/elite
faction = FACTION_MERCENARY

/datum/equipment_preset/other/elite_merc/standard/New()
. = ..()
access = get_access(ACCESS_LIST_WY_PMC)

/datum/equipment_preset/other/elite_merc/standard/load_gear(mob/living/carbon/human/new_human)
//TODO: add unique backpacks and satchels
//clothes
Expand Down Expand Up @@ -319,10 +315,6 @@
skills = /datum/skills/mercenary/elite/heavy
faction = FACTION_MERCENARY

/datum/equipment_preset/other/elite_merc/heavy/New()
. = ..()
access = get_access(ACCESS_LIST_WY_PMC)

/datum/equipment_preset/other/elite_merc/heavy/load_gear(mob/living/carbon/human/new_human)
//TODO: add backpacks and satchels
//clothes
Expand Down Expand Up @@ -363,9 +355,6 @@
skills = /datum/skills/mercenary/elite/engineer
faction = FACTION_MERCENARY

/datum/equipment_preset/other/elite_merc/engineer/New()
. = ..()
access = get_access(ACCESS_LIST_WY_PMC)

/datum/equipment_preset/other/elite_merc/engineer/load_gear(mob/living/carbon/human/new_human)
//TODO: add backpacks and satchels
Expand Down Expand Up @@ -420,10 +409,6 @@
skills = /datum/skills/mercenary/elite/medic
faction = FACTION_MERCENARY

/datum/equipment_preset/other/elite_merc/medic/New()
. = ..()
access = get_access(ACCESS_LIST_WY_PMC)

/datum/equipment_preset/other/elite_merc/medic/load_gear(mob/living/carbon/human/new_human)
//webbing
var/obj/item/clothing/under/marine/veteran/mercenary/support/SUPPORT = new()
Expand Down Expand Up @@ -470,10 +455,6 @@
skills = /datum/skills/mercenary/elite/leader
faction = FACTION_MERCENARY

/datum/equipment_preset/other/elite_merc/leader/New()
. = ..()
access = get_access(ACCESS_LIST_WY_PMC)

/datum/equipment_preset/other/elite_merc/leader/load_gear(mob/living/carbon/human/new_human)
//clothes
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/dutch, WEAR_L_EAR)
Expand Down
Loading

0 comments on commit 29896c3

Please sign in to comment.