Skip to content

Commit

Permalink
Removes rangers, fixes goldman (#2521)
Browse files Browse the repository at this point in the history
Removes rangers and fixes goldman jobs
  • Loading branch information
Koshenko authored May 17, 2024
1 parent ba2ef80 commit 69deaa1
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 18 deletions.
20 changes: 20 additions & 0 deletions _maps/minimammoth.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions mojave/code/modules/jobs/job_types/goldman/goldman.dm
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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,\
Expand All @@ -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))
Expand Down
4 changes: 0 additions & 4 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 69deaa1

Please sign in to comment.