diff --git a/code/modules/vore/fluffstuff/custom_boxes_yw.dm b/code/modules/vore/fluffstuff/custom_boxes_yw.dm index e546ace5a2..d736d12830 100644 --- a/code/modules/vore/fluffstuff/custom_boxes_yw.dm +++ b/code/modules/vore/fluffstuff/custom_boxes_yw.dm @@ -174,6 +174,17 @@ /obj/item/device/modkit_conversion/fluff/art_hos_kit, /obj/item/clothing/under/rank/security/corp/fluf/art_uniform) +// ******* +// Dwaggy090 +// ******* +/obj/item/weapon/storage/box/fluff/saur + name = "Saur's kit" + desc = "A kit containing Saur's equipment." + has_items = list( + /obj/item/weapon/rig/medical/equipped/fluff/saur, + /obj/item/weapon/storage/backpack/dufflebag/fluff/saur_dufflebag + ) + // ************ // championfire // ************ diff --git a/code/modules/vore/fluffstuff/custom_rigs_yw.dm b/code/modules/vore/fluffstuff/custom_rigs_yw.dm new file mode 100644 index 0000000000..3864744986 --- /dev/null +++ b/code/modules/vore/fluffstuff/custom_rigs_yw.dm @@ -0,0 +1,67 @@ +/obj/item/weapon/rig/hazmat/fluff/sheri + name = "AHS-VPR Control Module" + desc = "This is the control module for a prototype hazardous environment suit, designed to protect the wearer from radiation, pressure, and hostile aliens alike. This particular suit was designed to fit a naga, and is labeled as the model 'Viper'. A small tag on it marks it as belonging to a 'Sheri Calen'" + icon = 'icons/vore/rig_yw/rigs_module.dmi' + icon_state = "sheririg" + icon_override = 'icons/vore/rig_yw/rigs_module_onmob.dmi' + + chest_type = /obj/item/clothing/suit/space/rig/fluff/sheri + helm_type = /obj/item/clothing/head/helmet/space/rig/hazmat/fluff/sheri + boot_type = /obj/item/clothing/shoes/magboots/rig/fluff/sheri + glove_type = /obj/item/clothing/gloves/gauntlets/rig/fluff/sheri + +/obj/item/clothing/suit/space/rig/fluff/sheri + icon = 'icons/vore/rigs_taur_yw.dmi' + icon_override = 'icons/vore/rigs_taur_yw.dmi' + +/obj/item/clothing/suit/space/rig/fluff/sheri + mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0) + item_state = icon_state + pixel_x = -16 + update_icon() + return 1 + +/obj/item/clothing/head/helmet/space/rig/hazmat/fluff/sheri + icon = 'icons/vore/rig_yw/rigs_head.dmi' + icon_override = 'icons/vore/rig_yw/rigs_head_onmob.dmi' + +/obj/item/clothing/shoes/magboots/rig/fluff/sheri + icon = 'icons/vore/rig_yw/rigs_shoes.dmi' + icon_override = 'icons/vore/rig_yw/rigs_shoes_onmob.dmi' + item_state = null + +/obj/item/clothing/gloves/gauntlets/rig/fluff/sheri + icon = 'icons/vore/rig_yw/rigs_gauntlets.dmi' + icon_override = 'icons/vore/rig_yw/rigs_gauntlets_onmob.dmi' + item_state = null + + + +/obj/item/weapon/rig/medical/equipped/fluff/saur + name = "AMR-DRGN" + desc = "This seems to be a highly customized Medical RIG suit, coloured black and purple, and with an added extendable plating to include a pair of wings and a tail comfortably within the suits protection. There's a nametag on the chest piece, and on the control module itself, with the name 'Saur Darastrix' on it." + icon = 'icons/vore/rig_yw/rigs_module.dmi' + icon_state = "saurrig" + icon_override = 'icons/vore/rig_yw/rigs_module_onmob.dmi' + + chest_type = /obj/item/clothing/suit/space/rig/fluff/saur + helm_type = /obj/item/clothing/head/helmet/space/rig/medical/fluff/saur + boot_type = /obj/item/clothing/shoes/magboots/rig/fluff/saur + glove_type = /obj/item/clothing/gloves/gauntlets/rig/fluff/saur + + +/obj/item/clothing/suit/space/rig/fluff/saur + icon = 'icons/vore/rig_yw/rigs_chest.dmi' + icon_override = 'icons/vore/rig_yw/rigs_chest_onmob.dmi' + +/obj/item/clothing/head/helmet/space/rig/medical/fluff/saur + icon = 'icons/vore/rig_yw/rigs_head.dmi' + icon_override = 'icons/vore/rig_yw/rigs_head_onmob.dmi' + +/obj/item/clothing/shoes/magboots/rig/fluff/saur + icon = 'icons/vore/rig_yw/rigs_shoes.dmi' + icon_override = 'icons/vore/rig_yw/rigs_shoes_onmob.dmi' + +/obj/item/clothing/gloves/gauntlets/rig/fluff/saur + icon = 'icons/vore/rig_yw/rigs_gauntlets.dmi' + icon_override = 'icons/vore/rig_yw/rigs_gauntlets_onmob.dmi' \ No newline at end of file diff --git a/config/custom_items.txt b/config/custom_items.txt index bb1511f58c..27a70bfd0a 100644 --- a/config/custom_items.txt +++ b/config/custom_items.txt @@ -144,10 +144,11 @@ ckey: deathty character_name: Arthur Schutz item_path: /obj/item/weapon/storage/box/fluff/art } + { ckey: dwaggy90 character_name: Saur Darastrix -item_path: /obj/item/weapon/storage/backpack/dufflebag/fluff/saur_dufflebag +item_path: /obj/item/weapon/storage/box/fluff/saur } { diff --git a/icons/vore/rig_yw/boots_onmob.dmi b/icons/vore/rig_yw/boots_onmob.dmi deleted file mode 100644 index cf74d73796..0000000000 Binary files a/icons/vore/rig_yw/boots_onmob.dmi and /dev/null differ diff --git a/icons/vore/rig_yw/chest.dmi b/icons/vore/rig_yw/chest.dmi deleted file mode 100644 index cf74d73796..0000000000 Binary files a/icons/vore/rig_yw/chest.dmi and /dev/null differ diff --git a/icons/vore/rig_yw/chest_onmob.dmi b/icons/vore/rig_yw/chest_onmob.dmi deleted file mode 100644 index cf74d73796..0000000000 Binary files a/icons/vore/rig_yw/chest_onmob.dmi and /dev/null differ diff --git a/icons/vore/rig_yw/gloves.dmi b/icons/vore/rig_yw/gloves.dmi deleted file mode 100644 index cf74d73796..0000000000 Binary files a/icons/vore/rig_yw/gloves.dmi and /dev/null differ diff --git a/icons/vore/rig_yw/gloves_onmob.dmi b/icons/vore/rig_yw/gloves_onmob.dmi deleted file mode 100644 index cf74d73796..0000000000 Binary files a/icons/vore/rig_yw/gloves_onmob.dmi and /dev/null differ diff --git a/icons/vore/rig_yw/helmet.dmi b/icons/vore/rig_yw/helmet.dmi deleted file mode 100644 index cf74d73796..0000000000 Binary files a/icons/vore/rig_yw/helmet.dmi and /dev/null differ diff --git a/icons/vore/rig_yw/helmet_onmob.dmi b/icons/vore/rig_yw/helmet_onmob.dmi deleted file mode 100644 index cf74d73796..0000000000 Binary files a/icons/vore/rig_yw/helmet_onmob.dmi and /dev/null differ diff --git a/icons/vore/rig_yw/rigs_chest.dmi b/icons/vore/rig_yw/rigs_chest.dmi new file mode 100644 index 0000000000..aa131e803b Binary files /dev/null and b/icons/vore/rig_yw/rigs_chest.dmi differ diff --git a/icons/vore/rig_yw/rigs_chest_onmob.dmi b/icons/vore/rig_yw/rigs_chest_onmob.dmi new file mode 100644 index 0000000000..17000a5d5f Binary files /dev/null and b/icons/vore/rig_yw/rigs_chest_onmob.dmi differ diff --git a/icons/vore/rig_yw/rigs_gauntlets.dmi b/icons/vore/rig_yw/rigs_gauntlets.dmi new file mode 100644 index 0000000000..6cf189f8df Binary files /dev/null and b/icons/vore/rig_yw/rigs_gauntlets.dmi differ diff --git a/icons/vore/rig_yw/rigs_gauntlets_onmob.dmi b/icons/vore/rig_yw/rigs_gauntlets_onmob.dmi new file mode 100644 index 0000000000..3f239e7b67 Binary files /dev/null and b/icons/vore/rig_yw/rigs_gauntlets_onmob.dmi differ diff --git a/icons/vore/rig_yw/rigs_head.dmi b/icons/vore/rig_yw/rigs_head.dmi new file mode 100644 index 0000000000..f8636b63d1 Binary files /dev/null and b/icons/vore/rig_yw/rigs_head.dmi differ diff --git a/icons/vore/rig_yw/rigs_head_onmob.dmi b/icons/vore/rig_yw/rigs_head_onmob.dmi new file mode 100644 index 0000000000..def38aa64f Binary files /dev/null and b/icons/vore/rig_yw/rigs_head_onmob.dmi differ diff --git a/icons/vore/rig_yw/rigs_module.dmi b/icons/vore/rig_yw/rigs_module.dmi new file mode 100644 index 0000000000..d75d10a374 Binary files /dev/null and b/icons/vore/rig_yw/rigs_module.dmi differ diff --git a/icons/vore/rig_yw/rigs_module_onmob.dmi b/icons/vore/rig_yw/rigs_module_onmob.dmi new file mode 100644 index 0000000000..a4d470f38c Binary files /dev/null and b/icons/vore/rig_yw/rigs_module_onmob.dmi differ diff --git a/icons/vore/rig_yw/boots.dmi b/icons/vore/rig_yw/rigs_onmob_head.dmi similarity index 100% rename from icons/vore/rig_yw/boots.dmi rename to icons/vore/rig_yw/rigs_onmob_head.dmi diff --git a/icons/vore/rig_yw/rigs_shoes.dmi b/icons/vore/rig_yw/rigs_shoes.dmi new file mode 100644 index 0000000000..11495f332e Binary files /dev/null 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 new file mode 100644 index 0000000000..b6c894e912 Binary files /dev/null and b/icons/vore/rig_yw/rigs_shoes_onmob.dmi differ diff --git a/icons/vore/rigs_taur_yw.dmi b/icons/vore/rigs_taur_yw.dmi new file mode 100644 index 0000000000..447426ed8e Binary files /dev/null and b/icons/vore/rigs_taur_yw.dmi differ diff --git a/vorestation.dme b/vorestation.dme index e49d37272b..1882ca8fbe 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2797,6 +2797,7 @@ #include "code\modules\vore\fluffstuff\custom_mecha_vr.dm" #include "code\modules\vore\fluffstuff\custom_mecha_yw.dm" #include "code\modules\vore\fluffstuff\custom_permits_vr.dm" +#include "code\modules\vore\fluffstuff\custom_rigs_yw.dm" #include "code\modules\vore\fluffstuff\MadokaSpear.dm" #include "code\modules\vore\fluffstuff\nazirus_yw.dm" #include "code\modules\vore\fluffstuff\guns\bsharpoon.dm"