Small changeling tweaks (#9255)

This commit is contained in:
Decepteor
2020-07-06 13:53:26 +02:00
committed by GitHub
parent 6e92f88945
commit ef39964cbd
4 changed files with 18 additions and 3 deletions
@@ -10,6 +10,9 @@
if(!istype(G))
to_chat(src, "<span class='warning'>We must be grabbing a creature in our active hand to absorb them.</span>")
return
if(!src.get_pressure_weakness())
to_chat(src, "<span class='warning'>We cannot absorb this creature from inside a sealed environment.</span>")
return
var/mob/living/carbon/human/T = G.affecting
if(!istype(T))
to_chat(src, "<span class='warning'>[T] is not compatible with our biology.</span>")
@@ -18,7 +21,7 @@
to_chat(src, "<span class='warning'>We do not know how to parse this creature's DNA!</span>")
return
if(islesserform(T))
to_chat(src, "<span class='warning'>This creature DNA is not compatible with our form!</span>")
to_chat(src, "<span class='warning'>This creature's DNA is not compatible with our form!</span>")
return
if(HUSK in T.mutations)
to_chat(src, "<span class='warning'>This creature's DNA is ruined beyond useability!</span>")
+2 -2
View File
@@ -109,7 +109,7 @@
// Calculate how vulnerable the human is to under- and overpressure.
// Returns 0 (equals 0 %) if sealed in an undamaged suit, 1 if unprotected (equals 100%).
// Suitdamage can modifiy this in 10% steps.
/mob/living/carbon/human/proc/get_pressure_weakness()
/mob/living/carbon/human/get_pressure_weakness()
var/pressure_adjustment_coefficient = 1 // Assume no protection at first.
if(wear_suit && (wear_suit.item_flags & STOPPRESSUREDAMAGE) && head && (head.item_flags & STOPPRESSUREDAMAGE)) // Complete set of pressure-proof suit worn, assume fully sealed.
@@ -727,7 +727,7 @@
return 1
if(hallucination && !(species.flags & (NO_POISON|IS_PLANT)))
handle_hallucinations()
handle_hallucinations()
if(get_shock() >= (species.total_health * 0.75))
if(!stat)
+3
View File
@@ -987,6 +987,9 @@
/mob/proc/get_species(var/reference = 0)
return ""
/mob/proc/get_pressure_weakness()
return 1
/mob/proc/flash_weak_pain()
flick("weak_pain", pain)
+9
View File
@@ -0,0 +1,9 @@
# Your name.
author: Decepter
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Changes
changes:
- tweak: "Made it so that Changelings can't absorb DNA if they're inside a sealed void suit."