diff --git a/_maps/RandomRuins/IceRuins/doppler/icemoon_underground_abandoned_icewalker_den.dmm b/_maps/RandomRuins/IceRuins/doppler/icemoon_underground_abandoned_icewalker_den.dmm index 2c4c5d0615608..6a68798880ee4 100644 --- a/_maps/RandomRuins/IceRuins/doppler/icemoon_underground_abandoned_icewalker_den.dmm +++ b/_maps/RandomRuins/IceRuins/doppler/icemoon_underground_abandoned_icewalker_den.dmm @@ -294,7 +294,7 @@ /turf/open/misc/asteroid/snow/icemoon, /area/ruin/unpowered/abandoned_hearth) "nA" = ( -/obj/machinery/vending/primitive_catgirl_clothing_vendor, +/obj/machinery/vending/primitive_genemod_clothing_vendor, /obj/effect/decal/cleanable/cobweb, /obj/structure/wall_torch/mount_only/directional/north, /obj/effect/decal/cleanable/dirt/dust, diff --git a/_maps/RandomRuins/IceRuins/doppler/icemoon_underground_icewalker_lower.dmm b/_maps/RandomRuins/IceRuins/doppler/icemoon_underground_icewalker_lower.dmm index 0ce6d5fa855db..26ca099fd0fe1 100644 --- a/_maps/RandomRuins/IceRuins/doppler/icemoon_underground_icewalker_lower.dmm +++ b/_maps/RandomRuins/IceRuins/doppler/icemoon_underground_icewalker_lower.dmm @@ -2,7 +2,7 @@ "ac" = ( /obj/structure/flora/ash/chilly, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "ad" = ( /obj/structure/closet/crate/wooden/storage_barrel, /obj/item/seeds/cabbage, @@ -20,7 +20,7 @@ /obj/item/seeds/onion/red, /obj/effect/turf_decal/siding/wood, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "ap" = ( /obj/structure/wall_torch/spawns_lit/directional/east, /obj/structure/railing/wooden_fencing{ @@ -30,7 +30,7 @@ dir = 1 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "at" = ( /obj/structure/rack/wooden, /obj/item/ore_sensor{ @@ -52,7 +52,7 @@ /obj/effect/turf_decal/siding/wood, /obj/structure/wall_torch/spawns_lit/directional/north, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "au" = ( /obj/structure/closet/crate/wooden/storage_barrel, /obj/item/fishing_hook/weighted, @@ -75,7 +75,7 @@ }, /obj/structure/wall_torch/spawns_lit/directional/north, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "aA" = ( /obj/structure/closet/crate/wooden/storage_barrel, /obj/item/food/cheese/firm_cheese{ @@ -92,22 +92,22 @@ }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "aB" = ( /obj/structure/railing/wooden_fencing, /obj/structure/railing/wooden_fencing{ dir = 4 }, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "aJ" = ( /obj/structure/railing/wooden_fencing, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "aO" = ( /obj/structure/wall_torch/spawns_lit/directional/south, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "bc" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 10 @@ -116,7 +116,7 @@ dir = 5 }, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "bu" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 @@ -131,31 +131,31 @@ pixel_y = -4 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "bB" = ( /obj/structure/fluff/minepost, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "bK" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 }, /obj/structure/wall_torch/spawns_lit/directional/north, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "bT" = ( /obj/structure/railing/wooden_fencing{ dir = 1 }, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "cM" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 4 }, /obj/effect/turf_decal/weather/snow/corner, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "cQ" = ( /obj/effect/turf_decal/siding/wood, /obj/structure/rack/wooden, @@ -165,36 +165,36 @@ pixel_x = 5 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "cU" = ( /obj/structure/water_source/puddle, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "cV" = ( /obj/structure/mineral_door/wood/large_gate, /obj/effect/turf_decal/weather/snow/corner{ dir = 1 }, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "de" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 }, /obj/structure/chair/sofa/bamboo/left, /turf/open/water/hot_spring, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "dj" = ( /obj/structure/flora/bush/snow/style_random, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "ds" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 5 }, /obj/effect/turf_decal/weather/snow/corner, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "dD" = ( /obj/structure/closet/crate/wooden/storage_barrel, /obj/item/seeds/cotton, @@ -214,13 +214,13 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/structure/wall_torch/spawns_lit/directional/west, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "dF" = ( /obj/structure/mineral_door/wood/large_gate{ dir = 4 }, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "dM" = ( /obj/item/pillow/random{ pixel_y = 4 @@ -229,7 +229,7 @@ dir = 8 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "em" = ( /obj/structure/closet/crate/wooden/storage_barrel, /obj/item/stack/sheet/leather{ @@ -241,7 +241,7 @@ /obj/item/stack/sheet/cloth/ten, /obj/item/stack/cable_coil/thirty, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "eq" = ( /obj/structure/table/wood, /obj/structure/large_mortar, @@ -251,18 +251,18 @@ }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "ev" = ( /obj/machinery/smartfridge/wooden/produce_bin, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "eS" = ( /obj/structure/railing/wooden_fencing, /obj/structure/railing/wooden_fencing{ dir = 1 }, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "fJ" = ( /obj/item/pillow/random{ pixel_y = 4 @@ -271,25 +271,25 @@ dir = 4 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "fK" = ( /obj/effect/turf_decal/siding/wood, /obj/structure/wall_torch/spawns_lit/directional/north, /turf/open/water/hot_spring, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "fV" = ( /obj/effect/turf_decal/siding/wood{ dir = 10 }, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "fY" = ( /obj/structure/spacevine{ name = "thick vines"; opacity = 1 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "gg" = ( /obj/structure/rack/wooden, /obj/item/canvas/twentythree_twentythree, @@ -297,13 +297,13 @@ /obj/item/canvas/thirtysix_twentyfour, /obj/item/paint_palette, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "gr" = ( /obj/effect/turf_decal/weather/dirt{ dir = 4 }, /turf/open/water/hot_spring, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "gz" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 6 @@ -312,13 +312,13 @@ dir = 1 }, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "gK" = ( /obj/effect/turf_decal/weather/dirt{ dir = 9 }, /turf/open/water/hot_spring, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "gU" = ( /obj/structure/rack/wooden, /obj/item/climbing_hook{ @@ -332,11 +332,11 @@ dir = 1 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "gW" = ( /obj/structure/table/wood, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "hb" = ( /obj/structure/rack/wooden, /obj/effect/turf_decal/siding/wood, @@ -347,35 +347,35 @@ pixel_y = -5 }, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "hB" = ( /obj/machinery/cauldron, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "hP" = ( /obj/structure/reagent_water_basin, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "hR" = ( /obj/structure/wall_torch/spawns_lit/directional/east, /obj/effect/turf_decal/siding/wood{ dir = 5 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "hW" = ( /obj/structure/mineral_door/wood/large_gate{ dir = 1 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "ie" = ( /obj/structure/railing/wooden_fencing{ dir = 8 }, /obj/structure/wall_torch/spawns_lit/directional/east, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "iy" = ( /obj/structure/rack/wooden, /obj/item/stack/sheet/iron/five{ @@ -417,18 +417,18 @@ }, /obj/structure/wall_torch/spawns_lit/directional/north, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "iz" = ( /obj/structure/railing/wooden_fencing/gate{ dir = 4 }, /turf/open/misc/hay/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "iI" = ( /obj/structure/window/green_glass_pane, /obj/structure/curtain/bounty, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "ja" = ( /obj/structure/table/wood, /obj/structure/wall_torch/spawns_lit/directional/south, @@ -436,32 +436,32 @@ pixel_x = 5 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "jf" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 1 }, /obj/effect/turf_decal/weather/snow/corner, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "js" = ( /obj/structure/ore_vein/iron, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "jR" = ( /obj/structure/wall_torch/spawns_lit/directional/south, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "ke" = ( /obj/structure/wall_torch/spawns_lit/directional/west, /obj/structure/flora/ash/leaf_shroom, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "kg" = ( /obj/structure/rack/wooden, /obj/structure/wall_torch/spawns_lit/directional/south, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "kh" = ( /obj/structure/railing/wooden_fencing{ dir = 8 @@ -473,11 +473,11 @@ dir = 4 }, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "kt" = ( /obj/item/flashlight/lantern, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "kx" = ( /obj/structure/rack/wooden, /obj/item/clothing/glasses/blindfold/white{ @@ -490,23 +490,23 @@ pixel_y = -6 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "kO" = ( /obj/structure/loom, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "kP" = ( /obj/structure/chair/sofa/bamboo/left, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "la" = ( /turf/open/floor/grass/fairy/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "lb" = ( /obj/structure/window/green_glass_pane, /obj/structure/curtain/bounty/start_closed, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "lg" = ( /obj/structure/closet/crate/wooden/storage_barrel, /obj/item/flashlight/lantern{ @@ -521,7 +521,7 @@ pixel_y = 2 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "ln" = ( /obj/structure/chair/wood{ dir = 8 @@ -530,7 +530,7 @@ dir = 4 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "lv" = ( /obj/structure/closet/crate/wooden/storage_barrel, /obj/item/seeds/coffee{ @@ -548,34 +548,34 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "lx" = ( /turf/closed/mineral/snowmountain/cavern, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "lA" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/blood, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "lI" = ( /obj/structure/mirror/directional/west, /obj/structure/rack/wooden, -/obj/item/clothing/under/dress/skirt/primitive_catgirl_tailored_dress, -/obj/item/clothing/under/dress/skirt/primitive_catgirl_tailored_dress, -/obj/item/clothing/under/dress/skirt/primitive_catgirl_tailored_dress, -/obj/item/clothing/under/dress/skirt/primitive_catgirl_tailored_dress, +/obj/item/clothing/under/dress/skirt/primitive_genemod_tailored_dress, +/obj/item/clothing/under/dress/skirt/primitive_genemod_tailored_dress, +/obj/item/clothing/under/dress/skirt/primitive_genemod_tailored_dress, +/obj/item/clothing/under/dress/skirt/primitive_genemod_tailored_dress, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "lQ" = ( /obj/structure/ore_vein/gold, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "mc" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 9 }, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "ml" = ( /obj/structure/mineral_door/wood/large_gate{ dir = 8 @@ -584,17 +584,17 @@ dir = 5 }, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "mq" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 1 }, /turf/open/water/hot_spring, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "mr" = ( /obj/structure/wall_torch/spawns_lit/directional/west, /turf/open/misc/hay/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "mG" = ( /obj/structure/table/wood, /obj/item/cutting_board, @@ -604,11 +604,11 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/blood, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "mH" = ( /obj/structure/wall_torch/spawns_lit/directional/south, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "mN" = ( /obj/structure/closet/crate/wooden/storage_barrel, /obj/item/food/raw_tiziran_sausage{ @@ -620,25 +620,25 @@ }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "mS" = ( /obj/structure/railing/wooden_fencing{ dir = 4 }, /obj/structure/ore_container/food_trough/raptor_trough, /turf/open/misc/hay/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "mU" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 }, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "mZ" = ( /obj/structure/table/wood, /obj/item/reagent_containers/cup/bowl/wood_bowl, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "nn" = ( /obj/effect/turf_decal/weather/dirt{ dir = 10 @@ -647,17 +647,17 @@ dir = 1 }, /turf/open/water/hot_spring, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "nG" = ( /obj/machinery/griddle/stone, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "nI" = ( /obj/effect/turf_decal/weather/dirt{ dir = 5 }, /turf/open/floor/grass/fairy/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "nL" = ( /obj/structure/closet/crate/wooden/storage_barrel, /obj/item/seeds/garlic, @@ -672,15 +672,15 @@ /obj/item/seeds/watermelon, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "nQ" = ( /obj/structure/bonfire/prelit, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "nR" = ( /obj/machinery/primitive_stove, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "oe" = ( /obj/structure/closet/crate/wooden/storage_barrel, /obj/item/pen/charcoal, @@ -695,7 +695,7 @@ pixel_x = -5 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "of" = ( /obj/structure/spacevine{ name = "thick vines"; @@ -705,7 +705,7 @@ dir = 8 }, /turf/open/water/hot_spring, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "ol" = ( /obj/structure/railing/wooden_fencing{ dir = 8 @@ -717,11 +717,11 @@ dir = 1 }, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "om" = ( /obj/structure/mirror/directional/west, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "oy" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 8 @@ -730,28 +730,28 @@ dir = 4 }, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "oB" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 }, /obj/structure/reagent_crafting_bench, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "oJ" = ( /obj/effect/turf_decal/weather/dirt, /turf/open/water/hot_spring, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "oL" = ( /obj/machinery/smartfridge/wooden/seed_shelf, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "oN" = ( /obj/structure/railing/wooden_fencing{ dir = 4 }, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "oQ" = ( /obj/structure/mineral_door/wood/large_gate{ dir = 4 @@ -761,7 +761,7 @@ }, /obj/effect/turf_decal/weather/snow/corner, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "pd" = ( /obj/structure/closet/crate/wooden/storage_barrel, /obj/item/seeds/aloe{ @@ -783,41 +783,41 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/siding/wood, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "pm" = ( /obj/effect/turf_decal/weather/dirt{ dir = 6 }, /turf/open/water/hot_spring, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "po" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 4 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "pA" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "pW" = ( /obj/effect/turf_decal/weather/snow/corner, /turf/open/water/hot_spring, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "qb" = ( /obj/effect/turf_decal/siding/wood{ dir = 9 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "qh" = ( /obj/effect/turf_decal/weather/dirt{ dir = 8 }, /turf/open/water/hot_spring, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "qr" = ( /obj/structure/rack/wooden, /obj/item/flashlight/flare/torch{ @@ -834,11 +834,11 @@ }, /obj/structure/wall_torch/spawns_lit/directional/south, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "qu" = ( /obj/effect/turf_decal/siding/wood, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "qN" = ( /obj/structure/rack/wooden, /obj/item/reagent_containers/cup/glass/bottle/small{ @@ -860,55 +860,55 @@ pixel_x = 1 }, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "rd" = ( /obj/structure/ore_vein/stone, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "rg" = ( /obj/structure/wall_torch/spawns_lit/directional/north, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "rL" = ( /obj/structure/fluff/minepost, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "rY" = ( /obj/structure/chair/sofa/bamboo{ dir = 1 }, /turf/open/water/hot_spring, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "sj" = ( /obj/structure/spacevine{ name = "thick vines"; opacity = 1 }, /turf/open/floor/grass/fairy/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "sl" = ( /obj/structure/wall_torch/spawns_lit/directional/west, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "sq" = ( /obj/structure/reagent_forge, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "su" = ( /turf/closed/mineral/snowmountain/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "sz" = ( /obj/structure/wall_torch/spawns_lit/directional/east, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "sM" = ( /obj/item/pillow, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "te" = ( /obj/structure/wall_torch/spawns_lit/directional/north, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "tu" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 @@ -917,7 +917,7 @@ dir = 8 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "tz" = ( /obj/structure/rack/wooden, /obj/item/paper_bin/bundlenatural{ @@ -929,33 +929,33 @@ pixel_x = -5 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "tB" = ( /obj/structure/ore_container/food_trough/raptor_trough, /turf/open/misc/hay/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "tI" = ( /obj/structure/spacevine{ name = "thick vines"; opacity = 1 }, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "uC" = ( /obj/structure/rack/wooden, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "uG" = ( /obj/structure/spacevine{ name = "thick vines"; opacity = 1 }, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "uP" = ( /obj/structure/hearthkin_rune_stone, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "uT" = ( /obj/structure/rack/wooden, /obj/item/climbing_hook{ @@ -967,14 +967,14 @@ dir = 1 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "uV" = ( /obj/effect/turf_decal/siding/wood, /obj/item/stack/sheet/cloth/ten, /obj/structure/rack/wooden, /obj/item/food/grown/poppy/geranium, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "vd" = ( /obj/machinery/portable_atmospherics/scrubber/huge{ alpha = 0; @@ -984,7 +984,7 @@ /obj/structure/window/green_glass_pane, /obj/structure/curtain/bounty, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "vk" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 @@ -993,11 +993,11 @@ /obj/item/stack/sheet/mineral/coal/ten, /obj/item/stack/sheet/mineral/wood/fifty, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "vm" = ( /obj/structure/flora/ash/cap_shroom, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "vq" = ( /obj/structure/spacevine{ name = "thick vines"; @@ -1005,42 +1005,42 @@ }, /obj/effect/turf_decal/weather/snow/corner, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "vu" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 }, /turf/open/water/hot_spring, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "vy" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 }, /obj/structure/wall_torch/spawns_lit/directional/north, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "vG" = ( /obj/structure/table/wood, /obj/item/reagent_containers/cup/primitive_centrifuge, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "vI" = ( /obj/structure/table/wood, /obj/item/food/honey_roll, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "ws" = ( /obj/structure/table/wood, /obj/item/reagent_containers/cup/glass/trophy, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "wB" = ( /obj/structure/railing/wooden_fencing{ dir = 1 }, /obj/structure/ore_container/food_trough/raptor_trough, /turf/open/misc/hay/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "wF" = ( /obj/structure/rack/wooden, /obj/item/fishing_rod/bone{ @@ -1051,20 +1051,20 @@ }, /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "wN" = ( /obj/structure/flora/bush/sparsegrass/style_random, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "wQ" = ( /obj/structure/curtain/bounty, /obj/structure/window/green_glass_pane, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "wU" = ( /obj/structure/wall_torch/spawns_lit/directional/south, /turf/open/water/hot_spring, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "xc" = ( /obj/structure/wall_torch/spawns_lit/directional/west, /obj/effect/turf_decal/weather/snow/corner{ @@ -1074,11 +1074,11 @@ dir = 8 }, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "xu" = ( /obj/effect/turf_decal/weather/snow/corner, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "xT" = ( /obj/structure/closet/crate/wooden/storage_barrel, /obj/item/food/rootdough, @@ -1088,16 +1088,16 @@ }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "xU" = ( /obj/structure/wall_torch/spawns_lit/directional/east, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "xX" = ( /obj/structure/table/wood, /obj/item/food/honeybun, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "yd" = ( /obj/structure/rack/wooden, /obj/item/storage/box/matches{ @@ -1106,7 +1106,7 @@ }, /obj/item/storage/fancy/candle_box, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "yf" = ( /obj/structure/statue/hearthkin/odin, /obj/effect/turf_decal/siding/wood{ @@ -1116,7 +1116,7 @@ dir = 4 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "yn" = ( /obj/structure/rack/wooden, /obj/item/restraints/legcuffs/bola{ @@ -1144,28 +1144,28 @@ }, /obj/structure/wall_torch/spawns_lit/directional/south, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "yp" = ( /obj/structure/chair/sofa/bamboo/right{ dir = 1 }, /turf/open/water/hot_spring, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "yx" = ( /obj/effect/turf_decal/weather/dirt{ dir = 9 }, /obj/structure/wall_torch/spawns_lit/directional/south, /turf/open/water/hot_spring, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "yy" = ( -/obj/effect/mob_spawn/ghost_role/human/primitive_catgirl, +/obj/effect/mob_spawn/ghost_role/human/primitive_genemod, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "yE" = ( /obj/effect/turf_decal/siding/wood, /turf/open/water/hot_spring, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "yN" = ( /obj/structure/rack/wooden, /obj/item/climbing_hook{ @@ -1177,37 +1177,37 @@ }, /obj/effect/turf_decal/siding/wood, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "yR" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 }, /turf/open/water/hot_spring, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "yU" = ( /obj/structure/window/green_glass_pane, /obj/structure/curtain/bounty, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "zt" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 8 }, /turf/open/water/hot_spring, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "zu" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 }, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "zy" = ( /obj/item/pillow/random{ pixel_y = 4 }, /obj/effect/turf_decal/siding/wood, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "zE" = ( /obj/effect/turf_decal/siding/wood{ dir = 10 @@ -1225,36 +1225,36 @@ pixel_x = -3 }, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "zI" = ( /obj/structure/railing/wooden_fencing{ dir = 1 }, /obj/structure/ore_vein/gold, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Aj" = ( /obj/structure/chair/sofa/bamboo/right, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Aw" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 }, /obj/effect/turf_decal/weather/snow/corner, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "AA" = ( /obj/structure/rack/wooden, /obj/item/instrument/glockenspiel, /obj/item/instrument/guitar, /obj/item/instrument/banjo, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "AE" = ( /obj/machinery/smartfridge/wooden/ration_shelf, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "AF" = ( /obj/structure/mineral_door/wood/large_gate{ dir = 4 @@ -1263,20 +1263,20 @@ dir = 8 }, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "AI" = ( /obj/structure/wall_torch/spawns_lit/directional/north, /obj/effect/turf_decal/weather/snow/corner{ dir = 4 }, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "AK" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 8 }, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "AR" = ( /obj/structure/table/wood, /obj/item/flashlight/flare/candle/infinite{ @@ -1285,7 +1285,7 @@ }, /obj/effect/decal/cleanable/blood/gibs/old, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Bd" = ( /obj/structure/closet/crate/wooden/storage_barrel, /obj/item/seeds/corn, @@ -1303,17 +1303,17 @@ dir = 4 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Be" = ( /obj/structure/wall_torch/spawns_lit/directional/south, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Bh" = ( /obj/structure/railing/wooden_fencing/gate{ dir = 1 }, /turf/open/misc/hay/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Bq" = ( /obj/structure/rack/wooden, /obj/item/pickaxe{ @@ -1336,17 +1336,17 @@ /obj/effect/turf_decal/siding/wood, /obj/structure/wall_torch/spawns_lit/directional/north, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "BA" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 6 }, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "BF" = ( -/obj/machinery/vending/primitive_catgirl_clothing_vendor, +/obj/machinery/vending/primitive_genemod_clothing_vendor, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "BG" = ( /obj/structure/rack/wooden, /obj/item/ore_sensor{ @@ -1367,7 +1367,7 @@ }, /obj/effect/turf_decal/siding/wood, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "BL" = ( /obj/machinery/portable_atmospherics/scrubber/huge{ alpha = 0; @@ -1375,7 +1375,7 @@ name = "air scrubber" }, /turf/closed/wall/mineral/stone, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "BU" = ( /obj/structure/rack/wooden, /obj/item/reagent_containers/cup/soup_pot{ @@ -1396,7 +1396,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/structure/wall_torch/spawns_lit/directional/south, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Ca" = ( /obj/structure/railing/wooden_fencing{ dir = 1 @@ -1405,24 +1405,24 @@ dir = 4 }, /turf/open/misc/hay/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Co" = ( /obj/structure/stairs/wood{ dir = 1 }, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "CD" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 }, /obj/structure/wall_torch/spawns_lit/directional/west, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "CU" = ( /obj/effect/turf_decal/weather/dirt, /turf/open/floor/grass/fairy/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "CX" = ( /obj/structure/rack/wooden, /obj/item/flashlight/flare/torch{ @@ -1439,13 +1439,13 @@ }, /obj/structure/wall_torch/spawns_lit/directional/west, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Df" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Di" = ( /obj/structure/rack/wooden, /obj/item/reagent_containers/cup/bowl/mushroom_bowl{ @@ -1462,52 +1462,52 @@ }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Dz" = ( /obj/structure/railing/wooden_fencing{ dir = 1 }, /turf/open/misc/hay/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "DB" = ( /obj/structure/mineral_door/wood/large_gate, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "DJ" = ( /obj/effect/turf_decal/weather/snow/corner, /obj/effect/turf_decal/weather/snow/corner{ dir = 4 }, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Eh" = ( /obj/structure/table/wood, /obj/item/food/bread/meat, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Ej" = ( /obj/structure/stairs/wood{ dir = 8 }, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Er" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 1 }, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Es" = ( /obj/structure/table/wood, /obj/item/reagent_containers/cup/bowl/mushroom_bowl, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "EL" = ( /obj/structure/railing/wooden_fencing{ dir = 4 }, /turf/open/misc/hay/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "EP" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 10 @@ -1516,7 +1516,7 @@ dir = 1 }, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "ER" = ( /obj/structure/wall_torch/spawns_lit/directional/north, /obj/structure/table/wood, @@ -1531,34 +1531,34 @@ }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "EU" = ( /obj/structure/mineral_door/wood/large_gate{ dir = 1 }, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "EZ" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 }, /obj/structure/chair/sofa/bamboo/right, /turf/open/water/hot_spring, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Fj" = ( /obj/structure/chair/wood, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Fw" = ( /obj/item/pillow/random{ pixel_y = 4 }, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "FG" = ( /obj/structure/reagent_crafting_bench, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "FK" = ( /obj/structure/rack/wooden, /obj/item/ore_sensor{ @@ -1579,17 +1579,17 @@ }, /obj/effect/turf_decal/siding/wood, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "FP" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 8 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "FW" = ( /obj/structure/wall_torch/spawns_lit/directional/west, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "FX" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 1 @@ -1598,13 +1598,13 @@ dir = 6 }, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Ga" = ( /obj/structure/stairs/wood{ dir = 4 }, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Gf" = ( /obj/effect/turf_decal/siding/wood{ dir = 9 @@ -1613,26 +1613,26 @@ dir = 4 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Gy" = ( /obj/effect/turf_decal/siding/wood, /obj/structure/reagent_anvil, /obj/item/forging/hammer/primitive, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "GD" = ( /obj/structure/wall_torch/spawns_lit/directional/west, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "GU" = ( /obj/structure/railing/wooden_fencing{ dir = 8 }, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Hd" = ( /turf/open/water/hot_spring, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Hv" = ( /obj/structure/rack/wooden, /obj/item/dice/d20{ @@ -1641,18 +1641,18 @@ }, /obj/item/chisel/primitive, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "HB" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 4 }, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Is" = ( /obj/structure/wall_torch/spawns_lit/directional/north, /obj/structure/flora/ash/stem_shroom, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "IE" = ( /obj/structure/rack/wooden, /obj/item/pickaxe{ @@ -1674,7 +1674,7 @@ /obj/item/pickaxe, /obj/effect/turf_decal/siding/wood, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "IF" = ( /obj/structure/table/wood, /obj/item/reagent_containers/cup/bowl/wood_bowl{ @@ -1685,31 +1685,31 @@ pixel_x = 3 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "II" = ( /obj/effect/turf_decal/weather/dirt{ dir = 1 }, /turf/open/water/hot_spring, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "IJ" = ( /obj/structure/wall_torch/spawns_lit/directional/east, /obj/effect/turf_decal/weather/snow/corner{ dir = 8 }, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "IQ" = ( /obj/machinery/smartfridge/wooden/produce_bin, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "IR" = ( /obj/structure/rack/wooden, -/obj/item/clothing/suit/jacket/primitive_catgirl_coat, -/obj/item/clothing/suit/jacket/primitive_catgirl_coat, -/obj/item/clothing/suit/jacket/primitive_catgirl_coat, +/obj/item/clothing/suit/jacket/primitive_genemod_coat, +/obj/item/clothing/suit/jacket/primitive_genemod_coat, +/obj/item/clothing/suit/jacket/primitive_genemod_coat, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "IS" = ( /obj/structure/closet/crate/wooden/storage_barrel, /obj/item/restraints/handcuffs/cable/sinew, @@ -1721,7 +1721,7 @@ pixel_y = 6 }, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Jj" = ( /obj/structure/closet/crate/wooden/storage_barrel, /obj/item/fish/chasm_crab/ice{ @@ -1740,14 +1740,14 @@ pixel_y = 8 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Jl" = ( /obj/structure/spacevine{ name = "thick vines"; opacity = 1 }, /turf/open/water/hot_spring, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Jn" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 6 @@ -1756,28 +1756,28 @@ dir = 8 }, /turf/open/water/hot_spring, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Jq" = ( /turf/open/misc/hay/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Jt" = ( /obj/structure/railing/wooden_fencing{ dir = 8 }, /obj/structure/wall_torch/spawns_lit/directional/south, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "JF" = ( /obj/effect/turf_decal/siding/wood{ dir = 9 }, /obj/structure/rack/wooden, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "JI" = ( /obj/structure/curtain/bounty, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "JN" = ( /obj/structure/rack/wooden, /obj/item/soap/homemade{ @@ -1801,29 +1801,29 @@ }, /obj/structure/wall_torch/spawns_lit/directional/north, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "JO" = ( /obj/structure/chair/wood{ dir = 1 }, /obj/effect/turf_decal/siding/wood, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "JQ" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "JT" = ( /obj/structure/wall_torch/spawns_lit/directional/west, /obj/structure/rack/wooden, -/obj/item/clothing/under/dress/skirt/primitive_catgirl_tunic, -/obj/item/clothing/under/dress/skirt/primitive_catgirl_tunic, -/obj/item/clothing/under/dress/skirt/primitive_catgirl_tunic, -/obj/item/clothing/under/dress/skirt/primitive_catgirl_tunic, +/obj/item/clothing/under/dress/skirt/primitive_genemod_tunic, +/obj/item/clothing/under/dress/skirt/primitive_genemod_tunic, +/obj/item/clothing/under/dress/skirt/primitive_genemod_tunic, +/obj/item/clothing/under/dress/skirt/primitive_genemod_tunic, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Kc" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 4 @@ -1832,21 +1832,21 @@ dir = 8 }, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Kd" = ( /turf/closed/wall/mineral/wood/nonmetal, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Kn" = ( /obj/structure/wall_torch/spawns_lit/directional/north, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Kr" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 }, /obj/structure/chair/sofa/bamboo, /turf/open/water/hot_spring, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Ku" = ( /obj/effect/turf_decal/siding/wood{ dir = 10 @@ -1860,7 +1860,7 @@ pixel_y = -4 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Kz" = ( /obj/structure/closet/crate/wooden/storage_barrel, /obj/item/wirecutters/primitive, @@ -1869,7 +1869,7 @@ /obj/item/crowbar/primitive, /obj/item/weldingtool/mini, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "KU" = ( /obj/structure/closet/crate/wooden/storage_barrel, /obj/item/seeds/greenbean, @@ -1884,11 +1884,11 @@ /obj/item/seeds/lemon, /obj/item/seeds/lime, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "LA" = ( /obj/structure/flora/ash/tall_shroom, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "LC" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -1899,17 +1899,17 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/item/shovel, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "LG" = ( /obj/effect/turf_decal/weather/dirt{ dir = 1 }, /turf/open/floor/grass/fairy/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "LR" = ( /obj/structure/flora/ash/leaf_shroom, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "LU" = ( /obj/structure/rack/wooden, /obj/item/plate/blowing_glass{ @@ -1945,14 +1945,14 @@ pixel_x = 7 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "LV" = ( /obj/structure/table/wood, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Md" = ( /turf/closed/wall/mineral/stone, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Mg" = ( /obj/effect/turf_decal/weather/dirt{ dir = 4 @@ -1961,12 +1961,12 @@ dir = 8 }, /turf/open/water/hot_spring, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Mr" = ( /obj/structure/wall_torch/spawns_lit/directional/north, /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Mw" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -1975,7 +1975,7 @@ /obj/item/stack/sheet/mineral/coal/ten, /obj/item/stack/sheet/mineral/wood/fifty, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "MQ" = ( /obj/structure/rack/wooden, /obj/item/flashlight/flare/torch{ @@ -1992,7 +1992,7 @@ }, /obj/structure/wall_torch/spawns_lit/directional/north, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Nb" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 6 @@ -2001,13 +2001,13 @@ dir = 1 }, /turf/open/water/hot_spring, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Nr" = ( /obj/effect/turf_decal/siding/wood{ dir = 10 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Nz" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -2016,40 +2016,40 @@ dir = 6 }, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "NA" = ( /obj/structure/flora/tree/pine/style_random, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "NP" = ( /obj/structure/stairs/wood{ dir = 4 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "NR" = ( /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Od" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 10 }, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Of" = ( /obj/structure/railing/wooden_fencing, /obj/structure/wall_torch/spawns_lit/directional/west, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Oi" = ( /obj/structure/flora/ash/seraka, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Oz" = ( /obj/structure/rack/wooden, /obj/structure/wall_torch/spawns_lit/directional/north, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "OI" = ( /obj/structure/closet/crate/wooden/storage_barrel, /obj/item/food/plumphelmetbiscuit{ @@ -2066,17 +2066,17 @@ }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "OY" = ( /obj/structure/chair/sofa/bamboo, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Pk" = ( /obj/structure/railing/wooden_fencing{ dir = 8 }, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Pz" = ( /obj/structure/table/wood, /obj/item/reagent_containers/cup/bowl/mushroom_bowl{ @@ -2084,7 +2084,7 @@ pixel_x = 3 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "PB" = ( /obj/structure/railing/wooden_fencing{ dir = 4 @@ -2093,24 +2093,24 @@ dir = 8 }, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "PL" = ( /obj/structure/mineral_door/wood/large_gate, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Qb" = ( /obj/structure/table/wood, /obj/item/reagent_containers/cup/bowl/ceramic, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Qj" = ( /obj/machinery/oven/stone, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Qx" = ( /obj/structure/stairs/wood, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "QF" = ( /obj/structure/rack/wooden, /obj/item/gun/ballistic/bow/longbow, @@ -2119,24 +2119,24 @@ dir = 9 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "QT" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 5 }, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "QU" = ( /obj/structure/rack/wooden, /obj/item/raptor_dex, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Ra" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 }, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Rk" = ( /obj/structure/chair/wood{ dir = 4 @@ -2145,13 +2145,13 @@ dir = 8 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Rp" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "RJ" = ( /obj/structure/table/wood, /obj/item/flashlight/flare/candle/infinite{ @@ -2160,13 +2160,13 @@ }, /obj/effect/decal/cleanable/blood/gibs/old, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "RW" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 }, /turf/open/water/hot_spring, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "RZ" = ( /obj/structure/closet/crate/wooden/storage_barrel, /obj/item/seeds/plump{ @@ -2195,16 +2195,16 @@ dir = 6 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Sa" = ( /obj/structure/wall_torch/spawns_lit/directional/east, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Sp" = ( /obj/machinery/smartfridge/drying/rack, /obj/structure/wall_torch/spawns_lit/directional/north, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Sq" = ( /obj/item/pillow/random{ pixel_y = 4 @@ -2213,46 +2213,46 @@ dir = 1 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "SG" = ( /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "SL" = ( /obj/structure/wall_torch/spawns_lit/directional/west, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Tx" = ( /obj/effect/spawner/random/lavaland_mob/raptor, /turf/open/misc/hay/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "TS" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 4 }, /turf/open/water/hot_spring, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "TW" = ( /obj/effect/turf_decal/weather/dirt{ dir = 6 }, /turf/open/floor/grass/fairy/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "TY" = ( /obj/structure/curtain/bounty, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "TZ" = ( /obj/structure/wall_torch/spawns_lit/directional/south, /obj/structure/hearthkin_rune_stone, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Ud" = ( /obj/effect/turf_decal/siding/wood/corner, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Uk" = ( /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "UA" = ( /obj/structure/closet/crate/wooden/storage_barrel, /obj/item/fish/armorfish{ @@ -2274,74 +2274,74 @@ pixel_y = 3 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Vc" = ( /obj/structure/fluff/minepost, /turf/open/water/hot_spring, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Vp" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Vx" = ( /obj/structure/table/wood, /obj/structure/wall_torch/spawns_lit/directional/west, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Vy" = ( /obj/structure/mineral_door/wood/large_gate{ dir = 1 }, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "VU" = ( /obj/structure/millstone, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "VW" = ( /obj/structure/wall_torch/spawns_lit/directional/north, /obj/effect/turf_decal/weather/snow/corner, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Wa" = ( /obj/structure/chair/wood{ dir = 1 }, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Wp" = ( /obj/structure/wall_torch/spawns_lit/directional/north, /obj/effect/turf_decal/weather/snow/corner{ dir = 10 }, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Ww" = ( /obj/structure/railing/wooden_fencing, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "WP" = ( /obj/structure/railing/wooden_fencing, /turf/open/misc/hay/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "WS" = ( /obj/structure/chair/wood, /obj/effect/turf_decal/siding/wood{ dir = 1 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "WU" = ( /obj/effect/turf_decal/weather/dirt{ dir = 8 }, /turf/open/floor/grass/fairy/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "WW" = ( /obj/structure/flora/rock/pile/icy/style_random, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Xe" = ( /obj/structure/table/wood, /obj/structure/wall_torch/spawns_lit/directional/south, @@ -2349,18 +2349,18 @@ pixel_x = -5 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Xi" = ( /obj/structure/railing/wooden_fencing, /obj/structure/railing/wooden_fencing{ dir = 4 }, /turf/open/misc/hay/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Xu" = ( /obj/structure/ore_vein/silver, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "XX" = ( /obj/structure/rack/wooden, /obj/item/reagent_containers/cup/rag{ @@ -2371,7 +2371,7 @@ pixel_x = 6 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Yk" = ( /obj/structure/closet/crate/wooden/storage_barrel, /obj/item/food/cheese/mozzarella{ @@ -2391,37 +2391,37 @@ }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "YA" = ( /obj/item/target/archery{ dir = 1 }, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "YE" = ( /obj/effect/turf_decal/weather/dirt{ dir = 10 }, /turf/open/water/hot_spring, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "YO" = ( /obj/structure/wall_torch/spawns_lit/directional/north, /obj/effect/turf_decal/weather/snow/corner{ dir = 6 }, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "YQ" = ( /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "YX" = ( /obj/effect/turf_decal/weather/snow/corner, /obj/effect/turf_decal/weather/snow/corner{ dir = 1 }, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "YZ" = ( /obj/structure/rack/wooden, /obj/item/paper_bin/bundlenatural{ @@ -2437,26 +2437,26 @@ pixel_x = -5 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Ze" = ( /obj/structure/railing/wooden_fencing{ dir = 1 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Zj" = ( /obj/structure/flora/ash/stem_shroom, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Zu" = ( /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "ZB" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "ZM" = ( /obj/structure/rack/wooden, /obj/item/gun/ballistic/bow/longbow, @@ -2465,13 +2465,13 @@ dir = 1 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "ZU" = ( /obj/structure/mineral_door/wood/large_gate{ dir = 8 }, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) (1,1,1) = {" NR diff --git a/_maps/RandomRuins/IceRuins/doppler/icemoon_underground_icewalker_upper.dmm b/_maps/RandomRuins/IceRuins/doppler/icemoon_underground_icewalker_upper.dmm index 00a2c419fee29..be0d45e465d3c 100644 --- a/_maps/RandomRuins/IceRuins/doppler/icemoon_underground_icewalker_upper.dmm +++ b/_maps/RandomRuins/IceRuins/doppler/icemoon_underground_icewalker_upper.dmm @@ -5,7 +5,7 @@ }, /obj/structure/wall_torch/spawns_lit/directional/south, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "ay" = ( /obj/item/food/grown/aloe{ pixel_x = 5 @@ -17,48 +17,48 @@ /obj/structure/closet/crate/wooden/storage_barrel, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "aN" = ( /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "aX" = ( /obj/structure/window/green_glass_pane, /obj/structure/curtain/bounty, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "bd" = ( /obj/structure/mannequin/wood, /obj/structure/wall_torch/spawns_lit/directional/north, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "bL" = ( /obj/structure/railing/wooden_fencing{ dir = 8 }, /obj/structure/wall_torch/spawns_lit/directional/east, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "bN" = ( /obj/structure/wall_torch/spawns_lit/directional/south, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "bU" = ( /obj/structure/rack/wooden, /obj/structure/wall_torch/spawns_lit/directional/east, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "cL" = ( /obj/structure/closet/xenoarch/tribal_version, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "cM" = ( /obj/structure/wall_torch/spawns_lit/directional/west, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "da" = ( /obj/structure/wall_torch/spawns_lit/directional/north, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "dc" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 10 @@ -67,11 +67,11 @@ dir = 4 }, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "di" = ( /obj/effect/turf_decal/siding/wood/corner, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "dl" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt/dust, @@ -81,7 +81,7 @@ pixel_x = -8 }, /turf/open/floor/grass/fairy/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "do" = ( /obj/structure/table/wood, /obj/item/reagent_containers/cup/primitive_centrifuge{ @@ -95,23 +95,23 @@ /obj/item/pen/charcoal, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/grass/fairy/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "dF" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 4 }, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "dR" = ( /obj/structure/wall_torch/spawns_lit/directional/east, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "dY" = ( /obj/structure/mineral_door/wood/large_gate{ dir = 8 }, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "dZ" = ( /obj/structure/closet/crate/wooden/storage_barrel, /obj/item/reagent_containers/cup/glass/bottle/moonshine{ @@ -124,28 +124,28 @@ pixel_y = 8 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "ek" = ( /turf/open/openspace/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "ey" = ( /obj/structure/railing/wooden_fencing{ dir = 8 }, /obj/item/pillow, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "eL" = ( /obj/structure/railing/wooden_fencing{ dir = 1 }, /obj/item/pillow, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "eP" = ( /obj/item/flashlight/lantern, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "fW" = ( /obj/structure/railing/wooden_fencing{ dir = 1 @@ -154,7 +154,7 @@ dir = 8 }, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "gd" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 10 @@ -163,16 +163,16 @@ dir = 5 }, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "gk" = ( /obj/structure/bed/double/pelt, /obj/structure/curtain/bounty, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "gU" = ( /obj/structure/water_source/puddle, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "hb" = ( /obj/structure/table/wood, /obj/item/reagent_containers/cup/primitive_centrifuge{ @@ -180,11 +180,11 @@ pixel_y = 10 }, /turf/open/floor/grass/fairy/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "hg" = ( /obj/structure/wall_torch/spawns_lit/directional/north, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "ho" = ( /obj/structure/rack/wooden, /obj/item/bonesetter/primitive, @@ -195,25 +195,25 @@ /obj/item/retractor/primitive, /obj/item/surgicaldrill/primitive, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "hx" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 }, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "iI" = ( /obj/structure/fluff/minepost, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "iL" = ( /obj/structure/fireplace, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "iU" = ( /obj/structure/flora/bush/snow/style_random, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "iV" = ( /obj/structure/mineral_door/wood/large_gate{ dir = 4 @@ -222,18 +222,18 @@ dir = 8 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "jd" = ( /obj/structure/wall_torch/spawns_lit/directional/west, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "je" = ( /obj/structure/rugs/pelt/black{ dir = 4; pixel_y = -15 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "kd" = ( /obj/structure/mineral_door/wood/large_gate{ dir = 8 @@ -243,28 +243,28 @@ }, /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "kr" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 5 }, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "kH" = ( /obj/structure/curtain/bounty, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "kI" = ( /obj/structure/railing/wooden_fencing, /obj/structure/railing/wooden_fencing{ dir = 8 }, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "kM" = ( /obj/structure/window/green_glass_pane, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "lF" = ( /obj/structure/bed/double/pelt/black{ dir = 1 @@ -273,11 +273,11 @@ dir = 4 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "lO" = ( /obj/structure/flora/tree/pine/style_random, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "mP" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 8 @@ -286,11 +286,11 @@ dir = 4 }, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "nN" = ( /obj/effect/turf_decal/siding/wood, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "on" = ( /obj/structure/table/wood, /obj/structure/large_mortar, @@ -300,55 +300,55 @@ }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/grass/fairy/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "oT" = ( /obj/structure/closet/crate/wooden/storage_barrel, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "pw" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 }, /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "pH" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "pJ" = ( /obj/structure/table/wood, /obj/item/xenoarch/strange_rock, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "qu" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 }, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "qT" = ( /obj/structure/railing/wooden_fencing{ dir = 8 }, /obj/structure/calling_horn/hearthkin, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "rT" = ( /obj/structure/railing/wooden_fencing{ dir = 8 }, /obj/structure/railing/wooden_fencing, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "st" = ( /obj/structure/wall_torch/spawns_lit/directional/north, /obj/structure/rack/wooden, /obj/item/storage/fancy/candle_box, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "sB" = ( /obj/structure/rack/wooden, /obj/effect/decal/cleanable/dirt/dust, @@ -362,62 +362,62 @@ pixel_x = 7 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "sE" = ( /obj/structure/railing/wooden_fencing{ dir = 8 }, /obj/effect/turf_decal/siding/wood, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "sO" = ( /obj/structure/railing/wooden_fencing/gate, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "uo" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 8 }, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "uy" = ( /obj/structure/railing/wooden_fencing{ dir = 4 }, /obj/structure/wall_torch/spawns_lit/directional/west, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "uR" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 1 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "vH" = ( /obj/structure/railing/wooden_fencing/gate{ dir = 1 }, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "vP" = ( /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "wg" = ( /obj/structure/railing/wooden_fencing{ dir = 4 }, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "wj" = ( /obj/effect/turf_decal/siding/wood{ dir = 10 }, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "wQ" = ( /obj/structure/rugs/pelt/black, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "xk" = ( /obj/structure/mineral_door/wood/large_gate{ dir = 8 @@ -426,17 +426,17 @@ dir = 1 }, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "xn" = ( /obj/structure/mineral_door/wood/large_gate{ dir = 1 }, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "xE" = ( /obj/machinery/cauldron, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "xG" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 5 @@ -445,121 +445,121 @@ dir = 8 }, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "xR" = ( /obj/structure/railing/wooden_fencing{ dir = 4 }, /obj/structure/railing/wooden_fencing, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "AW" = ( /obj/effect/turf_decal/siding/wood/corner, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Bv" = ( /obj/item/pillow, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "CJ" = ( /obj/structure/table/wood, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "DH" = ( /obj/structure/closet/cardboard, /obj/structure/wall_torch/spawns_lit/directional/north, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "DL" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 }, /obj/structure/rack/wooden, -/obj/item/clothing/shoes/winterboots/ice_boots/primitive_catgirl_boots{ +/obj/item/clothing/shoes/winterboots/ice_boots/primitive_genemod_boots{ pixel_y = 8; pixel_x = -4 }, -/obj/item/clothing/shoes/winterboots/ice_boots/primitive_catgirl_boots{ +/obj/item/clothing/shoes/winterboots/ice_boots/primitive_genemod_boots{ pixel_y = 8; pixel_x = 4 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Ee" = ( /obj/structure/wall_torch/spawns_lit/directional/east, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Eg" = ( /obj/structure/rack/wooden, /obj/item/bedsheet, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Et" = ( /obj/structure/millstone, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Fg" = ( /obj/machinery/smartfridge/wooden/seed_shelf, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Fm" = ( /obj/structure/table/wood, /obj/structure/wall_torch/spawns_lit/directional/west, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Fo" = ( /obj/structure/rack/wooden, /obj/item/storage/crayons, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Fs" = ( /obj/structure/railing/wooden_fencing, /obj/structure/wall_torch/spawns_lit/directional/north, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Fv" = ( /obj/machinery/smartfridge/drying/rack, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/wall_torch/spawns_lit/directional/east, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "FB" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 6 }, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "FO" = ( /obj/structure/railing/wooden_fencing{ dir = 1 }, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Gj" = ( /obj/structure/railing/wooden_fencing, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Gs" = ( /obj/structure/rack/wooden, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "GN" = ( /turf/closed/mineral/snowmountain/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "HV" = ( /obj/structure/railing/wooden_fencing{ dir = 8 }, /obj/structure/mannequin/wood, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Ib" = ( /obj/structure/railing/wooden_fencing{ dir = 4 }, /obj/effect/turf_decal/siding/wood, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Id" = ( /obj/structure/railing/wooden_fencing{ dir = 1 @@ -568,31 +568,31 @@ dir = 8 }, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Ii" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 }, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "IF" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 10 }, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Jh" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 }, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Js" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 1 }, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "JI" = ( /obj/structure/railing/wooden_fencing{ dir = 1 @@ -601,7 +601,7 @@ dir = 4 }, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "JJ" = ( /obj/structure/mineral_door/wood/large_gate{ dir = 1 @@ -610,12 +610,12 @@ dir = 1 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "KK" = ( /obj/structure/bed/double/pelt/black, /obj/item/bedsheet/double, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Lq" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -624,20 +624,20 @@ /obj/structure/rack/wooden, /obj/item/toy/crayon/spraycan, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Lt" = ( /obj/structure/railing/wooden_fencing{ dir = 4 }, /obj/item/pillow, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "LA" = ( /obj/structure/mineral_door/wood/large_gate{ dir = 4 }, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "LF" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 4 @@ -646,89 +646,89 @@ dir = 8 }, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "LQ" = ( /obj/structure/mineral_door/wood/large_gate{ dir = 4 }, /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "LR" = ( /turf/closed/mineral/snowmountain/cavern, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Ma" = ( /obj/effect/turf_decal/siding/wood{ dir = 9 }, /obj/structure/rack/wooden, -/obj/item/clothing/suit/apron/chef/colorable_apron/primitive_catgirl_leather, +/obj/item/clothing/suit/apron/chef/colorable_apron/primitive_genemod_leather, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "My" = ( /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "MM" = ( /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Nn" = ( /obj/structure/table/wood, /obj/structure/chem_separator{ pixel_y = 12 }, /turf/open/floor/grass/fairy/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Nt" = ( /obj/effect/turf_decal/weather/snow/corner, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "NI" = ( /obj/structure/railing/wooden_fencing{ dir = 4 }, /obj/structure/mannequin/wood, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Ou" = ( /obj/structure/wall_torch/spawns_lit/directional/east, /turf/open/openspace/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "OD" = ( /obj/structure/geyser, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "OG" = ( /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "OI" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Qe" = ( /obj/structure/rack/wooden, /obj/item/bedsheet, /obj/structure/wall_torch/spawns_lit/directional/west, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Qg" = ( /obj/structure/rack/wooden, -/obj/item/clothing/shoes/winterboots/ice_boots/primitive_catgirl_boots{ +/obj/item/clothing/shoes/winterboots/ice_boots/primitive_genemod_boots{ pixel_y = 8; pixel_x = -4 }, -/obj/item/clothing/shoes/winterboots/ice_boots/primitive_catgirl_boots{ +/obj/item/clothing/shoes/winterboots/ice_boots/primitive_genemod_boots{ pixel_y = 8; pixel_x = 4 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "QK" = ( /obj/structure/closet/cardboard, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "QQ" = ( /obj/structure/rack/wooden, /obj/item/reagent_containers/cup/mortar{ @@ -745,43 +745,43 @@ }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "QZ" = ( /obj/structure/rack/wooden, /obj/item/bedsheet, /obj/structure/wall_torch/spawns_lit/directional/east, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Rf" = ( /obj/structure/mannequin/wood, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Rs" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 }, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "RX" = ( /obj/structure/wall_torch/spawns_lit/directional/south, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "RZ" = ( /obj/machinery/smartfridge/wooden/produce_bin, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Sf" = ( /obj/structure/railing/wooden_fencing{ dir = 8 }, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Sv" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 1 }, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "SG" = ( /obj/structure/railing/wooden_fencing{ dir = 8 @@ -790,7 +790,7 @@ dir = 1 }, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "SN" = ( /obj/structure/rack/wooden, /obj/item/food/grown/tobacco{ @@ -810,40 +810,40 @@ }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Ta" = ( /obj/structure/table/wood, /obj/item/xenoarch/strange_rock, /obj/structure/wall_torch/spawns_lit/directional/west, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Tq" = ( /obj/structure/bed/double/pelt, /obj/item/bedsheet/black/double, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "TQ" = ( /obj/structure/rugs/pelt{ pixel_y = -15; dir = 8 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Uc" = ( /obj/structure/rugs/pelt, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Uv" = ( /turf/closed/wall/mineral/wood/nonmetal, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "UM" = ( /obj/structure/table/wood, /obj/item/food/grown/poppy/lily, /turf/open/floor/grass/fairy/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Vc" = ( /turf/closed/wall/mineral/stone, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Vk" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -853,7 +853,7 @@ }, /obj/structure/wall_torch/spawns_lit/directional/west, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "VR" = ( /obj/structure/railing/wooden_fencing{ dir = 1 @@ -863,44 +863,44 @@ }, /obj/item/pillow, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "VV" = ( /obj/structure/flora/ash/chilly, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "VY" = ( /obj/structure/railing/wooden_fencing, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Wb" = ( /obj/structure/table/wood, /turf/open/floor/grass/fairy/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "WN" = ( /obj/structure/window/green_glass_pane, /obj/structure/curtain/bounty, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "WR" = ( /obj/structure/wall_torch/spawns_lit/directional/north, /turf/open/openspace/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "WS" = ( /obj/structure/railing/wooden_fencing, /obj/structure/railing/wooden_fencing{ dir = 4 }, /turf/open/floor/wood/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Xg" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Xu" = ( /turf/open/misc/grass/roofing, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "XV" = ( /obj/structure/rack/wooden, /obj/effect/decal/cleanable/dirt/dust, @@ -915,7 +915,7 @@ pixel_x = 7 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Yj" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -923,25 +923,25 @@ /obj/structure/wall_torch/spawns_lit/directional/south, /obj/structure/rack/wooden, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "YK" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 4 }, /turf/open/misc/dirt/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "YR" = ( /obj/structure/rack/wooden, -/obj/item/clothing/suit/jacket/primitive_catgirl_coat{ +/obj/item/clothing/suit/jacket/primitive_genemod_coat{ pixel_y = 7; pixel_x = -4 }, -/obj/item/clothing/under/dress/skirt/primitive_catgirl_body_wraps{ +/obj/item/clothing/under/dress/skirt/primitive_genemod_body_wraps{ pixel_x = 6; pixel_y = -6 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "YZ" = ( /obj/structure/rack/wooden, /obj/effect/decal/cleanable/dirt/dust, @@ -955,20 +955,20 @@ pixel_x = 7 }, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "Zv" = ( /obj/structure/railing/wooden_fencing{ dir = 1 }, /turf/open/misc/asteroid/snow/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) "ZX" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 }, /obj/structure/wall_torch/spawns_lit/directional/east, /turf/open/floor/stone/icemoon, -/area/ruin/unpowered/primitive_catgirl_den) +/area/ruin/unpowered/primitive_genemod_den) (1,1,1) = {" ek diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index 38f39437fac75..c4399a668aadc 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -103,7 +103,7 @@ GLOBAL_LIST_INIT(turfs_pass_meteor, typecacheof(list( //Human sub-species #define isabductor(A) (is_species(A, /datum/species/abductor)) #define isgolem(A) (is_species(A, /datum/species/golem)) -#define islizard(A) (is_species(A, /datum/species/lizard)) +#define islizard(A) (is_species(A, /datum/species/lizard) || HAS_TRAIT(A, LIZARD)) // DOPPLER EDIT, old code: #define islizard(A) (is_species(A, /datum/species/lizard)) #define isashwalker(A) (is_species(A, /datum/species/lizard/ashwalker)) #define isplasmaman(A) (is_species(A, /datum/species/plasmaman)) #define ispodperson(A) (is_species(A, /datum/species/pod)) @@ -113,11 +113,11 @@ GLOBAL_LIST_INIT(turfs_pass_meteor, typecacheof(list( #define iszombie(A) (is_species(A, /datum/species/zombie)) #define isskeleton(A) (is_species(A, /datum/species/skeleton)) #define ismoth(A) (is_species(A, /datum/species/moth)) -#define isfelinid(A) (is_species(A, /datum/species/human/felinid)) +#define isfelinid(A) (is_species(A, /datum/species/human/felinid) || HAS_TRAIT(A, CAT)) // DOPPLER EDIT, old code: #define isfelinid(A) (is_species(A, /datum/species/human/felinid)) #define isethereal(A) (is_species(A, /datum/species/ethereal)) #define isvampire(A) (is_species(A,/datum/species/vampire)) #define isdullahan(A) (is_species(A, /datum/species/dullahan)) -#define ismonkey(A) (is_species(A, /datum/species/monkey)) +#define ismonkey(A) (is_species(A, /datum/species/monkey) || HAS_TRAIT(A, MONKEY)) // DOPPLER EDIT, old code: #define ismonkey(A) (is_species(A, /datum/species/monkey)) #define isandroid(A) (is_species(A, /datum/species/android)) #define isnightmare(A) (is_species(A, /datum/species/shadow/nightmare)) diff --git a/code/__DEFINES/~doppler_defines/is_helpers.dm b/code/__DEFINES/~doppler_defines/is_helpers.dm index 02e0c61088246..0b00d1d1b7187 100644 --- a/code/__DEFINES/~doppler_defines/is_helpers.dm +++ b/code/__DEFINES/~doppler_defines/is_helpers.dm @@ -1,7 +1,6 @@ //Species -#define isprimitivedemihuman(A) (is_species(A, /datum/species/human/felinid/primitive)) +#define isprimitive(A) (is_species(A, /datum/species/human/genemod/primitive)) //Customization bases -#define isfeline(A) (isfelinid(A) || HAS_TRAIT(A, TRAIT_FELINE)) #define isinsectoid(A) (is_species(A, /datum/species/insectoid)) #define issnail(A) (is_species(A, /datum/species/snail)) //Species with green blood diff --git a/code/__DEFINES/~doppler_defines/mutant_variations.dm b/code/__DEFINES/~doppler_defines/mutant_variations.dm index cbc48ad409e89..bf37e6d6dc00a 100644 --- a/code/__DEFINES/~doppler_defines/mutant_variations.dm +++ b/code/__DEFINES/~doppler_defines/mutant_variations.dm @@ -31,3 +31,18 @@ GLOBAL_LIST_INIT(mutant_variations, list( MOUSE, SYNTHETIC, )) + +/// This list gets read by the animalistic preference for genemod and anthros +GLOBAL_LIST_INIT(genemod_variations, list( + NO_VARIATION, + BIRD, + BUNNY, + CAT, + DEER, + DOG, + FISH, + FOX, + LIZARD, + MONKEY, + MOUSE, +)) diff --git a/code/__DEFINES/~doppler_defines/species.dm b/code/__DEFINES/~doppler_defines/species.dm index 77dc59555c350..fa9a89767e2e8 100644 --- a/code/__DEFINES/~doppler_defines/species.dm +++ b/code/__DEFINES/~doppler_defines/species.dm @@ -1,8 +1,6 @@ -// Hearthkin, from the Ice Moon -#define SPECIES_FELINE_PRIMITIVE "primitive_felinid" -// Slugcats, from Talon III. +#define SPECIES_GENEMOD "genemod" +#define SPECIES_GENEMOD_PRIMITIVE "primitive_genemod" #define SPECIES_SLUGCAT "slugcat" - #define SPECIES_ANTHROMORPH "anthromorph" #define SPECIES_AQUATIC "aquatic" #define SPECIES_INSECTOID "insectoid" diff --git a/code/__DEFINES/~doppler_defines/traits.dm b/code/__DEFINES/~doppler_defines/traits.dm index fbb070614fe88..315191bd4a30f 100644 --- a/code/__DEFINES/~doppler_defines/traits.dm +++ b/code/__DEFINES/~doppler_defines/traits.dm @@ -7,8 +7,8 @@ /// Trait that is applied whenever someone or something is glassblowing #define TRAIT_CURRENTLY_GLASSBLOWING "currently_glassblowing" -// felinid traits -#define TRAIT_FELINE "feline_aspect" +/// Trait which lets species pick from a list of animal traits, used by genemod + subtypes and anthromorphs +#define TRAIT_ANIMALISTIC "animalistic" // Green blood traits #define TRAIT_GREEN_BLOOD "green_blood" diff --git a/code/_globalvars/traits/_traits.dm b/code/_globalvars/traits/_traits.dm index 6643878893256..ac5d281942aa4 100644 --- a/code/_globalvars/traits/_traits.dm +++ b/code/_globalvars/traits/_traits.dm @@ -689,7 +689,7 @@ GLOBAL_LIST_INIT(traits_by_type, list( // DOPPLER EDIT ADDITION START - MODULAR TRAITS /obj/item/toy/plush/modular = list( "TRAIT_CURRENTLY_GLASSBLOWING" = TRAIT_CURRENTLY_GLASSBLOWING, - "TRAIT_FELINE" = TRAIT_FELINE, + "TRAIT_ANIMALISTIC" = TRAIT_ANIMALISTIC, "TRAIT_GLASSBLOWING" = TRAIT_GLASSBLOWING, "TRAIT_XENOARCH_QUALIFIED" = TRAIT_XENOARCH_QUALIFIED, "TRAIT_DETECTIVE" = TRAIT_DETECTIVE, diff --git a/code/_globalvars/traits/admin_tooling.dm b/code/_globalvars/traits/admin_tooling.dm index f3ee2ecfbc05a..b24fdac208d26 100644 --- a/code/_globalvars/traits/admin_tooling.dm +++ b/code/_globalvars/traits/admin_tooling.dm @@ -375,7 +375,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list( // DOPPLER EDIT ADDITION START - MODULAR TRAITS /obj/item/toy/plush/modular = list( "TRAIT_CURRENTLY_GLASSBLOWING" = TRAIT_CURRENTLY_GLASSBLOWING, - "TRAIT_FELINE" = TRAIT_FELINE, + "TRAIT_ANIMALISTIC" = TRAIT_ANIMALISTIC, "TRAIT_GLASSBLOWING" = TRAIT_GLASSBLOWING, "TRAIT_XENOARCH_QUALIFIED" = TRAIT_XENOARCH_QUALIFIED, "TRAIT_DETECTIVE" = TRAIT_DETECTIVE, diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm index 1f52c6812021f..45354d4bd6164 100644 --- a/code/controllers/subsystem/processing/quirks.dm +++ b/code/controllers/subsystem/processing/quirks.dm @@ -26,9 +26,6 @@ GLOBAL_LIST_INIT_TYPED(quirk_blacklist, /list/datum/quirk, list( list(/datum/quirk/photophobia, /datum/quirk/nyctophobia), list(/datum/quirk/item_quirk/settler, /datum/quirk/freerunning), list(/datum/quirk/numb, /datum/quirk/selfaware), - //DOPPLER EDIT ADDITION BEGIN - list(/datum/quirk/feline_aspect) - //DOPPLER EDIT ADDITION END )) GLOBAL_LIST_INIT(quirk_string_blacklist, generate_quirk_string_blacklist()) diff --git a/code/game/machinery/computer/dna_console.dm b/code/game/machinery/computer/dna_console.dm index da00fc3542197..c50a073cab59b 100644 --- a/code/game/machinery/computer/dna_console.dm +++ b/code/game/machinery/computer/dna_console.dm @@ -341,7 +341,7 @@ data["subjectStatus"] = scanner_occupant.stat data["subjectHealth"] = scanner_occupant.health data["subjectEnzymes"] = scanner_occupant.dna.unique_enzymes - data["isMonkey"] = ismonkey(scanner_occupant) + data["isMonkey"] = (ismonkey(scanner_occupant) && !HAS_TRAIT(scanner_occupant, MONKEY)) // Doppler station edit, animal trait. Lets the machine work on trait-havers - old code: data["isMonkey"] = ismonkey(scanner_occupant) data["subjectUNI"] = scanner_occupant.dna.unique_identity data["subjectUF"] = scanner_occupant.dna.unique_features data["storage"]["occupant"] = tgui_occupant_mutations diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index 3e2248914dcf0..d2cb351f7060d 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -282,17 +282,17 @@ */ /mob/living/carbon/human/proc/get_mob_height() if(HAS_TRAIT(src, TRAIT_DWARF)) - if(ismonkey(src)) + if(ismonkey(src) && !HAS_TRAIT(src, MONKEY)) // DOPPLER EDIT, old code: if(ismonkey(src)) return MONKEY_HEIGHT_DWARF else return HUMAN_HEIGHT_DWARF if(HAS_TRAIT(src, TRAIT_TOO_TALL)) - if(ismonkey(src)) + if(ismonkey(src) && !HAS_TRAIT(src, MONKEY)) // DOPPLER EDIT, old code: if(ismonkey(src)) return MONKEY_HEIGHT_TALL else return HUMAN_HEIGHT_TALLEST - else if(ismonkey(src)) + else if(ismonkey(src) && !HAS_TRAIT(src, MONKEY)) // DOPPLER EDIT, old code: else if(ismonkey(src)) return MONKEY_HEIGHT_MEDIUM return mob_height diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_felinid_primitive.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_felinid_primitive.png deleted file mode 100644 index 7e24044101925..0000000000000 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_felinid_primitive.png and /dev/null differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_genemod.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_genemod.png new file mode 100644 index 0000000000000..475c07f50deed Binary files /dev/null and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_genemod.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_genemod_primitive.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_genemod_primitive.png new file mode 100644 index 0000000000000..475c07f50deed Binary files /dev/null and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_genemod_primitive.png differ diff --git a/config/game_options.txt b/config/game_options.txt index 3f7581c325413..fe21ece55fcb1 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -358,7 +358,7 @@ SILICON_MAX_LAW_AMOUNT 12 ROUNDSTART_RACES human ## Races that are strictly worse than humans that could probably be turned on without balance concerns -ROUNDSTART_RACES felinid +#ROUNDSTART_RACES felinid ROUNDSTART_RACES lizard #ROUNDSTART_RACES fly ROUNDSTART_RACES moth @@ -368,7 +368,8 @@ ROUNDSTART_RACES slugcat ROUNDSTART_RACES anthromorph ROUNDSTART_RACES aquatic ROUNDSTART_RACES insectoid -ROUNDSTART_RACES primitive_felinid +ROUNDSTART_RACES genemod +ROUNDSTART_RACES primitive_genemod ## Races that are better than humans in some ways, but worse in others ROUNDSTART_RACES ethereal diff --git a/modular_doppler/hearthkin/primitive_cooking_additions/code/plant_bag.dm b/modular_doppler/hearthkin/primitive_cooking_additions/code/plant_bag.dm index 1a747cff6f99e..e996f35a5eebe 100644 --- a/modular_doppler/hearthkin/primitive_cooking_additions/code/plant_bag.dm +++ b/modular_doppler/hearthkin/primitive_cooking_additions/code/plant_bag.dm @@ -61,7 +61,7 @@ if(!istype(created, /obj/item/storage/bag/plants)) return - if(!isprimitivedemihuman(builder)) + if(!isprimitive(builder)) return var/obj/item/storage/bag/plants/bag = created diff --git a/modular_doppler/hearthkin/primitive_catgirls/code/clothing.dm b/modular_doppler/hearthkin/primitive_genemod/code/clothing.dm similarity index 58% rename from modular_doppler/hearthkin/primitive_catgirls/code/clothing.dm rename to modular_doppler/hearthkin/primitive_genemod/code/clothing.dm index 7e48b3b337cc8..9aae069b2d00e 100644 --- a/modular_doppler/hearthkin/primitive_catgirls/code/clothing.dm +++ b/modular_doppler/hearthkin/primitive_genemod/code/clothing.dm @@ -2,54 +2,54 @@ // Outfit Datum -/datum/outfit/primitive_catgirl +/datum/outfit/primitive_genemod name = "Icemoon Dweller" - uniform = /obj/item/clothing/under/dress/skirt/primitive_catgirl_body_wraps - shoes = /obj/item/clothing/shoes/winterboots/ice_boots/primitive_catgirl_boots - gloves = /obj/item/clothing/gloves/fingerless/primitive_catgirl_armwraps - suit = /obj/item/clothing/suit/jacket/primitive_catgirl_coat - neck = /obj/item/clothing/neck/scarf/primitive_catgirl_scarf + uniform = /obj/item/clothing/under/dress/skirt/primitive_genemod_body_wraps + shoes = /obj/item/clothing/shoes/winterboots/ice_boots/primitive_genemod_boots + gloves = /obj/item/clothing/gloves/fingerless/primitive_genemod_armwraps + suit = /obj/item/clothing/suit/jacket/primitive_genemod_coat + neck = /obj/item/clothing/neck/scarf/primitive_genemod_scarf back = /obj/item/forging/reagent_weapon/axe/fake_copper // Under -/obj/item/clothing/under/dress/skirt/primitive_catgirl_body_wraps +/obj/item/clothing/under/dress/skirt/primitive_genemod_body_wraps name = "body wraps" desc = "Some pretty simple wraps to cover up your lower bits." icon_state = "wraps" - icon = 'modular_doppler/hearthkin/primitive_catgirls/icons/clothing_greyscale.dmi' - worn_icon = 'modular_doppler/hearthkin/primitive_catgirls/icons/clothing_greyscale.dmi' + icon = 'modular_doppler/hearthkin/primitive_genemod/icons/clothing_greyscale.dmi' + worn_icon = 'modular_doppler/hearthkin/primitive_genemod/icons/clothing_greyscale.dmi' body_parts_covered = GROIN - greyscale_config = /datum/greyscale_config/primitive_catgirl_wraps - greyscale_config_worn = /datum/greyscale_config/primitive_catgirl_wraps/worn + greyscale_config = /datum/greyscale_config/primitive_genemod_wraps + greyscale_config_worn = /datum/greyscale_config/primitive_genemod_wraps/worn greyscale_colors = "#cec8bf#364660" flags_1 = IS_PLAYER_COLORABLE_1 has_sensor = FALSE -/obj/item/clothing/under/dress/skirt/primitive_catgirl_tailored_dress +/obj/item/clothing/under/dress/skirt/primitive_genemod_tailored_dress name = "tailored dress" desc = "A handmade dress, tailored to fit perfectly to its wearer's body measurements." icon_state = "tailored_dress" - icon = 'modular_doppler/hearthkin/primitive_catgirls/icons/clothing_greyscale.dmi' - worn_icon = 'modular_doppler/hearthkin/primitive_catgirls/icons/clothing_greyscale.dmi' + icon = 'modular_doppler/hearthkin/primitive_genemod/icons/clothing_greyscale.dmi' + worn_icon = 'modular_doppler/hearthkin/primitive_genemod/icons/clothing_greyscale.dmi' body_parts_covered = GROIN|CHEST - greyscale_config = /datum/greyscale_config/primitive_catgirl_tailored_dress - greyscale_config_worn = /datum/greyscale_config/primitive_catgirl_tailored_dress/worn + greyscale_config = /datum/greyscale_config/primitive_genemod_tailored_dress + greyscale_config_worn = /datum/greyscale_config/primitive_genemod_tailored_dress/worn greyscale_colors = "#cec8bf#364660" flags_1 = IS_PLAYER_COLORABLE_1 has_sensor = FALSE -/obj/item/clothing/under/dress/skirt/primitive_catgirl_tunic +/obj/item/clothing/under/dress/skirt/primitive_genemod_tunic name = "handmade tunic" desc = "A simple garment that reaches from the shoulders to above the knee. This one has a belt to secure it." icon_state = "tunic" - icon = 'modular_doppler/hearthkin/primitive_catgirls/icons/clothing_greyscale.dmi' - worn_icon = 'modular_doppler/hearthkin/primitive_catgirls/icons/clothing_greyscale.dmi' + icon = 'modular_doppler/hearthkin/primitive_genemod/icons/clothing_greyscale.dmi' + worn_icon = 'modular_doppler/hearthkin/primitive_genemod/icons/clothing_greyscale.dmi' body_parts_covered = GROIN|CHEST - greyscale_config = /datum/greyscale_config/primitive_catgirl_tunic - greyscale_config_worn = /datum/greyscale_config/primitive_catgirl_tunic/worn + greyscale_config = /datum/greyscale_config/primitive_genemod_tunic + greyscale_config_worn = /datum/greyscale_config/primitive_genemod_tunic/worn greyscale_colors = "#ccd1db#dce0f2#594032" flags_1 = IS_PLAYER_COLORABLE_1 has_sensor = FALSE @@ -58,8 +58,8 @@ name = "loincloth" desc = "A simple elegant cloth, to use wrapped around your waist and groin." icon_state = "loincloth" - icon = 'modular_doppler/hearthkin/primitive_catgirls/icons/loincloth.dmi' - worn_icon = 'modular_doppler/hearthkin/primitive_catgirls/icons/loincloth.dmi' + icon = 'modular_doppler/hearthkin/primitive_genemod/icons/loincloth.dmi' + worn_icon = 'modular_doppler/hearthkin/primitive_genemod/icons/loincloth.dmi' greyscale_config = /datum/greyscale_config/loincloth greyscale_config_worn = /datum/greyscale_config/loincloth/worn greyscale_colors = "#413069" @@ -77,25 +77,25 @@ // Hands -/obj/item/clothing/gloves/fingerless/primitive_catgirl_armwraps +/obj/item/clothing/gloves/fingerless/primitive_genemod_armwraps name = "arm wraps" desc = "Simple cloth to wrap around one's arms." icon_state = "armwraps" - icon = 'modular_doppler/hearthkin/primitive_catgirls/icons/clothing_greyscale.dmi' - worn_icon = 'modular_doppler/hearthkin/primitive_catgirls/icons/clothing_greyscale.dmi' - greyscale_config = /datum/greyscale_config/primitive_catgirl_armwraps - greyscale_config_worn = /datum/greyscale_config/primitive_catgirl_armwraps/worn + icon = 'modular_doppler/hearthkin/primitive_genemod/icons/clothing_greyscale.dmi' + worn_icon = 'modular_doppler/hearthkin/primitive_genemod/icons/clothing_greyscale.dmi' + greyscale_config = /datum/greyscale_config/primitive_genemod_armwraps + greyscale_config_worn = /datum/greyscale_config/primitive_genemod_armwraps/worn greyscale_colors = "#cec8bf" flags_1 = IS_PLAYER_COLORABLE_1 -/obj/item/clothing/gloves/fingerless/primitive_catgirl_gauntlets +/obj/item/clothing/gloves/fingerless/primitive_genemod_gauntlets name = "gauntlets" desc = "Simple cloth arm wraps with overlying metal protection." icon_state = "gauntlets" - icon = 'modular_doppler/hearthkin/primitive_catgirls/icons/clothing_greyscale.dmi' - worn_icon = 'modular_doppler/hearthkin/primitive_catgirls/icons/clothing_greyscale.dmi' - greyscale_config = /datum/greyscale_config/primitive_catgirl_gauntlets - greyscale_config_worn = /datum/greyscale_config/primitive_catgirl_gauntlets/worn + icon = 'modular_doppler/hearthkin/primitive_genemod/icons/clothing_greyscale.dmi' + worn_icon = 'modular_doppler/hearthkin/primitive_genemod/icons/clothing_greyscale.dmi' + greyscale_config = /datum/greyscale_config/primitive_genemod_gauntlets + greyscale_config_worn = /datum/greyscale_config/primitive_genemod_gauntlets/worn greyscale_config_inhand_left = null greyscale_config_inhand_right = null greyscale_colors = "#cec8bf#c55a1d" @@ -103,75 +103,75 @@ // Suit -/obj/item/clothing/suit/jacket/primitive_catgirl_coat +/obj/item/clothing/suit/jacket/primitive_genemod_coat name = "primitive fur coat" desc = "A large piece of animal hide stuffed with fur, likely from the same animal." icon_state = "coat" - icon = 'modular_doppler/hearthkin/primitive_catgirls/icons/clothing_greyscale.dmi' - worn_icon = 'modular_doppler/hearthkin/primitive_catgirls/icons/clothing_greyscale.dmi' + icon = 'modular_doppler/hearthkin/primitive_genemod/icons/clothing_greyscale.dmi' + worn_icon = 'modular_doppler/hearthkin/primitive_genemod/icons/clothing_greyscale.dmi' body_parts_covered = CHEST cold_protection = CHEST min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON - greyscale_config = /datum/greyscale_config/primitive_catgirl_coat - greyscale_config_worn = /datum/greyscale_config/primitive_catgirl_coat/worn + greyscale_config = /datum/greyscale_config/primitive_genemod_coat + greyscale_config_worn = /datum/greyscale_config/primitive_genemod_coat/worn greyscale_colors = "#594032#cec8bf" flags_1 = IS_PLAYER_COLORABLE_1 -/obj/item/clothing/suit/apron/chef/colorable_apron/primitive_catgirl_leather +/obj/item/clothing/suit/apron/chef/colorable_apron/primitive_genemod_leather greyscale_colors = "#594032" // Shoes -/obj/item/clothing/shoes/winterboots/ice_boots/primitive_catgirl_boots +/obj/item/clothing/shoes/winterboots/ice_boots/primitive_genemod_boots name = "primitive hiking boots" desc = "A pair of heavy boots lined with fur and with soles special built to prevent slipping on ice." icon_state = "boots" - icon = 'modular_doppler/hearthkin/primitive_catgirls/icons/clothing_greyscale.dmi' - worn_icon = 'modular_doppler/hearthkin/primitive_catgirls/icons/clothing_greyscale.dmi' + icon = 'modular_doppler/hearthkin/primitive_genemod/icons/clothing_greyscale.dmi' + worn_icon = 'modular_doppler/hearthkin/primitive_genemod/icons/clothing_greyscale.dmi' supports_variations_flags = CLOTHING_NO_VARIATION supported_bodyshapes = null bodyshape_icon_files = null - greyscale_config = /datum/greyscale_config/primitive_catgirl_boots - greyscale_config_worn = /datum/greyscale_config/primitive_catgirl_boots/worn + greyscale_config = /datum/greyscale_config/primitive_genemod_boots + greyscale_config_worn = /datum/greyscale_config/primitive_genemod_boots/worn greyscale_colors = "#594032#cec8bf" flags_1 = IS_PLAYER_COLORABLE_1 // Neck -/obj/item/clothing/neck/scarf/primitive_catgirl_scarf +/obj/item/clothing/neck/scarf/primitive_genemod_scarf greyscale_colors = "#cec8bf#cec8bf" -/obj/item/clothing/neck/large_scarf/primitive_catgirl_off_white +/obj/item/clothing/neck/large_scarf/primitive_genemod_off_white greyscale_colors = "#cec8bf#cec8bf" -/obj/item/clothing/neck/infinity_scarf/primitive_catgirl_blue +/obj/item/clothing/neck/infinity_scarf/primitive_genemod_blue greyscale_colors = "#364660" -/obj/item/clothing/neck/mantle/recolorable/primitive_catgirl_off_white +/obj/item/clothing/neck/mantle/recolorable/primitive_genemod_off_white greyscale_colors = "#cec8bf" -/obj/item/clothing/neck/ranger_poncho/primitive_catgirl_leather +/obj/item/clothing/neck/ranger_poncho/primitive_genemod_leather greyscale_colors = "#594032#594032" // Masks -/obj/item/clothing/mask/neck_gaiter/primitive_catgirl_gaiter +/obj/item/clothing/mask/neck_gaiter/primitive_genemod_gaiter greyscale_colors = "#364660" // Head -/obj/item/clothing/head/standalone_hood/primitive_catgirl_colors +/obj/item/clothing/head/standalone_hood/primitive_genemod_colors greyscale_colors = "#594032#364660" -/obj/item/clothing/head/primitive_catgirl_ferroniere +/obj/item/clothing/head/primitive_genemod_ferroniere name = "Ferroniere" desc = "A style of headband that encircles the wearer's forehead, with a small jewel suspended in the centre." icon_state = "ferroniere" - icon = 'modular_doppler/hearthkin/primitive_catgirls/icons/clothing_greyscale.dmi' - worn_icon = 'modular_doppler/hearthkin/primitive_catgirls/icons/clothing_greyscale.dmi' - greyscale_config = /datum/greyscale_config/primitive_catgirl_ferroniere - greyscale_config_worn = /datum/greyscale_config/primitive_catgirl_ferroniere/worn + icon = 'modular_doppler/hearthkin/primitive_genemod/icons/clothing_greyscale.dmi' + worn_icon = 'modular_doppler/hearthkin/primitive_genemod/icons/clothing_greyscale.dmi' + greyscale_config = /datum/greyscale_config/primitive_genemod_ferroniere + greyscale_config_worn = /datum/greyscale_config/primitive_genemod_ferroniere/worn greyscale_colors = "#f1f6ff#364660" w_class = WEIGHT_CLASS_TINY flags_1 = IS_PLAYER_COLORABLE_1 @@ -185,8 +185,8 @@ name = "handcrafted hearthkin armor" desc = "An armor obviously crafted by the expertise of a hearthkin. It has leather shoulder pads and a chain mail underneath." icon_state = "chained_leather_armor" - icon = 'modular_doppler/hearthkin/primitive_catgirls/icons/objects.dmi' - worn_icon = 'modular_doppler/hearthkin/primitive_catgirls/icons/clothing_greyscale.dmi' + icon = 'modular_doppler/hearthkin/primitive_genemod/icons/objects.dmi' + worn_icon = 'modular_doppler/hearthkin/primitive_genemod/icons/clothing_greyscale.dmi' body_parts_covered = GROIN|CHEST /datum/crafting_recipe/handcrafted_hearthkin_armor @@ -205,8 +205,8 @@ //Pelts /obj/item/clothing/head/pelt - icon = 'modular_doppler/hearthkin/primitive_catgirls/icons/pelt.dmi' - worn_icon = 'modular_doppler/hearthkin/primitive_catgirls/icons/pelt_worn.dmi' + icon = 'modular_doppler/hearthkin/primitive_genemod/icons/pelt.dmi' + worn_icon = 'modular_doppler/hearthkin/primitive_genemod/icons/pelt_worn.dmi' name = "bear pelt" desc = "A luxurious bear pelt, good to keep warm in winter. Or to sleep through it." icon_state = "bearpelt_brown" @@ -243,7 +243,7 @@ /obj/item/clothing/head/pelt/wolf name = "wolf pelt" desc = "A fuzzy wolf pelt that demands respect as a hunter... assuming it wasn't just purchased, that is, for all the glory but none of the credit." - worn_icon = 'modular_doppler/hearthkin/primitive_catgirls/icons/pelt_big.dmi' + worn_icon = 'modular_doppler/hearthkin/primitive_genemod/icons/pelt_big.dmi' icon_state = "wolfpelt_brown" /obj/item/clothing/head/pelt/wolf/black diff --git a/modular_doppler/hearthkin/primitive_catgirls/code/clothing_vendor.dm b/modular_doppler/hearthkin/primitive_genemod/code/clothing_vendor.dm similarity index 54% rename from modular_doppler/hearthkin/primitive_catgirls/code/clothing_vendor.dm rename to modular_doppler/hearthkin/primitive_genemod/code/clothing_vendor.dm index 483c77acc9bad..ef6bb9f4629cd 100644 --- a/modular_doppler/hearthkin/primitive_catgirls/code/clothing_vendor.dm +++ b/modular_doppler/hearthkin/primitive_genemod/code/clothing_vendor.dm @@ -1,4 +1,4 @@ -/obj/machinery/vending/primitive_catgirl_clothing_vendor +/obj/machinery/vending/primitive_genemod_clothing_vendor name = "wardrobe" desc = "It's a big wardrobe filled up with all sorts of clothing." icon = 'icons/obj/storage/closet.dmi' @@ -10,29 +10,29 @@ all_products_free = TRUE // we don't want them to charge anything either. it's a wardrobe. products = list( - /obj/item/clothing/under/dress/skirt/primitive_catgirl_body_wraps = 15, - /obj/item/clothing/under/dress/skirt/primitive_catgirl_tailored_dress = 15, - /obj/item/clothing/under/dress/skirt/primitive_catgirl_tunic = 15, + /obj/item/clothing/under/dress/skirt/primitive_genemod_body_wraps = 15, + /obj/item/clothing/under/dress/skirt/primitive_genemod_tailored_dress = 15, + /obj/item/clothing/under/dress/skirt/primitive_genemod_tunic = 15, /obj/item/clothing/under/dress/skirt/loincloth = 5, /obj/item/clothing/under/dress/skirt/loincloth/loincloth_alt = 5, - /obj/item/clothing/suit/jacket/primitive_catgirl_coat = 15, - /obj/item/clothing/gloves/fingerless/primitive_catgirl_armwraps = 15, - /obj/item/clothing/shoes/winterboots/ice_boots/primitive_catgirl_boots = 15, - /obj/item/clothing/gloves/fingerless/primitive_catgirl_gauntlets = 10, - /obj/item/clothing/mask/neck_gaiter/primitive_catgirl_gaiter = 10, - /obj/item/clothing/suit/apron/chef/colorable_apron/primitive_catgirl_leather = 10, - /obj/item/clothing/head/standalone_hood/primitive_catgirl_colors = 10, - /obj/item/clothing/neck/scarf/primitive_catgirl_scarf = 5, + /obj/item/clothing/suit/jacket/primitive_genemod_coat = 15, + /obj/item/clothing/gloves/fingerless/primitive_genemod_armwraps = 15, + /obj/item/clothing/shoes/winterboots/ice_boots/primitive_genemod_boots = 15, + /obj/item/clothing/gloves/fingerless/primitive_genemod_gauntlets = 10, + /obj/item/clothing/mask/neck_gaiter/primitive_genemod_gaiter = 10, + /obj/item/clothing/suit/apron/chef/colorable_apron/primitive_genemod_leather = 10, + /obj/item/clothing/head/standalone_hood/primitive_genemod_colors = 10, + /obj/item/clothing/neck/scarf/primitive_genemod_scarf = 5, /obj/item/clothing/neck/face_scarf = 5, - /obj/item/clothing/neck/large_scarf/primitive_catgirl_off_white = 5, - /obj/item/clothing/neck/infinity_scarf/primitive_catgirl_blue = 5, - /obj/item/clothing/neck/mantle/recolorable/primitive_catgirl_off_white = 5, + /obj/item/clothing/neck/large_scarf/primitive_genemod_off_white = 5, + /obj/item/clothing/neck/infinity_scarf/primitive_genemod_blue = 5, + /obj/item/clothing/neck/mantle/recolorable/primitive_genemod_off_white = 5, /obj/item/clothing/neck/ranger_poncho/ = 5, /obj/item/clothing/neck/wide_cape = 5, /obj/item/clothing/neck/robe_cape = 5, /obj/item/clothing/neck/long_cape = 5, /obj/item/clothing/glasses/eyepatch/wrap = 5, - /obj/item/clothing/head/primitive_catgirl_ferroniere = 5, + /obj/item/clothing/head/primitive_genemod_ferroniere = 5, /obj/item/clothing/head/pelt/snow_tiger = 5, /obj/item/clothing/head/pelt = 5, /obj/item/clothing/head/pelt/black = 5, @@ -45,5 +45,5 @@ /obj/item/clothing/head/hair_tie = 5, ) -/obj/machinery/vending/primitive_catgirl_clothing_vendor/speak(message) +/obj/machinery/vending/primitive_genemod_clothing_vendor/speak(message) return diff --git a/modular_doppler/hearthkin/primitive_catgirls/code/greyscale_config.dm b/modular_doppler/hearthkin/primitive_genemod/code/greyscale_config.dm similarity index 60% rename from modular_doppler/hearthkin/primitive_catgirls/code/greyscale_config.dm rename to modular_doppler/hearthkin/primitive_genemod/code/greyscale_config.dm index 31620b2368ee4..3455d3edff388 100644 --- a/modular_doppler/hearthkin/primitive_catgirls/code/greyscale_config.dm +++ b/modular_doppler/hearthkin/primitive_genemod/code/greyscale_config.dm @@ -1,78 +1,78 @@ -/datum/greyscale_config/primitive_catgirl_wraps +/datum/greyscale_config/primitive_genemod_wraps name = "Primitive Body Wraps" - icon_file = 'modular_doppler/hearthkin/primitive_catgirls/icons/clothing_greyscale.dmi' + icon_file = 'modular_doppler/hearthkin/primitive_genemod/icons/clothing_greyscale.dmi' json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/hearthkin/body_wraps.json' -/datum/greyscale_config/primitive_catgirl_wraps/worn +/datum/greyscale_config/primitive_genemod_wraps/worn name = "Primitive Body Wraps (Worn)" json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/hearthkin/body_wraps_worn.json' -/datum/greyscale_config/primitive_catgirl_armwraps +/datum/greyscale_config/primitive_genemod_armwraps name = "Arm Wraps" - icon_file = 'modular_doppler/hearthkin/primitive_catgirls/icons/clothing_greyscale.dmi' + icon_file = 'modular_doppler/hearthkin/primitive_genemod/icons/clothing_greyscale.dmi' json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/hearthkin/armwraps.json' -/datum/greyscale_config/primitive_catgirl_armwraps/worn +/datum/greyscale_config/primitive_genemod_armwraps/worn name = "Arm Wraps (Worn)" json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/hearthkin/armwraps_worn.json' -/datum/greyscale_config/primitive_catgirl_coat +/datum/greyscale_config/primitive_genemod_coat name = "Primitive Fur Coat" - icon_file = 'modular_doppler/hearthkin/primitive_catgirls/icons/clothing_greyscale.dmi' + icon_file = 'modular_doppler/hearthkin/primitive_genemod/icons/clothing_greyscale.dmi' json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/hearthkin/coat.json' -/datum/greyscale_config/primitive_catgirl_coat/worn +/datum/greyscale_config/primitive_genemod_coat/worn name = "Primitive Fur Coat (Worn)" json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/hearthkin/coat_worn.json' -/datum/greyscale_config/primitive_catgirl_boots +/datum/greyscale_config/primitive_genemod_boots name = "Primitive Winter Boots" - icon_file = 'modular_doppler/hearthkin/primitive_catgirls/icons/clothing_greyscale.dmi' + icon_file = 'modular_doppler/hearthkin/primitive_genemod/icons/clothing_greyscale.dmi' json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/hearthkin/boots.json' -/datum/greyscale_config/primitive_catgirl_boots/worn +/datum/greyscale_config/primitive_genemod_boots/worn name = "Primitive Winter Boots (Worn)" json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/hearthkin/boots_worn.json' -/datum/greyscale_config/primitive_catgirl_gauntlets +/datum/greyscale_config/primitive_genemod_gauntlets name = "Gauntlets" - icon_file = 'modular_doppler/hearthkin/primitive_catgirls/icons/clothing_greyscale.dmi' + icon_file = 'modular_doppler/hearthkin/primitive_genemod/icons/clothing_greyscale.dmi' json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/hearthkin/gauntlets.json' -/datum/greyscale_config/primitive_catgirl_gauntlets/worn +/datum/greyscale_config/primitive_genemod_gauntlets/worn name = "Gauntlets (Worn)" json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/hearthkin/gauntlets_worn.json' -/datum/greyscale_config/primitive_catgirl_tailored_dress +/datum/greyscale_config/primitive_genemod_tailored_dress name = "Tailored Dress" - icon_file = 'modular_doppler/hearthkin/primitive_catgirls/icons/clothing_greyscale.dmi' + icon_file = 'modular_doppler/hearthkin/primitive_genemod/icons/clothing_greyscale.dmi' json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/hearthkin/tailored_dress.json' -/datum/greyscale_config/primitive_catgirl_tailored_dress/worn +/datum/greyscale_config/primitive_genemod_tailored_dress/worn name = "Tailored Dress (Worn)" json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/hearthkin/tailored_dress_worn.json' -/datum/greyscale_config/primitive_catgirl_ferroniere +/datum/greyscale_config/primitive_genemod_ferroniere name = "Ferroniere" - icon_file = 'modular_doppler/hearthkin/primitive_catgirls/icons/clothing_greyscale.dmi' + icon_file = 'modular_doppler/hearthkin/primitive_genemod/icons/clothing_greyscale.dmi' json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/hearthkin/ferroniere.json' -/datum/greyscale_config/primitive_catgirl_ferroniere/worn +/datum/greyscale_config/primitive_genemod_ferroniere/worn name = "Ferroniere (Worn)" json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/hearthkin/ferroniere_worn.json' -/datum/greyscale_config/primitive_catgirl_tunic +/datum/greyscale_config/primitive_genemod_tunic name = "Handmade Tunic" - icon_file = 'modular_doppler/hearthkin/primitive_catgirls/icons/clothing_greyscale.dmi' + icon_file = 'modular_doppler/hearthkin/primitive_genemod/icons/clothing_greyscale.dmi' json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/hearthkin/tunic.json' -/datum/greyscale_config/primitive_catgirl_tunic/worn +/datum/greyscale_config/primitive_genemod_tunic/worn name = "Handmade Tunic (Worn)" json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/hearthkin/tunic_worn.json' /datum/greyscale_config/loincloth name = "Loincloth" - icon_file = 'modular_doppler/hearthkin/primitive_catgirls/icons/loincloth.dmi' + icon_file = 'modular_doppler/hearthkin/primitive_genemod/icons/loincloth.dmi' json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/hearthkin/loincloth.json' /datum/greyscale_config/loincloth/worn @@ -81,7 +81,7 @@ /datum/greyscale_config/loincloth_alt name = "Shorter Loincloth" - icon_file = 'modular_doppler/hearthkin/primitive_catgirls/icons/loincloth.dmi' + icon_file = 'modular_doppler/hearthkin/primitive_genemod/icons/loincloth.dmi' json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/hearthkin/loincloth_alt.json' /datum/greyscale_config/loincloth_alt/worn diff --git a/modular_doppler/hearthkin/primitive_catgirls/code/language.dm b/modular_doppler/hearthkin/primitive_genemod/code/language.dm similarity index 90% rename from modular_doppler/hearthkin/primitive_catgirls/code/language.dm rename to modular_doppler/hearthkin/primitive_genemod/code/language.dm index 8a97197d279fc..45e16e407d1c4 100644 --- a/modular_doppler/hearthkin/primitive_catgirls/code/language.dm +++ b/modular_doppler/hearthkin/primitive_genemod/code/language.dm @@ -1,4 +1,4 @@ -/datum/language/primitive_catgirl +/datum/language/primitive_genemod name = "Ættmál" desc = "A liturgical language passed through three centuries of Hearthkin culture, the only tongue which their literature is allowed to be spoken in; \ especially relating to their pagan practices. While Galactic Uncommon is used as a trade language with outsiders, Ættmál remains sacred and mostly unknown \ @@ -13,6 +13,6 @@ "bar", "dar", "akur", "jer", "bær", "múl", "fjörð", "jah", "dah", "dim", "din", "dir", "dur", "nya", "miau", "mjau", "ný", "kt", "hø", ) icon_state = "omgkittyhiii" - icon = 'modular_doppler/hearthkin/primitive_catgirls/icons/language_icon.dmi' + icon = 'modular_doppler/hearthkin/primitive_genemod/icons/language_icon.dmi' default_priority = 94 // secret = TRUE //this needs a dedicated module for language diff --git a/modular_doppler/hearthkin/primitive_catgirls/code/map_items.dm b/modular_doppler/hearthkin/primitive_genemod/code/map_items.dm similarity index 98% rename from modular_doppler/hearthkin/primitive_catgirls/code/map_items.dm rename to modular_doppler/hearthkin/primitive_genemod/code/map_items.dm index c1b383741fe9c..f2c5e4a8069f0 100644 --- a/modular_doppler/hearthkin/primitive_catgirls/code/map_items.dm +++ b/modular_doppler/hearthkin/primitive_genemod/code/map_items.dm @@ -96,5 +96,5 @@ // The area -/area/ruin/unpowered/primitive_catgirl_den +/area/ruin/unpowered/primitive_genemod_den name = "\improper Icewalker Camp" diff --git a/modular_doppler/hearthkin/primitive_catgirls/code/objects.dm b/modular_doppler/hearthkin/primitive_genemod/code/objects.dm similarity index 91% rename from modular_doppler/hearthkin/primitive_catgirls/code/objects.dm rename to modular_doppler/hearthkin/primitive_genemod/code/objects.dm index f1c7b430b780d..bf74c086cc3e7 100644 --- a/modular_doppler/hearthkin/primitive_catgirls/code/objects.dm +++ b/modular_doppler/hearthkin/primitive_genemod/code/objects.dm @@ -1,7 +1,7 @@ /obj/item/anointing_oil name = "anointing bloodresin" desc = "And so Helgar Knife-Arm spoke to the Hearth, and decreed that all of the Kin who gave name to beasts would do so with conquest and blood." - icon = 'modular_doppler/hearthkin/primitive_catgirls/icons/objects.dmi' + icon = 'modular_doppler/hearthkin/primitive_genemod/icons/objects.dmi' icon_state = "anointingbloodresin" throwforce = 0 w_class = WEIGHT_CLASS_TINY @@ -9,7 +9,7 @@ var/being_used = FALSE /obj/item/anointing_oil/attack(mob/living/target_mob, mob/living/user, params) - if (!is_species(user, /datum/species/human/felinid/primitive)) + if (!is_species(user, /datum/species/human/genemod/primitive)) to_chat(user, span_warning("You have no idea what this disgusting concoction is used for.")) return if(being_used || !ismob(target_mob)) //originally this was going to check if the mob was friendly, but if an icecat wants to name some terror mob while it's tearing chunks out of them, why not? @@ -48,7 +48,7 @@ /obj/item/anointing_oil/examine(mob/user) . = ..() - if(is_species(user, /datum/species/human/felinid/primitive)) + if(is_species(user, /datum/species/human/genemod/primitive)) . += span_info("Using this on the local wildlife will allow you to give them a name.") /datum/crafting_recipe/anointing_oil @@ -68,13 +68,13 @@ /obj/item/frozen_breath name = "Frozen Breath" desc = "A strange brew, it smells minty and is extremely cold to the touch. It is rumored that a cold-hearted witch managed to make this, to mend the breath of her kindred." - icon = 'modular_doppler/hearthkin/primitive_catgirls/icons/objects.dmi' + icon = 'modular_doppler/hearthkin/primitive_genemod/icons/objects.dmi' icon_state = "frozenbreath" throwforce = 0 w_class = WEIGHT_CLASS_TINY /obj/item/frozen_breath/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) - if (!is_species(user, /datum/species/human/felinid/primitive)) + if (!is_species(user, /datum/species/human/genemod/primitive)) to_chat(user, span_warning("You have no idea how to use this freezing concoction.")) return @@ -94,7 +94,7 @@ /obj/item/frozen_breath/examine(mob/user) . = ..() - if(is_species(user, /datum/species/human/felinid/primitive)) + if(is_species(user, /datum/species/human/genemod/primitive)) . += span_info("Using this on a pair of organic lungs transforms them into hardy lungs. This will remove any other special features from the old lungs, if there were any.") /datum/crafting_recipe/frozen_breath diff --git a/modular_doppler/hearthkin/primitive_catgirls/code/organs.dm b/modular_doppler/hearthkin/primitive_genemod/code/organs.dm similarity index 92% rename from modular_doppler/hearthkin/primitive_catgirls/code/organs.dm rename to modular_doppler/hearthkin/primitive_genemod/code/organs.dm index acc10d2153c63..67297ad4c73c1 100644 --- a/modular_doppler/hearthkin/primitive_catgirls/code/organs.dm +++ b/modular_doppler/hearthkin/primitive_genemod/code/organs.dm @@ -6,7 +6,7 @@ name = "hardy lungs" desc = "Lungs adapted to frozen environments that would be otherwise inhospitable to most races. Feels cold." icon_state = "hardylungs" - icon = 'modular_doppler/hearthkin/primitive_catgirls/icons/organs.dmi' + icon = 'modular_doppler/hearthkin/primitive_genemod/icons/organs.dmi' /obj/item/organ/internal/lungs/icebox_adapted/Initialize(mapload) . = ..() @@ -62,10 +62,4 @@ /obj/item/organ/internal/eyes/low_light_adapted color_cutoffs = list(30, 15, 15) - -// Tongue -/obj/item/organ/internal/tongue/cat/primitive - liked_foodtypes = SEAFOOD | MEAT | GORE - - #undef GAS_TOLERANCE diff --git a/modular_doppler/hearthkin/primitive_catgirls/code/pet_commands.dm b/modular_doppler/hearthkin/primitive_genemod/code/pet_commands.dm similarity index 100% rename from modular_doppler/hearthkin/primitive_catgirls/code/pet_commands.dm rename to modular_doppler/hearthkin/primitive_genemod/code/pet_commands.dm diff --git a/modular_doppler/hearthkin/primitive_catgirls/code/smelling_salts.dm b/modular_doppler/hearthkin/primitive_genemod/code/smelling_salts.dm similarity index 97% rename from modular_doppler/hearthkin/primitive_catgirls/code/smelling_salts.dm rename to modular_doppler/hearthkin/primitive_genemod/code/smelling_salts.dm index a91337b514a28..4acfb6eb67ae7 100644 --- a/modular_doppler/hearthkin/primitive_catgirls/code/smelling_salts.dm +++ b/modular_doppler/hearthkin/primitive_genemod/code/smelling_salts.dm @@ -2,7 +2,7 @@ name = "smelling salts" desc = "A small pile of a salt-like substance that smells absolutely repulsive. Rumor has it that the smell is so pungent that even the dead will come back to life to escape it." icon_state = "smelling_salts" - icon = 'modular_doppler/hearthkin/primitive_catgirls/icons/salts.dmi' + icon = 'modular_doppler/hearthkin/primitive_genemod/icons/salts.dmi' w_class = WEIGHT_CLASS_TINY resistance_flags = FLAMMABLE item_flags = NOBLUDGEON diff --git a/modular_doppler/hearthkin/primitive_catgirls/code/spawner.dm b/modular_doppler/hearthkin/primitive_genemod/code/spawner.dm similarity index 81% rename from modular_doppler/hearthkin/primitive_catgirls/code/spawner.dm rename to modular_doppler/hearthkin/primitive_genemod/code/spawner.dm index 3b5e5170d0192..329469d585ccb 100644 --- a/modular_doppler/hearthkin/primitive_catgirls/code/spawner.dm +++ b/modular_doppler/hearthkin/primitive_genemod/code/spawner.dm @@ -1,11 +1,11 @@ -/obj/effect/mob_spawn/ghost_role/human/primitive_catgirl +/obj/effect/mob_spawn/ghost_role/human/primitive_genemod name = "hole in the ground" desc = "A clearly hand dug hole in the ground that appears to lead into a small cave of some kind? It's pretty dark in there." prompt_name = "icemoon dweller" icon = 'icons/mob/simple/lavaland/nest.dmi' icon_state = "hole" - mob_species = /datum/species/human/felinid/primitive - outfit = /datum/outfit/primitive_catgirl + mob_species = /datum/species/human/genemod/primitive + outfit = /datum/outfit/primitive_genemod density = FALSE you_are_text = "You are an icemoon dweller." flavour_text = "For as long as you can remember, the icemoon has been your home. \ @@ -13,14 +13,14 @@ Currently, you and your kin live in uneasy tension with your nearby human-and-otherwise \ neighbors. Keep your village and your Kin safe, but bringing death on their heads from \ being reckless with the outsiders will not have the Gods be so kind." - spawner_job_path = /datum/job/primitive_catgirl + spawner_job_path = /datum/job/primitive_genemod interaction_flags_mouse_drop = NEED_DEXTERITY allow_loadout = FALSE /// The team the spawner will assign players to and use to keep track of people that have already used the spawner - var/datum/team/primitive_catgirls/team + var/datum/team/primitive_genemods/team - restricted_species = list(/datum/species/human/felinid/primitive) + restricted_species = list(/datum/species/human/genemod/primitive) infinite_use = TRUE deletes_on_zero_uses_left = FALSE @@ -32,28 +32,28 @@ var/join_and_leave_log_cache = null /// The minimum time someone needs to be SSD before they can be put back in. Shares config "cryo_min_ssd_time" with cryopod var/ssd_time = 15 MINUTES -/obj/effect/mob_spawn/ghost_role/human/primitive_catgirl/Initialize(mapload) +/obj/effect/mob_spawn/ghost_role/human/primitive_genemod/Initialize(mapload) . = ..() - team = new /datum/team/primitive_catgirls() + team = new /datum/team/primitive_genemods() ssd_time = CONFIG_GET(number/cryo_min_ssd_time) -/obj/effect/mob_spawn/ghost_role/human/primitive_catgirl/Destroy() +/obj/effect/mob_spawn/ghost_role/human/primitive_genemod/Destroy() team = null return ..() -/obj/effect/mob_spawn/ghost_role/human/primitive_catgirl/examine(mob/user) +/obj/effect/mob_spawn/ghost_role/human/primitive_genemod/examine(mob/user) . = ..() - if(isprimitivedemihuman(user) || isobserver(user)) + if(isprimitive(user) || isobserver(user)) . += span_notice("You could examine it more thoroughly...") return . -/obj/effect/mob_spawn/ghost_role/human/primitive_catgirl/examine_more(mob/user) +/obj/effect/mob_spawn/ghost_role/human/primitive_genemod/examine_more(mob/user) . = ..() - if(!isprimitivedemihuman(user) && !isobserver(user)) + if(!isprimitive(user) && !isobserver(user)) return . += get_joined_and_left_log() @@ -63,7 +63,7 @@ * Returns the `join_and_leave_log_cache` string if it already exists, otherwise * generates and returns it. */ -/obj/effect/mob_spawn/ghost_role/human/primitive_catgirl/proc/get_joined_and_left_log() +/obj/effect/mob_spawn/ghost_role/human/primitive_genemod/proc/get_joined_and_left_log() if(join_and_leave_log_cache) return join_and_leave_log_cache @@ -91,7 +91,7 @@ return join_and_leave_log_cache -/obj/effect/mob_spawn/ghost_role/human/primitive_catgirl/allow_spawn(mob/user, silent = FALSE) +/obj/effect/mob_spawn/ghost_role/human/primitive_genemod/allow_spawn(mob/user, silent = FALSE) if(!(user.key in team.players_spawned)) // One spawn per person return TRUE if(!silent) @@ -99,7 +99,7 @@ return FALSE -/obj/effect/mob_spawn/ghost_role/human/primitive_catgirl/create(mob/mob_possessor, newname) +/obj/effect/mob_spawn/ghost_role/human/primitive_genemod/create(mob/mob_possessor, newname) . = ..() // We remove their name from there if they come back. @@ -107,19 +107,26 @@ join_and_leave_log_cache = null -// This stuff is put on equip because it turns out /special sometimes just don't get called because Nova -/obj/effect/mob_spawn/ghost_role/human/primitive_catgirl/equip(mob/living/carbon/human/spawned_human) +// Add the animalistic trait if they have it selected +/obj/effect/mob_spawn/ghost_role/human/primitive_genemod/special(mob/living/spawned_mob, mob/mob_possessor) + var/animalistic_trait = mob_possessor.client?.prefs.read_preference(/datum/preference/choiced/animalistic_trait) + if(animalistic_trait && animalistic_trait != NO_VARIATION) + ADD_TRAIT(spawned_mob, animalistic_trait, SPECIES_TRAIT) + ..() + + +/obj/effect/mob_spawn/ghost_role/human/primitive_genemod/equip(mob/living/carbon/human/spawned_human) . = ..() - spawned_human.mind.add_antag_datum(/datum/antagonist/primitive_catgirl, team) + spawned_human.mind.add_antag_datum(/datum/antagonist/primitive_genemod, team) team.players_spawned += (spawned_human.key) -/obj/effect/mob_spawn/ghost_role/human/primitive_catgirl/mouse_drop_receive(mob/living/carbon/human/target, mob/user, params) +/obj/effect/mob_spawn/ghost_role/human/primitive_genemod/mouse_drop_receive(mob/living/carbon/human/target, mob/user, params) if(!istype(target)) return - if(!isprimitivedemihuman(target) || target.buckled) + if(!isprimitive(target) || target.buckled) return if(target.stat == DEAD) @@ -168,7 +175,7 @@ return // Just in case something happened in-between, to make sure it doesn't do unexpected behaviors. - if(!isprimitivedemihuman(target) || !can_interact(user) || !target.Adjacent(user) || target.buckled || target.stat == DEAD) + if(!isprimitive(target) || !can_interact(user) || !target.Adjacent(user) || target.buckled || target.stat == DEAD) return if(target == user) @@ -187,7 +194,7 @@ * stripping them of all their items, and finishes by adding back a use to the * spawner. */ -/obj/effect/mob_spawn/ghost_role/human/primitive_catgirl/proc/put_back_in(mob/living/carbon/human/target) +/obj/effect/mob_spawn/ghost_role/human/primitive_genemod/proc/put_back_in(mob/living/carbon/human/target) if(!istype(target)) return @@ -225,7 +232,7 @@ * Simple helper to generate the item drop blacklist based on the spawner's * outfit, only taking the used slots into account. */ -/obj/effect/mob_spawn/ghost_role/human/primitive_catgirl/proc/generate_item_drop_blacklist() +/obj/effect/mob_spawn/ghost_role/human/primitive_genemod/proc/generate_item_drop_blacklist() PROTECTED_PROC(TRUE) var/list/blacklist = list() @@ -240,17 +247,17 @@ return blacklist -/datum/job/primitive_catgirl +/datum/job/primitive_genemod title = "Icemoon Dweller" // Antag and team datums -/datum/team/primitive_catgirls +/datum/team/primitive_genemods name = "Icewalkers" member_name = "Icewalker" show_roundend_report = FALSE -/datum/team/primitive_catgirls/roundend_report() +/datum/team/primitive_genemods/roundend_report() var/list/report = list() report += span_header("An Ice Walker Tribe inhabited the wastes...
") @@ -264,7 +271,7 @@ // Antagonist datum -/datum/antagonist/primitive_catgirl +/datum/antagonist/primitive_genemod name = "\improper Icewalker" job_rank = ROLE_LAVALAND // If you're ashwalker banned you should also not be playing this, other way around as well show_in_antagpanel = FALSE @@ -275,7 +282,7 @@ show_in_roundend = FALSE /// Tracks the antag datum's 'team' for showing in the ghost orbit menu - var/datum/team/primitive_catgirls/feline_team + var/datum/team/primitive_genemods/feline_team antag_recipes = list( /datum/crafting_recipe/boneaxe, @@ -292,16 +299,16 @@ /datum/crafting_recipe/hearthkin_rune_stone, ) -/datum/antagonist/primitive_catgirl/Destroy() +/datum/antagonist/primitive_genemod/Destroy() feline_team = null return ..() -/datum/antagonist/primitive_catgirl/create_team(datum/team/team) +/datum/antagonist/primitive_genemod/create_team(datum/team/team) if(team) feline_team = team objectives |= feline_team.objectives else feline_team = new -/datum/antagonist/primitive_catgirl/get_team() +/datum/antagonist/primitive_genemod/get_team() return feline_team diff --git a/modular_doppler/hearthkin/primitive_catgirls/code/special_metals.dm b/modular_doppler/hearthkin/primitive_genemod/code/special_metals.dm similarity index 92% rename from modular_doppler/hearthkin/primitive_catgirls/code/special_metals.dm rename to modular_doppler/hearthkin/primitive_genemod/code/special_metals.dm index ae969d27ca8df..8268c148f6b23 100644 --- a/modular_doppler/hearthkin/primitive_catgirls/code/special_metals.dm +++ b/modular_doppler/hearthkin/primitive_genemod/code/special_metals.dm @@ -18,7 +18,7 @@ name = "cobolterium bars" desc = "Cobalt-blue metal that might actually just be cobalt." singular_name = "cobolterium bar" - icon = 'modular_doppler/hearthkin/primitive_catgirls/icons/special_metals_stack.dmi' + icon = 'modular_doppler/hearthkin/primitive_genemod/icons/special_metals_stack.dmi' icon_state = "precious-metals" material_flags = MATERIAL_EFFECTS | MATERIAL_COLOR mats_per_unit = list(/datum/material/cobolterium = SHEET_MATERIAL_AMOUNT) @@ -47,7 +47,7 @@ name = "copporcitite bars" desc = "Copper colored metal that might actually just be copper." singular_name = "copporcitite bar" - icon = 'modular_doppler/hearthkin/primitive_catgirls/icons/special_metals_stack.dmi' + icon = 'modular_doppler/hearthkin/primitive_genemod/icons/special_metals_stack.dmi' icon_state = "precious-metals" material_flags = MATERIAL_EFFECTS | MATERIAL_COLOR mats_per_unit = list(/datum/material/copporcitite = SHEET_MATERIAL_AMOUNT) @@ -76,7 +76,7 @@ name = "tinumium bars" desc = "Heavily blued, silver colored metal." singular_name = "tinumium bar" - icon = 'modular_doppler/hearthkin/primitive_catgirls/icons/special_metals_stack.dmi' + icon = 'modular_doppler/hearthkin/primitive_genemod/icons/special_metals_stack.dmi' icon_state = "precious-metals" material_flags = MATERIAL_EFFECTS | MATERIAL_COLOR mats_per_unit = list(/datum/material/tinumium = SHEET_MATERIAL_AMOUNT ) @@ -105,7 +105,7 @@ name = "brussite bars" desc = "Brassy-yellow metal that might actually just be brass." singular_name = "brussite bar" - icon = 'modular_doppler/hearthkin/primitive_catgirls/icons/special_metals_stack.dmi' + icon = 'modular_doppler/hearthkin/primitive_genemod/icons/special_metals_stack.dmi' icon_state = "precious-metals" material_flags = MATERIAL_EFFECTS | MATERIAL_COLOR mats_per_unit = list(/datum/material/brussite = SHEET_MATERIAL_AMOUNT ) diff --git a/modular_doppler/hearthkin/primitive_catgirls/code/translator.dm b/modular_doppler/hearthkin/primitive_genemod/code/translator.dm similarity index 94% rename from modular_doppler/hearthkin/primitive_catgirls/code/translator.dm rename to modular_doppler/hearthkin/primitive_genemod/code/translator.dm index 4963f7160ab99..4b26da144557c 100644 --- a/modular_doppler/hearthkin/primitive_catgirls/code/translator.dm +++ b/modular_doppler/hearthkin/primitive_genemod/code/translator.dm @@ -6,8 +6,8 @@ desc = "A necklace with a old, strange device as its pendant. Symbols \ constantly seem to appear on its screen, as noises happen around it, \ but its purpose is not immediately apparent." - icon = 'modular_doppler/hearthkin/primitive_catgirls/icons/translator.dmi' - worn_icon = 'modular_doppler/hearthkin/primitive_catgirls/icons/translator_worn.dmi' + icon = 'modular_doppler/hearthkin/primitive_genemod/icons/translator.dmi' + worn_icon = 'modular_doppler/hearthkin/primitive_genemod/icons/translator_worn.dmi' icon_state = "translator" slot_flags = ITEM_SLOT_NECK | ITEM_SLOT_OCLOTHING w_class = WEIGHT_CLASS_SMALL //allows this to fit inside of pockets. diff --git a/modular_doppler/hearthkin/primitive_catgirls/icons/clothing_greyscale.dmi b/modular_doppler/hearthkin/primitive_genemod/icons/clothing_greyscale.dmi similarity index 100% rename from modular_doppler/hearthkin/primitive_catgirls/icons/clothing_greyscale.dmi rename to modular_doppler/hearthkin/primitive_genemod/icons/clothing_greyscale.dmi diff --git a/modular_doppler/hearthkin/primitive_catgirls/icons/gods_statue.dmi b/modular_doppler/hearthkin/primitive_genemod/icons/gods_statue.dmi similarity index 100% rename from modular_doppler/hearthkin/primitive_catgirls/icons/gods_statue.dmi rename to modular_doppler/hearthkin/primitive_genemod/icons/gods_statue.dmi diff --git a/modular_doppler/hearthkin/primitive_catgirls/icons/language_icon.dmi b/modular_doppler/hearthkin/primitive_genemod/icons/language_icon.dmi similarity index 100% rename from modular_doppler/hearthkin/primitive_catgirls/icons/language_icon.dmi rename to modular_doppler/hearthkin/primitive_genemod/icons/language_icon.dmi diff --git a/modular_doppler/hearthkin/primitive_catgirls/icons/loincloth.dmi b/modular_doppler/hearthkin/primitive_genemod/icons/loincloth.dmi similarity index 100% rename from modular_doppler/hearthkin/primitive_catgirls/icons/loincloth.dmi rename to modular_doppler/hearthkin/primitive_genemod/icons/loincloth.dmi diff --git a/modular_doppler/hearthkin/primitive_catgirls/icons/objects.dmi b/modular_doppler/hearthkin/primitive_genemod/icons/objects.dmi similarity index 100% rename from modular_doppler/hearthkin/primitive_catgirls/icons/objects.dmi rename to modular_doppler/hearthkin/primitive_genemod/icons/objects.dmi diff --git a/modular_doppler/hearthkin/primitive_catgirls/icons/organs.dmi b/modular_doppler/hearthkin/primitive_genemod/icons/organs.dmi similarity index 100% rename from modular_doppler/hearthkin/primitive_catgirls/icons/organs.dmi rename to modular_doppler/hearthkin/primitive_genemod/icons/organs.dmi diff --git a/modular_doppler/hearthkin/primitive_catgirls/icons/pelt.dmi b/modular_doppler/hearthkin/primitive_genemod/icons/pelt.dmi similarity index 100% rename from modular_doppler/hearthkin/primitive_catgirls/icons/pelt.dmi rename to modular_doppler/hearthkin/primitive_genemod/icons/pelt.dmi diff --git a/modular_doppler/hearthkin/primitive_catgirls/icons/pelt_big.dmi b/modular_doppler/hearthkin/primitive_genemod/icons/pelt_big.dmi similarity index 100% rename from modular_doppler/hearthkin/primitive_catgirls/icons/pelt_big.dmi rename to modular_doppler/hearthkin/primitive_genemod/icons/pelt_big.dmi diff --git a/modular_doppler/hearthkin/primitive_catgirls/icons/pelt_worn.dmi b/modular_doppler/hearthkin/primitive_genemod/icons/pelt_worn.dmi similarity index 100% rename from modular_doppler/hearthkin/primitive_catgirls/icons/pelt_worn.dmi rename to modular_doppler/hearthkin/primitive_genemod/icons/pelt_worn.dmi diff --git a/modular_doppler/hearthkin/primitive_catgirls/icons/salts.dmi b/modular_doppler/hearthkin/primitive_genemod/icons/salts.dmi similarity index 100% rename from modular_doppler/hearthkin/primitive_catgirls/icons/salts.dmi rename to modular_doppler/hearthkin/primitive_genemod/icons/salts.dmi diff --git a/modular_doppler/hearthkin/primitive_catgirls/icons/special_metals_stack.dmi b/modular_doppler/hearthkin/primitive_genemod/icons/special_metals_stack.dmi similarity index 100% rename from modular_doppler/hearthkin/primitive_catgirls/icons/special_metals_stack.dmi rename to modular_doppler/hearthkin/primitive_genemod/icons/special_metals_stack.dmi diff --git a/modular_doppler/hearthkin/primitive_catgirls/icons/translator.dmi b/modular_doppler/hearthkin/primitive_genemod/icons/translator.dmi similarity index 100% rename from modular_doppler/hearthkin/primitive_catgirls/icons/translator.dmi rename to modular_doppler/hearthkin/primitive_genemod/icons/translator.dmi diff --git a/modular_doppler/hearthkin/primitive_catgirls/icons/translator_worn.dmi b/modular_doppler/hearthkin/primitive_genemod/icons/translator_worn.dmi similarity index 100% rename from modular_doppler/hearthkin/primitive_catgirls/icons/translator_worn.dmi rename to modular_doppler/hearthkin/primitive_genemod/icons/translator_worn.dmi diff --git a/modular_doppler/hearthkin/primitive_catgirls/readme.md b/modular_doppler/hearthkin/primitive_genemod/readme.md similarity index 82% rename from modular_doppler/hearthkin/primitive_catgirls/readme.md rename to modular_doppler/hearthkin/primitive_genemod/readme.md index b2556a429e167..40f1ad47861ee 100644 --- a/modular_doppler/hearthkin/primitive_catgirls/readme.md +++ b/modular_doppler/hearthkin/primitive_genemod/readme.md @@ -1,13 +1,13 @@ -## Title: Primitive Catgirls +## Title: Primitive Genemods -MODULE ID: PRIMITIVE_CATGIRLS +MODULE ID: PRIMITIVE_GENEMOD ### Description: Main module of the Hearthkin. It adds species, unique language, special organs and map items as well as unique objects and clothing. Special metals, as well as the pet commands functionality have been added too. -The species ID `primitive_felinid` was added in the configuration file `config\doppler\config_doppler.txt` as a round start species +The species ID `primitive_genemod` was added in the configuration file `config\doppler\config_doppler.txt` as a round start species ### TG Proc Changes: diff --git a/modular_doppler/modular_traits/code/organs.dm b/modular_doppler/modular_customization/organs/_organs.dm similarity index 100% rename from modular_doppler/modular_traits/code/organs.dm rename to modular_doppler/modular_customization/organs/_organs.dm diff --git a/modular_doppler/modular_customization/organs/internal/tongue.dm b/modular_doppler/modular_customization/organs/internal/tongue.dm new file mode 100644 index 0000000000000..82a21af3878d5 --- /dev/null +++ b/modular_doppler/modular_customization/organs/internal/tongue.dm @@ -0,0 +1,45 @@ +/// Dog tongue +// +/obj/item/organ/internal/tongue/dog + name = "dog tongue" + desc = "A fleshy muscle mostly used for barking." + say_mod = "barks" + +/// Bird tongue +// +/obj/item/organ/internal/tongue/bird + name = "bird tongue" + desc = "A fleshy muscle mostly used for chirping." + say_mod = "chirps" + +/obj/item/organ/internal/tongue/bird/Insert(mob/living/carbon/speaker, special = FALSE, movement_flags = DELETE_IF_REPLACED) + . = ..() + speaker.verb_ask = "peeps" + speaker.verb_exclaim = "squawks" + speaker.verb_whisper = "murmurs" + speaker.verb_yell = "shrieks" + +/obj/item/organ/internal/tongue/bird/Remove(mob/living/carbon/speaker, special = FALSE, movement_flags) + . = ..() + speaker.verb_ask = initial(verb_ask) + speaker.verb_exclaim = initial(verb_exclaim) + speaker.verb_whisper = initial(verb_whisper) + speaker.verb_yell = initial(verb_yell) + +/// Mouse tongue +// +/obj/item/organ/internal/tongue/mouse + name = "mouse tongue" + desc = "A fleshy muscle mostly used for squeaking." + say_mod = "squeaks" + +/// Fish tongue +// +/obj/item/organ/internal/tongue/fish + name = "fish tongue" + desc = "A fleshy muscle mostly used for gnashing." + say_mod = "gnashes" + +/// Monkey tongue +// +/obj/item/organ/internal/tongue/monkey diff --git a/modular_doppler/modular_customization/preferences/species_traits.dm b/modular_doppler/modular_customization/preferences/species_traits.dm new file mode 100644 index 0000000000000..aaf22e2fd3c6e --- /dev/null +++ b/modular_doppler/modular_customization/preferences/species_traits.dm @@ -0,0 +1,46 @@ +/// Pref logic for animalistic species traits +// defines in `code/__DEFINES/~doppler_defines/mutant_variations.dm` +/datum/preference/choiced/animalistic_trait + main_feature_name = "Animalistic trait" + savefile_key = "feature_animalistic" + savefile_identifier = PREFERENCE_CHARACTER + category = PREFERENCE_CATEGORY_FEATURES + relevant_inherent_trait = TRAIT_ANIMALISTIC + should_generate_icons = TRUE + +/datum/preference/choiced/animalistic_trait/init_possible_values() + return GLOB.genemod_variations + +/datum/preference/choiced/animalistic_trait/icon_for(value) + switch(value) + if(BIRD) + return icon('icons/mob/simple/animal.dmi', "chicken_brown", EAST) + if(BUNNY) + return icon('icons/mob/simple/rabbit.dmi', "rabbit_white", WEST) + if(CAT) + return icon('icons/mob/simple/pets.dmi', "cat2", EAST) + if(DEER) + return icon('icons/mob/simple/animal.dmi', "deer-doe", WEST) + if(DOG) + return icon('icons/mob/simple/pets.dmi', "corgi", EAST) + if(FISH) + return icon('icons/mob/simple/carp.dmi', "carp", WEST) + if(FOX) + return icon('icons/mob/simple/pets.dmi', "fox", EAST) + if(LIZARD) + return icon('icons/mob/simple/animal.dmi', "lizard", EAST) + if(MONKEY) + return icon('icons/mob/human/human.dmi', "monkey", WEST) + if(MOUSE) + return icon('icons/mob/simple/animal.dmi', "mouse_white", EAST) + else + return icon('icons/effects/crayondecal.dmi', "x") + + +/datum/preference/choiced/animalistic_trait/apply_to_human(mob/living/carbon/human/target, value) + if(value == NO_VARIATION) + return + ADD_TRAIT(target, value, SPECIES_TRAIT) + +/datum/preference/choiced/animalistic_trait/create_default_value() + return NO_VARIATION diff --git a/modular_doppler/modular_mapping/code/ruins/icemoon.dm b/modular_doppler/modular_mapping/code/ruins/icemoon.dm index 0d3c5840d5db4..dc0d116a3f010 100644 --- a/modular_doppler/modular_mapping/code/ruins/icemoon.dm +++ b/modular_doppler/modular_mapping/code/ruins/icemoon.dm @@ -35,7 +35,7 @@ /obj/structure/statue/hearthkin/odin name = "statue of Óðinn" desc = "A gold statue, representing the All-Father Óðinn. It is strangely in good state." - icon = 'modular_doppler/hearthkin/primitive_catgirls/icons/gods_statue.dmi' + icon = 'modular_doppler/hearthkin/primitive_genemod/icons/gods_statue.dmi' icon_state = "odin_statue" /obj/item/paper/crumpled/bloody/fluff/stations/lavaland/sacred_temple/ @@ -44,7 +44,7 @@ default_raw_text = "I refuse to believe we're reduced to this- to sacrifice our own in hopes of our gods taking pity and rescuing us. We've lost too many already... I regret not joining with the rest. But I won't sit here and wait for my turn to be sacrificed, moping about like some sort of useless bastard. Me, my husband, and my sibling Halko will soon make our move, once the grand priest goes to sleep." /obj/item/paper/crumpled/bloody/fluff/stations/lavaland/sacred_temple/ui_status(mob/user, datum/ui_state/state) - if(!user.has_language(/datum/language/primitive_catgirl)) + if(!user.has_language(/datum/language/primitive_genemod)) to_chat(user, span_warning("This seems to be in a language you do not understand!")) return UI_CLOSE diff --git a/modular_doppler/modular_traits/readme.md b/modular_doppler/modular_quirks/readme.md similarity index 90% rename from modular_doppler/modular_traits/readme.md rename to modular_doppler/modular_quirks/readme.md index 18c230c7fe1d2..3d21c5e946fd9 100644 --- a/modular_doppler/modular_traits/readme.md +++ b/modular_doppler/modular_quirks/readme.md @@ -1,6 +1,6 @@ -## Title: Modular Traits +## Title: Modular Quirks -MODULE ID: MODULAR_TRAITS +MODULE ID: MODULAR_QUIRKS ### Description: diff --git a/modular_doppler/modular_species/_species.dm b/modular_doppler/modular_species/_species.dm new file mode 100644 index 0000000000000..422499d5faacd --- /dev/null +++ b/modular_doppler/modular_species/_species.dm @@ -0,0 +1,30 @@ +/// Animal trait logic goes here! +// Used for the genemod and anthro species + +/// Find or build a user's preferred animal trait +/datum/species/proc/find_animal_trait(mob/living/carbon/human/target) + /// Trait which is given to the target, none by default + var/animal_trait = NO_VARIATION + // Lets find the chosen trait, exciting! + for(var/trait as anything in GLOB.genemod_variations) + if(HAS_TRAIT(target, trait)) + animal_trait = trait + break + return animal_trait + +/// Apply the chosen trait, updating the species data according to the desired organ's data +// The proc runs before the mutant organs are read and loaded onto the target +/datum/species/proc/apply_animal_trait(mob/living/carbon/human/target, animal_trait) + if(!ishuman(target) || animal_trait == NO_VARIATION || !animal_trait) + return + // Organs (or just tongues) + /// Find and set our new informed tongue! + var/obj/item/organ/tongue = text2path("/obj/item/organ/internal/tongue/[animal_trait]") + if(tongue) // text2path nulls if it can't find a matching subtype, so don't worry adding an organ for every single trait value + mutanttongue = tongue.type + // Adding traits from here on + switch(animal_trait) + if(CAT) + ADD_TRAIT(target, TRAIT_CATLIKE_GRACE, SPECIES_TRAIT) + ADD_TRAIT(target, TRAIT_HATED_BY_DOGS, SPECIES_TRAIT) + diff --git a/modular_doppler/modular_species/species_types/anthromorph/anthromorph.dm b/modular_doppler/modular_species/species_types/anthromorph/anthromorph.dm index 2cef0bff97097..9380087405d9f 100644 --- a/modular_doppler/modular_species/species_types/anthromorph/anthromorph.dm +++ b/modular_doppler/modular_species/species_types/anthromorph/anthromorph.dm @@ -7,6 +7,7 @@ id = SPECIES_ANTHROMORPH preview_outfit = /datum/outfit/anthro_preview inherent_traits = list( + TRAIT_ANIMALISTIC, TRAIT_MUTANT_COLORS, ) body_markings = list(/datum/bodypart_overlay/simple/body_marking/lizard = "Anthromorph Pattern") @@ -28,6 +29,10 @@ BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/digitigrade/anthromorph, ) +/datum/species/anthromorph/on_species_gain(mob/living/carbon/human/target, datum/species/old_species, pref_load) + apply_animal_trait(target, find_animal_trait(target)) + return ..() + /datum/outfit/anthro_preview name = "Anthromorph (Species Preview)" uniform = /obj/item/clothing/under/rank/security/officer/skirt diff --git a/modular_doppler/modular_species/species_types/genemod/genemod.dm b/modular_doppler/modular_species/species_types/genemod/genemod.dm new file mode 100644 index 0000000000000..5485bd67482f9 --- /dev/null +++ b/modular_doppler/modular_species/species_types/genemod/genemod.dm @@ -0,0 +1,45 @@ +/mob/living/carbon/human/species/genemod + race = /datum/species/human/genemod + +/datum/species/human/genemod + name = "Gene-Mod" + id = SPECIES_GENEMOD + preview_outfit = /datum/outfit/genemod_preview + examine_limb_id = SPECIES_HUMAN + inherent_traits = list( + TRAIT_ANIMALISTIC, + TRAIT_USES_SKINTONES, + ) + changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT + +/datum/outfit/genemod_preview + name = "Gene-Mod (Species Preview)" + uniform = /obj/item/clothing/under/dress/sundress + +/datum/species/human/genemod/get_physical_attributes() + return "N/a." + +/datum/species/human/genemod/get_species_description() + return "N/a." + +/datum/species/human/genemod/get_species_lore() + return list( + "N/a.", + ) + +/datum/species/human/genemod/on_species_gain(mob/living/carbon/human/target, datum/species/old_species, pref_load) + apply_animal_trait(target, find_animal_trait(target)) + return ..() + +/datum/species/human/genemod/prepare_human_for_preview(mob/living/carbon/human/human_for_preview) + human_for_preview.dna.ear_type = DOG + human_for_preview.dna.features["ears"] = "Fold" + human_for_preview.dna.features["ears_color_1"] = "#4E3E30" + human_for_preview.dna.features["ears_color_2"] = "#F4B1C8" + human_for_preview.set_haircolor("#3a2d22", update = FALSE) + human_for_preview.set_hairstyle("Short twintails", update = TRUE) + human_for_preview.skin_tone = "mixed3" + human_for_preview.eye_color_left = "#442B12" + human_for_preview.eye_color_right = "#442B12" + regenerate_organs(human_for_preview) + human_for_preview.update_body(is_creating = TRUE) diff --git a/modular_doppler/modular_species/species_types/primitive_demihuman/primitive_demihuman.dm b/modular_doppler/modular_species/species_types/primitive_genemod/primitive_genemod.dm similarity index 82% rename from modular_doppler/modular_species/species_types/primitive_demihuman/primitive_demihuman.dm rename to modular_doppler/modular_species/species_types/primitive_genemod/primitive_genemod.dm index cd8d8faf05283..8e4e5778d0d7a 100644 --- a/modular_doppler/modular_species/species_types/primitive_demihuman/primitive_demihuman.dm +++ b/modular_doppler/modular_species/species_types/primitive_genemod/primitive_genemod.dm @@ -1,48 +1,46 @@ -/mob/living/carbon/human/species/felinid/primitive - race = /datum/species/human/felinid/primitive +/mob/living/carbon/human/species/genemod/primitive + race = /datum/species/human/genemod/primitive -/datum/language_holder/primitive_felinid +/datum/language_holder/primitive_genemod understood_languages = list( - /datum/language/primitive_catgirl = list(LANGUAGE_ATOM), + /datum/language/primitive_genemod = list(LANGUAGE_ATOM), /datum/language/uncommon = list(LANGUAGE_ATOM), ) spoken_languages = list( - /datum/language/primitive_catgirl = list(LANGUAGE_ATOM), + /datum/language/primitive_genemod = list(LANGUAGE_ATOM), /datum/language/uncommon = list(LANGUAGE_ATOM), ) - selected_language = /datum/language/primitive_catgirl + selected_language = /datum/language/primitive_genemod -/datum/species/human/felinid/primitive - name = "Primitive Demihuman" - id = SPECIES_FELINE_PRIMITIVE - preview_outfit = /datum/outfit/demihuman_preview +/datum/species/human/genemod/primitive + name = "Primitive Gene-Mod" + id = SPECIES_GENEMOD_PRIMITIVE + preview_outfit = /datum/outfit/genemod_primitive_preview mutantlungs = /obj/item/organ/internal/lungs/icebox_adapted mutanteyes = /obj/item/organ/internal/eyes/low_light_adapted - mutanttongue = /obj/item/organ/internal/tongue/cat/primitive - species_language_holder = /datum/language_holder/primitive_felinid - // language_prefs_whitelist = list(/datum/language/primitive_catgirl) //this needs a dedicated module for language - // always_customizable = TRUE //this needs a dedicated module for species customization + species_language_holder = /datum/language_holder/primitive_genemod + // language_prefs_whitelist = list(/datum/language/primitive_genemod) //this needs a dedicated module for language bodytemp_normal = 270 // If a normal human gets hugged by one it's gonna feel cold bodytemp_heat_damage_limit = 283 // To them normal station atmos would be sweltering bodytemp_cold_damage_limit = 213 // Man up bro it's not even that cold out here inherent_traits = list( - TRAIT_CATLIKE_GRACE, + TRAIT_ANIMALISTIC, TRAIT_VIRUSIMMUNE, TRAIT_RESISTCOLD, TRAIT_USES_SKINTONES, ) -/datum/outfit/demihuman_preview - name = "Demihuman (Species Preview)" - uniform = /obj/item/clothing/under/dress/skirt/primitive_catgirl_body_wraps - neck = /obj/item/clothing/neck/scarf/primitive_catgirl_scarf +/datum/outfit/genemod_primitive_preview + name = "Primitive Gene-Mod (Species Preview)" + uniform = /obj/item/clothing/under/dress/skirt/primitive_genemod_body_wraps + neck = /obj/item/clothing/neck/scarf/primitive_genemod_scarf back = /obj/item/forging/reagent_weapon/axe/fake_copper -/datum/species/human/felinid/primitive/on_species_gain(mob/living/carbon/new_primitive, datum/species/old_species, pref_load) +/datum/species/human/genemod/primitive/on_species_gain(mob/living/carbon/new_primitive, datum/species/old_species, pref_load) . = ..() var/mob/living/carbon/human/hearthkin = new_primitive if(!istype(hearthkin)) @@ -55,14 +53,14 @@ mutation.mutadone_proof = TRUE mutation.instability = 0 -/datum/species/human/felinid/primitive/on_species_loss(mob/living/carbon/former_primitive, datum/species/new_species, pref_load) +/datum/species/human/genemod/primitive/on_species_loss(mob/living/carbon/former_primitive, datum/species/new_species, pref_load) . = ..() var/mob/living/carbon/human/hearthkin = former_primitive if(!istype(hearthkin)) return hearthkin.dna.remove_mutation(/datum/mutation/human/olfaction) -/datum/species/human/felinid/primitive/prepare_human_for_preview(mob/living/carbon/human/human_for_preview) +/datum/species/human/genemod/primitive/prepare_human_for_preview(mob/living/carbon/human/human_for_preview) human_for_preview.dna.ear_type = CAT human_for_preview.dna.features["ears"] = "Coeurl" human_for_preview.dna.features["ears_color_1"] = "#e9eff5" @@ -71,10 +69,12 @@ human_for_preview.set_haircolor("#E9EFF5", update = FALSE) human_for_preview.set_hairstyle("Fluffy long", update = TRUE) human_for_preview.skin_tone = "albino" + human_for_preview.eye_color_left = "#96dbe7" + human_for_preview.eye_color_right = "#96dbe7" regenerate_organs(human_for_preview) human_for_preview.update_body(is_creating = TRUE) -/datum/species/human/felinid/primitive/get_species_description() +/datum/species/human/genemod/primitive/get_species_description() return list( "Genetically modified humanoids believed to be descendants of a now centuries old colony \ ship from the pre-bluespace travel era. Still having at least some human traits, they \ @@ -82,7 +82,7 @@ the icemoon's many fauna." ) -/datum/species/human/felinid/primitive/get_species_lore() +/datum/species/human/genemod/primitive/get_species_lore() return list( "The Hearthkin are a culture of disparate Scandinavian groups all sharing a common origin \ as descendents from demihuman genemodders aboard the good ship Stjarndrakkr, or Star Dragon; \ diff --git a/modular_doppler/modular_traits/code/neutral.dm b/modular_doppler/modular_traits/code/neutral.dm deleted file mode 100644 index 1bff3c1539b0f..0000000000000 --- a/modular_doppler/modular_traits/code/neutral.dm +++ /dev/null @@ -1,22 +0,0 @@ -/datum/quirk/feline_aspect - name = "Feline Traits" - desc = "You happen to act like a feline, for whatever reason. This will replace most other tongue-based speech quirks." - gain_text = span_notice("Nya could go for some catnip right about now...") - lose_text = span_notice("You feel less attracted to lasers.") - medical_record_text = "Patient seems to possess behavior much like a feline." - mob_trait = TRAIT_FELINE - icon = FA_ICON_CAT - -/datum/quirk/feline_aspect/add_unique(client/client_source) - var/mob/living/carbon/human/human_holder = quirk_holder - var/obj/item/organ/internal/tongue/cat/new_tongue = new(get_turf(human_holder)) - - new_tongue.copy_traits_from(human_holder.get_organ_slot(ORGAN_SLOT_TONGUE)) - new_tongue.Insert(human_holder, special = TRUE, movement_flags = DELETE_IF_REPLACED) - -/datum/quirk/feline_aspect/remove() - var/mob/living/carbon/human/human_holder = quirk_holder - var/obj/item/organ/internal/tongue/new_tongue = new human_holder.dna.species.mutanttongue - - new_tongue.copy_traits_from(human_holder.get_organ_slot(ORGAN_SLOT_TONGUE)) - new_tongue.Insert(human_holder, special = TRUE, movement_flags = DELETE_IF_REPLACED) diff --git a/modular_doppler/reagent_forging/code/forge.dm b/modular_doppler/reagent_forging/code/forge.dm index 27902e41c9cbe..54e8fdf6fd501 100644 --- a/modular_doppler/reagent_forging/code/forge.dm +++ b/modular_doppler/reagent_forging/code/forge.dm @@ -156,7 +156,7 @@ . += span_notice("
[src] is currently [forge_temperature] degrees hot, going towards [target_temperature] degrees.
") - if(reagent_forging && (is_species(user, /datum/species/lizard/ashwalker) || is_species(user, /datum/species/human/felinid/primitive))) + if(reagent_forging && (is_species(user, /datum/species/lizard/ashwalker) || is_species(user, /datum/species/human/genemod/primitive))) . += span_warning("[src] has a fine gold trim, it is ready to imbue chemicals into reagent objects.") return . @@ -408,7 +408,7 @@ if(SKILL_LEVEL_LEGENDARY) if(!forced) - if(is_species(user, /datum/species/lizard/ashwalker) || is_species(user, /datum/species/human/felinid/primitive)) + if(is_species(user, /datum/species/lizard/ashwalker) || is_species(user, /datum/species/human/genemod/primitive)) to_chat(user, span_notice("With just the right heat treating technique, metal could be made to accept reagents...")) create_reagent_forge() if(forge_level == FORGE_LEVEL_MASTER) @@ -573,7 +573,7 @@ return var/mob/living/carbon/human/human_user = user - if(!is_species(human_user, /datum/species/lizard/ashwalker) && !is_species(human_user, /datum/species/human/felinid/primitive)) + if(!is_species(human_user, /datum/species/lizard/ashwalker) && !is_species(human_user, /datum/species/human/genemod/primitive)) to_chat(user, span_danger("It is impossible for you to imbue!")) //maybe remove (ashwalkers & icecats only) after some time return @@ -623,7 +623,7 @@ return var/mob/living/carbon/human/human_user = user - if(!is_species(human_user, /datum/species/lizard/ashwalker) && !is_species(human_user, /datum/species/human/felinid/primitive)) + if(!is_species(human_user, /datum/species/lizard/ashwalker) && !is_species(human_user, /datum/species/human/genemod/primitive)) to_chat(user, span_danger("It is impossible for you to imbue!")) //maybe remove (ashwalkers & icecats only) after some time return diff --git a/tgstation.dme b/tgstation.dme index e30b12c368496..bcd3f3f6f1102 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6554,18 +6554,6 @@ #include "modular_doppler\food_replicator\code\replicator_designs\replicator_clothing.dm" #include "modular_doppler\food_replicator\code\replicator_designs\replicator_food.dm" #include "modular_doppler\food_replicator\code\replicator_designs\replicator_medical.dm" -#include "modular_doppler\hearthkin\primitive_catgirls\code\clothing.dm" -#include "modular_doppler\hearthkin\primitive_catgirls\code\clothing_vendor.dm" -#include "modular_doppler\hearthkin\primitive_catgirls\code\greyscale_config.dm" -#include "modular_doppler\hearthkin\primitive_catgirls\code\language.dm" -#include "modular_doppler\hearthkin\primitive_catgirls\code\map_items.dm" -#include "modular_doppler\hearthkin\primitive_catgirls\code\objects.dm" -#include "modular_doppler\hearthkin\primitive_catgirls\code\organs.dm" -#include "modular_doppler\hearthkin\primitive_catgirls\code\pet_commands.dm" -#include "modular_doppler\hearthkin\primitive_catgirls\code\smelling_salts.dm" -#include "modular_doppler\hearthkin\primitive_catgirls\code\spawner.dm" -#include "modular_doppler\hearthkin\primitive_catgirls\code\special_metals.dm" -#include "modular_doppler\hearthkin\primitive_catgirls\code\translator.dm" #include "modular_doppler\hearthkin\primitive_cooking_additions\code\big_mortar.dm" #include "modular_doppler\hearthkin\primitive_cooking_additions\code\cauldron.dm" #include "modular_doppler\hearthkin\primitive_cooking_additions\code\cookware.dm" @@ -6575,6 +6563,18 @@ #include "modular_doppler\hearthkin\primitive_cooking_additions\code\stone_griddle.dm" #include "modular_doppler\hearthkin\primitive_cooking_additions\code\stone_oven.dm" #include "modular_doppler\hearthkin\primitive_cooking_additions\code\stone_stove.dm" +#include "modular_doppler\hearthkin\primitive_genemod\code\clothing.dm" +#include "modular_doppler\hearthkin\primitive_genemod\code\clothing_vendor.dm" +#include "modular_doppler\hearthkin\primitive_genemod\code\greyscale_config.dm" +#include "modular_doppler\hearthkin\primitive_genemod\code\language.dm" +#include "modular_doppler\hearthkin\primitive_genemod\code\map_items.dm" +#include "modular_doppler\hearthkin\primitive_genemod\code\objects.dm" +#include "modular_doppler\hearthkin\primitive_genemod\code\organs.dm" +#include "modular_doppler\hearthkin\primitive_genemod\code\pet_commands.dm" +#include "modular_doppler\hearthkin\primitive_genemod\code\smelling_salts.dm" +#include "modular_doppler\hearthkin\primitive_genemod\code\spawner.dm" +#include "modular_doppler\hearthkin\primitive_genemod\code\special_metals.dm" +#include "modular_doppler\hearthkin\primitive_genemod\code\translator.dm" #include "modular_doppler\hearthkin\primitive_production\code\antfarm.dm" #include "modular_doppler\hearthkin\primitive_production\code\ceramics.dm" #include "modular_doppler\hearthkin\primitive_production\code\farming.dm" @@ -6734,11 +6734,13 @@ #include "modular_doppler\modular_customization\accessories\code\synthetic_accessories\synth_tail.dm" #include "modular_doppler\modular_customization\accessories\code\~overrides\code\overrides.dm" #include "modular_doppler\modular_customization\bodypart\bodypart_overrides.dm" +#include "modular_doppler\modular_customization\organs\_organs.dm" #include "modular_doppler\modular_customization\organs\external\fluff.dm" #include "modular_doppler\modular_customization\organs\external\tail.dm" #include "modular_doppler\modular_customization\organs\external\wings.dm" #include "modular_doppler\modular_customization\organs\internal\ears.dm" #include "modular_doppler\modular_customization\organs\internal\eyes.dm" +#include "modular_doppler\modular_customization\organs\internal\tongue.dm" #include "modular_doppler\modular_customization\preferences\antennae.dm" #include "modular_doppler\modular_customization\preferences\body_marking_lizard.dm" #include "modular_doppler\modular_customization\preferences\body_marking_moth.dm" @@ -6747,6 +6749,7 @@ #include "modular_doppler\modular_customization\preferences\frills.dm" #include "modular_doppler\modular_customization\preferences\horns.dm" #include "modular_doppler\modular_customization\preferences\snout.dm" +#include "modular_doppler\modular_customization\preferences\species_traits.dm" #include "modular_doppler\modular_customization\preferences\tail.dm" #include "modular_doppler\modular_customization\preferences\wings.dm" #include "modular_doppler\modular_customization\tri_color\antennae.dm" @@ -6798,6 +6801,7 @@ #include "modular_doppler\modular_quirks\paycheck_rations\code\ticket_book.dm" #include "modular_doppler\modular_quirks\paycheck_rations\code\tickets.dm" #include "modular_doppler\modular_sounds\code\sounds.dm" +#include "modular_doppler\modular_species\_species.dm" #include "modular_doppler\modular_species\code\bloodsplatter.dm" #include "modular_doppler\modular_species\overwrites\code\species.dm" #include "modular_doppler\modular_species\species_types\anthromorph\anthromorph.dm" @@ -6805,6 +6809,7 @@ #include "modular_doppler\modular_species\species_types\aquatic\aquatic.dm" #include "modular_doppler\modular_species\species_types\aquatic\aquatic_bodyparts.dm" #include "modular_doppler\modular_species\species_types\ethereal\ethereal.dm" +#include "modular_doppler\modular_species\species_types\genemod\genemod.dm" #include "modular_doppler\modular_species\species_types\golem\golem.dm" #include "modular_doppler\modular_species\species_types\insectoid\insectoid.dm" #include "modular_doppler\modular_species\species_types\insectoid\insectoid_bodyparts.dm" @@ -6812,15 +6817,13 @@ #include "modular_doppler\modular_species\species_types\monkey\monkeys.dm" #include "modular_doppler\modular_species\species_types\mothmen\mothmen.dm" #include "modular_doppler\modular_species\species_types\plasmamen\plasmamen.dm" -#include "modular_doppler\modular_species\species_types\primitive_demihuman\primitive_demihuman.dm" +#include "modular_doppler\modular_species\species_types\primitive_genemod\primitive_genemod.dm" #include "modular_doppler\modular_species\species_types\slugcats\slugcat.dm" #include "modular_doppler\modular_species\species_types\slugcats\slugcat_bodyparts.dm" #include "modular_doppler\modular_species\species_types\snails\modular_snail.dm" #include "modular_doppler\modular_species\species_types\snails\snail_bodyparts.dm" #include "modular_doppler\modular_species\species_types\snails\organs\snail_heart.dm" #include "modular_doppler\modular_species\species_types\snails\organs\snail_liver.dm" -#include "modular_doppler\modular_traits\code\neutral.dm" -#include "modular_doppler\modular_traits\code\organs.dm" #include "modular_doppler\modular_weapons\code\gunsets.dm" #include "modular_doppler\modular_weapons\company_and_or_faction_based\carwo_defense_systems\gunsets.dm" #include "modular_doppler\modular_weapons\manufacturer_examine\code\gun_company_additions.dm" diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/species_features.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/species_features.tsx index d517cc720c29c..6d36760ee68e7 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/species_features.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/species_features.tsx @@ -123,3 +123,10 @@ export const heterochromatic: Feature = { name: 'Heterochromatic (Right Eye) color', component: FeatureColorInput, }; + +// DOPPLER ADDITION START +export const feature_animalistic: Feature = { + name: 'Animalistic trait', + component: FeatureDropdownInput, +}; +// DOPPLER ADDITION END