Merge remote-tracking branch 'refs/remotes/VOREStation/master'

code/game/objects/items/weapons/tanks/tank_types_vr.dm

@@ -1,7 +1,8 @@
 /obj/item/weapon/tank/emergency/phoron_double
 	name = "double emergency phoron tank"
-	desc = "An emergency air tank hastily painted red."
+	desc = "Contains dangerous phoron. Do not inhale. Warning: extremely flammable."
 	icon = 'icons/obj/tank_vr.dmi'
+	icon_override = 'icons/mob/belt_vr.dmi'
 	icon_state = "emergency_double_vox"
 	gauge_icon = "indicator_double"
 	gauge_cap = 3
@@ -38,7 +39,8 @@
 
 /obj/item/weapon/tank/vox	//Can't be a child of phoron or the gas amount gets screwey.
 	icon = 'icons/obj/tank_vr.dmi'
-	icon_state = "plasma_fr"
+	icon_override = 'icons/mob/back_vr.dmi'
+	icon_state = "phoron_vox"
 
 /obj/item/weapon/tank/emergency
 	icon = 'icons/obj/tank_vr.dmi'
@@ -78,7 +80,8 @@
 
 /obj/item/weapon/tank/emergency/phoron
 	icon = 'icons/obj/tank_vr.dmi'
-	icon_state = "emergency_p"
+	icon_override = 'icons/mob/belt_vr.dmi'
+	icon_state = "emergency_phoron_vox"
 	gauge_icon = "indicator_smalltank"
 	gauge_cap = 3
 

code/modules/admin/verbs/debug_vr.dm

@@ -3,7 +3,7 @@
 	set name = "Quick NIF"
 	set desc = "Spawns a NIF into someone in quick-implant mode."
 
-	if(!check_rights(R_FUN))
+	if(!check_rights(R_ADMIN))
 		return
 
 	var/mob/living/carbon/human/H = input("Pick a mob with a player","Quick NIF") as null|anything in player_list

code/modules/mob/living/silicon/robot/life.dm

@@ -21,6 +21,7 @@
 		process_killswitch()
 		process_locks()
 		process_queued_alarms()
+	handle_internal_contents() //VOREStation Edit
 	update_canmove()
 
 /mob/living/silicon/robot/proc/clamp_values()

code/modules/mob/living/silicon/robot/robot_vr.dm

@@ -1,3 +1,12 @@
+/mob/living/silicon/robot/verb/robot_nom(var/mob/living/T in oview(1))
+	set name = "Robot Nom"
+	set category = "IC"
+	set desc = "Allows you to eat someone."
+
+	if (stat != CONSCIOUS)
+		return
+	return feed_grabbed_to_self(src,T)
+
 /mob/living/silicon/robot/updateicon()
 	overlays.Cut()
 	if(stat == CONSCIOUS)

code/modules/vore/fluffstuff/custom_boxes_vr.dm

@@ -138,7 +138,7 @@
 	New()
 		..()
 		new /obj/item/clothing/head/beretg(src)
-		new /obj/item/weapon/card/id/fluff/ivyholoid(src)
+		new /obj/item/device/fluff/id_kit_ivy(src)
 		new /obj/item/weapon/storage/fancy/cigarettes/dromedaryco(src)
 		new /obj/item/weapon/storage/box/matches(src)
 		new /obj/item/weapon/reagent_containers/food/snacks/sliceable/plaincake(src)

code/modules/vore/fluffstuff/custom_items_vr.dm

@@ -608,24 +608,28 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie
 
 
 
-/obj/item/weapon/card/id/fluff/ivyholoid
-	name = "Holo-ID"
-	registered_name = "Unconfigured"
-	desc = "A thin screen that seems to show an ID card's information. It keeps flickering between the ID and being blank."
-	icon = 'icons/vore/custom_items_vr.dmi'
-	icon_state = "ivyholoid"
-	var/configured = 0
+/obj/item/device/fluff/id_kit_ivy
+	name = "Holo-ID reprinter"
+	desc = "Stick your ID in one end and it'll print a new ID out the other!"
+	icon = 'icons/obj/bureaucracy.dmi'
+	icon_state = "labeler1"
 
-	attack_self(mob/user as mob)
-		if(configured)
-			return ..()
-
-		assignment = user.job
-		user.set_id_info(src)
-		if(user.mind && user.mind.initial_account)
-			associated_account_number = user.mind.initial_account.account_number
-		configured = 1
-		user << "<span class='notice'>Card settings set.</span>"
+	afterattack(obj/O, mob/user as mob)
+		var/new_icon = "ivyholoid"
+		var/new_desc = "Its a thin screen showing ID information, but it seems to be flickering."
+		if(istype(O,/obj/item/weapon/card/id) && O.icon_state != new_icon)
+			//O.icon = src.icon // just in case we're using custom sprite paths with fluff items.
+			O.icon_state = new_icon // Changes the icon without changing the access.
+			O.desc = new_desc
+			playsound(user.loc, 'sound/items/polaroid2.ogg', 100, 1)
+			user.visible_message("<span class='warning'> [user] reprints their ID.</span>")
+			qdel(src)
+		else if(O.icon_state == new_icon)
+			user << "<span class='notice'>[O] already has been reprinted.</span>"
+			return
+		else
+			user << "<span class='warning'>This isn't even an ID card you idiot.</span>"
+			return
 
 //WickedTempest: Chakat Tempest
 /obj/item/weapon/reagent_containers/hypospray/vr/tempest
@@ -1337,4 +1341,4 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie
         if(stored_name)
             user.visible_message("<span class='notice'>[user] displays their [src.name].\nIt reads: [stored_name], [badge_string].</span>","<span class='notice'>You display your [src.name].\nIt reads: [stored_name], [badge_string].</span>")
         else
-            user.visible_message("<span class='notice'>[user] displays their [src.name].\nIt reads: [badge_string].</span>","<span class='notice'>You display your [src.name]. It reads: [badge_string].</span>")
+            user.visible_message("<span class='notice'>[user] displays their [src.name].\nIt reads: [badge_string].</span>","<span class='notice'>You display your [src.name]. It reads: [badge_string].</span>")