From a4b253475e5958a3d760d48c410cbebbb39b5b36 Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Thu, 31 Dec 2020 02:39:29 +0100
Subject: [PATCH] [MIRROR] Integrates vibebots with the pda (#2391)

* Merge pull request #55798 from spessbro/please-assume-the-position

Integrates vibebots with the pda

* Integrates vibebots with the pda

Co-authored-by: 81Denton <32391752+81Denton@users.noreply.github.com>
---
 code/__DEFINES/robots.dm                             |  1 +
 code/game/objects/items/devices/PDA/cart.dm          | 10 +++++-----
 code/modules/mob/living/simple_animal/bot/vibebot.dm |  3 ++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/code/__DEFINES/robots.dm b/code/__DEFINES/robots.dm
index 87e0be05820..441bfcdb3a1 100644
--- a/code/__DEFINES/robots.dm
+++ b/code/__DEFINES/robots.dm
@@ -39,6 +39,7 @@
 #define HONK_BOT			(1<<5)	// Honkbots & ED-Honks
 #define FIRE_BOT			(1<<6)  // Firebots
 #define HYGIENE_BOT			(1<<7)  // Hygienebots
+#define VIBE_BOT			(1<<8)  //vibe bots
 
 //AI notification defines
 #define		NEW_BORG     1
diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm
index 41ec0c8d258..2398d9af4e3 100644
--- a/code/game/objects/items/devices/PDA/cart.dm
+++ b/code/game/objects/items/devices/PDA/cart.dm
@@ -32,7 +32,7 @@
 
 	var/remote_door_id = ""
 
-	var/bot_access_flags = 0 //Bit flags. Selection: SEC_BOT | MULE_BOT | FLOOR_BOT | CLEAN_BOT | MED_BOT | FIRE_BOT
+	var/bot_access_flags = 0 //Bit flags. Selection: SEC_BOT | MULE_BOT | FLOOR_BOT | CLEAN_BOT | MED_BOT | FIRE_BOT | VIBE_BOT
 	var/spam_enabled = 0 //Enables "Send to All" Option
 
 	var/obj/item/pda/host_pda = null
@@ -113,7 +113,7 @@
 /obj/item/cartridge/roboticist
 	name = "\improper B.O.O.P. Remote Control cartridge"
 	desc = "Packed with heavy duty quad-bot interlink!"
-	bot_access_flags = FLOOR_BOT | CLEAN_BOT | MED_BOT | FIRE_BOT
+	bot_access_flags = FLOOR_BOT | CLEAN_BOT | MED_BOT | FIRE_BOT | VIBE_BOT
 	access = CART_DRONEPHONE
 
 /obj/item/cartridge/signal
@@ -148,7 +148,7 @@
 	name = "\improper HumanResources9001 cartridge"
 	icon_state = "cart-h"
 	access = CART_MANIFEST | CART_STATUS_DISPLAY | CART_JANITOR | CART_SECURITY | CART_NEWSCASTER | CART_QUARTERMASTER | CART_DRONEPHONE
-	bot_access_flags = MULE_BOT | CLEAN_BOT
+	bot_access_flags = MULE_BOT | CLEAN_BOT | VIBE_BOT
 
 /obj/item/cartridge/hos
 	name = "\improper R.O.B.U.S.T. DELUXE cartridge"
@@ -173,7 +173,7 @@
 	name = "\improper Signal Ace DELUXE cartridge"
 	icon_state = "cart-rd"
 	access = CART_MANIFEST | CART_STATUS_DISPLAY | CART_REAGENT_SCANNER | CART_ATMOS | CART_DRONEPHONE
-	bot_access_flags = FLOOR_BOT | CLEAN_BOT | MED_BOT | FIRE_BOT
+	bot_access_flags = FLOOR_BOT | CLEAN_BOT | MED_BOT | FIRE_BOT | VIBE_BOT
 
 /obj/item/cartridge/rd/Initialize()
 	. = ..()
@@ -184,7 +184,7 @@
 	desc = "Now with 350% more value!" //Give the Captain...EVERYTHING! (Except Mime, Clown, and Syndie)
 	icon_state = "cart-c"
 	access = ~(CART_CLOWN | CART_MIME | CART_REMOTE_DOOR)
-	bot_access_flags = SEC_BOT | MULE_BOT | FLOOR_BOT | CLEAN_BOT | MED_BOT | FIRE_BOT
+	bot_access_flags = SEC_BOT | MULE_BOT | FLOOR_BOT | CLEAN_BOT | MED_BOT | FIRE_BOT | VIBE_BOT
 	spam_enabled = 1
 
 /obj/item/cartridge/captain/Initialize()
diff --git a/code/modules/mob/living/simple_animal/bot/vibebot.dm b/code/modules/mob/living/simple_animal/bot/vibebot.dm
index 7a0d78076b9..ba6a292c669 100644
--- a/code/modules/mob/living/simple_animal/bot/vibebot.dm
+++ b/code/modules/mob/living/simple_animal/bot/vibebot.dm
@@ -1,5 +1,5 @@
 /mob/living/simple_animal/bot/vibebot
-	name = "\improper vibebot"
+	name = "\improper Vibebot"
 	desc = "A little robot. It's just vibing, doing its thing."
 	icon = 'icons/mob/aibots.dmi'
 	icon_state = "vibebot"
@@ -12,6 +12,7 @@
 
 	radio_key = /obj/item/encryptionkey/headset_service //doesn't have security key
 	radio_channel = RADIO_CHANNEL_SERVICE //Doesn't even use the radio anyway.
+	bot_type = VIBE_BOT
 	model = "Vibebot"
 	window_id = "vibebot"
 	window_name = "Discomatic Vibe Bot v1.05"