Skip to content

Slasher antag tweaks #6714

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

Open
wants to merge 26 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
22f2956
Update megaseed.dm
TheMrGlasses Mar 17, 2025
bae28ae
Update megaseed.dm
TheMrGlasses Mar 17, 2025
c065fc3
Merge remote-tracking branch 'upstream/master'
TheMrGlasses Mar 22, 2025
fdb3776
Merge remote-tracking branch 'upstream/HEAD'
TheMrGlasses Apr 3, 2025
be3ef84
Merge remote-tracking branch 'upstream/HEAD'
TheMrGlasses Apr 16, 2025
a4b6f15
Merge branch 'Monkestation:master' into master
TheMrGlasses Apr 18, 2025
5b257a7
Merge branch 'master' of https://github.com/TheMrGlasses/Monkestation2.0
TheMrGlasses Apr 18, 2025
b67c331
Merge branch 'Monkestation:master' into master
TheMrGlasses Apr 28, 2025
5d0c74b
Merge branch 'Monkestation:master' into master
TheMrGlasses Apr 30, 2025
c98d6bc
Merge branch 'Monkestation:master' into master
TheMrGlasses May 6, 2025
6a9f54e
Merge remote-tracking branch 'origin/HEAD' into Slasher-Antag-Tweaks
TheMrGlasses May 6, 2025
a5696aa
Slasher Tests
TheMrGlasses May 6, 2025
37498d2
Fixes
TheMrGlasses May 6, 2025
cf8af70
Tweaky Tweak
TheMrGlasses May 6, 2025
e19359d
Blegh
TheMrGlasses May 6, 2025
7b54cb4
Placement issue
TheMrGlasses May 6, 2025
b97df56
Think this is needed oops
TheMrGlasses May 6, 2025
0f7194c
Testing different code
TheMrGlasses May 6, 2025
83f033f
Things
TheMrGlasses May 6, 2025
503de9b
More changes
TheMrGlasses May 6, 2025
ad2e08f
Merge branch 'Monkestation:master' into master
TheMrGlasses May 16, 2025
5455fce
More testing
TheMrGlasses May 17, 2025
9db46c8
Merge branch 'master' into Slasher-Antag-Tweaks
TheMrGlasses May 17, 2025
6c29059
fix
TheMrGlasses May 17, 2025
0db9e30
Possible placement issues
TheMrGlasses May 17, 2025
2c02145
Beep
TheMrGlasses May 17, 2025
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
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
/// Sound played when exiting the jaunt
var/exit_sound = 'monkestation/sound/effects/slasher_jauntappear.ogg'
/// For how long are we jaunting?
var/jaunt_duration = 4 SECONDS
var/jaunt_duration = 8 SECONDS
/// For how long we become immobilized after exiting the jaunt
var/jaunt_in_time = 0.33 SECONDS
/// For how long we become immobilized when using this spell
Expand Down Expand Up @@ -50,8 +50,12 @@
* Puts owner in the phased mob holder here.
*/
/datum/action/cooldown/slasher/envelope_darkness/proc/do_jaunt(mob/living/jaunter)
ADD_TRAIT(jaunter, TRAIT_NO_TRANSFORM, REF(src))
ADD_TRAIT(jaunter, TRAIT_NO_TRANSFORM, REF(src))
var/obj/effect/dummy/phased_mob/slasher_jaunt/holder = enter_jaunt(jaunter)
var/obj/cuffs = jaunter.get_item_by_slot(ITEM_SLOT_HANDCUFFED)
jaunter.visible_message("You see [jaunter] fade away into nothingness!")
if(HAS_TRAIT(jaunter, TRAIT_RESTRAINED))
qdel(cuffs)
REMOVE_TRAIT(jaunter, TRAIT_NO_TRANSFORM, REF(src))
if(!holder)
return
Expand Down