Skip to content
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.

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

Dagoth Smite #501

Merged
merged 7 commits into from
Nov 5, 2023
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
23 changes: 23 additions & 0 deletions monkestation/code/modules/admin/smites/dagothsmite.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// Dagoth Smite! (ported from Biblefart code) - Dexee
/datum/smite/dagothsmite
name = "Dagoth Smite"

/datum/smite/dagothsmite/effect(client/user, mob/living/target)
. = ..()
if (!iscarbon(target))
to_chat(user, span_warning("This must be used on a carbon mob."), confidential = TRUE)
return
var/mob/living/carbon/human/Person = target
var/turf/Location = get_turf(target)
var/turf/T = get_step(get_step(Person, NORTH), NORTH)
to_chat(Person,"<span class='ratvar'>What a grand and intoxicating innocence. Perish.</span>")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
to_chat(Person,"<span class='ratvar'>What a grand and intoxicating innocence. Perish.</span>")
to_chat(Person, span_ratvar("What a grand and intoxicating innocence. Perish."))

try to use span procs(technically macros) wherever possible.

T.Beam(Person, icon_state="lightning[rand(1,12)]", time = 15)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
T.Beam(Person, icon_state="lightning[rand(1,12)]", time = 15)
T.Beam(Person, icon_state="lightning[rand(1,12)]", time = 1.5 SECONDS)

Use SECONDS procs for time related things.

Person.unequip_everything()
Person.Paralyze(15)
playsound(target,'sound/magic/lightningshock.ogg', 50, 1)
playsound(target,'monkestation/sound/misc/dagothgod.ogg', 80)
Person.electrocution_animation(15)
spawn(15)
Person.gib()
playsound(Location,'sound/effects/explosion3.ogg', 75, 1)
return
1 change: 1 addition & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -5551,6 +5551,7 @@
#include "monkestation\code\modules\admin\antag_tokens.dm"
#include "monkestation\code\modules\admin\camera_view.dm"
#include "monkestation\code\modules\admin\ggg\where_are_your_fingers.dm"
#include "monkestation\code\modules\admin\smites\dagothsmite.dm"
#include "monkestation\code\modules\aesthetics\airlock\airlock.dm"
#include "monkestation\code\modules\aesthetics\items\clothing.dm"
#include "monkestation\code\modules\aesthetics\mapping\tilecoloring.dm"
Expand Down
Loading