Reverted some fireman skills as per request

cmss13-devs · May 30, 2024 · 8d5c96e · 8d5c96e
1 parent d7c77ae
commit 8d5c96e
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 12 deletions.
diff --git a/code/datums/skills/civilian.dm b/code/datums/skills/civilian.dm
@@ -8,7 +8,6 @@ CIVILIAN
 	name = "Civilian"
 	skills = list(
 		SKILL_CQC = SKILL_CQC_DEFAULT,
-		SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
 		SKILL_FIREARMS = SKILL_FIREARMS_CIVILIAN,
 		SKILL_ENDURANCE = SKILL_ENDURANCE_NONE,
 		SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
@@ -18,7 +17,6 @@ CIVILIAN
 	name = "Weyland-Yutani Manager" // Semi-competent leader with basic knowledge in most things.
 	skills = list(
 		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
-		SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
 		SKILL_LEADERSHIP = SKILL_LEAD_MASTER,
 		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,

diff --git a/code/datums/skills/misc.dm b/code/datums/skills/misc.dm
@@ -52,7 +52,6 @@ MISCELLANEOUS
 	name = "Souto Man"
 	skills = list(
 		SKILL_CQC = SKILL_CQC_MASTER,
-		SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
 		SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
 		SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,

diff --git a/code/datums/skills/upp.dm b/code/datums/skills/upp.dm
@@ -138,7 +138,6 @@ UNITED PROGRESSIVE PEOPLES
 	name = "UPP Conscript"
 	skills = list(
 		SKILL_FIREARMS = SKILL_FIREARMS_TRAINED,
-		SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
 	)
 
 
@@ -152,7 +151,6 @@ UNITED PROGRESSIVE PEOPLES
 		SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
 		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
 		SKILL_CQC = SKILL_CQC_TRAINED,
-		SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
 		SKILL_FIREARMS = SKILL_FIREARMS_TRAINED,
 		SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
 		SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT,

diff --git a/code/datums/skills/uscm.dm b/code/datums/skills/uscm.dm
@@ -6,12 +6,8 @@ United States Colonial Marines
 
 /datum/skills/pfc
 	name = "Private"
-	skills = list(
-		SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
-	)
+	skills = list()
 	//same as default
-	// I added fireman skills here. I suspect that since shooting skills aren't here, they are in the 'default' area, but I don't know where that is
-	// so I've just pasted the fireman skill across every role in the USCM category instead.
 
 /datum/skills/pfc/crafty
 	name = "Crafty Private"
@@ -123,7 +119,6 @@ MILITARY NONCOMBATANT
 /datum/skills/nurse
 	name = "Nurse"
 	skills = list(
-		SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
 		SKILL_FIREARMS = SKILL_FIREARMS_CIVILIAN,
 		SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR,
 		SKILL_SURGERY = SKILL_SURGERY_NOVICE,
@@ -132,7 +127,6 @@ MILITARY NONCOMBATANT
 /datum/skills/researcher
 	name = "Researcher"
 	skills = list(
-		SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
 		SKILL_FIREARMS = SKILL_FIREARMS_CIVILIAN,
 		SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR,
 		SKILL_SURGERY = SKILL_SURGERY_TRAINED,