From fb6e54ab175f4345a9f5de3e6fbfdd7d49e55227 Mon Sep 17 00:00:00 2001 From: Morrow Date: Wed, 11 Oct 2023 04:43:07 -0400 Subject: [PATCH] Engi/Con skill buffs, marine gloves insulated --- code/__DEFINES/skills.dm | 8 ++++---- code/datums/skills.dm | 5 ++--- code/modules/clothing/gloves/marine_gloves.dm | 3 +-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/code/__DEFINES/skills.dm b/code/__DEFINES/skills.dm index 5dabb4545a..6e615d4b17 100644 --- a/code/__DEFINES/skills.dm +++ b/code/__DEFINES/skills.dm @@ -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 @@ -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 @@ -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 diff --git a/code/datums/skills.dm b/code/datums/skills.dm index 9178e6f7a1..9f81dc9737 100644 --- a/code/datums/skills.dm +++ b/code/datums/skills.dm @@ -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 @@ -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, diff --git a/code/modules/clothing/gloves/marine_gloves.dm b/code/modules/clothing/gloves/marine_gloves.dm index 15c596f9f6..ac6267970c 100644 --- a/code/modules/clothing/gloves/marine_gloves.dm +++ b/code/modules/clothing/gloves/marine_gloves.dm @@ -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 @@ -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"