Reduces the Khans to a loadout, Re-adds the Den faction (#438)

* Reduces the Khans to a loadout, Re-adds Den

* That time I forgot to fix the map

* Update Pahrump-Surface-2.dmm

* Forgot a door

* Forgot loadouts

* Gives the den a colormate

* Once again updates the Den to account for map changes

---------

Co-authored-by: xTrainx <[email protected]>

code/__DEFINES/jobs.dm

@@ -143,13 +143,15 @@
 
 #define WASTELAND		(1<<9)
 
-#define F13WASTELANDER	(1<<1)
-#define F13RAIDER		(1<<2)
-#define F13PUSHER		(1<<3)
-#define F13DETECTIVE	(1<<4)
-#define F13TRIBAL		(1<<5)
-#define F13BWSETTLER	(1<<6)
-#define F13BWDEPUTY		(1<<7)
+#define F13MOBBOSS		(1<<0)
+#define F13ENFORCER		(1<<1)
+#define F13DENDOCTOR    (1<<2)
+#define F13WASTELANDER	(1<<3)
+#define F13RAIDER		(1<<4)
+#define F13DETECTIVE	(1<<5)
+#define F13TRIBAL		(1<<6)
+#define F13BWSETTLER	(1<<7)
+#define F13BWDEPUTY		(1<<8)
 
 #define ENCLAVE			(1<<10)
 

code/__DEFINES/radio.dm

@@ -73,9 +73,9 @@
 #define RADIO_KEY_LEGION "l"
 #define RADIO_TOKEN_LEGION ":l"
 
-#define RADIO_CHANNEL_KHANS "Khans"
-#define RADIO_KEY_KHANS "a"
-#define RADIO_TOKEN_KHANS ":a"
+#define RADIO_CHANNEL_DEN "Den"
+#define RADIO_KEY_DEN "j"
+#define RADIO_TOKEN_DEN ":j"
 
 #define RADIO_CHANNEL_BW "Blackwater"
 #define RADIO_KEY_BW "q"

code/game/communications.dm

@@ -110,7 +110,7 @@ GLOBAL_LIST_INIT(radiochannels, list(
 	RADIO_CHANNEL_TOWN = FREQ_TOWN,
 	RADIO_CHANNEL_LEGION = FREQ_LEGION,
 	RADIO_CHANNEL_RANGER = FREQ_RANGER,
-	RADIO_CHANNEL_KHANS = FREQ_KHANS,
+	RADIO_CHANNEL_DEN = FREQ_DEN,
 	RADIO_CHANNEL_BW = FREQ_BW
 ))
 
@@ -135,7 +135,7 @@ GLOBAL_LIST_INIT(reverseradiochannels, list(
 	"[FREQ_TOWN]" = RADIO_CHANNEL_TOWN,
 	"[FREQ_LEGION]" = RADIO_CHANNEL_LEGION,
 	"[FREQ_RANGER]" = RADIO_CHANNEL_RANGER,
-	"[FREQ_KHANS]" = RADIO_CHANNEL_KHANS,
+	"[FREQ_DEN]" = RADIO_CHANNEL_DEN,
 	"[FREQ_BW]" = RADIO_CHANNEL_BW
 ))
 

code/game/objects/effects/landmarks.dm

@@ -773,9 +773,16 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
 	name = "Outlaw"
 	icon_state = "Raider"
 
-/obj/effect/landmark/start/f13/pusher
-	name = "Great Khan"
-	icon_state = "Pusher"
+/obj/effect/landmark/start/f13/enforcer
+	name = "Den Mob Enforcer"
+	icon_state = "Enforcer"
+
+/obj/effect/landmark/start/f13/dendoctor
+	name = "Den Doctor"
+	icon_state = "Doctor"
+/obj/effect/landmark/start/f13/mobboss
+	name = "Den Mob Boss"
+	icon_state = "Boss"
 
 /obj/effect/landmark/start/f13/preacher
 	name = "Preacher"

code/game/objects/items/devices/radio/encryptionkey.dm

@@ -208,11 +208,11 @@
 	independent = TRUE
 	channels = list(RADIO_CHANNEL_CENTCOM = 1)
 
-/obj/item/encryptionkey/headset_khans
-	name = "Khan radio encryption key"
-	desc = "An encryption key for a radio headset.  To access the Khan channel, use :a."
+/obj/item/encryptionkey/headset_den
+	name = "Den radio encryption key"
+	desc = "An encryption key for a radio headset. To access the Den channel, use :j."
 	icon_state = "cypherkey"
-	channels = list(RADIO_CHANNEL_KHANS = 1)
+	channels = list(RADIO_CHANNEL_DEN = 1)
 
 /obj/item/encryptionkey/headset_bw
 	name = "Blackwater radio encryption key"

code/game/objects/items/devices/radio/headset.dm

@@ -19,7 +19,7 @@ GLOBAL_LIST_INIT(channel_tokens, list(
 	RADIO_CHANNEL_TOWN = RADIO_TOKEN_TOWN,
 	RADIO_CHANNEL_LEGION = RADIO_TOKEN_LEGION,
 	RADIO_CHANNEL_RANGER = RADIO_TOKEN_RANGER,
-	RADIO_CHANNEL_KHANS = RADIO_TOKEN_KHANS,
+	RADIO_CHANNEL_DEN = RADIO_TOKEN_DEN,
 	RADIO_CHANNEL_BW = RADIO_TOKEN_BW
 ))
 
@@ -386,12 +386,11 @@ GLOBAL_LIST_INIT(channel_tokens, list(
 /obj/item/radio/headset/headset_enclave/command
 	command = TRUE
 
-/obj/item/radio/headset/headset_khans
-	name = "khan radio headset"
-	desc = "This is used by the Khans.\nTo access the Khan channel, use :h."
-	icon_state = "syndie_headset"
-	item_state = "headset_alt"
-	keyslot = new /obj/item/encryptionkey/headset_khans
+/obj/item/radio/headset/headset_den
+	name = "den radio headset"
+	desc = "This is used by the den. \nTo access the den channel, use :j."
+	icon_state = "mine_headset"
+	keyslot = new /obj/item/encryptionkey/headset_den
 
 /obj/item/radio/headset/headset_bw
 	name = "blackwater radio headset"

code/modules/clothing/under/f13.dm

@@ -1755,7 +1755,7 @@
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 30, "fire" = 20, "acid" = 50)
 
 /obj/item/clothing/under/f13/densuit
-	name = "mafioso outfit"
+	name = "the den outfit"
 	desc = "A dark grey, and finely pressed suit, complete with kneepads and a suspiciously golden silk shirt, only the best."
 	icon_state = "den_suit"
 	item_state = "den_suit"

code/modules/fallout/misc/gang_items.dm

@@ -248,11 +248,6 @@
 	cost = 75
 	item_path = /obj/item/grenade/f13/dynamite
 
-/datum/gang_item/equipment/greatkhanheadset
-	name = "Great Khan Headset"
-	cost = 10 
-	item_path = /obj/item/radio/headset/headset_khans
-
 
 ///////////////////
 //EQUIPMENT

code/modules/fallout/misc/gangs.dm

@@ -4,8 +4,7 @@
 GLOBAL_LIST_INIT(gang_names, list ( \
 "raider", \
 "raiders", \
-"great khan", \
-"great khans", \
+"den", \
 "gang", \
 "gangs", \
 ))
@@ -79,7 +78,6 @@ GLOBAL_DATUM_INIT(greatkhans, /datum/gang/greatkhans, new)
 		/datum/gang_item/clothing/prostitute_dress,
 		/datum/gang_item/clothing/hat,
 		/datum/gang_item/clothing/glasses/sunglasses,
-		/datum/gang_item/equipment/greatkhanheadset
 	)
 
 /datum/gang/New(starting_members, starting_leader)