diff --git a/code/__DEFINES/skills.dm b/code/__DEFINES/skills.dm index d33e26c1c3f6..e4965907f707 100644 --- a/code/__DEFINES/skills.dm +++ b/code/__DEFINES/skills.dm @@ -70,10 +70,11 @@ // engineer skill #define SKILL_ENGINEER_DEFAULT 0 -#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 -#define SKILL_ENGINEER_MAX 3 +#define SKILL_ENGINEER_NOVICE 1 //barricade repair && c4 use (mini-engis, specs) +#define SKILL_ENGINEER_TRAINED 2 //plasteel barricade deconstruction, hacking&&planet engine fixing&&apc building, Telecomms fixing (OT, etc.) +#define SKILL_ENGINEER_ENGI 3 // Slightly faster at everything (Combat Technicians) +#define SKILL_ENGINEER_MASTER 4 //Synths +#define SKILL_ENGINEER_MAX 4 //medical skill #define SKILL_MEDICAL_DEFAULT 0 diff --git a/code/datums/skills/civilian.dm b/code/datums/skills/civilian.dm index 0ff13ae67225..ff9cadf02913 100644 --- a/code/datums/skills/civilian.dm +++ b/code/datums/skills/civilian.dm @@ -20,7 +20,7 @@ CIVILIAN SKILL_LEADERSHIP = SKILL_LEAD_MASTER, SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_NOVICE, SKILL_VEHICLE = SKILL_VEHICLE_SMALL, SKILL_INTEL = SKILL_INTEL_EXPERT, ) @@ -31,7 +31,7 @@ CIVILIAN SKILL_CQC = SKILL_CQC_DEFAULT, SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, //The ASRS consoles + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, //The ASRS consoles SKILL_FIREARMS = SKILL_FIREARMS_CIVILIAN, SKILL_POLICE = SKILL_POLICE_SKILLED, //The CMB Tradeband Compliance Device ) @@ -43,7 +43,7 @@ CIVILIAN SKILL_LEADERSHIP = SKILL_LEAD_MASTER, SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_NOVICE, SKILL_VEHICLE = SKILL_VEHICLE_SMALL, SKILL_POLICE = SKILL_POLICE_SKILLED, SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, @@ -115,7 +115,7 @@ CIVILIAN SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, SKILL_VEHICLE = SKILL_VEHICLE_SMALL, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, ) @@ -131,7 +131,7 @@ CIVILIAN /datum/skills/civilian/survivor/clf name = "Survivor CLF" additional_skills = list( - SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_NOVICE, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, SKILL_VEHICLE = SKILL_VEHICLE_SMALL, SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, @@ -158,7 +158,7 @@ CIVILIAN name = "Survivor Miner" additional_skills = list( SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_NOVICE, SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, SKILL_VEHICLE = SKILL_VEHICLE_SMALL, ) @@ -167,7 +167,7 @@ CIVILIAN name = "Survivor Trucker" additional_skills = list( SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_VEHICLE = SKILL_VEHICLE_CREWMAN, ) @@ -176,7 +176,7 @@ CIVILIAN name = "Survivor Engineer" additional_skills = list( SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, SKILL_VEHICLE = SKILL_VEHICLE_SMALL, @@ -192,7 +192,7 @@ CIVILIAN /datum/skills/civilian/survivor/marshal name = "Survivor Marshal" skills = list( - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, @@ -201,7 +201,7 @@ CIVILIAN SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, SKILL_POLICE = SKILL_POLICE_SKILLED, SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_NOVICE, SKILL_CQC = SKILL_CQC_SKILLED, SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, ) diff --git a/code/datums/skills/clf.dm b/code/datums/skills/clf.dm index 88aa14a41f79..64a8864d3c51 100644 --- a/code/datums/skills/clf.dm +++ b/code/datums/skills/clf.dm @@ -12,7 +12,7 @@ COLONIAL LIBERATION FRONT SKILL_POLICE = SKILL_POLICE_SKILLED, SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_NOVICE, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, SKILL_VEHICLE = SKILL_VEHICLE_SMALL, SKILL_ENDURANCE = SKILL_ENDURANCE_WEAK, @@ -24,7 +24,7 @@ COLONIAL LIBERATION FRONT skills = list( SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, SKILL_POWERLOADER = SKILL_POWERLOADER_TRAINED, SKILL_VEHICLE = SKILL_VEHICLE_SMALL, @@ -48,7 +48,7 @@ COLONIAL LIBERATION FRONT skills = list( SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, //to use c4 in demo set. + SKILL_ENGINEER = SKILL_ENGINEER_NOVICE, //to use c4 in demo set. SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, @@ -60,7 +60,7 @@ COLONIAL LIBERATION FRONT name = "CLF Leader" skills = list( SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, // to use their C4 + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, // to use their C4 SKILL_CQC = SKILL_CQC_SKILLED, SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, @@ -78,7 +78,7 @@ COLONIAL LIBERATION FRONT name = "CLF Cell Commander" skills = list( SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_CQC = SKILL_CQC_SKILLED, SKILL_LEADERSHIP = SKILL_LEAD_MASTER, SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, diff --git a/code/datums/skills/cmb.dm b/code/datums/skills/cmb.dm index b29a4c314567..8fa7ca4dd892 100644 --- a/code/datums/skills/cmb.dm +++ b/code/datums/skills/cmb.dm @@ -26,7 +26,7 @@ COLONIAL MARSHALS SKILL_LEADERSHIP = SKILL_LEAD_MASTER, SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_FIREMAN = SKILL_FIREMAN_MASTER, SKILL_FIREARMS = SKILL_FIREARMS_MAX, SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, diff --git a/code/datums/skills/commando.dm b/code/datums/skills/commando.dm index ed5e5ee086e4..5133cb0e55ea 100644 --- a/code/datums/skills/commando.dm +++ b/code/datums/skills/commando.dm @@ -9,7 +9,7 @@ SPEC-OPS skills = list( SKILL_CQC = SKILL_CQC_EXPERT, SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, @@ -24,7 +24,7 @@ SPEC-OPS skills = list( SKILL_CQC = SKILL_CQC_EXPERT, SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, @@ -40,7 +40,7 @@ SPEC-OPS skills = list( SKILL_CQC = SKILL_CQC_EXPERT, SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, @@ -56,7 +56,7 @@ SPEC-OPS skills = list( SKILL_CQC = SKILL_CQC_MASTER, SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, @@ -71,7 +71,7 @@ SPEC-OPS skills = list( SKILL_CQC = SKILL_CQC_MASTER, SKILL_FIREMAN = SKILL_FIREMAN_MASTER, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, @@ -87,7 +87,7 @@ SPEC-OPS skills = list( SKILL_CQC = SKILL_CQC_MASTER, SKILL_FIREMAN = SKILL_FIREMAN_MASTER, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, @@ -105,7 +105,7 @@ SPEC-OPS SKILL_CQC = SKILL_CQC_TRAINED, SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, diff --git a/code/datums/skills/contractor.dm b/code/datums/skills/contractor.dm index 183e95c941f5..5e079e5664d4 100644 --- a/code/datums/skills/contractor.dm +++ b/code/datums/skills/contractor.dm @@ -7,7 +7,7 @@ CONTRACTORS name = "Contractor Standard" skills = list( SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_NOVICE, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, SKILL_FIREARMS = SKILL_FIREARMS_MAX, SKILL_POLICE = SKILL_POLICE_SKILLED, @@ -22,7 +22,7 @@ CONTRACTORS /datum/skills/contractor/leader name = "Contractor Leader" skills = list( - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_FIREARMS = SKILL_FIREARMS_MAX, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_LEADERSHIP = SKILL_LEAD_MASTER, @@ -45,7 +45,7 @@ CONTRACTORS SKILL_POLICE = SKILL_POLICE_SKILLED, SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_NOVICE, SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, SKILL_SURGERY = SKILL_SURGERY_TRAINED, SKILL_VEHICLE = SKILL_VEHICLE_LARGE, @@ -76,7 +76,7 @@ CONTRACTORS name = "Contractor Machinegunner" skills = list( SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_NOVICE, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, SKILL_FIREARMS = SKILL_FIREARMS_MAX, SKILL_POLICE = SKILL_POLICE_SKILLED, diff --git a/code/datums/skills/dutch.dm b/code/datums/skills/dutch.dm index 4f19233e66d0..ec550f8e2bdf 100644 --- a/code/datums/skills/dutch.dm +++ b/code/datums/skills/dutch.dm @@ -4,7 +4,7 @@ SKILL_CQC = SKILL_CQC_MASTER, SKILL_FIREMAN = SKILL_FIREMAN_MAX, SKILL_MELEE_WEAPONS = SKILL_MELEE_MAX, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, SKILL_LEADERSHIP = SKILL_LEAD_MASTER, @@ -20,7 +20,7 @@ name = "Dutch's Dozen Mercenary" skills = list( SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, @@ -35,7 +35,7 @@ name = "Dutch's Dozen Medic" skills = list( SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, diff --git a/code/datums/skills/forecon.dm b/code/datums/skills/forecon.dm index 724a49ee98ca..aef187ce05dd 100644 --- a/code/datums/skills/forecon.dm +++ b/code/datums/skills/forecon.dm @@ -8,7 +8,7 @@ MILITARY SURVIVORS /datum/skills/military/survivor/forecon_standard name = "Reconnaissance Rifleman" skills = list( - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_DEFAULT, SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, SKILL_CQC = SKILL_CQC_TRAINED, @@ -24,7 +24,7 @@ MILITARY SURVIVORS /datum/skills/military/survivor/forecon_techician name = "Reconnaissance Support Technician" skills = list( - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, SKILL_CQC = SKILL_CQC_TRAINED, @@ -41,7 +41,7 @@ MILITARY SURVIVORS /datum/skills/military/survivor/forecon_marksman name = "Reconnaissance Designated Marksman" skills = list( - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_DEFAULT, SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, SKILL_CQC = SKILL_CQC_TRAINED, @@ -58,7 +58,7 @@ MILITARY SURVIVORS /datum/skills/military/survivor/forecon_smartgunner name = "Reconnaissance Smartgunner" skills = list( - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_DEFAULT, SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, SKILL_CQC = SKILL_CQC_TRAINED, @@ -75,7 +75,7 @@ MILITARY SURVIVORS /datum/skills/military/survivor/forecon_sniper name = "Reconnaissance Sniper" skills = list( - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_DEFAULT, SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, SKILL_CQC = SKILL_CQC_TRAINED, @@ -92,7 +92,7 @@ MILITARY SURVIVORS /datum/skills/military/survivor/forecon_squad_leader name = "Reconnaissance Squad Leader" skills = list( - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_DEFAULT, SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, SKILL_CQC = SKILL_CQC_SKILLED, diff --git a/code/datums/skills/freelancer.dm b/code/datums/skills/freelancer.dm index 09df9f32369c..cf7baa15532b 100644 --- a/code/datums/skills/freelancer.dm +++ b/code/datums/skills/freelancer.dm @@ -11,7 +11,7 @@ FREELANCERS skills = list( SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, ) @@ -20,7 +20,7 @@ FREELANCERS skills = list( SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, SKILL_SURGERY = SKILL_SURGERY_TRAINED, @@ -31,7 +31,7 @@ FREELANCERS skills = list( SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, SKILL_CQC = SKILL_CQC_TRAINED, diff --git a/code/datums/skills/mercenary.dm b/code/datums/skills/mercenary.dm index 1dc18eaa2fbc..35a6378f51a4 100644 --- a/code/datums/skills/mercenary.dm +++ b/code/datums/skills/mercenary.dm @@ -3,7 +3,7 @@ skills = list( SKILL_CQC = SKILL_CQC_SKILLED, SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, @@ -16,7 +16,7 @@ skills = list( SKILL_CQC = SKILL_CQC_SKILLED, SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_FIREARMS = SKILL_FIREARMS_MAX, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, @@ -31,7 +31,7 @@ skills = list( SKILL_CQC = SKILL_CQC_SKILLED, SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_FIREARMS = SKILL_FIREARMS_MAX, SKILL_MEDICAL = SKILL_MEDICAL_MASTER, @@ -62,7 +62,7 @@ skills = list( SKILL_CQC = SKILL_CQC_SKILLED, SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_FIREARMS = SKILL_FIREARMS_MAX, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, @@ -78,7 +78,7 @@ skills = list( SKILL_CQC = SKILL_CQC_SKILLED, SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_FIREARMS = SKILL_FIREARMS_MAX, SKILL_LEADERSHIP = SKILL_LEAD_MASTER, diff --git a/code/datums/skills/misc.dm b/code/datums/skills/misc.dm index 0f0ca657f995..204890685b91 100644 --- a/code/datums/skills/misc.dm +++ b/code/datums/skills/misc.dm @@ -11,7 +11,7 @@ MISCELLANEOUS SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, SKILL_JTAC = SKILL_JTAC_EXPERT, @@ -23,7 +23,7 @@ MISCELLANEOUS SKILL_CQC = SKILL_CQC_MASTER, SKILL_MELEE_WEAPONS = SKILL_MELEE_SUPER, SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, SKILL_SURGERY = SKILL_SURGERY_EXPERT, @@ -52,7 +52,7 @@ MISCELLANEOUS name = "Souto Man" skills = list( SKILL_CQC = SKILL_CQC_MASTER, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, diff --git a/code/datums/skills/pmc.dm b/code/datums/skills/pmc.dm index df7027e2a7ab..1860157c0a54 100644 --- a/code/datums/skills/pmc.dm +++ b/code/datums/skills/pmc.dm @@ -14,7 +14,7 @@ Private Military Contractors SKILL_POLICE = SKILL_POLICE_SKILLED, SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, ) @@ -26,7 +26,7 @@ Private Military Contractors SKILL_POLICE = SKILL_POLICE_SKILLED, SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, SKILL_SURGERY = SKILL_SURGERY_NOVICE, SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, @@ -40,7 +40,7 @@ Private Military Contractors SKILL_POLICE = SKILL_POLICE_SKILLED, SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, SKILL_RESEARCH = SKILL_RESEARCH_TRAINED, @@ -54,7 +54,7 @@ Private Military Contractors SKILL_POLICE = SKILL_POLICE_SKILLED, SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_SPEC_WEAPONS = SKILL_SPEC_SMARTGUN, SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, SKILL_JTAC = SKILL_JTAC_BEGINNER, @@ -68,7 +68,7 @@ Private Military Contractors SKILL_POLICE = SKILL_POLICE_SKILLED, SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_CQC = SKILL_CQC_TRAINED, SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, @@ -83,7 +83,7 @@ Private Military Contractors SKILL_POLICE = SKILL_POLICE_SKILLED, SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_CQC = SKILL_CQC_SKILLED, SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, @@ -99,7 +99,7 @@ Private Military Contractors SKILL_POLICE = SKILL_POLICE_SKILLED, SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_CQC = SKILL_CQC_SKILLED, SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, @@ -116,7 +116,7 @@ Private Military Contractors SKILL_POLICE = SKILL_POLICE_SKILLED, SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, SKILL_JTAC = SKILL_JTAC_TRAINED, @@ -131,7 +131,7 @@ Private Military Contractors SKILL_POLICE = SKILL_POLICE_SKILLED, SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_NOVICE, SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, SKILL_SURGERY = SKILL_SURGERY_EXPERT, SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, //trained in medicine more than combat @@ -160,7 +160,7 @@ Private Military Contractors SKILL_POLICE = SKILL_POLICE_SKILLED, SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, SKILL_CQC = SKILL_CQC_TRAINED, SKILL_LEADERSHIP = SKILL_LEAD_MASTER, diff --git a/code/datums/skills/rmc.dm b/code/datums/skills/rmc.dm index 89aa39b154ad..4385253e9a28 100644 --- a/code/datums/skills/rmc.dm +++ b/code/datums/skills/rmc.dm @@ -14,7 +14,7 @@ Royal Marines Commando SKILL_POLICE = SKILL_POLICE_SKILLED, SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, SKILL_SURGERY = SKILL_SURGERY_NOVICE, @@ -28,7 +28,7 @@ Royal Marines Commando SKILL_POLICE = SKILL_POLICE_SKILLED, SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, SKILL_SURGERY = SKILL_SURGERY_NOVICE, @@ -44,7 +44,7 @@ Royal Marines Commando SKILL_POLICE = SKILL_POLICE_SKILLED, SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, SKILL_SURGERY = SKILL_SURGERY_NOVICE, @@ -61,7 +61,7 @@ Royal Marines Commando SKILL_POLICE = SKILL_POLICE_SKILLED, SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, SKILL_SURGERY = SKILL_SURGERY_NOVICE, diff --git a/code/datums/skills/synthetic.dm b/code/datums/skills/synthetic.dm index 3925dd9605b3..c4d7296dee5d 100644 --- a/code/datums/skills/synthetic.dm +++ b/code/datums/skills/synthetic.dm @@ -33,7 +33,7 @@ SYNTHETIC name = SYNTH_COLONY skills = list( SKILL_CQC = SKILL_CQC_EXPERT, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, diff --git a/code/datums/skills/upp.dm b/code/datums/skills/upp.dm index e367372719d6..8ada7ccad124 100644 --- a/code/datums/skills/upp.dm +++ b/code/datums/skills/upp.dm @@ -10,7 +10,7 @@ UNITED PROGRESSIVE PEOPLES name = "UPP Private" skills = list( SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_NOVICE, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, SKILL_CQC = SKILL_CQC_DEFAULT, @@ -22,7 +22,7 @@ UNITED PROGRESSIVE PEOPLES name = "UPP Sapper" skills = list( SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, SKILL_CQC = SKILL_CQC_DEFAULT, @@ -45,7 +45,7 @@ UNITED PROGRESSIVE PEOPLES name = "UPP Specialist" skills = list( SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_NOVICE, SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, SKILL_CQC = SKILL_CQC_TRAINED, SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, @@ -60,7 +60,7 @@ UNITED PROGRESSIVE PEOPLES name = "UPP Squad Leader" skills = list( SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, SKILL_CQC = SKILL_CQC_TRAINED, SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, @@ -78,7 +78,7 @@ UNITED PROGRESSIVE PEOPLES SKILL_FIREMAN = SKILL_FIREMAN_EXPERT, SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_NOVICE, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, ) @@ -93,7 +93,7 @@ UNITED PROGRESSIVE PEOPLES SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_NOVICE, SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, SKILL_VEHICLE = SKILL_VEHICLE_SMALL, @@ -109,7 +109,7 @@ UNITED PROGRESSIVE PEOPLES SKILL_LEADERSHIP = SKILL_LEAD_MASTER, SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, @@ -126,7 +126,7 @@ UNITED PROGRESSIVE PEOPLES SKILL_LEADERSHIP = SKILL_LEAD_MASTER, SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, @@ -147,7 +147,7 @@ UNITED PROGRESSIVE PEOPLES name = "UPP Private" skills = list( SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, SKILL_CQC = SKILL_CQC_TRAINED, @@ -161,7 +161,7 @@ UNITED PROGRESSIVE PEOPLES name = "UPP Sapper" skills = list( SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, SKILL_CQC = SKILL_CQC_TRAINED, @@ -176,7 +176,7 @@ UNITED PROGRESSIVE PEOPLES name = "UPP Medic" skills = list( SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, SKILL_SURGERY = SKILL_SURGERY_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, @@ -192,7 +192,7 @@ UNITED PROGRESSIVE PEOPLES name = "UPP Specialist" skills = list( SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, SKILL_CQC = SKILL_CQC_TRAINED, @@ -210,7 +210,7 @@ UNITED PROGRESSIVE PEOPLES name = "UPP Squad Leader" skills = list( SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, SKILL_SPEC_WEAPONS = SKILL_SPEC_UPP, SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, diff --git a/code/datums/skills/uscm.dm b/code/datums/skills/uscm.dm index f694e8789dcd..2e5929477812 100644 --- a/code/datums/skills/uscm.dm +++ b/code/datums/skills/uscm.dm @@ -12,7 +12,7 @@ United States Colonial Marines name = "Crafty Private" skills = list( SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_NOVICE, ) /datum/skills/combat_medic @@ -28,7 +28,7 @@ United States Colonial Marines name = "Crafty Combat Medic" skills = list( SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_NOVICE, ) /datum/skills/combat_engineer @@ -55,7 +55,7 @@ United States Colonial Marines SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_CQC = SKILL_CQC_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, //to use c4 in demo set. + SKILL_ENGINEER = SKILL_ENGINEER_NOVICE, //to use c4 in demo set. SKILL_SPEC_WEAPONS = SKILL_SPEC_TRAINED, SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, @@ -66,7 +66,7 @@ United States Colonial Marines name = "Fireteam Leader" skills = list( SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_JTAC = SKILL_JTAC_EXPERT, ) @@ -77,7 +77,7 @@ United States Colonial Marines SKILL_CQC = SKILL_CQC_TRAINED, SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, @@ -90,7 +90,7 @@ United States Colonial Marines name = "Intelligence Officer" skills = list( SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, SKILL_CQC = SKILL_CQC_TRAINED, @@ -157,7 +157,7 @@ MILITARY NONCOMBATANT SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, SKILL_SURGERY = SKILL_SURGERY_NOVICE, SKILL_JTAC = SKILL_JTAC_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, ) /datum/skills/MP @@ -180,7 +180,7 @@ MILITARY NONCOMBATANT SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, ) /datum/skills/provost @@ -216,7 +216,7 @@ MILITARY NONCOMBATANT name = "Mess Technician" skills = list( SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, // need to hunt food somehow - SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_NOVICE, SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, SKILL_DOMESTIC = SKILL_DOMESTIC_MASTER @@ -240,7 +240,7 @@ COMMAND STAFF name = "General" skills = list( SKILL_CQC = SKILL_CQC_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_LEADERSHIP = SKILL_LEAD_MASTER, SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, @@ -259,7 +259,7 @@ COMMAND STAFF /datum/skills/commander name = "Commanding Officer" skills = list( - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_LEADERSHIP = SKILL_LEAD_MASTER, SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, @@ -282,7 +282,7 @@ COMMAND STAFF /datum/skills/XO name = "Executive Officer" skills = list( - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, //to fix CIC apc. + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, //to fix CIC apc. SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_LEADERSHIP = SKILL_LEAD_MASTER, SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, @@ -303,7 +303,7 @@ COMMAND STAFF /datum/skills/SO name = "Staff Officer" skills = list( - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, @@ -322,7 +322,7 @@ COMMAND STAFF name = "Senior Enlisted Advisor" skills = list( SKILL_CQC = SKILL_CQC_SKILLED, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, @@ -375,7 +375,7 @@ COMMAND STAFF SKILL_JTAC = SKILL_JTAC_EXPERT, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, SKILL_INTEL = SKILL_INTEL_TRAINED, ) @@ -392,7 +392,7 @@ COMMAND STAFF SKILL_JTAC = SKILL_JTAC_EXPERT, SKILL_INTEL = SKILL_INTEL_EXPERT, SKILL_VEHICLE = SKILL_VEHICLE_SMALL, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_POLICE = SKILL_POLICE_FLASH, SKILL_NAVIGATIONS = SKILL_NAVIGATIONS_TRAINED, diff --git a/code/datums/skills/wygoons.dm b/code/datums/skills/wygoons.dm index 2d2c247bd1ea..73d8da15b976 100644 --- a/code/datums/skills/wygoons.dm +++ b/code/datums/skills/wygoons.dm @@ -18,7 +18,7 @@ SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, ) /datum/skills/wy_goon_lead @@ -31,6 +31,6 @@ SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, ) diff --git a/code/game/gamemodes/colonialmarines/whiskey_outpost/skills.dm b/code/game/gamemodes/colonialmarines/whiskey_outpost/skills.dm index a5126627adaf..746e6ed53c18 100644 --- a/code/game/gamemodes/colonialmarines/whiskey_outpost/skills.dm +++ b/code/game/gamemodes/colonialmarines/whiskey_outpost/skills.dm @@ -35,7 +35,7 @@ /datum/skills/honor_guard/lead name = "Honor Guard Squad Leader" skills = list( - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, //to fix CIC apc. + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, //to fix CIC apc. SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_LEADERSHIP = SKILL_LEAD_MASTER, SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, @@ -49,7 +49,7 @@ /datum/skills/mortar_crew name = "Mortar Crew" skills = list( - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_JTAC = SKILL_JTAC_BEGINNER, SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, diff --git a/code/game/jobs/job/marine/squad_info.dm b/code/game/jobs/job/marine/squad_info.dm index 37db48c3116e..406263115196 100644 --- a/code/game/jobs/job/marine/squad_info.dm +++ b/code/game/jobs/job/marine/squad_info.dm @@ -146,7 +146,7 @@ if(skillcheck(H, SKILL_MEDICAL, SKILL_MEDICAL_TRAINED)) Med = TRUE else - if(skillcheck(H, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) + if(skillcheck(H, SKILL_ENGINEER, SKILL_ENGINEER_NOVICE)) Eng = TRUE ID = H.get_idcard() squad_info_data["fireteams"][team]["tl"] = list( @@ -223,7 +223,7 @@ if(skillcheck(H, SKILL_MEDICAL, SKILL_MEDICAL_TRAINED)) Med = TRUE else - if(skillcheck(H, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) + if(skillcheck(H, SKILL_ENGINEER, SKILL_ENGINEER_NOVICE)) Eng = TRUE mar[H.real_name] = list( "name" = H.real_name, @@ -270,7 +270,7 @@ if(skillcheck(H, SKILL_MEDICAL, SKILL_MEDICAL_TRAINED)) Med = TRUE else - if(skillcheck(H, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) + if(skillcheck(H, SKILL_ENGINEER, SKILL_ENGINEER_NOVICE)) Eng = TRUE mar[H.real_name] = list( "name" = H.real_name, diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 4150aead979e..4013aec3fb29 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -224,7 +224,7 @@ if("cutwire") if(!panel_open) return FALSE - if(!skillcheck(usr, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(usr, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(usr, SPAN_WARNING("You don't understand anything about this wiring...")) return FALSE var/obj/item/held_item = usr.get_held_item() @@ -238,7 +238,7 @@ if("fixwire") if(!panel_open) return FALSE - if(!skillcheck(usr, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(usr, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(usr, SPAN_WARNING("You don't understand anything about this wiring...")) return FALSE var/obj/item/held_item = usr.get_held_item() @@ -251,7 +251,7 @@ if("pulsewire") if(!panel_open) return FALSE - if(!skillcheck(usr, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(usr, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(usr, SPAN_WARNING("You don't understand anything about this wiring...")) return FALSE var/obj/item/held_item = usr.get_held_item() @@ -269,7 +269,7 @@ /obj/structure/machinery/autolathe/attackby(obj/item/O as obj, mob/user as mob) if(HAS_TRAIT(O, TRAIT_TOOL_SCREWDRIVER)) - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You are not trained to dismantle machines...")) return panel_open = !panel_open @@ -586,7 +586,7 @@ stored_material = list("metal" = 56250, "plastic" = 20000) //15 metal and 10 plastic sheets /obj/structure/machinery/autolathe/armylathe/attack_hand(mob/user) - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You have no idea how to operate the [name].")) return FALSE . = ..() diff --git a/code/game/machinery/colony_floodlights.dm b/code/game/machinery/colony_floodlights.dm index 0267c7e95487..e8f59ad643d7 100644 --- a/code/game/machinery/colony_floodlights.dm +++ b/code/game/machinery/colony_floodlights.dm @@ -125,7 +125,7 @@ /obj/structure/machinery/colony_floodlight/attackby(obj/item/I, mob/user) if(damaged) if(HAS_TRAIT(I, TRAIT_TOOL_SCREWDRIVER)) - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You have no clue how to repair [src].")) return FALSE @@ -160,7 +160,7 @@ return TRUE else if(HAS_TRAIT(I, TRAIT_TOOL_CROWBAR)) - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You have no clue how to repair [src].")) return FALSE @@ -183,7 +183,7 @@ return var/obj/item/tool/weldingtool/welder = I - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You have no clue how to repair [src].")) return FALSE @@ -206,7 +206,7 @@ else if(iscoil(I)) var/obj/item/stack/cable_coil/coil = I - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You have no clue how to repair [src].")) return FALSE @@ -228,7 +228,7 @@ return TRUE else if(istype(I, /obj/item/device/lightreplacer)) - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You have no clue how to repair [src].")) return FALSE @@ -271,7 +271,7 @@ if(ishuman(user)) if(damaged) . += SPAN_WARNING("It is damaged.") - if(skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) switch(repair_state) if(FLOODLIGHT_REPAIR_UNSCREW) . += SPAN_INFO("You must first unscrew its maintenance hatch.") if(FLOODLIGHT_REPAIR_CROWBAR) . += SPAN_INFO("You must crowbar its lighting assembly out or use a light replacer.") diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm index bfa64ab174ed..bb434e8ca114 100644 --- a/code/game/machinery/computer/computer.dm +++ b/code/game/machinery/computer/computer.dm @@ -99,7 +99,7 @@ if(!deconstructible) to_chat(user, SPAN_WARNING("You can't figure out how to deconstruct [src]...")) return - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You don't know how to deconstruct [src]...")) return playsound(src.loc, 'sound/items/Screwdriver.ogg', 25, 1) diff --git a/code/game/machinery/computer/demo_sim.dm b/code/game/machinery/computer/demo_sim.dm index f633e8f351d4..2b2ca9fda775 100644 --- a/code/game/machinery/computer/demo_sim.dm +++ b/code/game/machinery/computer/demo_sim.dm @@ -11,7 +11,7 @@ /obj/structure/machinery/computer/demo_sim/attackby(obj/item/B, mob/living/user) if(inoperable()) return - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You don't know how to configure [src].")) return if(configuration) diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 0c8cc62c3f87..3b7880320da7 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -15,7 +15,7 @@ var/list/req_component_names = null var/state = CONSTRUCTION_STATE_BEGIN var/required_skill = SKILL_CONSTRUCTION_ENGI - var/required_dismantle_skill = SKILL_ENGINEER_ENGI + var/required_dismantle_skill = SKILL_ENGINEER_TRAINED /obj/structure/machinery/constructable_frame/Initialize(mapload, ...) . = ..() diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 84f02f0a5bbd..9ac9765371f3 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -439,7 +439,7 @@ GLOBAL_LIST_INIT(airlock_wire_descriptions, list( return if(panel_open) - if(ishuman(usr) && !skillcheck(usr, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(ishuman(usr) && !skillcheck(usr, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(usr, SPAN_WARNING("You look into \the [src]'s access panel and can only see a jumbled mess of colored wires...")) return FALSE @@ -483,7 +483,7 @@ GLOBAL_LIST_INIT(airlock_wire_descriptions, list( add_fingerprint(usr) if((in_range(src, usr) && istype(loc, /turf)) && panel_open) - if(ishuman(usr) && !skillcheck(usr, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(ishuman(usr) && !skillcheck(usr, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(usr, SPAN_WARNING("You don't understand anything about [src]'s wiring!")) return FALSE @@ -649,7 +649,7 @@ GLOBAL_LIST_INIT(airlock_wire_descriptions, list( else if(attacking_item.pry_capable) if(attacking_item.pry_capable == IS_PRY_CAPABLE_CROWBAR && panel_open && welded) - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You don't seem to know how to deconstruct machines.")) return playsound(loc, 'sound/items/Crowbar.ogg', 25, 1) diff --git a/code/game/machinery/doors/multi_tile.dm b/code/game/machinery/doors/multi_tile.dm index f95ef09e812f..6e7f571a0d4e 100644 --- a/code/game/machinery/doors/multi_tile.dm +++ b/code/game/machinery/doors/multi_tile.dm @@ -262,14 +262,14 @@ var/datum/door_controller/single/control = linked_dropship.door_control.door_controllers[direction] if (control.status != SHUTTLE_DOOR_BROKEN) return ..() - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI) && !skillcheck(user, SKILL_PILOT, SKILL_PILOT_TRAINED)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED) && !skillcheck(user, SKILL_PILOT, SKILL_PILOT_TRAINED)) to_chat(user, SPAN_WARNING("You don't seem to understand how to restore a remote connection to [src].")) return if(user.action_busy) return to_chat(user, SPAN_WARNING("You begin to restore the remote connection to [src].")) - if(!do_after(user, (skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI) ? 5 SECONDS : 8 SECONDS), INTERRUPT_ALL, BUSY_ICON_BUILD)) + if(!do_after(user, (skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED) ? 5 SECONDS : 8 SECONDS), INTERRUPT_ALL, BUSY_ICON_BUILD)) to_chat(user, SPAN_WARNING("You fail to restore a remote connection to [src].")) return unlock(TRUE) diff --git a/code/game/machinery/fusion_engine.dm b/code/game/machinery/fusion_engine.dm index 72f836717b0f..06ae3321a2c5 100644 --- a/code/game/machinery/fusion_engine.dm +++ b/code/game/machinery/fusion_engine.dm @@ -140,7 +140,7 @@ if(overloaded) . += SPAN_INFO("It is overloaded.") return - if(skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) . += SPAN_INFO("You could overload its safeties with a multitool.") /obj/structure/machinery/power/reactor/power_change() @@ -344,7 +344,7 @@ if(!is_ship_reactor) return - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) return to_chat(user, SPAN_WARNING("You start [overloaded ? "overloading" : "restoring"] the safeties on [src].")) @@ -446,7 +446,7 @@ var/repair_time = 20 SECONDS repair_time *= user.get_skill_duration_multiplier(SKILL_ENGINEER) - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) repair_time += 5 SECONDS to_chat(user, SPAN_NOTICE("You start repairing [src] with [tool].")) diff --git a/code/game/machinery/kitchen/smartfridge.dm b/code/game/machinery/kitchen/smartfridge.dm index 774153316baa..957f6c97eca3 100644 --- a/code/game/machinery/kitchen/smartfridge.dm +++ b/code/game/machinery/kitchen/smartfridge.dm @@ -350,7 +350,7 @@ if("cutwire") if(!panel_open) return FALSE - if(!skillcheck(usr, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(usr, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(usr, SPAN_WARNING("You don't understand anything about this wiring...")) return FALSE var/obj/item/held_item = user.get_held_item() @@ -364,7 +364,7 @@ if("fixwire") if(!panel_open) return FALSE - if(!skillcheck(usr, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(usr, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(usr, SPAN_WARNING("You don't understand anything about this wiring...")) return FALSE var/obj/item/held_item = user.get_held_item() @@ -377,7 +377,7 @@ if("pulsewire") if(!panel_open) return FALSE - if(!skillcheck(usr, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(usr, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(usr, SPAN_WARNING("You don't understand anything about this wiring...")) return FALSE var/obj/item/held_item = user.get_held_item() diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index f835ecaa424c..f7244fb8ce0d 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -171,7 +171,7 @@ Class Procs: . += "It does not appear to be working." var/msg = get_repair_move_text(FALSE) - if(msg && skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(msg && skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) . += SPAN_WARNING("[msg]") /obj/structure/machinery/emp_act(severity) diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm index 9bffa8ebe450..31cd2cf94d4e 100644 --- a/code/game/machinery/telecomms/machine_interactions.dm +++ b/code/game/machinery/telecomms/machine_interactions.dm @@ -22,7 +22,7 @@ attack_hand(user) else - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You stare at \the [src] cluelessly...")) return 0 @@ -103,7 +103,7 @@ // You need a multitool to use this, or be silicon if(!isSilicon(user)) - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You stare at \the [src] cluelessly...")) return // istype returns false if the value is null diff --git a/code/game/machinery/telecomms/portable_comms.dm b/code/game/machinery/telecomms/portable_comms.dm index c2a9bb1072ac..cf7ef1c1f2ef 100644 --- a/code/game/machinery/telecomms/portable_comms.dm +++ b/code/game/machinery/telecomms/portable_comms.dm @@ -3,7 +3,7 @@ desc = "A portable compact TC-4T telecommunications construction kit. Used to set up subspace communications lines between planetary and extra-planetary locations. Needs cabling." icon = 'icons/obj/structures/machinery/comm_tower2.dmi' icon_state = "construct_0_0" - required_skill = SKILL_ENGINEER_ENGI + required_skill = SKILL_ENGINEER_TRAINED required_dismantle_skill = 5 density = TRUE anchored = FALSE diff --git a/code/game/machinery/telecomms/presets.dm b/code/game/machinery/telecomms/presets.dm index 3997484f39e7..300eb767daff 100644 --- a/code/game/machinery/telecomms/presets.dm +++ b/code/game/machinery/telecomms/presets.dm @@ -122,7 +122,7 @@ return if(user.action_busy) return - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_NOVICE)) to_chat(user, SPAN_WARNING("You're not trained to repair [src]...")) return var/obj/item/tool/weldingtool/WT = I diff --git a/code/game/machinery/vending/cm_vending.dm b/code/game/machinery/vending/cm_vending.dm index d4f56504be72..ac2fb1d7441a 100644 --- a/code/game/machinery/vending/cm_vending.dm +++ b/code/game/machinery/vending/cm_vending.dm @@ -153,7 +153,7 @@ GLOBAL_LIST_EMPTY(vending_products) /obj/structure/machinery/cm_vending/get_examine_text(mob/living/carbon/human/user) . = ..() - if(skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI) && hackable) + if(skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED) && hackable) . += SPAN_NOTICE("You believe you can hack this one to remove the access requirements.") /obj/structure/machinery/cm_vending/proc/hack_access(mob/user) @@ -678,7 +678,7 @@ GLOBAL_LIST_EMPTY(vending_products) to_chat(user, SPAN_WARNING("You need to set [src] back upright first.")) return if(HAS_TRAIT(W, TRAIT_TOOL_SCREWDRIVER)) - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You do not understand how to repair the broken [src].")) return FALSE else if(stat & MAINT) @@ -705,7 +705,7 @@ GLOBAL_LIST_EMPTY(vending_products) to_chat(user, SPAN_WARNING("[msg]")) return FALSE else if(HAS_TRAIT(W, TRAIT_TOOL_WIRECUTTERS)) - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You do not understand how to repair the broken [src].")) return FALSE else if(stat & REPAIR_STEP_ONE) @@ -722,7 +722,7 @@ GLOBAL_LIST_EMPTY(vending_products) to_chat(user, SPAN_WARNING("[msg]")) return FALSE else if(iswire(W)) - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You do not understand how to repair the broken [src].")) return FALSE var/obj/item/stack/cable_coil/CC = W @@ -745,7 +745,7 @@ GLOBAL_LIST_EMPTY(vending_products) to_chat(user, SPAN_WARNING("[msg]")) return else if(istype(W, /obj/item/stack/sheet/metal)) - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You do not understand how to repair the broken [src].")) return FALSE var/obj/item/stack/sheet/metal/M = W @@ -768,7 +768,7 @@ GLOBAL_LIST_EMPTY(vending_products) else if(HAS_TRAIT(W, TRAIT_TOOL_MULTITOOL)) var/obj/item/device/multitool/MT = W - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI) && !skillcheckexplicit(user, SKILL_ANTAG, SKILL_ANTAG_AGENT)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED) && !skillcheckexplicit(user, SKILL_ANTAG, SKILL_ANTAG_AGENT)) to_chat(user, SPAN_WARNING("You do not understand how tweak access requirements in [src].")) return FALSE if(stat != WORKING) diff --git a/code/game/machinery/vending/vending.dm b/code/game/machinery/vending/vending.dm index a05245e4b185..c6ef6eb7a574 100644 --- a/code/game/machinery/vending/vending.dm +++ b/code/game/machinery/vending/vending.dm @@ -207,7 +207,7 @@ GLOBAL_LIST_EMPTY_TYPED(total_vending_machines, /obj/structure/machinery/vending to_chat(user, "You [panel_open ? "open" : "close"] the maintenance panel.") update_icon() return TRUE - else if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + else if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You do not understand how to repair the broken [src.name].")) return FALSE else if(stat & BROKEN) @@ -234,7 +234,7 @@ GLOBAL_LIST_EMPTY_TYPED(total_vending_machines, /obj/structure/machinery/vending to_chat(user, SPAN_WARNING("[msg]")) return FALSE else if(HAS_TRAIT(item, TRAIT_TOOL_WIRECUTTERS)) - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You do not understand how to repair the broken [src.name].")) return FALSE else if(stat == WORKING && panel_open) @@ -254,7 +254,7 @@ GLOBAL_LIST_EMPTY_TYPED(total_vending_machines, /obj/structure/machinery/vending to_chat(user, SPAN_WARNING("[msg]")) return FALSE else if(istype(item, /obj/item/stack/cable_coil)) - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You do not understand how to repair the broken [src.name].")) return FALSE var/obj/item/stack/cable_coil/CC = item @@ -277,7 +277,7 @@ GLOBAL_LIST_EMPTY_TYPED(total_vending_machines, /obj/structure/machinery/vending to_chat(user, SPAN_WARNING("[msg]")) return else if(istype(item, /obj/item/stack/sheet/metal)) - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You do not understand how to repair the broken [src.name].")) return FALSE var/obj/item/stack/sheet/metal/M = item diff --git a/code/game/machinery/vending/vendor_types/requisitions.dm b/code/game/machinery/vending/vendor_types/requisitions.dm index a8d44a8b5012..602650b89512 100644 --- a/code/game/machinery/vending/vendor_types/requisitions.dm +++ b/code/game/machinery/vending/vendor_types/requisitions.dm @@ -139,6 +139,8 @@ list("Powerloader Certification", 0.75, /obj/item/pamphlet/skill/powerloader, VENDOR_ITEM_REGULAR), list("Spare PDT/L Battle Buddy Kit", floor(scale * 4), /obj/item/storage/box/pdt_kit, VENDOR_ITEM_REGULAR), list("W-Y brand rechargeable mini-battery", floor(scale * 3), /obj/item/cell/crap, VENDOR_ITEM_REGULAR), + list("Nailgun Magazine (7x45mm)", floor(scale * 4), /obj/item/ammo_magazine/smg/nailgun, VENDOR_ITEM_REGULAR), + list("Nailgun Magazine Box (7x45mm)", floor(scale * 2), /obj/item/ammo_box/magazine/nailgun, VENDOR_ITEM_REGULAR), list("EXPLOSIVES BOXES", -1, null, null), list("M15 Fragmentation Grenade Packet", 0, /obj/item/storage/box/packet/m15, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm index aaf134c4a459..970b69152cd3 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm @@ -137,6 +137,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_engi, list( list("M276 Mortar Operator Belt", 0, /obj/item/storage/belt/gun/mortarbelt, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("M276 Toolbelt Rig (Full)", 0, /obj/item/storage/belt/utility/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_MANDATORY), list("M276 M40 Grenade Rig", 0, /obj/item/storage/belt/grenade, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), + list("M277 Pattern Construction Rig", 0, /obj/item/storage/belt/utility/construction, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Construction Pouch", 0, /obj/item/storage/pouch/construction, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), @@ -152,6 +153,8 @@ GLOBAL_LIST_INIT(cm_vending_clothing_engi, list( list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Engineer kit Pouch", 0, /obj/item/storage/pouch/engikit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), @@ -159,6 +162,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_engi, list( list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Small Tool Webbing", 0, /obj/item/clothing/accessory/storage/tool_webbing/small/equipped, MARINE_CAN_BUY_ACCESSORY, 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), @@ -210,4 +214,5 @@ GLOBAL_LIST_INIT(cm_vending_clothing_engi, list( /obj/item/cell/high, /obj/item/tool/shovel/etool/folded, /obj/item/device/lightreplacer, + /obj/item/weapon/gun/smg/nailgun/compact/tactical, ) diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm index 35b059ac9611..fd0d777c8d71 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm @@ -339,7 +339,8 @@ list("Binoculars", floor(scale * 1), /obj/item/device/binoculars, VENDOR_ITEM_REGULAR), list("MB-6 Folding Barricades (x3)", floor(scale * 2), /obj/item/stack/folding_barricade/three, VENDOR_ITEM_REGULAR), list("Spare PDT/L Battle Buddy Kit", floor(scale * 3), /obj/item/storage/box/pdt_kit, VENDOR_ITEM_REGULAR), - list("W-Y brand rechargeable mini-battery", floor(scale * 2.5), /obj/item/cell/crap, VENDOR_ITEM_REGULAR) + list("W-Y brand rechargeable mini-battery", floor(scale * 2.5), /obj/item/cell/crap, VENDOR_ITEM_REGULAR), + list("Nailgun Magazine (7x45mm)", floor(scale * 4), /obj/item/ammo_magazine/smg/nailgun, VENDOR_ITEM_REGULAR) ) //--------------SQUAD ATTACHMENTS VENDOR-------------- diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 03e1f126e9d8..d8bf3d9d8f79 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -163,6 +163,9 @@ /// How much to offset the item randomly either way alongside Y visually var/ground_offset_y = 0 + /// Special storages this item prioritizes + var/list/preferred_storage + /obj/item/Initialize(mapload, ...) . = ..() diff --git a/code/game/objects/items/circuitboards/computer.dm b/code/game/objects/items/circuitboards/computer.dm index 43215faf0fbb..58ff86130cd6 100644 --- a/code/game/objects/items/circuitboards/computer.dm +++ b/code/game/objects/items/circuitboards/computer.dm @@ -180,7 +180,7 @@ else if(HAS_TRAIT(tool, TRAIT_TOOL_BLACKMARKET_HACKER)) to_chat(user, SPAN_WARNING("You start messing around with the electronics of [src]...")) if(do_after(user, 8 SECONDS, INTERRUPT_ALL, BUSY_ICON_FRIENDLY)) - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You have no idea what you're doing.")) return to_chat(user, SPAN_WARNING("Huh? You find a processor bus with the letters 'B.M.' written in white crayon over it. You start fiddling with it.")) diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index a92135b9d7ed..73e5b86a69eb 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -18,6 +18,7 @@ matter = list("metal" = 50,"glass" = 20) inherent_traits = list(TRAIT_TOOL_MULTITOOL) + preferred_storage = list(/obj/item/clothing/accessory/storage/tool_webbing = WEAR_ACCESSORY) var/hack_speed = 10 SECONDS // Only used for vendors right now var/next_scan @@ -46,7 +47,7 @@ /obj/item/device/multitool/attack_self(mob/user) ..() - if(world.time < next_scan || !ishuman(user) || !skillcheck(user,SKILL_ENGINEER,SKILL_ENGINEER_TRAINED)) + if(world.time < next_scan || !ishuman(user) || !skillcheck(user,SKILL_ENGINEER,SKILL_ENGINEER_NOVICE)) return next_scan = world.time + 15 diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 309c7ff20f8b..dae0e8c2af32 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -329,7 +329,7 @@ FORENSIC SCANNER if(!(istype(user, /mob/living/carbon/human) || SSticker) && SSticker.mode.name != "monkey") to_chat(user, SPAN_DANGER("You don't have the dexterity to do this!")) return - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You do not know how to use the [name].")) return if(!istype(O)) diff --git a/code/game/objects/items/explosives/explosive.dm b/code/game/objects/items/explosives/explosive.dm index 1bd6985bc015..0be81ba8a0ed 100644 --- a/code/game/objects/items/explosives/explosive.dm +++ b/code/game/objects/items/explosives/explosive.dm @@ -259,7 +259,7 @@ to_chat(usr, SPAN_DANGER("This is beyond your understanding...")) return - if(!skillcheck(H, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(H, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(usr, SPAN_DANGER("You have no idea how to use this...")) return diff --git a/code/game/objects/items/explosives/plastic.dm b/code/game/objects/items/explosives/plastic.dm index 58cbca9a5ab3..c6a3dfaed5f9 100644 --- a/code/game/objects/items/explosives/plastic.dm +++ b/code/game/objects/items/explosives/plastic.dm @@ -25,7 +25,7 @@ antigrief_protection = TRUE //Should it be checked by antigrief? var/req_skill = SKILL_ENGINEER - var/req_skill_level = SKILL_ENGINEER_TRAINED + var/req_skill_level = SKILL_ENGINEER_NOVICE /obj/item/explosive/plastic/Destroy() disarm() @@ -46,7 +46,7 @@ . = ..() /obj/item/explosive/plastic/attack_self(mob/user) - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_NOVICE)) to_chat(user, SPAN_WARNING("You don't seem to know how to use [src]...")) return diff --git a/code/game/objects/items/props/helmetgarb.dm b/code/game/objects/items/props/helmetgarb.dm index 5b9b81804311..9da509d16c5a 100644 --- a/code/game/objects/items/props/helmetgarb.dm +++ b/code/game/objects/items/props/helmetgarb.dm @@ -176,12 +176,12 @@ if(src != user.get_inactive_hand()) to_chat(user, SPAN_WARNING("You need to hold \the [src] in hand in order to repair them.")) return - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) // level 2 is enough to repair damaged NVG + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_NOVICE)) // level 2 is enough to repair damaged NVG to_chat(user, SPAN_WARNING("You are not trained to repair electronics...")) return if(shape == NVG_SHAPE_BROKEN) - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) // level 3 is needed to repair broken NVG + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) // level 3 is needed to repair broken NVG to_chat(user, SPAN_WARNING("Repair of this complexity is too difficult for you, find someone more trained.")) return diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index baa91db19396..c038f6918e63 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -15,7 +15,7 @@ cant_hold = list(/obj/item/storage/firstaid, /obj/item/storage/toolkit) can_hold_skill = list( /obj/item/storage/firstaid = list(SKILL_MEDICAL, SKILL_MEDICAL_MEDIC), - /obj/item/storage/toolkit = list(SKILL_ENGINEER, SKILL_ENGINEER_ENGI), + /obj/item/storage/toolkit = list(SKILL_ENGINEER, SKILL_ENGINEER_TRAINED), ) drop_sound = "armorequip" var/worn_accessible = FALSE //whether you can access its content while worn on the back diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index d16602e04aaa..32392d34297b 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -117,7 +117,6 @@ ) storage_slots = 10 - /obj/item/storage/belt/utility/full/fill_preset_inventory() new /obj/item/tool/screwdriver(src) new /obj/item/tool/wrench(src) @@ -136,6 +135,43 @@ new /obj/item/tool/wirecutters(src) new /obj/item/device/t_scanner(src) +/obj/item/storage/belt/utility/construction + name = "\improper M277 pattern construction rig" + desc = "The M277 is a common rig used by Combat Technicians to carry around materials and other supplies. It consists of a modular belt with various clips. This version sarafices storage space for specialized material loading clips." + storage_slots = 6 + can_hold = list( + /obj/item/tool/crowbar, + /obj/item/tool/screwdriver, + /obj/item/tool/weldingtool, + /obj/item/tool/wirecutters, + /obj/item/tool/wrench, + /obj/item/tool/extinguisher/mini, + /obj/item/tool/shovel/etool, + /obj/item/stack/cable_coil, + /obj/item/weapon/gun/smg/nailgun/compact, + /obj/item/cell, + /obj/item/circuitboard, + /obj/item/stock_parts, + /obj/item/device/demo_scanner, + /obj/item/device/reagent_scanner, + /obj/item/device/assembly, + /obj/item/device/multitool, + /obj/item/device/flashlight, + /obj/item/device/t_scanner, + /obj/item/device/analyzer, + /obj/item/explosive/plastic, + /obj/item/device/lightreplacer, + /obj/item/stack/sheet/metal, + /obj/item/stack/sheet/plasteel, + ) + + bypass_w_limit = list( + /obj/item/tool/shovel/etool, + /obj/item/device/lightreplacer, + /obj/item/stack/sheet/metal, + /obj/item/stack/sheet/plasteel, + ) + /obj/item/storage/belt/utility/full/pred name = "\improper Yautja toolbelt" desc = "A modular belt with various clips. This version lacks any hunting functionality, and is commonly used by engineers to transport important tools." diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm index 63516ac20aa0..a40bf55bddbf 100644 --- a/code/game/objects/items/storage/pouch.dm +++ b/code/game/objects/items/storage/pouch.dm @@ -802,6 +802,28 @@ for(var/i = 1 to storage_slots) new /obj/item/reagent_container/syringe(src) +/obj/item/storage/pouch/engikit + name = "engineer kit pouch" + storage_flags = STORAGE_FLAGS_POUCH + icon_state = "construction" + desc = "It's specifically made to hold engineering items. Requires engineering skills to use effectively." + storage_slots = 7 + can_hold_skill = list( + /obj/item/circuitboard = list(SKILL_ENGINEER, SKILL_ENGINEER_TRAINED), + /obj/item/device/flashlight = list(SKILL_ENGINEER, SKILL_ENGINEER_TRAINED), + /obj/item/clothing/glasses/welding = list(SKILL_ENGINEER, SKILL_ENGINEER_TRAINED), + /obj/item/device/analyzer = list(SKILL_ENGINEER, SKILL_ENGINEER_TRAINED), + /obj/item/device/demo_scanner = list(SKILL_ENGINEER, SKILL_ENGINEER_TRAINED), + /obj/item/device/reagent_scanner = list(SKILL_ENGINEER, SKILL_ENGINEER_TRAINED), + /obj/item/device/t_scanner = list(SKILL_ENGINEER, SKILL_ENGINEER_TRAINED), + /obj/item/stack/cable_coil = list(SKILL_ENGINEER, SKILL_ENGINEER_TRAINED), + /obj/item/cell = list(SKILL_ENGINEER, SKILL_ENGINEER_TRAINED), + /obj/item/device/assembly = list(SKILL_ENGINEER, SKILL_ENGINEER_TRAINED), + /obj/item/stock_parts = list(SKILL_ENGINEER, SKILL_ENGINEER_TRAINED), + /obj/item/explosive/plastic = list(SKILL_ENGINEER, SKILL_ENGINEER_TRAINED), + ) + can_hold_skill_only = TRUE + /obj/item/storage/pouch/medkit name = "medical kit pouch" storage_flags = STORAGE_FLAGS_POUCH diff --git a/code/game/objects/items/storage/toolkit.dm b/code/game/objects/items/storage/toolkit.dm index e3171eca40f6..cccca19c241c 100644 --- a/code/game/objects/items/storage/toolkit.dm +++ b/code/game/objects/items/storage/toolkit.dm @@ -23,7 +23,7 @@ ) storage_flags = STORAGE_FLAGS_BOX required_skill_for_nest_opening = SKILL_ENGINEER - required_skill_level_for_nest_opening = SKILL_ENGINEER_ENGI + required_skill_level_for_nest_opening = SKILL_ENGINEER_TRAINED ///icon state to use when kit is full var/icon_full diff --git a/code/game/objects/items/tools/maintenance_tools.dm b/code/game/objects/items/tools/maintenance_tools.dm index 8febff63ee5d..f45953040a07 100644 --- a/code/game/objects/items/tools/maintenance_tools.dm +++ b/code/game/objects/items/tools/maintenance_tools.dm @@ -29,6 +29,7 @@ matter = list("metal" = 150) attack_verb = list("bashed", "battered", "bludgeoned", "whacked") inherent_traits = list(TRAIT_TOOL_WRENCH) + preferred_storage = list(/obj/item/clothing/accessory/storage/tool_webbing = WEAR_ACCESSORY) /* @@ -52,7 +53,7 @@ attack_verb = list("stabbed") flags_item = CAN_DIG_SHRAPNEL inherent_traits = list(TRAIT_TOOL_SCREWDRIVER) - + preferred_storage = list(/obj/item/clothing/accessory/storage/tool_webbing = WEAR_ACCESSORY) /obj/item/tool/screwdriver/Initialize() @@ -135,6 +136,7 @@ sharp = IS_SHARP_ITEM_SIMPLE edge = 1 inherent_traits = list(TRAIT_TOOL_WIRECUTTERS) + preferred_storage = list(/obj/item/clothing/accessory/storage/tool_webbing = WEAR_ACCESSORY) /obj/item/tool/wirecutters/tactical name = "tactical wirecutters" @@ -189,6 +191,7 @@ /// Used to slowly deplete the fuel when the tool is left on. var/weld_tick = 0 var/has_welding_screen = FALSE + preferred_storage = list(/obj/item/clothing/accessory/storage/tool_webbing = WEAR_ACCESSORY) /obj/item/tool/weldingtool/Initialize() . = ..() @@ -472,6 +475,7 @@ attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked") inherent_traits = list(TRAIT_TOOL_CROWBAR) pry_capable = IS_PRY_CAPABLE_CROWBAR + preferred_storage = list(/obj/item/clothing/accessory/storage/tool_webbing = WEAR_ACCESSORY) /obj/item/tool/crowbar/red icon = 'icons/obj/items/items.dmi' diff --git a/code/game/objects/structures/barricade/barricade.dm b/code/game/objects/structures/barricade/barricade.dm index 28036f92d018..884b511d87a5 100644 --- a/code/game/objects/structures/barricade/barricade.dm +++ b/code/game/objects/structures/barricade/barricade.dm @@ -449,6 +449,10 @@ else material = user.l_hand + if(material.amount < nailgun.material_per_repair) + to_chat(user, SPAN_WARNING("You'll need more adequate repair material in your other hand to patch up [src]!")) + return FALSE + if(!istype(material, /obj/item/stack/sheet/)) to_chat(user, SPAN_WARNING("You'll need some adequate repair material in your other hand to patch up [src]!")) return FALSE @@ -479,7 +483,7 @@ update_health(-repair_value*maxhealth) to_chat(user, SPAN_WARNING("You nail [material] to [src], restoring some of its integrity!")) update_damage_state() - material.use(1) + material.use(nailgun.material_per_repair) nailgun.current_mag.current_rounds -= 3 nailgun.in_chamber = null nailgun.load_into_chamber() diff --git a/code/game/objects/structures/barricade/deployable.dm b/code/game/objects/structures/barricade/deployable.dm index e53c917dc2bb..f95e7f1286e3 100644 --- a/code/game/objects/structures/barricade/deployable.dm +++ b/code/game/objects/structures/barricade/deployable.dm @@ -31,7 +31,7 @@ if(HAS_TRAIT(item, TRAIT_TOOL_CROWBAR)) if(user.action_busy) return - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_NOVICE)) to_chat(user, SPAN_WARNING("You do not know how to collapse [src] using a crowbar...")) return user.visible_message(SPAN_NOTICE("[user] starts collapsing [src]."), \ diff --git a/code/game/objects/structures/barricade/metal.dm b/code/game/objects/structures/barricade/metal.dm index 3e79af2e21e1..f16e6851341b 100644 --- a/code/game/objects/structures/barricade/metal.dm +++ b/code/game/objects/structures/barricade/metal.dm @@ -48,7 +48,7 @@ if(!..()) return FALSE - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_NOVICE)) if(!silent) to_chat(user, SPAN_WARNING("You're not trained to repair [src]...")) return FALSE diff --git a/code/game/objects/structures/barricade/plasteel.dm b/code/game/objects/structures/barricade/plasteel.dm index 1acedae9997d..fb5a08954a5d 100644 --- a/code/game/objects/structures/barricade/plasteel.dm +++ b/code/game/objects/structures/barricade/plasteel.dm @@ -69,7 +69,7 @@ if(!..()) return FALSE - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_NOVICE)) if(!silent) to_chat(user, SPAN_WARNING("You're not trained to repair [src]...")) return FALSE @@ -95,7 +95,7 @@ if(busy || tool_cooldown > world.time) return tool_cooldown = world.time + 10 - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You are not trained to assemble [src]...")) return @@ -112,7 +112,7 @@ return if(HAS_TRAIT(item, TRAIT_TOOL_CROWBAR)) - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You are not trained to modify [src]...")) return playsound(src.loc, 'sound/items/Crowbar.ogg', 25, 1) @@ -136,7 +136,7 @@ if(busy || tool_cooldown > world.time) return tool_cooldown = world.time + 10 - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You are not trained to assemble [src]...")) return if(!do_after(user, 10, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, src)) @@ -151,7 +151,7 @@ if(busy || tool_cooldown > world.time) return tool_cooldown = world.time + 10 - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You are not trained to assemble [src]...")) return if(!do_after(user, 10, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, src)) @@ -169,7 +169,7 @@ if(busy || tool_cooldown > world.time) return tool_cooldown = world.time + 10 - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You are not trained to assemble [src]...")) return var/turf/open/T = loc @@ -190,7 +190,7 @@ if(busy || tool_cooldown > world.time) return tool_cooldown = world.time + 10 - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You are not trained to assemble [src]...")) return user.visible_message(SPAN_NOTICE("[user] starts unseating [src]'s panels."), diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm index d78c0faeeca8..8d6178199755 100644 --- a/code/modules/clothing/under/ties.dm +++ b/code/modules/clothing/under/ties.dm @@ -584,6 +584,11 @@ desc = "A brown synthcotton webbing that is similar in function to civilian tool aprons, but is more durable for field usage." hold = /obj/item/storage/internal/accessory/tool_webbing +/obj/item/clothing/accessory/storage/tool_webbing/small + name = "Small Tool Webbing" + desc = "A brown synthcotton webbing that is similar in function to civilian tool aprons, but is more durable for field usage. This is the small low-budget version." + hold = /obj/item/storage/internal/accessory/tool_webbing/small + /obj/item/storage/internal/accessory/tool_webbing storage_slots = 7 can_hold = list( @@ -596,6 +601,20 @@ /obj/item/device/multitool, ) +/obj/item/storage/internal/accessory/tool_webbing/small + storage_slots = 6 + +/obj/item/clothing/accessory/storage/tool_webbing/small/equipped + hold = /obj/item/storage/internal/accessory/tool_webbing/small/equipped + +/obj/item/storage/internal/accessory/tool_webbing/small/equipped/fill_preset_inventory() + new /obj/item/tool/screwdriver(src) + new /obj/item/tool/wrench(src) + new /obj/item/tool/weldingtool(src) + new /obj/item/tool/crowbar(src) + new /obj/item/tool/wirecutters(src) + new /obj/item/device/multitool(src) + /obj/item/clothing/accessory/storage/tool_webbing/equipped hold = /obj/item/storage/internal/accessory/tool_webbing/equipped diff --git a/code/modules/cm_marines/anti_air.dm b/code/modules/cm_marines/anti_air.dm index e867c0d64083..3c69a0fe241a 100644 --- a/code/modules/cm_marines/anti_air.dm +++ b/code/modules/cm_marines/anti_air.dm @@ -131,7 +131,7 @@ GLOBAL_DATUM(almayer_aa_cannon, /obj/structure/anti_air_cannon) if(..()) return - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You have no idea how to use that console.")) return TRUE diff --git a/code/modules/cm_marines/equipment/kit_boxes.dm b/code/modules/cm_marines/equipment/kit_boxes.dm index 8d5a478fa620..75a20e6a5bb6 100644 --- a/code/modules/cm_marines/equipment/kit_boxes.dm +++ b/code/modules/cm_marines/equipment/kit_boxes.dm @@ -286,15 +286,15 @@ specialist_assignment = "Scout" user.skills.set_skill(SKILL_SPEC_WEAPONS, SKILL_SPEC_SCOUT) //this is to be able to use C4s that are coming with the kit - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) - user.skills.set_skill(SKILL_ENGINEER, SKILL_ENGINEER_TRAINED) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_NOVICE)) + user.skills.set_skill(SKILL_ENGINEER, SKILL_ENGINEER_NOVICE) if("Demo") spec_box = new /obj/item/storage/box/spec/demolitionist(T) specialist_assignment = "Demo" user.skills.set_skill(SKILL_SPEC_WEAPONS, SKILL_SPEC_ROCKET) //this is to be able to use C4s that are coming with the kit - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) - user.skills.set_skill(SKILL_ENGINEER, SKILL_ENGINEER_TRAINED) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_NOVICE)) + user.skills.set_skill(SKILL_ENGINEER, SKILL_ENGINEER_NOVICE) if(specialist_assignment) user.put_in_hands(spec_box) card.set_assignment((user.assigned_squad && squad_assignment_update ? (user.assigned_squad.name + " ") : "") + card.assignment + " ([specialist_assignment])") diff --git a/code/modules/cm_marines/equipment/mortar/mortar_shells.dm b/code/modules/cm_marines/equipment/mortar/mortar_shells.dm index dae0910cc9b4..05da2e3a8d9b 100644 --- a/code/modules/cm_marines/equipment/mortar/mortar_shells.dm +++ b/code/modules/cm_marines/equipment/mortar/mortar_shells.dm @@ -112,7 +112,7 @@ icon_state = initial(icon_state) /obj/item/mortar_shell/custom/attackby(obj/item/W as obj, mob/user) - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You do not know how to tinker with [name].")) return if(HAS_TRAIT(W, TRAIT_TOOL_SCREWDRIVER)) diff --git a/code/modules/cm_marines/equipment/mortar/mortars.dm b/code/modules/cm_marines/equipment/mortar/mortars.dm index 018bd7b9e11c..e7e258494e52 100644 --- a/code/modules/cm_marines/equipment/mortar/mortars.dm +++ b/code/modules/cm_marines/equipment/mortar/mortars.dm @@ -91,7 +91,7 @@ if(isyautja(user)) to_chat(user, SPAN_WARNING("You kick [src] but nothing happens.")) return - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_NOVICE)) to_chat(user, SPAN_WARNING("You don't have the training to use [src].")) return if(busy) @@ -213,7 +213,7 @@ var/obj/item/mortar_shell/mortar_shell = item var/turf/target_turf = locate(targ_x + dial_x + offset_x, targ_y + dial_y + offset_y, z) var/area/target_area = get_area(target_turf) - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_NOVICE)) to_chat(user, SPAN_WARNING("You don't have the training to fire [src].")) return if(busy) @@ -277,7 +277,7 @@ addtimer(CALLBACK(src, PROC_REF(handle_shell), target_turf, mortar_shell), travel_time) if(HAS_TRAIT(item, TRAIT_TOOL_WRENCH)) - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_NOVICE)) to_chat(user, SPAN_WARNING("You don't have the training to undeploy [src].")) return if(fixed) @@ -410,7 +410,7 @@ var/turf/deploy_turf = get_turf(user) if(!deploy_turf) return - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_NOVICE)) to_chat(user, SPAN_WARNING("You don't have the training to deploy [src].")) return var/area/area = get_area(deploy_turf) diff --git a/code/modules/cm_marines/orbital_cannon.dm b/code/modules/cm_marines/orbital_cannon.dm index a4286b043eba..d3eca0ea3ba3 100644 --- a/code/modules/cm_marines/orbital_cannon.dm +++ b/code/modules/cm_marines/orbital_cannon.dm @@ -681,7 +681,7 @@ GLOBAL_LIST_EMPTY(orbital_cannon_cancellation) if(..()) return - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You have no idea how to use that console.")) return TRUE diff --git a/code/modules/cm_tech/implements/xeno_handler.dm b/code/modules/cm_tech/implements/xeno_handler.dm index cbafec7499ee..d3340ffcdff8 100644 --- a/code/modules/cm_tech/implements/xeno_handler.dm +++ b/code/modules/cm_tech/implements/xeno_handler.dm @@ -53,7 +53,7 @@ SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, SKILL_POLICE = SKILL_POLICE_SKILLED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_LEADERSHIP = SKILL_LEAD_MASTER, SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_EXPERT, diff --git a/code/modules/defenses/defenses.dm b/code/modules/defenses/defenses.dm index af4e497862fa..fef8498f802a 100644 --- a/code/modules/defenses/defenses.dm +++ b/code/modules/defenses/defenses.dm @@ -185,7 +185,7 @@ additional_shock++ if(prob(50)) var/mob/living/carbon/human/H = user - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_NOVICE)) if(turned_on) additional_shock++ H.electrocute_act(40, src, additional_shock)//god damn Hans... @@ -204,7 +204,7 @@ to_chat(user, SPAN_WARNING("You've hacked \the [src], it's now ours!")) return - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_NOVICE)) to_chat(user, SPAN_WARNING("You don't have the training to do this.")) return // if the sentry can have key interacted with @@ -368,7 +368,7 @@ to_chat(user, SPAN_WARNING("It must be anchored to the ground before you can activate it.")) return - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) if(locked) to_chat(user, SPAN_WARNING("The control panel on [src] is locked to non-engineers.")) return @@ -490,7 +490,7 @@ return if(!friendly_faction(usr.faction)) return - if(!skillcheck(usr, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(usr, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(usr, SPAN_WARNING("You don't have the training to do this.")) return diff --git a/code/modules/defenses/handheld.dm b/code/modules/defenses/handheld.dm index 5b5831c9bb15..242d902cbd13 100644 --- a/code/modules/defenses/handheld.dm +++ b/code/modules/defenses/handheld.dm @@ -114,7 +114,8 @@ . += list("DMR Upgrade" = image(icon = 'icons/obj/structures/machinery/defenses/sentry.dmi', icon_state = "DMR uac_sentry_handheld")) . += list( "Shotgun Upgrade" = image(icon = 'icons/obj/structures/machinery/defenses/sentry.dmi', icon_state = "Shotgun uac_sentry_handheld"), - "Mini-Sentry Upgrade" = image(icon = 'icons/obj/structures/machinery/defenses/sentry.dmi', icon_state = "Mini uac_sentry_handheld") + "Mini-Sentry Upgrade" = image(icon = 'icons/obj/structures/machinery/defenses/sentry.dmi', icon_state = "Mini uac_sentry_handheld"), + "Omni-Sentry Upgrade" = image(icon = 'icons/obj/structures/machinery/defenses/sentry.dmi', icon_state="Normal uac_sentry_handheld") ) /obj/item/defenses/handheld/sentry/upgrade_string_to_type(upgrade_string) @@ -125,6 +126,8 @@ return /obj/item/defenses/handheld/sentry/shotgun if("Mini-Sentry Upgrade") return /obj/item/defenses/handheld/sentry/mini + if("Omni-Sentry Upgrade") + return /obj/item/defenses/handheld/sentry/omni /obj/item/defenses/handheld/sentry/dmr name = "handheld UA 725-D sniper sentry" @@ -143,6 +146,12 @@ defense_type = /obj/structure/machinery/defenses/sentry/mini deployment_time = 0.75 SECONDS +/obj/item/defenses/handheld/sentry/omni + name = "handheld UA 571-D omnidirectional sentry gun" + icon = 'icons/obj/structures/machinery/defenses/sentry.dmi' + icon_state = "Normal uac_sentry_handheld" + defense_type = /obj/structure/machinery/defenses/sentry/omni + /obj/item/defenses/handheld/sentry/wy name = "handheld WY 202-GMA1 smart sentry" desc = "A compact version of the Weyland-Yutani defenses. Designed for deployment in the field." diff --git a/code/modules/defenses/sentry.dm b/code/modules/defenses/sentry.dm index 695b3387d909..f04432f2e4e0 100644 --- a/code/modules/defenses/sentry.dm +++ b/code/modules/defenses/sentry.dm @@ -223,7 +223,7 @@ if(istype(O, ammo)) var/obj/item/ammo_magazine/M = O - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI) || user.action_busy) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED) || user.action_busy) return if(ammo.current_rounds) @@ -900,5 +900,11 @@ omni_directional = TRUE handheld_type = /obj/item/defenses/handheld/sentry/upp/light +/obj/structure/machinery/defenses/sentry/omni + name = "\improper UA 571-D omnidirectional sentry gun" + omni_directional = TRUE + damage_mult = 0.7 + sentry_range = 4 + #undef SENTRY_FIREANGLE #undef SENTRY_RANGE diff --git a/code/modules/defenses/sentry_computer.dm b/code/modules/defenses/sentry_computer.dm index 59c6409d552c..ce62ea2f8325 100644 --- a/code/modules/defenses/sentry_computer.dm +++ b/code/modules/defenses/sentry_computer.dm @@ -308,7 +308,7 @@ . = ..() if(!on) return UI_CLOSE - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) return UI_UPDATE @@ -383,7 +383,7 @@ . = ..() if(.) return - if(!skillcheck(usr, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(usr, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(usr, SPAN_WARNING("You are not authorised to configure the sentry.")) return if(params["index"]) diff --git a/code/modules/desert_dam/motion_sensor/sensortower.dm b/code/modules/desert_dam/motion_sensor/sensortower.dm index a3f33d4da078..41859167458f 100644 --- a/code/modules/desert_dam/motion_sensor/sensortower.dm +++ b/code/modules/desert_dam/motion_sensor/sensortower.dm @@ -101,7 +101,7 @@ add_fingerprint(user) - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You have no clue how this thing works...")) return FALSE @@ -135,7 +135,7 @@ to_chat(user, SPAN_WARNING("You need a stronger blowtorch!")) return if(buildstate == SENSORTOWER_BUILDSTATE_BLOWTORCH && !is_on) - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You have no clue how to repair this thing.")) return FALSE var/obj/item/tool/weldingtool/WT = O @@ -159,7 +159,7 @@ else if(HAS_TRAIT(O, TRAIT_TOOL_WIRECUTTERS)) if(buildstate == SENSORTOWER_BUILDSTATE_WIRECUTTERS && !is_on) - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You have no clue how to repair this thing.")) return FALSE playsound(loc, 'sound/items/Wirecutter.ogg', 25, 1) @@ -176,7 +176,7 @@ return TRUE else if(HAS_TRAIT(O, TRAIT_TOOL_WRENCH)) if(buildstate == SENSORTOWER_BUILDSTATE_WRENCH && !is_on) - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You have no clue how to repair this thing.")) return FALSE playsound(loc, 'sound/items/Ratchet.ogg', 25, 1) diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index 3f419333d218..dec4a7f3fbe0 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -412,6 +412,8 @@ /mob/living/carbon/human/get_item_by_slot(slot_id) switch(slot_id) + if(WEAR_ACCESSORY) + return w_uniform.accessories if(WEAR_BACK) return back if(WEAR_FACE) diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 37a6c46c23cc..058f8ae4aabc 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -420,8 +420,10 @@ GLOBAL_LIST_INIT(limb_types_by_name, list( if(skillcheck(src, SKILL_ENGINEER, SKILL_ENGINEER_MASTER)) return DURATION_MULTIPLIER_TIER_3 else if(skillcheck(src, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) - return DURATION_MULTIPLIER_TIER_2 + return (DURATION_MULTIPLIER_TIER_3 + DURATION_MULTIPLIER_TIER_2) / 2 else if(skillcheck(src, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) + return DURATION_MULTIPLIER_TIER_2 + else if(skillcheck(src, SKILL_ENGINEER, SKILL_ENGINEER_NOVICE)) return DURATION_MULTIPLIER_TIER_1 // Construction if(SKILL_CONSTRUCTION) diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 6c1c234eaadd..7183ce8bf660 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -373,7 +373,7 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( . = list(desc) if(stat & BROKEN) - . += SPAN_INFO("It appears to be completely broken. It's hard to see what else is wrong with it.") + . += SPAN_INFO("It appears to be completely broken. Bash it open with any tool.") return if(opened) if(has_electronics && terminal) @@ -559,7 +559,7 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( if(HAS_TRAIT(W, TRAIT_TOOL_CROWBAR) && opened) if(has_electronics == 1) if(user.action_busy) return - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You have no idea how to deconstruct [src].")) return if(terminal) @@ -591,7 +591,7 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( opened = APC_COVER_OPEN update_icon() else if(istype(W, /obj/item/cell) && opened) //Trying to put a cell inside - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You have no idea how to fit [W] into [src].")) return if(cell) @@ -609,7 +609,7 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( update_icon() else if(HAS_TRAIT(W, TRAIT_TOOL_SCREWDRIVER)) //Haxing if(opened) - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("\The [src]'s wiring confuses you.")) return if(cell) @@ -643,7 +643,7 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( tgui_interact(user) //then close them and open up the new ones (wires/panel) else if(istype(W, /obj/item/card/id)) //Trying to unlock the interface with an ID card - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You're not sure where to swipe \the [W] on [src].")) return if(opened) @@ -661,7 +661,7 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( else to_chat(user, SPAN_WARNING("Access denied.")) else if(iswire(W) && !terminal && opened && has_electronics != 2) - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You have no idea what to do with [src].")) return if(loc:intact_tile) @@ -688,7 +688,7 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( make_terminal() terminal.connect_to_network() else if(HAS_TRAIT(W, TRAIT_TOOL_WIRECUTTERS) && terminal && opened && has_electronics != 2) - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You have no idea what to do with [W].")) return if(loc:intact_tile) @@ -712,7 +712,7 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( qdel(terminal) terminal = null else if(istype(W, /obj/item/circuitboard/apc) && opened && has_electronics == 0 && !(stat & BROKEN)) - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You have no idea what to do with [W].")) return user.visible_message(SPAN_NOTICE("[user] starts inserting the power control board into [src]."), @@ -724,7 +724,7 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( SPAN_NOTICE("You insert the power control board into [src].")) qdel(W) else if(istype(W, /obj/item/circuitboard/apc) && opened && has_electronics == 0 && (stat & BROKEN)) - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You have no idea what to do with [W].")) return to_chat(user, SPAN_WARNING("You cannot put the board inside, the frame is damaged.")) @@ -733,7 +733,7 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( if(!HAS_TRAIT(W, TRAIT_TOOL_BLOWTORCH)) to_chat(user, SPAN_WARNING("You need a stronger blowtorch!")) return - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You have no idea what to do with [W].")) return var/obj/item/tool/weldingtool/WT = W @@ -750,7 +750,7 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( deconstruct() return else if(istype(W, /obj/item/frame/apc) && opened && (stat & BROKEN)) - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You have no idea what to do with [W].")) return if(has_electronics) @@ -908,7 +908,7 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( if(usr == user && opened && (!isRemoteControlling(user))) if(cell) - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You have no idea how to remove the power cell from [src].")) return user.put_in_hands(cell) @@ -1043,7 +1043,7 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list( else if(prob(H.getBrainLoss())) to_chat(user, SPAN_WARNING("You momentarily forget how to use [src].")) return 0 - if(!skillcheck(H, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(H, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(H, SPAN_WARNING("You don't know how to use \the [src]'s interface.")) return return 1 diff --git a/code/modules/projectiles/gun_helpers.dm b/code/modules/projectiles/gun_helpers.dm index efc7abf3aa20..f03ffc05436b 100644 --- a/code/modules/projectiles/gun_helpers.dm +++ b/code/modules/projectiles/gun_helpers.dm @@ -536,6 +536,22 @@ DEFINES in setup.dm, referenced here. var/obj/item/active_hand = get_active_hand() if(active_hand) + if(active_hand.preferred_storage) + for(var/storage in active_hand.preferred_storage) + var/list/items_in_slot + if(islist(get_item_by_slot(active_hand.preferred_storage[storage]))) + items_in_slot = get_item_by_slot(active_hand.preferred_storage[storage]) + else + items_in_slot = list(get_item_by_slot(active_hand.preferred_storage[storage])) + + for(var/item_in_slot in items_in_slot) + if(istype(item_in_slot, storage)) + var/slot = active_hand.preferred_storage[storage] + if(slot == WEAR_ACCESSORY) + slot = WEAR_IN_ACCESSORY + + if(equip_to_slot_if_possible(active_hand, slot, 1, 0, 1, 1)) + return 1 if(w_uniform) for(var/obj/accessory in w_uniform.accessories) var/obj/item/storage/internal/accessory/holster/holster = accessory diff --git a/code/modules/projectiles/guns/smgs.dm b/code/modules/projectiles/guns/smgs.dm index 69fd5d968750..6838abb42586 100644 --- a/code/modules/projectiles/guns/smgs.dm +++ b/code/modules/projectiles/guns/smgs.dm @@ -657,6 +657,7 @@ start_automatic = FALSE var/nailing_speed = 2 SECONDS //Time to apply a sheet for patching. Also haha name. Try to keep sync with soundbyte duration var/repair_sound = 'sound/weapons/nailgun_repair_long.ogg' + var/material_per_repair = 1 /obj/item/weapon/gun/smg/nailgun/set_gun_config_values() ..() @@ -687,3 +688,11 @@ if(.) click_empty(user) return FALSE + +/obj/item/weapon/gun/smg/nailgun/compact/tactical + name = "tactical compact nailgun" + desc = "A carpentry tool, used to drive nails into tough surfaces. This one is military grade, it's olive drab and tacticool. Cannot fire nails as a projectile." + icon_state = "tnailgun" + item_state = "tnailgun" + w_class = SIZE_SMALL + material_per_repair = 2 diff --git a/code/modules/projectiles/magazines/specialist.dm b/code/modules/projectiles/magazines/specialist.dm index 547d231e1c69..38b9137be54f 100644 --- a/code/modules/projectiles/magazines/specialist.dm +++ b/code/modules/projectiles/magazines/specialist.dm @@ -265,7 +265,7 @@ . += SPAN_NOTICE("Contains a warhead.") /obj/item/ammo_magazine/rocket/custom/attackby(obj/item/W as obj, mob/user as mob) - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You do not know how to tinker with [name].")) return if(current_rounds <= 0) diff --git a/code/modules/reagents/chemistry_machinery/chem_master.dm b/code/modules/reagents/chemistry_machinery/chem_master.dm index 6f6d45b6712e..2394146918a9 100644 --- a/code/modules/reagents/chemistry_machinery/chem_master.dm +++ b/code/modules/reagents/chemistry_machinery/chem_master.dm @@ -434,7 +434,7 @@ icon_state = "industry_mixer0" base_state = "industry_mixer" req_skill = SKILL_ENGINEER - req_skill_level = SKILL_ENGINEER_ENGI + req_skill_level = SKILL_ENGINEER_TRAINED pill_maker = FALSE vial_maker = TRUE max_pill_count = 0 diff --git a/code/modules/vehicles/hardpoints/hardpoint.dm b/code/modules/vehicles/hardpoints/hardpoint.dm index f94d0dc6b373..f0b519759727 100644 --- a/code/modules/vehicles/hardpoints/hardpoint.dm +++ b/code/modules/vehicles/hardpoints/hardpoint.dm @@ -336,7 +336,7 @@ . = ..() if(health <= 0) . += "It's busted!" - else if(isobserver(user) || (ishuman(user) && (skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED) || skillcheck(user, SKILL_VEHICLE, SKILL_VEHICLE_CREWMAN)))) + else if(isobserver(user) || (ishuman(user) && (skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_NOVICE) || skillcheck(user, SKILL_VEHICLE, SKILL_VEHICLE_CREWMAN)))) . += "It's at [round(get_integrity_percent(), 1)]% integrity!" //reloading hardpoint - take mag from backup clips and replace current ammo with it. Will change in future. Called via weapons loader diff --git a/code/modules/vehicles/hardpoints/holder/holder.dm b/code/modules/vehicles/hardpoints/holder/holder.dm index df91cbc51b65..948142383cca 100644 --- a/code/modules/vehicles/hardpoints/holder/holder.dm +++ b/code/modules/vehicles/hardpoints/holder/holder.dm @@ -23,7 +23,7 @@ . = ..() if(health <= 0) . += "It's busted!" - else if(isobserver(user) || (ishuman(user) && (skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED) || skillcheck(user, SKILL_VEHICLE, SKILL_VEHICLE_CREWMAN)))) + else if(isobserver(user) || (ishuman(user) && (skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_NOVICE) || skillcheck(user, SKILL_VEHICLE, SKILL_VEHICLE_CREWMAN)))) . += "It's at [round(get_integrity_percent(), 1)]% integrity!" for(var/obj/item/hardpoint/H in hardpoints) . += "There is \a [H] module installed on [src]." @@ -100,7 +100,7 @@ /obj/item/hardpoint/holder/attackby(obj/item/O, mob/user) if(HAS_TRAIT(O, TRAIT_TOOL_CROWBAR)) - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You don't know what to do with \the [O] on \the [src].")) return @@ -113,7 +113,7 @@ return if(istype(O, /obj/item/hardpoint)) - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You don't know what to do with \the [O] on \the [src].")) return diff --git a/code/modules/vehicles/multitile/multitile_hardpoints.dm b/code/modules/vehicles/multitile/multitile_hardpoints.dm index b94b8459890f..5d1612852f8c 100644 --- a/code/modules/vehicles/multitile/multitile_hardpoints.dm +++ b/code/modules/vehicles/multitile/multitile_hardpoints.dm @@ -63,7 +63,7 @@ //Putting on hardpoints //Similar to repairing stuff, down to the time delay /obj/vehicle/multitile/proc/install_hardpoint(obj/item/O, mob/user) - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You don't know what to do with [O] on \the [src].")) return @@ -132,7 +132,7 @@ //User-orientated proc for taking of hardpoints //Again, similar to the above ones /obj/vehicle/multitile/proc/uninstall_hardpoint(obj/item/O, mob/user) - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You don't know what to do with \the [O] on \the [src].")) return diff --git a/icons/mob/humans/onmob/items_lefthand_1.dmi b/icons/mob/humans/onmob/items_lefthand_1.dmi index cb80cb6cc10c..45a3b51ecdf2 100644 Binary files a/icons/mob/humans/onmob/items_lefthand_1.dmi and b/icons/mob/humans/onmob/items_lefthand_1.dmi differ diff --git a/icons/mob/humans/onmob/items_righthand_1.dmi b/icons/mob/humans/onmob/items_righthand_1.dmi index 7bad7eb2c583..a2e7e96bac13 100644 Binary files a/icons/mob/humans/onmob/items_righthand_1.dmi and b/icons/mob/humans/onmob/items_righthand_1.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_faction/colony.dmi b/icons/obj/items/weapons/guns/guns_by_faction/colony.dmi index 17e7e6f221ae..24f9f9b63871 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_faction/colony.dmi and b/icons/obj/items/weapons/guns/guns_by_faction/colony.dmi differ