Merge pull request #1258 from JoanRisu/Fluff_Items_worshop

Fluff items worshop: Fixing things

code/datums/supplypacks/recreation_vr.dm

@@ -0,0 +1,8 @@
+/datum/supply_packs/recreation/rover
+	name = "NT Humvee"
+	contains = list(
+			/obj/vehicle/train/rover/engine
+			)
+	containertype = /obj/structure/largecrate
+	containername = "NT Humvee Crate"
+	cost = 100

code/datums/supplypacks/science_vr.dm

@@ -25,4 +25,13 @@
 	cost = 40
 	containertype = /obj/structure/closet/crate/secure
 	containername = "Advanced Robolimb Blueprint Crate"
-	access = access_robotics
+	access = access_robotics
+
+/datum/supply_packs/sci/dune_buggy
+	name = "Exploration Dune Buggy"
+	contains = list(
+			/obj/vehicle/train/rover/engine/dunebuggy
+			)
+	cost = 100
+	containertype = /obj/structure/largecrate
+	containername = "Exploration Dune Buggy Crate"

code/modules/admin/create_object.dm

@@ -15,7 +15,7 @@
 	var/quick_create_object_html = null
 	var/pathtext = null
 
-	pathtext = input("Select the path of the object you wish to create.", "Path", "/obj") as null|anything in list("/obj","/obj/structure","/obj/item","/obj/item/weapon","/obj/item/clothing","/obj/machinery","/obj/mecha")
+	pathtext = input("Select the path of the object you wish to create.", "Path", "/obj") as null|anything in list("/obj","/obj/structure","/obj/item","/obj/item/weapon","/obj/item/clothing","/obj/machinery","/obj/mecha","/obj/item/weapon/storage/box/fluff") //VOREStation Edit
 	if(!pathtext)
 		return
 	var path = text2path(pathtext)

code/modules/vehicles/rover_vr.dm

@@ -30,7 +30,7 @@
 
 	dunebuggy
 		name = "Research Dune Buggy"
-		desc = "A Dune Buggy developed for asteroid exploration and transportation"
+		desc = "A Dune Buggy developed for asteroid exploration and transportation. It has a sticker that says to wear EVA suits if used in space."
 		icon = 'icons/vore/rover_vr.dmi'
 		icon_state = "dunebug"
 

code/modules/vore/fluffstuff/custom_boxes_vr.dm

@@ -49,7 +49,11 @@
 		/obj/item/clothing/suit/storage/trench/fluff/octaviouscoat,
 		/obj/item/clothing/under/det/fluff/octavious,
 		/obj/item/clothing/mask/gas/plaguedoctor/fluff/octaviousmask,
-		/obj/item/clothing/head/fedora/fluff/bowler)
+		/obj/item/clothing/head/fedora/fluff/bowler,
+		/obj/item/clothing/shoes/black/cuffs/octavious,
+		/obj/item/weapon/cane/fluff/tasald,
+		/obj/item/clothing/glasses/hud/health/octaviousmonicle
+		)
 
 // jemli:Cirra Mayhem
 /obj/item/weapon/storage/box/fluff/cirra
@@ -76,7 +80,7 @@
 //joanrisu:Joan Risu
 /obj/item/weapon/storage/backpack/dufflebag/sec/fluff/joanrisu
 	name = "Joan's Workbag"
-	desc = "A duffle bag Joan uses to carry her work equipment."
+	desc = "A bag Joan uses to carry her work equipment. It has the 82nd Battle Group Insignia on it."
 	icon_state = "joanbag"
 	icon = 'icons/vore/custom_items_vr.dmi'
 	item_state = "duffle_med"
@@ -96,7 +100,6 @@
 		new /obj/item/clothing/under/rank/internalaffairs/fluff/joan(src)
 		new /obj/item/clothing/head/helmet/space/fluff/joan(src)
 		new /obj/item/clothing/suit/space/fluff/joan(src)
-		new /obj/item/device/pda/heads/hos/joanpda(src)
 
 
 

code/modules/vore/fluffstuff/custom_clothes_vr.dm

@@ -1,25 +1,15 @@
 /* TUTORIAL
 	"icon" is the file with the HUD/ground icon for the item
 	"icon_state" is the iconstate in this file for the item
-	"icon_override" is the file with the on-mob icons, can be the same file
+	"icon_override" is the file with the on-mob icons, can be the same file (Except for glasses, shoes, and masks.)
 	"item_state" is the iconstate for the on-mob icons:
 		item_state_s is used for worn uniforms on mobs
 		item_state_r and item_state_l are for being held in each hand
-		some do not have a suffix, like gloves. plan accordingly, maybe add _mob?
-	"overlay_state" is the iconstate for ties/accessories, for some reason they don't
-		just use the item_state variable
 
-	If you don't have a special HUD/ground sprite, don't worry about it.
-	Just set both the icon_state and item_state to the same thing,
-	and it will use the top direction sprite (facing the viewer)
-	for your HUD/item sprite. This usually looks fine!
-
-	Advanced:
 	"item_state_slots" can replace "item_state", it is a list:
 		item_state_slots["slotname1"] = "item state for that slot"
 		item_state_slots["slotname2"] = "item state for that slot"
 */
-
 /* TEMPLATE
 //ckey:Character Name
 /obj/item/clothing/type/fluff/charactername
@@ -921,12 +911,58 @@
 	desc = "A customized gas mask to look like an old plague doctors, with a special looking lens in the left eye that turns on when in use."
 	icon = 'icons/vore/custom_clothes_vr.dmi'
 	icon_state = "octplaguedoctor"
-	icon_override = 'icons/vore/custom_clothes_vr.dmi'
+	icon_override = 'icons/vore/custom_onmob_vr.dmi'
 	item_state = "octplaguedoctor_mob"
 	item_state_slots = null
 	armor = list(melee = 0, bullet = 0, laser = 2,energy = 2, bomb = 0, bio = 90, rad = 0)
 	body_parts_covered = HEAD|FACE|EYES
 
+//bwoincognito:Octavious Ward
+/obj/item/clothing/glasses/hud/health/octaviousmonicle
+	name = "Gilded monocle"
+	desc = "Avery expensive looking monocle inlaid with small gems around the gold frame. It has a thin leather cord running down to a clasp for attaching to ones coat. Probably not a good idea to steal this."
+	icon = 'icons/vore/custom_clothes_vr.dmi'
+	icon_state = "clockworkgoggle_l"
+	icon_override = 'icons/vore/custom_onmob_vr.dmi'
+	item_state = "clockworkgoggle_l_mob"
+	item_state_slots = null
+	body_parts_covered = 0
+
+
+/obj/item/clothing/shoes/black/cuffs
+	name = "Gilded cuffs"
+	desc = "Ankle coverings for digitigrade creatures. Gilded!"
+	icon = 'icons/vore/custom_clothes_vr.dmi'
+	icon_state = "gildedcuffs"
+
+	icon_override = 'icons/vore/custom_onmob_vr.dmi'
+	item_state = "gildedcuffs_mob"
+	item_icons = null
+
+	body_parts_covered = 0
+	species_restricted = null
+
+	red
+		name = "Red Cuffs"
+		desc = "Ankle coverings for digitigrade creatures. Red!"
+		icon_state = "redcuffs"
+		item_state = "redcuffs_mob"
+
+	blue
+		name = "Blue Cuffs"
+		desc = "Ankle coverings for digitigrade creatures. Blue!"
+		icon_state = "bluecuffs"
+		item_state = "bluecuffs_mob"
+
+
+//bwoincognito:Octavious Ward
+	octavious
+		name = "silvered leg wraps"
+		desc = "Dark leather leg wraps with sliver clasps on the sides. Stylish and functional."
+		icon_state = "silvergildedcuffs"
+		item_state = "silvergildedcuffs_mob"
+
+
 //jemli:Jemli
 /obj/item/clothing/head/fedora/fluff/jemli
 	name = "Cavalier Hat"

code/modules/vore/fluffstuff/custom_guns_vr.dm

@@ -346,6 +346,7 @@
 	icon_override = 'icons/obj/gun_vr.dmi'
 	item_state = "battlerifle_i"
 	item_icons = null
+	pixel_x = -16
 
 /obj/item/weapon/gun/projectile/automatic/carbine/fluff/ufarc/update_icon(var/ignore_inhands)
 	..()
@@ -357,6 +358,7 @@
 	if(!ignore_inhands) update_held_icon()
 
 
+
 //-----------------------G44----------------------------------
 /obj/item/weapon/gun/projectile/automatic/carbine/fluff/g44
 	name = "G44 Rifle"
@@ -364,6 +366,7 @@
 	icon = 'icons/obj/gun64_vr.dmi'
 	icon_state = "g44"
 	item_state = "bullpup"
+	pixel_x = -16
 
 /obj/item/weapon/gun/projectile/automatic/carbine/fluff/g44/update_icon(var/ignore_inhands)
 	..()
@@ -386,7 +389,8 @@
 	force = 8
 	w_class = ITEMSIZE_LARGE
 	fire_delay = 6
-
+	pixel_x = -16
+	
 	projectile_type = /obj/item/projectile/beam/stun/weak
 	origin_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 2, TECH_ILLEGAL = 3)
 	modifystate = "g44estun"

code/modules/vore/fluffstuff/custom_items_vr.dm

@@ -1,7 +1,7 @@
 /* TUTORIAL
 	"icon" is the file with the HUD/ground icon for the item
 	"icon_state" is the iconstate in this file for the item
-	"icon_override" is the file with the on-mob icons, can be the same file
+	"icon_override" is the file with the on-mob icons, can be the same file (Except for glasses, shoes, and masks.)
 	"item_state" is the iconstate for the on-mob icons:
 		item_state_s is used for worn uniforms on mobs
 		item_state_r and item_state_l are for being held in each hand
@@ -570,7 +570,8 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie
 	desc = "A cane used by a true gentlemen. Or a clown."
 	icon = 'icons/vore/custom_items_vr.dmi'
 	icon_state = "browncane"
-	item_state = "browncanemob"
+	item_icons = list (slot_r_hand_str = 'icons/vore/custom_items_vr.dmi', slot_l_hand_str = 'icons/vore/custom_items_vr.dmi')
+	item_state_slots = list(slot_r_hand_str = "browncanemob_r", slot_l_hand_str = "browncanemob_l")
 	flags = CONDUCT
 	force = 5.0
 	throwforce = 7.0
@@ -578,6 +579,13 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie
 	matter = list(DEFAULT_WALL_MATERIAL = 50)
 	attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed")
 
+	tasald
+		name = "Ornate Walking Cane"
+		desc = "An elaborately made custom walking stick with a dark wooding core, a crimson red gemstone on its head and a steel cover around the bottom. you'd probably hear someone using this down the hall."
+		icon = 'icons/vore/custom_items_vr.dmi'
+
+
+
 /obj/item/weapon/card/id/fluff/ivyholoid
 	name = "Holo-ID"
 	registered_name = "Unconfigured"

config/custom_items.txt

@@ -92,12 +92,6 @@ character_name: Tasald Corlethian
 item_path: /obj/item/weapon/storage/box/fluff/tasald
 }
 
-{
-ckey: bwoincognito
-character_name: Octavious Ward
-item_path: /obj/item/clothing/shoes/cuffs/octavious
-}
-
 {
 ckey: bwoincognito
 character_name: Octavious Ward