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 b57cc050fd8..5559790b167 100644 Binary files a/icons/mob/npc/adhomai.dmi and b/icons/mob/npc/adhomai.dmi differ 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