diff --git a/modular_splurt/code/modules/client/loadout/neck.dm b/modular_splurt/code/modules/client/loadout/neck.dm index a6f4bd1924..b4cdf0c2de 100644 --- a/modular_splurt/code/modules/client/loadout/neck.dm +++ b/modular_splurt/code/modules/client/loadout/neck.dm @@ -10,3 +10,23 @@ loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION restricted_desc = "Heads of Staff" restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster") + +/datum/gear/neck/spikedcollar + name = "Spiked Pet Collar" + path = /obj/item/clothing/neck/petcollar/spike + loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION + +/datum/gear/neck/holocollar + name = "Holo-collar" + path = /obj/item/clothing/neck/petcollar/holo + loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION + +/datum/gear/neck/casinoslave + name = "Casino Collar" + path = /obj/item/clothing/neck/petcollar/casino + loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION + +/datum/gear/neck/handmade + name = "handmade collar" + path = /obj/item/clothing/neck/petcollar/handmade + loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION diff --git a/modular_splurt/code/modules/clothing/neck/_neck.dm b/modular_splurt/code/modules/clothing/neck/_neck.dm new file mode 100644 index 0000000000..7919cfb126 --- /dev/null +++ b/modular_splurt/code/modules/clothing/neck/_neck.dm @@ -0,0 +1,62 @@ +/obj/item/clothing/neck/petcollar/spike + name = "Spiked Pet Collar" + desc = "A collar with spikes that look as sharp as your teeth. Doesn't seem very good for neck cuddles." + icon = 'modular_splurt/icons/obj/clothing/neck/collars.dmi' + mob_overlay_icon = 'modular_splurt/icons/mob/clothing/neck.dmi' + icon_state = "collar_spik" + poly_states = 0 + +/obj/item/clothing/neck/petcollar/locked/spike + name = "Spiked Pet Collar" + desc = "A collar with spikes that look as sharp as your teeth. Doesn't seem very good for neck cuddles." + icon = 'modular_splurt/icons/obj/clothing/neck/collars.dmi' + mob_overlay_icon = 'modular_splurt/icons/mob/clothing/neck.dmi' + icon_state = "collar_spik" + poly_states = 0 + +/obj/item/clothing/neck/petcollar/holo + name = "Holo-collar" + desc = "An expensive holo-collar for the modern day pet." + icon = 'modular_splurt/icons/obj/clothing/neck/collars.dmi' + mob_overlay_icon = 'modular_splurt/icons/mob/clothing/neck.dmi' + icon_state = "collar_holo" + poly_states = 0 + +/obj/item/clothing/neck/petcollar/locked/holo + name = "Holo-collar" + desc = "An expensive holo-collar for the modern day pet." + icon = 'modular_splurt/icons/obj/clothing/neck/collars.dmi' + mob_overlay_icon = 'modular_splurt/icons/mob/clothing/neck.dmi' + icon_state = "collar_holo" + poly_states = 0 + +/obj/item/clothing/neck/petcollar/casino + name = "Casino Collar" + desc = "A fancy collar whose neon hue neatly changes with time. Once probably used to mark living prizes, but it only seems to be a cool item now." + icon = 'modular_splurt/icons/obj/clothing/neck/collars.dmi' + mob_overlay_icon = 'modular_splurt/icons/mob/clothing/neck.dmi' + icon_state = "casinoslave" + poly_states = 0 + +/obj/item/clothing/neck/petcollar/locked/casino + name = "Casino Collar" + desc = "A fancy collar whose neon hue neatly changes with time. Once probably used to mark living prizes." + icon = 'modular_splurt/icons/obj/clothing/neck/collars.dmi' + mob_overlay_icon = 'modular_splurt/icons/mob/clothing/neck.dmi' + icon_state = "casinoslave_available" + poly_states = 0 + +/obj/item/clothing/neck/petcollar/locked/casino/attackby(obj/item/K, mob/user, params) + . = ..() + if(lock) + icon_state = "casinoslave_owned" + else + icon_state = "casinoslave_available" + +/obj/item/clothing/neck/petcollar/handmade + name = "handmade collar" + desc = "A collar made out of pliable material." + icon = 'modular_splurt/icons/obj/clothing/neck/collars.dmi' + mob_overlay_icon = 'modular_splurt/icons/mob/clothing/neck.dmi' + icon_state = "collar_handmade" + poly_states = 0 diff --git a/modular_splurt/icons/mob/clothing/neck.dmi b/modular_splurt/icons/mob/clothing/neck.dmi index 1fbd72688e..09e1ab9cf1 100644 Binary files a/modular_splurt/icons/mob/clothing/neck.dmi and b/modular_splurt/icons/mob/clothing/neck.dmi differ diff --git a/modular_splurt/icons/obj/clothing/neck/collars.dmi b/modular_splurt/icons/obj/clothing/neck/collars.dmi new file mode 100644 index 0000000000..626c20178a Binary files /dev/null and b/modular_splurt/icons/obj/clothing/neck/collars.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 7c6e81b48e..cd5879c7f1 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4272,6 +4272,7 @@ #include "modular_splurt\code\modules\clothing\lewd_clothing\head\deprivation_helmet.dm" #include "modular_splurt\code\modules\clothing\lewd_clothing\uniform\latex_catsuit.dm" #include "modular_splurt\code\modules\clothing\masks\miscellaneous.dm" +#include "modular_splurt\code\modules\clothing\neck\_neck.dm" #include "modular_splurt\code\modules\clothing\shoes\miscellaneous.dm" #include "modular_splurt\code\modules\clothing\suits\cloaks.dm" #include "modular_splurt\code\modules\clothing\under\miscellaneous.dm"