diff --git a/code/datums/skills/uscm.dm b/code/datums/skills/uscm.dm index 2da19793e5..7e6658d9c1 100644 --- a/code/datums/skills/uscm.dm +++ b/code/datums/skills/uscm.dm @@ -8,13 +8,6 @@ United States Colonial Marines name = "Private" //same as default -/datum/skills/pfc/crafty - name = "Crafty Private" - skills = list( - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, - ) - /datum/skills/combat_medic name = "Combat Medic" skills = list( @@ -23,13 +16,6 @@ United States Colonial Marines SKILL_JTAC = SKILL_JTAC_BEGINNER, ) -/datum/skills/combat_medic/crafty - name = "Crafty Combat Medic" - skills = list( - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, - ) - /datum/skills/combat_engineer name = "Combat Engineer" skills = list( diff --git a/code/modules/gear_presets/cmb.dm b/code/modules/gear_presets/cmb.dm index 22bf31d42c..94672a1b9b 100644 --- a/code/modules/gear_presets/cmb.dm +++ b/code/modules/gear_presets/cmb.dm @@ -418,7 +418,7 @@ rank = JOB_SQUAD_MARINE paygrade = "ME2" role_comm_title = "A-RFN" - skills = /datum/skills/pfc/crafty + skills = /datum/skills/pfc faction = FACTION_MARSHAL faction_group = list(FACTION_MARSHAL, FACTION_MARINE) @@ -590,10 +590,6 @@ new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency, WEAR_IN_BELT) new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/autoinjector/emergency, WEAR_IN_BELT) new_human.equip_to_slot_or_del(new /obj/item/bodybag/cryobag, WEAR_IN_BELT) - if(new_human.disabilities & NEARSIGHTED) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription, WEAR_EYES) - else - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health, WEAR_EYES) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine, WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife, WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE, WEAR_IN_BACK) diff --git a/code/modules/gear_presets/dust_raider.dm b/code/modules/gear_presets/dust_raider.dm index 78fea23a77..37a69c7828 100644 --- a/code/modules/gear_presets/dust_raider.dm +++ b/code/modules/gear_presets/dust_raider.dm @@ -26,7 +26,7 @@ rank = JOB_SQUAD_MARINE paygrade = "ME2" role_comm_title = "RFN" - skills = /datum/skills/pfc/crafty + skills = /datum/skills/pfc /datum/equipment_preset/dust_raider/private/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels diff --git a/code/modules/gear_presets/fun.dm b/code/modules/gear_presets/fun.dm index 23350768a6..2e17dfe9ef 100644 --- a/code/modules/gear_presets/fun.dm +++ b/code/modules/gear_presets/fun.dm @@ -14,7 +14,7 @@ flags = EQUIPMENT_PRESET_EXTRA faction = FACTION_PIRATE - skills = /datum/skills/pfc/crafty + skills = /datum/skills/pfc /datum/equipment_preset/fun/pirate/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) @@ -417,7 +417,7 @@ uses_special_name = TRUE - skills = /datum/skills/pfc/crafty // about equivalent to a marine + skills = /datum/skills/pfc // about equivalent to a marine assignment = "Monkey" rank = "Monkey" diff --git a/code/modules/gear_presets/uscm.dm b/code/modules/gear_presets/uscm.dm index 1e64a30e17..e1a510ce8d 100644 --- a/code/modules/gear_presets/uscm.dm +++ b/code/modules/gear_presets/uscm.dm @@ -641,7 +641,7 @@ rank = JOB_SQUAD_MARINE paygrade = "ME2" role_comm_title = "RFN" - skills = /datum/skills/pfc/crafty + skills = /datum/skills/pfc minimap_icon = "private"