diff --git a/hyperstation/code/obj/ZaoCorp/hat.dm b/hyperstation/code/obj/ZaoCorp/hat.dm index 2936e88c3b..cb86892cbb 100644 --- a/hyperstation/code/obj/ZaoCorp/hat.dm +++ b/hyperstation/code/obj/ZaoCorp/hat.dm @@ -4,7 +4,6 @@ icon = 'hyperstation/icons/obj/clothing/head.dmi' icon_state = "zaohat" item_state = "helmet" - item_color = "zaohat" mob_overlay_icon = 'hyperstation/icons/mobs/head.dmi' armor = list("melee" = 40, "bullet" = 40, "laser" = 10,"energy" = 20, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 60) cold_protection = HEAD diff --git a/hyperstation/code/obj/ZaoCorp/suit.dm b/hyperstation/code/obj/ZaoCorp/suit.dm index 50b294c21d..67ccbd29e6 100644 --- a/hyperstation/code/obj/ZaoCorp/suit.dm +++ b/hyperstation/code/obj/ZaoCorp/suit.dm @@ -4,7 +4,6 @@ icon = 'hyperstation/icons/obj/clothing/suits.dmi' icon_state = "zaocoat" item_state = "zaocoat" - item_color = "zaocoat" mob_overlay_icon = 'hyperstation/icons/mobs/suits.dmi' togglename = "zipper" body_parts_covered = CHEST|ARMS|LEGS diff --git a/hyperstation/code/obj/ZaoCorp/uniform.dm b/hyperstation/code/obj/ZaoCorp/uniform.dm index 411f48b834..3f7cfaeafd 100644 --- a/hyperstation/code/obj/ZaoCorp/uniform.dm +++ b/hyperstation/code/obj/ZaoCorp/uniform.dm @@ -4,5 +4,4 @@ icon = 'hyperstation/icons/obj/clothing/uniforms.dmi' icon_state = "zaounder" item_state = "zaounder" - item_color = "zaounder" mob_overlay_icon = 'hyperstation/icons/mobs/uniforms.dmi' diff --git a/hyperstation/code/obj/ZaoCorp/visor.dm b/hyperstation/code/obj/ZaoCorp/visor.dm index 680ce5d91e..82cc58cb1a 100644 --- a/hyperstation/code/obj/ZaoCorp/visor.dm +++ b/hyperstation/code/obj/ZaoCorp/visor.dm @@ -11,7 +11,6 @@ mob_overlay_icon = 'hyperstation/icons/mobs/eyes.dmi' hud_type = DATA_HUD_SECURITY_ADVANCED actions_types = list(/datum/action/item_action/switch_hud) - glass_colour_type = /datum/client_colour/glass_colour/lightyellow /obj/item/clothing/glasses/hud/toggle/zao/attack_self(mob/user) if(!ishuman(user)) @@ -30,14 +29,12 @@ hud_type = null flash_protect = 0 tint = 0 - change_glass_color(user, /datum/client_colour/glass_colour/white) else hud_type = DATA_HUD_SECURITY_ADVANCED icon_state = "zaovisor" item_state = "zaovisor" flash_protect = 1 tint = 1 - change_glass_color(user, /datum/client_colour/glass_colour/lightyellow) if (hud_type) var/datum/atom_hud/H = GLOB.huds[hud_type] diff --git a/hyperstation/code/obj/kinkyclothes.dm b/hyperstation/code/obj/kinkyclothes.dm index c9e2bd9914..410c940993 100644 --- a/hyperstation/code/obj/kinkyclothes.dm +++ b/hyperstation/code/obj/kinkyclothes.dm @@ -6,14 +6,12 @@ icon = 'hyperstation/icons/obj/clothing/gloves.dmi' mob_overlay_icon = 'hyperstation/icons/mobs/gloves.dmi' mutantrace_variation = NONE - price = 5 /obj/item/clothing/gloves/latexsleeves/security name = "security sleeves" desc = "A pair of latex sleeves, with a band of red above the elbows denoting that the wearer is part of the security team." icon_state = "latexsec" item_state = "latexsec" - price = 5 /obj/item/clothing/head/dominatrixcap name = "dominatrix cap" @@ -35,7 +33,7 @@ /obj/item/clothing/shoes/highheels/Initialize(mapload) . = ..() - AddComponent(/datum/component/squeak, list('sound/effects/footstep/highheel1.ogg' = 1,'sound/effects/footstep/highheel2.ogg' = 1), 20) + AddComponent(/datum/component/squeak, list('hyperstation/sound/footstep/highheel1.ogg' = 1,'hyperstation/sound/footstep/highheel2.ogg' = 1), 20) //the classic click clack obj/item/clothing/neck/stole @@ -45,7 +43,6 @@ obj/item/clothing/neck/stole w_class = WEIGHT_CLASS_SMALL icon_state = "stole" item_state = "" //no inhands - price = 3 obj/item/clothing/neck/stole/black name = "black boa" @@ -55,7 +52,6 @@ obj/item/clothing/neck/stole/black icon_state = "stole" item_state = "" //no inhands color = "#3d3d3d" - price = 3 /obj/item/clothing/suit/fluffyhalfcrop name = "fluffy half-crop jacket" @@ -86,7 +82,7 @@ obj/item/clothing/neck/stole/black item_state = "r_suit" can_adjust = FALSE mutantrace_variation = NONE - do_not_cover_butt = TRUE + body_parts_covered = CHEST|LEGS|ARMS /obj/item/clothing/under/sexynursesuit name = "Sexy nurse outfit" @@ -97,6 +93,7 @@ obj/item/clothing/neck/stole/black item_state = "r_suit" can_adjust = FALSE mutantrace_variation = NONE + body_parts_covered = CHEST|LEGS|ARMS /obj/item/clothing/under/centcomdress name = "Centcom Dress Uniform" diff --git a/hyperstation/sound/footstep/heels.ogg b/hyperstation/sound/footstep/heels.ogg new file mode 100644 index 0000000000..64006f0076 Binary files /dev/null and b/hyperstation/sound/footstep/heels.ogg differ diff --git a/hyperstation/sound/footstep/highheel1.ogg b/hyperstation/sound/footstep/highheel1.ogg new file mode 100644 index 0000000000..8f66ac2998 Binary files /dev/null and b/hyperstation/sound/footstep/highheel1.ogg differ diff --git a/hyperstation/sound/footstep/highheel2.ogg b/hyperstation/sound/footstep/highheel2.ogg new file mode 100644 index 0000000000..3c5c779699 Binary files /dev/null and b/hyperstation/sound/footstep/highheel2.ogg differ diff --git a/tgstation.dme b/tgstation.dme index 5ec7b059f6..ac176ae89c 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4046,7 +4046,13 @@ #include "hyperstation\code\modules\surgery\organs\augments_arms.dm" #include "hyperstation\code\obj\ashtray.dm" #include "hyperstation\code\obj\decal.dm" +#include "hyperstation\code\obj\kinkyclothes.dm" #include "hyperstation\code\obj\sizeitems.dm" +#include "hyperstation\code\obj\stargate_clothing.dm" +#include "hyperstation\code\obj\ZaoCorp\hat.dm" +#include "hyperstation\code\obj\ZaoCorp\suit.dm" +#include "hyperstation\code\obj\ZaoCorp\uniform.dm" +#include "hyperstation\code\obj\ZaoCorp\visor.dm" #include "interface\interface.dm" #include "interface\menu.dm" #include "interface\stylesheet.dm"