diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index e12c0378b433..4c486fd1fdfa 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -489,6 +489,7 @@ attack_verb_simple = list("chop", "tear", "lacerate", "cut") hitsound = 'sound/weapons/bladeslice.ogg' sharpness = SHARP_EDGED + tool_behaviour = TOOL_SAW /obj/item/hatchet/Initialize(mapload) . = ..() diff --git a/monkestation/code/modules/blueshift/appliances/colony.dm b/monkestation/code/modules/blueshift/appliances/colony.dm index 01f6b2ea07c7..c25fb1fd0a81 100644 --- a/monkestation/code/modules/blueshift/appliances/colony.dm +++ b/monkestation/code/modules/blueshift/appliances/colony.dm @@ -541,9 +541,9 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/cell_charger_multi/wall_mounted, 29) layer = ABOVE_MOB_LAYER can_change_cable_layer = TRUE /// How much power the turbine makes without a storm - var/regular_power_production = 2500 + var/regular_power_production = 25 KW /// How much power the turbine makes during a storm - var/storm_power_production = 10000 + var/storm_power_production = 100 KW /// Is our pressure too low to function? var/pressure_too_low = FALSE /// Minimum external pressure needed to work diff --git a/monkestation/code/modules/blueshift/machines/sterling_generator.dm b/monkestation/code/modules/blueshift/machines/sterling_generator.dm index 18d185de4a06..ab6236fbfedb 100644 --- a/monkestation/code/modules/blueshift/machines/sterling_generator.dm +++ b/monkestation/code/modules/blueshift/machines/sterling_generator.dm @@ -165,7 +165,7 @@ /// Maximum efficient heat difference, at what heat difference does more difference stop meaning anything for power? var/max_efficient_heat_difference = 8000 /// Maximum power output from this machine - var/max_power_output = 100 * 1000 + var/max_power_output = 100 * 10 KW /// How much power the generator is currently making var/current_power_generation /// Our looping fan sound that we play when turned on diff --git a/monkestation/code/modules/blueshift/structures/primative.dm b/monkestation/code/modules/blueshift/structures/primative.dm index ca8bb887d926..c467e9772e17 100644 --- a/monkestation/code/modules/blueshift/structures/primative.dm +++ b/monkestation/code/modules/blueshift/structures/primative.dm @@ -581,6 +581,10 @@ GLOBAL_LIST_INIT(stone_recipes, list ( \ /// The maximum number of items this structure can store var/maximum_contained_items = 10 +/obj/structure/millstone/Initialize(mapload) + . = ..() + create_reagents(250, (TRANSPARENT | AMOUNT_VISIBLE | OPENCONTAINER)) + /obj/structure/millstone/examine(mob/user) . = ..() @@ -720,6 +724,9 @@ GLOBAL_LIST_INIT(stone_recipes, list ( \ user.mind.adjust_experience(/datum/skill/primitive, 5) for(var/target_item as anything in contents) + var/obj/item/food/grown/food_item = target_item + if(food_item.mill_reagent) + reagents.add_reagent(food_item.mill_reagent, food_item.seed.potency * 0.2) seedify(target_item, t_max = 1) return @@ -2587,3 +2594,9 @@ GLOBAL_LIST_INIT(clay_recipes, list ( \ /// Called on an object when a tool with wrench capabilities is used to right click an object /atom/proc/blowrod_act_secondary(mob/living/user, obj/item/tool) return + +/obj/item/food/grown + var/datum/reagent/mill_reagent + +/obj/item/food/grown/wheat + mill_reagent = /datum/reagent/consumable/flour diff --git a/monkestation/code/modules/map_gen_expansions/new_turfs.dm b/monkestation/code/modules/map_gen_expansions/new_turfs.dm index 49e991bbc35f..d1f5fc15ed0f 100644 --- a/monkestation/code/modules/map_gen_expansions/new_turfs.dm +++ b/monkestation/code/modules/map_gen_expansions/new_turfs.dm @@ -38,7 +38,7 @@ . = ..() AddComponent(/datum/component/simple_farm) new /obj/item/stack/ore/glass(src) - icon = 'icons/turf/floors.dmi' + icon_state = base_icon_state /turf/open/misc/asteroid/forest/mushroom name = "mushroom floor" diff --git a/monkestation/code/modules/outdoors/code/datum/particle_weathers/_particle_weather.dm b/monkestation/code/modules/outdoors/code/datum/particle_weathers/_particle_weather.dm index 954f94e48b71..63eb0d713bff 100644 --- a/monkestation/code/modules/outdoors/code/datum/particle_weathers/_particle_weather.dm +++ b/monkestation/code/modules/outdoors/code/datum/particle_weathers/_particle_weather.dm @@ -62,7 +62,10 @@ GLOBAL_LIST_EMPTY(siren_objects) color_animating = pick(affecting_value) animate_flags = ELASTIC_EASING | EASE_IN | EASE_OUT spawn(duration - rand(0, duration*10)/10) - playsound_z(SSmapping.levels_by_trait(ZTRAIT_STATION), pick(sound_effects), 50, _mixer_channel = CHANNEL_WEATHER) + if(initiator_ref.plane_type == "Default") + playsound_z(SSmapping.levels_by_trait(ZTRAIT_STATION), pick(sound_effects), 50, _mixer_channel = CHANNEL_WEATHER) + else + playsound_z(SSmapping.levels_by_trait(ZTRAIT_ECLIPSE), pick(sound_effects), 50, _mixer_channel = CHANNEL_WEATHER) if(GLE_STAGE_THIRD) color_animating = SSoutdoor_effects.current_color animate_flags = CIRCULAR_EASING | EASE_IN