diff --git a/code/modules/mob/living/simple_animal/simple_animal_vr.dm b/code/modules/mob/living/simple_animal/simple_animal_vr.dm index a116a9cf0ea..0944fb737a5 100644 --- a/code/modules/mob/living/simple_animal/simple_animal_vr.dm +++ b/code/modules/mob/living/simple_animal/simple_animal_vr.dm @@ -248,28 +248,28 @@ animal_nom(A) // Riding -/datum/riding/simple_animal +/datum/riding/simple_mob keytype = /obj/item/weapon/material/twohanded/fluff/riding_crop // Crack! nonhuman_key_exemption = FALSE // If true, nonhumans who can't hold keys don't need them, like borgs and simplemobs. key_name = "a riding crop" // What the 'keys' for the thing being rided on would be called. only_one_driver = TRUE // If true, only the person in 'front' (first on list of riding mobs) can drive. -/datum/riding/simple_animal/handle_vehicle_layer() +/datum/riding/simple_mob/handle_vehicle_layer() ridden.layer = initial(ridden.layer) -/datum/riding/simple_animal/ride_check(mob/living/M) +/datum/riding/simple_mob/ride_check(mob/living/M) var/mob/living/L = ridden if(L.stat) force_dismount(M) return FALSE return TRUE -/datum/riding/simple_animal/force_dismount(mob/M) +/datum/riding/simple_mob/force_dismount(mob/M) . =..() ridden.visible_message("[M] stops riding [ridden]!") -/datum/riding/simple_animal/get_offsets(pass_index) // list(dir = x, y, layer) - var/mob/living/simple_animal/L = ridden +/datum/riding/simple_mob/get_offsets(pass_index) // list(dir = x, y, layer) + var/mob/living/simple_mob/L = ridden var/scale = L.size_multiplier var/list/values = list( @@ -280,7 +280,7 @@ return values -/mob/living/simple_animal/buckle_mob(mob/living/M, forced = FALSE, check_loc = TRUE) +/mob/living/simple_mob/buckle_mob(mob/living/M, forced = FALSE, check_loc = TRUE) if(forced) return ..() // Skip our checks if(!riding_datum) @@ -305,7 +305,7 @@ if(.) buckled_mobs[H] = "riding" -/mob/living/simple_animal/attack_hand(mob/user as mob) +/mob/living/simple_mob/attack_hand(mob/user as mob) if(riding_datum && LAZYLEN(buckled_mobs)) //We're getting off! if(user in buckled_mobs) @@ -317,7 +317,7 @@ else . = ..() -/mob/living/simple_animal/proc/animal_mount(var/mob/living/M in living_mobs(1)) +/mob/living/simple_mob/proc/animal_mount(var/mob/living/M in living_mobs(1)) set name = "Animal Mount/Dismount" set category = "Abilities" set desc = "Let people ride on you." diff --git a/code/modules/vore/fluffstuff/custom_boxes_vr.dm b/code/modules/vore/fluffstuff/custom_boxes_vr.dm index ba0e72238c5..5751c529dc8 100644 --- a/code/modules/vore/fluffstuff/custom_boxes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_boxes_vr.dm @@ -233,7 +233,7 @@ name = "Phi's Personal Items" has_items = list( /obj/item/clothing/accessory/medal/bronze_heart, - /obj/item/clothing/gloves/ring/seal/signet/fluff/vietsi) + /obj/item/clothing/gloves/ring/seal/signet/fluff/phi) /* //VORESTATION AI TEMPORARY REMOVAL // Tabiranth: Ascian diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index e0b62b165bf..b1a85421358 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -13773,7 +13773,7 @@ "aGx" = ( /obj/structure/table/glass, /obj/item/weapon/storage/toolbox/emergency, -/obj/item/device/radio/emergency +/obj/item/device/radio/emergency, /obj/machinery/recharger, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/first_aid_west) diff --git a/vorestation.dme b/vorestation.dme index f35684c163f..eca90232d06 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2272,6 +2272,7 @@ #include "code\modules\mob\living\simple_mob\subtypes\animal\giant_spider\webslinger.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\passive\crab.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\passive\fish.dm" +#include "code\modules\mob\living\simple_mob\subtypes\animal\passive\fish_vr.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\passive\lizard.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\passive\misc.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\passive\mouse.dm" @@ -2280,8 +2281,10 @@ #include "code\modules\mob\living\simple_mob\subtypes\animal\pets\bird.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\pets\cat.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\pets\dog.dm" +#include "code\modules\mob\living\simple_mob\subtypes\animal\pets\fox_vr.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\pets\parrot.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\sif\diyaab.dm" +#include "code\modules\mob\living\simple_mob\subtypes\animal\sif\fluffy_vr.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\sif\hooligan_crab.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\sif\savik.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\sif\shantak.dm" @@ -2290,7 +2293,10 @@ #include "code\modules\mob\living\simple_mob\subtypes\animal\space\bats.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\space\bear.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\space\carp.dm" +#include "code\modules\mob\living\simple_mob\subtypes\animal\space\gaslamp_vr.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\space\goose.dm" +#include "code\modules\mob\living\simple_mob\subtypes\animal\space\mimic_vr.dm" +#include "code\modules\mob\living\simple_mob\subtypes\animal\space\snake_vr.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\space\space.dm" #include "code\modules\mob\living\simple_mob\subtypes\blob\blob.dm" #include "code\modules\mob\living\simple_mob\subtypes\blob\spore.dm"