diff --git a/config/alienwhitelist.txt b/config/alienwhitelist.txt index fdf61c6900..23c7c9f7ab 100644 --- a/config/alienwhitelist.txt +++ b/config/alienwhitelist.txt @@ -1,3 +1,34 @@ -#CKey is not case sensitive, Race is. -#CKey - Race -#e.g. JakkSergal - Tajaran +aether_elemental - Daemon +aruis - Xenochimera +bothnevarbackwards - Diona +cameron653 - Xenomorph Hybrid +hawkerthegreat - Vox +jemli - Gutter +mewchild - Diona +mewchild - Vox +natje - Xenochimera +rapidvalj - Vox +rikaru19xjenkins - Xenomorph Hybrid +rikaru19xjenkins - Xenochimera +rixunie - Diona +rixunie - Gutter +seiga - Vox +sepulchre - Vox +sepulchre - Xenomorph Hybrid +silverTalismen - Diona +silvertalismen - Xenochimera +singo - Gutter +some~user - Species +tastypred - Xenochimera +verkister - Xenochimera +xioen - Diona +xioen - Xenochimera +xioen - Xenomorph Hybrid +yuliy - Vox +zammyman215 - Vox +zekesturm - Xenomorph Hybrid +billybob11432 - Vox +bikky - Xenomorph Hybrid +kotetsuredwood - Xenochimera +quotegoat - Xenochimera +ashling - Vox \ No newline at end of file diff --git a/config/custom_items.txt b/config/custom_items.txt index b3fea582c1..bc52ab5d3c 100644 --- a/config/custom_items.txt +++ b/config/custom_items.txt @@ -94,12 +94,6 @@ character_name: Yuuko Shimmerpond item_path: /obj/item/clothing/under/fluff/sakura_hokkaido_kimono } -{ -ckey: beyondmylife -character_name: Cassandra Selone -item_path: /obj/item/weapon/storage/box/fluff/cassandra -} - { ckey: beyondmylife character_name: Kilano Soryu @@ -212,26 +206,6 @@ character_name: Drake Frostpaw item_path: /obj/item/weapon/storage/box/fluff/drake } -{ -ckey: draycu -character_name: Theseus -item_path:/obj/item/weapon/coin/diamond -item_name: theseus' diamond coin -item_desc: An engraved coin made of diamond. On the side for heads is printed the year 2541, along with the letter T. On the side for tails, the letter Y can be seen. -} - -{ -ckey: draycu -character_name: Schae Yonra -item_path: /obj/item/weapon/melee/fluff/holochain/mass -} - -{ -ckey: draycu -character_name: Schae Yonra -item_path: /obj/item/weapon/implanter/reagent_generator/yonra -} - # ######## E CKEYS # Permit Expired @@ -458,6 +432,12 @@ character_name: Kisuke Gema item_path: /obj/item/clothing/glasses/omnihud/kamina } +{ +ckey: Sharkmare +character_name: Xala +item_path: /obj/item/clothing/glasses/omnihud/kamina +} + { ckey: Killjaden character_name: Lassara Faaira'Nrezi @@ -504,7 +484,7 @@ item_path: /obj/item/weapon/implanter/reagent_generator/savannah { ckey: mewchild character_name: Phi Vietsi -item_path: /obj/item/clothing/gloves/ring/seal/signet/fluff/vietsi +item_path: /obj/item/clothing/gloves/fluff/vietsi } { @@ -663,6 +643,12 @@ character_name: Scree item_path: /obj/item/device/modkit_conversion/fluff/screekit } +{ +ckey: Sharkmare +character_name: Kiri +item_path: /obj/item/clothing/accessory/medal/gold/heroism +} + { ckey: scree character_name: Scree @@ -764,11 +750,13 @@ item_path: /obj/item/clothing/under/sexymime # ######## T CKEYS { + ckey: techtypes + character_name: Lasshseeki Korss item_path: /obj/item/weapon/implant/language/eal -} +} { ckey: tonyvld character_name: Tony Bingham @@ -885,7 +873,7 @@ item_path: /obj/item/clothing/glasses/omnihud/med/fluff/wickedtemphud { ckey: wickedtemp character_name: Chakat Tempest -item_path: /obj/item/weapon/reagent_containers/hypospray/vial/tempest +item_path: /obj/item/weapon/reagent_containers/hypospray/vr/tempest } { diff --git a/config/custom_sprites.txt b/config/custom_sprites.txt index db3930a4ae..fc743103f3 100644 --- a/config/custom_sprites.txt +++ b/config/custom_sprites.txt @@ -1 +1,2 @@ -ckey-state \ No newline at end of file +ckey-state +sharkmare-medihound diff --git a/config/jobwhitelist.txt b/config/jobwhitelist.txt index 8af2d81edf..55dda00bff 100644 --- a/config/jobwhitelist.txt +++ b/config/jobwhitelist.txt @@ -1,2 +1,14 @@ # Job whitelist in format ckey - jobname # Like arokha - clown +bikky - research director +kylerick - head of personnel +warrior256 - colony director +ashling - chief engineer +nadyr - chief medical officer +keithwinters - head of security +izzya - chief medical officer +lucidhope - head of personnel +kotetsuredwood - chief medical officer +mrmacinto0sh - head of personnel +erikthedog - head of security +maglev2 - chief engineer