Merge branch 'master' into kk-miscstuff

This commit is contained in:
Izac Joof Forsgren
2020-02-17 17:44:09 +01:00
committed by GitHub
5 changed files with 52 additions and 3 deletions

View File

@@ -859,6 +859,25 @@
ckeywhitelist = list("snakewitharocketlauncher") ckeywhitelist = list("snakewitharocketlauncher")
character_name = list("Alex Wolf") 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 // T CKEYS
// U CKEYS // U CKEYS

View File

@@ -1,2 +1,2 @@
/obj/effect/lobby_image /obj/effect/lobby_image
name = "VORE Station" name = "Yawn Wider Station" // YW EDIT

View File

@@ -1607,4 +1607,34 @@
name = "Light duffle bag" name = "Light duffle bag"
desc = "A compact duffle bag, meant for long hikes." desc = "A compact duffle bag, meant for long hikes."
icon = 'icons/obj/clothing/backpack.dmi' icon = 'icons/obj/clothing/backpack.dmi'
icon_state = "duffle" 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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 132 KiB

After

Width:  |  Height:  |  Size: 138 KiB

View File

@@ -1825,7 +1825,7 @@ window "mainwindow"
right-click = false right-click = false
saved-params = "pos;size;is-minimized;is-maximized" saved-params = "pos;size;is-minimized;is-maximized"
on-size = "" on-size = ""
title = "VOREStation" title = "Yawn Wider Station" //YW EDIT
titlebar = true titlebar = true
statusbar = true statusbar = true
can-close = true can-close = true