diff --git a/aurorastation.dme b/aurorastation.dme index 0e5e8b43cc8..5a0747ebe85 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1187,6 +1187,7 @@ #include "code\game\objects\structures\crates_lockers\closets\secure\security.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\service.dm" #include "code\game\objects\structures\crates_lockers\crates\gear_loadout.dm" +#include "code\game\objects\structures\flora\adhomai.dm" #include "code\game\objects\structures\flora\generic_flora.dm" #include "code\game\objects\structures\flora\grove.dm" #include "code\game\objects\structures\flora\jungle.dm" diff --git a/code/game/objects/effects/decals/snow.dm b/code/game/objects/effects/decals/snow.dm index 3b93dfd0b7d..f188077632d 100644 --- a/code/game/objects/effects/decals/snow.dm +++ b/code/game/objects/effects/decals/snow.dm @@ -14,3 +14,4 @@ /obj/effect/floor_decal/snowdrift/large icon = 'icons/turf/decals/snow64x32.dmi' + pixel_x = -16 diff --git a/code/game/objects/structures/flora/adhomai.dm b/code/game/objects/structures/flora/adhomai.dm new file mode 100644 index 00000000000..514734bbc56 --- /dev/null +++ b/code/game/objects/structures/flora/adhomai.dm @@ -0,0 +1,40 @@ +//tree + +/obj/structure/flora/tree/adhomai + icon = 'icons/obj/flora/adhomai_trees.dmi' + icon_state = "tree1" + pixel_x = -32 + +/obj/structure/flora/tree/adhomai/Initialize(mapload) + . = ..() + icon_state = "tree[rand(1, 13)]" + +//bushes +/obj/structure/flora/bush/adhomai + icon = 'icons/obj/flora/adhomai_flora.dmi' + icon_state = "bush1" + anchored = 1 + +/obj/structure/flora/bush/adhomai/Initialize(mapload) + . = ..() + icon_state = "bush[rand(1, 7)]" + +//grass + +/obj/structure/flora/grass/adhomai + icon = 'icons/obj/flora/adhomai_flora.dmi' + icon_state = "grass1" + +/obj/structure/flora/grass/adhomai/Initialize(mapload) + . = ..() + icon_state = "grass[rand(1, 4)]" + +//rock + +/obj/structure/flora/rock/adhomai + icon = 'icons/obj/flora/adhomai_flora.dmi' + icon_state = "rock1" + +/obj/structure/flora/rock/adhomai/Initialize(mapload) + . = ..() + icon_state = "rock[rand(1, 5)]" \ No newline at end of file diff --git a/code/modules/background/space_sectors/badlands.dm b/code/modules/background/space_sectors/badlands.dm index 58a8b6bdbf9..e3e2c3ef2c3 100644 --- a/code/modules/background/space_sectors/badlands.dm +++ b/code/modules/background/space_sectors/badlands.dm @@ -41,7 +41,7 @@ almost perpetual snowfall and extremely low temperatures. It is currently divided between three factions involved in a cold war: the People's Republic of Adhomai, the Democratic People's \ Republic of Adhomai, and the New Kingdom of Adhomai." skybox_icon = "srandmarr" - possible_exoplanets = list(/obj/effect/overmap/visitable/sector/exoplanet/barren/asteroid, /obj/effect/overmap/visitable/sector/exoplanet/barren/aethemir, /obj/effect/overmap/visitable/sector/exoplanet/barren/raskara, /obj/effect/overmap/visitable/sector/exoplanet/barren/azmar, /obj/effect/overmap/visitable/sector/exoplanet/lava/sahul, /obj/effect/overmap/visitable/sector/exoplanet/adhomai) + possible_exoplanets = list(/obj/effect/overmap/visitable/sector/exoplanet/barren/aethemir, /obj/effect/overmap/visitable/sector/exoplanet/barren/raskara, /obj/effect/overmap/visitable/sector/exoplanet/barren/azmar, /obj/effect/overmap/visitable/sector/exoplanet/lava/sahul, /obj/effect/overmap/visitable/sector/exoplanet/adhomai) cargo_price_coef = list("nt" = 1.2, "hpi" = 1.2, "zhu" = 1.2, "een" = 1.2, "get" = 1.2, "arz" = 1.2, "blm" = 1.2, "iac" = 1.2, "zsc" = 0.5, "vfc" = 1.2, "bis" = 1.2, "xmg" = 1.2, "npi" = 1.2) starlight_color = "#B9E8EA" sector_lobby_art = list('icons/misc/titlescreens/lore/cold_dawn.dmi') diff --git a/code/modules/clothing/head/xenos/tajara.dm b/code/modules/clothing/head/xenos/tajara.dm index 2a94577a3bf..75fb4bbf6a6 100644 --- a/code/modules/clothing/head/xenos/tajara.dm +++ b/code/modules/clothing/head/xenos/tajara.dm @@ -109,13 +109,13 @@ insignia." /obj/item/clothing/head/tajaran/nka_cap - name = "adhomai imperial army service cap" - desc = "A simple service cap worn by soldiers of the Adhomai Imperial Army." + name = "imperial adhomian army service cap" + desc = "A simple service cap worn by soldiers of the Imperial Adhomian Army." icon_state = "nkahat" item_state = "nkahat" /obj/item/clothing/head/tajaran/nka_cap/commander - desc = "A fancy service cap worn by officer of the Adhomai Imperial Army." + desc = "A fancy service cap worn by officer of the Imperial Adhomian Army." icon_state = "nka_commander_hat" item_state = "nka_commander_hat" diff --git a/code/modules/maps/planet_types/lore/srandmarr.dm b/code/modules/maps/planet_types/lore/srandmarr.dm index 05c1b1a27b3..6ce337ae7fb 100644 --- a/code/modules/maps/planet_types/lore/srandmarr.dm +++ b/code/modules/maps/planet_types/lore/srandmarr.dm @@ -26,7 +26,6 @@ name = "Az'Mar" desc = "A small planet with a caustic shale crust. The surface is extremely hot and dense." color = "#4a3f41" - color = "#dcdcdc" rock_colors = null plant_colors = null rock_colors = list("#4a3f41") @@ -72,6 +71,7 @@ generated_name = FALSE ring_chance = 0 possible_random_ruins = list (/datum/map_template/ruin/exoplanet/raskara_ritual, /datum/map_template/ruin/exoplanet/raskara_okon, /datum/map_template/ruin/exoplanet/raskara_wreck, /datum/map_template/ruin/exoplanet/pra_exploration_drone) + place_near_main = list(3, 3) /obj/effect/overmap/visitable/sector/exoplanet/barren/raskara/get_surface_color() return "#373737" @@ -108,7 +108,7 @@ plant_colors = null possible_themes = list(/datum/exoplanet_theme/mountains/adhomai) map_generators = list(/datum/random_map/noise/exoplanet/snow/adhomai, /datum/random_map/noise/ore/rich) - features_budget = 3 + features_budget = 4 surface_color = "#e8faff" water_color = "#b5dfeb" generated_name = FALSE @@ -116,6 +116,7 @@ /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_bar, /datum/map_template/ruin/exoplanet/adhomai_war_memorial, /datum/map_template/ruin/exoplanet/adhomai_raskara_ritual, /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) + place_near_main = list(2, 2) /obj/effect/overmap/visitable/sector/exoplanet/adhomai/pre_ruin_preparation() var/landing_faction = pick("People's Republic of Adhomai", "Democratic People's Republic of Adhomai", "New Kingdom of Adhomai") @@ -148,7 +149,7 @@ return HABITABILITY_IDEAL /obj/effect/overmap/visitable/sector/exoplanet/adhomai/generate_map() - if(prob(50)) + if(prob(75)) lightlevel = rand(3,10)/10 ..() @@ -195,16 +196,22 @@ new /obj/structure/flora/rock/ice(T) if(3) if(prob(50)) - new /obj/structure/flora/grass/both(T) + new /obj/structure/flora/grass/adhomai(T) if(4) if(prob(50)) - new /obj/structure/flora/bush(T) + new /obj/structure/flora/bush/adhomai(T) if(5) if(prob(15)) - new /obj/structure/flora/tree/dead(T) + new /obj/structure/flora/tree/adhomai(T) if(6) if(prob(15)) - new /obj/structure/flora/grass/green(T) + new /obj/structure/flora/rock/adhomai(T) + if(7) + if(prob(15)) + new /obj/effect/floor_decal/snowdrift(T) + if(8) + if(prob(10)) + new /obj/effect/floor_decal/snowdrift/large(T) /area/exoplanet/adhomai name = "Adhomian Wilderness" diff --git a/code/modules/mob/living/simple_animal/friendly/adhomai.dm b/code/modules/mob/living/simple_animal/friendly/adhomai.dm index 1ad284fa036..d7ce60ea384 100644 --- a/code/modules/mob/living/simple_animal/friendly/adhomai.dm +++ b/code/modules/mob/living/simple_animal/friendly/adhomai.dm @@ -16,6 +16,9 @@ canbrush = TRUE faction = "Adhomai" gender = FEMALE + maxHealth = 50 + health = 50 + mob_size = 5 var/eggsleft = 0 /mob/living/simple_animal/ice_tunneler/attackby(var/obj/item/O as obj, var/mob/user as mob) @@ -57,6 +60,10 @@ icon_state = "tunneler_baby" icon_living = "tunneler_baby" icon_dead = "tunneler_baby_dead" + maxHealth = 10 + health = 10 + mob_size = 2 + meat_amount = 1 /mob/living/simple_animal/fatshouter name = "fatshouter" @@ -141,4 +148,10 @@ icon_state = "rafama_baby" icon_living = "rafama_baby" icon_dead = "rafama_baby_dead" - gender = MALE \ No newline at end of file + gender = MALE + maxHealth = 30 + health = 30 + mob_size = 5 + melee_damage_lower = 5 + melee_damage_upper = 5 + meat_amount = 2 \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/hostile/pra.dm b/code/modules/mob/living/simple_animal/hostile/pra.dm index f8957f19fb8..43a6a9c51a2 100644 --- a/code/modules/mob/living/simple_animal/hostile/pra.dm +++ b/code/modules/mob/living/simple_animal/hostile/pra.dm @@ -152,10 +152,13 @@ emote_hear = list("buzzes","beeps") speak = list("Hadii's grace, comrades.", "The stars belong to the People's Republic of Adhomai!", "The quest for knowledge must continue!") emote_see = list("beeps curiously", "whirrs softly", "scans its surroundings") + attack_emote = "beeps menacingly at" destroy_surroundings = FALSE universal_speak = TRUE universal_understand = TRUE + speak_chance = 5 + simple_default_language = LANGUAGE_SIIK_MAAS mob_size = 3 @@ -192,6 +195,8 @@ emote_sounds = list('sound/effects/creatures/PRA_drone.ogg') + psi_pingable = FALSE + var/datum/effect_system/ion_trail/ion_trail /mob/living/simple_animal/hostile/retaliate/pra_exploration_drone/Allow_Spacemove(var/check_drift = 0) diff --git a/code/modules/vehicles/bike.dm b/code/modules/vehicles/bike.dm index 26a63b1d80f..b375f94e286 100644 --- a/code/modules/vehicles/bike.dm +++ b/code/modules/vehicles/bike.dm @@ -323,7 +323,7 @@ icon_state = "snow_on" bike_icon = "snow" - land_speed = 3 + land_speed = 2 protection_percent = 10 can_hover = FALSE var/paid = FALSE @@ -359,7 +359,7 @@ icon_state = "snow_on" bike_icon = "snow" - land_speed = 3 + land_speed = 2 space_speed = 0 protection_percent = 10 can_hover = FALSE \ No newline at end of file diff --git a/html/changelogs/alberyk-adhomaigrowup.yml b/html/changelogs/alberyk-adhomaigrowup.yml new file mode 100644 index 00000000000..b906b8c09db --- /dev/null +++ b/html/changelogs/alberyk-adhomaigrowup.yml @@ -0,0 +1,9 @@ +author: Alberyk, Kyres1 + +delete-after: True + +changes: + - rscadd: "Added Adhomian flora." + - tweak: "Added the orion and the independent freight to s'rand'marr." + - tweak: "Regular asteroids no longer spawn in s'rand'marr." + - tweak: "Adhomai and Raskara now spawn closer to the ship." diff --git a/icons/obj/flora/adhomai_flora.dmi b/icons/obj/flora/adhomai_flora.dmi new file mode 100644 index 00000000000..827084c3ea0 Binary files /dev/null and b/icons/obj/flora/adhomai_flora.dmi differ diff --git a/icons/obj/flora/adhomai_trees.dmi b/icons/obj/flora/adhomai_trees.dmi new file mode 100644 index 00000000000..27307f690a3 Binary files /dev/null and b/icons/obj/flora/adhomai_trees.dmi differ diff --git a/icons/obj/tajara_items.dmi b/icons/obj/tajara_items.dmi index 6364f5551ba..58aaac6a934 100644 Binary files a/icons/obj/tajara_items.dmi and b/icons/obj/tajara_items.dmi differ diff --git a/maps/away/away_site/tajara/peoples_station/peoples_station.dm b/maps/away/away_site/tajara/peoples_station/peoples_station.dm index eea395593a2..fe6c6d7ecb3 100644 --- a/maps/away/away_site/tajara/peoples_station/peoples_station.dm +++ b/maps/away/away_site/tajara/peoples_station/peoples_station.dm @@ -24,6 +24,8 @@ "Orbital Fleet Fang" = list("nav_hangar_peoples_station_fang"), "Intrepid" = list("nav_peoples_station_dockintrepid") ) + comms_support = TRUE + comms_name = "people's station" /obj/effect/shuttle_landmark/nav_peoples_station/dockintrepid name = "People's Space Station Intrepid Docking" diff --git a/maps/away/away_site/tajara/peoples_station/peoples_station.dmm b/maps/away/away_site/tajara/peoples_station/peoples_station.dmm index 2c776e89aa0..9598997c39b 100644 --- a/maps/away/away_site/tajara/peoples_station/peoples_station.dmm +++ b/maps/away/away_site/tajara/peoples_station/peoples_station.dmm @@ -1869,6 +1869,16 @@ temperature = 278.15 }, /area/peoples_station/commissar_quarters) +"iq" = ( +/obj/machinery/telecomms/allinone/ship, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled{ + name = "cooled floor"; + temperature = 278 + }, +/area/peoples_station/solars) "ir" = ( /obj/effect/floor_decal/corner/red{ dir = 6 @@ -4860,11 +4870,11 @@ }, /area/peoples_station/training) "vH" = ( -/obj/machinery/appliance/cooker/fryer, /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/sign/flag/pra{ pixel_x = 32 }, +/obj/machinery/appliance/cooker/oven, /turf/simulated/floor/tiled/white{ temperature = 278.15 }, @@ -10224,8 +10234,16 @@ }, /area/peoples_station/training) "UH" = ( -/turf/simulated/wall/shuttle/raider, -/area/space) +/obj/machinery/door/airlock/hatch{ + name = "Telecomms"; + req_access = list(209) + }, +/obj/structure/plasticflaps/airtight, +/turf/simulated/floor/tiled{ + name = "cooled floor"; + temperature = 278 + }, +/area/peoples_station/solars) "UI" = ( /obj/structure/cable/green{ d2 = 4; @@ -42842,8 +42860,8 @@ nz HK pr Kn -Kn -Kn +nU +nU nU He PX @@ -43099,8 +43117,8 @@ nz EI pr Kn -Kn -Kn +nU +iq nU FH Dk @@ -43355,8 +43373,8 @@ pr pr pr pr -UH -UH +nU +nU UH nU jO diff --git a/maps/away/ships/orion/orion_express_ship.dm b/maps/away/ships/orion/orion_express_ship.dm index 7eb3fe81a47..4e7d26ce58c 100644 --- a/maps/away/ships/orion/orion_express_ship.dm +++ b/maps/away/ships/orion/orion_express_ship.dm @@ -2,7 +2,7 @@ name = "Orion Express Mobile Station" description = "The Traveler-class mobile station is a relatively old design, but nonetheless venerable and one of the building blocks of interstellar commerce. While relatively small, is a treasured asset in the Orion Express corporation's fleet, and has been referred to as “the gas station of the stars”, offering food, supplies, and fuel to anyone who may need it." suffixes = list("ships/orion/orion_express_ship.dmm") - sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS) + sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_SRANDMARR) spawn_weight = 1 ship_cost = 1 id = "orion_express_ship" diff --git a/maps/away/ships/tramp_freighter/tramp_freighter.dm b/maps/away/ships/tramp_freighter/tramp_freighter.dm index 6e8434ad33c..41fc3d4bd03 100644 --- a/maps/away/ships/tramp_freighter/tramp_freighter.dm +++ b/maps/away/ships/tramp_freighter/tramp_freighter.dm @@ -2,7 +2,7 @@ name = "Tramp Freighter" description = "A freighter of mixed repute, the Catspaw-class is a rare independent design, and a favorite of small-scale freight businesses. It has a shielded cargo bay and an internal hangar, capable of accommodating a small shuttle. Its other features, however, are lacking - with cramped crew amenities and no defenses to speak of, the Catspaw is risky to operate in unpoliced space." suffixes = list("ships/tramp_freighter/tramp_freighter.dmm") - sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_NEW_ANKARA, SECTOR_BADLANDS, SECTOR_AEMAQ) + sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_NEW_ANKARA, SECTOR_BADLANDS, SECTOR_AEMAQ, SECTOR_SRANDMARR) spawn_weight = 1 ship_cost = 1 id = "tramp_freighter" @@ -71,7 +71,7 @@ desc = "An inefficient design of ultra-light shuttle known as the Wisp-class. Its only redeeming features are the extreme cheapness of the design and the ease of finding replacement parts. Manufactured by Hephaestus. This one's transponder identifies it as belonging to an independent freighter." shuttle = "Freight Shuttle" icon_state = "shuttle_grey" - moving_state = "shuttle_grey_moving" + moving_state = "shuttle_grey_moving" max_speed = 1/(3 SECONDS) burn_delay = 2 SECONDS vessel_mass = 3000 //very inefficient pod diff --git a/maps/random_ruins/exoplanets/adhomai/abandoned_village.dmm b/maps/random_ruins/exoplanets/adhomai/abandoned_village.dmm index c9c36ccac2a..a789f7ca964 100644 --- a/maps/random_ruins/exoplanets/adhomai/abandoned_village.dmm +++ b/maps/random_ruins/exoplanets/adhomai/abandoned_village.dmm @@ -281,7 +281,7 @@ }, /area/exoplanet/adhomai) "FM" = ( -/obj/structure/flora/grass/brown, +/obj/structure/flora/grass/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, @@ -464,7 +464,7 @@ }, /area/exoplanet/adhomai) "YV" = ( -/obj/structure/flora/bush, +/obj/structure/flora/bush/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_amohdan.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_amohdan.dmm index 13035b6a29e..de08f5195ab 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_amohdan.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_amohdan.dmm @@ -15,13 +15,13 @@ }, /area/exoplanet/adhomai) "s" = ( -/obj/structure/flora/grass/brown, +/obj/structure/flora/grass/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, /area/exoplanet/adhomai) "x" = ( -/obj/structure/flora/bush, +/obj/structure/flora/bush/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_archeology.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_archeology.dmm index 9a0fc31a90d..48aa72a7c42 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_archeology.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_archeology.dmm @@ -114,7 +114,7 @@ }, /area/adhomai_archeology) "s" = ( -/obj/structure/flora/grass/brown, +/obj/structure/flora/grass/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, @@ -206,7 +206,7 @@ }, /area/adhomai_archeology) "H" = ( -/obj/structure/flora/bush, +/obj/structure/flora/bush/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, @@ -298,7 +298,7 @@ }, /area/adhomai_archeology) "X" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_battlefield.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_battlefield.dmm index b8b3296ebf8..42d7daa2cbb 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_battlefield.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_battlefield.dmm @@ -66,7 +66,7 @@ }, /area/exoplanet/adhomai) "x" = ( -/obj/structure/flora/bush, +/obj/structure/flora/bush/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, @@ -79,7 +79,7 @@ }, /area/exoplanet/adhomai) "C" = ( -/obj/structure/flora/grass/brown, +/obj/structure/flora/grass/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, @@ -128,7 +128,7 @@ }, /area/exoplanet/adhomai) "X" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_cavern.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_cavern.dmm index 5159a757188..7436ace591a 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_cavern.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_cavern.dmm @@ -17,13 +17,13 @@ /turf/simulated/mineral/adhomai, /area/exoplanet/adhomai) "s" = ( -/obj/structure/flora/grass/brown, +/obj/structure/flora/grass/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, /area/exoplanet/adhomai) "x" = ( -/obj/structure/flora/bush, +/obj/structure/flora/bush/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, @@ -42,7 +42,7 @@ /turf/simulated/floor/exoplanet/mineral/adhomai, /area/exoplanet/adhomai) "X" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_cavern_geist.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_cavern_geist.dmm index b39ca0a9a29..51c0d7ac4e8 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_cavern_geist.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_cavern_geist.dmm @@ -24,13 +24,13 @@ /turf/simulated/mineral/adhomai, /area/exoplanet/adhomai) "s" = ( -/obj/structure/flora/grass/brown, +/obj/structure/flora/grass/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, /area/exoplanet/adhomai) "x" = ( -/obj/structure/flora/bush, +/obj/structure/flora/bush/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, @@ -49,7 +49,7 @@ /turf/simulated/floor/exoplanet/mineral/adhomai, /area/exoplanet/adhomai) "X" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_chemical_testing.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_chemical_testing.dmm index f163cc471d9..cfe54550dd2 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_chemical_testing.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_chemical_testing.dmm @@ -18,7 +18,7 @@ }, /area/exoplanet/adhomai) "x" = ( -/obj/structure/flora/bush, +/obj/structure/flora/bush/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, @@ -29,8 +29,14 @@ temperature = 268.15 }, /area/exoplanet/adhomai) +"M" = ( +/obj/structure/flora/grass/adhomai, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/exoplanet/adhomai) "X" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, @@ -92,7 +98,7 @@ c c c c -c +M c c c @@ -288,7 +294,7 @@ c c c c -c +M c c c @@ -453,7 +459,7 @@ c c c c -c +M c c c @@ -688,7 +694,7 @@ c c c c -c +M c c c @@ -857,7 +863,7 @@ c c c c -c +M c c x @@ -971,7 +977,7 @@ X c c c -c +M c c c diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_deserter.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_deserter.dmm index e941ba09b49..0b55b96e2dc 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_deserter.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_deserter.dmm @@ -15,13 +15,13 @@ }, /area/exoplanet/adhomai) "s" = ( -/obj/structure/flora/grass/brown, +/obj/structure/flora/grass/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, /area/exoplanet/adhomai) "x" = ( -/obj/structure/flora/bush, +/obj/structure/flora/bush/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_hunting.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_hunting.dmm index ea5aac51c08..2c7734f147b 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_hunting.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_hunting.dmm @@ -132,7 +132,7 @@ }, /area/adhomai_hunting) "s" = ( -/obj/structure/flora/grass/brown, +/obj/structure/flora/grass/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, @@ -247,7 +247,7 @@ }, /area/adhomai_hunting) "H" = ( -/obj/structure/flora/bush, +/obj/structure/flora/bush/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, @@ -371,7 +371,7 @@ }, /area/adhomai_hunting) "X" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_minefield.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_minefield.dmm index a6efe6d7510..1e702ee4e56 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_minefield.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_minefield.dmm @@ -1,6 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "b" = ( -/obj/structure/flora/grass/both, +/obj/structure/flora/grass/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, @@ -29,13 +29,13 @@ }, /area/exoplanet/adhomai) "x" = ( -/obj/structure/flora/bush, +/obj/structure/flora/bush/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, /area/exoplanet/adhomai) "A" = ( -/obj/structure/flora/tree/pine, +/obj/structure/flora/tree/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, @@ -52,12 +52,6 @@ temperature = 268.15 }, /area/exoplanet/adhomai) -"X" = ( -/obj/structure/flora/tree/dead, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, -/area/exoplanet/adhomai) (1,1,1) = {" c @@ -207,7 +201,7 @@ c c c c -X +A m m m @@ -255,7 +249,7 @@ c c s c -X +A c c c @@ -282,7 +276,7 @@ c c c c -X +A c c c @@ -415,7 +409,7 @@ c c c c -X +A c c c @@ -649,7 +643,7 @@ c c c c -X +A c c c @@ -668,12 +662,12 @@ A c c c -X +A c "} (19,1,1) = {" c -X +A c c c @@ -863,7 +857,7 @@ c c c c -X +A c c c @@ -878,7 +872,7 @@ c (25,1,1) = {" c c -X +A c c c @@ -973,7 +967,7 @@ c c c c -X +A c c "} diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_nuclear_waste_makeshift.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_nuclear_waste_makeshift.dmm index 81944129a49..5fad8aee1c2 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_nuclear_waste_makeshift.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_nuclear_waste_makeshift.dmm @@ -103,7 +103,7 @@ }, /area/adhomai_nuclear_waste_makeshift) "J" = ( -/obj/structure/flora/bush, +/obj/structure/flora/bush/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, @@ -115,7 +115,7 @@ }, /area/adhomai_nuclear_waste_makeshift) "O" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, @@ -131,7 +131,7 @@ /turf/simulated/wall/wood, /area/adhomai_nuclear_waste_makeshift) "Y" = ( -/obj/structure/flora/grass/brown, +/obj/structure/flora/grass/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_rafama_herd.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_rafama_herd.dmm index 482cd62af3e..fe1b6ab532e 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_rafama_herd.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_rafama_herd.dmm @@ -17,7 +17,7 @@ }, /area/exoplanet/adhomai) "s" = ( -/obj/structure/flora/grass/brown, +/obj/structure/flora/grass/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, @@ -29,13 +29,13 @@ }, /area/exoplanet/adhomai) "H" = ( -/obj/structure/flora/bush, +/obj/structure/flora/bush/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, /area/exoplanet/adhomai) "X" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_raskara_ritual.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_raskara_ritual.dmm index cea7aa4390a..f4c65238b5e 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_raskara_ritual.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_raskara_ritual.dmm @@ -1,6 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "c" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, @@ -12,7 +12,7 @@ }, /area/adhomai_raskara_ritual) "o" = ( -/obj/structure/flora/bush, +/obj/structure/flora/bush/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_raskariim_hideout.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_raskariim_hideout.dmm index 3600e92bd25..8cba6af8ac1 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_raskariim_hideout.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_raskariim_hideout.dmm @@ -64,7 +64,7 @@ }, /area/exoplanet/adhomai) "ds" = ( -/obj/structure/flora/bush, +/obj/structure/flora/bush/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, @@ -267,7 +267,7 @@ /obj/structure/railing/fence{ dir = 8 }, -/obj/structure/flora/grass/brown, +/obj/structure/flora/grass/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, @@ -358,7 +358,7 @@ /obj/structure/railing/fence{ dir = 1 }, -/obj/structure/flora/grass/brown, +/obj/structure/flora/grass/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, @@ -381,7 +381,7 @@ /obj/structure/railing/fence{ dir = 1 }, -/obj/structure/flora/bush, +/obj/structure/flora/bush/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, @@ -516,7 +516,7 @@ }, /area/adhomai_raskariim_hideout) "Mo" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, @@ -596,7 +596,7 @@ }, /area/adhomai_raskariim_hideout) "PT" = ( -/obj/structure/flora/grass/brown, +/obj/structure/flora/grass/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_tunneler_nest.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_tunneler_nest.dmm index dfee3c373a6..5de74f2f391 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_tunneler_nest.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_tunneler_nest.dmm @@ -23,7 +23,7 @@ }, /area/exoplanet/adhomai) "s" = ( -/obj/structure/flora/grass/brown, +/obj/structure/flora/grass/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, @@ -35,7 +35,7 @@ }, /area/exoplanet/adhomai) "H" = ( -/obj/structure/flora/bush, +/obj/structure/flora/bush/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, @@ -47,7 +47,7 @@ }, /area/exoplanet/adhomai) "X" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm index 5d77cd5c090..44c288a2fc9 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm @@ -277,7 +277,7 @@ }, /area/adhomai_village) "oi" = ( -/obj/structure/flora/grass/brown, +/obj/structure/flora/grass/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, @@ -1062,7 +1062,7 @@ }, /area/adhomai_village) "YV" = ( -/obj/structure/flora/bush, +/obj/structure/flora/bush/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, diff --git a/maps/random_ruins/exoplanets/adhomai/ala_base.dmm b/maps/random_ruins/exoplanets/adhomai/ala_base.dmm index ec8e38d4bd5..c1b624de0cf 100644 --- a/maps/random_ruins/exoplanets/adhomai/ala_base.dmm +++ b/maps/random_ruins/exoplanets/adhomai/ala_base.dmm @@ -75,7 +75,7 @@ }, /area/ala_base) "hT" = ( -/obj/structure/flora/bush, +/obj/structure/flora/bush/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, @@ -805,6 +805,12 @@ temperature = 268.15 }, /area/ala_base) +"ZQ" = ( +/obj/structure/flora/grass/adhomai, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/exoplanet/adhomai) (1,1,1) = {" vi @@ -812,7 +818,7 @@ vi vi vi vi -vi +ZQ vi vi vi @@ -870,7 +876,7 @@ vi vi vi vi -vi +ZQ vi vi "} @@ -892,7 +898,7 @@ vi vi vi vi -vi +ZQ vi vi vi @@ -1625,7 +1631,7 @@ vi (25,1,1) = {" vi vi -vi +ZQ vi vi vi @@ -1697,7 +1703,7 @@ vi vi vi vi -vi +ZQ vi vi vi @@ -1736,7 +1742,7 @@ vi vi vi vi -vi +ZQ vi vi vi diff --git a/maps/random_ruins/exoplanets/adhomai/ala_cell.dmm b/maps/random_ruins/exoplanets/adhomai/ala_cell.dmm index e7694997ea5..0d941f1ded9 100644 --- a/maps/random_ruins/exoplanets/adhomai/ala_cell.dmm +++ b/maps/random_ruins/exoplanets/adhomai/ala_cell.dmm @@ -52,7 +52,7 @@ /turf/simulated/floor/exoplanet/mineral/adhomai, /area/exoplanet/adhomai) "s" = ( -/obj/structure/flora/grass/brown, +/obj/structure/flora/grass/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, @@ -74,7 +74,7 @@ /turf/simulated/floor/exoplanet/mineral/adhomai, /area/exoplanet/adhomai) "x" = ( -/obj/structure/flora/bush, +/obj/structure/flora/bush/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, @@ -180,7 +180,7 @@ /turf/simulated/floor/exoplanet/mineral/adhomai, /area/exoplanet/adhomai) "X" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, diff --git a/maps/random_ruins/exoplanets/adhomai/nka_base.dm b/maps/random_ruins/exoplanets/adhomai/nka_base.dm index b30c951730b..10350920e34 100644 --- a/maps/random_ruins/exoplanets/adhomai/nka_base.dm +++ b/maps/random_ruins/exoplanets/adhomai/nka_base.dm @@ -56,7 +56,7 @@ l_pocket = /obj/item/device/radio /datum/outfit/admin/nka_base/get_id_access() - return list(access_pra) + return list(access_nka) /datum/ghostspawner/human/nka_base/commander short_name = "nka_base_commander" diff --git a/maps/random_ruins/exoplanets/adhomai/nka_base.dmm b/maps/random_ruins/exoplanets/adhomai/nka_base.dmm index fafefdde633..bcad7beb909 100644 --- a/maps/random_ruins/exoplanets/adhomai/nka_base.dmm +++ b/maps/random_ruins/exoplanets/adhomai/nka_base.dmm @@ -56,7 +56,7 @@ }, /area/nka_base) "hT" = ( -/obj/structure/flora/bush, +/obj/structure/flora/bush/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, diff --git a/maps/random_ruins/exoplanets/adhomai/pra_base.dmm b/maps/random_ruins/exoplanets/adhomai/pra_base.dmm index 8d440e49da6..8e4d2b8a8b7 100644 --- a/maps/random_ruins/exoplanets/adhomai/pra_base.dmm +++ b/maps/random_ruins/exoplanets/adhomai/pra_base.dmm @@ -93,7 +93,7 @@ /turf/simulated/wall/concrete, /area/pra_base) "hT" = ( -/obj/structure/flora/bush, +/obj/structure/flora/bush/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, diff --git a/maps/random_ruins/exoplanets/adhomai/pra_mining_camp.dmm b/maps/random_ruins/exoplanets/adhomai/pra_mining_camp.dmm index ce196febdda..542a882e281 100644 --- a/maps/random_ruins/exoplanets/adhomai/pra_mining_camp.dmm +++ b/maps/random_ruins/exoplanets/adhomai/pra_mining_camp.dmm @@ -99,7 +99,7 @@ }, /area/pra_mining_camp) "hQ" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, @@ -341,7 +341,7 @@ }, /area/pra_mining_camp) "CC" = ( -/obj/structure/flora/grass/brown, +/obj/structure/flora/grass/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, @@ -668,7 +668,7 @@ }, /area/exoplanet/adhomai) "WW" = ( -/obj/structure/flora/bush, +/obj/structure/flora/bush/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, diff --git a/maps/random_ruins/exoplanets/adhomai/psis_outpost.dmm b/maps/random_ruins/exoplanets/adhomai/psis_outpost.dmm index f1a2a07b808..4b2e4c22058 100644 --- a/maps/random_ruins/exoplanets/adhomai/psis_outpost.dmm +++ b/maps/random_ruins/exoplanets/adhomai/psis_outpost.dmm @@ -140,7 +140,7 @@ }, /area/psis_outpost) "hQ" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, @@ -445,7 +445,7 @@ }, /area/psis_outpost) "CC" = ( -/obj/structure/flora/grass/brown, +/obj/structure/flora/grass/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, @@ -838,7 +838,7 @@ }, /area/psis_outpost) "WW" = ( -/obj/structure/flora/bush, +/obj/structure/flora/bush/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 },