Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Elevates Quartermaster back to Requisitions Officer #6701

Closed
wants to merge 1 commit into from
Closed

Elevates Quartermaster back to Requisitions Officer #6701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/__DEFINES/job.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)
#define JOB_ENGINEER_ROLES /datum/timelock/engineer
#define JOB_ENGINEER_ROLES_LIST list(JOB_SQUAD_ENGI, JOB_MAINT_TECH, JOB_ORDNANCE_TECH, JOB_CHIEF_ENGINEER)

#define JOB_CHIEF_REQUISITION "Quartermaster"
#define JOB_CHIEF_REQUISITION "Requisitions Officer"
#define JOB_CARGO_TECH "Cargo Technician"
#define JOB_REQUISITION_ROLES /datum/timelock/requisition
#define JOB_REQUISITION_ROLES_LIST list(JOB_CHIEF_REQUISITION, JOB_CARGO_TECH)
Expand Down
2 changes: 1 addition & 1 deletion code/datums/skills/uscm.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ COMMAND STAFF
)

/datum/skills/RO
name = "Requisition Officer"
name = "Requisitions Officer"
skills = list(
SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
SKILL_LEADERSHIP = SKILL_LEAD_EXPERT,
Expand Down
2 changes: 1 addition & 1 deletion code/datums/supply_packs/clothing.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@

/datum/supply_packs/officer_outfits//lmao this shit is so hideously out of date
contains = list(
/obj/item/clothing/under/rank/qm_suit,
/obj/item/clothing/under/rank/ro_suit,
/obj/item/clothing/under/marine/officer/bridge,
/obj/item/clothing/under/marine/officer/bridge,
/obj/item/clothing/under/marine/dress,
Expand Down
4 changes: 2 additions & 2 deletions code/game/jobs/job/logistics/cargo/chief_req.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/datum/job/logistics/requisition
title = JOB_CHIEF_REQUISITION
selection_class = "job_qm"
selection_class = "job_ro"
flags_startup_parameters = ROLE_ADD_TO_DEFAULT
gear_preset = /datum/equipment_preset/uscm_ship/qm
gear_preset = /datum/equipment_preset/uscm_ship/ro
entry_message_body = "<a href='"+WIKI_PLACEHOLDER+"'>Your job</a> is to dispense supplies to the marines, including weapon attachments. Your cargo techs can help you out, but you have final say in your department. Make sure they're not goofing off. While you may request paperwork for supplies, do not go out of your way to screw with marines, unless you want to get deposed. A happy ship is a well-functioning ship."

AddTimelock(/datum/job/logistics/requisition, list(
Expand Down
11 changes: 6 additions & 5 deletions code/game/machinery/vending/vendor_types/crew/senior_officers.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,13 +173,14 @@ GLOBAL_LIST_INIT(cm_vending_clothing_req_officer, list(

list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null),
list("Insulated Gloves", 0, /obj/item/clothing/gloves/yellow, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY),
list("Quartermaster Uniform", 0, /obj/item/clothing/under/rank/qm_suit, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
list("Headset", 0, /obj/item/device/radio/headset/almayer/qm, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY),
list("Requisitions Officer Uniform", 0, /obj/item/clothing/under/rank/ro_suit, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
list("Headset", 0, /obj/item/device/radio/headset/almayer/ro, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY),
list("Satchel", 0, /obj/item/storage/backpack/marine/satchel/tech, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY),
list("Quartermaster Jacket", 0, /obj/item/clothing/suit/storage/RO, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY),
list("Requisitions Officer Jacket", 0, /obj/item/clothing/suit/storage/RO, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY),

list("Headgear (CHOOSE 1)", 0, null, null, null),
list("Quartermaster Cap", 0, /obj/item/clothing/head/cmcap/req/ro, MARINE_CAN_BUY_MASK, VENDOR_ITEM_RECOMMENDED),
list("Requisitions Officer Cap", 0, /obj/item/clothing/head/cmcap/req/ro, MARINE_CAN_BUY_MASK, VENDOR_ITEM_RECOMMENDED),
list("Requisitions Officer Beret", 0, /obj/item/clothing/head/beret/marine/ro, MARINE_CAN_BUY_MASK, VENDOR_ITEM_RECOMMENDED),
list("Requisitions Cap", 0, /obj/item/clothing/head/cmcap/req, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR),

list("PERSONAL SIDEARM (CHOOSE 1)", 0, null, null, null),
Expand Down Expand Up @@ -450,7 +451,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_auxiliary_officer, list(
list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null),
list("Insulated Gloves", 0, /obj/item/clothing/gloves/yellow, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY),
list("Officer Uniform", 0, /obj/item/clothing/under/marine/officer/bridge, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
list("Headset", 0, /obj/item/device/radio/headset/almayer/qm, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY),
list("Headset", 0, /obj/item/device/radio/headset/almayer/ro, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY),
list("Patrol Cap", 0, /obj/item/clothing/head/cmcap, MARINE_CAN_BUY_MASK, VENDOR_ITEM_MANDATORY),
list("Auxiliary Support Officer Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/service/aso, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY),

Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/vending/vendor_types/crew/synthetic.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth_snowflake, list(
list("Windbreaker, Exploration", 12, /obj/item/clothing/suit/storage/windbreaker/windbreaker_covenant, null, VENDOR_ITEM_REGULAR),
list("Labcoat", 12, /obj/item/clothing/suit/storage/labcoat, null, VENDOR_ITEM_REGULAR),
list("Labcoat, Researcher", 12, /obj/item/clothing/suit/storage/labcoat/researcher, null, VENDOR_ITEM_REGULAR),
list("Quartermaster Jacket", 12, /obj/item/clothing/suit/storage/RO, null, VENDOR_ITEM_REGULAR),
list("Requisitions Officer Jacket", 12, /obj/item/clothing/suit/storage/RO, null, VENDOR_ITEM_REGULAR),
list("Bio Suit", 12, /obj/item/clothing/suit/storage/synthbio, null, VENDOR_ITEM_REGULAR),
list("Black Suit Jacket", 12, /obj/item/clothing/suit/storage/jacket/marine/corporate/black, null, VENDOR_ITEM_REGULAR),
list("Brown Suit Jacket", 12, /obj/item/clothing/suit/storage/jacket/marine/corporate/brown, null, VENDOR_ITEM_REGULAR),
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items/devices/radio/encryptionkey.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@

// MARINE REQUISTIONS

/obj/item/device/encryptionkey/qm
name = "Requisition Officer's Encryption Key"
/obj/item/device/encryptionkey/ro
name = "Requisitions Officer's Encryption Key"
icon_state = "ce_key"
channels = list(RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_ENGI = FALSE, RADIO_CHANNEL_MEDSCI = FALSE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_CRYO = FALSE)

Expand Down
8 changes: 4 additions & 4 deletions code/game/objects/items/devices/radio/headset.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,11 +475,11 @@
icon_state = "req_headset"
initial_keys = list(/obj/item/device/encryptionkey/req/ct)

/obj/item/device/radio/headset/almayer/qm
desc = "A headset used by the quartermaster for controlling their slave(s). Channels are as follows: :u - requisitions, :v - marine command, :a - alpha squad, :b - bravo squad, :c - charlie squad, :d - delta squad."
name = "requisition officer radio headset"
/obj/item/device/radio/headset/almayer/ro
desc = "A headset used by the Requisitions Officer for controlling their slave(s). Channels are as follows: :u - requisitions, :v - marine command, :a - alpha squad, :b - bravo squad, :c - charlie squad, :d - delta squad."
name = "requisitions officer radio headset"
icon_state = "ro_headset"
initial_keys = list(/obj/item/device/encryptionkey/qm)
initial_keys = list(/obj/item/device/encryptionkey/ro)
volume = RADIO_VOLUME_CRITICAL
multibroadcast_cooldown = LOW_MULTIBROADCAST_COOLDOWN

Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/tools/misc_tools.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@
icon_state = "stamp-cmb"

/obj/item/tool/stamp/ro
name = "quartermaster's rubber stamp"
name = "requisitions officer's rubber stamp"
icon_state = "stamp-ro"

/obj/item/tool/carpenters_hammer //doesn't do anything, yet
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,8 +307,8 @@ GLOBAL_LIST_EMPTY(co_secure_boxes)

/obj/structure/closet/secure_closet/req_officer/Initialize()
. = ..()
new /obj/item/device/radio/headset/almayer/qm(src)
new /obj/item/clothing/under/rank/qm_suit(src)
new /obj/item/device/radio/headset/almayer/ro(src)
new /obj/item/clothing/under/rank/ro_suit(src)
new /obj/item/clothing/shoes/marine(src)
new /obj/item/storage/belt/marine(src)
new /obj/item/clothing/head/cmcap/req(src)
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/structures/signs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@

/obj/structure/sign/ROsign
name = "\improper USCM Requisitions Office Guidelines"
desc = " 1. You are not entitled to service or equipment. Attachments are a privilege, not a right.\n 2. You must be fully dressed to obtain service. Cryosleep underwear is non-permissible.\n 3. The Quartermaster has the final say and the right to decline service. Only the Acting Commanding Officer may override their decisions.\n 4. Please treat your Requsitions staff with respect. They work hard."
desc = " 1. You are not entitled to service or equipment. Attachments are a privilege, not a right.\n 2. You must be fully dressed to obtain service. Cryosleep underwear is non-permissible.\n 3. The Requisitions Officer has the final say and the right to decline service. Only the Acting Commanding Officer may override their decisions.\n 4. Please treat your Requsitions staff with respect. They work hard."
icon_state = "roplaque"

/obj/structure/sign/prop1
Expand Down
11 changes: 10 additions & 1 deletion code/modules/clothing/head/head.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@
icon_state = "co_formalhat_black"

/obj/item/clothing/head/cmcap/req/ro
name = "\improper USCM quartermaster cap"
name = "\improper USCM Requisitions Officer cap"
desc = "It's a fancy hat for a not-so-fancy military supply clerk."
icon_state = "rocap"
flags_atom = NO_SNOW_TYPE
Expand Down Expand Up @@ -567,6 +567,15 @@
desc = "A beret with the lieutenant insignia emblazoned on it. It inspires a feeling of respect."
icon_state = "beret_badge"

/obj/item/clothing/head/beret/marine/ro
name = "requisitions officer beret"
desc = "A beret with the lieutenant insignia emblazoned on it. It symbolizes hard work and shady business."
icon = 'icons/obj/items/clothing/cm_hats.dmi'
icon_state = "ro_beret"
item_icons = list(
WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
)

//==========================//PROTECTIVE\\===============================\\
//=======================================================================\\

Expand Down
6 changes: 3 additions & 3 deletions code/modules/clothing/suits/marine_armor/_marine_armor.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@
icon_state = "officer"
storage_slots = 3
flags_atom = null
uniform_restricted = list(/obj/item/clothing/under/marine/officer, /obj/item/clothing/under/rank/qm_suit, /obj/item/clothing/under/rank/chief_medical_officer, /obj/item/clothing/under/marine/dress)
uniform_restricted = list(/obj/item/clothing/under/marine/officer, /obj/item/clothing/under/rank/ro_suit, /obj/item/clothing/under/rank/chief_medical_officer, /obj/item/clothing/under/marine/dress)
specialty = "M3 pattern officer"
item_state_slots = list(WEAR_JACKET = "officer")

Expand All @@ -337,7 +337,7 @@
storage_slots = 3
flags_atom = NO_SNOW_TYPE
flags_inventory = BLOCKSHARPOBJ|SMARTGUN_HARNESS
uniform_restricted = list(/obj/item/clothing/under/marine, /obj/item/clothing/under/rank/qm_suit)
uniform_restricted = list(/obj/item/clothing/under/marine, /obj/item/clothing/under/rank/ro_suit)
specialty = "M3 pattern captain"
item_state_slots = list(WEAR_JACKET = "co_officer")
valid_accessory_slots = list(ACCESSORY_SLOT_MEDAL, ACCESSORY_SLOT_RANK, ACCESSORY_SLOT_DECOR, ACCESSORY_SLOT_PONCHO)
Expand Down Expand Up @@ -664,7 +664,7 @@
unacidable = TRUE

/obj/item/clothing/suit/storage/RO
name = "quartermaster jacket"
name = "requisitions officer jacket"
desc = "A green jacket worn by USCM personnel. The back has the flag of the United Americas on it."
icon_state = "RO_jacket"
blood_overlay_type = "coat"
Expand Down
6 changes: 3 additions & 3 deletions code/modules/clothing/under/marine_uniform.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -926,9 +926,9 @@
desc = "A formal white undersuit."
flags_jumpsuit = FALSE

/obj/item/clothing/under/rank/qm_suit
name = "quartermaster suit"
desc = "A nicely-fitting military suit for a quartermaster. It has shards of light Kevlar to help protect against stabbing weapons and bullets."
/obj/item/clothing/under/rank/ro_suit
name = "requisitions officer suit"
desc = "A nicely-fitting military suit for a Requisitions Officer. It has shards of light Kevlar to help protect against stabbing weapons and bullets."
icon_state = "RO_jumpsuit"
worn_state = "RO_jumpsuit"
flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE
Expand Down
16 changes: 8 additions & 8 deletions code/modules/gear_presets/uscm_ship.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,8 +310,8 @@

//*****************************************************************************************************/

/datum/equipment_preset/uscm_ship/qm
name = "USCM Quartermaster (QM)"
/datum/equipment_preset/uscm_ship/ro
name = "USCM Requisitions Officer (RO)"
flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE

idtype = /obj/item/card/id/silver
Expand All @@ -327,25 +327,25 @@
)
assignment = JOB_CHIEF_REQUISITION
rank = JOB_CHIEF_REQUISITION
paygrade = PAY_SHORT_ME7
role_comm_title = "QM"
paygrade = PAY_SHORT_MO1
role_comm_title = "RO"
minimum_age = 27
skills = /datum/skills/RO

minimap_background = MINIMAP_ICON_BACKGROUND_CIC
minimap_icon = list("ct" = MINIMAP_ICON_COLOR_HEAD)

utility_under = list(/obj/item/clothing/under/rank/qm_suit)
utility_under = list(/obj/item/clothing/under/rank/ro_suit)
dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/nco)
dress_hat = list(/obj/item/clothing/head/marine/dress_cover)

/datum/equipment_preset/uscm_ship/qm/load_gear(mob/living/carbon/human/new_human)
/datum/equipment_preset/uscm_ship/ro/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel/tech
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
back_item = /obj/item/storage/backpack/industrial

new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/qm(new_human), WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/qm_suit(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/ro(new_human), WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/ro_suit(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(new_human), WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(new_human), WEAR_HANDS)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/req/ro(new_human), WEAR_HEAD)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/new_player/preferences_setup.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@
if(JOB_MAINT_TECH)
return /datum/equipment_preset/uscm_ship/maint
if(JOB_CHIEF_REQUISITION)
return /datum/equipment_preset/uscm_ship/qm
return /datum/equipment_preset/uscm_ship/ro
if(JOB_CARGO_TECH)
return /datum/equipment_preset/uscm_ship/cargo
if(JOB_CMO)
Expand Down
2 changes: 1 addition & 1 deletion html/browser/common.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ a.purple:hover {
background-color: #e6b800;
}

.job_qm {
.job_ro {
background-color: #8378a1;
}

Expand Down
2 changes: 1 addition & 1 deletion html/browser/legacy.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ a.purple {
background-color: #ffeeaa;
}

.job_qm {
.job_ro {
background-color: #9990B2;
}

Expand Down
Binary file modified icons/mob/humans/onmob/head_1.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/items/clothing/cm_hats.dmi
View file
Open in desktop
Binary file not shown.
Loading