diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm index 216a45ee1c..36fa534fa9 100644 --- a/code/__HELPERS/type2type.dm +++ b/code/__HELPERS/type2type.dm @@ -49,7 +49,7 @@ var/n = 1 // Figure out power. (power of 2) - while (n < num) + while (n <= num) power += 4 n *= 16 @@ -60,7 +60,7 @@ power -= 4 // Append zeroes to make sure that hex is atleast digits long. - var/left = length(hex) - digits + var/left = digits - length(hex) while (left-- > 0) hex = text("0[]", hex) diff --git a/code/modules/hydroponics/spreading/spreading.dm b/code/modules/hydroponics/spreading/spreading.dm index 87894c6d73..cea1353573 100644 --- a/code/modules/hydroponics/spreading/spreading.dm +++ b/code/modules/hydroponics/spreading/spreading.dm @@ -62,6 +62,7 @@ var/list/neighbors = list() var/obj/effect/plant/parent var/datum/seed/seed + var/sampled = 0 var/floor = 0 var/spread_chance = 40 var/spread_distance = 3 @@ -237,8 +238,14 @@ plant_controller.add_plant(src) if(istype(W, /obj/item/weapon/wirecutters) || istype(W, /obj/item/weapon/scalpel)) + if(sampled) + user << "\The [src] has already been sampled recently." + return + if(!is_mature()) + user << "\The [src] is not mature enough to yield a sample yet." + return if(!seed) - user << "There is nothing to take a sample from." + user << "There is nothing to take a sample from." return if(sampled) user << "You cannot take another sample from \the [src]." @@ -246,7 +253,8 @@ if(prob(70)) sampled = 1 seed.harvest(user,0,1) - health -= (rand(3,5)*10) + health -= (rand(3,5)*5) + sampled = 1 else ..() if(W.force) diff --git a/code/modules/hydroponics/spreading/spreading_growth.dm b/code/modules/hydroponics/spreading/spreading_growth.dm index 80b55b7227..0b8ead0476 100644 --- a/code/modules/hydroponics/spreading/spreading_growth.dm +++ b/code/modules/hydroponics/spreading/spreading_growth.dm @@ -69,6 +69,12 @@ last_tick = world.time update_neighbors() + if(sampled) + //Should be between 2-7 for given the default range of values for TRAIT_PRODUCTION + var/chance = max(1, round(30/seed.get_trait(TRAIT_PRODUCTION))) + if(prob(chance)) + sampled = 0 + if(is_mature() && neighbors.len && prob(spread_chance)) //spread to 1-3 adjacent turfs depending on yield trait. var/max_spread = between(1, round(seed.get_trait(TRAIT_YIELD)*3/14), 3) diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm index 7726775a1d..d397138317 100644 --- a/code/modules/hydroponics/trays/tray.dm +++ b/code/modules/hydroponics/trays/tray.dm @@ -260,7 +260,6 @@ seed.harvest(user,yield_mod) else seed.harvest(get_turf(src),yield_mod) - // Reset values. harvest = 0 lastproduce = age @@ -292,6 +291,7 @@ mutation_mod = 0 user << "You remove the dead plant." + lastproduce = 0 check_health() return @@ -461,6 +461,7 @@ return user << "You plant the [S.seed.seed_name] [S.seed.seed_noun]." + lastproduce = 0 seed = S.seed //Grab the seed datum. dead = 0 age = 1