Skip to content

Commit

Permalink
renaming RO
Browse files Browse the repository at this point in the history
  • Loading branch information
@morrowwolf
morrowwolf committed Aug 6, 2023
1 parent dc00de1 commit 219324f
Show file tree
Hide file tree
Showing 12 changed files with 24 additions and 25 deletions.
2 changes: 1 addition & 1 deletion code/datums/supply_packs/clothing.dm
View file
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/ro_suit,
/obj/item/clothing/under/rank/qm_suit,
/obj/item/clothing/under/marine/officer/bridge,
/obj/item/clothing/under/marine/officer/bridge,
/obj/item/clothing/under/marine/officer/exec,
Expand Down
5 changes: 2 additions & 3 deletions code/game/jobs/job/logistics/cargo/chief_req.dm
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
//Requisitions Officer
/datum/job/logistics/requisition
title = JOB_CHIEF_REQUISITION
selection_class = "job_ro"
selection_class = "job_qm"
flags_startup_parameters = ROLE_ADD_TO_DEFAULT
gear_preset = /datum/equipment_preset/uscm_ship/ro
gear_preset = /datum/equipment_preset/uscm_ship/qm
entry_message_body = "<a href='"+URL_WIKI_RO_GUIDE+"'>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
6 changes: 3 additions & 3 deletions code/game/machinery/vending/vendor_types/crew/senior_officers.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,8 @@ 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/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("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("Satchel", 0, /obj/item/storage/backpack/marine/satchel/tech, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY),
list("Req Cap", 0, /obj/item/clothing/head/cmcap/req, MARINE_CAN_BUY_MASK, VENDOR_ITEM_MANDATORY),
list("Quartermaster Jacket", 0, /obj/item/clothing/suit/storage/RO, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY),
Expand Down Expand Up @@ -317,7 +317,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/ro, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY),
list("Headset", 0, /obj/item/device/radio/headset/almayer/qm, 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("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/objects/items/devices/radio/encryptionkey.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@

// MARINE REQUISTIONS

/obj/item/device/encryptionkey/ro
/obj/item/device/encryptionkey/qm
name = "Requisition 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
6 changes: 3 additions & 3 deletions code/game/objects/items/devices/radio/headset.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -451,11 +451,11 @@
icon_state = "req_headset"
initial_keys = list(/obj/item/device/encryptionkey/req/ct)

/obj/item/device/radio/headset/almayer/ro
desc = "A headset used by the RO 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."
/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"
icon_state = "ro_headset"
initial_keys = list(/obj/item/device/encryptionkey/ro)
initial_keys = list(/obj/item/device/encryptionkey/qm)
volume = RADIO_VOLUME_CRITICAL
multibroadcast_cooldown = LOW_MULTIBROADCAST_COOLDOWN

Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -306,8 +306,8 @@ GLOBAL_LIST_EMPTY(co_secure_boxes)

/obj/structure/closet/secure_closet/req_officer/Initialize()
. = ..()
new /obj/item/device/radio/headset/almayer/ro(src)
new /obj/item/clothing/under/rank/ro_suit(src)
new /obj/item/device/radio/headset/almayer/qm(src)
new /obj/item/clothing/under/rank/qm_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
6 changes: 3 additions & 3 deletions code/modules/clothing/suits/marine_armor.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@

/obj/item/clothing/suit/storage/marine/rto/intel
name = "\improper XM4 pattern intelligence officer armor"
uniform_restricted = list(/obj/item/clothing/under/marine/officer, /obj/item/clothing/under/rank/ro_suit, /obj/item/clothing/under/marine/officer/intel)
uniform_restricted = list(/obj/item/clothing/under/marine/officer, /obj/item/clothing/under/rank/qm_suit, /obj/item/clothing/under/marine/officer/intel)
specialty = "XM4 pattern intel"

/obj/item/clothing/suit/storage/marine/MP
Expand Down Expand Up @@ -347,7 +347,7 @@
icon_state = "officer"
storage_slots = 3
flags_atom = null
uniform_restricted = list(/obj/item/clothing/under/marine/officer, /obj/item/clothing/under/rank/ro_suit, /obj/item/clothing/under/rank/chief_medical_officer)
uniform_restricted = list(/obj/item/clothing/under/marine/officer, /obj/item/clothing/under/rank/qm_suit, /obj/item/clothing/under/rank/chief_medical_officer)
specialty = "M2 pattern officer"
item_state_slots = list(WEAR_JACKET = "officer")

Expand All @@ -362,7 +362,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/ro_suit)
uniform_restricted = list(/obj/item/clothing/under/marine, /obj/item/clothing/under/rank/qm_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
2 changes: 1 addition & 1 deletion code/modules/clothing/under/marine_uniform.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -839,7 +839,7 @@
desc = "A formal white undersuit."
flags_jumpsuit = FALSE

/obj/item/clothing/under/rank/ro_suit
/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."
icon_state = "RO_jumpsuit"
Expand Down
10 changes: 5 additions & 5 deletions code/modules/gear_presets/uscm_ship.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@

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

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

Expand All @@ -332,15 +332,15 @@
minimap_background = MINIMAP_ICON_BACKGROUND_CIC
minimap_icon = list("ct" = MINIMAP_ICON_COLOR_HEAD)

utility_under = list(/obj/item/clothing/under/rank/ro_suit)
utility_under = list(/obj/item/clothing/under/rank/qm_suit)

/datum/equipment_preset/uscm_ship/ro/load_gear(mob/living/carbon/human/new_human)
/datum/equipment_preset/uscm_ship/qm/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/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/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/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(new_human), WEAR_HEAD)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/new_player/preferences_setup.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@
if(JOB_MAINT_TECH)
return /datum/equipment_preset/uscm_ship/maint
if(JOB_CHIEF_REQUISITION)
return /datum/equipment_preset/uscm_ship/ro
return /datum/equipment_preset/uscm_ship/qm
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
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ a.purple:hover {
background-color: #e6b800;
}

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

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

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

Expand Down

0 comments on commit 219324f

Please sign in to comment.