Skip to content

Commit 42857af

Browse files
stun ball type
1 parent 3a11afa commit 42857af

File tree

1 file changed

+23
-3
lines changed

1 file changed

+23
-3
lines changed

code/game/machinery/computer/HolodeckControl.dm

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -649,6 +649,29 @@
649649
/obj/item/weapon/beach_ball/holoball/rigged/explosive/discrete
650650
silent = TRUE
651651

652+
/obj/item/weapon/beach_ball/holoball/rigged/stun
653+
var/stuns = TRUE
654+
655+
/obj/item/weapon/beach_ball/holoball/rigged/stun/AltClick(mob/user)
656+
if(!user.incapacitated() && Adjacent(user))
657+
stuns = !stuns
658+
to_chat(user,"<span class='notice'>You turn stunning on travelling [stuns ? "On" : "Off"].</span>")
659+
return
660+
return ..()
661+
662+
/obj/item/weapon/beach_ball/holoball/rigged/stun/travel_foul(atom/movable/mover)
663+
if (stuns && ismob(mover))
664+
. = ..()
665+
var/mob/M = mover
666+
playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
667+
M.Knockdown(5)
668+
M.Stun(5)
669+
if(iscarbon(M))
670+
M.apply_effect(10, STUTTER)
671+
672+
/obj/item/weapon/beach_ball/holoball/rigged/stun/discrete
673+
silent = TRUE
674+
652675
/obj/item/weapon/beach_ball/holoball/rigged/grenade
653676
silent = TRUE //Set to false when a nade is put inside
654677
var/obj/item/weapon/grenade/held_grenade = null
@@ -706,12 +729,9 @@
706729
G.affecting.Stun(5)
707730
visible_message("<span class='warning'>[G.assailant] dunks [G.affecting] into the [src]!</span>")
708731
qdel(W)
709-
return
710732
else if (istype(W, /obj/item) && get_dist(src,user)<2)
711733
if(user.drop_item(W, src.loc))
712734
visible_message("<span class='notice'>[user] dunks [W] into the [src]!</span>")
713-
score += 2
714-
return
715735

716736
/obj/structure/holohoop/Cross(atom/movable/mover, turf/target, height=1.5, air_group = 0)
717737
if(istype(mover,/obj/item) && mover.throwing)

0 commit comments

Comments
 (0)