From 69deaa117b0203818459716b7a6170c5635be26c Mon Sep 17 00:00:00 2001
From: Koshenko <53068134+Koshenko@users.noreply.github.com>
Date: Fri, 17 May 2024 00:21:40 -0700
Subject: [PATCH] Removes rangers, fixes goldman (#2521)

Removes rangers and fixes goldman jobs
---
 _maps/minimammoth.json                        | 20 +++++++++++++++++++
 .../mojave/jobs/departments/departments.dm    | 14 ++++++-------
 .../modules/jobs/job_types/goldman/goldman.dm | 12 +++++------
 tgstation.dme                                 |  4 ----
 4 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/_maps/minimammoth.json b/_maps/minimammoth.json
index b8db930cab7..3f281e5c23f 100644
--- a/_maps/minimammoth.json
+++ b/_maps/minimammoth.json
@@ -113,6 +113,26 @@
 		"shaman": {
 			"spawn_positions": 0,
 			"total_positions": 0
+		},
+		"standardgold": {
+			"spawn_positions": 0,
+			"total_positions": 0
+		},
+		"keeper": {
+			"spawn_positions": 0,
+			"total_positions": 0
+		},
+		"ringleader": {
+			"spawn_positions": 0,
+			"total_positions": 0
+		},
+		"roadrunner": {
+			"spawn_positions": 0,
+			"total_positions": 0
+		},
+		"unproven": {
+			"spawn_positions": 0,
+			"total_positions": 0
 		}
 	}
 }
diff --git a/mojave/code/modules/jobs/departments/mojave/jobs/departments/departments.dm b/mojave/code/modules/jobs/departments/mojave/jobs/departments/departments.dm
index 45662192e0d..b0a0a129662 100644
--- a/mojave/code/modules/jobs/departments/mojave/jobs/departments/departments.dm
+++ b/mojave/code/modules/jobs/departments/mojave/jobs/departments/departments.dm
@@ -42,14 +42,12 @@
  	//label_class = "Legion"
  	//latejoin_color = "#ffddf0"
 
-/datum/job_department/rangers
-	department_name = DEPARTMENT_RANGERS
-	department_bitflags = DEPARTMENT_BITFLAG_RANGERS
-	department_experience_type = EXP_TYPE_RANGERS
-	department_full_name = "Desert Rangers"
- 	//display_order = 0
- 	//label_class = "Legion"
- 	//latejoin_color = "#ffddf0"
+/// Depreciated. Not even human.
+//datum/job_department/rangers
+//	department_name = DEPARTMENT_RANGERS
+//	department_bitflags = DEPARTMENT_BITFLAG_RANGERS
+//	department_experience_type = EXP_TYPE_RANGERS
+//	department_full_name = "Desert Rangers"
 
 
 /datum/job_department/bos
diff --git a/mojave/code/modules/jobs/job_types/goldman/goldman.dm b/mojave/code/modules/jobs/job_types/goldman/goldman.dm
index 121414d856f..49c4b6dc855 100644
--- a/mojave/code/modules/jobs/job_types/goldman/goldman.dm
+++ b/mojave/code/modules/jobs/job_types/goldman/goldman.dm
@@ -1,17 +1,17 @@
-/datum/job/ms13/goldman/standard
+/datum/job/ms13/goldman/standardgold
 	title = "Goldman"
 	total_positions = 5
 	spawn_positions = 5
 	supervisors = "The Ringleader and the Keeper."
 	description = "Stay in line and listen to your superiors. Expand the influence and profits of the Goldman posse. Abide by established agreements and patrol the highways."
 
-	outfit = /datum/outfit/job/ms13/goldman/standard
+	outfit = /datum/outfit/job/ms13/goldman/standardgold
 
 	display_order = JOB_DISPLAY_ORDER_MS13_GOLDMAN
 
-/datum/outfit/job/ms13/goldman/standard
+/datum/outfit/job/ms13/goldman/standardgold
 	name = "_Goldman"
-	jobtype = 	 /datum/job/ms13/goldman/standard
+	jobtype = 	 /datum/job/ms13/goldman/standardgold
 	id =		 /obj/item/card/id/ms13/goldman
 	head = 		 /obj/item/clothing/head/helmet/ms13/cowboy/goldman
 	uniform =	 /obj/item/clothing/under/ms13/goldman
@@ -26,7 +26,7 @@
 		/obj/item/knife/ms13/hunting=1,\
 		/obj/item/ammo_box/ms13/c10mm=1)
 
-/datum/outfit/job/ms13/goldman/standard/pre_equip(mob/living/carbon/human/H)
+/datum/outfit/job/ms13/goldman/standardgold/pre_equip(mob/living/carbon/human/H)
 	..()
 
 	suit = pick(/obj/item/clothing/suit/ms13/goldman/duster_covered,\
@@ -41,7 +41,7 @@
 	else
 		glasses = null
 
-/datum/outfit/job/ms13/goldman/standard/post_equip(mob/living/carbon/human/H, visualsOnly)
+/datum/outfit/job/ms13/goldman/standardgold/post_equip(mob/living/carbon/human/H, visualsOnly)
 	. = ..()
 	var/obj/item/gun/ballistic/equipped_gun = H.get_item_by_slot(ITEM_SLOT_SUITSTORE)
 	if(!istype(equipped_gun))
diff --git a/tgstation.dme b/tgstation.dme
index b8ed7f1ca23..24ac2410ec0 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -4476,10 +4476,6 @@
 #include "mojave\code\modules\jobs\job_types\raiders\slick_cook.dm"
 #include "mojave\code\modules\jobs\job_types\raiders\slick_underboss.dm"
 #include "mojave\code\modules\jobs\job_types\raiders\slicker.dm"
-#include "mojave\code\modules\jobs\job_types\rangers\_desertrangers.dm"
-#include "mojave\code\modules\jobs\job_types\rangers\doctor.dm"
-#include "mojave\code\modules\jobs\job_types\rangers\ranger.dm"
-#include "mojave\code\modules\jobs\job_types\rangers\sharpshooter.dm"
 #include "mojave\code\modules\jobs\job_types\town\_town.dm"
 #include "mojave\code\modules\jobs\job_types\town\bartender.dm"
 #include "mojave\code\modules\jobs\job_types\town\bodyguard.dm"