Skip to content

Commit 2ea47c0

Browse files
authored
Remove SetRotAfter method from SharedRottingSystem
1 parent 538b81a commit 2ea47c0

1 file changed

Lines changed: 0 additions & 14 deletions

File tree

Content.Shared/Atmos/Rotting/SharedRottingSystem.cs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -166,18 +166,4 @@ public int RotStage(EntityUid uid, RottingComponent? comp = null, PerishableComp
166166

167167
return (int) (comp.TotalRotTime.TotalSeconds / perishable.RotAfter.TotalSeconds);
168168
}
169-
<<<<<<< HEAD
170-
171-
#region Starlight
172-
public bool SetRotAfter(EntityUid uid, TimeSpan newTime, PerishableComponent? perishable = null)
173-
{
174-
if (!Resolve(uid, ref perishable))
175-
return false;
176-
177-
perishable.RotAfter = newTime;
178-
return true;
179-
}
180-
#endregion Starlight
181-
=======
182-
>>>>>>> 5792ab3c55 (partial class stuff)
183169
}

0 commit comments

Comments
 (0)