Skip to content
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.

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

Compiled tweaks from old codex dump branch. #4681

Merged
merged 1 commit into from
Dec 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 6 additions & 5 deletions code/game/objects/items/weapons/policetape.dm
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ var/global/list/image/hazard_overlays //Cached hazard floor overlays for the bar
/obj/structure/tape_barricade/proc/update_neighbors(var/location = loc)
for (var/look_dir in global.cardinal)
var/obj/structure/tape_barricade/B = locate(/obj/structure/tape_barricade, get_step(location, look_dir))
if(B && !QDELETED(B))
if(!QDELETED(B))
B.update_icon()

if(!QDELETED(src))
Expand All @@ -261,10 +261,11 @@ var/global/list/image/hazard_overlays //Cached hazard floor overlays for the bar
neighbors = 0
for (var/look_dir in global.cardinal)
var/turf/target_turf = get_step(src, look_dir)
var/obj/structure/tape_barricade/B = locate(/obj/structure/tape_barricade, target_turf)
//We connect to walls and other tape_barricades
if((B && !QDELETED(B)) || (!B && target_turf?.is_wall()))
neighbors |= look_dir
if(target_turf)
var/obj/structure/tape_barricade/B = locate(/obj/structure/tape_barricade) in target_turf
//We connect to walls and other tape_barricades
if((B && !QDELETED(B)) || (!B && target_turf.is_wall()))
neighbors |= look_dir

/**Allow sutypes to override with their own forced icon state name.*/
/obj/structure/tape_barricade/proc/icon_name_override()
Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/new_player/new_player.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
universal_speak = TRUE
mob_sort_value = 10
invisibility = INVISIBILITY_ABSTRACT
is_spawnable_type = FALSE
simulated = FALSE
density = FALSE
stat = DEAD
Expand Down
Loading