Skip to content

Commit a91a16b

Browse files
committed
Removes rangers, fixes goldman
1 parent ba2ef80 commit a91a16b

File tree

3 files changed

+32
-14
lines changed

3 files changed

+32
-14
lines changed

_maps/minimammoth.json

+20
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,26 @@
113113
"shaman": {
114114
"spawn_positions": 0,
115115
"total_positions": 0
116+
},
117+
"standardgold": {
118+
"spawn_positions": 0,
119+
"total_positions": 0
120+
},
121+
"keeper": {
122+
"spawn_positions": 0,
123+
"total_positions": 0
124+
},
125+
"ringleader": {
126+
"spawn_positions": 0,
127+
"total_positions": 0
128+
},
129+
"roadrunner": {
130+
"spawn_positions": 0,
131+
"total_positions": 0
132+
},
133+
"unproven": {
134+
"spawn_positions": 0,
135+
"total_positions": 0
116136
}
117137
}
118138
}

mojave/code/modules/jobs/departments/mojave/jobs/departments/departments.dm

+6-8
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,12 @@
4242
//label_class = "Legion"
4343
//latejoin_color = "#ffddf0"
4444

45-
/datum/job_department/rangers
46-
department_name = DEPARTMENT_RANGERS
47-
department_bitflags = DEPARTMENT_BITFLAG_RANGERS
48-
department_experience_type = EXP_TYPE_RANGERS
49-
department_full_name = "Desert Rangers"
50-
//display_order = 0
51-
//label_class = "Legion"
52-
//latejoin_color = "#ffddf0"
45+
/// Depreciated. Not even human.
46+
//datum/job_department/rangers
47+
// department_name = DEPARTMENT_RANGERS
48+
// department_bitflags = DEPARTMENT_BITFLAG_RANGERS
49+
// department_experience_type = EXP_TYPE_RANGERS
50+
// department_full_name = "Desert Rangers"
5351

5452

5553
/datum/job_department/bos

mojave/code/modules/jobs/job_types/goldman/goldman.dm

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
/datum/job/ms13/goldman/standard
1+
/datum/job/ms13/goldman/standardgold
22
title = "Goldman"
33
total_positions = 5
44
spawn_positions = 5
55
supervisors = "The Ringleader and the Keeper."
66
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."
77

8-
outfit = /datum/outfit/job/ms13/goldman/standard
8+
outfit = /datum/outfit/job/ms13/goldman/standardgold
99

1010
display_order = JOB_DISPLAY_ORDER_MS13_GOLDMAN
1111

12-
/datum/outfit/job/ms13/goldman/standard
12+
/datum/outfit/job/ms13/goldman/standardgold
1313
name = "_Goldman"
14-
jobtype = /datum/job/ms13/goldman/standard
14+
jobtype = /datum/job/ms13/goldman/standardgold
1515
id = /obj/item/card/id/ms13/goldman
1616
head = /obj/item/clothing/head/helmet/ms13/cowboy/goldman
1717
uniform = /obj/item/clothing/under/ms13/goldman
@@ -26,7 +26,7 @@
2626
/obj/item/knife/ms13/hunting=1,\
2727
/obj/item/ammo_box/ms13/c10mm=1)
2828

29-
/datum/outfit/job/ms13/goldman/standard/pre_equip(mob/living/carbon/human/H)
29+
/datum/outfit/job/ms13/goldman/standardgold/pre_equip(mob/living/carbon/human/H)
3030
..()
3131

3232
suit = pick(/obj/item/clothing/suit/ms13/goldman/duster_covered,\
@@ -41,7 +41,7 @@
4141
else
4242
glasses = null
4343

44-
/datum/outfit/job/ms13/goldman/standard/post_equip(mob/living/carbon/human/H, visualsOnly)
44+
/datum/outfit/job/ms13/goldman/standardgold/post_equip(mob/living/carbon/human/H, visualsOnly)
4545
. = ..()
4646
var/obj/item/gun/ballistic/equipped_gun = H.get_item_by_slot(ITEM_SLOT_SUITSTORE)
4747
if(!istype(equipped_gun))

0 commit comments

Comments
 (0)