cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-08-31 08:37:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1131 from liz-lavenza/fix/runtimes-one

Browse Source 
Fix a large number of runtimes
This commit is contained in:
BongaTheProto
2024-04-06 18:43:43 -05:00
committed by GitHub
parent 84f230b889 d50794333f
commit 40eeadef98
41 changed files with 388 additions and 511 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/carbon.dm
+1 -1
View File
@@ -103,7 +103,7 @@
. = ..()
var/hurt = TRUE
var/extra_speed = 0
if(throwingdatum.thrower != src)
if(throwingdatum?.thrower != src)
extra_speed = min(max(0, throwingdatum.speed - initial(throw_speed)), 3)
if(GetComponent(/datum/component/tackler))
return
code/modules/mob/living/carbon/human/emote.dm
+3 -3
View File
@@ -100,7 +100,7 @@
H.dna.species.stop_wagging_tail(H)
/datum/emote/living/carbon/human/wag/can_run_emote(mob/user, status_check = TRUE)
if(!..())
if(!..() || !ishuman(user))
return FALSE
var/mob/living/carbon/human/H = user
return H.dna && H.dna.species && H.dna.species.can_wag_tail(user)
@@ -122,7 +122,7 @@
. = ..()
if(.)
var/mob/living/carbon/human/H = user
if(findtext(select_message_type(user), "open"))
if(H.dna.species.mutant_bodyparts["wings"])
H.OpenWings()
else
H.CloseWings()
@@ -136,7 +136,7 @@
. = "closes " + message
/datum/emote/living/carbon/human/wing/can_run_emote(mob/user, status_check = TRUE)
if(!..())
if(!..() || !ishuman(user))
return FALSE
var/mob/living/carbon/human/H = user
if(H.dna && H.dna.species && (H.dna.features["wings"] != "None"))
code/modules/mob/living/carbon/life.dm
+1 -1
View File
@@ -401,7 +401,7 @@
var/obj/item/organ/O = V
if(O)
O.on_life(seconds, times_fired)
else
else if(!QDELETED(src))
if(reagents.has_reagent(/datum/reagent/toxin/formaldehyde, 1) || reagents.has_reagent(/datum/reagent/preservahyde, 1)) // No organ decay if the body contains formaldehyde. Or preservahyde.
return
for(var/V in internal_organs)
code/modules/mob/living/living_defense.dm
+2 -2
View File
@@ -109,7 +109,7 @@
/mob/living/hitby(atom/movable/AM, skipcatch, hitpush = TRUE, blocked = FALSE, datum/thrownthing/throwingdatum)
if(!isitem(AM))
// Filled with made up numbers for non-items.
if(mob_run_block(AM, 30, "\the [AM.name]", ATTACK_TYPE_PROJECTILE, 0, throwingdatum.thrower, throwingdatum.thrower.zone_selected, list()))
if(mob_run_block(AM, 30, "\the [AM.name]", ATTACK_TYPE_THROWN, 0, throwingdatum?.thrower, throwingdatum?.thrower?.zone_selected, list()))
hitpush = FALSE
skipcatch = TRUE
blocked = TRUE
@@ -121,7 +121,7 @@
if(thrown_item.thrownby == WEAKREF(src)) //No throwing stuff at yourself to trigger hit reactions
return ..()
if(mob_run_block(AM, thrown_item.throwforce, "\the [thrown_item.name]", ATTACK_TYPE_PROJECTILE, 0, throwingdatum.thrower, throwingdatum.thrower.zone_selected, list()))
if(mob_run_block(AM, thrown_item.throwforce, "\the [thrown_item.name]", ATTACK_TYPE_THROWN, 0, throwingdatum?.thrower, throwingdatum?.thrower?.zone_selected, list()))
hitpush = FALSE
skipcatch = TRUE
blocked = TRUE