From 2e83b8e34cd3c7b9f57417f0d7b9d0138aa17529 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Thu, 16 Feb 2023 09:01:20 -0300 Subject: [PATCH] Adds the ha'rron (#15796) --- .../structures/crates_lockers/largecrate.dm | 3 + .../maps/planet_types/lore/srandmarr.dm | 2 +- .../living/simple_animal/hostile/adhomai.dm | 38 + .../hostile/commanded/guard_dog.dm | 33 +- html/changelogs/alberyk-harron.yml | 6 + icons/mob/npc/adhomai.dmi | Bin 7329 -> 8958 bytes .../exoplanets/adhomai/adhomai_cavern.dmm | 10 +- .../exoplanets/adhomai/adhomai_hunting.dmm | 2695 +++++++++-------- .../exoplanets/adhomai/psis_outpost.dmm | 147 +- 9 files changed, 1553 insertions(+), 1381 deletions(-) create mode 100644 html/changelogs/alberyk-harron.yml diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm index 50cd9b1a5c8..a758fc87823 100644 --- a/code/game/objects/structures/crates_lockers/largecrate.dm +++ b/code/game/objects/structures/crates_lockers/largecrate.dm @@ -94,6 +94,9 @@ /obj/structure/largecrate/animal/adhomai/schlorrgo held_type = /mob/living/simple_animal/schlorrgo +/obj/structure/largecrate/animal/adhomai/harron + held_type = /mob/living/simple_animal/hostile/commanded/dog/harron + /obj/structure/largecrate/animal/hakhma name = "hakhma crate" held_type = /mob/living/simple_animal/hakhma diff --git a/code/modules/maps/planet_types/lore/srandmarr.dm b/code/modules/maps/planet_types/lore/srandmarr.dm index 228397e8996..4b5e556a3e2 100644 --- a/code/modules/maps/planet_types/lore/srandmarr.dm +++ b/code/modules/maps/planet_types/lore/srandmarr.dm @@ -193,7 +193,7 @@ 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/wind_devil, /mob/living/carbon/human/farwa/adhomai, /mob/living/simple_animal/hostile/harron) /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/hostile/adhomai.dm b/code/modules/mob/living/simple_animal/hostile/adhomai.dm index abba3d6b731..e4b5a913f96 100644 --- a/code/modules/mob/living/simple_animal/hostile/adhomai.dm +++ b/code/modules/mob/living/simple_animal/hostile/adhomai.dm @@ -27,6 +27,44 @@ faction = "Adhomai" flying = TRUE + butchering_products = list(/obj/item/stack/material/animalhide = 1) + meat_type = /obj/item/reagent_containers/food/snacks/meat/adhomai + meat_amount = 5 + +/mob/living/simple_animal/hostile/harron + name = "ha'rron" + desc = "A carnivorous adhomian animal. Some domesticated breeds make excellent hunting companions." + + icon = 'icons/mob/npc/adhomai.dmi' + icon_state = "harron" + icon_living = "harron" + icon_dead = "harron_dead" + + organ_names = list("head", "chest", "right fore leg", "left fore leg", "right rear leg", "left rear leg") + response_help = "pets" + response_harm = "hits" + response_disarm = "pushes" + + turns_per_move = 3 + + response_help = "pets the" + response_disarm = "gently pushes aside the" + response_harm = "hits the" + speed = -1 + maxHealth = 75 + health = 75 + + mob_size = 5 + + + melee_damage_lower = 15 + melee_damage_upper = 15 + attacktext = "bitten" + attack_sound = 'sound/weapons/bite.ogg' + + + faction = "Adhomai" + butchering_products = list(/obj/item/stack/material/animalhide = 1) meat_type = /obj/item/reagent_containers/food/snacks/meat/adhomai meat_amount = 5 \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/hostile/commanded/guard_dog.dm b/code/modules/mob/living/simple_animal/hostile/commanded/guard_dog.dm index 6b8eab471e9..ee86dc28bdb 100644 --- a/code/modules/mob/living/simple_animal/hostile/commanded/guard_dog.dm +++ b/code/modules/mob/living/simple_animal/hostile/commanded/guard_dog.dm @@ -110,4 +110,35 @@ melee_damage_lower = 5 melee_damage_upper = 5 - butchering_products = list(/obj/item/stack/material/animalhide = 2) \ No newline at end of file + butchering_products = list(/obj/item/stack/material/animalhide = 2) + +/mob/living/simple_animal/hostile/commanded/dog/harron + name = "domesticated ha'rron" + short_name = "ha'rron" + + desc = "A carnivorous adhomian animal. Some domesticated breeds make excellent hunting companions." + + icon = 'icons/mob/npc/adhomai.dmi' + icon_state = "harron" + icon_living = "harron" + icon_dead = "harron_dead" + + meat_type = /obj/item/reagent_containers/food/snacks/meat/adhomai + meat_amount = 5 + +/mob/living/simple_animal/hostile/commanded/dog/harron/cybernetic + name = "cybernetic ha'rron" + desc = "A heavily augmented ha'rron. It is commonly used by the People's Strategic Intelligence Service." + + icon_state = "cyber_harron" + icon_living = "cyber_harron" + icon_dead = "cyber_harron_dead" + + melee_damage_lower = 20 + melee_damage_upper = 20 + resist_mod = 4 + + health = 100 + maxHealth = 100 + + meat_amount = 3 \ No newline at end of file diff --git a/html/changelogs/alberyk-harron.yml b/html/changelogs/alberyk-harron.yml new file mode 100644 index 00000000000..3dbfaaf37c7 --- /dev/null +++ b/html/changelogs/alberyk-harron.yml @@ -0,0 +1,6 @@ +author: Alberyk, Kyres1 + +delete-after: True + +changes: + - rscadd: "Added the Ha'rron, with hostile, domesticated and cybernetic versions." diff --git a/icons/mob/npc/adhomai.dmi b/icons/mob/npc/adhomai.dmi index b57cc050fd8eb92c92f8389bf022013c59f56da8..5559790b1670e5414f89875bae8fb4371c6d2874 100644 GIT binary patch delta 8924 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 diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_cavern.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_cavern.dmm index 7436ace591a..d8b2f6d221f 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_cavern.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_cavern.dmm @@ -41,6 +41,10 @@ "P" = ( /turf/simulated/floor/exoplanet/mineral/adhomai, /area/exoplanet/adhomai) +"R" = ( +/mob/living/simple_animal/hostile/harron, +/turf/simulated/floor/exoplanet/mineral/adhomai, +/area/exoplanet/adhomai) "X" = ( /obj/structure/flora/tree/adhomai, /turf/simulated/floor/exoplanet/snow{ @@ -475,7 +479,7 @@ P P m m -P +R P P m @@ -571,7 +575,7 @@ P P P P -P +R P P P @@ -774,7 +778,7 @@ P P m m -P +R P A P diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_hunting.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_hunting.dmm index 2c7734f147b..60f00409d24 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_hunting.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_hunting.dmm @@ -1,184 +1,28 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/obj/structure/closet/crate/hydroponics, -/obj/item/seeds/mtearseed, -/obj/item/seeds/nifberries, -/obj/item/seeds/sugartree, -/obj/item/seeds/earthenroot, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, -/area/exoplanet/adhomai) -"b" = ( -/turf/simulated/wall/wood, -/area/adhomai_hunting) -"c" = ( -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, -/area/exoplanet/adhomai) -"d" = ( -/turf/simulated/floor/carpet/art{ - temperature = 278.15 - }, -/area/adhomai_hunting) -"e" = ( -/obj/machinery/light/small{ - dir = 4 - }, +"af" = ( +/obj/structure/bed/padded, +/obj/item/bedsheet/yellow, /turf/simulated/floor/wood{ temperature = 268.15 }, /area/adhomai_hunting) -"f" = ( -/obj/structure/simple_door/wood, -/turf/simulated/floor/wood{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"g" = ( -/obj/structure/table/wood, -/obj/item/flame/candle/waxcandles{ - pixel_y = 7; - pixel_x = -5 - }, -/turf/simulated/floor/wood{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"h" = ( -/obj/structure/table/wood, -/obj/item/material/ashtray/bronze, -/obj/item/flame/lighter/adhomai{ - pixel_x = 7 - }, -/obj/item/clothing/mask/smokable/cigarette/adhomai{ - pixel_x = -5 - }, -/turf/simulated/floor/wood{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"i" = ( +"cS" = ( /obj/structure/closet/secure_closet/freezer, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/wood{ temperature = 268.15 }, /area/adhomai_hunting) -"j" = ( -/obj/structure/bed/stool/wood, -/obj/effect/ghostspawpoint{ - identifier = "adhomai_hunter"; - name = "igs - adhomai_hunter" - }, -/turf/simulated/floor/wood{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"k" = ( -/turf/simulated/floor/wood{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"l" = ( -/obj/structure/railing/mapped{ +"dK" = ( +/obj/structure/railing/fence, +/obj/structure/railing/fence{ dir = 4 }, -/turf/simulated/floor/tiled/ramp, -/area/adhomai_hunting) -"m" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor/wood{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"n" = ( -/obj/structure/closet/cabinet, -/obj/item/ammo_magazine/boltaction, -/obj/item/ammo_magazine/boltaction, -/obj/item/clothing/suit/storage/tajaran/hunting, -/obj/item/device/flashlight/heavy, -/turf/simulated/floor/wood{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"o" = ( -/obj/structure/table/wood, -/obj/item/device/flashlight/lamp, -/turf/simulated/floor/wood{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"p" = ( -/obj/structure/railing/mapped{ - dir = 8 - }, -/turf/simulated/floor/tiled/ramp, -/area/adhomai_hunting) -"q" = ( -/obj/structure/table/wood/gamblingtable, -/obj/item/storage/pill_bottle/dice/tajara, -/turf/simulated/floor/wood{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"r" = ( -/obj/structure/table/wood/gamblingtable, -/turf/simulated/floor/wood{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"s" = ( -/obj/structure/flora/grass/adhomai, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, /area/exoplanet/adhomai) -"t" = ( -/obj/structure/closet/crate/drop, -/obj/item/device/binoculars, -/obj/item/device/binoculars, -/turf/simulated/floor/wood{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"u" = ( -/obj/structure/table/wood/gamblingtable, -/obj/item/deck/cards, -/turf/simulated/floor/wood{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"v" = ( -/turf/simulated/floor/exoplanet/ice, -/area/exoplanet/adhomai) -"w" = ( -/obj/structure/window/basic{ - dir = 8 - }, -/obj/structure/curtain/black, -/turf/simulated/floor/wood{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"x" = ( -/obj/machinery/appliance/cooker/oven/adhomai, -/turf/simulated/floor/wood{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"y" = ( -/obj/structure/table/wood/gamblingtable, -/obj/item/reagent_containers/food/snacks/hardbread, -/obj/item/reagent_containers/food/drinks/cans/adhomai_milk, -/turf/simulated/floor/wood{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"z" = ( +"dN" = ( /obj/effect/decal/fake_object{ density = 1; desc = "An Adhomian television. Due to bad reception, there is nothing to watch."; @@ -190,27 +34,88 @@ temperature = 268.15 }, /area/adhomai_hunting) -"B" = ( +"gt" = ( +/obj/machinery/light/small, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"gQ" = ( /obj/structure/table/wood/gamblingtable, -/obj/item/material/knife/bayonet, /turf/simulated/floor/wood{ temperature = 268.15 }, /area/adhomai_hunting) -"C" = ( +"gT" = ( +/mob/living/simple_animal/hostile/commanded/dog/harron{ + dir = 1 + }, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/exoplanet/adhomai) +"ih" = ( +/obj/structure/sink/puddle, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/exoplanet/adhomai) +"iA" = ( +/obj/structure/railing/mapped{ + dir = 4 + }, +/turf/simulated/floor/tiled/ramp, +/area/adhomai_hunting) +"jN" = ( /obj/structure/flora/rock/ice, /turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, /area/exoplanet/adhomai) -"D" = ( +"ol" = ( +/turf/simulated/floor/exoplanet/ice, +/area/exoplanet/adhomai) +"pk" = ( +/obj/structure/bed/stool/chair/sofa/right/brown{ + dir = 1 + }, +/turf/simulated/floor/carpet/art{ + temperature = 278.15 + }, +/area/adhomai_hunting) +"pn" = ( +/obj/structure/table/wood, +/obj/item/flame/candle/waxcandles{ + pixel_y = 7; + pixel_x = -5 + }, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"pR" = ( /obj/structure/bed/padded, /obj/item/bedsheet/brown, /turf/simulated/floor/wood{ temperature = 268.15 }, /area/adhomai_hunting) -"E" = ( +"qH" = ( +/obj/structure/closet/crate/drop, +/obj/item/device/binoculars, +/obj/item/device/binoculars, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"qL" = ( +/obj/structure/table/wood, +/obj/item/device/flashlight/lamp, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"sx" = ( /obj/structure/closet/crate/drop, /obj/item/ammo_magazine/boltaction, /obj/item/ammo_magazine/boltaction, @@ -219,14 +124,203 @@ temperature = 268.15 }, /area/adhomai_hunting) -"F" = ( -/obj/structure/bed/padded, -/obj/item/bedsheet/yellow, +"sK" = ( +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/exoplanet/adhomai) +"sR" = ( +/obj/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/wood{ temperature = 268.15 }, /area/adhomai_hunting) -"G" = ( +"tZ" = ( +/obj/item/reagent_containers/glass/bucket/wood{ + pixel_x = -9; + pixel_y = 5 + }, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/exoplanet/adhomai) +"uD" = ( +/obj/structure/railing/fence{ + dir = 4 + }, +/mob/living/simple_animal/hostile/commanded/dog/harron{ + dir = 8 + }, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/exoplanet/adhomai) +"vh" = ( +/obj/effect/decal/cleanable/blood/splatter, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"wZ" = ( +/obj/structure/table/wood/gamblingtable, +/obj/item/material/knife/bayonet, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"xA" = ( +/obj/structure/closet/crate/drop, +/obj/item/trap, +/obj/item/trap, +/obj/item/trap, +/obj/item/trap, +/obj/item/trap, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"yf" = ( +/obj/structure/window/basic{ + dir = 4 + }, +/obj/structure/curtain/black, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"zG" = ( +/obj/machinery/portable_atmospherics/hydroponics/soil, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/exoplanet/adhomai) +"zT" = ( +/obj/structure/bed/stool/chair/sofa/left/brown{ + dir = 1 + }, +/turf/simulated/floor/carpet/art{ + temperature = 278.15 + }, +/area/adhomai_hunting) +"Ar" = ( +/obj/structure/table/wood, +/obj/item/storage/chewables/tobacco/bad, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"AF" = ( +/obj/structure/bed/stool/chair/sofa/brown{ + dir = 1 + }, +/turf/simulated/floor/carpet/art{ + temperature = 278.15 + }, +/area/adhomai_hunting) +"Bg" = ( +/obj/machinery/light/small, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"BE" = ( +/obj/structure/table/wood/gamblingtable, +/obj/item/storage/pill_bottle/dice/tajara, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"Cj" = ( +/obj/structure/table/wood/gamblingtable, +/obj/item/reagent_containers/food/snacks/hardbread, +/obj/item/reagent_containers/food/drinks/cans/adhomai_milk, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"Cp" = ( +/obj/machinery/appliance/cooker/oven/adhomai, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"EY" = ( +/obj/structure/closet/cabinet, +/obj/item/ammo_magazine/boltaction, +/obj/item/ammo_magazine/boltaction, +/obj/item/clothing/suit/storage/tajaran/hunting, +/obj/item/device/flashlight/heavy, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"GY" = ( +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"Ha" = ( +/obj/structure/flora/bush/adhomai, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/exoplanet/adhomai) +"HP" = ( +/obj/structure/window/basic{ + dir = 8 + }, +/obj/structure/curtain/black, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"Ii" = ( +/obj/structure/flora/tree/adhomai, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/exoplanet/adhomai) +"IF" = ( +/obj/structure/bed/stool/wood, +/obj/effect/ghostspawpoint{ + identifier = "adhomai_hunter"; + name = "igs - adhomai_hunter" + }, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"IT" = ( +/obj/structure/railing/fence{ + dir = 4 + }, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/exoplanet/adhomai) +"IU" = ( +/obj/structure/simple_door/wood, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"Ju" = ( +/obj/structure/cult/tome{ + desc = "A stone altar dedicated to Ma'take, the god of hunting."; + icon_state = "churchaltar"; + name = "altar" + }, +/obj/item/clothing/accessory/tajaran/charm/steel/silver{ + desc = "An expensive silver charm of tajaran origin. This one has the arrowhead of Ma'take"; + name = "mata'ke charm" + }, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"Lm" = ( /obj/structure/table/wood, /obj/item/material/hatchet/butch, /obj/item/material/kitchen/utensil/knife, @@ -246,34 +340,99 @@ temperature = 268.15 }, /area/adhomai_hunting) -"H" = ( -/obj/structure/flora/bush/adhomai, -/turf/simulated/floor/exoplanet/snow{ +"Lo" = ( +/obj/structure/railing/mapped, +/turf/simulated/floor/wood{ temperature = 268.15 }, -/area/exoplanet/adhomai) -"I" = ( -/obj/structure/sink/puddle, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, -/area/exoplanet/adhomai) -"J" = ( -/obj/structure/bed/stool/chair/sofa/brown{ - dir = 1 - }, -/turf/simulated/floor/carpet/art{ - temperature = 278.15 - }, /area/adhomai_hunting) -"K" = ( +"LO" = ( +/obj/structure/closet/crate/hydroponics, +/obj/item/seeds/mtearseed, +/obj/item/seeds/nifberries, +/obj/item/seeds/sugartree, +/obj/item/seeds/earthenroot, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/exoplanet/adhomai) +"MU" = ( +/obj/structure/railing/mapped{ + dir = 8 + }, +/turf/simulated/floor/tiled/ramp, +/area/adhomai_hunting) +"QL" = ( +/turf/simulated/wall/wood, +/area/adhomai_hunting) +"Rf" = ( +/obj/structure/flora/grass/adhomai, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/exoplanet/adhomai) +"Sg" = ( +/obj/structure/table/wood/gamblingtable, +/obj/item/deck/tarot/adhomai, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"Tu" = ( +/mob/living/simple_animal/hostile/commanded/dog/harron{ + dir = 4 + }, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/exoplanet/adhomai) +"UG" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"UI" = ( /obj/structure/table/wood, /obj/item/toy/plushie/farwa, /turf/simulated/floor/wood{ temperature = 268.15 }, /area/adhomai_hunting) -"L" = ( +"Vd" = ( +/obj/structure/railing/fence{ + dir = 4 + }, +/obj/structure/railing/fence{ + dir = 1 + }, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/exoplanet/adhomai) +"Vi" = ( +/obj/structure/table/wood, +/obj/item/material/ashtray/bronze, +/obj/item/flame/lighter/adhomai{ + pixel_x = 7 + }, +/obj/item/clothing/mask/smokable/cigarette/adhomai{ + pixel_x = -5 + }, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"WR" = ( +/obj/structure/table/wood/gamblingtable, +/obj/item/deck/cards, +/turf/simulated/floor/wood{ + temperature = 268.15 + }, +/area/adhomai_hunting) +"Xz" = ( /obj/effect/ghostspawpoint{ identifier = "matake_hunter"; name = "igs - matake_hunter" @@ -282,101 +441,12 @@ temperature = 268.15 }, /area/adhomai_hunting) -"M" = ( -/obj/structure/railing/mapped, -/turf/simulated/floor/wood{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"N" = ( -/obj/structure/table/wood, -/obj/item/storage/chewables/tobacco/bad, -/turf/simulated/floor/wood{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"O" = ( -/obj/structure/table/wood/gamblingtable, -/obj/item/deck/tarot/adhomai, -/turf/simulated/floor/wood{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"P" = ( -/obj/machinery/portable_atmospherics/hydroponics/soil, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, -/area/exoplanet/adhomai) -"Q" = ( -/obj/structure/cult/tome{ - desc = "A stone altar dedicated to Ma'take, the god of hunting."; - icon_state = "churchaltar"; - name = "altar" - }, -/obj/item/clothing/accessory/tajaran/charm/steel/silver{ - desc = "An expensive silver charm of tajaran origin. This one has the arrowhead of Ma'take"; - name = "mata'ke charm" - }, -/turf/simulated/floor/wood{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"R" = ( -/obj/structure/closet/crate/drop, -/obj/item/trap, -/obj/item/trap, -/obj/item/trap, -/obj/item/trap, -/obj/item/trap, -/turf/simulated/floor/wood{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"S" = ( -/obj/machinery/light/small, -/turf/simulated/floor/wood{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"T" = ( -/obj/effect/decal/cleanable/blood/splatter, -/turf/simulated/floor/wood{ - temperature = 268.15 - }, -/area/adhomai_hunting) -"U" = ( -/obj/item/reagent_containers/glass/bucket/wood{ - pixel_x = -9; - pixel_y = 5 - }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, -/area/exoplanet/adhomai) -"V" = ( -/obj/structure/bed/stool/chair/sofa/right/brown{ - dir = 1 - }, +"XR" = ( /turf/simulated/floor/carpet/art{ temperature = 278.15 }, /area/adhomai_hunting) -"W" = ( -/obj/structure/bed/stool/chair/sofa/left/brown{ - dir = 1 - }, -/turf/simulated/floor/carpet/art{ - temperature = 278.15 - }, -/area/adhomai_hunting) -"X" = ( -/obj/structure/flora/tree/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, -/area/exoplanet/adhomai) -"Y" = ( +"YR" = ( /obj/machinery/light/small{ dir = 1 }, @@ -384,1101 +454,1100 @@ temperature = 268.15 }, /area/adhomai_hunting) -"Z" = ( -/obj/structure/window/basic{ - dir = 4 +"ZD" = ( +/obj/structure/railing/fence{ + dir = 1 }, -/obj/structure/curtain/black, -/turf/simulated/floor/wood{ +/turf/simulated/floor/exoplanet/snow{ temperature = 268.15 }, -/area/adhomai_hunting) +/area/exoplanet/adhomai) (1,1,1) = {" -c -c -c -c -H -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c +sK +sK +sK +sK +Ha +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK "} (2,1,1) = {" -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -X -c -c -c -c -c -c -c -c -c -c +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +Ii +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK "} (3,1,1) = {" -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK "} (4,1,1) = {" -c -c -c -c -c -c -c -c -c -c -c -X -c -c -c -s -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +Ii +sK +sK +sK +Rf +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK "} (5,1,1) = {" -c -c -c -c -c -c -c -X -c -c -c -c -c -c -c -c -c -c -c -c -C -c -c -c -c -c -c -s -c -c -c -c +sK +sK +sK +sK +sK +sK +sK +Ii +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +jN +sK +sK +sK +sK +sK +sK +Rf +sK +sK +sK +sK "} (6,1,1) = {" -c -c -s -c -c -C -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -s -c -c -c -c -c -c -c -c +sK +sK +Rf +sK +sK +jN +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +Rf +sK +sK +sK +sK +sK +sK +sK +sK "} (7,1,1) = {" -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK "} (8,1,1) = {" -c -c -c -c -c -c -c -c -c -c -c -s -c -c -c -c -c -c -c -c -s -c -c -c -c -c -c -c -c -c -c -s +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +Rf +sK +sK +sK +sK +sK +sK +sK +sK +Rf +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +Rf "} (9,1,1) = {" -c -c -c -c -c -c -c -c -c -c -c -c -c -c -b -b -w -b -P -P -P -c -I -c -c -c -X -c -c -c -c -c +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +QL +QL +HP +QL +zG +zG +zG +sK +ih +sK +sK +sK +Ii +sK +sK +sK +sK +sK "} (10,1,1) = {" -c -c -c -c -c -c -c -s -c -c -c -c -c -c -b -F -k -b -Y -c -c -c -U -c -c -c -c -c -c -c -c -c +sK +sK +sK +sK +sK +sK +sK +Rf +sK +sK +sK +sK +sK +sK +QL +af +GY +QL +YR +sK +sK +sK +tZ +sK +sK +sK +sK +sK +sK +sK +sK +sK "} (11,1,1) = {" -c -c -c -c -c -c -c -c -c -b -b -w -b -b -b -o -k -b -P -P -P -c -c -c -s -c -c -c -c -c -c -c +sK +sK +sK +sK +sK +sK +sK +sK +sK +QL +QL +HP +QL +QL +QL +qL +GY +QL +zG +zG +zG +sK +sK +sK +Rf +sK +sK +sK +sK +sK +sK +sK "} (12,1,1) = {" -c -c -c -c -c -c -c -c -c -b -i -k -m -T -b -n -k -b -c -c -c -c -c -c -c -c -c -c -c -c -c -c +sK +sK +sK +sK +sK +sK +sK +sK +sK +QL +cS +GY +sR +vh +QL +EY +GY +QL +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK "} (13,1,1) = {" -c -c -c -c -c -c -b -b -b -b -x -k -k -G -b -b -f -b -a -c -c -c -c -H -c -c -c -c -c -c -c -c +sK +sK +sK +sK +sK +sK +QL +QL +QL +QL +Cp +GY +GY +Lm +QL +QL +IU +QL +LO +sK +sK +sK +sK +Ha +sK +sK +sK +sK +sK +sK +sK +sK "} (14,1,1) = {" -c -c -c -c -c -b -b -k -m -l -k -k -k -k -k -m -k -b -b -b -b -b -c -c -c -c -c -c -c -c -c -c +sK +sK +sK +sK +sK +QL +QL +GY +sR +iA +GY +GY +GY +GY +GY +sR +GY +QL +QL +QL +QL +QL +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK "} (15,1,1) = {" -c -c -c -H -c -b -g -k -M -k -k -j -u -r -j -k -k -f -k -k -o -b -c -c -c -c -c -c -c -c -s -c +sK +sK +sK +Ha +sK +QL +pn +GY +Lo +GY +GY +IF +WR +gQ +IF +GY +GY +IU +GY +GY +qL +QL +sK +sK +sK +sK +sK +sK +sK +sK +Rf +sK "} (16,1,1) = {" -c -s -c -c -c -b -Q -L -M -k -k -j -B -q -j -k -k -b -n -k -D -b -c -c -c -c -c -X -c -c -c -c +sK +Rf +sK +sK +sK +QL +Ju +Xz +Lo +GY +GY +IF +wZ +BE +IF +GY +GY +QL +EY +GY +pR +QL +sK +sK +sK +sK +sK +Ii +sK +sK +sK +sK "} (17,1,1) = {" -c -c -c -c -c -b -g -k -M -k -k -j -O -y -j -k -S -b -b -Z -b -b -c -c -H -c -c -c -c -c -c -c +sK +sK +sK +sK +sK +QL +pn +GY +Lo +GY +GY +IF +Sg +Cj +IF +GY +Bg +QL +QL +yf +QL +QL +sK +sK +Ha +sK +sK +sK +sK +sK +sK +sK "} (18,1,1) = {" -c -c -c -c -c -b -b -k -e -p -k -k -k -k -k -k -k -f -c -c -c -c -c -c -c -c -c -c -c -c -c -c +sK +sK +sK +sK +sK +QL +QL +GY +UG +MU +GY +GY +GY +GY +GY +GY +GY +IU +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK "} (19,1,1) = {" -c -c -c -c -c -c -b -b -b -b -t -R -E -k -k -k -h -b -c -c -c -c -c -c -c -c -c -c -c -c -c -c +sK +sK +sK +sK +sK +sK +QL +QL +QL +QL +qH +xA +sx +GY +GY +GY +Vi +QL +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK "} (20,1,1) = {" -c -s -c -c -c -c -c -c -c -b -b -b -b -K -k -d -V -b -c -c -c -c -c -c -c -c -c -c -c -c -c -c +sK +Rf +sK +sK +sK +sK +sK +sK +ZD +QL +QL +QL +QL +UI +GY +XR +pk +QL +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK "} (21,1,1) = {" -c -c -c -c -c -c -s -c -c -c -c -c -b -z -k -d -J -b -c -c -c -c -s -c -s -c -c -c -c -c -c -c +sK +sK +sK +sK +sK +sK +Rf +sK +ZD +sK +Tu +sK +QL +dN +GY +XR +AF +QL +sK +sK +sK +sK +Rf +sK +Rf +sK +sK +sK +sK +sK +sK +sK "} (22,1,1) = {" -c -c -c -c -c -c -c -c -c -c -c -c -b -N -e -d -W -b -c -c -c -c -c -c -c -c -s -c -c -c -c -c +sK +sK +sK +sK +sK +sK +sK +sK +sK +Tu +sK +gt +QL +Ar +UG +XR +zT +QL +sK +sK +sK +sK +sK +sK +sK +sK +Rf +sK +sK +sK +sK +sK "} (23,1,1) = {" -c -c -c -c -v -c -c -c -c -c -c -c -b -b -b -Z -b -b -c -c -c -c -c -c -c -c -c -c -c -c -c -c +sK +sK +sK +sK +ol +sK +sK +sK +ZD +sK +sK +gT +QL +QL +QL +yf +QL +QL +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK "} (24,1,1) = {" -c -c -c -v -v -v -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c +sK +sK +sK +ol +ol +ol +sK +sK +Vd +uD +IT +IT +dK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK "} (25,1,1) = {" -c -c -c -v -v -v -v -c -c -c -c -c -s -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c +sK +sK +sK +ol +ol +ol +ol +sK +sK +sK +sK +sK +Rf +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK "} (26,1,1) = {" -c -c -v -v -v -v -c -c -c -C -c -c -c -c -c -c -c -c -s -c -c -c -s -c -c -c -X -c -c -c -c -c +sK +sK +ol +ol +ol +ol +sK +sK +sK +jN +sK +sK +sK +sK +sK +sK +sK +sK +Rf +sK +sK +sK +Rf +sK +sK +sK +Ii +sK +sK +sK +sK +sK "} (27,1,1) = {" -c -s -c -v -v -v -v -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c +sK +Rf +sK +ol +ol +ol +ol +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK "} (28,1,1) = {" -c -c -c -c -c -v -v -v -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -s -c +sK +sK +sK +sK +sK +ol +ol +ol +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +Rf +sK "} (29,1,1) = {" -c -c -c -c -c -v -v -c -c -c -c -c -c -s -c -c -c -c -c -c -c -c -X -c -c -c -c -c -c -c -c -c +sK +sK +sK +sK +sK +ol +ol +sK +sK +sK +sK +sK +sK +Rf +sK +sK +sK +sK +sK +sK +sK +sK +Ii +sK +sK +sK +sK +sK +sK +sK +sK +sK "} (30,1,1) = {" -c -c -c -c -c -c -c -c -c -c -c -H -c -c -c -c -c -H -c -c -c -c -c -c -c -c -c -c -c -c -c -c +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +Ha +sK +sK +sK +sK +sK +Ha +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK "} (31,1,1) = {" -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK "} (32,1,1) = {" -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c -c +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK +sK "} diff --git a/maps/random_ruins/exoplanets/adhomai/psis_outpost.dmm b/maps/random_ruins/exoplanets/adhomai/psis_outpost.dmm index 4b2e4c22058..f5ff9b468ef 100644 --- a/maps/random_ruins/exoplanets/adhomai/psis_outpost.dmm +++ b/maps/random_ruins/exoplanets/adhomai/psis_outpost.dmm @@ -21,7 +21,7 @@ req_access = list(209); name = "Outpost" }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -33,7 +33,8 @@ pixel_y = 32; req_access = list(209) }, -/turf/simulated/floor/holofloor/tiled/dark{ +/mob/living/simple_animal/hostile/commanded/dog/harron/cybernetic, +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -41,7 +42,7 @@ /obj/machinery/porta_turret/ballistic, /obj/effect/floor_decal/industrial/warning/full, /obj/machinery/light, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -72,7 +73,7 @@ /obj/effect/floor_decal/corner/red{ dir = 9 }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -84,7 +85,7 @@ identifier = "psis_outpost"; name = "igs - psis_outpost" }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -103,7 +104,7 @@ dir = 4; status = 2 }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -115,7 +116,7 @@ identifier = "psis_outpost"; name = "igs - psis_outpost" }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -123,7 +124,7 @@ /obj/structure/sign/painting_frame/hadii{ pixel_y = 32 }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -135,7 +136,7 @@ dir = 4; status = 2 }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -156,7 +157,7 @@ /obj/item/stamp/denied{ pixel_y = -2 }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -167,7 +168,7 @@ /obj/item/clothing/under/color/orange, /obj/item/clothing/under/color/orange, /obj/machinery/light, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -192,14 +193,14 @@ pixel_y = 5; pixel_x = 8 }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) "lf" = ( /obj/machinery/porta_turret/ballistic, /obj/effect/floor_decal/industrial/warning/full, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -225,7 +226,7 @@ pixel_x = 7; pixel_y = 2 }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -244,7 +245,7 @@ /obj/item/device/binoculars, /obj/item/device/binoculars, /obj/item/device/binoculars, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -277,7 +278,7 @@ /obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -299,7 +300,7 @@ /obj/effect/floor_decal/corner/black{ dir = 8 }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -308,7 +309,7 @@ req_access = list(209); name = "Cells" }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -316,7 +317,7 @@ /obj/effect/floor_decal/corner/red{ dir = 10 }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -337,7 +338,7 @@ req_access = list(209); pixel_y = 32 }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -355,7 +356,18 @@ /obj/effect/floor_decal/corner/black{ dir = 6 }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ + temperature = 268.15 + }, +/area/psis_outpost) +"vL" = ( +/obj/effect/floor_decal/corner/red{ + dir = 6 + }, +/mob/living/simple_animal/hostile/commanded/dog/harron/cybernetic{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -364,7 +376,7 @@ dir = 4 }, /obj/machinery/vending/cigarette, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -372,7 +384,7 @@ /obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -380,7 +392,7 @@ /obj/structure/sign/flag/pra{ pixel_x = -32 }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -397,7 +409,7 @@ dir = 10 }, /obj/machinery/light, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -405,7 +417,7 @@ /obj/effect/floor_decal/industrial/loading/yellow{ dir = 1 }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -440,7 +452,7 @@ /obj/machinery/door/blast/shutters{ id = "psis_outpost_shutter" }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -460,7 +472,7 @@ /obj/structure/sign/flag/pra/right{ pixel_y = -32 }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -472,7 +484,7 @@ /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -480,7 +492,7 @@ /obj/effect/floor_decal/corner/black{ dir = 9 }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -489,7 +501,7 @@ dir = 4; status = 2 }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -517,7 +529,7 @@ /obj/effect/floor_decal/corner/red{ dir = 5 }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -537,7 +549,7 @@ /obj/structure/sign/flag/pra{ pixel_y = -32 }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -553,7 +565,16 @@ /obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ + temperature = 268.15 + }, +/area/psis_outpost) +"Ke" = ( +/obj/effect/floor_decal/corner/red{ + dir = 5 + }, +/mob/living/simple_animal/hostile/commanded/dog/harron/cybernetic, +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -581,7 +602,7 @@ /obj/structure/sign/painting_frame/hadii{ pixel_y = 32 }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -590,7 +611,7 @@ /obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -601,7 +622,7 @@ /obj/structure/sign/flag/pra{ pixel_x = -32 }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -612,7 +633,7 @@ /obj/structure/sign/flag/pra{ pixel_x = 32 }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -627,7 +648,7 @@ pixel_y = 32 }, /obj/structure/hadii_statue, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -655,13 +676,13 @@ /obj/structure/sign/flag/pra{ pixel_y = 32 }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) "PL" = ( /obj/effect/floor_decal/corner/black, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -676,14 +697,14 @@ /area/psis_outpost) "Qq" = ( /obj/effect/floor_decal/industrial/loading/yellow, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) "Qx" = ( /obj/effect/floor_decal/corner/red/full, /obj/machinery/vending/snack, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -698,7 +719,7 @@ dir = 4; status = 2 }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -707,7 +728,7 @@ /obj/effect/floor_decal/corner/red{ dir = 9 }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -724,12 +745,12 @@ /obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) "Tn" = ( -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -742,7 +763,7 @@ /obj/structure/sign/flag/pra/left{ pixel_y = 32 }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -751,7 +772,7 @@ req_access = list(209); name = "Office" }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -778,7 +799,7 @@ req_access = list(209); name = "Interrogation" }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -786,7 +807,7 @@ /obj/effect/floor_decal/corner/black{ dir = 1 }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -804,7 +825,7 @@ pixel_x = -8; pixel_y = 5 }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -812,7 +833,7 @@ /obj/effect/floor_decal/corner/red{ dir = 6 }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -821,7 +842,7 @@ dir = 10 }, /obj/machinery/light, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -833,7 +854,7 @@ /obj/item/book/manual/pra_manifesto, /obj/item/book/manual/pra_manifesto, /obj/item/book/manual/pra_manifesto, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -853,7 +874,7 @@ /obj/structure/sign/flag/pra/right{ pixel_y = 32 }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -865,7 +886,7 @@ /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -885,7 +906,7 @@ /obj/structure/sign/painting_frame/hadii{ pixel_y = -32 }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -893,7 +914,7 @@ /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -901,7 +922,7 @@ /obj/effect/floor_decal/corner/black{ dir = 4 }, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -911,7 +932,7 @@ }, /obj/item/clothing/under/color/orange, /obj/item/clothing/under/color/orange, -/turf/simulated/floor/holofloor/tiled/dark{ +/turf/simulated/floor/tiled/dark{ temperature = 268.15 }, /area/psis_outpost) @@ -1547,7 +1568,7 @@ Hc Tn dd Mq -ID +Ke Tn qO Gu @@ -1582,7 +1603,7 @@ Mq Mq Mq Xm -WA +vL Lo WA Lo