mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2026-08-28 15:47:38 +01:00
Species shock vulnerability is now handled with a getter.
This commit is contained in:
@@ -310,7 +310,7 @@
|
||||
if (!def_zone)
|
||||
def_zone = pick("l_hand", "r_hand")
|
||||
|
||||
if(species.siemens_coefficient == -1)
|
||||
if(species.get_siemens_coefficient(src) == -1)
|
||||
if(stored_shock_by_ref["\ref[src]"])
|
||||
stored_shock_by_ref["\ref[src]"] += shock_damage
|
||||
else
|
||||
|
||||
@@ -126,7 +126,7 @@ emp_act
|
||||
if (!def_zone)
|
||||
return 1.0
|
||||
|
||||
var/siemens_coefficient = max(species.siemens_coefficient,0)
|
||||
var/siemens_coefficient = max(species.get_siemens_coefficient(src),0)
|
||||
|
||||
var/list/clothing_items = list(head, wear_mask, wear_suit, w_uniform, gloves, shoes) // What all are we checking?
|
||||
for(var/obj/item/clothing/C in clothing_items)
|
||||
|
||||
@@ -91,7 +91,7 @@ Variables you may want to make use of are:
|
||||
flash_mod = 0.9
|
||||
sound_mod = 0.9
|
||||
chemOD_mod = 0.9
|
||||
siemens_coefficient = 0.9
|
||||
shock_vulnerability = 0.9
|
||||
|
||||
spawn_flags = SPECIES_IS_RESTRICTED
|
||||
appearance_flags = HAS_SKIN_TONE | HAS_EYE_COLOR
|
||||
@@ -199,7 +199,7 @@ Variables you may want to make use of are:
|
||||
|
||||
/datum/species/event1/proc/toggle_cloning()
|
||||
flags ^= NO_SCAN
|
||||
|
||||
|
||||
/datum/species/event1/proc/toggle_defibbing()
|
||||
flags ^= NO_DEFIB
|
||||
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
radiation_mod = 0.9
|
||||
flash_mod = 0.9
|
||||
sound_mod = 0.9
|
||||
siemens_coefficient = 0.9
|
||||
shock_vulnerability = 0.9
|
||||
|
||||
spawn_flags = SPECIES_IS_RESTRICTED
|
||||
appearance_flags = HAS_SKIN_COLOR | HAS_EYE_COLOR | HAS_HAIR_COLOR | HAS_UNDERWEAR
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
light_dam = 2
|
||||
darksight = 8
|
||||
has_organ = list()
|
||||
siemens_coefficient = 0
|
||||
shock_vulnerability = 0
|
||||
|
||||
blood_color = "#CCCCCC"
|
||||
flesh_color = "#AAAAAA"
|
||||
@@ -30,4 +30,4 @@
|
||||
/datum/species/shadow/handle_death(var/mob/living/carbon/human/H)
|
||||
spawn(1)
|
||||
new /obj/effect/decal/cleanable/ash(H.loc)
|
||||
qdel(H)
|
||||
qdel(H)
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
flash_mod = 0
|
||||
chemOD_mod = 0
|
||||
|
||||
siemens_coefficient = 0
|
||||
shock_vulnerability = 0
|
||||
|
||||
death_message = "falls over and stops moving!"
|
||||
knockout_message = "falls over and stops moving!"
|
||||
@@ -50,4 +50,4 @@
|
||||
heat_level_2 = 3000
|
||||
heat_level_3 = 4000
|
||||
|
||||
body_temperature = T20C
|
||||
body_temperature = T20C
|
||||
|
||||
@@ -55,7 +55,7 @@
|
||||
|
||||
breath_type = "nitrogen"
|
||||
poison_type = "oxygen"
|
||||
siemens_coefficient = 0.2
|
||||
shock_vulnerability = 0.2
|
||||
|
||||
flags = NO_SCAN
|
||||
spawn_flags = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED
|
||||
|
||||
@@ -195,7 +195,7 @@
|
||||
// Body/form vars.
|
||||
var/list/inherent_verbs = list() // Species-specific verbs.
|
||||
var/has_fine_manipulation = 1 // Can use small items.
|
||||
var/siemens_coefficient = 1 // The lower, the thicker the skin and better the insulation.
|
||||
var/shock_vulnerability = 1 // Used as Siemen's coefficient. The lower, the thicker the skin and better the insulation.
|
||||
var/darksight = 2 // Native darksight distance.
|
||||
var/flags = 0 // Various specific features.
|
||||
var/appearance_flags = 0 // Appearance/display related features.
|
||||
|
||||
@@ -131,3 +131,6 @@
|
||||
|
||||
/datum/species/proc/get_slowdown(var/mob/living/carbon/human/H)
|
||||
return slowdown
|
||||
|
||||
/datum/species/proc/get_siemens_coefficient(var/mob/living/carbon/human/H)
|
||||
return shock_vulnerability
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/punch)
|
||||
flags = NO_PAIN | NO_SCAN | NO_POISON | NO_MINOR_CUT | NO_DEFIB
|
||||
spawn_flags = SPECIES_IS_RESTRICTED
|
||||
siemens_coefficient = 0
|
||||
shock_vulnerability = 0
|
||||
|
||||
assisted_langs = list()
|
||||
|
||||
@@ -35,4 +35,4 @@
|
||||
H.mind.special_role = "Golem"
|
||||
H.real_name = "adamantine golem ([rand(1, 1000)])"
|
||||
H.name = H.real_name
|
||||
..()
|
||||
..()
|
||||
|
||||
@@ -71,7 +71,7 @@ var/global/datum/species/shapeshifter/promethean/prometheans
|
||||
body_temperature = T20C // Room temperature
|
||||
|
||||
rarity_value = 5
|
||||
siemens_coefficient = 0.8
|
||||
shock_vulnerability = 0.8
|
||||
|
||||
water_resistance = 0
|
||||
water_damage_mod = 0.3
|
||||
|
||||
@@ -507,7 +507,7 @@
|
||||
water_movement = -4 //Ignore shallow water
|
||||
rarity_value = 3
|
||||
hud_type = /datum/hud_data/diona
|
||||
siemens_coefficient = 0.3
|
||||
shock_vulnerability = 0.3
|
||||
show_ssd = "completely quiescent"
|
||||
health_hud_intensity = 2.5
|
||||
item_slowdown_mod = 0.1
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
rarity_value = 3
|
||||
|
||||
has_fine_manipulation = 0
|
||||
siemens_coefficient = 0
|
||||
shock_vulnerability = 0
|
||||
gluttonous = GLUT_SMALLER
|
||||
|
||||
brute_mod = 0.5 // Hardened carapace.
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
if(ishuman(L))
|
||||
var/mob/living/carbon/human/H = L
|
||||
stun_power *= max(H.species.siemens_coefficient, 0)
|
||||
stun_power *= max(H.species.get_siemens_coefficient(H), 0)
|
||||
|
||||
if(prob(stun_power * 10)) // Try an electric shock.
|
||||
power_charge = max(0, power_charge - 3)
|
||||
|
||||
@@ -304,7 +304,7 @@
|
||||
PN.trigger_warning(5)
|
||||
if(istype(M,/mob/living/carbon/human))
|
||||
var/mob/living/carbon/human/H = M
|
||||
if(H.species.siemens_coefficient <= 0)
|
||||
if(H.species.get_siemens_coefficient(H) <= 0)
|
||||
return
|
||||
if(H.gloves)
|
||||
var/obj/item/clothing/gloves/G = H.gloves
|
||||
|
||||
Reference in New Issue
Block a user