Merge remote-tracking branch 'upstream/master'

code/__defines/misc.dm

@@ -8,13 +8,15 @@
 #define INVISIBILITY_LIGHTING             20
 #define INVISIBILITY_LEVEL_ONE            35
 #define INVISIBILITY_LEVEL_TWO            45
+#define INVISIBILITY_SHADEKIN			  55
 #define INVISIBILITY_OBSERVER             60
 #define INVISIBILITY_EYE		          61
 
 #define SEE_INVISIBLE_LIVING              25
-#define SEE_INVISIBLE_NOLIGHTING 15
+#define SEE_INVISIBLE_NOLIGHTING		  15
 #define SEE_INVISIBLE_LEVEL_ONE           35
 #define SEE_INVISIBLE_LEVEL_TWO           45
+#define SEE_INVISIBILITY_SHADEKIN         55
 #define SEE_INVISIBLE_CULT		          60
 #define SEE_INVISIBLE_OBSERVER            61
 

code/__defines/mobs.dm

@@ -27,6 +27,7 @@
 #define BORGTHERM 0x2
 #define BORGXRAY  0x4
 #define BORGMATERIAL  0x8
+#define BORGANOMALOUS  0x10
 
 #define STANCE_ATTACK    11 // Backwards compatability
 #define STANCE_ATTACKING 12 // Ditto

code/__defines/span_vr.dm

@@ -52,6 +52,12 @@
 
 #define span_reflex_shoot(str) ("<span class='reflex_shoot'>" + str + "</span>")
 
+/* Vore messages */
+
+#define span_vdanger(str) ("<span class='vdanger'>" + str + "</span>")
+#define span_vwarning(str) ("<span class='vwarning'>" + str + "</span>")
+#define span_vnotice(str) ("<span class='vnotice'>" + str + "</span>")
+
 /* Languages */
 
 #define span_alien(str) ("<span class='alien'>" + str + "</span>")

code/_helpers/global_lists_vr.dm

@@ -240,6 +240,7 @@ var/global/list/edible_trash = list(/obj/item/broken_device,
 				/obj/item/weapon/storage/wallet,
 				/obj/item/weapon/storage/vore_egg,
 				/obj/item/weapon/bikehorn/tinytether,
+				/obj/item/weapon/entrepreneur,
 				/obj/item/capture_crystal,
 				/obj/item/roulette_ball,
 				/obj/item/pizzabox

code/datums/outfits/jobs/civilian_vr.dm

@@ -23,4 +23,70 @@
 /decl/hierarchy/outfit/job/assistant/entrepreneur
 	id_type = /obj/item/weapon/card/id/civilian/entrepreneur
 	l_hand = /obj/item/device/ticket_printer/train
+	uniform = /obj/item/clothing/under/tropical/pink
 
+/decl/hierarchy/outfit/job/assistant/entrepreneur/lawyer
+	uniform = /obj/item/clothing/under/lawyer/red
+	r_hand = /obj/item/weapon/clipboard
+	l_pocket = /obj/item/weapon/pen/fountain3
+
+/decl/hierarchy/outfit/job/assistant/entrepreneur/private_eye
+	l_hand = /obj/item/weapon/storage/box/private_investigator
+	suit = /obj/item/clothing/suit/storage/trench
+	head = /obj/item/clothing/head/fedora/brown
+
+/decl/hierarchy/outfit/job/assistant/entrepreneur/bodyguard
+	glasses = /obj/item/clothing/glasses/sunglasses
+	l_pocket = /obj/item/weapon/reagent_containers/spray/pepper
+	suit = /obj/item/clothing/accessory/sweater/blackneck
+
+/decl/hierarchy/outfit/job/assistant/entrepreneur/personal_physician
+	suit = /obj/item/clothing/suit/storage/toggle/labcoat
+	l_pocket = /obj/item/clothing/accessory/stethoscope
+	r_pocket = /obj/item/device/healthanalyzer
+
+/decl/hierarchy/outfit/job/assistant/entrepreneur/dentist
+	l_hand = /obj/item/weapon/storage/box/dentist
+	suit = /obj/item/clothing/suit/storage/toggle/labcoat
+
+/decl/hierarchy/outfit/job/assistant/entrepreneur/fitness_instructor
+	l_hand = /obj/item/weapon/storage/box/fitness_trainer
+
+/decl/hierarchy/outfit/job/assistant/entrepreneur/yoga_teacher
+	uniform = /obj/item/clothing/under/pants/yogapants
+	l_hand = /obj/item/weapon/storage/box/yoga_teacher
+
+/decl/hierarchy/outfit/job/assistant/entrepreneur/masseuse
+	r_hand = /obj/item/roller/massage
+
+/decl/hierarchy/outfit/job/assistant/entrepreneur/tradesperson
+	r_hand = /obj/item/weapon/storage/toolbox/brass
+
+/decl/hierarchy/outfit/job/assistant/entrepreneur/streamer
+	l_pocket = /obj/item/device/tvcamera/streamer
+
+/decl/hierarchy/outfit/job/assistant/entrepreneur/influencer
+	l_pocket = /obj/item/device/camera/selfie
+
+/decl/hierarchy/outfit/job/assistant/entrepreneur/paranormal_investigator
+	l_hand = /obj/item/weapon/storage/box/paranormal_investigator
+
+/decl/hierarchy/outfit/job/assistant/entrepreneur/stylist
+	l_hand = /obj/item/weapon/storage/box/stylist
+
+/decl/hierarchy/outfit/job/assistant/entrepreneur/fisher
+	r_hand = /obj/item/weapon/material/fishing_rod/modern
+	l_pocket = /obj/item/weapon/material/fishing_net
+	head = /obj/item/clothing/head/fishing
+	r_pocket = /obj/item/weapon/storage/box/wormcan
+
+/decl/hierarchy/outfit/job/assistant/entrepreneur/personal_secretary
+	uniform = /obj/item/clothing/under/lawyer/blue
+	r_hand = /obj/item/weapon/clipboard
+	l_pocket = /obj/item/weapon/pen/fountain3
+
+/decl/hierarchy/outfit/job/assistant/entrepreneur/fortune_teller
+	l_hand = /obj/item/weapon/storage/box/fortune_teller
+
+/decl/hierarchy/outfit/job/assistant/entrepreneur/spirit_healer
+	l_hand = /obj/item/weapon/storage/box/spirit_healer

code/game/jobs/job/civilian_vr.dm

@@ -337,70 +337,84 @@
 /datum/alt_title/lawyer
 	title = "Lawyer"
 	title_blurb = "A Lawyer is knowledgable in various legal systems, including station's operations. They can try to offer their legal counsel, although nobody is really obliged to listen."
+	title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/personal_secretary
 
 /datum/alt_title/private_eye
 	title = "Private Eye"
 	title_blurb = "A Private Eye is a detective that has no credentials or equipment. But if someone wants something found without security's knowledge, they are the one to go to."
+	title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/private_eye
 
 /datum/alt_title/bodyguard
 	title = "Bodyguard"
 	title_blurb = "A Bodyguard offers service of personal protection. They may not be allowed any weapons, but their own body is weapon enough."
+	title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/bodyguard
 
 /datum/alt_title/personal_physician
 	title = "Personal Physician"
 	title_blurb = "A Personal Physicial is a doctor dedicated less to Hippocratic Oath and more to the moneymaking grind. Their license may be expired, but the grindset never will be."
+	title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/personal_physician
 
 /datum/alt_title/dentist
 	title = "Dentist"
 	title_blurb = "A Dentist is a doctor that specializes in oral care. Company may not recognize them as a proper doctor, but surely their customers will."
+	title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/dentist
 
 /datum/alt_title/fitness_instructor
 	title = "Fitness Instructor"
 	title_blurb = "A Fitness Instructor dedicates themselves to improving the health of the crew through physical activity, and boy, do they need the help."
+	title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/fitness_instructor
 
 /datum/alt_title/yoga_teacher
 	title = "Yoga Teacher"
 	title_blurb = "A Yoga Teacher is similar to fitness instructor, but rather than turning the round bodies into firm ones, they focus on helping people find balance and harmony."
+	title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/yoga_teacher
 
 /datum/alt_title/masseuse
 	title = "Masseuse"
 	title_blurb = "A Masseuse is master of physical therapy and working others' bodies with their hands."
+	title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/masseuse
 
 /datum/alt_title/tradesperson
 	title = "Tradesperson"
 	title_blurb = "A Tradesperson is someone attempting to make money via the most obvious act of all - buying and selling. Now if only customs allowed you to bring your goods along..."
+	title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/tradesperson
 
 /datum/alt_title/streamer
 	title = "Streamer"
 	title_blurb = "A Streamer is here to entertain. Not the crew! Their audience across exonet!"
+	title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/streamer
 
 /datum/alt_title/influencer
 	title = "Influencer"
 	title_blurb = "An Influencer has lucked out with some exonet following, and was given permission to go onstation to provide free exposure. Don't let it go to your head."
+	title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/influencer
 
 /datum/alt_title/paranormal_investigator
 	title = "Paranormal Investigator"
 	title_blurb = "A Paranormal Investigator looks beyond what is accepted by modern science, and searches for the true unknown. Aliens, alternate dimensions, ghosts... The truth is out there!"
+	title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/paranormal_investigator
 
 /datum/alt_title/personal_secretary
 	title = "Personal Secretary"
 	title_blurb = "A Personal Secretary offers services of general assistance. Although it's doubtful anyone will ever actually need those."
+	title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/personal_secretary
 
 /datum/alt_title/stylist
 	title = "Stylist"
 	title_blurb = "A Stylist offers fashion advice, as well as helps with adjusting appearance of the crew to better suit their beauty standards."
+	title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/stylist
 
 /datum/alt_title/fisher
 	title = "Fisher"
 	title_blurb = "A Fisher is a capable angler, who is good at obtaining large amounts of marine goods. Whether you generously give them to station or attempt to make a quick thaler by selling, it's up to you!"
+	title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/fisher
 
 /datum/alt_title/fortune_teller
 	title = "Fortune Teller"
 	title_blurb = "A Fortune Teller peers into the future, and offers these visions to others. Occasionally those visions may even come true!"
+	title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/fortune_teller
 
 /datum/alt_title/spirit_healer
 	title = "Spirit Healer"
 	title_blurb = "A Spirit Healer offers alternative forms of medicine. Rituals, magic rocks, seances... It totally works. What's that about placebo?"
-
-
-
+	title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/spirit_healer

code/game/objects/items/robot/robot_items.dm

@@ -36,6 +36,8 @@
 /obj/item/borg/sight/xray
 	name = "\proper x-ray vision"
 	sight_mode = BORGXRAY
+	icon_state = "night"
+	icon = 'icons/inventory/eyes/item.dmi'
 
 
 /obj/item/borg/sight/thermal
@@ -57,6 +59,12 @@
 	icon_state = "material"
 	icon = 'icons/inventory/eyes/item.dmi'
 
+/obj/item/borg/sight/anomalous
+	name = "\proper anomaly vision"
+	sight_mode = BORGANOMALOUS
+	icon_state = "denight"
+	icon = 'icons/inventory/eyes/item.dmi'
+
 /obj/item/borg/sight/hud
 	name = "hud"
 	var/obj/item/clothing/glasses/hud/hud = null