Skip to content

Commit

Permalink
Removes crafty pvts, redundant health hud. (#200)
Browse files Browse the repository at this point in the history
Makes given our skill defaults.
  • Loading branch information
private-tristan committed Mar 31, 2024
1 parent 0e57e89 commit bb277f8
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 23 deletions.
14 changes: 0 additions & 14 deletions code/datums/skills/uscm.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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(
Expand Down
6 changes: 1 addition & 5 deletions code/modules/gear_presets/cmb.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/gear_presets/dust_raider.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions code/modules/gear_presets/fun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/gear_presets/uscm.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down

0 comments on commit bb277f8

Please sign in to comment.