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

[FIX] Jobbaned can't spam-spawn as cult harvesters (#21656)

Browse Source 
* fix: jobbaned can't spam-spawn as cult harvesters
https://github.com/ss220-space/Paradise/pull/1283

* fix: oops, what is this check?

* smoke needs create_smoke
This commit is contained in:
larentoun
2023-08-17 03:50:21 +09:00
committed by GitHub
parent ff909adfb1
commit 4efc40ccac
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/wizard/soulstone.dm
+3 -1
View File
@@ -421,10 +421,12 @@
qdel(shade)
qdel(SS)
/proc/make_new_construct(mob/living/simple_animal/hostile/construct/c_type, mob/target, mob/user, cult_override = FALSE)
/proc/make_new_construct(mob/living/simple_animal/hostile/construct/c_type, mob/target, mob/user, cult_override = FALSE, create_smoke = FALSE)
if(jobban_isbanned(target, ROLE_CULTIST))
return
var/mob/living/simple_animal/hostile/construct/C = new c_type(get_turf(target))
if(create_smoke)
new /obj/effect/particle_effect/smoke/sleeping(target.loc)
C.faction |= "\ref[user]"
C.key = target.key
if(user && iscultist(user) || cult_override)
code/modules/mob/living/living.dm
+1 -1
View File
@@ -926,7 +926,7 @@
/mob/living/narsie_act()
if(client)
make_new_construct(/mob/living/simple_animal/hostile/construct/harvester, src, cult_override = TRUE)
make_new_construct(/mob/living/simple_animal/hostile/construct/harvester, src, cult_override = TRUE, create_smoke = TRUE)
spawn_dust()
gib()
code/modules/power/engines/singularity/narsie.dm
+1 -3
View File
@@ -69,9 +69,7 @@
/obj/singularity/narsie/large/attack_ghost(mob/dead/observer/user as mob)
user.forceMove(get_turf(src)) //make_new_construct spawns harvesters at observers locations, could be used to get into admin rooms/CC
make_new_construct(/mob/living/simple_animal/hostile/construct/harvester, user, cult_override = TRUE)
new /obj/effect/particle_effect/smoke/sleeping(user.loc)
make_new_construct(/mob/living/simple_animal/hostile/construct/harvester, user, cult_override = TRUE, create_smoke = TRUE)
/obj/singularity/narsie/process()
eat()