From 0bc5d5b3ba9b7136957aa4ba784076167f627064 Mon Sep 17 00:00:00 2001 From: Heroman Date: Sun, 28 Jul 2019 06:46:05 +1000 Subject: [PATCH] Replaces Termination with Demotions as default rank removal --- code/game/machinery/computer/card.dm | 2 +- .../modular_computers/file_system/programs/command/card.dm | 2 +- nano/templates/identification_computer.tmpl | 6 ++++-- nano/templates/mod_identification_computer.tmpl | 6 ++++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 9b1dd198d92..745e1b30c2f 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -279,7 +279,7 @@ if ("terminate") if (is_authenticated()) - modify.assignment = "Terminated" + modify.assignment = "Demoted" modify.access = list() callHook("terminate_employee", list(modify)) diff --git a/code/modules/modular_computers/file_system/programs/command/card.dm b/code/modules/modular_computers/file_system/programs/command/card.dm index b93fbb4d7db..73739580ad4 100644 --- a/code/modules/modular_computers/file_system/programs/command/card.dm +++ b/code/modules/modular_computers/file_system/programs/command/card.dm @@ -167,7 +167,7 @@ computer.proc_eject_id(user) if("terminate") if(computer && can_run(user, 1)) - id_card.assignment = "Terminated" + id_card.assignment = "Demoted" //VOREStation Edit: setting adjustment id_card.access = list() callHook("terminate_employee", list(id_card)) if("edit") diff --git a/nano/templates/identification_computer.tmpl b/nano/templates/identification_computer.tmpl index feb58a705a7..0b8da120483 100644 --- a/nano/templates/identification_computer.tmpl +++ b/nano/templates/identification_computer.tmpl @@ -125,11 +125,13 @@
- Terminations: + + Demotions:
- {{:helper.link('Terminate ' + data.target_owner, 'gear', {'choice' : 'terminate'}, data.target_rank == "Terminated" ? 'disabled' : null, data.target_rank == "Terminated" ? 'disabled' : 'linkDanger')}} + {{:helper.link('Demote ' + data.target_owner, 'gear', {'choice' : 'terminate'}, data.target_rank == "Demoted" ? 'disabled' : null, data.target_rank == "Demoted" ? 'disabled' : 'linkDanger')}}
+
diff --git a/nano/templates/mod_identification_computer.tmpl b/nano/templates/mod_identification_computer.tmpl index 9325723fae4..d5b9172ecc2 100644 --- a/nano/templates/mod_identification_computer.tmpl +++ b/nano/templates/mod_identification_computer.tmpl @@ -55,11 +55,13 @@
- Terminations: + + Demotions:
- {{:helper.link('Terminate ' + data.id_owner, 'gear', {'action' : 'terminate'}, data.id_rank == "Terminated" ? 'disabled' : null, data.id_rank == "Terminated" ? 'disabled' : 'linkDanger')}} + {{:helper.link('Demote ' + data.id_owner, 'gear', {'action' : 'terminate'}, data.id_rank == "Demoted" ? 'disabled' : null, data.id_rank == "Demoted" ? 'disabled' : 'linkDanger')}}
+