diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index cbf75ab139..25d575f7da 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -36,7 +36,8 @@ "Parrot" = "pai-parrot", "Rabbit" = "pai-rabbit", "Bear" = "pai-bear", //VOREStation Edit - "Fennec" = "pai-fen" // VOREStation Edit - Rykka + "Fennec" = "pai-fen", // VOREStation Edit - Rykka + "Fennec" = "pai-typezero" //VOREStation Edit ) var/global/list/possible_say_verbs = list( diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm index 5e29b10eab..9aae32df4c 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm @@ -64,14 +64,16 @@ /obj/item/weapon/robot_module/robot/medical/surgeon //VOREStation sprites vr_sprites = list( "Acheron" = "mechoid-Medical", - "Shellguard Noble" = "Noble-MED" + "Shellguard Noble" = "Noble-MED", + "ZOOM-BA" = "zoomba-medical" ) /obj/item/weapon/robot_module/robot/medical/crisis //VOREStation sprites vr_sprites = list( "Handy" = "handy-med", "Acheron" = "mechoid-Medical", - "Shellguard Noble" = "Noble-MED" + "Shellguard Noble" = "Noble-MED", + "ZOOM-BA" = "zoomba-crisis" ) /obj/item/weapon/robot_module/robot/clerical/butler //VOREStation sprites @@ -79,58 +81,67 @@ "Handy - Service" = "handy-service", "Handy - Hydro" = "handy-hydro", "Acheron" = "mechoid-Service", - "Shellguard Noble" = "Noble-SRV" + "Shellguard Noble" = "Noble-SRV", + "ZOOM-BA" = "zoomba-service" ) /obj/item/weapon/robot_module/robot/clerical/general //VOREStation sprites vr_sprites = list( "Handy" = "handy-clerk", "Acheron" = "mechoid-Service", - "Shellguard Noble" = "Noble-SRV" + "Shellguard Noble" = "Noble-SRV", + "ZOOM-BA" = "zoomba-clerical" ) /obj/item/weapon/robot_module/robot/janitor //VOREStation sprites vr_sprites = list( "Handy" = "handy-janitor", "Acheron" = "mechoid-Janitor", - "Shellguard Noble" = "Noble-CLN" + "Shellguard Noble" = "Noble-CLN", + "ZOOM-BA" = "zoomba-janitor" ) /obj/item/weapon/robot_module/robot/security/general //VOREStation sprites vr_sprites = list( "Handy" = "handy-sec", "Acheron" = "mechoid-Security", - "Shellguard Noble" = "Noble-SEC" + "Shellguard Noble" = "Noble-SEC", + "ZOOM-BA" = "zoomba-security" ) /obj/item/weapon/robot_module/robot/miner //VOREStation sprites vr_sprites = list( "Handy" = "handy-miner", "Acheron" = "mechoid-Miner", - "Shellguard Noble" = "Noble-DIG" + "Shellguard Noble" = "Noble-DIG", + "ZOOM-BA" = "zoomba-miner" ) /obj/item/weapon/robot_module/robot/standard //VOREStation sprites vr_sprites = list( "Handy" = "handy-standard", "Acheron" = "mechoid-Standard", - "Shellguard Noble" = "Noble-STD" + "Shellguard Noble" = "Noble-STD", + "ZOOM-BA" = "zoomba-standard" ) /obj/item/weapon/robot_module/robot/engineering/general //VOREStation sprites vr_sprites = list( "Acheron" = "mechoid-Engineering", - "Shellguard Noble" = "Noble-ENG" + "Shellguard Noble" = "Noble-ENG", + "ZOOM-BA" = "zoomba-engineering" ) /obj/item/weapon/robot_module/robot/research //VOREStation sprites vr_sprites = list( - "Acheron" = "mechoid-Science" + "Acheron" = "mechoid-Science", + "ZOOM-BA" = "zoomba-research" ) /obj/item/weapon/robot_module/robot/security/combat //VOREStation sprites vr_sprites = list( - "Acheron" = "mechoid-Combat" + "Acheron" = "mechoid-Combat", + "ZOOM-BA" = "zoomba-combat" ) /obj/item/weapon/robot_module/robot/knine @@ -138,7 +149,8 @@ sprites = list( "K9 hound" = "k9", "K9 Alternative (Static)" = "k92", - "Secborg model V-2" = "secborg" + "Secborg model V-2" = "secborg", + "Borgi" = "borgi-sec" ) channels = list("Security" = 1) networks = list(NETWORK_SECURITY) @@ -210,7 +222,8 @@ sprites = list( "Medical Hound" = "medihound", "Dark Medical Hound (Static)" = "medihounddark", - "Mediborg model V-2" = "vale" + "Mediborg model V-2" = "vale", + "Borgi" = "borgi-medi" ) /obj/item/weapon/robot_module/robot/medihound/New(var/mob/living/silicon/robot/R) @@ -261,7 +274,8 @@ networks = list(NETWORK_SECURITY) can_be_pushed = 0 sprites = list( - "Standard" = "ert" + "Standard" = "ert", + "Borgi" = "borgi" ) /obj/item/weapon/robot_module/robot/ert/New(var/mob/living/silicon/robot/R) @@ -305,6 +319,7 @@ name = "Custodial Hound module" sprites = list( "Custodial Hound" = "scrubpup", + "Borgi" = "borgi-jani" ) channels = list("Service" = 1) can_be_pushed = 0 @@ -385,6 +400,7 @@ name = "Research Hound Module" sprites = list( "Research Hound" = "science", + "Borgi" = "borgi-sci" ) channels = list("Science" = 1) can_be_pushed = 0 @@ -431,6 +447,7 @@ name = "Construction Hound module" sprites = list( "Pupdozer" = "pupdozer", + "Borgi" = "borgi-eng" ) channels = list("Engineering" = 1) networks = list(NETWORK_ENGINEERING) diff --git a/code/modules/mob/living/silicon/robot/robot_vr.dm b/code/modules/mob/living/silicon/robot/robot_vr.dm index e3264aee4e..5f1e037e32 100644 --- a/code/modules/mob/living/silicon/robot/robot_vr.dm +++ b/code/modules/mob/living/silicon/robot/robot_vr.dm @@ -33,13 +33,27 @@ "mechoid-Janitor", "mechoid-Combat", "mechoid-Combat-roll", + "mechoid-Combat-shield", "Noble-CLN", "Noble-SRV", "Noble-DIG", "Noble-MED", "Noble-SEC", "Noble-ENG", - "Noble-STD" + "Noble-STD", + "zoomba-standard", + "zoomba-clerical", + "zoomba-engineering", + "zoomba-janitor", + "zoomba-medical", + "zoomba-crisis", + "zoomba-miner", + "zoomba-research", + "zoomba-security", + "zoomba-service", + "zoomba-combat", + "zoomba-combat-roll", + "zoomba-combat-shield" ) //List of all used sprites that are in robots_vr.dmi diff --git a/icons/mob/64x64robot_vr.dmi b/icons/mob/64x64robot_vr.dmi index b631aa61df..8bcd665ea4 100644 Binary files a/icons/mob/64x64robot_vr.dmi and b/icons/mob/64x64robot_vr.dmi differ diff --git a/icons/mob/pai_vr.dmi b/icons/mob/pai_vr.dmi index cb494851af..09b8504915 100644 Binary files a/icons/mob/pai_vr.dmi and b/icons/mob/pai_vr.dmi differ diff --git a/icons/mob/robots_vr.dmi b/icons/mob/robots_vr.dmi index 2d6a4f2648..cdf2fd6a86 100644 Binary files a/icons/mob/robots_vr.dmi and b/icons/mob/robots_vr.dmi differ diff --git a/icons/mob/widerobot_vr.dmi b/icons/mob/widerobot_vr.dmi index 49e60d2c1d..529dd7231d 100644 Binary files a/icons/mob/widerobot_vr.dmi and b/icons/mob/widerobot_vr.dmi differ