mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
[MIRROR] Multiple bugfixes (#10538)
Co-authored-by: Cameron Lennox <killer65311@gmail.com> Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
98a67137bd
commit
5ea1d1d372
@@ -384,6 +384,14 @@
|
|||||||
var/lleill_energy = 200
|
var/lleill_energy = 200
|
||||||
var/lleill_energy_max = 200
|
var/lleill_energy_max = 200
|
||||||
|
|
||||||
|
var/bite_mod = 1 //NYI - Used Downstream
|
||||||
|
var/grab_resist_divisor_victims = 1 //NYI - Used Downstream
|
||||||
|
var/grab_resist_divisor_self = 1 //NYI - Used Downstream
|
||||||
|
var/grab_power_victims = 0 //NYI - Used Downstream
|
||||||
|
var/grab_power_self = 0 //NYI - Used Downstream
|
||||||
|
var/waking_speed = 1 //NYI - Used Downstream
|
||||||
|
var/lightweight_light = 0 //NYI - Used Downstream
|
||||||
|
|
||||||
/datum/species/proc/update_attack_types()
|
/datum/species/proc/update_attack_types()
|
||||||
unarmed_attacks = list()
|
unarmed_attacks = list()
|
||||||
for(var/u_type in unarmed_types)
|
for(var/u_type in unarmed_types)
|
||||||
@@ -601,8 +609,10 @@
|
|||||||
/datum/species/proc/handle_death(var/mob/living/carbon/human/H) //Handles any species-specific death events (such as dionaea nymph spawns).
|
/datum/species/proc/handle_death(var/mob/living/carbon/human/H) //Handles any species-specific death events (such as dionaea nymph spawns).
|
||||||
return
|
return
|
||||||
|
|
||||||
// Only used for alien plasma weeds atm, but could be used for Dionaea later.
|
// Used for traits and species that have special environmental effects.
|
||||||
/datum/species/proc/handle_environment_special(var/mob/living/carbon/human/H)
|
/datum/species/proc/handle_environment_special(var/mob/living/carbon/human/H)
|
||||||
|
for(var/datum/trait/env_trait in env_traits)
|
||||||
|
env_trait.handle_environment_special(H)
|
||||||
return
|
return
|
||||||
|
|
||||||
// Used to update alien icons for aliens.
|
// Used to update alien icons for aliens.
|
||||||
|
|||||||
@@ -30,7 +30,7 @@
|
|||||||
|
|
||||||
|
|
||||||
spawn_flags = SPECIES_CAN_JOIN
|
spawn_flags = SPECIES_CAN_JOIN
|
||||||
appearance_flags = HAS_HAIR_COLOR | HAS_SKIN_TONE | HAS_LIPS | HAS_UNDERWEAR | HAS_EYE_COLOR
|
appearance_flags = HAS_HAIR_COLOR | HAS_SKIN_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_EYE_COLOR
|
||||||
|
|
||||||
has_organ = list(
|
has_organ = list(
|
||||||
O_HEART = /obj/item/organ/internal/heart,
|
O_HEART = /obj/item/organ/internal/heart,
|
||||||
|
|||||||
@@ -39,10 +39,14 @@
|
|||||||
var/mob/living/carbon/human/H = L
|
var/mob/living/carbon/human/H = L
|
||||||
var/obj/item/organ/external/affected = H.get_organ(check_zone(BP_TORSO))
|
var/obj/item/organ/external/affected = H.get_organ(check_zone(BP_TORSO))
|
||||||
H.electrocute_act(rand(25, 40), holder, H.get_siemens_coefficient_organ(affected), affected)
|
H.electrocute_act(rand(25, 40), holder, H.get_siemens_coefficient_organ(affected), affected)
|
||||||
lightning_strike(H.loc, TRUE)
|
var/turf/T = get_turf(H)
|
||||||
|
if(istype(T))
|
||||||
|
lightning_strike(T, TRUE)
|
||||||
else
|
else
|
||||||
L.electrocute_act(rand(25, 40), holder, 0.75, BP_TORSO)
|
L.electrocute_act(rand(25, 40), holder, 0.75, BP_TORSO)
|
||||||
lightning_strike(L.loc, TRUE)
|
var/turf/T = get_turf(L)
|
||||||
|
if(istype(T))
|
||||||
|
lightning_strike(T, TRUE)
|
||||||
|
|
||||||
/datum/artifact_effect/electric_field/DoEffectAura()
|
/datum/artifact_effect/electric_field/DoEffectAura()
|
||||||
var/atom/holder = get_master_holder()
|
var/atom/holder = get_master_holder()
|
||||||
|
|||||||
@@ -75,7 +75,9 @@
|
|||||||
if(last_touched.loc)
|
if(last_touched.loc)
|
||||||
conjure_animation(last_touched.loc)
|
conjure_animation(last_touched.loc)
|
||||||
visible_message(span_cult("\The [src] screeches as it's destroyed"))
|
visible_message(span_cult("\The [src] screeches as it's destroyed"))
|
||||||
lightning_strike(last_touched.loc, TRUE)
|
var/turf/T = get_turf(last_touched)
|
||||||
|
if(istype(T))
|
||||||
|
lightning_strike(T, TRUE)
|
||||||
playsound(src, 'sound/goonstation/spooky/creepyshriek.ogg', 100, 1, 75) //It plays VERY far.
|
playsound(src, 'sound/goonstation/spooky/creepyshriek.ogg', 100, 1, 75) //It plays VERY far.
|
||||||
last_touched = null //Get rid of the reference to our owner.
|
last_touched = null //Get rid of the reference to our owner.
|
||||||
..()
|
..()
|
||||||
|
|||||||
@@ -458,7 +458,9 @@
|
|||||||
playsound(holder.my_atom, 'sound/effects/phasein.ogg', 75, 1)
|
playsound(holder.my_atom, 'sound/effects/phasein.ogg', 75, 1)
|
||||||
spawn(5 SECONDS)
|
spawn(5 SECONDS)
|
||||||
if(holder && holder.my_atom)
|
if(holder && holder.my_atom)
|
||||||
lightning_strike(get_turf(holder.my_atom))
|
var/turf/T = get_turf(holder.my_atom)
|
||||||
|
if(istype(T))
|
||||||
|
lightning_strike(T)
|
||||||
..()
|
..()
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,13 +0,0 @@
|
|||||||
/datum/species
|
|
||||||
var/bite_mod = 1
|
|
||||||
var/grab_resist_divisor_victims = 1
|
|
||||||
var/grab_resist_divisor_self = 1
|
|
||||||
var/grab_power_victims = 0
|
|
||||||
var/grab_power_self = 0
|
|
||||||
var/waking_speed = 1
|
|
||||||
var/lightweight_light = 0
|
|
||||||
|
|
||||||
/datum/species/handle_environment_special(var/mob/living/carbon/human/H)
|
|
||||||
for(var/datum/trait/env_trait in env_traits)
|
|
||||||
env_trait.handle_environment_special(H)
|
|
||||||
return
|
|
||||||
@@ -4976,7 +4976,6 @@
|
|||||||
#include "modular_chomp\code\modules\mob\living\carbon\human\human.dm"
|
#include "modular_chomp\code\modules\mob\living\carbon\human\human.dm"
|
||||||
#include "modular_chomp\code\modules\mob\living\carbon\human\human_defines.dm"
|
#include "modular_chomp\code\modules\mob\living\carbon\human\human_defines.dm"
|
||||||
#include "modular_chomp\code\modules\mob\living\carbon\human\update_icons.dm"
|
#include "modular_chomp\code\modules\mob\living\carbon\human\update_icons.dm"
|
||||||
#include "modular_chomp\code\modules\mob\living\carbon\human\species\species.dm"
|
|
||||||
#include "modular_chomp\code\modules\mob\living\carbon\human\species\species_shapeshift_ch.dm"
|
#include "modular_chomp\code\modules\mob\living\carbon\human\species\species_shapeshift_ch.dm"
|
||||||
#include "modular_chomp\code\modules\mob\living\carbon\human\species\outsider\vox.dm"
|
#include "modular_chomp\code\modules\mob\living\carbon\human\species\outsider\vox.dm"
|
||||||
#include "modular_chomp\code\modules\mob\living\carbon\human\species\shadekin\shadekin_abilities.dm"
|
#include "modular_chomp\code\modules\mob\living\carbon\human\species\shadekin\shadekin_abilities.dm"
|
||||||
|
|||||||
Reference in New Issue
Block a user