From 0bc5d5b3ba9b7136957aa4ba784076167f627064 Mon Sep 17 00:00:00 2001
From: Heroman <alesha3000@list.ru>
Date: Sun, 28 Jul 2019 06:46:05 +1000
Subject: [PATCH 1/3] 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 9b1dd198d9..745e1b30c2 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 b93fbb4d7d..73739580ad 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 feb58a705a..0b8da12048 100644
--- a/nano/templates/identification_computer.tmpl
+++ b/nano/templates/identification_computer.tmpl
@@ -125,11 +125,13 @@
 
 				<div class='item'>
 					<div class='itemLabel'>
-						Terminations:
+					<!-- VOREStation Edit Start -->
+						Demotions:
 					</div>
 					<div class='itemContent'>
-						{{: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')}}
 					</div>
+					<!-- VOREStation Edit End -->
 				</div>
 
 				<div class='item'>
diff --git a/nano/templates/mod_identification_computer.tmpl b/nano/templates/mod_identification_computer.tmpl
index 9325723fae..d5b9172ecc 100644
--- a/nano/templates/mod_identification_computer.tmpl
+++ b/nano/templates/mod_identification_computer.tmpl
@@ -55,11 +55,13 @@
 
 	<div class='item'>
 	  <div class='itemLabel'>
-		Terminations:
+		<!-- VOREStation Edit Start -->
+		Demotions:
 	  </div>
 	  <div class='itemContent'>
-		{{: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')}}
 	  </div>
+		<!-- VOREStation Edit End -->
 	</div>
 
 	<div class='item'>

From fea0c9954dd619a8b9ffdc4efd65405d80272c4e Mon Sep 17 00:00:00 2001
From: Heroman <alesha3000@list.ru>
Date: Tue, 30 Jul 2019 05:38:29 +1000
Subject: [PATCH 2/3] Adds missing //Vorestation Edit

---
 code/game/machinery/computer/card.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm
index 745e1b30c2..0c7f3f03ee 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 = "Demoted"
+				modify.assignment = "Demoted"	//VOREStation Edit
 				modify.access = list()
 
 				callHook("terminate_employee", list(modify))

From a8e3b1e27036e4df2b0547d50b2adcdde4632f00 Mon Sep 17 00:00:00 2001
From: Heroman <alesha3000@list.ru>
Date: Sat, 3 Aug 2019 21:59:56 +1000
Subject: [PATCH 3/3] Replaces Terminated with Dismissed 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                   | 4 ++--
 nano/templates/mod_identification_computer.tmpl               | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm
index 0c7f3f03ee..eb78d41e26 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 = "Demoted"	//VOREStation Edit
+				modify.assignment = "Dismissed"	//VOREStation Edit: setting adjustment
 				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 73739580ad..5bcac7adf8 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 = "Demoted"	//VOREStation Edit: setting adjustment
+				id_card.assignment = "Dismissed"	//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 0b8da12048..7f4fbdda70 100644
--- a/nano/templates/identification_computer.tmpl
+++ b/nano/templates/identification_computer.tmpl
@@ -126,10 +126,10 @@
 				<div class='item'>
 					<div class='itemLabel'>
 					<!-- VOREStation Edit Start -->
-						Demotions:
+						Dismissals:
 					</div>
 					<div class='itemContent'>
-						{{:helper.link('Demote ' + data.target_owner, 'gear', {'choice' : 'terminate'}, data.target_rank == "Demoted" ? 'disabled' : null, data.target_rank == "Demoted" ? 'disabled' : 'linkDanger')}}
+						{{:helper.link('Dismiss ' + data.target_owner, 'gear', {'choice' : 'terminate'}, data.target_rank == "Dismissed" ? 'disabled' : null, data.target_rank == "Dismissed" ? 'disabled' : 'linkDanger')}}
 					</div>
 					<!-- VOREStation Edit End -->
 				</div>
diff --git a/nano/templates/mod_identification_computer.tmpl b/nano/templates/mod_identification_computer.tmpl
index d5b9172ecc..0dee1fdeac 100644
--- a/nano/templates/mod_identification_computer.tmpl
+++ b/nano/templates/mod_identification_computer.tmpl
@@ -56,10 +56,10 @@
 	<div class='item'>
 	  <div class='itemLabel'>
 		<!-- VOREStation Edit Start -->
-		Demotions:
+		Dismissals:
 	  </div>
 	  <div class='itemContent'>
-		{{:helper.link('Demote ' + data.id_owner, 'gear', {'action' : 'terminate'}, data.id_rank == "Demoted" ? 'disabled' : null, data.id_rank == "Demoted" ? 'disabled' : 'linkDanger')}}
+		{{:helper.link('Dismiss ' + data.id_owner, 'gear', {'action' : 'terminate'}, data.id_rank == "Dismissed" ? 'disabled' : null, data.id_rank == "Dismissed" ? 'disabled' : 'linkDanger')}}
 	  </div>
 		<!-- VOREStation Edit End -->
 	</div>