Skip to content

Commit

Permalink
Typebating makes you sad. (#17235)
Browse files Browse the repository at this point in the history
* you monster

* shpelling
  • Loading branch information
MajManatee committed Jan 2, 2023
1 parent 58674c1 commit 7556c32
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
3 changes: 3 additions & 0 deletions code/datums/mood_events/generic_negative_events.dm
Original file line number Diff line number Diff line change
Expand Up @@ -221,3 +221,6 @@
description = "<span class='boldwarning'>HE'S CUTTING ME OPEN!!</span>\n"
mood_change = -8

/datum/mood_event/type_bait
description = "<span class='warning'>I caught that fish mid-conversation... I can't believe I did that...</span>\n"
mood_change = -1
2 changes: 2 additions & 0 deletions yogstation/code/game/objects/items/fishing/rods.dm
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@
if(!forced && bite) // we got something!!!
playsound(fishing_component, 'sound/effects/water_emerge.ogg', 50, FALSE, -5)
var/power = 0
if(istype(bait, /obj/item/reagent_containers/food/snacks/bait/type))
SEND_SIGNAL(fisher, COMSIG_ADD_MOOD_EVENT, "typebait", /datum/mood_event/type_bait)
if(iscarbon(fisher)) //sorry, non-carbons don't get to wear cool fishing outfits
var/mob/living/carbon/carbonfisher = fisher
power = carbonfisher.fishing_power
Expand Down

0 comments on commit 7556c32

Please sign in to comment.