Prototype code for Crestrose, added code for scisword, and moved some fluff around.

code/modules/vore/fluffstuff/custom_boxes_vr.dm

@@ -64,15 +64,18 @@
 		/*/obj/item/toy/crayon/mime*/) //Need to track down the code for crayons before adding this back in
 
 //joanrisu:Joan Risu
-/obj/item/weapon/storage/box/fluff/joanrisu
-	name = "Federation Officer's Kit"
-	desc = "A care package for every serving Federation officer serving away from the Federation."
-	has_items = list(
-		/obj/item/clothing/accessory/holster/hip,
-		/obj/item/clothing/suit/storage/fluff/fedcoat/fedcapt,
-		/obj/item/weapon/card/id/centcom/fluff/joanbadge,
-		/obj/item/weapon/gun/energy/gun/fluff/dominator,
-		/obj/item/clothing/suit/armor/det_suit,)
+/obj/item/weapon/storage/backpack/dufflebag/sec/fluff/joanrisu
+	name = "Joan's Workbag"
+	desc = "A duffle bag Joan uses to carry her work equipment."
+
+	New()
+		..()
+		new /obj/item/clothing/accessory/holster/hip(src)
+		new /obj/item/clothing/suit/storage/fluff/fedcoat/fedcapt(src)
+		new /obj/item/weapon/card/id/centcom/fluff/joanbadge(src)
+		new /obj/item/weapon/gun/energy/gun/fluff/dominator(src)
+		new /obj/item/clothing/suit/armor/det_suit(src)
+		new /obj/item/fluff/permit/joanrisu(src)
 
 //Razerwing:Archer Maximus
 /obj/item/weapon/storage/box/fluff/archermaximus

code/modules/vore/fluffstuff/custom_guns_vr.dm

@@ -211,45 +211,52 @@
 		toggle_scope(2.0)
 
 //This weapon is shelved until someone can fix the modifystate var and apply a safety to the scythe mode.
-/*
-/obj/item/weapon/gun/projectile/automatic/crestrose
+
+/obj/item/weapon/gun/projectile/automatic/fluff/crestrose
 	name = "Crescent Rose"
 	desc = "Can you match my resolve? If so then you will succeed. I believe that the human spirit is indomitable. Keep Moving Forward."
-	origin_tech = "materials=7"
-	icon = 'icons/obj/custom_items.dmi'
-	icon_state = "crestrose"
-	item_state = null // So it inherits the icon_state.
+	icon = 'icons/vore/custom_guns_vr.dmi'
+	icon_state = "crestrose_fold"
+
+	icon_override = 'icons/vore/custom_guns_vr.dmi'
+	item_state = "crestrose_fold"
+
 	w_class = 4
-	fire_sound = 'sound/weapons/rifleshot.ogg'
-	force = 40
-	throwforce = 10
-	max_shells = 10
-	magazine_type = /obj/item/ammo_magazine/m14
-	allowed_magazines = list(magazine_type = /obj/item/ammo_magazine/m14)
+	caliber = "75"
+	origin_tech = list(TECH_COMBAT = 7, TECH_MATERIAL = 4)
+	slot_flags = SLOT_BACK
+	ammo_type = "/obj/item/ammo_casing/a75"
+	fire_sound = 'sound/weapons/Gunshot_light.ogg'
 	load_method = MAGAZINE
-	caliber = "a762"
+	magazine_type = /obj/item/ammo_magazine/a75
+	force = 3
+	var/on = 0
 
-	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
-	var/modifystate = "crestrose"
-	var/mode = 0 //0 = unfolded, 1 = folded
+/obj/item/weapon/gun/projectile/automatic/fluff/crestrose/attack_self(mob/user as mob)
+	on = !on
+	if(on)
+		user.visible_message("<span class='warning'>With a press of a button, [user]'s gun turns into a deadly scythe.</span>",\
+		"<span class='warning'>You extend The Rose's thorns.</span>",\
+		"You hear an ominous click.")
+		icon = 'icons/vore/custom_guns_vr.dmi'
+		icon_state = "crestrose"
+		icon_override = 'icons/vore/custom_guns_vr.dmi'
+		item_state = "crestrose"
+		w_class = 4
+		force = 15//Obscenely robust
+		attack_verb = list("slashed", "cut", "drives")
+	else
+		user.visible_message("<span class='notice'>\The [user] folds the weapon back up into a gun.</span>",\
+		"<span class='notice'>You fold up the weapon.</span>",\
+		"You hear a click.")
+		icon = 'icons/vore/custom_guns_vr.dmi'
+		icon_state = "crestrose_fold"
+		icon_override = 'icons/vore/custom_guns_vr.dmi'
+		item_state = "crestrose_fold"
+		w_class = 3
+		force = 3//Not so obscenely robust
+		attack_verb = list("hit", "melee'd")
 
-/obj/item/weapon/gun/projectile/automatic/crestrose/attack_self(mob/living/user as mob)
-	switch(mode)
-		if(0)
-			mode = 1
-			user.visible_message("<span class='warning'>[src.name] folds up into a cool looking rifle.</span>")
-			force = 5
-			throwforce = 2
-			modifystate = crestrose_fold
-		if(1)
-			mode = 0 // I feel like this mode should prevent it from shooting. Otherwise, what's the point? -Spades ||Probably need assistance in that. Original design of Crescent Rose is to shoot no matter what form it was in. Perhaps lowering accuracy will provide a con buffer here. -- Joan
-			user.visible_message("<span class='warning'>[src.name] changes into a very intimidating looking weapon.</span>")
-			force = 40
-			throwforce = 10
-			modifystate = crestrose
-	update_icon()
-	update_held_icon()
-*/
 
 // molenar:Kari Akiren
 /obj/item/weapon/gun/projectile/shotgun/pump/rifle/fluff/kari_akiren

code/modules/vore/fluffstuff/custom_items_vr.dm

@@ -81,6 +81,15 @@
 	icon_state = "joanaria"
 	origin_tech = "materials=7"
 
+//For General use
+/obj/item/weapon/claymore/fluff/scisword
+	name = "Sci Blade"
+	desc = "A sword that can not only cut down your enemies, it can also cut fabric really neatly"
+	icon = 'icons/vore/custom_items_vr.dmi'
+	icon_state = "scisword"
+	origin_tech = "materials=7"
+
+
 //john.wayne9392:Harmony Prechtl
 /obj/item/weapon/twohanded/fireaxe/fluff/mjollnir
 	name = "Mjollnir"
@@ -96,6 +105,9 @@
 	desc = "A faded badge, backed with leather, that reads 'NT Security Force' across the front."
 	icon = 'icons/vore/custom_items_vr.dmi'
 	icon_state = "joanbadge"
+	registered_name = "Joan Risu"
+	assignment = "Centcom Officer"
+
 
 	attack_self(mob/user as mob)
 		if(isliving(user))