diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 888bd00e3..47f2610a9 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -1261,9 +1261,14 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if(jobban_isbanned(user, rank))
HTML += "[rank]| BANNED | "
continue
+ //Hyperstation Edit - Whitelisted roles
if((rank in GLOB.silly_positions) && (!sillyroles))
HTML += "[rank] WHITELIST | "
continue
+ if((rank in GLOB.important_positions) && (!importantroles)) //TODO: make whitelists a bit more accurate than "silly" and "important"
+ HTML += "[rank] WHITELIST | "
+ continue
+ //Hyperstation Edit end
var/required_playtime_remaining = job.required_playtime_remaining(user.client)
if(required_playtime_remaining)
HTML += "[rank] \[ [get_exp_format(required_playtime_remaining)] as [job.get_exp_req_type()] \] | "
diff --git a/code/modules/jobs/job_types/security.dm b/code/modules/jobs/job_types/security.dm
index 33776f618..9b499dba6 100644
--- a/code/modules/jobs/job_types/security.dm
+++ b/code/modules/jobs/job_types/security.dm
@@ -92,6 +92,8 @@ Lambent
exp_requirements = 9000
exp_type = EXP_TYPE_COMMAND
exp_type_department = EXP_TYPE_COMMAND
+ whitelist_type = "important"
+ custom_spawn_text = "You are a Kinaris Lambent; a person hired directly by Kinaris who has a high interest in asset security and the protection of the station. Unlike the station, your gear is official Kinaris items, not replicated Milky-Way Engrams. As such, you should keep them safe due to the power they hold. You answer directly to Central Command and Kinaris, and security matters should not involve you for the most part, unless staffing is low or there is a problem with securing assets. Thankfully, Layenia Station is one of Kinaris's most low-tech stations with hardly anything important to secure; not even the items in the vault are noteworthy due to the falsified, low-tech Engram they're under. Just ensure peace is kept and the station is functioning in a calm manner."
outfit = /datum/outfit/job/lambent
@@ -114,13 +116,12 @@ Lambent
id = /obj/item/card/id/silver
belt = /obj/item/pda/captain
- glasses = /obj/item/clothing/glasses/sunglasses
+ glasses = /obj/item/clothing/glasses/hud/toggle/zao
ears = /obj/item/radio/headset/heads/captain/alt
- gloves = /obj/item/clothing/gloves/color/captain
- uniform = /obj/item/clothing/under/rank/captain
- suit = /obj/item/clothing/suit/armor/vest/capcarapace
- shoes = /obj/item/clothing/shoes/sneakers/brown
- head = /obj/item/clothing/head/caphat
+ gloves = /obj/item/clothing/gloves/lambent
+ uniform = /obj/item/clothing/under/rank/lambent
+ suit = /obj/item/clothing/suit/lambent
+ shoes = /obj/item/clothing/shoes/lambent
backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced = 1)
backpack = /obj/item/storage/backpack/captain
diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm
index 3dd039adb..498a9af4d 100644
--- a/code/modules/jobs/jobs.dm
+++ b/code/modules/jobs/jobs.dm
@@ -61,6 +61,9 @@ GLOBAL_LIST_INIT(nonhuman_positions, list(
"Cyborg",
ROLE_PAI))
+GLOBAL_LIST_INIT(important_positions, list(
+ "Lambent"))
+
GLOBAL_LIST_INIT(silly_positions, list(
"Clown",
"Mime"))
diff --git a/hyperstation/code/modules/clothing/gloves.dm b/hyperstation/code/modules/clothing/gloves.dm
index c3ecb21fe..107126506 100644
--- a/hyperstation/code/modules/clothing/gloves.dm
+++ b/hyperstation/code/modules/clothing/gloves.dm
@@ -10,4 +10,4 @@
strip_delay = 40
equip_delay_other = 20
cold_protection = HANDS
- min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
\ No newline at end of file
+ min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
diff --git a/hyperstation/code/obj/Lambent/gloves.dm b/hyperstation/code/obj/Lambent/gloves.dm
new file mode 100644
index 000000000..8cbb2df61
--- /dev/null
+++ b/hyperstation/code/obj/Lambent/gloves.dm
@@ -0,0 +1,16 @@
+/obj/item/clothing/gloves/lambent
+ name = "Lambent's sleeves"
+ desc = "An elegant sleeve worn from the shoulder down. Despite missing anything on the palm and fingers, it seems to cast small hardlight protections over the hands, like a glove."
+ icon_state = "lambent"
+ item_state = "lambent"
+ icon = 'hyperstation/icons/obj/clothing/gloves.dmi'
+ alternate_worn_icon = 'hyperstation/icons/mobs/gloves.dmi'
+ armor = list("melee" = 50, "bullet" = 50, "laser" = 30, "energy" = 30, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 20, "acid" = 60)
+ resistance_flags = LAVA_PROOF|FIRE_PROOF|UNACIDABLE
+ transfer_prints = FALSE
+ strip_delay = 40
+ body_parts_covered = ARMS|HANDS
+ cold_protection = ARMS|HANDS
+ min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
+ siemens_coefficient = 0
+ permeability_coefficient = 0.05
diff --git a/hyperstation/code/obj/Lambent/shoes.dm b/hyperstation/code/obj/Lambent/shoes.dm
new file mode 100644
index 000000000..aff7e1271
--- /dev/null
+++ b/hyperstation/code/obj/Lambent/shoes.dm
@@ -0,0 +1,14 @@
+/obj/item/clothing/shoes/lambent
+ name = "Lambent's heels"
+ desc = "A sleek pair of leggings with high heels, gilded in golden strips. It seems to have an autobalancing matrix installed."
+ icon_state = "lambent"
+ item_state = "lambent"
+ icon = 'hyperstation/icons/obj/clothing/shoes.dmi'
+ alternate_worn_icon = 'hyperstation/icons/mobs/feet.dmi'
+ body_parts_covered = LEGS|FEET
+ cold_protection = LEGS|FEET
+ min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
+ strip_delay = 70
+ resistance_flags = LAVA_PROOF|FIRE_PROOF|UNACIDABLE
+ armor = list("melee" = 50, "bullet" = 50, "laser" = 30, "energy" = 30, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 20, "acid" = 60)
+ clothing_flags = NOSLIP
diff --git a/hyperstation/code/obj/Lambent/suit.dm b/hyperstation/code/obj/Lambent/suit.dm
new file mode 100644
index 000000000..c9c990bcf
--- /dev/null
+++ b/hyperstation/code/obj/Lambent/suit.dm
@@ -0,0 +1,13 @@
+/obj/item/clothing/suit/lambent
+ name = "Lambent's coat"
+ desc = "A regal-esque coat outfitted with inert nanites, waiting to be activated at a moment's notice."
+ icon = 'hyperstation/icons/obj/clothing/suits.dmi'
+ //alternate_worn_icon = 'hyperstation/icons/mobs/suits.dmi'
+ icon_state = "lambent"
+ item_state = "lambent"
+ body_parts_covered = CHEST|LEGS
+ cold_protection = CHEST|GROIN|LEGS|ARMS
+ min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
+ strip_delay = 70
+ resistance_flags = LAVA_PROOF|FIRE_PROOF|UNACIDABLE
+ armor = list("melee" = 50, "bullet" = 50, "laser" = 30, "energy" = 30, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 20, "acid" = 60)
diff --git a/hyperstation/code/obj/Lambent/uniform.dm b/hyperstation/code/obj/Lambent/uniform.dm
new file mode 100644
index 000000000..8fcd48a2b
--- /dev/null
+++ b/hyperstation/code/obj/Lambent/uniform.dm
@@ -0,0 +1,14 @@
+/obj/item/clothing/under/rank/lambent
+ name = "Lambent's outfitting"
+ desc = "A Hyperwoven outfitting meant for a Kinaris Lambent. It's gilded colors and ultratech weaving speak highly about status."
+ icon = 'hyperstation/icons/obj/clothing/uniforms.dmi'
+ //alternate_worn_icon = 'hyperstation/icons/mobs/uniforms.dmi'
+ icon_state = "lambent"
+ item_state = "lambent"
+ armor = list("melee" = 50, "bullet" = 50, "laser" = 30, "energy" = 30, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 20, "acid" = 60)
+ resistance_flags = LAVA_PROOF|FIRE_PROOF|UNACIDABLE
+ strip_delay = 50
+ sensor_mode = SENSOR_COORDS
+ random_sensor = FALSE
+
+//We'll add more alternative outfits here later. For now this'll be how it is!
diff --git a/hyperstation/icons/mobs/feet.dmi b/hyperstation/icons/mobs/feet.dmi
index 93ad37e85..67e5f7708 100644
Binary files a/hyperstation/icons/mobs/feet.dmi and b/hyperstation/icons/mobs/feet.dmi differ
diff --git a/hyperstation/icons/mobs/gloves.dmi b/hyperstation/icons/mobs/gloves.dmi
index 516151085..ba22bebbd 100644
Binary files a/hyperstation/icons/mobs/gloves.dmi and b/hyperstation/icons/mobs/gloves.dmi differ
diff --git a/hyperstation/icons/mobs/suits.dmi b/hyperstation/icons/mobs/suits.dmi
index a2dcf641a..0394b4c4d 100644
Binary files a/hyperstation/icons/mobs/suits.dmi and b/hyperstation/icons/mobs/suits.dmi differ
diff --git a/hyperstation/icons/mobs/uniforms.dmi b/hyperstation/icons/mobs/uniforms.dmi
index 89868e8c4..d76e4b678 100644
Binary files a/hyperstation/icons/mobs/uniforms.dmi and b/hyperstation/icons/mobs/uniforms.dmi differ
diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi
index 617fbcf01..40d0c675a 100644
Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index 8fe60a952..6a331e8d9 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index 1360328ba..3f8cd5af4 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/modular_citadel/icons/mob/digishoes.dmi b/modular_citadel/icons/mob/digishoes.dmi
index a3175f0c3..7acfe1fc6 100644
Binary files a/modular_citadel/icons/mob/digishoes.dmi and b/modular_citadel/icons/mob/digishoes.dmi differ
diff --git a/modular_citadel/icons/mob/suit_digi.dmi b/modular_citadel/icons/mob/suit_digi.dmi
index 8a14afa11..55c83982e 100644
Binary files a/modular_citadel/icons/mob/suit_digi.dmi and b/modular_citadel/icons/mob/suit_digi.dmi differ
diff --git a/modular_citadel/icons/mob/uniform_digi.dmi b/modular_citadel/icons/mob/uniform_digi.dmi
index ddc536dd1..6e1f3e1a2 100644
Binary files a/modular_citadel/icons/mob/uniform_digi.dmi and b/modular_citadel/icons/mob/uniform_digi.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index 2cdd23831..60b9fb630 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -3197,6 +3197,10 @@
#include "hyperstation\code\obj\sounding.dm"
#include "hyperstation\code\obj\stargate_clothing.dm"
#include "hyperstation\code\obj\vibrator.dm"
+#include "hyperstation\code\obj\Lambent\gloves.dm"
+#include "hyperstation\code\obj\Lambent\shoes.dm"
+#include "hyperstation\code\obj\Lambent\suit.dm"
+#include "hyperstation\code\obj\Lambent\uniform.dm"
#include "hyperstation\code\obj\SYSuit\abilities.dm"
#include "hyperstation\code\obj\SYSuit\main.dm"
#include "hyperstation\code\obj\SYSuit\suit_initialize.dm"