Merge pull request #9601 from Ghommie/Ghommie-cit265
Ports move force and move resist, movement/pushing/pulling tweaks & co.
This commit is contained in:
@@ -45,10 +45,10 @@
|
||||
bonus_damage *= 3 //total 30 damage on cultists, 50 with ratvar
|
||||
GLOB.clockwork_vitality += target.adjustFireLoss(bonus_damage) //adds the damage done to existing vitality
|
||||
|
||||
/obj/item/clockwork/weapon/ratvarian_spear/throw_impact(atom/target)
|
||||
var/turf/T = get_turf(target)
|
||||
if(isliving(target))
|
||||
var/mob/living/L = target
|
||||
/obj/item/clockwork/weapon/ratvarian_spear/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
|
||||
var/turf/T = get_turf(hit_atom)
|
||||
if(isliving(hit_atom))
|
||||
var/mob/living/L = hit_atom
|
||||
if(is_servant_of_ratvar(L))
|
||||
if(L.put_in_active_hand(src))
|
||||
L.visible_message("<span class='warning'>[L] catches [src] out of the air!</span>")
|
||||
|
||||
@@ -265,7 +265,7 @@
|
||||
to_chat(user, "<span class='warning'>The bola seems to take on a life of its own!</span>")
|
||||
throw_impact(user)
|
||||
|
||||
/obj/item/restraints/legcuffs/bola/cult/throw_impact(atom/hit_atom)
|
||||
/obj/item/restraints/legcuffs/bola/cult/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
|
||||
if(iscultist(hit_atom))
|
||||
return
|
||||
. = ..()
|
||||
@@ -690,10 +690,10 @@
|
||||
/obj/item/twohanded/cult_spear/update_icon()
|
||||
icon_state = "bloodspear[wielded]"
|
||||
|
||||
/obj/item/twohanded/cult_spear/throw_impact(atom/target)
|
||||
var/turf/T = get_turf(target)
|
||||
if(isliving(target))
|
||||
var/mob/living/L = target
|
||||
/obj/item/twohanded/cult_spear/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
|
||||
var/turf/T = get_turf(hit_atom)
|
||||
if(isliving(hit_atom))
|
||||
var/mob/living/L = hit_atom
|
||||
if(iscultist(L))
|
||||
playsound(src, 'sound/weapons/throwtap.ogg', 50)
|
||||
if(L.put_in_active_hand(src))
|
||||
@@ -987,11 +987,11 @@
|
||||
return TRUE
|
||||
return FALSE
|
||||
|
||||
/obj/item/shield/mirror/throw_impact(atom/target, throwingdatum)
|
||||
var/turf/T = get_turf(target)
|
||||
/obj/item/shield/mirror/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
|
||||
var/turf/T = get_turf(hit_atom)
|
||||
var/datum/thrownthing/D = throwingdatum
|
||||
if(isliving(target))
|
||||
var/mob/living/L = target
|
||||
if(isliving(hit_atom))
|
||||
var/mob/living/L = hit_atom
|
||||
if(iscultist(L))
|
||||
playsound(src, 'sound/weapons/throwtap.ogg', 50)
|
||||
if(L.put_in_active_hand(src))
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
wander = FALSE
|
||||
density = FALSE
|
||||
movement_type = FLYING
|
||||
anchored = TRUE
|
||||
move_resist = MOVE_FORCE_OVERPOWERING
|
||||
mob_size = MOB_SIZE_TINY
|
||||
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
|
||||
speed = 1
|
||||
@@ -361,7 +361,7 @@
|
||||
user.dropItemToGround(src)
|
||||
scatter()
|
||||
|
||||
/obj/item/ectoplasm/revenant/throw_impact(atom/hit_atom)
|
||||
/obj/item/ectoplasm/revenant/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
|
||||
..()
|
||||
if(inert)
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user