diff --git a/code/modules/projectiles/guns/projectile/pistol_yw.dm b/code/modules/projectiles/guns/projectile/pistol_yw.dm
index 431f9c85fa..0f7c8ea237 100644
--- a/code/modules/projectiles/guns/projectile/pistol_yw.dm
+++ b/code/modules/projectiles/guns/projectile/pistol_yw.dm
@@ -58,6 +58,26 @@
magazine_type = /obj/item/ammo_magazine/c45m2024
allowed_magazines = list(/obj/item/ammo_magazine/c45m2024,/obj/item/ammo_magazine/c45m)
+/obj/item/weapon/gun/projectile/m2024/update_icon()
+ ..()
+ if(ammo_magazine)
+ icon_state = "[initial(icon_state)]"
+ else
+ icon_state = "[initial(icon_state)]-empty"
+
+/*******M1911 Custom fluff*******/
+/obj/item/weapon/gun/projectile/fluff/m1911
+ name = "M1911 Custom"
+ desc = "A modernized, customized M1911 pistol with a rail for attachments such as flashlight or laser sight (fooken laser sights). It's engraved, and the engraving says, 'For honorable duty.' It's original, Sol Gov firearm from Earth, not a cheap mars replica."
+ icon_state = "m1911"
+ item_state = "m1911"
+ icon = 'icons/obj/gun_yw.dmi'
+ caliber = ".45"
+ load_method = MAGAZINE
+ fire_sound = 'sound/weapons/semiauto.ogg'
+ magazine_type = /obj/item/ammo_magazine/c45m
+ allowed_magazines = list(/obj/item/ammo_magazine/c45m)
+
/obj/item/weapon/gun/projectile/m2024/update_icon()
..()
if(ammo_magazine)
diff --git a/code/modules/vore/fluffstuff/custom_boxes_yw.dm b/code/modules/vore/fluffstuff/custom_boxes_yw.dm
index 5fcc6384e0..2991a8c5f3 100644
--- a/code/modules/vore/fluffstuff/custom_boxes_yw.dm
+++ b/code/modules/vore/fluffstuff/custom_boxes_yw.dm
@@ -39,7 +39,9 @@
has_items = list(
/obj/item/clothing/under/color/grey/fluff/sam_bodysuit,
/obj/item/clothing/gloves/sterile/latex/fluff/sam_gloves,
- /obj/item/clothing/shoes/boots/jackboots/fluff/sam_boots)
+ /obj/item/clothing/shoes/boots/jackboots/fluff/sam_boots,
+ /obj/item/clothing/suit/storage/toggle/fluff/sam_jacket,
+ /obj/item/weapon/storage/belt/utility/fluff/sam_belt)
// **************
//The god himself
@@ -54,6 +56,7 @@
/obj/item/clothing/gloves/arm_guard/fluff/madoka_arms,
/obj/item/clothing/shoes/leg_guard/fluff/madoka_legs,
/obj/item/weapon/oldtwohanded/spear/fluff/madoka_koto_1)
+
// **********
//JohnWolf135
// **********
@@ -80,6 +83,8 @@
// Izac112
// *******
+//Ally Faell
+
/obj/item/weapon/storage/box/fluff/ally
name = "Ally's Kit"
desc = "A kit containing Ally's equipment."
@@ -87,6 +92,15 @@
/obj/item/clothing/under/fluff/ally_1,
/obj/item/clothing/under/rank/security/corp/fluff/ally_2)
+//Raja Bastet
+
+/obj/item/weapon/storage/box/fluff/raja
+ name = "Ally's Kit"
+ desc = "A kit containing Ally's equipment."
+ has_items = list(
+ /obj/item/weapon/storage/belt/utility/fluff/raja_belt,
+ /obj/item/clothing/suit/storage/hooded/wintercoat/fluff/raja_coat)
+
// **************
// Admiral Dragon
// **************
@@ -109,7 +123,8 @@
desc = "A kit containing Melissa's equipment."
has_items = list(
/obj/item/weapon/flame/lighter/zippo/fluff/edgy_zippo,
- /obj/item/clothing/under/rank/security/corp/fluff/melissa_uniform)
+ /obj/item/clothing/under/rank/security/corp/fluff/melissa_uniform,
+ /obj/item/device/modkit_conversion/fluff/melissa_gun_kit)
// *******
// Deathty
@@ -120,4 +135,4 @@
desc = "A kit containing Arthur's equipment."
has_items = list(
/obj/item/device/modkit_conversion/fluff/art_hos_kit,
- /obj/item/clothing/under/color/grey/fluff/art_uniform)
\ No newline at end of file
+ /obj/item/clothing/under/rank/security/corp/fluf/art_uniform)
\ No newline at end of file
diff --git a/code/modules/vore/fluffstuff/custom_clothes_yw.dm b/code/modules/vore/fluffstuff/custom_clothes_yw.dm
index 157e5c5c7d..bf4547ab8c 100644
--- a/code/modules/vore/fluffstuff/custom_clothes_yw.dm
+++ b/code/modules/vore/fluffstuff/custom_clothes_yw.dm
@@ -433,10 +433,30 @@
icon_override = 'icons/vore/custom_clothes_yw.dmi'
item_state = "pilotboots_mob"
+/obj/item/weapon/storage/belt/utility/fluff/sam_belt
+ name = "Mech Pilot Belt"
+ desc = "A white-blue toolbelt with many slots to hold tools in, seems to be made to literally be attached onto a suit."
+ icon = 'icons/vore/custom_clothes_yw.dmi'
+ icon_state = "mechpilot"
+ icon_override = 'icons/vore/custom_clothes_yw.dmi'
+ item_state = "mechpilot_mob"
+
+/obj/item/clothing/suit/storage/toggle/fluff/sam_jacket
+ name = "Mech Pilot Jacket"
+ desc = "A black jacket made of genuine leather with blue markings on each shoulder. The letters 'ERT' are stenciled onto the back in gold lettering."
+ icon = 'icons/vore/custom_clothes_yw.dmi'
+ icon_state = "mechjacket"
+ icon_override = 'icons/vore/custom_clothes_yw.dmi'
+ item_state = "mechjacket_mob"
+ cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS
+ min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
+
// *******
// Izac112
// *******
+//Ally Faell
+
/obj/item/clothing/under/fluff/ally_1
name = "Skintight bodysuit"
desc = "A black-purple bodysuit made of some durable synthetic material fitted for a akula. Lewd."
@@ -454,6 +474,42 @@
icon_override = 'icons/vore/custom_clothes_yw.dmi'
item_state = "allyuniform"
+//Raja Bastet
+
+/obj/item/weapon/storage/belt/utility/fluff/raja_belt
+ name = "Mech Engineer Belt"
+ desc = "A black-golden toolbelt with many slots to hold tools in. Also comes with a blue buckle."
+ icon = 'icons/vore/custom_clothes_yw.dmi'
+ icon_state = "mechengineer"
+ icon_override = 'icons/vore/custom_clothes_yw.dmi'
+ item_state = "mechengineer_mob"
+
+/obj/item/clothing/suit/storage/hooded/wintercoat/fluff/raja_coat
+ name = "Mech Engineer Coat"
+ desc = "A black winter coat made of genuine leather, decorated with blue markings and an interior made of genuine, white fur. The letters 'ERT' are stenciled onto the back in gold lettering."
+ icon = 'icons/vore/custom_clothes_yw.dmi'
+ icon_state = "coatmech"
+ icon_override = 'icons/vore/custom_clothes_yw.dmi'
+ item_state = "coatmech_mob"
+
+ /obj/item/clothing/suit/storage/hooded/proc/ToggleHood
+ if(!suittoggled)
+ if(ishuman(loc))
+ var/mob/living/carbon/human/H = src.loc
+ if(H.wear_suit != src)
+ H << "You must be wearing [src] to put up the hood!"
+ return
+ if(H.head)
+ H << "You're already wearing something on your head!"
+ return
+ else
+ suittoggled = 1
+ icon_state = "[initial(icon_state)]_t,
+ item_state = "[initial(item_state)]_t"
+ H.update_inv_wear_suit()
+ else
+ RemoveHood()
+
// ***********
// Johnwolf135
// ***********
@@ -606,14 +662,13 @@
//Arthur Schutz
-/obj/item/clothing/under/color/grey/fluff/art_uniform
+/obj/item/clothing/under/rank/security/corp/fluf/art_uniform
name = "SecCom Uniform"
desc = "A standard issue SifGuard uniform for every military officer. Made from advanced fabrics which provide both the physical security and the fashionable security of it's wearer. They are designed with both purposes of utility work and formal work. This uniform has a couple of additional badges on the torso along with the nametag with 'A. Schutz' engraved onto it."
icon = 'icons/vore/custom_clothes_yw.dmi'
- icon_state = "sifguard_fox_s"
+ icon_state = "sifguardfox"
icon_override = 'icons/vore/custom_clothes_yw.dmi'
- item_state = "sifguard_fox"
-
+ item_state = "sifguardfox"
/obj/item/clothing/suit/storage/vest/hoscoat/art_hos
name = "SecCom Jacket"
diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm
index 96d8993f82..2733593737 100644
--- a/code/modules/vore/fluffstuff/custom_items_vr.dm
+++ b/code/modules/vore/fluffstuff/custom_items_vr.dm
@@ -36,7 +36,6 @@
var/from_suit = /obj/item/clothing/suit/space/void
var/to_helmet = /obj/item/clothing/head/cardborg
var/to_suit = /obj/item/clothing/suit/cardborg
-
//Conversion proc
afterattack(obj/O, mob/user as mob)
var/flag
diff --git a/code/modules/vore/fluffstuff/custom_items_yw.dm b/code/modules/vore/fluffstuff/custom_items_yw.dm
index db3ad4aab1..c5eb3fb6f1 100644
--- a/code/modules/vore/fluffstuff/custom_items_yw.dm
+++ b/code/modules/vore/fluffstuff/custom_items_yw.dm
@@ -104,6 +104,16 @@
icon = 'icons/vore/custom_items_yw.dmi'
icon_state = "melzippo"
+/obj/item/device/modkit_conversion/fluff/melissa_gun_kit
+ name = "Melissa's modkit"
+ desc = "A kit containing all the needed tools and parts to modify a 45 Pistol."
+
+ icon = 'icons/vore/custom_items_vr.dmi'
+ icon_state = "modkit"
+
+ from_suit = /obj/item/weapon/gun/projectile/sec/flash
+ to_suit = /obj/item/weapon/gun/projectile/fluff/m1911
+
// *******
// Deathty
// *******
diff --git a/config/custom_items.txt b/config/custom_items.txt
index af62017ca0..a680fec0e5 100644
--- a/config/custom_items.txt
+++ b/config/custom_items.txt
@@ -125,6 +125,12 @@ character_name: Ally Faell
item_path: /obj/item/weapon/storage/box/fluff/ally
}
+{
+ckey: izac112
+character_name: Raja Bastet
+item_path: /obj/item/weapon/storage/box/fluff/raja
+}
+
{
ckey: ivymoomoo
character_name: Ivy Baladeva
diff --git a/icons/obj/gun_yw.dmi b/icons/obj/gun_yw.dmi
index dbe872756b..3cccb318ec 100644
Binary files a/icons/obj/gun_yw.dmi and b/icons/obj/gun_yw.dmi differ
diff --git a/icons/vore/custom_clothes_yw.dmi b/icons/vore/custom_clothes_yw.dmi
index f39281314a..4b73ddaaa5 100644
Binary files a/icons/vore/custom_clothes_yw.dmi and b/icons/vore/custom_clothes_yw.dmi differ