mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
Merge pull request #836 from Datraen/BayCherryPickTest
Cherrypicks from Bay
This commit is contained in:
@@ -299,7 +299,7 @@
|
||||
item_state = "glasses"
|
||||
desc = "It looks like a plain set of mesons, but on closer inspection, it seems to have a small dial inside."
|
||||
origin_tech = list(TECH_ILLEGAL = 3)
|
||||
var/list/clothing_choices = list()
|
||||
var/list/global/clothing_choices
|
||||
|
||||
/obj/item/clothing/glasses/chameleon/New()
|
||||
..()
|
||||
|
||||
@@ -15,7 +15,7 @@ If the spell_projectile is seeking, it will update its target every process and
|
||||
var/proj_step_delay = 1 //lower = faster
|
||||
var/cast_prox_range = 1
|
||||
|
||||
/spell/targeted/projectile/cast(list/targets, mob/user = usr)
|
||||
/spell/targeted/projectile/cast(list/targets, mob/user = usr, var/target_zone)
|
||||
|
||||
if(istext(proj_type))
|
||||
proj_type = text2path(proj_type) // sanity filters
|
||||
@@ -26,19 +26,14 @@ If the spell_projectile is seeking, it will update its target every process and
|
||||
if(!projectile)
|
||||
return
|
||||
|
||||
projectile.original = target
|
||||
projectile.starting = get_turf(user)
|
||||
|
||||
projectile.shot_from = user //fired from the user
|
||||
projectile.current = projectile.original
|
||||
projectile.yo = target.y - user.y
|
||||
projectile.xo = target.x - user.x
|
||||
projectile.kill_count = src.duration
|
||||
projectile.hitscan = !proj_step_delay
|
||||
projectile.step_delay = proj_step_delay
|
||||
if(istype(projectile, /obj/item/projectile/spell_projectile))
|
||||
var/obj/item/projectile/spell_projectile/SP = projectile
|
||||
SP.carried = src //casting is magical
|
||||
spawn projectile.process()
|
||||
projectile.launch(target, target_zone="chest")
|
||||
return
|
||||
|
||||
/spell/targeted/projectile/proc/choose_prox_targets(mob/user = usr, var/atom/movable/spell_holder)
|
||||
|
||||
Reference in New Issue
Block a user