diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm index 2dbaf5394..f30584f27 100644 --- a/code/modules/vending/autodrobe.dm +++ b/code/modules/vending/autodrobe.dm @@ -112,6 +112,9 @@ /obj/item/clothing/head/wig/random = 3, /obj/item/clothing/suit/ran = 2, /obj/item/clothing/head/ran = 2, + /obj/item/clothing/suit/threepwoodjacket = 3, + /obj/item/clothing/under/threepwood = 2, + /obj/item/clothing/shoes/threepwoodboots = 1, /obj/item/clothing/under/vaultsuit = 3) contraband = list(/obj/item/clothing/suit/judgerobe = 1, /obj/item/clothing/head/powdered_wig = 1, diff --git a/hyperstation/code/obj/kinkyclothes.dm b/hyperstation/code/obj/kinkyclothes.dm index 3a5e44318..e7be65751 100644 --- a/hyperstation/code/obj/kinkyclothes.dm +++ b/hyperstation/code/obj/kinkyclothes.dm @@ -160,9 +160,6 @@ obj/item/clothing/neck/stole/black var/firstpickup = TRUE var/pickupsound = TRUE -/obj/item/clothing/under/vaultsuit/no_sound - pickupsound = FALSE - /obj/item/clothing/under/vaultsuit/equipped(mob/user, slot) . = ..() if(!pickupsound) @@ -198,3 +195,44 @@ obj/item/clothing/neck/stole/black body_parts_covered = CHEST|LEGS|ARMS min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT +/obj/item/clothing/suit/threepwoodjacket + name = "threepwood's jacket" + desc = "A jacket fit for a Mighty Pirate!" + icon = 'hyperstation/icons/obj/clothing/suits.dmi' + icon_state = "threepwoodjacket" + alternate_worn_icon = 'hyperstation/icons/mobs/suits.dmi' + item_state = "b_suit" + var/firstpickup = TRUE + var/pickupsound = TRUE + +/obj/item/clothing/suit/threepwoodjacket/equipped(mob/user, slot) + . = ..() + if(!pickupsound) + return + if(!ishuman(user)) + return + if(slot == SLOT_WEAR_SUIT) + if(!firstpickup) + SEND_SOUND(user, sound('hyperstation/sound/effects/vaultsuit/FalloutEXPUp.ogg', volume = 00)) + else + firstpickup = FALSE + SEND_SOUND(user, sound('hyperstation/sound/effects/vaultsuit/bartandfink.ogg', volume = 60)) + return + +/obj/item/clothing/under/threepwood + name = "threepwood's outfit" + desc = "An outfit fit for a Mighty Pirate!." + icon = 'hyperstation/icons/obj/clothing/uniforms.dmi' + icon_state = "threepwood" + alternate_worn_icon = 'hyperstation/icons/mobs/uniforms.dmi' + item_state = "w_suit" + can_adjust = FALSE + +/obj/item/clothing/shoes/threepwoodboots + name = "threepwood's boots" + desc = "A pair of boots fit for a Mighty Pirate!." + icon = 'hyperstation/icons/obj/clothing/shoes.dmi' + icon_state = "threepwoodboots" + alternate_worn_icon = 'hyperstation/icons/obj/clothing/shoes.dmi' + item_state = "threepwoodboots" + alternate_worn_icon = 'hyperstation/icons/mobs/feet.dmi' \ No newline at end of file diff --git a/hyperstation/icons/mobs/feet.dmi b/hyperstation/icons/mobs/feet.dmi index 93ad37e85..245fe782b 100644 Binary files a/hyperstation/icons/mobs/feet.dmi and b/hyperstation/icons/mobs/feet.dmi differ diff --git a/hyperstation/icons/obj/clothing/shoes.dmi b/hyperstation/icons/obj/clothing/shoes.dmi index af087b733..2a0318dad 100644 Binary files a/hyperstation/icons/obj/clothing/shoes.dmi and b/hyperstation/icons/obj/clothing/shoes.dmi differ diff --git a/hyperstation/icons/obj/clothing/suits.dmi b/hyperstation/icons/obj/clothing/suits.dmi index 00194e271..befb339a5 100644 Binary files a/hyperstation/icons/obj/clothing/suits.dmi and b/hyperstation/icons/obj/clothing/suits.dmi differ diff --git a/hyperstation/icons/obj/clothing/uniforms.dmi b/hyperstation/icons/obj/clothing/uniforms.dmi index ec1fe01f9..68a87d445 100644 Binary files a/hyperstation/icons/obj/clothing/uniforms.dmi and b/hyperstation/icons/obj/clothing/uniforms.dmi differ diff --git a/hyperstation/sound/effects/vaultsuit/bartandfink.ogg b/hyperstation/sound/effects/vaultsuit/bartandfink.ogg new file mode 100644 index 000000000..9b76713f2 Binary files /dev/null and b/hyperstation/sound/effects/vaultsuit/bartandfink.ogg differ diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi index 617fbcf01..bbf3d9451 100644 Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 0b00d73a4..3f0a8d4c0 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 91538bd3d..945cf9260 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi index 7815d52d6..b0150ed51 100644 Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ diff --git a/modular_citadel/code/modules/client/loadout/shoes.dm b/modular_citadel/code/modules/client/loadout/shoes.dm index d4da69d2c..284a9afde 100644 --- a/modular_citadel/code/modules/client/loadout/shoes.dm +++ b/modular_citadel/code/modules/client/loadout/shoes.dm @@ -111,4 +111,9 @@ /datum/gear/cowboyboots/black name = "Cowboy Boots, Black" category = SLOT_SHOES - path = /obj/item/clothing/shoes/cowboyboots/black + path = /obj/item/clothing/shoes/cowboyboots/black + +/datum/gear/threepwoodboots + name = "theepwood's boots" + category = SLOT_SHOES + path = /obj/item/clothing/shoes/threepwoodboots diff --git a/modular_citadel/code/modules/client/loadout/suit.dm b/modular_citadel/code/modules/client/loadout/suit.dm index 7797e1f7b..eb02a07db 100644 --- a/modular_citadel/code/modules/client/loadout/suit.dm +++ b/modular_citadel/code/modules/client/loadout/suit.dm @@ -259,3 +259,8 @@ name = "Bathrobe" category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/bathrobe + +/datum/gear/uniform/threepwoodjacket + name = "threepwood's jacket" + category = SLOT_WEAR_SUIT + path = /obj/item/clothing/suit/threepwoodjacket diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index fcc6846c2..d688ee979 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -541,4 +541,10 @@ name = "vault jumpsuit" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/vaultsuit + cost = 1 + +/datum/gear/threepwood + name = "threepwood's outfit" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/threepwood cost = 1 \ No newline at end of file diff --git a/modular_citadel/icons/mob/digishoes.dmi b/modular_citadel/icons/mob/digishoes.dmi index a3175f0c3..bf5e4ec64 100644 Binary files a/modular_citadel/icons/mob/digishoes.dmi and b/modular_citadel/icons/mob/digishoes.dmi differ diff --git a/modular_citadel/icons/mob/suit_digi.dmi b/modular_citadel/icons/mob/suit_digi.dmi index 48a956a9f..f006ba914 100644 Binary files a/modular_citadel/icons/mob/suit_digi.dmi and b/modular_citadel/icons/mob/suit_digi.dmi differ diff --git a/modular_citadel/icons/mob/uniform_digi.dmi b/modular_citadel/icons/mob/uniform_digi.dmi index 221688ec0..9e51ee537 100644 Binary files a/modular_citadel/icons/mob/uniform_digi.dmi and b/modular_citadel/icons/mob/uniform_digi.dmi differ