Skip to content

Commit

Permalink
Engi/Con skill buffs, marine gloves insulated
Browse files Browse the repository at this point in the history
  • Loading branch information
morrowwolf committed Oct 11, 2023
1 parent cfc9e46 commit fb6e54a
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 9 deletions.
8 changes: 4 additions & 4 deletions code/__DEFINES/skills.dm
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

//spec_weapons skill
//hidden. who can and can't use specialist weapons
#define SKILL_SPEC_DEFAULT 0
#define SKILL_SPEC_DEFAULT 7
/// Is trained to use specialist gear, but hasn't picked a kit.
#define SKILL_SPEC_TRAINED 1
/// Can use RPG
Expand All @@ -60,14 +60,14 @@
#define SKILL_SPEC_ALL 9

//construction skill
#define SKILL_CONSTRUCTION_DEFAULT 0
#define SKILL_CONSTRUCTION_DEFAULT 2
#define SKILL_CONSTRUCTION_TRAINED 1 //metal barricade construction (CT, mini-engis)
#define SKILL_CONSTRUCTION_ENGI 2 //plasteel barricade, windows and girder construction, building machine&computer frames, (Combat Engi, OT, etc.)
#define SKILL_CONSTRUCTION_MASTER 3 //Synths
#define SKILL_CONSTRUCTION_MAX 3

// engineer skill
#define SKILL_ENGINEER_DEFAULT 0
#define SKILL_ENGINEER_DEFAULT 2
#define SKILL_ENGINEER_TRAINED 1 //barricade repair && c4 use (mini-engis, specs)
#define SKILL_ENGINEER_ENGI 2 //plasteel barricade deconstruction, hacking&&planet engine fixing&&apc building, Telecomms fixing (Combat Engi, OT, etc.)
#define SKILL_ENGINEER_MASTER 3 //Synths
Expand Down Expand Up @@ -166,7 +166,7 @@


//pilot skill, hidden
#define SKILL_PILOT_DEFAULT 0
#define SKILL_PILOT_DEFAULT 1
#define SKILL_PILOT_TRAINED 1 // DCC
#define SKILL_PILOT_EXPERT 2 // Pilot, Synth
#define SKILL_PILOT_MAX 2
Expand Down
5 changes: 2 additions & 3 deletions code/datums/skills.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1050,9 +1050,8 @@ United States Colonial Marines
/datum/skills/tl
name = "Fireteam Leader"
skills = list(
SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
SKILL_JTAC = SKILL_JTAC_EXPERT,
SKILL_LEADERSHIP = SKILL_LEAD_TRAINED,
)

/datum/skills/SL
Expand All @@ -1062,7 +1061,7 @@ United States Colonial Marines
SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
SKILL_LEADERSHIP = SKILL_LEAD_TRAINED,
SKILL_LEADERSHIP = SKILL_LEAD_EXPERT,
SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
Expand Down
3 changes: 1 addition & 2 deletions code/modules/clothing/gloves/marine_gloves.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
desc = "Standard issue marine tactical gloves. It reads: 'knit by Marine Widows Association'."
icon_state = "black"
item_state = "black"
siemens_coefficient = 0.6
siemens_coefficient = 0
permeability_coefficient = 0.05
flags_cold_protection = BODY_FLAG_HANDS
flags_heat_protection = BODY_FLAG_HANDS
Expand Down Expand Up @@ -40,7 +40,6 @@
desc = "These gloves will protect the wearer from electric shock."
icon_state = "lightbrown"
item_state = "lightbrowngloves"
siemens_coefficient = 0

/obj/item/clothing/gloves/marine/black
name = "marine black combat gloves"
Expand Down

0 comments on commit fb6e54a

Please sign in to comment.