cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 23:17:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes a cult construct death runtime (#20675)

Browse Source 
* fixes a cult construct runtime

* Update code/game/gamemodes/cult/cult_mode.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
This commit is contained in:
GDN
2023-03-26 11:50:27 +01:00
committed by GitHub
co-authored by Contrabang
parent 7503a6c187
commit 690376da3a
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/cult/cult_mode.dm
+4 -2
View File
@@ -172,11 +172,13 @@ GLOBAL_LIST_EMPTY(all_cults)
to_chat(cult_mind.current, "<span class='motd'>For more information, check the wiki page: ([GLOB.configuration.url.wiki_url]/index.php/Cultist)</span>")
return TRUE
/datum/game_mode/proc/remove_cultist(datum/mind/cult_mind, show_message = TRUE, remove_gear = FALSE)
/datum/game_mode/proc/remove_cultist(datum/mind/cult_mind, show_message = TRUE, remove_gear = FALSE, mob/target_mob)
if(!(cult_mind in cult)) // Not actually a cultist in the first place
return
var/mob/cultist = cult_mind.current
var/mob/cultist = target_mob
if(!cultist)
cultist = cult_mind.current
cult -= cult_mind
cultist.faction -= "cult"
cult_mind.special_role = null
code/modules/mob/living/simple_animal/constructs.dm
+1 -1
View File
@@ -52,7 +52,7 @@
/mob/living/simple_animal/hostile/construct/death(gibbed)
. = ..()
SSticker.mode.remove_cultist(mind, FALSE)
SSticker.mode.remove_cultist(show_message = FALSE, target_mob = src)
/mob/living/simple_animal/hostile/construct/examine(mob/user)
. = ..()
code/modules/mob/living/simple_animal/shade.dm
+1 -1
View File
@@ -40,7 +40,7 @@
/mob/living/simple_animal/shade/death(gibbed)
. = ..()
SSticker.mode.remove_cultist(mind, FALSE)
SSticker.mode.remove_cultist(show_message = FALSE, target_mob = src)
/mob/living/simple_animal/shade/attackby(obj/item/O, mob/user) //Marker -Agouri
if(istype(O, /obj/item/soulstone))