Skip to content

Commit

Permalink
Fixes the moon expanding infinitelly, eventually consuming the entire…
Browse files Browse the repository at this point in the history
… sky and all the stars (#2654)

oh my god
  • Loading branch information
Gboster-0 authored Dec 31, 2024
1 parent 1d0a919 commit abd63ad
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion ModularTegustation/fishing/code/fish_market.dm
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@

/obj/machinery/fish_market/attackby(obj/item/I, mob/user, params)
if(SSfishing.IsAligned(/datum/planet/uranus))
to_chat(usr, span_notice("Uranus is aligned with earth. All fish points are increaed by 1.5x"))
to_chat(user, span_notice("Uranus is aligned with earth. All fish point output increased by 1.5x"))
if(istype(I, /obj/item/stack/fish_points))
var/obj/item/stack/fish_points/more_points = I
AdjustPoints(more_points.amount)
Expand Down
5 changes: 3 additions & 2 deletions ModularTegustation/fishing/code/fishing_items/fishing_rod.dm
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
to_chat(user, span_nicegreen("[FISHGOD_MERCURY] smiles upon you!."))

if(user.god_aligned == FISHGOD_MERCURY)
size_modifier*=2
size_modifier *= 2

fishie.randomize_weight_and_size(size_modifier)

Expand All @@ -198,7 +198,8 @@
new /obj/item/stack/spacecash/c50(get_turf(user))

if(CheckPlanetAligned(FISHGOD_SATURN))
to_chat(user, span_nicegreen("Saturn is in alignment. You feel like better for fishing."))
var/list/possible_messages = list("Your mind feels clearer after fishing.", "You feel relaxed in [FISHGOD_SATURN]'s light.")
to_chat(user, span_nicegreen("Saturn is in alignment. [pick(possible_messages)]"))
user.adjustSanityLoss(-5)

to_chat(user, span_nicegreen("You caught [fishie.name]."))
Expand Down
3 changes: 3 additions & 0 deletions code/controllers/subsystem/fishing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ SUBSYSTEM_DEF(fishing)
/datum/controller/subsystem/fishing/proc/Moveplanets()
addtimer(CALLBACK(src, PROC_REF(Moveplanets)), 7 MINUTES)
moonphase++
if(moonphase == 5)
moonphase = 1

if(stopnext && moonphase != 4)
for(var/mob/M in GLOB.player_list)
to_chat(M, span_userdanger("The planets begin to move again."))
Expand Down

0 comments on commit abd63ad

Please sign in to comment.