diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/goose_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/goose_vr.dm new file mode 100644 index 00000000000..7a1f219ad90 --- /dev/null +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/goose_vr.dm @@ -0,0 +1,2 @@ +/mob/living/simple_mob/animal/space/goose/virgo3b + faction = "virgo3b" diff --git a/maps/submaps/surface_submaps/plains/Boathouse_vr.dmm b/maps/submaps/surface_submaps/plains/Boathouse_vr.dmm index 707203ffe57..45cbfef0836 100644 --- a/maps/submaps/surface_submaps/plains/Boathouse_vr.dmm +++ b/maps/submaps/surface_submaps/plains/Boathouse_vr.dmm @@ -278,6 +278,10 @@ "bb" = ( /turf/simulated/floor/outdoors/dirt, /area/submap/Boathouse) +"LX" = ( +/obj/machinery/portable_atmospherics/canister/air, +/turf/simulated/floor/wood, +/area/submap/Boathouse) (1,1,1) = {" aa @@ -642,7 +646,7 @@ am am am am -ak +LX ai ai ai diff --git a/maps/submaps/surface_submaps/plains/Diner_vr.dmm b/maps/submaps/surface_submaps/plains/Diner_vr.dmm index c028e5056a9..8967f9bff74 100644 --- a/maps/submaps/surface_submaps/plains/Diner_vr.dmm +++ b/maps/submaps/surface_submaps/plains/Diner_vr.dmm @@ -466,6 +466,16 @@ /obj/structure/table/standard, /turf/simulated/floor/tiled/hydro, /area/submap/Diner) +"gw" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/portable_atmospherics/canister/air, +/turf/simulated/floor/tiled, +/area/submap/Diner) +"lT" = ( +/obj/effect/floor_decal/corner/red/diagonal, +/obj/machinery/portable_atmospherics/canister/air, +/turf/simulated/floor/tiled/white, +/area/submap/Diner) (1,1,1) = {" aa @@ -615,7 +625,7 @@ ac ac ac ac -ac +aZ ac ac ac @@ -639,10 +649,10 @@ ab ab ab ab -ab -ac -ac -aZ +ad +ad +az +ad ab ab ab @@ -667,8 +677,8 @@ ae ae ae ad -ad -az +aS +ap ad ae ae @@ -798,7 +808,7 @@ af ao as ax -af +lT aE aE aE @@ -967,7 +977,7 @@ ad ad ad bc -bc +gw ad ad ad diff --git a/maps/submaps/surface_submaps/plains/Oldhouse_vr.dmm b/maps/submaps/surface_submaps/plains/Oldhouse_vr.dmm index 07b86869967..56622df92fc 100644 --- a/maps/submaps/surface_submaps/plains/Oldhouse_vr.dmm +++ b/maps/submaps/surface_submaps/plains/Oldhouse_vr.dmm @@ -259,6 +259,10 @@ /obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/tram, /turf/simulated/floor/wood, /area/submap/Oldhouse) +"Uw" = ( +/obj/machinery/portable_atmospherics/canister/air, +/turf/simulated/floor/wood, +/area/submap/Oldhouse) (1,1,1) = {" aa @@ -672,7 +676,7 @@ ac ac ac ai -ai +Uw ac ab ab diff --git a/maps/submaps/surface_submaps/plains/RationCache_vr.dmm b/maps/submaps/surface_submaps/plains/RationCache_vr.dmm index c11cc2d79fb..e955b83f15d 100644 --- a/maps/submaps/surface_submaps/plains/RationCache_vr.dmm +++ b/maps/submaps/surface_submaps/plains/RationCache_vr.dmm @@ -5,10 +5,6 @@ "b" = ( /turf/simulated/floor/outdoors/snow, /area/submap/RationCache) -"c" = ( -/mob/living/simple_mob/vore/aggressive/dino, -/turf/simulated/floor/outdoors/snow, -/area/submap/RationCache) "d" = ( /turf/simulated/floor/outdoors/dirt, /area/submap/RationCache) @@ -25,6 +21,10 @@ /obj/machinery/portable_atmospherics/hydroponics/soil, /turf/simulated/floor/outdoors/dirt, /area/submap/RationCache) +"x" = ( +/mob/living/simple_mob/vore/aggressive/dino, +/turf/simulated/floor/outdoors/dirt, +/area/submap/RationCache) (1,1,1) = {" a @@ -54,7 +54,7 @@ a a b b -c +b b b b @@ -68,9 +68,9 @@ b b b d -d +x +b b -c b b "} @@ -115,7 +115,7 @@ a b b b -c +b b b b diff --git a/maps/submaps/surface_submaps/plains/Shakden_vr.dmm b/maps/submaps/surface_submaps/plains/Shakden_vr.dmm index 866f73517d8..4d78fcdde2b 100644 --- a/maps/submaps/surface_submaps/plains/Shakden_vr.dmm +++ b/maps/submaps/surface_submaps/plains/Shakden_vr.dmm @@ -404,8 +404,8 @@ d d d d -d -d +c +c d d d @@ -426,7 +426,7 @@ c d d d -d +c d d d diff --git a/maps/submaps/surface_submaps/plains/Thiefc_vr.dmm b/maps/submaps/surface_submaps/plains/Thiefc_vr.dmm index 6c08c071f93..956eb21ac18 100644 --- a/maps/submaps/surface_submaps/plains/Thiefc_vr.dmm +++ b/maps/submaps/surface_submaps/plains/Thiefc_vr.dmm @@ -117,8 +117,8 @@ outdoors = 0 }, /area/submap/Thiefc) -"q" = ( -/mob/living/simple_mob/animal/space/bear, +"I" = ( +/mob/living/simple_mob/humanoid/merc/melee/sword/space, /turf/simulated/floor/outdoors/dirt{ outdoors = 0 }, @@ -268,7 +268,7 @@ c c c c -h +c h c c @@ -290,7 +290,7 @@ c c c c -h +c h c c @@ -371,7 +371,7 @@ a c e h -h +I h h h @@ -396,7 +396,7 @@ c i h h -q +h h c c diff --git a/maps/submaps/surface_submaps/plains/camp1_vr.dmm b/maps/submaps/surface_submaps/plains/camp1_vr.dmm index 254004de22f..4a7c740be55 100644 --- a/maps/submaps/surface_submaps/plains/camp1_vr.dmm +++ b/maps/submaps/surface_submaps/plains/camp1_vr.dmm @@ -70,6 +70,12 @@ /obj/item/weapon/flame/lighter, /turf/simulated/floor/outdoors/dirt, /area/submap/camp1) +"y" = ( +/obj/machinery/portable_atmospherics/canister/air, +/turf/simulated/floor/outdoors/dirt{ + outdoors = 0 + }, +/area/submap/camp1) (1,1,1) = {" a @@ -121,8 +127,8 @@ n "} (5,1,1) = {" c +y e -f h f h diff --git a/maps/submaps/surface_submaps/plains/farm1_vr.dmm b/maps/submaps/surface_submaps/plains/farm1_vr.dmm index 592824e2c02..69e50050300 100644 --- a/maps/submaps/surface_submaps/plains/farm1_vr.dmm +++ b/maps/submaps/surface_submaps/plains/farm1_vr.dmm @@ -579,8 +579,8 @@ e e e g -g -u +D +k g e e @@ -612,10 +612,10 @@ e e b b -e -e -b -e +g +g +u +g e b b diff --git a/maps/submaps/surface_submaps/plains/house1_arealess_vr.dmm b/maps/submaps/surface_submaps/plains/house1_arealess_vr.dmm index 5b79ba61b60..2da3c52a437 100644 --- a/maps/submaps/surface_submaps/plains/house1_arealess_vr.dmm +++ b/maps/submaps/surface_submaps/plains/house1_arealess_vr.dmm @@ -285,6 +285,10 @@ }, /turf/simulated/wall/wood, /area/template_noop) +"zt" = ( +/obj/machinery/portable_atmospherics/canister/air, +/turf/simulated/floor/wood, +/area/template_noop) (1,1,1) = {" aa @@ -408,7 +412,7 @@ as ax ap ap -ap +zt ap ap ap diff --git a/maps/submaps/surface_submaps/plains/house1_vr.dmm b/maps/submaps/surface_submaps/plains/house1_vr.dmm index ace9ae9d5a7..e34e005ff01 100644 --- a/maps/submaps/surface_submaps/plains/house1_vr.dmm +++ b/maps/submaps/surface_submaps/plains/house1_vr.dmm @@ -284,6 +284,10 @@ }, /turf/simulated/wall/wood, /area/submap/house1) +"GN" = ( +/obj/machinery/portable_atmospherics/canister/air, +/turf/simulated/floor/wood, +/area/submap/house1) (1,1,1) = {" aa @@ -407,7 +411,7 @@ as ax ap ap -ap +GN ap ap ap diff --git a/maps/tether/submaps/tether_plains.dmm b/maps/tether/submaps/tether_plains.dmm index c17689a7506..5c026a3fc1c 100644 --- a/maps/tether/submaps/tether_plains.dmm +++ b/maps/tether/submaps/tether_plains.dmm @@ -78,6 +78,14 @@ "bF" = ( /turf/simulated/mineral/virgo3b, /area/mine/unexplored) +"BE" = ( +/mob/living/simple_mob/animal/space/goose/virgo3b, +/turf/simulated/floor/outdoors/grass/sif/virgo3b, +/area/tether/outpost/exploration_plains) +"Em" = ( +/mob/living/simple_mob/animal/passive/gaslamp, +/turf/simulated/floor/outdoors/grass/sif/virgo3b, +/area/tether/outpost/exploration_plains) (1,1,1) = {" aa @@ -1768,7 +1776,7 @@ ab ab ab ab -ab +BE ab ab ab @@ -2613,7 +2621,7 @@ ab ab ab ab -ab +Em ab ab ab @@ -2711,7 +2719,7 @@ ab ab ab ab -ab +BE ab ab ab @@ -2950,6 +2958,7 @@ ab ab ab ab +BE ab ab ab @@ -2971,8 +2980,7 @@ ab ab ab ab -ab -ab +Em ab ab ab @@ -3210,6 +3218,7 @@ ab ab ab ab +BE ab ab ab @@ -3293,8 +3302,7 @@ ab ab ab ab -ab -ab +BE ab ab ab @@ -5197,7 +5205,7 @@ ab ab ab ab -ab +Em ab ab ab @@ -7297,7 +7305,7 @@ ab ab ab ab -ab +BE ab ab ab @@ -7330,7 +7338,7 @@ ab ab ab ab -ab +BE ab ab ab @@ -8379,7 +8387,7 @@ ab ab ab ab -ab +BE ab ab ab @@ -9186,7 +9194,7 @@ ab ab ab ab -ab +BE ab ab ab @@ -9357,7 +9365,7 @@ ab ab ab ab -ab +BE ab ab ab @@ -10743,7 +10751,7 @@ ab ab ab ab -ab +Em ab ab ab @@ -11666,7 +11674,7 @@ ab ab ab ab -ab +Em ab ab ab @@ -14073,7 +14081,7 @@ ab ab ab ab -ab +BE ab ab ab @@ -14588,7 +14596,7 @@ ab ab ab ab -ab +BE ab ab ab @@ -14816,7 +14824,7 @@ ab ab ab ab -ab +BE ab ab ab @@ -15845,6 +15853,7 @@ ac aa ab ab +BE ab ab ab @@ -15867,8 +15876,7 @@ ab ab ab ab -ab -ab +Em ab ab ab @@ -16192,7 +16200,7 @@ ab ab ab ab -ab +BE ab ab ab @@ -17531,7 +17539,7 @@ ab ab ab ab -ab +Em ab ab ab @@ -17550,7 +17558,7 @@ aa ab ab ab -ab +Em ab ab ab diff --git a/vorestation.dme b/vorestation.dme index 6277b529895..46bae905591 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2359,6 +2359,7 @@ #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\goose_vr.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"