cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 04:51:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Pushes a missing commit from (#14144)

Browse Source
This commit is contained in:
Werner
2022-08-28 02:14:47 +02:00
parent 3bbcbdb899
commit d21cc48c2a
7 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/cciaa/cciaa_items.dm
+1 -1
View File
@@ -3,7 +3,7 @@
name = "Human Resources Recorder"
desc = "A recorder modified for the specific use-cases of human resource departments around the galaxy."
desc_info = "This recorder records the fingerprints of the interviewee, to do so, interact with this recorder when asked."
desc_fluff = "This recorder is a modified version of the standard universal recorder. It features additional audit-proof records keeping, access controls and is tied to a central management system."
desc_fluff = "This recorder is a modified version of a standard universal recorder. It features additional audit-proof records keeping, access controls and is tied to a central management system."
w_class = ITEMSIZE_TINY
timestamp = list() //This actually turns timestamp into a string later on
code/modules/client/preference_setup/occupation/occupation.dm
+2 -2
View File
@@ -450,9 +450,9 @@
dat += "You can learn more about this faction on <a href='?src=\ref[user.client];JSlink=wiki;wiki_page=[replacetext(faction.name, " ", "_")]'>the wiki</a>.</center>"
if (selected_faction == pref.faction)
dat += "<br>\[Faction already selected\]"
dat += "<br>\[Faction Already Selected\]"
else if (faction.can_select(pref,user))
dat += "<br>\[<a href='?src=\ref[src];faction_select=[html_encode(selected_faction)]'>Select faction</a>\]"
dat += "<br>\[<a href='?src=\ref[src];faction_select=[html_encode(selected_faction)]'>Select Faction</a>\]"
else
dat += "<br><span class='warning'>[faction.get_selection_error(pref, user)]</span>"
code/modules/clothing/factions/scc.dm
+2 -2
View File
@@ -35,7 +35,7 @@
/obj/item/clothing/accessory/tie/corporate/scc
name = "SCC tie"
desc = "A tie made to the exact specifications of the SCC"
desc = "A sleek corporate tie, worn by SCC employees."
contained_sprite = TRUE
icon = 'icons/obj/contained_items/scc.dmi'
icon_state = "scc_tie"
@@ -43,7 +43,7 @@
/obj/item/clothing/head/beret/scc
name = "SCC beret"
desc = "A snazzy beret in SCC colors"
desc = "A corporate beret in the colours of the Stellar Corporate Conglomerate."
contained_sprite = TRUE
icon = 'icons/obj/contained_items/scc.dmi'
icon_state = "scc_beret"