diff --git a/code/__defines/turfs.dm b/code/__defines/turfs.dm index ac797e16cbd..54388d2c38f 100644 --- a/code/__defines/turfs.dm +++ b/code/__defines/turfs.dm @@ -46,3 +46,4 @@ #define FLOOR_EDGE_PATH (60 * FLOOR_LAYER_CONSTANT) #define FLOOR_EDGE_GRASS_WILD (65 * FLOOR_LAYER_CONSTANT) #define FLOOR_EDGE_SNOW (70 * FLOOR_LAYER_CONSTANT) +#define FLOOR_EDGE_CARPET (75 * FLOOR_LAYER_CONSTANT) diff --git a/code/game/objects/structures/_structure_materials.dm b/code/game/objects/structures/_structure_materials.dm index 5e76990a22e..bd070bd0a05 100644 --- a/code/game/objects/structures/_structure_materials.dm +++ b/code/game/objects/structures/_structure_materials.dm @@ -36,7 +36,7 @@ /obj/structure/proc/update_material_name(var/override_name) var/base_name = override_name || initial(name) if(istype(material)) - SetName("[material.solid_name] [base_name]") + SetName("[material.adjective_name] [base_name]") else SetName(base_name) diff --git a/code/game/objects/structures/barrel.dm b/code/game/objects/structures/barrel.dm index 5281d7dfcef..20d0c9d6eb2 100644 --- a/code/game/objects/structures/barrel.dm +++ b/code/game/objects/structures/barrel.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/structures/barrel.dmi' icon_state = ICON_STATE_WORLD anchored = TRUE - atom_flags = ATOM_FLAG_CLIMBABLE | ATOM_FLAG_OPEN_CONTAINER + atom_flags = ATOM_FLAG_CLIMBABLE matter = null material = /decl/material/solid/organic/wood color = /decl/material/solid/organic/wood::color @@ -42,9 +42,21 @@ return var/primary_mat = reagents?.get_primary_reagent_name() if(primary_mat) - SetName("[material.solid_name] [initial(name)] of [primary_mat]") + update_material_name("[initial(name)] of [primary_mat]") else - SetName("[material.solid_name] [initial(name)]") + update_material_name() + update_icon() + +/obj/structure/reagent_dispensers/barrel/on_update_icon() + . = ..() + if(ATOM_IS_OPEN_CONTAINER(src)) + if(reagents) + var/overlay_amount = NONUNIT_CEILING(reagents.total_liquid_volume / reagents.maximum_volume * 100, 10) + var/image/filling_overlay = overlay_image(icon, "[icon_state]-[overlay_amount]", reagents.get_color(), RESET_COLOR | RESET_ALPHA) + add_overlay(filling_overlay) + add_overlay(overlay_image(icon, "[icon_state]-lidopen", material.color, RESET_COLOR)) + else + add_overlay(overlay_image(icon, "[icon_state]-lidclosed", material.color, RESET_COLOR)) /obj/structure/reagent_dispensers/barrel/ebony material = /decl/material/solid/organic/wood/ebony diff --git a/code/game/turfs/flooring/flooring_carpet.dm b/code/game/turfs/flooring/flooring_carpet.dm index 1158eb56ff1..79a30eb7ff4 100644 --- a/code/game/turfs/flooring/flooring_carpet.dm +++ b/code/game/turfs/flooring/flooring_carpet.dm @@ -3,6 +3,7 @@ desc = "Comfy and fancy carpeting." icon = 'icons/turf/flooring/carpet.dmi' icon_base = "brown" + icon_edge_layer = FLOOR_EDGE_CARPET build_type = /obj/item/stack/tile/carpet damage_temperature = T0C+200 flooring_flags = TURF_REMOVE_CROWBAR | TURF_CAN_BURN diff --git a/code/game/turfs/floors/_floor.dm b/code/game/turfs/floors/_floor.dm index 0dd9e8e4365..d3d49d39745 100644 --- a/code/game/turfs/floors/_floor.dm +++ b/code/game/turfs/floors/_floor.dm @@ -45,7 +45,7 @@ set_flooring(GET_DECL(floortype), skip_update = TRUE) if(fill_reagent_type && get_physical_height() < 0) - add_to_reagents(fill_reagent_type, abs(height)) + add_to_reagents(fill_reagent_type, abs(height), phase = MAT_PHASE_LIQUID) if(floor_material || get_topmost_flooring()) if(ml) @@ -110,11 +110,17 @@ /turf/floor/proc/get_base_flooring() RETURN_TYPE(/decl/flooring) - return istype(_base_flooring) ? _base_flooring : null + if(ispath(_base_flooring)) + return GET_DECL(_base_flooring) + return _base_flooring /turf/floor/proc/get_topmost_flooring() RETURN_TYPE(/decl/flooring) - return istype(_flooring) ? _flooring : get_base_flooring() + if(isnull(_flooring)) + return get_base_flooring() + if(ispath(_flooring)) + return GET_DECL(_flooring) + return _flooring /turf/floor/proc/set_flooring(var/decl/flooring/newflooring, skip_update, place_product) diff --git a/code/game/turfs/floors/floor_icon.dm b/code/game/turfs/floors/floor_icon.dm index 656b0cf3aeb..16b41e64ec8 100644 --- a/code/game/turfs/floors/floor_icon.dm +++ b/code/game/turfs/floors/floor_icon.dm @@ -209,39 +209,37 @@ if(!istype(origin) || !istype(opponent)) return FALSE - . = FALSE - //is_wall is true for wall turfs and for floors containing a low wall - if(opponent.is_wall()) - if(wall_smooth == SMOOTH_ALL) - . = TRUE - //If is_hole is true, then it's space or openspace - else if(opponent.is_open()) - if(space_smooth == SMOOTH_ALL) - . = TRUE - - //If we get here then its a normal floor - else if (istype(opponent, /turf/floor)) + // Just a normal floor + if (istype(opponent, /turf/floor)) var/turf/floor/floor_opponent = opponent var/decl/flooring/opponent_flooring = floor_opponent.get_topmost_flooring() if (floor_smooth == SMOOTH_ALL) - . = TRUE + return TRUE //If the floor is the same as us,then we're linked, else if (istype(opponent_flooring, neighbour_type)) - . = TRUE + return TRUE //If we get here it must be using a whitelist or blacklist else if (floor_smooth == SMOOTH_WHITELIST) if (flooring_whitelist[opponent_flooring.type]) //Found a match on the typecache - . = TRUE + return TRUE else if(floor_smooth == SMOOTH_BLACKLIST) - . = TRUE //Default to true for the blacklist, then make it false if a match comes up - if (flooring_blacklist[opponent_flooring.type]) - //Found a match on the typecache - . = FALSE + if (flooring_blacklist[opponent_flooring.type]) {EMPTY_BLOCK_GUARD} else + //No match on the typecache + return TRUE //Check for window frames. - if (!. && wall_smooth == SMOOTH_ALL) + if (wall_smooth == SMOOTH_ALL) if(locate(/obj/structure/wall_frame) in opponent) - . = TRUE + return TRUE + // Wall turf + else if(opponent.is_wall()) + if(wall_smooth == SMOOTH_ALL) + return TRUE + //If is_open is true, then it's space or openspace + else if(opponent.is_open()) + if(space_smooth == SMOOTH_ALL) + return TRUE + return FALSE /decl/flooring/proc/symmetric_test_link(var/turf/A, var/turf/B) return test_link(A, B) && test_link(B,A) diff --git a/code/game/turfs/floors/subtypes/floor_natural.dm b/code/game/turfs/floors/subtypes/floor_natural.dm index e1620e5b899..4b6b98437d5 100644 --- a/code/game/turfs/floors/subtypes/floor_natural.dm +++ b/code/game/turfs/floors/subtypes/floor_natural.dm @@ -11,7 +11,7 @@ color = "#41311b" _base_flooring = /decl/flooring/dirt -/turf/floor/dirt/walnut +/turf/floor/wood/walnut name = "wooden floor" icon = 'icons/turf/flooring/wood.dmi' icon_state = "wood" diff --git a/code/game/turfs/turf_fluids.dm b/code/game/turfs/turf_fluids.dm index 8779313e061..e7667b29bd5 100644 --- a/code/game/turfs/turf_fluids.dm +++ b/code/game/turfs/turf_fluids.dm @@ -103,7 +103,7 @@ create_reagents(FLUID_MAX_DEPTH) return ..() -/turf/add_to_reagents(reagent_type, amount, data, safety = FALSE, defer_update = FALSE) +/turf/add_to_reagents(reagent_type, amount, data, safety = FALSE, defer_update = FALSE, phase) if(!reagents) create_reagents(FLUID_MAX_DEPTH) return ..() diff --git a/code/modules/materials/definitions/liquids/materials_liquid_soup.dm b/code/modules/materials/definitions/liquids/materials_liquid_soup.dm index 2e3f43996b8..089fc5ecaea 100644 --- a/code/modules/materials/definitions/liquids/materials_liquid_soup.dm +++ b/code/modules/materials/definitions/liquids/materials_liquid_soup.dm @@ -4,6 +4,8 @@ nutriment_factor = 4 hydration_factor = 5 // Per removed amount each tick glass_name = "soup" + melting_point = T0C // We assume soup is water-based by default and so it freezes at 0C. + boiling_point = null // It kind of sucks for your soup to boil away honestly var/mask_name_suffix = "soup" /decl/material/liquid/nutriment/soup/get_presentation_name(var/obj/item/prop) @@ -26,19 +28,21 @@ var/allergen_flags = ALLERGEN_NONE var/list/ingredients = list() + var/new_fraction = newamount / REAGENT_VOLUME(reagents, type) // the fraction of the total reagent volume that the new data is associated with + var/old_fraction = 1 - new_fraction . = ..() if(islist(.) && length(.)) allergen_flags |= .["allergen_flags"] var/list/old_ingredients = .["soup_ingredients"] for(var/ingredient in old_ingredients) - ingredients[ingredient] += old_ingredients[ingredient] + ingredients[ingredient] += old_ingredients[ingredient] * old_fraction if(islist(newdata) && length(newdata)) allergen_flags |= newdata["allergen_flags"] var/list/new_ingredients = newdata["soup_ingredients"] for(var/ingredient in new_ingredients) - ingredients[ingredient] += new_ingredients[ingredient] + ingredients[ingredient] += new_ingredients[ingredient] * new_fraction if(length(ingredients)) ingredients = sortTim(ingredients, /proc/cmp_numeric_dsc, associative = TRUE) diff --git a/code/modules/materials/definitions/solids/materials_solid_wood.dm b/code/modules/materials/definitions/solids/materials_solid_wood.dm index 9dea72c5cdd..6a6f23c98ba 100644 --- a/code/modules/materials/definitions/solids/materials_solid_wood.dm +++ b/code/modules/materials/definitions/solids/materials_solid_wood.dm @@ -16,6 +16,7 @@ 'icons/turf/walls/log.dmi' = TRUE, 'icons/turf/walls/metal.dmi' = TRUE ) + table_icon_base = "wood" bench_icon = 'icons/obj/structures/wood_benches.dmi' pew_icon = 'icons/obj/structures/wood_pews.dmi' explosion_resistance = 2 diff --git a/code/modules/random_map/noise/forage.dm b/code/modules/random_map/noise/forage.dm index 72dd620ec1b..de983ba7810 100644 --- a/code/modules/random_map/noise/forage.dm +++ b/code/modules/random_map/noise/forage.dm @@ -117,56 +117,64 @@ return /datum/random_map/noise/forage/get_additional_spawns(value, turf/T) + if(!istype(T, /turf/floor)) + return + var/turf/floor/floor = T + var/decl/flooring/flooring = floor.get_topmost_flooring() var/parse_value = noise2value(value) var/place_prob var/place_type - if(T.is_outside()) - if(istype(T, /turf/floor/rock)) + if(floor.is_outside()) + if(istype(flooring, /decl/flooring/rock)) if(prob(15)) // Static as current map has limited amount of rock turfs var/rock_type = SAFEPICK(forage["rocks"]) - new rock_type(T) + new rock_type(floor) return - else if(istype(T, /turf/floor/grass)) + if(istype(flooring, /decl/flooring/grass)) if(prob(parse_value * tree_weight)) if(length(trees)) var/tree_type = pickweight(trees) - new tree_type(T) + new tree_type(floor) return place_prob = parse_value * forage_weight place_type = SAFEPICK(forage["grass"]) - else if(istype(T, /turf/floor/mud/water/deep)) - place_prob = parse_value * forage_weight - place_type = SAFEPICK(forage["riverbed"]) - else if(istype(T, /turf/floor/mud/water)) - place_prob = parse_value * forage_weight - place_type = SAFEPICK(forage["shallows"]) - else if(istype(T, /turf/floor/mud)) - place_prob = parse_value * forage_weight - place_type = SAFEPICK(forage["riverbank"]) // no entries by default, expanded on subtypes + if(istype(flooring, /decl/flooring/mud)) + switch(floor.get_fluid_depth()) + if(FLUID_OVER_MOB_HEAD to FLUID_MAX_DEPTH) + place_prob = parse_value * forage_weight + place_type = SAFEPICK(forage["riverbed"]) + if(FLUID_SLURRY to FLUID_OVER_MOB_HEAD) + place_prob = parse_value * forage_weight + place_type = SAFEPICK(forage["shallows"]) + else + place_prob = parse_value * forage_weight + place_type = SAFEPICK(forage["riverbank"]) // no entries by default, expanded on subtypes else - if(istype(T, /turf/floor/mud) && !istype(T, /turf/floor/mud/water/deep)) - if(prob(parse_value * cave_tree_weight)) - if(length(cave_trees)) - var/tree_type = pick(cave_trees) - new tree_type(T) - return - place_prob = parse_value * cave_forage_weight * 2 - place_type = SAFEPICK(forage["caves"]) - else if(istype(T, /turf/floor/dirt)) + if(istype(flooring, /decl/flooring/mud)) + switch(floor.get_fluid_depth()) + if(FLUID_SLURRY to FLUID_OVER_MOB_HEAD) + place_prob = parse_value * cave_forage_weight + place_type = SAFEPICK(forage["cave_shallows"]) + if(0 to FLUID_SLURRY) + if(prob(parse_value * cave_tree_weight)) + if(length(cave_trees)) + var/tree_type = pick(cave_trees) + new tree_type(floor) + return + place_prob = parse_value * cave_forage_weight * 2 + place_type = SAFEPICK(forage["caves"]) + else if(istype(flooring, /decl/flooring/dirt)) place_prob = parse_value * cave_forage_weight place_type = SAFEPICK(forage["caves"]) - else if(istype(T, /turf/floor/mud/water)) - place_prob = parse_value * cave_forage_weight - place_type = SAFEPICK(forage["cave_shallows"]) if(place_type && prob(place_prob)) if(istype(place_type, /datum/seed)) - new /obj/structure/flora/plant(T, null, null, place_type) + new /obj/structure/flora/plant(floor, null, null, place_type) for(var/stepdir in global.alldirs) if(prob(15)) - var/turf/neighbor = get_step(T, stepdir) - if(istype(neighbor, T.type) && !(locate(/obj/structure/flora/plant) in neighbor)) + var/turf/neighbor = get_step(floor, stepdir) + if(istype(neighbor, floor.type) && !(locate(/obj/structure/flora/plant) in neighbor)) new /obj/structure/flora/plant(neighbor, null, null, place_type) else if(ispath(place_type, /atom)) - new place_type(T) + new place_type(floor) diff --git a/html/changelog.html b/html/changelog.html index 51c853c8ceb..5764b2b41d6 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -201,19 +201,6 @@

Penelope Haze updated:

- -

09 August 2024

-

Penelope Haze updated:

- - -

08 August 2024

-

Penelope Haze updated:

- diff --git a/icons/obj/structures/barrel.dmi b/icons/obj/structures/barrel.dmi index 24f81ff0e32..4adfb3e502e 100644 Binary files a/icons/obj/structures/barrel.dmi and b/icons/obj/structures/barrel.dmi differ diff --git a/icons/turf/flooring/grass.dmi b/icons/turf/flooring/grass.dmi index 6a6d67a28e8..dd28f8c2904 100644 Binary files a/icons/turf/flooring/grass.dmi and b/icons/turf/flooring/grass.dmi differ diff --git a/maps/shaded_hills/shaded_hills-grassland.dmm b/maps/shaded_hills/shaded_hills-grassland.dmm index e909f1c8dd1..9f7fbbd17a6 100644 --- a/maps/shaded_hills/shaded_hills-grassland.dmm +++ b/maps/shaded_hills/shaded_hills-grassland.dmm @@ -110,7 +110,7 @@ "nl" = ( /obj/structure/door/walnut, /obj/abstract/exterior_marker/inside, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/outside) "oo" = ( /obj/item/stack/material/ore/handful/sand, @@ -144,7 +144,7 @@ /area/shaded_hills/caves/unexplored) "ul" = ( /obj/abstract/exterior_marker/inside, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/outside) "vX" = ( /turf/floor/path/running_bond/basalt, @@ -159,7 +159,7 @@ /turf/floor/dirt, /area/shaded_hills/outside) "xC" = ( -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/outside) "yA" = ( /obj/abstract/landmark/latejoin/observer, @@ -188,7 +188,7 @@ /turf/floor/woven, /area/shaded_hills/outside) "EE" = ( -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/outside/river) "EL" = ( /obj/abstract/exterior_marker/inside, diff --git a/maps/shaded_hills/shaded_hills-inn.dmm b/maps/shaded_hills/shaded_hills-inn.dmm index bfff7e186ed..4dd4813e557 100644 --- a/maps/shaded_hills/shaded_hills-inn.dmm +++ b/maps/shaded_hills/shaded_hills-inn.dmm @@ -17,7 +17,7 @@ /obj/structure/bed/chair/wood/ebony{ dir = 4 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/farmhouse) "bz" = ( /obj/structure/closet/crate/chest/ebony, @@ -32,23 +32,23 @@ /obj/item/chems/glass/handmade/cup/wood, /obj/item/chems/glass/handmade/cup/wood, /obj/item/chems/glass/handmade/cup/wood, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/shrine/kitchen) "cl" = ( /obj/structure/table/woodentable/ebony, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/farmhouse) "cq" = ( /obj/structure/table/woodentable/ebony, /obj/item/chems/glass/handmade/bowl/wood, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/inn) "cx" = ( /turf/wall/brick/basalt, /area/shaded_hills/outside/downlands) "cy" = ( /obj/structure/reagent_dispensers/barrel/ebony/water, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/shrine/kitchen) "cT" = ( /obj/structure/railing/mapped/wooden/walnut{ @@ -62,7 +62,7 @@ "dr" = ( /obj/structure/table/woodentable_reinforced/ebony, /obj/item/pen/fancy/quill, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/inn) "dx" = ( /obj/structure/fire_source/kiln/oven, @@ -72,24 +72,24 @@ /obj/structure/door/walnut{ dir = 4 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/inn) "dH" = ( /turf/wall/log/walnut/shutter, /area/shaded_hills/general_store) "dK" = ( /obj/structure/table/woodentable/ebony, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/inn/porch) "dL" = ( /obj/structure/reagent_dispensers/barrel/ebony, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/storehouse) "dN" = ( /obj/structure/wall_sconce/lantern{ dir = 8 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/inn) "ev" = ( /obj/structure/closet/crate/chest/ebony, @@ -97,12 +97,12 @@ /area/shaded_hills/shrine) "eD" = ( /obj/structure/working/loom/ebony, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/farmhouse) "eG" = ( /obj/structure/door/walnut, /obj/abstract/landmark/lock_preset/shaded_hills/trader, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/general_store) "fg" = ( /obj/structure/railing/mapped/wooden/walnut, @@ -135,7 +135,7 @@ /turf/floor/path/herringbone/basalt, /area/shaded_hills/inn/kitchen) "fR" = ( -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/storehouse) "fS" = ( /obj/structure/table/marble, @@ -169,7 +169,7 @@ dir = 4 }, /obj/structure/table/woodentable/ebony, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/farmhouse) "gp" = ( /obj/structure/railing/mapped/wooden/walnut{ @@ -181,7 +181,7 @@ /obj/structure/wall_sconce/lantern{ dir = 8 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/shrine) "gA" = ( /obj/structure/railing/mapped/wooden/walnut{ @@ -193,7 +193,7 @@ /obj/structure/wall_sconce/lantern{ start_lit = 1 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/farmhouse) "gL" = ( /obj/structure/reagent_dispensers/barrel/ebony/oil, @@ -218,13 +218,13 @@ dir = 4; start_lit = 1 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/inn) "hc" = ( /obj/structure/bed/chair/bench/ebony{ dir = 1 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/farmhouse/porch) "hu" = ( /obj/structure/railing/mapped/wooden/walnut{ @@ -234,7 +234,7 @@ dir = 1; pixel_y = 10 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/inn/porch) "hE" = ( /obj/structure/railing/mapped/wooden/walnut{ @@ -247,7 +247,7 @@ /obj/structure/bed/chair/bench/ebony{ dir = 4 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/farmhouse) "hU" = ( /obj/structure/railing/mapped/wooden/walnut{ @@ -260,7 +260,7 @@ dir = 1; pixel_y = 10 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/inn/porch) "id" = ( /obj/structure/table/woodentable/ebony, @@ -276,7 +276,7 @@ /obj/structure/bed/chair/wood/ebony{ dir = 4 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/general_store) "iq" = ( /turf/wall/log/walnut/shutter{ @@ -288,7 +288,7 @@ dir = 4 }, /obj/abstract/landmark/lock_preset/shaded_hills/trader, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/general_store) "iH" = ( /obj/structure/door/walnut, @@ -311,17 +311,17 @@ /obj/structure/wall_sconce/lantern{ dir = 4 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/stable) "jk" = ( /obj/structure/bed/chair/bench/pew/mahogany{ dir = 1 }, /obj/abstract/landmark/start/shaded_hills/cleric, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/shrine) "js" = ( -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/stable) "jx" = ( /obj/structure/reagent_dispensers/barrel/ebony, @@ -339,7 +339,7 @@ "jA" = ( /obj/structure/bed/simple/ebony, /obj/item/bedsheet/furs, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/stable) "jI" = ( /obj/structure/wall_sconce/lantern{ @@ -367,7 +367,7 @@ /area/shaded_hills/inn/porch) "kE" = ( /obj/structure/door/walnut, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/stable) "kI" = ( /obj/structure/bed/chair/bench/pew/ebony{ @@ -377,7 +377,7 @@ /area/shaded_hills/inn) "lv" = ( /obj/structure/bed/chair/bench/ebony, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/farmhouse) "lz" = ( /obj/structure/table/woodentable_reinforced/ebony, @@ -391,7 +391,7 @@ /obj/structure/railing/mapped/wooden/walnut{ dir = 4 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/inn/porch) "lE" = ( /obj/abstract/level_data_spawner/shaded_hills_downlands, @@ -405,7 +405,7 @@ dir = 1 }, /obj/abstract/landmark/start/shaded_hills/farmer, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/farmhouse/porch) "me" = ( /obj/structure/reagent_dispensers/barrel/ebony, @@ -424,13 +424,13 @@ "ml" = ( /obj/structure/table/woodentable/ebony, /obj/item/shears, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/farmhouse) "mG" = ( /obj/structure/railing/mapped/wooden/walnut{ dir = 4 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/farmhouse/porch) "mJ" = ( /obj/structure/railing/mapped/wooden/walnut{ @@ -488,7 +488,7 @@ /obj/structure/bed/chair/bench/pew/mahogany{ dir = 1 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/shrine) "pi" = ( /obj/structure/table/woodentable/ebony, @@ -505,13 +505,13 @@ /obj/structure/bed/simple/ebony, /obj/abstract/landmark/start/shaded_hills/shrine_attendant, /obj/item/bedsheet/furs, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/shrine) "qf" = ( /obj/structure/railing/mapped/wooden/walnut{ dir = 8 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/inn/porch) "qG" = ( /turf/wall/brick/basalt, @@ -524,7 +524,7 @@ /turf/floor/path/herringbone/basalt, /area/shaded_hills/shrine) "qP" = ( -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/farmhouse) "qW" = ( /obj/structure/town_bell, @@ -537,7 +537,7 @@ /obj/structure/table/woodentable/ebony, /obj/item/chems/glass/mortar, /obj/item/rock/basalt, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/farmhouse) "rc" = ( /obj/structure/railing/mapped/wooden/walnut, @@ -561,7 +561,7 @@ /obj/structure/railing/mapped/wooden/walnut{ dir = 4 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/inn/porch) "rC" = ( /obj/structure/table/marble, @@ -579,7 +579,7 @@ /obj/structure/wall_sconce/lantern{ start_lit = 1 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/shrine) "rY" = ( /obj/effect/floor_decal/spline/fancy/wood/corner/walnut, @@ -592,17 +592,17 @@ /area/shaded_hills/inn/kitchen) "sJ" = ( /obj/structure/closet/cabinet/wooden/ebony, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/inn) "sM" = ( /obj/structure/table/woodentable_reinforced/ebony, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/general_store) "th" = ( /obj/structure/bed/simple/ebony/cloth, /obj/item/bedsheet/yellowed, /obj/abstract/landmark/start/shaded_hills/inn_worker, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/inn) "tq" = ( /obj/structure/door/walnut, @@ -655,7 +655,7 @@ /obj/structure/bed/simple/ebony, /obj/item/bedsheet/furs, /obj/abstract/landmark/start/shaded_hills/farmer, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/farmhouse) "uA" = ( /obj/structure/wall_sconce/lantern{ @@ -663,10 +663,10 @@ pixel_y = 10; start_lit = 1 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/farmhouse) "uJ" = ( -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/general_store) "uK" = ( /obj/structure/table/marble, @@ -683,13 +683,13 @@ dir = 1; pixel_y = 10 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/shrine/kitchen) "vz" = ( /obj/structure/table/woodentable/ebony, /obj/item/chems/cooking_vessel/baking_dish/earthenware, /obj/item/chems/cooking_vessel/baking_dish/earthenware, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/shrine/kitchen) "vA" = ( /obj/structure/table/marble, @@ -737,7 +737,7 @@ /obj/item/chems/condiment/large/salt, /obj/item/chems/condiment/flour, /obj/item/chems/condiment/sugar, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/shrine/kitchen) "xk" = ( /obj/structure/flora/tree/dead/mahogany, @@ -758,12 +758,12 @@ /area/shaded_hills/outside/downlands) "ya" = ( /obj/structure/reagent_dispensers/barrel/ebony, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/farmhouse) "yn" = ( /obj/structure/door/walnut, /obj/abstract/landmark/lock_preset/shaded_hills/inn_backroom, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/inn) "yu" = ( /obj/structure/reagent_dispensers/barrel/ebony, @@ -776,7 +776,7 @@ /obj/item/seeds/extracted/cabbage, /obj/item/seeds/extracted/cabbage, /obj/item/seeds/extracted/cabbage, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/storehouse) "yx" = ( /obj/structure/table/marble, @@ -791,11 +791,11 @@ dir = 1 }, /obj/abstract/landmark/start/shaded_hills/farmer, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/farmhouse) "yN" = ( /obj/structure/closet/crate/chest/ebony, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/farmhouse) "yY" = ( /turf/floor/grass, @@ -835,7 +835,7 @@ /turf/floor/wood/walnut, /area/shaded_hills/inn) "zQ" = ( -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/general_store/porch) "Ak" = ( /turf/floor/path/basalt, @@ -846,7 +846,7 @@ /area/shaded_hills/inn) "Aq" = ( /obj/structure/working/loom/ebony, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/shrine/kitchen) "Aw" = ( /obj/structure/railing/mapped/wooden/walnut{ @@ -861,7 +861,7 @@ /obj/item/seeds/extracted/valerian, /obj/item/seeds/extracted/yarrow, /obj/item/seeds/extracted/yarrow, -/obj/item/tool/shovel/wood/walnut, +/obj/item/tool/hoe/wood/walnut, /turf/floor/dirt, /area/shaded_hills/outside/shrine) "Ay" = ( @@ -875,7 +875,7 @@ "AG" = ( /obj/structure/table/woodentable/ebony, /obj/item/bag/sack, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/farmhouse) "AW" = ( /obj/structure/railing/mapped/wooden/walnut, @@ -886,11 +886,11 @@ /obj/structure/wall_sconce/lantern{ dir = 4 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/shrine) "Bp" = ( /obj/structure/working/butter_churn/walnut, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/farmhouse) "Br" = ( /turf/floor/path/basalt, @@ -907,17 +907,17 @@ /obj/structure/bed/chair/wood/ebony{ dir = 1 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/inn) "BD" = ( /obj/structure/reagent_dispensers/barrel/ebony/wine, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/shrine/kitchen) "BG" = ( /obj/structure/bed/chair/bench/ebony{ dir = 1 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/inn) "BI" = ( /obj/abstract/map_data/shaded_hills, @@ -926,11 +926,11 @@ "BL" = ( /obj/structure/bed/simple/ebony/cloth, /obj/item/bedsheet/yellowed, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/general_store) "BX" = ( /obj/structure/wall_sconce/lantern, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/farmhouse/porch) "Cj" = ( /obj/item/stack/material/log/mapped/walnut/twenty, @@ -942,10 +942,10 @@ /turf/floor/path/herringbone/basalt, /area/shaded_hills/shrine/kitchen) "CR" = ( -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/shrine) "Dl" = ( -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/farmhouse/porch) "Dn" = ( /obj/structure/reagent_dispensers/barrel/ebony, @@ -957,18 +957,18 @@ /obj/item/seeds/extracted/wheat, /obj/item/seeds/extracted/wheat, /obj/item/seeds/extracted/wheat, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/storehouse) "Dr" = ( /obj/structure/bed/simple/ebony/cloth, /obj/item/bedsheet/yellowed, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/inn) "Dt" = ( /obj/structure/bed/simple/ebony/cloth, /obj/abstract/landmark/start/shaded_hills/shrine_keeper, /obj/item/bedsheet/furs, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/shrine) "Ee" = ( /turf/wall/log/walnut, @@ -978,7 +978,7 @@ dir = 4 }, /obj/structure/table/woodentable/ebony, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/general_store) "Er" = ( /obj/structure/bed/chair/bench/pew/ebony{ @@ -1034,7 +1034,7 @@ /area/shaded_hills/outside/downlands) "FE" = ( /obj/structure/closet/cabinet/wooden/ebony, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/farmhouse) "FH" = ( /obj/structure/fire_source/stove, @@ -1065,7 +1065,7 @@ /obj/structure/railing/mapped/wooden/walnut{ dir = 8 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/general_store/porch) "Gu" = ( /obj/structure/table/marble, @@ -1085,7 +1085,7 @@ dir = 1; pixel_y = 10 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/general_store) "GV" = ( /obj/structure/railing/mapped/wooden/walnut{ @@ -1124,7 +1124,7 @@ /area/shaded_hills/stable) "HF" = ( /obj/structure/working/spinning_wheel/ebony, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/farmhouse) "HI" = ( /turf/floor/grass, @@ -1148,13 +1148,13 @@ /obj/structure/door/walnut{ dir = 4 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/shrine) "Im" = ( /obj/structure/wall_sconce/lantern{ dir = 4 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/inn) "Iz" = ( /obj/abstract/exterior_marker/inside, @@ -1163,7 +1163,7 @@ "IB" = ( /obj/structure/door/walnut, /obj/abstract/landmark/lock_preset/shaded_hills/shrine, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/shrine) "IC" = ( /obj/structure/bookcase/ebony, @@ -1173,7 +1173,7 @@ /obj/structure/door/walnut{ dir = 4 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/storehouse) "IQ" = ( /turf/wall/log/walnut/shutter{ @@ -1201,7 +1201,7 @@ "Jo" = ( /obj/structure/table/woodentable/ebony, /obj/item/flame/candle/handmade, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/inn) "Jp" = ( /obj/structure/wall_sconce/lantern{ @@ -1212,18 +1212,18 @@ /area/shaded_hills/inn) "Jt" = ( /obj/structure/closet/cabinet/wooden/ebony, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/shrine) "Jw" = ( /obj/structure/bed/chair/wood/ebony, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/inn/porch) "Jz" = ( /obj/structure/door/walnut{ dir = 4 }, /obj/abstract/landmark/lock_preset/shaded_hills/inn_interior, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/inn) "JK" = ( /obj/structure/table/woodentable_reinforced/mahogany, @@ -1238,7 +1238,7 @@ /area/shaded_hills/shrine) "JU" = ( /obj/structure/railing/mapped/wooden/walnut, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/inn/porch) "Ka" = ( /mob/living/simple_animal/cow, @@ -1279,7 +1279,7 @@ "LH" = ( /obj/structure/table/woodentable/ebony, /obj/item/chems/glass/bucket/wood, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/farmhouse) "LK" = ( /obj/structure/railing/mapped/wooden/walnut{ @@ -1326,7 +1326,7 @@ /obj/item/cash/imperial/crown, /obj/item/cash/imperial/crown, /obj/item/cash/imperial/crown, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/inn) "MT" = ( /obj/structure/drying_rack, @@ -1360,7 +1360,7 @@ "Ot" = ( /obj/structure/table/woodentable/ebony, /obj/item/chems/cooking_vessel/pot/iron, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/shrine/kitchen) "ON" = ( /obj/structure/table/marble, @@ -1389,7 +1389,7 @@ /area/shaded_hills/stable) "PG" = ( /obj/structure/door/walnut, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/shrine) "PQ" = ( /obj/item/food/butchery/meat/beef, @@ -1401,7 +1401,7 @@ /area/shaded_hills/slaughterhouse) "PS" = ( /obj/structure/reagent_dispensers/barrel/ebony/oil, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/storehouse) "Qb" = ( /turf/floor/carpet, @@ -1409,7 +1409,7 @@ "Qs" = ( /obj/structure/door/walnut, /obj/abstract/landmark/lock_preset/shaded_hills/inn_exterior, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/inn) "QB" = ( /turf/wall/log/walnut, @@ -1422,7 +1422,7 @@ dir = 8; start_lit = 1 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/shrine) "QQ" = ( /turf/wall/log/walnut, @@ -1431,7 +1431,7 @@ /obj/structure/railing/mapped/wooden/walnut{ dir = 4 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/general_store/porch) "QW" = ( /turf/floor/path/herringbone/basalt, @@ -1446,7 +1446,7 @@ /obj/structure/bed/simple/ebony/cloth, /obj/item/bedsheet/yellowed, /obj/abstract/landmark/start/shaded_hills/innkeeper, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/inn) "Rl" = ( /turf/floor/mud, @@ -1491,7 +1491,7 @@ /area/shaded_hills/inn/porch) "Sy" = ( /obj/structure/working/spinning_wheel/ebony, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/shrine/kitchen) "SB" = ( /obj/structure/door/walnut{ @@ -1523,13 +1523,13 @@ /obj/structure/bed/chair/wood/ebony{ dir = 8 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/inn) "Ti" = ( /obj/structure/door/walnut{ dir = 4 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/farmhouse) "Tr" = ( /obj/structure/table/woodentable_reinforced/ebony, @@ -1548,7 +1548,7 @@ /area/shaded_hills/outside/downlands) "TA" = ( /obj/abstract/landmark/start/shaded_hills/storekeeper, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/general_store) "TM" = ( /obj/structure/table/woodentable/ebony, @@ -1557,7 +1557,7 @@ /obj/item/food/grown/carrot, /obj/item/food/grown/carrot, /obj/item/food/grown/cabbage, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/shrine/kitchen) "TR" = ( /turf/floor/dirt, @@ -1570,13 +1570,13 @@ "UD" = ( /obj/structure/table/woodentable/ebony, /obj/item/flame/candle/handmade, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/shrine) "US" = ( /obj/structure/bed/chair/wood/ebony{ dir = 4 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/inn) "UU" = ( /obj/structure/railing/mapped/wooden/walnut{ @@ -1592,7 +1592,7 @@ /area/shaded_hills/shrine) "VE" = ( /obj/structure/reagent_dispensers/barrel/ebony/beer, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/shrine/kitchen) "VM" = ( /obj/structure/railing/mapped/wooden/walnut{ @@ -1604,7 +1604,7 @@ /obj/structure/railing/mapped/wooden/walnut{ dir = 8 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/farmhouse/porch) "VW" = ( /obj/structure/table/marble, @@ -1623,7 +1623,7 @@ /obj/structure/table/woodentable/ebony, /obj/item/chems/glass/mortar, /obj/item/rock/basalt, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/shrine/kitchen) "Wk" = ( /obj/structure/railing/mapped/wooden/walnut{ @@ -1647,7 +1647,7 @@ /obj/structure/railing/mapped/wooden/walnut{ dir = 8 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/inn/porch) "WE" = ( /obj/structure/reagent_dispensers/barrel/ebony, @@ -1675,12 +1675,12 @@ /obj/structure/wall_sconce/lantern{ dir = 8 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/general_store) "WO" = ( /obj/structure/door/walnut, /obj/abstract/landmark/lock_preset/shaded_hills/farmhouse, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/farmhouse) "WV" = ( /obj/structure/fire_source/kiln/oven, @@ -1688,7 +1688,7 @@ /area/shaded_hills/inn/kitchen) "WY" = ( /obj/structure/table/woodentable/ebony, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/inn) "Xr" = ( /obj/structure/meat_hook, @@ -1705,7 +1705,7 @@ pixel_y = 10; start_lit = 1 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/shrine) "XM" = ( /turf/floor/carpet/red, @@ -1717,7 +1717,7 @@ /turf/wall/brick/basalt, /area/shaded_hills/shrine) "Yg" = ( -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/inn/porch) "Yj" = ( /obj/structure/meat_hook, @@ -1735,7 +1735,7 @@ /obj/structure/wall_sconce/lantern{ dir = 4 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/general_store) "Zx" = ( /obj/machinery/portable_atmospherics/hydroponics/soil, @@ -1751,7 +1751,7 @@ /turf/floor/path/herringbone/basalt, /area/shaded_hills/inn/kitchen) "ZY" = ( -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/inn) (1,1,1) = {" diff --git a/maps/shaded_hills/shaded_hills-swamp.dmm b/maps/shaded_hills/shaded_hills-swamp.dmm index fdc72a0acab..803bcbcc100 100644 --- a/maps/shaded_hills/shaded_hills-swamp.dmm +++ b/maps/shaded_hills/shaded_hills-swamp.dmm @@ -5,7 +5,7 @@ }, /area/shaded_hills/witch_hut) "bg" = ( -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/witch_hut) "cE" = ( /turf/floor/mud/water, @@ -14,7 +14,7 @@ /obj/structure/bed/chair/wood/ebony{ dir = 8 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/witch_hut) "hT" = ( /turf/floor/mud/water/deep, @@ -42,7 +42,7 @@ /obj/structure/closet/crate/chest/ebony, /obj/item/rock/hematite, /obj/item/rock/flint, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/witch_hut) "oF" = ( /turf/unsimulated/dark_filler, @@ -52,7 +52,7 @@ /area/shaded_hills/caves/swamp) "pl" = ( /obj/structure/drying_rack, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/witch_hut) "rP" = ( /obj/structure/reagent_dispensers/barrel/ebony/water, @@ -73,7 +73,7 @@ dir = 8; start_lit = 1 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/witch_hut) "vZ" = ( /turf/floor/mud/water, @@ -116,7 +116,7 @@ /obj/item/chems/glass/handmade/cup/wood, /obj/item/chems/glass/handmade/cup/wood, /obj/item/chems/glass/bucket/wood, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/witch_hut) "Ic" = ( /turf/floor/clay, @@ -135,11 +135,11 @@ /obj/item/seeds/extracted/yarrow, /obj/item/seeds/extracted/yarrow, /obj/item/seeds/extracted/yarrow, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/witch_hut) "KA" = ( /obj/abstract/landmark/start/shaded_hills/herbalist, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/witch_hut) "LF" = ( /turf/wall/natural/basalt/shaded_hills, @@ -153,7 +153,7 @@ /area/shaded_hills/outside/swamp) "SE" = ( /obj/structure/door/walnut, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/witch_hut) "Ty" = ( /obj/abstract/landmark/start/shaded_hills/traveller, @@ -167,7 +167,7 @@ /area/shaded_hills/outside/swamp) "TR" = ( /obj/structure/closet/crate/chest/ebony, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/witch_hut) "Vl" = ( /obj/structure/table/woodentable/ebony, @@ -177,7 +177,7 @@ }, /obj/item/chems/glass/mortar, /obj/item/rock/basalt, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/witch_hut) "VA" = ( /turf/wall/brick/basalt, @@ -195,7 +195,7 @@ /obj/structure/bed/simple/ebony, /obj/item/bedsheet/furs, /obj/abstract/landmark/start/shaded_hills/herbalist, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/witch_hut) (1,1,1) = {" diff --git a/maps/shaded_hills/shaded_hills-woods.dmm b/maps/shaded_hills/shaded_hills-woods.dmm index 39e69e65ce2..b3bab142c5a 100644 --- a/maps/shaded_hills/shaded_hills-woods.dmm +++ b/maps/shaded_hills/shaded_hills-woods.dmm @@ -10,7 +10,7 @@ "cN" = ( /obj/structure/table/woodentable/ebony, /obj/item/bladed/knife, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/forester_hut) "dp" = ( /turf/wall/log/walnut, @@ -42,7 +42,7 @@ /turf/wall/natural/basalt/shaded_hills, /area/shaded_hills/caves/river/woods) "lb" = ( -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/forester_hut) "lC" = ( /turf/unsimulated/dark_filler, @@ -81,12 +81,12 @@ "vw" = ( /obj/structure/table/woodentable/ebony, /obj/item/stack/material/bundle/grass/dry, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/forester_hut) "wD" = ( /obj/structure/table/woodentable/ebony, /obj/item/fishing_rod, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/forester_hut) "xn" = ( /turf/unsimulated/mask, @@ -105,7 +105,7 @@ /area/shaded_hills/caves/unexplored/woods) "AN" = ( /obj/structure/railing/mapped/wooden/walnut, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/outside/river/woods) "Co" = ( /obj/abstract/landmark/start/shaded_hills/traveller/learned, @@ -130,7 +130,7 @@ "Fz" = ( /obj/structure/fire_source/stove, /obj/item/stack/material/log/mapped/walnut/ten, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/forester_hut) "HA" = ( /turf/floor/grass, @@ -142,17 +142,17 @@ /obj/structure/bed/simple/ebony, /obj/item/bedsheet/furs, /obj/abstract/landmark/start/shaded_hills/forester, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/forester_hut) "JI" = ( /obj/structure/railing/mapped/wooden/walnut{ dir = 1 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/outside/river/woods) "JJ" = ( /obj/structure/meat_hook, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/forester_hut) "LJ" = ( /turf/floor/path/running_bond/basalt, @@ -164,7 +164,7 @@ /obj/structure/wall_sconce/lantern{ start_lit = 1 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/forester_hut) "MU" = ( /turf/wall/log/walnut/shutter{ @@ -173,7 +173,7 @@ /area/shaded_hills/forester_hut) "Oi" = ( /obj/structure/closet/crate/chest/ebony, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/forester_hut) "PO" = ( /turf/floor/mud/water/deep, @@ -183,7 +183,7 @@ /area/shaded_hills/forester_hut) "TP" = ( /obj/structure/table/woodentable/ebony, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/forester_hut) "Uz" = ( /obj/effect/departure_signpost/north, diff --git a/maps/shaded_hills/submaps/woods/chemistry_shack/chemistry_shack.dmm b/maps/shaded_hills/submaps/woods/chemistry_shack/chemistry_shack.dmm index a9b71d07671..1cb59e7eb69 100644 --- a/maps/shaded_hills/submaps/woods/chemistry_shack/chemistry_shack.dmm +++ b/maps/shaded_hills/submaps/woods/chemistry_shack/chemistry_shack.dmm @@ -4,7 +4,7 @@ /obj/structure/door/walnut{ dir = 4 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/outside/point_of_interest/chemistry_shack) "h" = ( /obj/abstract/exterior_marker/inside, @@ -40,12 +40,12 @@ /obj/item/chems/cooking_vessel/pot/iron, /obj/item/chems/glass/handmade/teapot, /obj/abstract/landmark/organize/vertical, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/outside/point_of_interest/chemistry_shack) "m" = ( /obj/abstract/exterior_marker/inside, /obj/structure/reagent_dispensers/barrel/ebony/oil, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/outside/point_of_interest/chemistry_shack) "n" = ( /obj/structure/wall_sconce/lantern{ @@ -59,7 +59,7 @@ /obj/structure/table/woodentable/ebony, /obj/item/chems/glass/mortar, /obj/item/rock/basalt, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/outside/point_of_interest/chemistry_shack) "q" = ( /obj/structure/drying_rack/ebony, @@ -80,7 +80,7 @@ "C" = ( /obj/abstract/exterior_marker/inside, /obj/structure/door/walnut, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/outside/point_of_interest/chemistry_shack) "F" = ( /obj/abstract/exterior_marker/inside, @@ -93,17 +93,17 @@ "I" = ( /obj/abstract/exterior_marker/inside, /obj/structure/reagent_dispensers/barrel/ebony/water, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/outside/point_of_interest/chemistry_shack) "J" = ( /obj/abstract/exterior_marker/inside, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/outside/point_of_interest/chemistry_shack) "K" = ( /obj/abstract/exterior_marker/inside, /obj/structure/bed/simple/ebony/cloth, /obj/item/bedsheet/furs, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/outside/point_of_interest/chemistry_shack) "L" = ( /obj/abstract/exterior_marker/inside, @@ -114,12 +114,12 @@ /obj/item/food/grown/carrot, /obj/item/food/grown/carrot, /obj/item/kitchen/rollingpin, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/outside/point_of_interest/chemistry_shack) "M" = ( /obj/abstract/exterior_marker/inside, /obj/structure/reagent_dispensers/barrel/ebony/wine, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/outside/point_of_interest/chemistry_shack) "N" = ( /obj/abstract/exterior_marker/inside, @@ -129,7 +129,7 @@ /obj/abstract/exterior_marker/inside, /obj/structure/closet/crate/chest/ebony, /obj/random/jewelry, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/outside/point_of_interest/chemistry_shack) "U" = ( /obj/abstract/exterior_marker/inside, @@ -159,7 +159,7 @@ "Y" = ( /obj/abstract/exterior_marker/inside, /obj/structure/fire_source/stove, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/outside/point_of_interest/chemistry_shack) (1,1,1) = {" diff --git a/maps/shaded_hills/submaps/woods/old_cabin/old_cabin.dmm b/maps/shaded_hills/submaps/woods/old_cabin/old_cabin.dmm index 37267c26364..6d1e1dffe48 100644 --- a/maps/shaded_hills/submaps/woods/old_cabin/old_cabin.dmm +++ b/maps/shaded_hills/submaps/woods/old_cabin/old_cabin.dmm @@ -2,7 +2,7 @@ "a" = ( /obj/structure/door/walnut, /obj/abstract/exterior_marker/inside, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/outside/point_of_interest/old_cabin) "h" = ( /turf/template_noop, @@ -13,17 +13,17 @@ "k" = ( /obj/structure/closet/crate/chest/ebony, /obj/abstract/exterior_marker/inside, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/outside/point_of_interest/old_cabin) "o" = ( /obj/structure/drying_rack/ebony, /obj/abstract/exterior_marker/inside, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/outside/point_of_interest/old_cabin) "u" = ( /obj/structure/reagent_dispensers/barrel/ebony/beer, /obj/abstract/exterior_marker/inside, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/outside/point_of_interest/old_cabin) "x" = ( /obj/structure/table/woodentable/ebony, @@ -32,7 +32,7 @@ /obj/item/rock/flint, /obj/item/rock/hematite, /obj/abstract/exterior_marker/inside, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/outside/point_of_interest/old_cabin) "z" = ( /obj/effect/spider/spiderling/mundane, @@ -42,19 +42,19 @@ pixel_y = 24 }, /obj/abstract/exterior_marker/inside, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/outside/point_of_interest/old_cabin) "B" = ( /obj/effect/decal/cleanable/blood, /obj/abstract/exterior_marker/inside, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/outside/point_of_interest/old_cabin) "D" = ( /obj/effect/spider/spiderling/mundane, /obj/structure/table/woodentable/ebony, /obj/item/food/grown/carrot, /obj/abstract/exterior_marker/inside, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/outside/point_of_interest/old_cabin) "G" = ( /obj/abstract/exterior_marker/inside, @@ -67,16 +67,16 @@ /obj/item/food/grown/potato, /obj/item/food/grown/carrot, /obj/abstract/exterior_marker/inside, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/outside/point_of_interest/old_cabin) "I" = ( /obj/abstract/exterior_marker/inside, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/outside/point_of_interest/old_cabin) "L" = ( /obj/effect/spider/spiderling/mundane, /obj/abstract/exterior_marker/inside, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/outside/point_of_interest/old_cabin) "M" = ( /obj/abstract/exterior_marker/inside, @@ -85,7 +85,7 @@ "N" = ( /obj/structure/coatrack, /obj/abstract/exterior_marker/inside, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/outside/point_of_interest/old_cabin) "W" = ( /obj/structure/wall_sconce/torch{ @@ -101,7 +101,7 @@ /obj/effect/decal/cleanable/blood, /obj/random/jewelry, /obj/abstract/exterior_marker/inside, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/shaded_hills/outside/point_of_interest/old_cabin) (1,1,1) = {" diff --git a/maps/shaded_hills/submaps/woods/suspicious_cabin/suspicious_cabin.dmm b/maps/shaded_hills/submaps/woods/suspicious_cabin/suspicious_cabin.dmm index 9e7ed6ef92d..042c2c02567 100644 --- a/maps/shaded_hills/submaps/woods/suspicious_cabin/suspicious_cabin.dmm +++ b/maps/shaded_hills/submaps/woods/suspicious_cabin/suspicious_cabin.dmm @@ -6,18 +6,18 @@ /obj/structure/bed/chair/wood/ebony{ dir = 1 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/template_noop) "e" = ( /obj/structure/bed/simple/ebony/cloth, /obj/item/bedsheet/furs, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/template_noop) "f" = ( /turf/floor/dirt, /area/template_noop) "g" = ( -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/template_noop) "i" = ( /obj/structure/reagent_dispensers/barrel/ebony/wine, @@ -25,18 +25,18 @@ /area/template_noop) "k" = ( /obj/structure/coatrack, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/template_noop) "q" = ( /obj/structure/table/woodentable/ebony, /obj/item/chems/glass/handmade/cup/wood, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/template_noop) "r" = ( /obj/structure/bed/chair/bench/ebony{ dir = 4 }, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/template_noop) "s" = ( /turf/floor/path/basalt, @@ -51,11 +51,11 @@ /area/template_noop) "w" = ( /obj/structure/bed/chair/wood/ebony, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/template_noop) "x" = ( /obj/structure/door/walnut, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/template_noop) "y" = ( /obj/structure/reagent_dispensers/barrel/ebony, @@ -63,12 +63,12 @@ /area/template_noop) "A" = ( /obj/structure/closet/crate/chest/ebony, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/template_noop) "E" = ( /obj/structure/table/woodentable/ebony, /obj/item/chems/glass/handmade/teapot, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/template_noop) "G" = ( /obj/item/stack/material/log/mapped/walnut/twenty, @@ -98,7 +98,7 @@ /area/template_noop) "P" = ( /obj/structure/bed/chair/bench/ebony, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/template_noop) "Q" = ( /obj/structure/reagent_dispensers/barrel/ebony/beer, @@ -106,7 +106,7 @@ /area/template_noop) "R" = ( /obj/structure/table/woodentable/ebony, -/turf/floor/dirt/walnut, +/turf/floor/wood/walnut, /area/template_noop) "S" = ( /obj/structure/table/woodentable/ebony, diff --git a/mods/content/fantasy/_fantasy.dme b/mods/content/fantasy/_fantasy.dme index 68b15180351..3cd8559ddf0 100644 --- a/mods/content/fantasy/_fantasy.dme +++ b/mods/content/fantasy/_fantasy.dme @@ -2,6 +2,7 @@ #define MODPACK_FANTASY_SPECIES // BEGIN_INCLUDE #include "_fantasy.dm" +#include "turfs.dm" #include "datum\cultures.dm" #include "datum\currencies.dm" #include "datum\factions.dm" diff --git a/mods/content/fantasy/turfs.dm b/mods/content/fantasy/turfs.dm new file mode 100644 index 00000000000..5911652b0cf --- /dev/null +++ b/mods/content/fantasy/turfs.dm @@ -0,0 +1,2 @@ +/turf/floor + _base_flooring = /decl/flooring/dirt \ No newline at end of file diff --git a/mods/species/vox/datum/accessories.dm b/mods/species/vox/datum/accessories.dm index 955d2f326c0..69256c54168 100644 --- a/mods/species/vox/datum/accessories.dm +++ b/mods/species/vox/datum/accessories.dm @@ -3,10 +3,14 @@ icon = 'mods/species/vox/icons/body/soldier/hair.dmi' icon_state = "vox_longquills" species_allowed = list(SPECIES_VOX) - body_flags_allowed = BODY_EQUIP_FLAG_VOX - bodytype_categories_allowed = list(BODYTYPE_VOX) uid = "acc_hair_vox_longquills" +/decl/sprite_accessory/hair/vox/get_accessory_icon(obj/item/organ/external/organ) + var/decl/bodytype/vox/voxtype = organ.bodytype + if(istype(voxtype)) + return voxtype.vox_hair_icon + return ..() + /decl/sprite_accessory/hair/vox/short name = "Short Vox Quills" icon_state = "vox_shortquills" @@ -22,57 +26,21 @@ icon_state = "vox_stubble" uid = "acc_hair_vox_stubble" -/decl/sprite_accessory/hair/vox/servitor - icon = 'mods/species/vox/icons/body/servitor/hair.dmi' - bodytype_categories_allowed = list(BODYTYPE_HUMANOID) - uid = "acc_hair_vox_longquills_servitor" - -/decl/sprite_accessory/hair/vox/short/servitor - icon = 'mods/species/vox/icons/body/servitor/hair.dmi' - bodytype_categories_allowed = list(BODYTYPE_HUMANOID) - uid = "acc_hair_vox_shortquills_servitor" - -/decl/sprite_accessory/hair/vox/mohawk/servitor - icon = 'mods/species/vox/icons/body/servitor/hair.dmi' - bodytype_categories_allowed = list(BODYTYPE_HUMANOID) - uid = "acc_hair_vox_mohawk_servitor" - -/decl/sprite_accessory/hair/vox/stubble/servitor - icon = 'mods/species/vox/icons/body/servitor/hair.dmi' - bodytype_categories_allowed = list(BODYTYPE_HUMANOID) - uid = "acc_hair_vox_stubble_servitor" - -/decl/sprite_accessory/hair/vox/stanchion - icon = 'mods/species/vox/icons/body/stanchion/hair.dmi' - bodytype_categories_allowed = list(BODYTYPE_VOX_LARGE) - uid = "acc_hair_vox_longquills_clockvox" - -/decl/sprite_accessory/hair/vox/short/stanchion - icon = 'mods/species/vox/icons/body/stanchion/hair.dmi' - bodytype_categories_allowed = list(BODYTYPE_VOX_LARGE) - uid = "acc_hair_vox_shortquills_clockvox" - -/decl/sprite_accessory/hair/vox/mohawk/stanchion - icon = 'mods/species/vox/icons/body/stanchion/hair.dmi' - bodytype_categories_allowed = list(BODYTYPE_VOX_LARGE) - uid = "acc_hair_vox_mohawk_clockvox" - -/decl/sprite_accessory/hair/vox/stubble/stanchion - icon = 'mods/species/vox/icons/body/stanchion/hair.dmi' - bodytype_categories_allowed = list(BODYTYPE_VOX_LARGE) - uid = "acc_hair_vox_stubble_clockvox" - /decl/sprite_accessory/marking/vox name = "Vox Neck Markings" icon_state = "neck_markings" body_parts = list(BP_HEAD) species_allowed = list(SPECIES_VOX) - body_flags_allowed = BODY_EQUIP_FLAG_VOX - bodytype_categories_allowed = list(BODYTYPE_VOX) icon = 'mods/species/vox/icons/body/soldier/markings.dmi' color_blend = ICON_MULTIPLY uid = "acc_markings_vox_neck" +/decl/sprite_accessory/marking/vox/get_accessory_icon(obj/item/organ/external/organ) + var/decl/bodytype/vox/voxtype = organ.bodytype + if(istype(voxtype)) + return voxtype.vox_marking_icon + return ..() + /decl/sprite_accessory/marking/vox/claws name = "Vox Claws" icon_state = "claws" @@ -105,73 +73,3 @@ name = "Vox Crest Colouration" icon_state = "crest" uid = "acc_markings_vox_crest" - -/decl/sprite_accessory/marking/vox/servitor - icon = 'mods/species/vox/icons/body/servitor/markings.dmi' - bodytype_categories_allowed = list(BODYTYPE_HUMANOID) - uid = "acc_markings_vox_neck_servitor" - -/decl/sprite_accessory/marking/vox/claws/servitor - icon = 'mods/species/vox/icons/body/servitor/markings.dmi' - bodytype_categories_allowed = list(BODYTYPE_HUMANOID) - uid = "acc_markings_vox_claws_servitor" - -/decl/sprite_accessory/marking/vox/beak/servitor - icon = 'mods/species/vox/icons/body/servitor/markings.dmi' - bodytype_categories_allowed = list(BODYTYPE_HUMANOID) - uid = "acc_markings_vox_beak_servitor" - -/decl/sprite_accessory/marking/vox/scutes/servitor - icon = 'mods/species/vox/icons/body/servitor/markings.dmi' - bodytype_categories_allowed = list(BODYTYPE_HUMANOID) - uid = "acc_markings_vox_scutes_servitor" - -/decl/sprite_accessory/marking/vox/arm_markings/servitor - icon = 'mods/species/vox/icons/body/servitor/markings.dmi' - bodytype_categories_allowed = list(BODYTYPE_HUMANOID) - uid = "acc_markings_vox_leftarm_servitor" - -/decl/sprite_accessory/marking/vox/arm_markings/right/servitor - icon = 'mods/species/vox/icons/body/servitor/markings.dmi' - bodytype_categories_allowed = list(BODYTYPE_HUMANOID) - uid = "acc_markings_vox_rightarm_servitor" - -/decl/sprite_accessory/marking/vox/crest/servitor - icon = 'mods/species/vox/icons/body/servitor/markings.dmi' - bodytype_categories_allowed = list(BODYTYPE_HUMANOID) - uid = "acc_markings_vox_crest_servitor" - -/decl/sprite_accessory/marking/vox/stanchion - icon = 'mods/species/vox/icons/body/stanchion/markings.dmi' - bodytype_categories_allowed = list(BODYTYPE_VOX_LARGE) - uid = "acc_markings_vox_neck_clockvox" - -/decl/sprite_accessory/marking/vox/claws/stanchion - icon = 'mods/species/vox/icons/body/stanchion/markings.dmi' - bodytype_categories_allowed = list(BODYTYPE_VOX_LARGE) - uid = "acc_markings_vox_claws_clockvox" - -/decl/sprite_accessory/marking/vox/beak/stanchion - icon = 'mods/species/vox/icons/body/stanchion/markings.dmi' - bodytype_categories_allowed = list(BODYTYPE_VOX_LARGE) - uid = "acc_markings_vox_beak_clockvox" - -/decl/sprite_accessory/marking/vox/scutes/stanchion - icon = 'mods/species/vox/icons/body/stanchion/markings.dmi' - bodytype_categories_allowed = list(BODYTYPE_VOX_LARGE) - uid = "acc_markings_vox_scutes_clockvox" - -/decl/sprite_accessory/marking/vox/arm_markings/stanchion - icon = 'mods/species/vox/icons/body/stanchion/markings.dmi' - bodytype_categories_allowed = list(BODYTYPE_VOX_LARGE) - uid = "acc_markings_vox_leftarm_clockvox" - -/decl/sprite_accessory/marking/vox/arm_markings/right/stanchion - icon = 'mods/species/vox/icons/body/stanchion/markings.dmi' - bodytype_categories_allowed = list(BODYTYPE_VOX_LARGE) - uid = "acc_markings_vox_rightarm_clockvox" - -/decl/sprite_accessory/marking/vox/crest/stanchion - icon = 'mods/species/vox/icons/body/stanchion/markings.dmi' - bodytype_categories_allowed = list(BODYTYPE_VOX_LARGE) - uid = "acc_markings_vox_crest_clockvox" diff --git a/mods/species/vox/datum/species_bodytypes.dm b/mods/species/vox/datum/species_bodytypes.dm index 8add57ce69d..3982f40ea9f 100644 --- a/mods/species/vox/datum/species_bodytypes.dm +++ b/mods/species/vox/datum/species_bodytypes.dm @@ -56,6 +56,9 @@ ) ) + var/vox_hair_icon = 'mods/species/vox/icons/body/soldier/hair.dmi' + var/vox_marking_icon = 'mods/species/vox/icons/body/soldier/markings.dmi' + /decl/bodytype/vox/Initialize() if(!length(equip_adjust)) equip_adjust = list( @@ -85,23 +88,12 @@ blood_overlays = 'mods/species/vox/icons/body/blood_overlays.dmi' eye_icon = 'mods/species/vox/icons/body/servitor/eyes.dmi' uid = "bodytype_vox_servitor" - - default_sprite_accessories = list( - SAC_HAIR = list( - /decl/sprite_accessory/hair/vox/short/servitor = list(SAM_COLOR = "#160900") - ), - SAC_MARKINGS = list( - /decl/sprite_accessory/marking/vox/beak/servitor = list(SAM_COLOR = "#bc7d3e"), - /decl/sprite_accessory/marking/vox/scutes/servitor = list(SAM_COLOR = "#bc7d3e"), - /decl/sprite_accessory/marking/vox/crest/servitor = list(SAM_COLOR = "#bc7d3e"), - /decl/sprite_accessory/marking/vox/claws/servitor = list(SAM_COLOR = "#a0a654") - ) - ) - override_limb_types = list( BP_GROIN = /obj/item/organ/external/groin/vox, BP_TAIL = /obj/item/organ/external/tail/vox/servitor ) + vox_hair_icon = 'mods/species/vox/icons/body/servitor/hair.dmi' + vox_marking_icon = 'mods/species/vox/icons/body/servitor/markings.dmi' /decl/bodytype/vox/stanchion name = "stanchion voxform" @@ -112,24 +104,13 @@ eye_icon = 'mods/species/vox/icons/body/stanchion/eyes.dmi' icon_template = 'mods/species/vox/icons/body/stanchion/template.dmi' uid = "bodytype_vox_stanchion" - - default_sprite_accessories = list( - SAC_HAIR = list( - /decl/sprite_accessory/hair/vox/short/stanchion = list(SAM_COLOR = "#160900") - ), - SAC_MARKINGS = list( - /decl/sprite_accessory/marking/vox/beak/stanchion = list(SAM_COLOR = "#bc7d3e"), - /decl/sprite_accessory/marking/vox/scutes/stanchion = list(SAM_COLOR = "#bc7d3e"), - /decl/sprite_accessory/marking/vox/crest/stanchion = list(SAM_COLOR = "#bc7d3e"), - /decl/sprite_accessory/marking/vox/claws/stanchion = list(SAM_COLOR = "#a0a654") - ) - ) - override_limb_types = list( BP_GROIN = /obj/item/organ/external/groin/vox, // Commenting this out so that tail validation doesn't try to find a species using this bodytype. //BP_TAIL = /obj/item/organ/external/tail/vox/stanchion ) + vox_hair_icon = 'mods/species/vox/icons/body/stanchion/hair.dmi' + vox_marking_icon = 'mods/species/vox/icons/body/stanchion/markings.dmi' /decl/bodytype/vox/servitor/alchemist name = "alchemist voxform"