diff --git a/code/modules/mob/living/silicon/robot/drone/drone_vr.dm b/code/modules/mob/living/silicon/robot/drone/drone_vr.dm new file mode 100644 index 00000000000..cc616fed521 --- /dev/null +++ b/code/modules/mob/living/silicon/robot/drone/drone_vr.dm @@ -0,0 +1,2 @@ +/mob/living/silicon/robot/drone + mob_size = MOB_SMALL \ No newline at end of file diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm index 257bcbb59c8..e86cfd39347 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm @@ -12,6 +12,8 @@ /mob/living/simple_mob/animal/passive/mouse/attack_hand(mob/living/hander) if(hander.a_intent == I_HELP) //if lime intent get_scooped(hander) //get scooped + else + ..() /obj/item/weapon/holder/mouse/attack_self(var/mob/U) for(var/mob/living/simple_mob/M in src.contents) diff --git a/code/modules/vore/resizing/holder_micro_vr.dm b/code/modules/vore/resizing/holder_micro_vr.dm index 4e7e855ae81..d9db06118ff 100644 --- a/code/modules/vore/resizing/holder_micro_vr.dm +++ b/code/modules/vore/resizing/holder_micro_vr.dm @@ -4,6 +4,7 @@ name = "micro" desc = "Another crewmember, small enough to fit in your hand." icon_state = "micro" + icon_override = 'icons/mob/head_vr.dmi' slot_flags = SLOT_FEET | SLOT_HEAD | SLOT_ID w_class = ITEMSIZE_SMALL item_icons = list() // No in-hand sprites (for now, anyway, we could totally add some) @@ -34,4 +35,9 @@ var/turf/here = get_turf(src) for(var/atom/movable/A in src) A.forceMove(here) - return ..() \ No newline at end of file + return ..() + +/obj/item/weapon/holder/micro/sync(var/mob/living/M) + ..() + for(var/mob/living/carbon/human/I in contents) + item_state = lowertext(I.species.name) \ No newline at end of file diff --git a/code/modules/vore/resizing/resize_vr.dm b/code/modules/vore/resizing/resize_vr.dm index c92121da918..2073f499c1a 100644 --- a/code/modules/vore/resizing/resize_vr.dm +++ b/code/modules/vore/resizing/resize_vr.dm @@ -135,7 +135,7 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 var/mob/living/simple_mob/SA = M if(!SA.has_hands) return 0 - if(M.buckled) + if(buckled) to_chat(usr,"You have to unbuckle \the [M] before you pick them up.") return 0 if(size_diff >= 0.50) diff --git a/icons/mob/head_vr.dmi b/icons/mob/head_vr.dmi index bf19238e2ea..7a1bea298be 100644 Binary files a/icons/mob/head_vr.dmi and b/icons/mob/head_vr.dmi differ diff --git a/vorestation.dme b/vorestation.dme index 6bda13edcc0..13d791817da 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2361,6 +2361,7 @@ #include "code\modules\mob\living\silicon\robot\drone\drone_items.dm" #include "code\modules\mob\living\silicon\robot\drone\drone_manufacturer.dm" #include "code\modules\mob\living\silicon\robot\drone\drone_say.dm" +#include "code\modules\mob\living\silicon\robot\drone\drone_vr.dm" #include "code\modules\mob\living\silicon\robot\robot_modules\event.dm" #include "code\modules\mob\living\silicon\robot\robot_modules\event_vr.dm" #include "code\modules\mob\living\silicon\robot\robot_modules\station.dm"