Skip to content

red, yellow, and tundra grass fixes #420

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DerFlammenwerfer merged 1 commit into from
Sep 6, 2025
Merged

red, yellow, and tundra grass fixes #420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/modules/farming/plough.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
user_tries_tilling(pulledby, get_turf(src))

/obj/structure/plough/proc/user_tries_tilling(mob/living/user, turf/location)
if(istype(location, /turf/open/floor/rogue/grass))
if(istype(location, /turf/open/floor/rogue/grass) || istype(location, /turf/open/floor/rogue/grassred) || istype(location, /turf/open/floor/rogue/grassyel) || istype(location, /turf/open/floor/rogue/grasscold))
apply_farming_fatigue(user, 10)
playsound(location,'sound/items/dig_shovel.ogg', 100, TRUE)
location.ChangeTurf(/turf/open/floor/rogue/dirt, flags = CHANGETURF_INHERIT_AIR)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/farming/tools.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@
/obj/item/rogueweapon/hoe/attack_turf(turf/T, mob/living/user)
if(user.used_intent.type == /datum/intent/till)
user.changeNext_move(CLICK_CD_MELEE)
if(istype(T, /turf/open/floor/rogue/grass))
if(istype(T, /turf/open/floor/rogue/grass) || istype(T, /turf/open/floor/rogue/grassyel) || istype(T, /turf/open/floor/rogue/grassred) || istype(T, /turf/open/floor/rogue/grasscold))
playsound(T,'sound/items/dig_shovel.ogg', 100, TRUE)
if (do_after(user, 3 SECONDS, target = src))
apply_farming_fatigue(user, 10)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/roguetown/roguejobs/gravedigger/tools.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
playsound(T,'sound/items/empty_shovel.ogg', 100, TRUE)
update_icon()
return
if(istype(T, /turf/open/floor/rogue/grass))
if(istype(T, /turf/open/floor/rogue/grass) || istype(T, /turf/open/floor/rogue/grassyel) || istype(T, /turf/open/floor/rogue/grassred) || istype(T, /turf/open/floor/rogue/grasscold))
to_chat(user, span_warning("There is grass in the way."))
return
return
Expand Down
17 changes: 13 additions & 4 deletions modular_hearthstone/code/game/objects/effects/track.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,15 @@

/turf/open/floor/rogue/grass
track_prob = 1

/turf/open/floor/rogue/grassred
track_prob = 1

/turf/open/floor/rogue/grassyel
track_prob = 1

/turf/open/floor/rogue/grasscold
track_prob = 1
//Probabilities end (albeit mud is handled seperately).

//Analysis levels depending on skillcheck during reveal.
Expand Down Expand Up @@ -88,7 +97,7 @@
if(!HAS_TRAIT(user, TRAIT_PERFECT_TRACKER))
var/diff = 11 //Base Tracking Difficulty
diff += tracking_modifier
diff += round((world.time - creation_time) / (60 SECONDS), 1) //Gets more difficult to spot the older.
diff += round((world.time - creation_time) / (120 SECONDS), 1) //Gets more difficult to spot the older.
diff += rand(0, 5) //Entropy.

var/competence = user.STAPER
Expand All @@ -112,7 +121,7 @@
if(!HAS_TRAIT(user, TRAIT_PERFECT_TRACKER))
var/diff = 11
diff += tracking_modifier
diff += round((world.time - creation_time) / (60 SECONDS), 1)
diff += round((world.time - creation_time) / (120 SECONDS), 1)
var/competence = user.STAPER / 2
if(user.mind)
competence += 5 * user.mind.get_skill_level(/datum/skill/misc/tracking) //Skill is much more relevant for analysis.
Expand Down Expand Up @@ -159,7 +168,7 @@
if(SOUTHEAST)
facing = "southeast"
real_image = image(icon, src, real_icon_state, ABOVE_OPEN_TURF_LAYER, track_source.dir) //Recreate image with correct dir.
deletion_timer = addtimer(CALLBACK(src, PROC_REF(track_expire)), 15 MINUTES, TIMER_STOPPABLE) //Tracks naturally expire after 15 minutes (although at that point their DC is pretty high anyways.)
deletion_timer = addtimer(CALLBACK(src, PROC_REF(track_expire)), 30 MINUTES, TIMER_STOPPABLE) //Tracks naturally expire after 30 minutes (although at that point their DC is pretty high anyways.)

///Adds a new person to the list of people who can see this track.
/obj/effect/track/proc/add_knower(mob/living/tracker, competence = 1)
Expand Down Expand Up @@ -266,7 +275,7 @@
return //Guh?
if(!(movement_type & GROUND) || (movement_type & (FLOATING|FLYING))) //For some reason some mobs have both ground and flying at once.
return
var/probability = round(track_creation_prob(new_turf), 0.1)
var/probability = round(track_creation_prob(new_turf), 0.1)
if(!probability)
return
if(!prob(probability))
Expand Down
Loading