Skip to content

Commit

Permalink
Sanity check 1
Browse files Browse the repository at this point in the history
1. Добавлена плетённая кровать. Крафт из кожи.
2. Добавлена деревянная кровать.
Крафт из дерева
3. Добавлен деревянный табурет.
Крафт из дерева
4. Добавлена примитивная сушилка. Не требует энергии, работает не мгновенно, а 5 секунд
5. (Не проебать это) было восстановлено отображение пепельных растений в маппинге. Не забыть проверить, сломались ли растения в мире
6. Начат ремаппинг гнезда пеплоходцев. Сделана планировка, добавлены кровати, табуретки и вешалка
  • Loading branch information
NightDawnFox committed Jan 24, 2024
1 parent aa0ee90 commit 0ca9bac
Show file tree
Hide file tree
Showing 11 changed files with 2,242 additions and 781 deletions.
2,916 changes: 2,144 additions & 772 deletions _maps/map_files/Delta/Lavaland.dmm

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions code/game/objects/items/stacks/sheets/leather.dm
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ GLOBAL_LIST_INIT(leather_recipes, list (
new/datum/stack_recipe("leather jacket", /obj/item/clothing/suit/jacket/leather, 7),
new/datum/stack_recipe("leather shoes", /obj/item/clothing/shoes/leather, 2),
new/datum/stack_recipe("leather overcoat", /obj/item/clothing/suit/jacket/leather/overcoat, 10),
new/datum/stack_recipe("wicker bed", /obj/structure/bed/ash, 4, time = 15, one_per_turf = TRUE, on_floor = TRUE),
new/datum/stack_recipe("FireSuit", /obj/item/clothing/suit/fire/firefighter, 15),
new/datum/stack_recipe("hide mantle", /obj/item/clothing/neck/mantle/unathi, 4),
new/datum/stack_recipe("gem satchel", /obj/item/storage/bag/gem, 1)))
Expand Down
2 changes: 2 additions & 0 deletions code/game/objects/items/stacks/sheets/sheet_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ GLOBAL_LIST_INIT(wood_recipes, list(
new /datum/stack_recipe("Сoat rack", /obj/structure/coatrack, 10, time = 10, one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("Display case chassis", /obj/structure/displaycase_chassis, 5, one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("Dog bed", /obj/structure/bed/dogbed, 10, time = 10, one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("Wooden bed", /obj/structure/bed/wooden, 15, time = 15, one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("Dresser", /obj/structure/dresser, 30, time = 50, one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("Drying rack", /obj/machinery/smartfridge/drying_rack, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("Fermenting barrel", /obj/structure/fermenting_barrel, 30, time = 50),
Expand Down Expand Up @@ -231,6 +232,7 @@ GLOBAL_LIST_INIT(wood_recipes, list(
new /datum/stack_recipe("Wood table frame", /obj/structure/table_frame/wood, 2, time = 10),
new /datum/stack_recipe("Wooden barricade", /obj/structure/barricade/wooden, 5, time = 50, one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("Wooden chair", /obj/structure/chair/wood, 3, time = 10, one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("Wooden stool", /obj/structure/chair/stool/wooden, 2, time = 10, one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("Wooden door", /obj/structure/mineral_door/wood, 10, time = 20, one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("Notice Board", /obj/item/noticeboard, 5, time = 10),
))
Expand Down
8 changes: 8 additions & 0 deletions code/modules/crafting/recipes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1405,3 +1405,11 @@
reqs = list(/obj/item/stack/sheet/glass = 3)
tools = list(TOOL_WELDER, TOOL_SCREWDRIVER)
category = CAT_MISC

/datum/crafting_recipe/ashrack
name = "drying stick"
result = /obj/machinery/smartfridge/drying_rack/ash
time = 15 SECONDS
reqs = list(/obj/item/stack/sheet/wood = 2,
/obj/item/stack/sheet/sinew = 1)
category = CAT_PRIMAL
16 changes: 13 additions & 3 deletions code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
Original file line number Diff line number Diff line change
Expand Up @@ -720,6 +720,8 @@
active_power_usage = 200
can_dry = TRUE
visible_contents = FALSE
var/primitive = FALSE //used for energy consuming stuff
var/drying_timer = 1

/obj/machinery/smartfridge/drying_rack/Initialize(mapload)
. = ..()
Expand All @@ -740,6 +742,8 @@
return

/obj/machinery/smartfridge/drying_rack/power_change()
if(primitive)
return
if(powered() && anchored)
stat &= ~NOPOWER
else
Expand Down Expand Up @@ -769,7 +773,8 @@
switch(action)
if("drying")
drying = !drying
use_power = drying ? ACTIVE_POWER_USE : IDLE_POWER_USE
if(!primitive)
use_power = drying ? ACTIVE_POWER_USE : IDLE_POWER_USE
update_icon()

/obj/machinery/smartfridge/drying_rack/update_icon()
Expand All @@ -782,8 +787,13 @@

/obj/machinery/smartfridge/drying_rack/process()
..()
if(drying && rack_dry())//no need to update unless something got dried
update_icon()
if(drying)//no need to update unless something got dried
if(drying_timer && length(contents))
drying_timer--
else
rack_dry()
drying_timer = initial(drying_timer)
update_icon()

/obj/machinery/smartfridge/drying_rack/accept_check(obj/item/O)
. = ..()
Expand Down
61 changes: 61 additions & 0 deletions code/modules/mining/ash_walker/structures.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
/*
Collection of special ash walker structures and related stuff.
Almost everything - reskin for station structures
Special thanks to piotrthetchaikowsky, pilygun & the_worm
*/

//beds

/obj/structure/bed/ash
name = "wicker bed"
desc = "A handmade bed used by ash walker tribes. It doesn't look very comfortable."
icon_state = "wicker_bed"
buildstacktype = /obj/item/stack/sheet/leather
buildstackamount = 4
buckle_offset = -3
comfort = 0.6

/obj/structure/bed/wooden
name = "wooden bed"
desc = "A handmade bed made of wood and fabric. Looks very comfortable. You could take a nap on it for a while..."
icon_state = "wooden_bed"
buildstacktype = /obj/item/stack/sheet/wood
buildstackamount = 15
buckle_offset = -3
comfort = 3

//drying rack

/obj/machinery/smartfridge/drying_rack/ash
name = "primitive drying rack"
desc = "A handmade tribal wooden rack, used to dry plant products, food and leather."
icon_state = "drying_stick"
use_power = NO_POWER_USE
can_dry = FALSE //trust me
drying = TRUE
idle_power_usage = 0
active_power_usage = 0
drying_timer = 5
primitive = TRUE

/obj/machinery/smartfridge/drying_rack/ash/update_icon()
overlays.Cut()
if(length(contents))
overlays += "drying_stick_filled"


//stool

/obj/structure/chair/stool/wooden
name = "wooden stool"
desc = "A comfortable looking stool."
icon_state = "wooden_stool"
item_chair = /obj/item/chair/stool/wooden

/obj/item/chair/stool/wooden
name = "wooden stool"
desc = "A comfortable looking stool."
icon_state = "wooden_stool_toppled"
item_state = "chair" //wooden enough
origin_type = /obj/structure/chair/stool/wooden
break_chance = 10
18 changes: 12 additions & 6 deletions code/modules/mining/lavaland/ash_flora.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
gender = PLURAL
layer = PROJECTILE_HIT_THRESHHOLD_LAYER //sporangiums up don't shoot
icon = 'icons/obj/lavaland/ash_flora.dmi'
icon_state = "l_mushroom"
icon_state = "l_mushroom1"
base_icon_state = "l_mushroom"
name = "large mushrooms"
desc = "A number of large mushrooms, covered in a faint layer of ash and what can only be spores."
anchored = TRUE
Expand All @@ -24,7 +25,7 @@

/obj/structure/flora/ash/Initialize(mapload)
. = ..()
base_icon = "[icon_state][rand(1, 4)]"
base_icon = "[base_icon_state][rand(1, 4)]"
icon_state = base_icon

/obj/structure/flora/ash/proc/harvest(user)
Expand Down Expand Up @@ -81,7 +82,8 @@
regrowth_time_low = 4200

/obj/structure/flora/ash/leaf_shroom
icon_state = "s_mushroom"
icon_state = "s_mushroom1"
base_icon_state = "s_mushroom"
name = "leafy mushrooms"
desc = "A number of mushrooms, each of which surrounds a greenish sporangium with a number of leaf-like structures."
harvested_name = "leafless mushrooms"
Expand All @@ -97,7 +99,8 @@
regrowth_time_high = 6000

/obj/structure/flora/ash/cap_shroom
icon_state = "r_mushroom"
icon_state = "r_mushroom1"
base_icon_state = "r_mushroom"
name = "tall mushrooms"
desc = "Several mushrooms, the larger of which have a ring of conks at the midpoint of their stems."
harvested_name = "small mushrooms"
Expand All @@ -112,7 +115,8 @@
regrowth_time_high = 5400

/obj/structure/flora/ash/stem_shroom
icon_state = "t_mushroom"
icon_state = "t_mushroom1"
base_icon_state = "t_mushroom"
name = "numerous mushrooms"
desc = "A large number of mushrooms, some of which have long, fleshy stems. They're radiating light!"
light_range = 1.5
Expand All @@ -129,7 +133,8 @@
regrowth_time_high = 6000

/obj/structure/flora/ash/cacti
icon_state = "cactus"
icon_state = "cactus1"
base_icon_state = "cactus"
name = "fruiting cacti"
desc = "Several prickly cacti, brimming with ripe fruit and covered in a thin layer of ash."
harvested_name = "cacti"
Expand All @@ -151,6 +156,7 @@

/obj/structure/flora/ash/fireblossom
icon_state = "fireblossom"
base_icon_state = "fireblossom"
name = "fire blossom"
desc = "An odd flower that grows commonly near bodies of lava."
harvested_name = "fire blossom stems"
Expand Down
Binary file modified icons/obj/chairs.dmi
Binary file not shown.
Binary file modified icons/obj/hydroponics/equipment.dmi
Binary file not shown.
Binary file modified icons/obj/objects.dmi
Binary file not shown.
1 change: 1 addition & 0 deletions paradise.dme
Original file line number Diff line number Diff line change
Expand Up @@ -2101,6 +2101,7 @@
#include "code\modules\mining\ores_coins.dm"
#include "code\modules\mining\satchel_ore_boxdm.dm"
#include "code\modules\mining\shelters.dm"
#include "code\modules\mining\ash_walker\structures.dm"
#include "code\modules\mining\equipment\explorer_gear.dm"
#include "code\modules\mining\equipment\hardmode_grenade.dm"
#include "code\modules\mining\equipment\kinetic_crusher.dm"
Expand Down

0 comments on commit 0ca9bac

Please sign in to comment.