diff --git a/code/datums/greyscale/config_types/greyscale_configs.dm b/code/datums/greyscale/config_types/greyscale_configs.dm
index 585b3df82b6..ec134731f3e 100644
--- a/code/datums/greyscale/config_types/greyscale_configs.dm
+++ b/code/datums/greyscale/config_types/greyscale_configs.dm
@@ -172,6 +172,10 @@
name = "Mime PDA"
json_config = 'code/datums/greyscale/json_configs/pda_mime.json'
+/datum/greyscale_config/tablet/stripe_double
+ name = "Double Stripe PDA"
+ json_config = 'code/datums/greyscale/json_configs/pda_stripe_double.json'
+
/datum/greyscale_config/tablet/stripe_split
name = "Split Stripe PDA"
json_config = 'code/datums/greyscale/json_configs/pda_stripe_split.json'
diff --git a/code/datums/greyscale/json_configs/pda_captain.json b/code/datums/greyscale/json_configs/pda_captain.json
index 52d3f9d1333..7fd41fdfad8 100644
--- a/code/datums/greyscale/json_configs/pda_captain.json
+++ b/code/datums/greyscale/json_configs/pda_captain.json
@@ -14,7 +14,7 @@
},
{
"type": "icon_state",
- "icon_state": "pda_stripe_split",
+ "icon_state": "pda_stripe_double",
"blend_mode": "overlay",
"color_ids": [ 3 ]
},
diff --git a/code/datums/greyscale/json_configs/pda_stripe_double.json b/code/datums/greyscale/json_configs/pda_stripe_double.json
new file mode 100644
index 00000000000..42346a2c86d
--- /dev/null
+++ b/code/datums/greyscale/json_configs/pda_stripe_double.json
@@ -0,0 +1,27 @@
+{
+ "pda": [
+ {
+ "type": "icon_state",
+ "icon_state": "pda_base",
+ "blend_mode": "overlay",
+ "color_ids": [ 1 ]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "pda_buttons",
+ "blend_mode": "overlay",
+ "color_ids": [ 2 ]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "pda_stripe_double",
+ "blend_mode": "overlay",
+ "color_ids": [ 3 ]
+ },
+ {
+ "type": "icon_state",
+ "icon_state": "pda_screen_borders",
+ "blend_mode": "overlay"
+ }
+ ]
+}
diff --git a/code/modules/cargo/orderconsole.dm b/code/modules/cargo/orderconsole.dm
index ca5b5597746..9a6ec0a867f 100644
--- a/code/modules/cargo/orderconsole.dm
+++ b/code/modules/cargo/orderconsole.dm
@@ -295,35 +295,35 @@
say(blockade_warning)
return
- //create the paper from the SSshuttle.shopping_list
- if(length(SSshuttle.shopping_list))
- var/obj/item/paper/requisition_paper = new(get_turf(src))
- requisition_paper.name = "requisition form"
- var/requisition_text = "[station_name()] Supply Requisition
"
- requisition_text += "
"
- requisition_text += "Time of Order: [station_time_timestamp()]
"
- for(var/datum/supply_order/order as anything in SSshuttle.shopping_list)
- requisition_text += "[order.pack.name]"
- requisition_text += "- Order ID: [order.id]"
- var/restrictions = SSid_access.get_access_desc(order.pack.access)
- if(restrictions)
- requisition_text += "- Access Restrictions: [restrictions]"
- requisition_text += "- Ordered by: [order.orderer] ([order.orderer_rank])"
- var/paying_account = order.paying_account
- if(paying_account)
- requisition_text += "- Paid Privately by: [order.paying_account.account_holder]
"
- var/reason = order.reason
- if(reason)
- requisition_text += "- Reason Given: [reason]"
- requisition_text += ""
- requisition_paper.add_raw_text(requisition_text)
- requisition_paper.update_appearance()
-
if(SSshuttle.supply.getDockedId() == docking_home)
SSshuttle.moveShuttle(cargo_shuttle, docking_away, TRUE)
say("The supply shuttle is departing.")
usr.investigate_log("sent the supply shuttle away.", INVESTIGATE_CARGO)
else
+ //create the paper from the SSshuttle.shopping_list
+ if(length(SSshuttle.shopping_list))
+ var/obj/item/paper/requisition_paper = new(get_turf(src))
+ requisition_paper.name = "requisition form"
+ var/requisition_text = "[station_name()] Supply Requisition
"
+ requisition_text += "
"
+ requisition_text += "Time of Order: [station_time_timestamp()]
"
+ for(var/datum/supply_order/order as anything in SSshuttle.shopping_list)
+ requisition_text += "[order.pack.name]"
+ requisition_text += "- Order ID: [order.id]"
+ var/restrictions = SSid_access.get_access_desc(order.pack.access)
+ if(restrictions)
+ requisition_text += "- Access Restrictions: [restrictions]"
+ requisition_text += "- Ordered by: [order.orderer] ([order.orderer_rank])"
+ var/paying_account = order.paying_account
+ if(paying_account)
+ requisition_text += "- Paid Privately by: [order.paying_account.account_holder]
"
+ var/reason = order.reason
+ if(reason)
+ requisition_text += "- Reason Given: [reason]"
+ requisition_text += ""
+ requisition_paper.add_raw_text(requisition_text)
+ requisition_paper.update_appearance()
+
usr.investigate_log("called the supply shuttle.", INVESTIGATE_CARGO)
say("The supply shuttle has been called and will arrive in [SSshuttle.supply.timeLeft(600)] minutes.")
SSshuttle.moveShuttle(cargo_shuttle, docking_home, TRUE)
diff --git a/code/modules/jobs/job_types/psychologist.dm b/code/modules/jobs/job_types/psychologist.dm
index b39babc0045..bf178b2de11 100644
--- a/code/modules/jobs/job_types/psychologist.dm
+++ b/code/modules/jobs/job_types/psychologist.dm
@@ -48,7 +48,7 @@
/obj/item/storage/pill_bottle/paxpsych,
/obj/item/storage/pill_bottle/psicodine,
)
- belt = /obj/item/modular_computer/pda/medical
+ belt = /obj/item/modular_computer/pda/psychologist
ears = /obj/item/radio/headset/headset_srvmed
shoes = /obj/item/clothing/shoes/laceup
l_hand = /obj/item/clipboard
diff --git a/code/modules/modular_computers/computers/item/pda.dm b/code/modules/modular_computers/computers/item/pda.dm
index a360023328d..9728e8c6f7f 100644
--- a/code/modules/modular_computers/computers/item/pda.dm
+++ b/code/modules/modular_computers/computers/item/pda.dm
@@ -43,6 +43,7 @@
/obj/item/toy/crayon,
/obj/item/lipstick,
/obj/item/flashlight/pen,
+ /obj/item/reagent_containers/hypospray/medipen,
/obj/item/clothing/mask/cigarette,
)
diff --git a/code/modules/modular_computers/computers/item/role_tablet_presets.dm b/code/modules/modular_computers/computers/item/role_tablet_presets.dm
index 147efbcb83f..4dc7ee420c9 100644
--- a/code/modules/modular_computers/computers/item/role_tablet_presets.dm
+++ b/code/modules/modular_computers/computers/item/role_tablet_presets.dm
@@ -112,7 +112,6 @@
/datum/computer_file/program/robocontrol,
/datum/computer_file/program/budgetorders,
/datum/computer_file/program/shipping,
- /datum/computer_file/program/robocontrol,
)
/**
@@ -139,7 +138,7 @@
/obj/item/modular_computer/pda/warden
name = "warden PDA"
- greyscale_config = /datum/greyscale_config/tablet/stripe_split
+ greyscale_config = /datum/greyscale_config/tablet/stripe_double
greyscale_colors = "#EA3232#0000CC#363636"
starting_programs = list(
/datum/computer_file/program/records/security,
@@ -183,7 +182,7 @@
/obj/item/modular_computer/pda/roboticist
name = "roboticist PDA"
- greyscale_config = /datum/greyscale_config/tablet/stripe_split
+ greyscale_config = /datum/greyscale_config/tablet/stripe_double
greyscale_colors = "#484848#0099CC#D94927"
starting_programs = list(
/datum/computer_file/program/robocontrol,
@@ -191,7 +190,7 @@
/obj/item/modular_computer/pda/geneticist
name = "geneticist PDA"
- greyscale_config = /datum/greyscale_config/tablet/stripe_split
+ greyscale_config = /datum/greyscale_config/tablet/stripe_double
greyscale_colors = "#FAFAFA#000099#0097CA"
starting_programs = list(
/datum/computer_file/program/records/medical,
@@ -212,6 +211,8 @@
/obj/item/modular_computer/pda/medical/paramedic
name = "paramedic PDA"
+ greyscale_config = /datum/greyscale_config/tablet/stripe_double
+ greyscale_colors = "#28334D#000099#3F96CC"
starting_programs = list(
/datum/computer_file/program/records/medical,
/datum/computer_file/program/radar/lifeline,
@@ -219,7 +220,7 @@
/obj/item/modular_computer/pda/viro
name = "virology PDA"
- greyscale_config = /datum/greyscale_config/tablet/stripe_split
+ greyscale_config = /datum/greyscale_config/tablet/stripe_double
greyscale_colors = "#FAFAFA#355FAC#57C451"
starting_programs = list(
/datum/computer_file/program/records/medical,
@@ -381,6 +382,16 @@
for(var/datum/computer_file/program/messenger/msg in stored_files)
msg.ringer_status = FALSE
+/obj/item/modular_computer/pda/psychologist
+ name = "psychologist PDA"
+ greyscale_config = /datum/greyscale_config/tablet/stripe_thick
+ greyscale_colors = "#333333#000099#3F96CC"
+ starting_programs = list(
+ /datum/computer_file/program/records/medical,
+ /datum/computer_file/program/crew_manifest,
+ /datum/computer_file/program/robocontrol,
+ )
+
/**
* No Department
*/
diff --git a/icons/obj/modular_pda.dmi b/icons/obj/modular_pda.dmi
index 38c2b15fcf4..18df3249e62 100644
Binary files a/icons/obj/modular_pda.dmi and b/icons/obj/modular_pda.dmi differ