Skip to content

Commit

Permalink
Recodes and fixes smite
Browse files Browse the repository at this point in the history
  • Loading branch information
Gboster-0 committed Dec 14, 2024
1 parent a5e1cf6 commit b21ff71
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
if(user.god_aligned == FISHGOD_NONE) // Athiests can't commune because they don't have a soul
to_chat(user, span_userdanger("YOU HAVE NO GOD."))

var/input = stripped_input(user,"What do you want to send to others that follow your god?", ,"Commune")
var/input = stripped_input(user, "What do you want to send to others that follow your god?", "Fish communion", "Commune")
message_admins("A fisherman ([user.ckey]) has used commune with the following message: [input].")
for(var/mob/living/M in GLOB.player_list)
if(M.god_aligned == user.god_aligned)
Expand Down
31 changes: 14 additions & 17 deletions code/game/objects/items/fixerskills/fishing/level2.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,19 @@

/datum/action/cooldown/fishing/smite/FishEffect(mob/living/user)
//Compile people around you
for(var/mob/living/M in view(4, get_turf(src)))
if(M.god_aligned != M.god_aligned)
//Deal a fuckload of damage to athiests
if(M.god_aligned == initial(M.god_aligned))
var/damagedealing = clamp(user.devotion, 1, 50)
M.apply_damage(damagedealing * 2, WHITE_DAMAGE, null, M.run_armor_check(null, WHITE_DAMAGE), spread_damage = TRUE) //KILL
if(ishuman(M))
to_chat(target, span_userdanger("The gods have punished you for your sins!"), confidential = TRUE)
return

//Deal some damage if they don't share the same god
if(M.god_aligned != user.god_aligned)
var/damagedealing = clamp(user.devotion, 1, 50)
M.apply_damage(damagedealing, WHITE_DAMAGE, null, M.run_armor_check(null, WHITE_DAMAGE), spread_damage = TRUE) //KILL
if(ishuman(M))
to_chat(target, span_userdanger("[user.god_aligned] has punished you for your sins!"), confidential = TRUE)
for(var/mob/living/sinner in view(4, get_turf(src)))
if(user.god_aligned == sinner.god_aligned)
continue

var/damage = clamp(user.devotion, 1, 50)
if(sinner.god_aligned == FISHGOD_NONE) //Deal a fuckload of damage to athiests
damage *= 2

sinner.deal_damage(damage, WHITE_DAMAGE) //KILL
if(ishuman(user))
to_chat(sinner, span_userdanger("[user.god_aligned] has punished you for your sins using [user] as a conduit!"))
else
to_chat(sinner, span_userdanger("The gods have punished you for your sins using [user] as a conduit!"))

//Lunar Might
/obj/item/book/granter/action/skill/might
Expand Down Expand Up @@ -100,7 +97,7 @@
for(var/mob/living/M in view(4, get_turf(src)))
if(M == owner)
continue
if(M.god_aligned == initial(M.god_aligned))
if(M.god_aligned == FISHGOD_NONE)
continue

for(var/datum/planet/planet as anything in SSfishing.planets)
Expand Down

0 comments on commit b21ff71

Please sign in to comment.