un-merges engi and foreman

shiptest-ss13 · Jun 25, 2024 · 15f24cf · 15f24cf
1 parent 4fe7d0f
commit 15f24cf
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 43 deletions.
diff --git a/_maps/configs/independent_dwayne.json b/_maps/configs/independent_dwayne.json
@@ -23,14 +23,18 @@
 			"slots": 1
 		},
 		"Foreman": {
-			"outfit": "/datum/outfit/job/independent/ce/western",
+			"outfit": "/datum/outfit/job/independent/quartermaster/western",
 			"officer": true,
 			"slots": 1
 		},
 		"Asteroid Miner": {
 			"outfit": "/datum/outfit/job/independent/miner/hazard",
 			"slots": 2
 		},
+		"Mechanic": {
+			"outfit": "/datum/outfit/job/independent/engineer",
+			"slots": 1
+		},
 		"Deckhand": {
 			"outfit": "/datum/outfit/job/independent/assistant",
 			"slots": 1

diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm
@@ -208,7 +208,6 @@
 	open_sound = 'sound/machines/wooden_closet_open.ogg'
 	},
 /obj/item/storage/backpack/satchel/cap,
-/obj/item/storage/backpack/captain,
 /obj/item/storage/backpack/messenger/com,
 /obj/item/clothing/under/rank/command/captain,
 /obj/item/clothing/under/rank/command/captain/skirt,
@@ -365,6 +364,7 @@
 	},
 /obj/item/storage/backpack/satchel/explorer,
 /obj/item/storage/backpack/satchel/explorer,
+/obj/item/storage/backpack/satchel/explorer,
 /obj/item/clothing/under/utility,
 /obj/item/clothing/under/utility,
 /obj/item/clothing/under/utility/skirt,
@@ -379,6 +379,8 @@
 /obj/item/clothing/gloves/fingerless,
 /obj/item/clothing/head/cowboy,
 /obj/item/clothing/head/cowboy,
+/obj/item/clothing/glasses/heat,
+/obj/item/clothing/glasses/heat,
 /turf/open/floor/wood,
 /area/ship/crew/dorm)
 "fY" = (
@@ -683,14 +685,14 @@
 /obj/structure/cable/yellow{
 	icon_state = "0-6"
 	},
-/obj/item/reagent_containers/glass/maunamug{
-	pixel_x = 10;
-	pixel_y = 2
-	},
 /obj/item/newspaper{
 	pixel_x = -9;
 	pixel_y = 1
 	},
+/obj/item/reagent_containers/food/drinks/mug{
+	pixel_x = 10;
+	pixel_y = 3
+	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering)
 "ld" = (
@@ -959,27 +961,17 @@
 /area/ship/storage/eva)
 "om" = (
 /obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/obj/structure/closet/secure_closet/wall/directional/west{
-	icon_state = "cargo_wall";
-	name = "Foreman's locker";
-	req_access_txt = "56"
+/obj/structure/closet/wall/orange/directional/west{
+	name = "Mechanic's locker"
 	},
-/obj/item/storage/backpack/industrial,
+/obj/effect/decal/cleanable/oil/streak,
 /obj/item/storage/backpack/satchel/eng,
-/obj/item/clothing/shoes/workboots,
-/obj/item/clothing/under/rank/security/detective,
+/obj/item/storage/backpack/messenger/engi,
+/obj/item/clothing/under/rank/engineering/engineer,
 /obj/item/clothing/suit/hazardvest,
-/obj/item/clothing/suit/jacket/leather/duster{
-	name = "foreman's duster";
-	desc = "A long, utilitarian leather coat. Ideal for protecting its wearer from rain, sun, dust and paperwork."
-	},
-/obj/item/storage/belt/utility,
-/obj/item/clothing/head/hardhat/white,
-/obj/item/clothing/head/hardhat/orange,
-/obj/item/clothing/head/cowboy/sec,
+/obj/item/clothing/suit/toggle/hazard,
+/obj/item/clothing/head/hardhat/dblue,
 /obj/item/clothing/glasses/welding,
-/obj/item/clothing/glasses/meson/engine/tray,
-/obj/effect/decal/cleanable/oil/streak,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering)
 "or" = (
@@ -1016,6 +1008,23 @@
 	},
 /obj/machinery/light/directional/east,
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/secure_closet{
+	req_access_txt = "19";
+	icon_state = "qm";
+	name = "Foreman's locker"
+	},
+/obj/item/storage/backpack/satchel/eng,
+/obj/item/clothing/shoes/workboots,
+/obj/item/clothing/under/rank/security/detective,
+/obj/item/clothing/suit/hazardvest,
+/obj/item/clothing/suit/jacket/leather/duster{
+	name = "foreman's duster";
+	desc = "A long, utilitarian leather coat. Ideal for protecting its wearer from rain, sun, dust and paperwork."
+	},
+/obj/item/clothing/gloves/fingerless,
+/obj/item/clothing/head/cowboy/sec,
+/obj/item/clothing/head/hardhat/orange,
+/obj/item/clothing/head/hardhat/white,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/cargo)
 "oB" = (
@@ -1067,6 +1076,9 @@
 /obj/item/radio{
 	pixel_y = 5
 	},
+/obj/item/radio{
+	pixel_y = 5
+	},
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/crew/cryo)
 "oJ" = (
@@ -2091,6 +2103,7 @@
 /obj/item/pickaxe/drill{
 	pixel_y = -2
 	},
+/obj/item/radio/weather_monitor,
 /obj/item/pinpointer/mineral{
 	pixel_y = 4
 	},

diff --git a/code/modules/clothing/outfits/factions/independent.dm b/code/modules/clothing/outfits/factions/independent.dm
@@ -406,26 +406,6 @@
 	box = /obj/item/storage/box/survival/engineer
 	chameleon_extras = /obj/item/stamp/ce
 
-/datum/outfit/job/independent/ce/western
-	name = "Independent - Foreman (Western)" // Something between CE and QM
-
-	belt = /obj/item/storage/belt/utility/full/engi // Indies probably don't need adv. tools
-	uniform = /obj/item/clothing/under/rank/security/detective
-	suit = /obj/item/clothing/suit/hazardvest
-	dcoat = /obj/item/clothing/suit/hooded/wintercoat/cargo
-	shoes = /obj/item/clothing/shoes/workboots
-	head = /obj/item/clothing/head/cowboy/sec
-	gloves = /obj/item/clothing/gloves/color/yellow
-	glasses = /obj/item/clothing/glasses/sunglasses
-	r_pocket = /obj/item/clipboard
-
-/datum/outfit/job/independent/ce/western/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
-	..()
-	if(visualsOnly)
-		return
-	var/obj/item/card/id/W = H.wear_id // All of QM's access.
-	W.access += list(ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION, ACCESS_VAULT)
-
 // Medical Doctor
 
 /datum/outfit/job/independent/doctor
@@ -565,6 +545,30 @@
 
 	chameleon_extras = /obj/item/stamp/qm
 
+
+/datum/outfit/job/independent/quartermaster/western
+	name = "Independent - Quartermaster (Western)"
+
+	belt = /obj/item/storage/belt/utility/full
+	uniform = /obj/item/clothing/under/rank/security/detective
+	suit = /obj/item/clothing/suit/hazardvest
+	shoes = /obj/item/clothing/shoes/workboots
+	gloves = /obj/item/clothing/gloves/fingerless
+	glasses = /obj/item/clothing/glasses/sunglasses
+	head = /obj/item/clothing/head/cowboy/sec
+	l_hand = null
+	r_pocket = /obj/item/clipboard
+
+	backpack = /obj/item/storage/backpack/industrial
+	satchel = /obj/item/storage/backpack/satchel/eng
+
+/datum/outfit/job/independent/quartermaster/western/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+	..()
+	if(visualsOnly)
+		return
+	var/obj/item/card/id/W = H.wear_id
+	W.access += list(ACCESS_HEADS)
+
 /datum/outfit/job/independent/miner
 	name = "Independent - Miner"
 	jobtype = /datum/job/mining