Skip to content

Fix: Round-spawn nested bodies no longer block projectiles #11481

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kiVts merged 1 commit into from
Jan 16, 2026
Merged

Fix: Round-spawn nested bodies no longer block projectiles #11481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions code/game/gamemodes/game_mode.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,18 +258,18 @@ GLOBAL_VAR_INIT(cas_tracking_id_increment, 0) //this var used to assign unique t
var/obj/effect/landmark/corpsespawner/spawner = pick(gamemode_spawn_corpse)
var/turf/spawnpoint = get_turf(spawner)
if(spawnpoint)
var/mob/living/carbon/human/M = new /mob/living/carbon/human(spawnpoint)
M.create_hud() //Need to generate hud before we can equip anything apparently...
arm_equipment(M, spawner.equip_path, TRUE, FALSE)
var/mob/living/carbon/human/human_mob = new /mob/living/carbon/human(spawnpoint)
human_mob.create_hud() //Need to generate hud before we can equip anything apparently...
arm_equipment(human_mob, spawner.equip_path, TRUE, FALSE)
for(var/obj/structure/bed/nest/found_nest in spawnpoint)
for(var/turf/the_turf in list(get_step(found_nest, NORTH),get_step(found_nest, EAST),get_step(found_nest, WEST)))
if(the_turf.density)
found_nest.dir = get_dir(found_nest, the_turf)
found_nest.pixel_x = found_nest.buckling_x["[found_nest.dir]"]
found_nest.pixel_y = found_nest.buckling_y["[found_nest.dir]"]
M.dir = get_dir(the_turf,found_nest)
human_mob.dir = get_dir(the_turf,found_nest)
if(!found_nest.buckled_mob)
found_nest.do_buckle(M,M)
found_nest.forced_buckle_mob(human_mob,human_mob)
gamemode_spawn_corpse.Remove(spawner)

/datum/game_mode/proc/spawn_static_comms()
Expand Down
8 changes: 7 additions & 1 deletion code/game/objects/structures/stool_bed_chair_nest/xeno_nest.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@
if(mob == user)
return

var/mob/living/carbon/human/human = null
var/mob/living/carbon/human/human
if(ishuman(mob))
human = mob
if(human.body_position != LYING_DOWN) //Don't ask me why is has to be
Expand Down Expand Up @@ -266,6 +266,12 @@

return TRUE

/obj/structure/bed/nest/proc/forced_buckle_mob(mob/mob, mob/user)
do_buckle(mob, user)
ADD_TRAIT(mob, TRAIT_NESTED, TRAIT_SOURCE_BUCKLE)
ADD_TRAIT(mob, TRAIT_NO_STRAY, TRAIT_SOURCE_BUCKLE)
SEND_SIGNAL(mob, COMSIG_MOB_NESTED, user)

/obj/structure/bed/nest/send_buckling_message(mob/M, mob/user)
M.visible_message(SPAN_XENONOTICE("[user] secretes a thick, vile resin, securing [M] into [src]!"),
SPAN_XENONOTICE("[user] drenches you in a foul-smelling resin, trapping you in [src]!"),
Expand Down
10 changes: 5 additions & 5 deletions code/modules/objectives/mob_objectives.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,18 @@
var/obj/effect/landmark/corpsespawner/spawner = pick(objective_spawn_corpse)
var/turf/spawnpoint = get_turf(spawner)
if(spawnpoint)
var/mob/living/carbon/human/M = new /mob/living/carbon/human(spawnpoint)
M.create_hud() //Need to generate hud before we can equip anything apparently...
arm_equipment(M, spawner.equip_path, TRUE, FALSE)
var/mob/living/carbon/human/human_mob = new /mob/living/carbon/human(spawnpoint)
human_mob.create_hud() //Need to generate hud before we can equip anything apparently...
arm_equipment(human_mob, spawner.equip_path, TRUE, FALSE)
for(var/obj/structure/bed/nest/found_nest in spawnpoint)
for(var/turf/the_turf in list(get_step(found_nest, NORTH),get_step(found_nest, EAST),get_step(found_nest, WEST)))
if(the_turf.density)
found_nest.dir = get_dir(found_nest, the_turf)
found_nest.pixel_x = found_nest.buckling_x["[found_nest.dir]"]
found_nest.pixel_y = found_nest.buckling_y["[found_nest.dir]"]
M.dir = get_dir(the_turf,found_nest)
human_mob.dir = get_dir(the_turf,found_nest)
if(!found_nest.buckled_mob)
found_nest.do_buckle(M,M)
found_nest.forced_buckle_mob(human_mob,human_mob)
objective_spawn_corpse.Remove(spawner)

/datum/cm_objective/recover_corpses/post_round_start()
Expand Down