cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 12:08:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5528 from Heroman3003/demotion

Browse Source 
Replaces "Terminated" with "Dismissed" as default rank removal
This commit is contained in:
Novacat
2019-08-03 08:41:50 -04:00
committed by GitHub
parent f15c7cd16e a8e3b1e270
commit c2463fc02b
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/computer/card.dm
+1 -1
View File
@@ -279,7 +279,7 @@
if ("terminate")
if (is_authenticated())
modify.assignment = "Terminated"
modify.assignment = "Dismissed" //VOREStation Edit: setting adjustment
modify.access = list()
callHook("terminate_employee", list(modify))
code/modules/modular_computers/file_system/programs/command/card.dm
+1 -1
View File
@@ -167,7 +167,7 @@
computer.proc_eject_id(user)
if("terminate")
if(computer && can_run(user, 1))
id_card.assignment = "Terminated"
id_card.assignment = "Dismissed" //VOREStation Edit: setting adjustment
id_card.access = list()
callHook("terminate_employee", list(id_card))
if("edit")
nano/templates/identification_computer.tmpl
+4 -2
View File
@@ -125,11 +125,13 @@
<div class='item'>
<div class='itemLabel'>
Terminations:
<!-- VOREStation Edit Start -->
Dismissals:
</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('Dismiss ' + data.target_owner, 'gear', {'choice' : 'terminate'}, data.target_rank == "Dismissed" ? 'disabled' : null, data.target_rank == "Dismissed" ? 'disabled' : 'linkDanger')}}
</div>
<!-- VOREStation Edit End -->
</div>
<div class='item'>
nano/templates/mod_identification_computer.tmpl
+4 -2
View File
@@ -55,11 +55,13 @@
<div class='item'>
<div class='itemLabel'>
Terminations:
<!-- VOREStation Edit Start -->
Dismissals:
</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('Dismiss ' + data.id_owner, 'gear', {'action' : 'terminate'}, data.id_rank == "Dismissed" ? 'disabled' : null, data.id_rank == "Dismissed" ? 'disabled' : 'linkDanger')}}
</div>
<!-- VOREStation Edit End -->
</div>
<div class='item'>