cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 07:27:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

[s] Fixes several clingspider related runtimes and fixes spiderlings growing into infestation spiders (#21988)

Browse Source 
* The fixes

* Steelslayer review
This commit is contained in:
DGamerL
2023-08-14 20:52:15 -05:00
committed by GitHub
parent b39f1ed204
commit c2f9228988
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/changeling/powers/summon_spiders.dm
+3 -1
View File
@@ -53,13 +53,15 @@
/// To check and gib the spider when dead, then remove only one of the counter for the changeling owner
var/gibbed = FALSE
//These two bellow are needed to both gib the spider always, and even if it was gibbed only remove 1 from the counter of spider_counter instead of death's gib calling death again and removing 2
//These two below are needed to both gib the spider always, and even if it was gibbed only remove 1 from the counter of spider_counter instead of death's gib calling death again and removing 2
/mob/living/simple_animal/hostile/poison/giant_spider/hunter/infestation_spider/gib()
gibbed = TRUE
return ..()
/mob/living/simple_animal/hostile/poison/giant_spider/hunter/infestation_spider/death(gibbed)
var/mob/owner_mob = locateUID(owner_UID)
if(!ismob(owner_mob))
return ..(TRUE)
var/datum/action/changeling/spiders/S = locate() in owner_mob.actions
if(!isnull(S))
if(gibbed)
code/modules/mob/mob.dm
+2
View File
@@ -1430,6 +1430,8 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
return FALSE
/mob/proc/faction_check_mob(mob/target, exact_match)
if(!target)
return faction_check(faction, null, FALSE)
if(exact_match) //if we need an exact match, we need to do some bullfuckery.
var/list/faction_src = faction.Copy()
var/list/faction_target = target.faction.Copy()