diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes_yw.dm b/code/modules/client/preference_setup/loadout/loadout_eyes_yw.dm new file mode 100644 index 0000000000..ec84428bd1 --- /dev/null +++ b/code/modules/client/preference_setup/loadout/loadout_eyes_yw.dm @@ -0,0 +1,20 @@ +/datum/gear/eyes/arglasses/sec + display_name = "AR-S glasses (Sec, BSG)" + path = /obj/item/clothing/glasses/omnihud/sec + allowed_roles = list("Security Officer","Head of Security","Warden","Detective","Blueshield Guard") + +/datum/gear/eyes/arglasses/eng + display_name = "AR-E glasses (Eng)" + path = /obj/item/clothing/glasses/omnihud/eng + allowed_roles = list("Station Engineer","Chief Engineer","Atmospheric Technician") + +/datum/gear/eyes/arglasses/med + display_name = "AR-M glasses (Med, S&R)" + path = /obj/item/clothing/glasses/omnihud/med + allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Search and Rescue") + +/datum/gear/eyes/arglasses/all + display_name = "AR-B glasses (CD, HoP, BSG)" + path = /obj/item/clothing/glasses/omnihud/all + cost = 2 + allowed_roles = list("Colony Director","Head of Personnel","Blueshield Guard") \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm index 4becb41bd3..1c078e67a8 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm @@ -859,6 +859,25 @@ ckeywhitelist = list("snakewitharocketlauncher") character_name = list("Alex Wolf") +//splintergp +//Aroozee Daarvoleast-Clark +/datum/gear/fluff/aroozee_cloak + path = /obj/item/clothing/accessory/poncho/cloak/fluff/aroozee + display_name = "Aroozee Cloak" + description = "A cloak made especially for a vasilissan, it smells of perfume." + ckeywhitelist = list("splintergp") + character_name = list("Aroozee Daarvoleast-Clark") + +/datum/gear/fluff/aroozee_cloak_hos + path = /obj/item/clothing/accessory/poncho/cloak/fluff/aroozeehos + display_name = "Aroozee HOS Cloak" + description = "A cloak denoting the rank of head of security, it's made especially for a vasilissan and smells of perfume." + ckeywhitelist = list("splintergp") + character_name = list("Aroozee Daarvoleast-Clark") + allowed_roles = list("Head of Security") + + + // T CKEYS // U CKEYS diff --git a/code/modules/clothing/spacesuits/rig/suits/station.dm b/code/modules/clothing/spacesuits/rig/suits/station.dm index eda8665fb2..513bc48d8a 100644 --- a/code/modules/clothing/spacesuits/rig/suits/station.dm +++ b/code/modules/clothing/spacesuits/rig/suits/station.dm @@ -205,6 +205,10 @@ siemens_coefficient= 0.75 helm_type = /obj/item/clothing/head/helmet/space/rig/hazmat + //ywadd start + glove_type = /obj/item/clothing/gloves/gauntlets/rig/hazmat + boot_type = /obj/item/clothing/shoes/magboots/rig/hazmat + //ywadd end allowed = list( /obj/item/device/flashlight, @@ -227,6 +231,15 @@ req_access = list() req_one_access = list() +//ywadd start +/obj/item/clothing/gloves/gauntlets/rig/hazmat + icon_override = 'icons/vore/rig_yw/rigs_gauntlets_onmob.dmi' + +/obj/item/clothing/shoes/magboots/rig/hazmat + icon = 'icons/vore/rig_yw/rigs_shoes.dmi' + icon_override = 'icons/vore/rig_yw/rigs_shoes_onmob.dmi' +//ywadd end + /obj/item/weapon/rig/hazmat/equipped req_access = list(access_rd) diff --git a/code/modules/mob/new_player/login_vr.dm b/code/modules/mob/new_player/login_vr.dm index 5eeb269bc5..e9d6dc10c7 100644 --- a/code/modules/mob/new_player/login_vr.dm +++ b/code/modules/mob/new_player/login_vr.dm @@ -1,2 +1,2 @@ /obj/effect/lobby_image - name = "VORE Station" \ No newline at end of file + name = "Yawn Wider Station" // YW EDIT \ No newline at end of file diff --git a/code/modules/vore/fluffstuff/custom_clothes_yw.dm b/code/modules/vore/fluffstuff/custom_clothes_yw.dm index 6f42eb1b6b..917fd7351e 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_yw.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_yw.dm @@ -1607,4 +1607,34 @@ name = "Light duffle bag" desc = "A compact duffle bag, meant for long hikes." icon = 'icons/obj/clothing/backpack.dmi' - icon_state = "duffle" \ No newline at end of file + icon_state = "duffle" + + +// ****** +// SplinterGP +// ****** + +/obj/item/clothing/accessory/poncho/cloak/fluff/aroozee + name = "Aroozee Cloak" + desc = "A cloak made especially for a vasilissan, it smells of perfume." + icon = 'icons/vore/custom_clothes_yw.dmi' + icon_state = "aroozee_cloak" + icon_override = 'icons/vore/custom_clothes_yw.dmi' + item_state = "aroozee_cloak_mob" + flags_inv = HIDETAIL + cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE + +/obj/item/clothing/accessory/poncho/cloak/fluff/aroozeehos + name = "Aroozee Head of Security Cloak" + desc = "A cloak denoting the rank of head of security, it's made especially for a vasilissan and smells of perfume." + icon = 'icons/vore/custom_clothes_yw.dmi' + icon_state = "aroozee_cloak_hos" + icon_override = 'icons/vore/custom_clothes_yw.dmi' + item_state = "aroozee_cloak_hos_mob" + flags_inv = HIDETAIL + cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE + + + diff --git a/icons/mob/species/vulpkanin/helmet.dmi b/icons/mob/species/vulpkanin/helmet.dmi index 2a8cb06994..ded9ce01c7 100644 Binary files a/icons/mob/species/vulpkanin/helmet.dmi and b/icons/mob/species/vulpkanin/helmet.dmi differ diff --git a/icons/mob/species/vulpkanin/suit.dmi b/icons/mob/species/vulpkanin/suit.dmi index c1669b05da..17ddb5bcbd 100644 Binary files a/icons/mob/species/vulpkanin/suit.dmi and b/icons/mob/species/vulpkanin/suit.dmi differ diff --git a/icons/vore/custom_clothes_yw.dmi b/icons/vore/custom_clothes_yw.dmi index 2cb2f39bdd..df650de8db 100644 Binary files a/icons/vore/custom_clothes_yw.dmi and b/icons/vore/custom_clothes_yw.dmi differ diff --git a/icons/vore/rig_yw/rigs_gauntlets_onmob.dmi b/icons/vore/rig_yw/rigs_gauntlets_onmob.dmi index 3f239e7b67..e02dd641d9 100644 Binary files a/icons/vore/rig_yw/rigs_gauntlets_onmob.dmi and b/icons/vore/rig_yw/rigs_gauntlets_onmob.dmi differ diff --git a/icons/vore/rig_yw/rigs_shoes.dmi b/icons/vore/rig_yw/rigs_shoes.dmi index 11495f332e..0f0cc3d292 100644 Binary files a/icons/vore/rig_yw/rigs_shoes.dmi and b/icons/vore/rig_yw/rigs_shoes.dmi differ diff --git a/icons/vore/rig_yw/rigs_shoes_onmob.dmi b/icons/vore/rig_yw/rigs_shoes_onmob.dmi index b6c894e912..53e08c4a8e 100644 Binary files a/icons/vore/rig_yw/rigs_shoes_onmob.dmi and b/icons/vore/rig_yw/rigs_shoes_onmob.dmi differ diff --git a/interface/skin.dmf b/interface/skin.dmf index ebde572420..43bd8e8888 100644 --- a/interface/skin.dmf +++ b/interface/skin.dmf @@ -1825,7 +1825,7 @@ window "mainwindow" right-click = false saved-params = "pos;size;is-minimized;is-maximized" on-size = "" - title = "VOREStation" + title = "Yawn Wider Station" //YW EDIT titlebar = true statusbar = true can-close = true diff --git a/vorestation.dme b/vorestation.dme index 07e8305e4a..e922ef5363 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1682,6 +1682,7 @@ #include "code\modules\client\preference_setup\loadout\loadout_ears.dm" #include "code\modules\client\preference_setup\loadout\loadout_eyes.dm" #include "code\modules\client\preference_setup\loadout\loadout_eyes_vr.dm" +#include "code\modules\client\preference_setup\loadout\loadout_eyes_yw.dm" #include "code\modules\client\preference_setup\loadout\loadout_fluffitems_vr.dm" #include "code\modules\client\preference_setup\loadout\loadout_fluffitems_yw.dm" #include "code\modules\client\preference_setup\loadout\loadout_general.dm"