Skip to content

Commit

Permalink
misc fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
dwasint committed Jun 30, 2024
1 parent 2988987 commit 99fef08
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 5 deletions.
1 change: 1 addition & 0 deletions code/modules/hydroponics/hydroitemdefines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
. = ..()
Expand Down
4 changes: 2 additions & 2 deletions monkestation/code/modules/blueshift/appliances/colony.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 13 additions & 0 deletions monkestation/code/modules/blueshift/structures/primative.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
. = ..()

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion monkestation/code/modules/map_gen_expansions/new_turfs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 99fef08

Please sign in to comment.