mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-23 07:26:05 +00:00
0caa59b21a
These are the files with just tiny tweaks. Mostly modify an object's attackby so it does "return ..()" instead of "..()". If there are other things in this commit, the PR's description will explain them.
119 lines
3.5 KiB
Plaintext
119 lines
3.5 KiB
Plaintext
/obj/item/weapon/twohanded/singularityhammer
|
|
name = "singularity hammer"
|
|
desc = "The pinnacle of close combat technology, the hammer harnesses the power of a miniaturized singularity to deal crushing blows."
|
|
icon_state = "mjollnir0"
|
|
flags = CONDUCT
|
|
slot_flags = SLOT_BACK
|
|
force = 5
|
|
force_unwielded = 5
|
|
force_wielded = 20
|
|
throwforce = 15
|
|
throw_range = 1
|
|
w_class = 5
|
|
var/charged = 5
|
|
origin_tech = "combat=5;bluespace=4"
|
|
|
|
|
|
|
|
/obj/item/weapon/twohanded/singularityhammer/New()
|
|
..()
|
|
SSobj.processing |= src
|
|
|
|
|
|
/obj/item/weapon/twohanded/singularityhammer/Destroy()
|
|
SSobj.processing.Remove(src)
|
|
return ..()
|
|
|
|
|
|
/obj/item/weapon/twohanded/singularityhammer/process()
|
|
if(charged < 5)
|
|
charged++
|
|
return
|
|
|
|
/obj/item/weapon/twohanded/singularityhammer/update_icon() //Currently only here to fuck with the on-mob icons.
|
|
icon_state = "mjollnir[wielded]"
|
|
return
|
|
|
|
|
|
/obj/item/weapon/twohanded/singularityhammer/proc/vortex(turf/pull, mob/wielder)
|
|
for(var/atom/X in orange(5,pull))
|
|
if(istype(X, /atom/movable))
|
|
if(X == wielder) continue
|
|
if((X) &&(!X:anchored) && (!istype(X,/mob/living/carbon/human)))
|
|
step_towards(X,pull)
|
|
step_towards(X,pull)
|
|
step_towards(X,pull)
|
|
else if(istype(X,/mob/living/carbon/human))
|
|
var/mob/living/carbon/human/H = X
|
|
if(istype(H.shoes,/obj/item/clothing/shoes/magboots))
|
|
var/obj/item/clothing/shoes/magboots/M = H.shoes
|
|
if(M.magpulse)
|
|
continue
|
|
H.apply_effect(1, WEAKEN, 0)
|
|
step_towards(H,pull)
|
|
step_towards(H,pull)
|
|
step_towards(H,pull)
|
|
return
|
|
|
|
|
|
|
|
/obj/item/weapon/twohanded/singularityhammer/afterattack(atom/A as mob|obj|turf|area, mob/user, proximity)
|
|
if(!proximity) return
|
|
if(wielded)
|
|
if(charged == 5)
|
|
charged = 0
|
|
if(istype(A, /mob/living/))
|
|
var/mob/living/Z = A
|
|
Z.take_organ_damage(20,0)
|
|
playsound(user, 'sound/weapons/marauder.ogg', 50, 1)
|
|
var/turf/target = get_turf(A)
|
|
vortex(target,user)
|
|
|
|
|
|
/obj/item/weapon/twohanded/mjollnir
|
|
name = "Mjolnir"
|
|
desc = "A weapon worthy of a god, able to strike with the force of a lightning bolt. It crackles with barely contained energy."
|
|
icon_state = "mjollnir0"
|
|
flags = CONDUCT
|
|
slot_flags = SLOT_BACK
|
|
force = 5
|
|
force_unwielded = 5
|
|
force_wielded = 25
|
|
throwforce = 30
|
|
throw_range = 7
|
|
w_class = 5
|
|
//var/charged = 5
|
|
origin_tech = "combat=5;powerstorage=5"
|
|
|
|
/obj/item/weapon/twohanded/mjollnir/proc/shock(mob/living/target)
|
|
var/datum/effect_system/lightning_spread/s = new /datum/effect_system/lightning_spread
|
|
s.set_up(5, 1, target.loc)
|
|
s.start()
|
|
target.visible_message("<span class='danger'>[target.name] was shocked by the [src.name]!</span>", \
|
|
"<span class='userdanger'>You feel a powerful shock course through your body sending you flying!</span>", \
|
|
"<span class='italics'>You hear a heavy electrical crack!</span>")
|
|
var/atom/throw_target = get_edge_target_turf(target, get_dir(src, get_step_away(target, src)))
|
|
target.throw_at_fast(throw_target, 200, 4)
|
|
return
|
|
|
|
|
|
/obj/item/weapon/twohanded/mjollnir/attack(mob/living/M, mob/user)
|
|
..()
|
|
if(wielded)
|
|
//if(charged == 5)
|
|
//charged = 0
|
|
playsound(src.loc, "sparks", 50, 1)
|
|
M.Stun(3)
|
|
shock(M)
|
|
|
|
/obj/item/weapon/twohanded/mjollnir/throw_impact(atom/target)
|
|
. = ..()
|
|
if(istype(target, /mob/living))
|
|
var/mob/living/L = target
|
|
L.Stun(3)
|
|
shock(L)
|
|
|
|
/obj/item/weapon/twohanded/mjollnir/update_icon() //Currently only here to fuck with the on-mob icons.
|
|
icon_state = "mjollnir[wielded]"
|
|
return
|