diff --git a/aurorastation.dme b/aurorastation.dme
index 08934079824..7472a5fa855 100644
--- a/aurorastation.dme
+++ b/aurorastation.dme
@@ -3151,6 +3151,7 @@
#include "code\modules\turbolift\turbolift_map.dm"
#include "code\modules\turbolift\turbolift_turfs.dm"
#include "code\modules\udp\ship_udp.dm"
+#include "code\modules\vehicles\animal.dm"
#include "code\modules\vehicles\bike.dm"
#include "code\modules\vehicles\cargo_train.dm"
#include "code\modules\vehicles\droppod.dm"
@@ -3363,6 +3364,7 @@
#include "maps\random_ruins\exoplanets\adhomai\adhomai_rredouane_shrine.dm"
#include "maps\random_ruins\exoplanets\adhomai\adhomai_schlorrgo_cage.dm"
#include "maps\random_ruins\exoplanets\adhomai\adhomai_silo.dm"
+#include "maps\random_ruins\exoplanets\adhomai\adhomai_sole_rock_nomad.dm"
#include "maps\random_ruins\exoplanets\adhomai\adhomai_tunneler_nest.dm"
#include "maps\random_ruins\exoplanets\adhomai\adhomai_village.dm"
#include "maps\random_ruins\exoplanets\adhomai\adhomai_war_memorial.dm"
diff --git a/code/modules/maps/planet_types/lore/srandmarr.dm b/code/modules/maps/planet_types/lore/srandmarr.dm
index 089247efc99..f9338be3f7e 100644
--- a/code/modules/maps/planet_types/lore/srandmarr.dm
+++ b/code/modules/maps/planet_types/lore/srandmarr.dm
@@ -176,14 +176,14 @@
/datum/map_template/ruin/exoplanet/adhomai_bar, /datum/map_template/ruin/exoplanet/adhomai_war_memorial, /datum/map_template/ruin/exoplanet/adhomai_raskariim_hideout, /datum/map_template/ruin/exoplanet/adhomai_cavern_geist,
/datum/map_template/ruin/exoplanet/adhomai_tunneler_nest, /datum/map_template/ruin/exoplanet/adhomai_rafama_herd, /datum/map_template/ruin/exoplanet/adhomai_amohdan,
/datum/map_template/ruin/exoplanet/ala_cell, /datum/map_template/ruin/exoplanet/adhomai_chemical_testing, /datum/map_template/ruin/exoplanet/adhomai_president_hadii_statue_toppled, /datum/map_template/ruin/exoplanet/ala_base,
- /datum/map_template/ruin/exoplanet/adhomai_deserter, /datum/map_template/ruin/exoplanet/adhomai_nuclear_waste_makeshift, /datum/map_template/ruin/exoplanet/adhomai_rredouane_shrine)
+ /datum/map_template/ruin/exoplanet/adhomai_deserter, /datum/map_template/ruin/exoplanet/adhomai_nuclear_waste_makeshift, /datum/map_template/ruin/exoplanet/adhomai_rredouane_shrine, /datum/map_template/ruin/exoplanet/adhomai_sole_rock_nomad)
if("New Kingdom of Adhomai")
ruin_type_whitelist = list (/datum/map_template/ruin/exoplanet/adhomai_hunting, /datum/map_template/ruin/exoplanet/adhomai_minefield, /datum/map_template/ruin/exoplanet/adhomai_village,
/datum/map_template/ruin/exoplanet/adhomai_abandoned_village, /datum/map_template/ruin/exoplanet/adhomai_battlefield, /datum/map_template/ruin/exoplanet/adhomai_cavern, /datum/map_template/ruin/exoplanet/adhomai_raskara_ritual,
/datum/map_template/ruin/exoplanet/adhomai_bar, /datum/map_template/ruin/exoplanet/adhomai_war_memorial, /datum/map_template/ruin/exoplanet/adhomai_raskariim_hideout,/datum/map_template/ruin/exoplanet/adhomai_cavern_geist,
/datum/map_template/ruin/exoplanet/adhomai_tunneler_nest, /datum/map_template/ruin/exoplanet/adhomai_rafama_herd, /datum/map_template/ruin/exoplanet/adhomai_amohdan, /datum/map_template/ruin/exoplanet/adhomai_archeology,
- /datum/map_template/ruin/exoplanet/nka_base, /datum/map_template/ruin/exoplanet/adhomai_president_hadii_statue_toppled, /datum/map_template/ruin/exoplanet/adhomai_rredouane_shrine)
+ /datum/map_template/ruin/exoplanet/nka_base, /datum/map_template/ruin/exoplanet/adhomai_president_hadii_statue_toppled, /datum/map_template/ruin/exoplanet/adhomai_rredouane_shrine, /datum/map_template/ruin/exoplanet/adhomai_sole_rock_nomad)
if("North Pole")
features_budget = 1
@@ -226,7 +226,8 @@
water_type = /turf/simulated/floor/exoplanet/ice
fauna_types = list(/mob/living/simple_animal/ice_tunneler, /mob/living/simple_animal/ice_tunneler/male, /mob/living/simple_animal/fatshouter, /mob/living/simple_animal/fatshouter/male,
/mob/living/simple_animal/hostile/retaliate/rafama, /mob/living/simple_animal/hostile/retaliate/rafama/male, /mob/living/simple_animal/hostile/retaliate/rafama/baby,
- /mob/living/simple_animal/hostile/wind_devil, /mob/living/carbon/human/farwa/adhomai, /mob/living/simple_animal/hostile/harron)
+ /mob/living/simple_animal/hostile/wind_devil, /mob/living/carbon/human/farwa/adhomai, /mob/living/simple_animal/hostile/harron, /mob/living/simple_animal/climber,
+ /mob/living/simple_animal/snow_strider, /mob/living/simple_animal/nosehorn)
/datum/random_map/noise/exoplanet/snow/adhomai/generate_flora()
for(var/i = 1 to flora_diversity)
diff --git a/code/modules/mob/living/simple_animal/friendly/adhomai.dm b/code/modules/mob/living/simple_animal/friendly/adhomai.dm
index 60dc1e3ebe3..cb5c47e253c 100644
--- a/code/modules/mob/living/simple_animal/friendly/adhomai.dm
+++ b/code/modules/mob/living/simple_animal/friendly/adhomai.dm
@@ -248,4 +248,102 @@
/mob/living/simple_animal/ice_catcher/death(gibbed)
..()
if(burrowed)
- unburrow()
\ No newline at end of file
+ unburrow()
+
+/mob/living/simple_animal/climber
+ name = "climber"
+ desc = "A rideable beast of burden, large enough for one adult rider only but perfectly adapted for the rough terrain on Adhomai."
+ icon = 'icons/mob/npc/adhomai_48.dmi'
+ icon_state = "climber"
+ icon_living = "climber"
+ icon_dead = "climber_dead"
+ speak_emote = list("chuffs")
+ emote_hear = list("chuffs")
+ emote_see = list("shakes its head", "stomps its feet")
+ speak_chance = 1
+ turns_per_move = 5
+ see_in_dark = 6
+
+ organ_names = list("head", "chest", "right fore leg", "left fore leg", "right rear leg", "left rear leg")
+ response_help = "pets"
+ response_disarm = "gently pushes aside"
+ response_harm = "kicks"
+ attacktext = "kicked"
+
+ meat_type = /obj/item/reagent_containers/food/snacks/meat/adhomai
+
+ faction = "Adhomai"
+
+ maxHealth = 100
+ health = 100
+ mob_size = 12
+ pixel_x = -8
+
+ canbrush = TRUE
+
+ meat_type = /obj/item/reagent_containers/food/snacks/meat/adhomai
+ meat_amount = 4
+ faction = "Adhomai"
+ vehicle_version = /obj/vehicle/bike/climber
+
+/mob/living/simple_animal/climber/saddle
+ desc = "A rideable beast of burden, large enough for one adult rider only but perfectly adapted for the rough terrain on Adhomai. This one has a saddle mounted on it"
+ icon_state = "climber_s"
+ icon_living = "climber_s"
+ icon_dead = "climber_s_dead"
+
+/mob/living/simple_animal/snow_strider
+ name = "snow strider"
+ desc = "An animal hunted and farmed by the Tajara for its meat and fur."
+ icon = 'icons/mob/npc/adhomai_48.dmi'
+ icon_state = "snow_strider"
+ icon_living = "snow_strider"
+ icon_dead = "snow_strider_dead"
+
+ turns_per_move = 3
+ speak_emote = list("chuffs")
+ emote_hear = list("yelps")
+ emote_see = list("shakes its head", "stamps a foot", "glares around")
+
+ stop_automated_movement_when_pulled = 0
+ mob_size = 12
+
+ meat_type = /obj/item/reagent_containers/food/snacks/meat/adhomai
+ organ_names = list("head", "chest", "right fore leg", "left fore leg", "right rear leg", "left rear leg")
+
+ maxHealth = 150
+ health = 150
+
+ butchering_products = list(/obj/item/stack/material/animalhide = 10)
+ meat_amount = 20
+ faction = "Adhomai"
+ pixel_x = -8
+
+/mob/living/simple_animal/nosehorn
+ name = "nose-horn"
+ desc = "A domesticated beast of burden used for hitching and dragging. "
+ icon = 'icons/mob/npc/adhomai_96.dmi'
+ icon_state = "nosehorn"
+ icon_living = "nosehorn"
+ icon_dead = "nosehorn_dead"
+ speak_emote = list("chuffs")
+ emote_hear = list("brays")
+ emote_see = list("shakes its head")
+ speak_chance = 1
+ turns_per_move = 5
+ see_in_dark = 6
+ meat_amount = 50
+ organ_names = list("head", "chest", "right fore leg", "left fore leg", "right rear leg", "left rear leg")
+ response_help = "pets"
+ response_disarm = "gently pushes aside"
+ response_harm = "kicks"
+ attacktext = "kicked"
+ health = 450
+ maxHealth = 452
+ mob_size = 30
+
+ pixel_x = -32
+
+ meat_type = /obj/item/reagent_containers/food/snacks/meat/adhomai
+ butchering_products = list(/obj/item/stack/material/animalhide = 15, /obj/item/reagent_containers/food/snacks/spreads/lard = 20)
+ faction = "Adhomai"
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index d8a72672c38..1ea3ede143f 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -149,7 +149,7 @@
var/return_damage_max
var/dead_on_map = FALSE //if true, kills the mob when it spawns (it is for mapping)
-
+ var/vehicle_version = null
/mob/living/simple_animal/proc/update_nutrition_stats()
nutrition_step = mob_size * 0.03 * metabolic_factor
@@ -544,6 +544,16 @@
poke(TRUE)
/mob/living/simple_animal/attackby(obj/item/O, mob/user)
+ if(istype(O, /obj/item/saddle) && vehicle_version && (stat != DEAD))
+ var/obj/vehicle/V = new vehicle_version (get_turf(src))
+ V.health = health
+ V.maxhealth = maxHealth
+ to_chat(user, SPAN_WARNING("You place \the [O] on the \the [src]."))
+ user.drop_from_inventory(O)
+ O.forceMove(get_turf(src))
+ qdel(O)
+ qdel(src)
+
if(istype(O, /obj/item/reagent_containers/glass/rag)) //You can't milk an udder with a rag.
attacked_with_item(O, user)
return
diff --git a/code/modules/vehicles/animal.dm b/code/modules/vehicles/animal.dm
new file mode 100644
index 00000000000..90057e8976e
--- /dev/null
+++ b/code/modules/vehicles/animal.dm
@@ -0,0 +1,46 @@
+/obj/vehicle/bike/climber
+ name = "climber"
+ desc = "A rideable beast of burden, large enough for one adult rider only but perfectly adapted for the rough terrain on Adhomai. This one has a saddle mounted on it."
+ icon = 'icons/mob/npc/adhomai_48.dmi'
+ icon_state = "climber_s"
+ bike_icon = "climber_s"
+ desc_info = "Click-drag yourself onto the animal to climb onto it.
\
+ - Click-drag it onto yourself to access its mounted storage.
"
+ pixel_x = -8
+ mob_offset_y = 8
+ kickstand = FALSE
+ on = TRUE
+ land_speed = 2
+ space_speed = 0
+
+ health = 100
+
+ can_hover = FALSE
+ organic = TRUE
+
+ storage_type = /obj/item/storage/toolbox/bike_storage/saddle
+ corpse = /mob/living/simple_animal/climber/saddle
+
+/obj/vehicle/bike/climber/setup_vehicle()
+ ..()
+ on = TRUE
+ set_light(0)
+
+/obj/vehicle/bike/climber/CtrlClick(var/mob/user)
+ return
+
+/obj/vehicle/bike/climber/toggle_engine(var/mob/user)
+ return
+
+/obj/vehicle/bike/climber/kickstand(var/mob/user)
+ return
+
+/obj/item/storage/toolbox/bike_storage/saddle
+ name = "saddle storage"
+
+/obj/item/saddle
+ name = "saddle"
+ desc = "A structure used to ride animals."
+ icon = 'icons/obj/saddle.dmi'
+ icon_state = "saddle"
+ w_class = ITEMSIZE_NORMAL
\ No newline at end of file
diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm
index 7fae423dec9..beab86dc104 100644
--- a/code/modules/vehicles/vehicle.dm
+++ b/code/modules/vehicles/vehicle.dm
@@ -40,6 +40,8 @@
var/load_offset_y = 0 //pixel_y offset for item overlay
var/mob_offset_y = 0 //pixel_y offset for mob overlay
var/flying = FALSE
+ var/organic = FALSE
+ var/corpse = null
//-------------------------------------------
// Standard procs
@@ -54,7 +56,7 @@
/obj/vehicle/Move()
if(world.time > l_move_time + move_delay)
var/old_loc = get_turf(src)
- if(on && powered && cell.charge < charge_use)
+ if(on && powered && cell.charge < charge_use && !organic)
turn_off()
var/init_anc = anchored
@@ -66,7 +68,7 @@
set_dir(get_dir(old_loc, loc))
anchored = init_anc
- if(on && powered)
+ if(on && powered && !organic)
cell.use(charge_use)
//Dummy loads do not have to be moved as they are just an overlay
@@ -85,17 +87,17 @@
/obj/vehicle/attackby(obj/item/W as obj, mob/user as mob)
if(istype(W, /obj/item/device/hand_labeler))
return
- if(W.isscrewdriver())
+ if(W.isscrewdriver() && !organic)
if(!locked)
open = !open
update_icon()
to_chat(user, "Maintenance panel is now [open ? "opened" : "closed"].")
- else if(W.iscrowbar() && cell && open)
+ else if(W.iscrowbar() && cell && open && !organic)
remove_cell(user)
- else if(istype(W, /obj/item/cell) && !cell && open)
+ else if(istype(W, /obj/item/cell) && !cell && open && !organic)
insert_cell(W, user)
- else if(W.iswelder())
+ else if(W.iswelder() && !organic)
var/obj/item/weldingtool/T = W
if(T.welding)
if(health < maxhealth)
@@ -125,7 +127,7 @@
health -= Proj.get_structure_damage()
..()
- if (prob(20))
+ if (prob(20) && !organic)
spark(src, 5, alldirs)
healthcheck()
@@ -149,6 +151,8 @@
return
/obj/vehicle/emp_act(severity)
+ if(organic)
+ return
var/was_on = on
stat |= EMPED
var/obj/effect/overlay/pulse2 = new /obj/effect/overlay(src.loc)
@@ -165,6 +169,8 @@
addtimer(CALLBACK(src, PROC_REF(post_emp), was_on), severity * 300)
/obj/vehicle/proc/post_emp(was_on)
+ if(organic)
+ return
stat &= ~EMPED
if(was_on)
turn_on()
@@ -182,7 +188,7 @@
/obj/vehicle/proc/turn_on()
if(stat)
return 0
- if(powered && cell.charge < charge_use)
+ if(powered && cell.charge < charge_use && !organic)
return 0
on = 1
set_light(initial(light_range))
@@ -195,36 +201,45 @@
update_icon()
/obj/vehicle/emag_act(var/remaining_charges, mob/user as mob)
+ if(organic)
+ return FALSE
if(!emagged)
emagged = 1
if(locked)
locked = 0
- to_chat(user, "You bypass [src]'s controls.")
+ to_chat(user, "You bypass \the [src]'s controls.")
return 1
/obj/vehicle/proc/explode()
- visible_message("[src] blows apart!")
var/turf/Tsec = get_turf(src)
+ if(organic)
+ visible_message(SPAN_WARNING("\The [src] dies!"))
+ var/body = new corpse(Tsec)
+ if(isliving(body))
+ var/mob/living/M = body
+ M.death()
+ else
+ visible_message(SPAN_WARNING("\The [src] blows apart!"))
- new /obj/item/stack/rods(Tsec)
- new /obj/item/stack/rods(Tsec)
- new /obj/item/stack/cable_coil/cut(Tsec)
+ new /obj/item/stack/rods(Tsec)
+ new /obj/item/stack/rods(Tsec)
+ new /obj/item/stack/cable_coil/cut(Tsec)
- if(cell)
- cell.forceMove(Tsec)
- cell.update_icon()
- cell = null
+ if(cell)
+ cell.forceMove(Tsec)
+ cell.update_icon()
+ cell = null
+
+ //stuns people who are thrown off a train that has been blown up
+
+
+ new /obj/effect/gibspawner/robot(Tsec)
+ new /obj/effect/decal/cleanable/blood/oil(src.loc)
- //stuns people who are thrown off a train that has been blown up
if(istype(load, /mob/living))
var/mob/living/M = load
M.apply_effects(5, 5)
-
unload()
-
- new /obj/effect/gibspawner/robot(Tsec)
- new /obj/effect/decal/cleanable/blood/oil(src.loc)
-
qdel(src)
/obj/vehicle/proc/healthcheck()
diff --git a/html/changelogs/alberyk-riding.yml b/html/changelogs/alberyk-riding.yml
new file mode 100644
index 00000000000..cd4d66b42b5
--- /dev/null
+++ b/html/changelogs/alberyk-riding.yml
@@ -0,0 +1,7 @@
+author: Alberyk, Kyres1
+
+delete-after: True
+
+changes:
+ - rscadd: "Added three more adhomian animals: the climber, the snow strider and the nose-horn."
+ - rscadd: "You can ride the climber if you use a saddle on it."
diff --git a/icons/mob/npc/adhomai_48.dmi b/icons/mob/npc/adhomai_48.dmi
index 1b1a788d078..29e3c7c9249 100644
Binary files a/icons/mob/npc/adhomai_48.dmi and b/icons/mob/npc/adhomai_48.dmi differ
diff --git a/icons/mob/npc/adhomai_96.dmi b/icons/mob/npc/adhomai_96.dmi
new file mode 100644
index 00000000000..630b640fbc5
Binary files /dev/null and b/icons/mob/npc/adhomai_96.dmi differ
diff --git a/icons/obj/saddle.dmi b/icons/obj/saddle.dmi
new file mode 100644
index 00000000000..374893e0891
Binary files /dev/null and b/icons/obj/saddle.dmi differ
diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_sole_rock_nomad.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_sole_rock_nomad.dm
new file mode 100644
index 00000000000..50af5bc6b0d
--- /dev/null
+++ b/maps/random_ruins/exoplanets/adhomai/adhomai_sole_rock_nomad.dm
@@ -0,0 +1,48 @@
+/datum/map_template/ruin/exoplanet/adhomai_sole_rock_nomad
+ name = "Rock Nomad"
+ id = "adhomai_sole_rock_nomad"
+ description = "A single rock nomad wandering around."
+
+ spawn_weight = 1
+ spawn_cost = 2
+ sectors = list(SECTOR_SRANDMARR)
+ suffixes = list("adhomai/adhomai_sole_rock_nomad.dmm")
+
+//ghost roles
+
+/datum/ghostspawner/human/adhomai_sole_rock_nomad
+ short_name = "adhomai_rock_nomad"
+ name = "Rock Nomad"
+ desc = "As a Rock Nomad, roam Adhomai on your trusty climber."
+ tags = list("External")
+
+ spawnpoints = list("adhomai_rock_nomad")
+ max_count = 1
+
+ extra_languages = list(LANGUAGE_DELVAHII)
+ outfit = /datum/outfit/admin/adhomai_sole_rock_nomad
+ possible_species = list(SPECIES_TAJARA_ZHAN)
+ allow_appearance_change = APPEARANCE_PLASTICSURGERY
+
+ origin_restriction = list(/singleton/origin_item/origin/rhazar)
+ culture_restriction = list(/singleton/origin_item/culture/adhomian)
+
+ assigned_role = "Rock Nomad"
+ special_role = "Rock Nomad"
+ respawn_flag = null
+
+/datum/outfit/admin/adhomai_sole_rock_nomad
+ name = "Rock Nomad"
+
+ uniform = /obj/item/clothing/under/pants/tajaran
+ head = /obj/item/clothing/head/tajaran/fur
+ suit = /obj/item/clothing/suit/storage/toggle/tajaran/wool
+ shoes = /obj/item/clothing/shoes/tajara/footwraps
+ l_ear = null
+
+ id = null
+ l_pocket = /obj/item/ammo_magazine/boltaction
+ r_pocket = /obj/item/ammo_magazine/boltaction
+
+ belt = /obj/item/material/knife/trench
+ back = /obj/item/gun/projectile/shotgun/pump/rifle
diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_sole_rock_nomad.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_sole_rock_nomad.dmm
new file mode 100644
index 00000000000..4d8b0a9d79a
--- /dev/null
+++ b/maps/random_ruins/exoplanets/adhomai/adhomai_sole_rock_nomad.dmm
@@ -0,0 +1,82 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"c" = (
+/turf/simulated/floor/exoplanet/snow{
+ temperature = 268.15
+ },
+/area/exoplanet/adhomai)
+"m" = (
+/obj/effect/ghostspawpoint{
+ identifier = "adhomai_sole_rock_nomad";
+ name = "igs - adhomai_sole_rock_nomad"
+ },
+/turf/simulated/floor/exoplanet/snow{
+ temperature = 268.15
+ },
+/area/exoplanet/adhomai)
+"s" = (
+/obj/structure/flora/grass/adhomai,
+/turf/simulated/floor/exoplanet/snow{
+ temperature = 268.15
+ },
+/area/exoplanet/adhomai)
+"x" = (
+/obj/structure/flora/bush/adhomai,
+/turf/simulated/floor/exoplanet/snow{
+ temperature = 268.15
+ },
+/area/exoplanet/adhomai)
+"z" = (
+/obj/item/stack/medical/bruise_pack/full,
+/obj/item/stack/medical/bruise_pack/full,
+/turf/simulated/floor/exoplanet/snow{
+ temperature = 268.15
+ },
+/area/exoplanet/adhomai)
+"M" = (
+/obj/vehicle/bike/climber,
+/turf/simulated/floor/exoplanet/snow{
+ temperature = 268.15
+ },
+/area/exoplanet/adhomai)
+"P" = (
+/obj/structure/bonfire/light_up,
+/turf/simulated/floor/exoplanet/snow{
+ temperature = 268.15
+ },
+/area/exoplanet/adhomai)
+
+(1,1,1) = {"
+c
+c
+c
+s
+c
+"}
+(2,1,1) = {"
+c
+M
+z
+c
+c
+"}
+(3,1,1) = {"
+c
+m
+P
+c
+c
+"}
+(4,1,1) = {"
+c
+c
+c
+c
+c
+"}
+(5,1,1) = {"
+c
+x
+c
+c
+c
+"}
diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm
index 7a042e7df04..6c1ffc1ac38 100644
--- a/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm
+++ b/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm
@@ -294,6 +294,12 @@
temperature = 268.15
},
/area/adhomai_village)
+"pz" = (
+/mob/living/simple_animal/climber,
+/turf/simulated/floor/wood{
+ temperature = 268.15
+ },
+/area/adhomai_village)
"pK" = (
/obj/structure/closet/crate/hydroponics,
/obj/item/seeds/earthenroot,
@@ -992,8 +998,9 @@
/area/adhomai_village)
"Vv" = (
/obj/structure/table/wood,
-/obj/item/device/flashlight/lantern,
/obj/effect/decal/cleanable/dirt,
+/obj/item/saddle,
+/obj/item/device/flashlight/lantern,
/turf/simulated/floor/wood{
temperature = 268.15
},
@@ -1721,7 +1728,7 @@ Gu
IJ
Wa
BZ
-TQ
+pz
TQ
zf
Gu
diff --git a/maps/random_ruins/exoplanets/adhomai/ala_base.dmm b/maps/random_ruins/exoplanets/adhomai/ala_base.dmm
index 03e259f820c..68347e54fc7 100644
--- a/maps/random_ruins/exoplanets/adhomai/ala_base.dmm
+++ b/maps/random_ruins/exoplanets/adhomai/ala_base.dmm
@@ -1669,7 +1669,7 @@ DB
DB
DB
DB
-yB
+EP
"}
(6,1,1) = {"
hT
@@ -1708,7 +1708,7 @@ DB
DB
DB
DB
-yB
+EP
"}
(7,1,1) = {"
vi
@@ -1747,7 +1747,7 @@ DB
DB
DB
DB
-yB
+EP
"}
(8,1,1) = {"
vi
@@ -1786,7 +1786,7 @@ DB
DB
DB
DB
-yB
+EP
"}
(9,1,1) = {"
vi
@@ -1825,7 +1825,7 @@ DB
DB
DB
DB
-yB
+EP
"}
(10,1,1) = {"
vi
@@ -1864,7 +1864,7 @@ DB
DB
DB
DB
-yB
+EP
"}
(11,1,1) = {"
vi
@@ -1903,7 +1903,7 @@ DB
DB
DB
DB
-yB
+EP
"}
(12,1,1) = {"
Fo
@@ -1942,7 +1942,7 @@ Hq
Hq
Hq
DB
-yB
+EP
"}
(13,1,1) = {"
Fo
@@ -1981,7 +1981,7 @@ LV
uM
Hq
DB
-yB
+EP
"}
(14,1,1) = {"
vi
@@ -2020,7 +2020,7 @@ lr
oA
Hq
DB
-yB
+EP
"}
(15,1,1) = {"
vi
@@ -2059,7 +2059,7 @@ oA
oA
Hq
DB
-yB
+EP
"}
(16,1,1) = {"
vi
@@ -2098,7 +2098,7 @@ oA
vJ
Hq
DB
-yB
+EP
"}
(17,1,1) = {"
vi
@@ -2137,7 +2137,7 @@ oA
ES
Hq
DB
-yB
+EP
"}
(18,1,1) = {"
vi
@@ -2176,7 +2176,7 @@ dg
uK
Hq
DB
-yB
+EP
"}
(19,1,1) = {"
vi
@@ -2215,7 +2215,7 @@ DB
DB
DB
DB
-yB
+EP
"}
(20,1,1) = {"
vi
@@ -2254,7 +2254,7 @@ DB
DB
DB
DB
-yB
+EP
"}
(21,1,1) = {"
vi
@@ -2293,7 +2293,7 @@ DB
DB
DB
DB
-yB
+EP
"}
(22,1,1) = {"
vi
@@ -2332,7 +2332,7 @@ DB
DB
DB
DB
-yB
+EP
"}
(23,1,1) = {"
vi
@@ -2371,13 +2371,13 @@ DB
DB
DB
DB
-yB
+EP
"}
(24,1,1) = {"
vi
vi
vi
-yB
+EP
DB
DB
DB
@@ -2388,7 +2388,7 @@ nE
yS
yS
DB
-yB
+EP
rp
EN
EN
@@ -2410,13 +2410,13 @@ DB
DB
DB
DB
-yB
+EP
"}
(25,1,1) = {"
vi
vi
ZQ
-yB
+EP
DB
DB
DB
@@ -2427,7 +2427,7 @@ oA
Ed
yS
DB
-yB
+EP
DB
DB
DB
@@ -2449,13 +2449,13 @@ DB
DB
DB
DB
-yB
+EP
"}
(26,1,1) = {"
vi
vi
vi
-yB
+EP
DB
DB
DB
@@ -2466,7 +2466,7 @@ oA
eo
yS
DB
-yB
+EP
DB
DB
DB
@@ -2488,13 +2488,13 @@ DB
DB
DB
DB
-yB
+EP
"}
(27,1,1) = {"
vi
vi
vi
-yB
+EP
DB
DB
jH
@@ -2505,7 +2505,7 @@ sD
bR
yS
DB
-yB
+EP
DB
DB
DB
@@ -2527,13 +2527,13 @@ DB
DB
DB
DB
-yB
+EP
"}
(28,1,1) = {"
vi
vi
vi
-yB
+EP
DB
DB
DB
@@ -2544,7 +2544,7 @@ yS
yS
yS
DB
-yB
+EP
DB
DB
DB
@@ -2566,13 +2566,13 @@ DB
DB
DB
DB
-yB
+EP
"}
(29,1,1) = {"
vi
hT
vi
-yB
+EP
DB
DB
DB
@@ -2583,7 +2583,7 @@ DB
DB
DB
DB
-yB
+EP
DB
DB
DB
@@ -2605,7 +2605,7 @@ DB
DB
DB
DB
-yB
+EP
"}
(30,1,1) = {"
vi
diff --git a/maps/random_ruins/exoplanets/adhomai/nka_base.dmm b/maps/random_ruins/exoplanets/adhomai/nka_base.dmm
index d932d9c11e2..8a68e67b22a 100644
--- a/maps/random_ruins/exoplanets/adhomai/nka_base.dmm
+++ b/maps/random_ruins/exoplanets/adhomai/nka_base.dmm
@@ -117,6 +117,14 @@
temperature = 268.15
},
/area/exoplanet/adhomai)
+"ji" = (
+/obj/machinery/light/small{
+ dir = 4
+ },
+/turf/simulated/floor/exoplanet/snow{
+ temperature = 268.15
+ },
+/area/nka_base)
"jN" = (
/obj/structure/table/rack,
/obj/item/shovel,
@@ -337,6 +345,22 @@
temperature = 268.15
},
/area/exoplanet/adhomai)
+"vl" = (
+/obj/item/reagent_containers/glass/bucket/wood{
+ pixel_x = 9
+ },
+/turf/simulated/floor/wood{
+ temperature = 268.15
+ },
+/area/nka_base)
+"vs" = (
+/obj/structure/table/wood,
+/obj/item/saddle,
+/obj/item/saddle,
+/turf/simulated/floor/wood{
+ temperature = 268.15
+ },
+/area/nka_base)
"vQ" = (
/obj/structure/closet/secure_closet/cabinet{
req_access = list(213);
@@ -836,6 +860,19 @@
temperature = 268.15
},
/area/nka_base)
+"Yv" = (
+/obj/structure/railing/fence,
+/obj/structure/railing/fence{
+ dir = 8
+ },
+/obj/structure/railing/fence{
+ dir = 4
+ },
+/obj/vehicle/bike/climber,
+/turf/simulated/floor/wood{
+ temperature = 268.15
+ },
+/area/nka_base)
"YC" = (
/obj/machinery/light/small{
dir = 8
@@ -971,6 +1008,7 @@ vi
DL
DL
DL
+CO
EK
EK
EK
@@ -998,8 +1036,7 @@ EK
EK
EK
EK
-EK
-EK
+CO
"}
(5,1,1) = {"
DL
@@ -1209,10 +1246,10 @@ gU
DL
DL
DL
-gU
-EK
+CO
EK
EK
+CO
DL
DL
DL
@@ -1438,7 +1475,7 @@ EP
EP
DL
DL
-DL
+yx
DL
DL
gU
@@ -1471,9 +1508,9 @@ DL
EP
EP
DL
-DL
-DL
-DL
+mB
+mB
+Yv
DL
gU
"}
@@ -1505,9 +1542,9 @@ DL
EP
EP
DL
-DL
-DL
-DL
+mB
+mB
+Yv
DL
gU
"}
@@ -1539,9 +1576,9 @@ DL
EP
EP
DL
-DL
-DL
-pV
+vl
+mB
+Yv
DL
gU
"}
@@ -1573,9 +1610,9 @@ DL
EP
EP
DL
-DL
-DL
-DL
+vs
+mB
+Yv
DL
gU
"}
@@ -1608,7 +1645,7 @@ EP
EP
DL
DL
-DL
+ji
DL
DL
gU
@@ -1821,6 +1858,7 @@ gU
DL
pV
DL
+CO
EK
EK
EK
@@ -1848,8 +1886,7 @@ EK
EK
EK
EK
-EK
-EK
+CO
"}
(30,1,1) = {"
DL