mirror of
https://github.com/Yawn-Wider/YWPolarisVore.git
synced 2026-08-25 22:17:21 +01:00
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
This commit is contained in:
@@ -664,12 +664,6 @@
|
||||
ckeywhitelist = list("luminescentring")
|
||||
character_name = list("Briana Moore")
|
||||
|
||||
/datum/gear/fluff/entchtut_medal
|
||||
path = /obj/item/clothing/accessory/medal/conduct
|
||||
display_name = "Entchtut's Conduct Medal"
|
||||
ckeywhitelist = list("littlebigkid2000")
|
||||
character_name = list("Entchtut Cenein")
|
||||
|
||||
// M CKEYS
|
||||
/datum/gear/fluff/phi_box
|
||||
path = /obj/item/weapon/storage/box/fluff/phi
|
||||
@@ -839,6 +833,12 @@
|
||||
ckeywhitelist = list("pastelprincedan")
|
||||
character_name = list("Kiyoshi Maki", "Masumi Maki")
|
||||
|
||||
/datum/gear/fluff/entchtut_medal
|
||||
path = /obj/item/clothing/accessory/medal/conduct
|
||||
display_name = "Entchtut's Conduct Medal"
|
||||
ckeywhitelist = list("positronicjune")
|
||||
character_name = list("Entchtut Cenein")
|
||||
|
||||
/datum/gear/fluff/mechanic_overalls
|
||||
path = /obj/item/clothing/under/fluff/mechanic_overalls
|
||||
display_name = "mechanic overalls"
|
||||
|
||||
Reference in New Issue
Block a user