Adds Orion Express to Service (#17623)

* code for job change & clothing

* sprites

* icon state

code/__defines/jobs.dm

@@ -37,5 +37,5 @@
 #define ZAVOD_ROLES list(SECURITY_ROLES, SCIENCE_ROLES, ENGINEERING_ROLES, CIVILIAN_ROLES, REPRESENTATIVE_ROLE)
 #define ZENG_ROLES list(SCIENCE_ROLES, MEDICAL_ROLES, CIVILIAN_ROLES, REPRESENTATIVE_ROLE)
 #define HEPH_ROLES list(OPERATIONS_ROLES, ENGINEERING_ROLES, CIVILIAN_ROLES, REPRESENTATIVE_ROLE)
-#define ORION_ROLES list(OPERATIONS_ROLES, CIVILIAN_ROLES, REPRESENTATIVE_ROLE)
+#define ORION_ROLES list(OPERATIONS_ROLES, CIVILIAN_ROLES, REPRESENTATIVE_ROLE, SERVICE_ROLES)
 #define INDEP_ROLES list(NON_CREW_CIVILIAN_ROLES, CONSULAR_ROLE, JOURNALIST_ROLE, CHAPLAIN_ROLE, OFF_DUTY_CREW_MEMBER_ROLE)

code/game/jobs/faction/orion_express.dm

@@ -8,7 +8,7 @@
 	on industrial synthetics to aid in its logistics missions. The Orion Express is expected to become an
 	integral part of the Stellar Corporate Conglomerate's future through delivering supplies and merchandise throughout the Orion Spur.
 	</p>"}
-	departments = {"Operations"}
+	departments = {"Operations<br>Service"}
 	title_suffix = "Orion"
 
 	allowed_role_types = ORION_ROLES
@@ -38,6 +38,14 @@
 		"Hangar Technician" = /datum/outfit/job/hangar_tech/orion,
 		"Shaft Miner" = /datum/outfit/job/mining/orion,
 		"Machinist" = /datum/outfit/job/machinist/orion,
+		"Bartender" = /datum/outfit/job/bartender/orion,
+		"Chef" = /datum/outfit/job/chef/orion,
+		"Gardener" = /datum/outfit/job/hydro/orion,
+		"Hydroponicist" = /datum/outfit/job/hydro/orion,
+		"Janitor" = /datum/outfit/job/janitor/orion,
+		"Librarian" = /datum/outfit/job/librarian/orion,
+		"Curator" = /datum/outfit/job/librarian/orion/curator,
+		"Tech Support" = /datum/outfit/job/librarian/orion/tech_support,
 		"Corporate Liaison" = /datum/outfit/job/representative/orion,
 		"Off-Duty Crew Member" = /datum/outfit/job/visitor/orion
 	)
@@ -90,6 +98,85 @@
 	dufflebag_faction = /obj/item/storage/backpack/duffel/orion
 	messengerbag_faction = /obj/item/storage/backpack/messenger/orion
 
+/datum/outfit/job/bartender/orion
+	name = "Bartender - Orion Express"
+
+	uniform = /obj/item/clothing/under/rank/bartender/orion
+	head = /obj/item/clothing/head/flatcap/bartender/orion
+	id = /obj/item/card/id/orion
+	suit = /obj/item/clothing/suit/storage/bartender/orion
+
+	backpack_faction = /obj/item/storage/backpack/orion
+	satchel_faction = /obj/item/storage/backpack/satchel/orion
+	dufflebag_faction = /obj/item/storage/backpack/duffel/orion
+	messengerbag_faction = /obj/item/storage/backpack/messenger/orion
+
+/datum/outfit/job/chef/orion
+	name = "Chef - Orion Express"
+
+	uniform = /obj/item/clothing/under/rank/chef/orion
+	suit = /obj/item/clothing/suit/chef_jacket/orion
+	head = /obj/item/clothing/head/chefhat/orion
+	id = /obj/item/card/id/orion
+
+	backpack_faction = /obj/item/storage/backpack/orion
+	satchel_faction = /obj/item/storage/backpack/satchel/orion
+	dufflebag_faction = /obj/item/storage/backpack/duffel/orion
+	messengerbag_faction = /obj/item/storage/backpack/messenger/orion
+
+/datum/outfit/job/hydro/orion
+	name = "Gardener - Orion Express"
+
+	uniform = /obj/item/clothing/under/rank/hydroponics/orion
+	head = /obj/item/clothing/head/bandana/hydro/orion
+	id = /obj/item/card/id/orion
+
+	backpack_faction = /obj/item/storage/backpack/orion
+	satchel_faction = /obj/item/storage/backpack/satchel/orion
+	dufflebag_faction = /obj/item/storage/backpack/duffel/orion
+	messengerbag_faction = /obj/item/storage/backpack/messenger/orion
+
+/datum/outfit/job/janitor/orion
+	name = "Janitor - Orion Express"
+
+	uniform = /obj/item/clothing/under/rank/janitor/orion
+	head = /obj/item/clothing/head/softcap/orion_custodian
+	id = /obj/item/card/id/orion
+
+	backpack_faction = /obj/item/storage/backpack/orion
+	satchel_faction = /obj/item/storage/backpack/satchel/orion
+	dufflebag_faction = /obj/item/storage/backpack/duffel/orion
+	messengerbag_faction = /obj/item/storage/backpack/messenger/orion
+
+/datum/outfit/job/librarian/orion
+	name = "Librarian - Orion Express"
+
+	uniform = /obj/item/clothing/under/librarian/orion
+	id = /obj/item/card/id/orion
+
+	backpack_faction = /obj/item/storage/backpack/orion
+	satchel_faction = /obj/item/storage/backpack/satchel/orion
+	dufflebag_faction = /obj/item/storage/backpack/duffel/orion
+	messengerbag_faction = /obj/item/storage/backpack/messenger/orion
+
+/datum/outfit/job/librarian/orion/curator
+	name = "Curator - Orion Express"
+	jobtype = /datum/job/librarian
+
+	r_pocket = /obj/item/device/price_scanner
+	l_hand = null
+
+/datum/outfit/job/librarian/orion/tech_support
+	name = "Tech Support - Orion Express"
+	jobtype = /datum/job/librarian
+
+	l_pocket = /obj/item/modular_computer/handheld/preset
+	r_pocket = /obj/item/card/tech_support
+	r_hand = /obj/item/storage/bag/circuits/basic
+	l_hand = /obj/item/modular_computer/laptop/preset
+	gloves = /obj/item/modular_computer/handheld/wristbound/preset/advanced/civilian
+
+
 /datum/outfit/job/visitor/orion
 	name = "Off-Duty Crew Member - Orion Express"
 

code/modules/clothing/head/bandanas.dm

@@ -77,6 +77,12 @@
 	icon_state = "idris_gardener_headband"
 	item_state = "idris_gardener_headband"
 
+/obj/item/clothing/head/bandana/hydro/orion
+	icon = 'icons/obj/item/clothing/department_uniforms/service.dmi'
+	contained_sprite = TRUE
+	icon_state = "orion_gardener_headband"
+	item_state = "orion_gardener_headband"
+
 /obj/item/clothing/head/bandana/cargo
 	name = "operations bandana"
 	desc = "It's a operations bandana with some fine nanotech lining. Wicks away the sweat from crate-pushing all day."

code/modules/clothing/head/jobs.dm

@@ -17,6 +17,12 @@
 	icon_state = "idris_chef_hat"
 	item_state = "idris_chef_hat"
 
+/obj/item/clothing/head/chefhat/orion
+	icon = 'icons/obj/item/clothing/department_uniforms/service.dmi'
+	contained_sprite = TRUE
+	icon_state = "orion_chef_hat"
+	item_state = "orion_chef_hat"
+
 
 /obj/item/clothing/head/hairnet
 	name = "hairnet"
@@ -170,6 +176,10 @@
 	icon_state = "idris_bartender_flatcap"
 	item_state = "idris_bartender_flatcap"
 
+/obj/item/clothing/head/flatcap/bartender/orion
+	icon_state = "orion_bartender_flatcap"
+	item_state = "orion_bartender_flatcap"
+
 /obj/item/clothing/head/sidecap
 	name = "side cap"
 	desc = "A simple cap, often worn by pilots."

code/modules/clothing/head/soft_caps.dm

@@ -185,3 +185,9 @@
 	desc = "A peaked cap in a teal colour with a purple brim."
 	icon_state = "custodian_idris"
 	item_state = "custodian_idris"
+
+/obj/item/clothing/head/softcap/orion_custodian
+	name = "orion custodial softcap"
+	desc = "A peaked cap in a brown colour with a purple brim."
+	icon_state = "custodian_orion"
+	item_state = "custodian_orion"

code/modules/clothing/suits/jobs.dm

@@ -46,6 +46,12 @@
 	icon = 'icons/obj/item/clothing/department_uniforms/service.dmi'
 	icon_state = "idris_chef_jacket"
 	item_state = "idris_chef_jacket"
+
+//Orion Chef Jacket
+/obj/item/clothing/suit/chef_jacket/orion
+	icon = 'icons/obj/item/clothing/department_uniforms/service.dmi'
+	icon_state = "orion_chef_jacket"
+	item_state = "orion_chef_jacket"
 /********** Chef/Cook End **********/
 
 //Security
@@ -292,6 +298,10 @@
 	icon_state = "idris_bartender_jacket"
 	item_state = "idris_bartender_jacket"
 
+/obj/item/clothing/suit/storage/bartender/orion
+	icon_state = "orion_bartender_jacket"
+	item_state = "orion_bartender_jacket"
+
 // Machinist
 
 /obj/item/clothing/suit/storage/machinist

code/modules/clothing/under/jobs/civilian.dm

@@ -11,6 +11,11 @@
 /obj/item/clothing/under/rank/bartender/idris
 	icon_state = "idris_bartender"
 	item_state = "idris_bartender"
+
+/obj/item/clothing/under/rank/bartender/orion
+	icon_state = "orion_bartender"
+	item_state = "orion_bartender"
+
 /obj/item/clothing/under/rank/chaplain
 	desc = "It's a black jumpsuit, often worn by religious folk."
 	name = "chaplain's jumpsuit"
@@ -37,6 +42,12 @@
 	icon_state = "idris_chef"
 	item_state = "idris_chef"
 
+/obj/item/clothing/under/rank/chef/orion
+	icon = 'icons/obj/item/clothing/department_uniforms/service.dmi'
+	contained_sprite = TRUE
+	icon_state = "orion_chef"
+	item_state = "orion_chef"
+
 /obj/item/clothing/under/rank/hydroponics
 	desc = "It's a jumpsuit designed to protect against minor plant-related hazards."
 	name = "botanist's jumpsuit"
@@ -45,10 +56,15 @@
 	item_state = "nt_gardener"
 	permeability_coefficient = 0.50
 	contained_sprite = TRUE
+
 /obj/item/clothing/under/rank/hydroponics/idris
 	icon_state = "idris_gardener"
 	item_state = "idris_gardener"
 
+/obj/item/clothing/under/rank/hydroponics/orion
+	icon_state = "orion_gardener"
+	item_state = "orion_gardener"
+
 // Liaison, a.k.a. Internal Affairs
 
 /obj/item/clothing/under/rank/liaison
@@ -107,6 +123,10 @@
 	icon_state = "idris_janitor_alt"
 	item_state = "idris_janitor_alt"
 
+/obj/item/clothing/under/rank/janitor/orion
+	icon_state = "orion_janitor"
+	item_state = "orion_janitor"
+
 // Lawyer (to be replaced by modularization)
 
 /obj/item/clothing/under/lawyer
@@ -139,6 +159,10 @@
 	icon_state = "idris_librarian"
 	item_state = "idris_librarian"
 
+/obj/item/clothing/under/librarian/orion
+	icon_state = "orion_librarian"
+	item_state = "orion_librarian"
+
 // Miner
 
 /obj/item/clothing/under/rank/miner
@@ -245,4 +269,4 @@
 	icon_state = "heph_captain"
 	item_state = "heph_captain"
 	worn_state = "heph_captain"
-	contained_sprite = TRUE
+	contained_sprite = TRUE

html/changelogs/RustingWithYou - orion.yml

@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: RustingWithYou
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - rscadd: "Adds Orion Express to the Service department."