From a16ccc87554ccdcda11bbd7a28c0b33da0cc5571 Mon Sep 17 00:00:00 2001 From: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> Date: Tue, 6 Sep 2022 12:46:24 +0200 Subject: [PATCH] Minor HRA Fixes (#14751) --- code/game/jobs/faction/admin.dm | 6 ++--- code/game/jobs/faction/faction.dm | 2 +- code/modules/cciaa/cciaa_items.dm | 6 ++--- code/modules/clothing/factions/scc.dm | 32 ++++++++++++++------------- html/changelogs/hra_fixes.yml | 6 +++++ 5 files changed, 30 insertions(+), 22 deletions(-) create mode 100644 html/changelogs/hra_fixes.yml diff --git a/code/game/jobs/faction/admin.dm b/code/game/jobs/faction/admin.dm index cdb8eba7a44..9cdb7320503 100644 --- a/code/game/jobs/faction/admin.dm +++ b/code/game/jobs/faction/admin.dm @@ -2,9 +2,9 @@ name = "Admin Jobs" description = {"
This faction is for IC administrative jobs used by staff. -
- "} + "} + departments = {"Command"} title_suffix = "SCC" allowed_role_types = ADMIN_ROLES @@ -15,4 +15,4 @@ ) /datum/faction/admin/is_visible(var/mob/user) - return check_rights(R_CCIAA,FALSE,user) + return check_rights(R_CCIAA, FALSE, user) \ No newline at end of file diff --git a/code/game/jobs/faction/faction.dm b/code/game/jobs/faction/faction.dm index c8222f232fc..092978d88bd 100644 --- a/code/game/jobs/faction/faction.dm +++ b/code/game/jobs/faction/faction.dm @@ -86,4 +86,4 @@ return objective /datum/faction/proc/is_visible(var/mob/user) - return TRUE + return TRUE \ No newline at end of file diff --git a/code/modules/cciaa/cciaa_items.dm b/code/modules/cciaa/cciaa_items.dm index 28a07693ba8..a445a20b1d0 100644 --- a/code/modules/cciaa/cciaa_items.dm +++ b/code/modules/cciaa/cciaa_items.dm @@ -1,9 +1,9 @@ //CCIAA's tape recorder /obj/item/device/taperecorder/cciaa 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 = "A modified recorder used for interviews by human resources personnel around the galaxy." 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." + desc_info = "This recorder records the fingerprints of the interviewee, to do so, interact with this recorder when asked." w_class = ITEMSIZE_TINY timestamp = list() //This actually turns timestamp into a string later on @@ -357,4 +357,4 @@ /obj/item/storage/lockbox/cciaa/fib name = "FIB agent briefcase" - desc = "A smart looking ID locked briefcase." + desc = "A smart looking ID locked briefcase." \ No newline at end of file diff --git a/code/modules/clothing/factions/scc.dm b/code/modules/clothing/factions/scc.dm index 032913e6112..b671110df5d 100644 --- a/code/modules/clothing/factions/scc.dm +++ b/code/modules/clothing/factions/scc.dm @@ -1,26 +1,29 @@ /obj/item/clothing/under/rank/scc2 name = "\improper SCC uniform" desc = "A standardized uniform used by SCC personnel." - contained_sprite = TRUE icon = 'icons/obj/contained_items/scc.dmi' icon_state = "scc_liaison" item_state = "scc_liaison" - + contained_sprite = TRUE /obj/item/clothing/suit/storage/toggle/armor/vest/scc - name = "SCC vest" + name = "\improper SCC vest" desc = "A stylish vest worn by SCC personnel." - contained_sprite = TRUE icon = 'icons/obj/contained_items/scc.dmi' icon_state = "scc_liaison_vest" item_state = "scc_liaison_vest" - allowed = list(/obj/item/gun,/obj/item/reagent_containers/spray/pepper,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/device/flashlight) - body_parts_covered = UPPER_TORSO - cold_protection = 0 - min_cold_protection_temperature = 0 - heat_protection = 0 - max_heat_protection_temperature = 0 contained_sprite = TRUE + opened = null // Not used. + allowed = list( + /obj/item/gun, + /obj/item/reagent_containers/spray/pepper, + /obj/item/ammo_magazine, + /obj/item/ammo_casing, + /obj/item/melee/baton, + /obj/item/handcuffs, + /obj/item/device/flashlight + ) + body_parts_covered = UPPER_TORSO armor = list( melee = ARMOR_MELEE_KNIVES, bullet = ARMOR_BALLISTIC_PISTOL, @@ -30,21 +33,20 @@ ) /obj/item/clothing/suit/storage/toggle/armor/vest/scc/toggle_open() - to_chat(usr ,"Safety regulations forbid you from opening the stab-vest while on the job.") return /obj/item/clothing/accessory/tie/corporate/scc - name = "SCC tie" + name = "\improper SCC tie" desc = "A sleek corporate tie, worn by SCC employees." - contained_sprite = TRUE icon = 'icons/obj/contained_items/scc.dmi' icon_state = "scc_tie" item_state = "scc_tie" + contained_sprite = TRUE /obj/item/clothing/head/beret/scc - name = "SCC beret" + name = "\improper SCC beret" 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" item_state = "scc_beret" + contained_sprite = TRUE \ No newline at end of file diff --git a/html/changelogs/hra_fixes.yml b/html/changelogs/hra_fixes.yml new file mode 100644 index 00000000000..32fc7c0ddf2 --- /dev/null +++ b/html/changelogs/hra_fixes.yml @@ -0,0 +1,6 @@ +author: SleepyGemmy + +delete-after: True + +changes: + - spellcheck: "Fixes some minor typos and clean code related stuff in the HRA code." \ No newline at end of file