mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-26 06:22:26 +01:00
Merge branch 'master' into development
# Conflicts: # code/modules/mob/living/carbon/human/species/station/station.dm
This commit is contained in:
@@ -288,8 +288,8 @@
|
||||
tox_mod = 3 //they're not used to all our weird human bacteria.
|
||||
warning_low_pressure = 50
|
||||
hazard_low_pressure = 0
|
||||
siemens_coefficient = 0 //attempting to mimic the old insulation feature.
|
||||
ethanol_resistance = 2
|
||||
siemens_coefficient = 1 //setting it to 0 would be redundant due to LordLag's snowflake checks, plus batons/tasers use siemens now too.
|
||||
breath_type = "oxygen"
|
||||
poison_type = "null" //a species that breathes plasma shouldn't be poisoned by it.
|
||||
blurb = "Vaurca are a bipedal insectoid species from the first moon of Sedantis I. \
|
||||
|
||||
@@ -38,7 +38,7 @@ If the spell_projectile is seeking, it will update its target every process and
|
||||
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)
|
||||
return
|
||||
|
||||
/spell/targeted/projectile/proc/choose_prox_targets(mob/user = usr, var/atom/movable/spell_holder)
|
||||
|
||||
Reference in New Issue
Block a user