cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Nuke disc respawn checks its surroundings for an open space if someone winds up building a wall over it (#20121)

Browse Source 
* Give it space

* Update nuclearbomb.dm

* Update nuclearbomb.dm
This commit is contained in:
Vi3trice
2023-01-14 11:26:51 -05:00
committed by GitHub
parent 6cf0a6e1d3
commit bf61975b2a
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/nuclear/nuclearbomb.dm
+15 -3
View File
@@ -586,17 +586,29 @@ GLOBAL_VAR(bomb_set)
STOP_PROCESSING(SSobj, src)
return ..()
if(length(GLOB.nukedisc_respawn))
var/turf/new_spawn = find_respawn()
if(new_spawn)
GLOB.poi_list.Remove(src)
var/obj/item/disk/nuclear/NEWDISK = new(pick(GLOB.nukedisc_respawn))
var/obj/item/disk/nuclear/NEWDISK = new(new_spawn)
transfer_fingerprints_to(NEWDISK)
message_admins("[src] has been destroyed at ([diskturf.x], [diskturf.y], [diskturf.z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[diskturf.x];Y=[diskturf.y];Z=[diskturf.z]'>JMP</a>). Moving it to ([NEWDISK.x], [NEWDISK.y], [NEWDISK.z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[NEWDISK.x];Y=[NEWDISK.y];Z=[NEWDISK.z]'>JMP</a>).")
log_game("[src] has been destroyed in ([diskturf.x], [diskturf.y], [diskturf.z]). Moving it to ([NEWDISK.x], [NEWDISK.y], [NEWDISK.z]).")
return QDEL_HINT_HARDDEL_NOW
else
error("[src] was supposed to be destroyed, but we were unable to locate a nukedisc_respawn landmark to spawn a new one.")
error("[src] was supposed to be destroyed, but we were unable to locate a nukedisc_respawn landmark or open surroundings to spawn a new one.")
return QDEL_HINT_LETMELIVE // Cancel destruction unless forced.
/obj/item/disk/nuclear/proc/find_respawn()
var/list/possible_spawns = GLOB.nukedisc_respawn
while(length(possible_spawns))
var/turf/current_spawn = pick_n_take(possible_spawns)
if(!current_spawn.density)
return current_spawn
// Someone built a wall over it, check the surroundings
var/list/open_turfs = current_spawn.AdjacentTurfs(open_only = TRUE)
if(length(open_turfs))
return pick(open_turfs)
#undef NUKE_INTACT
#undef NUKE_COVER_OFF
#undef NUKE_COVER_OPEN