Skip to content

Commit

Permalink
Corrects Intercom Overlays, Fixes Cable Underlaying Bug (lizardqueenl…
Browse files Browse the repository at this point in the history
…exi#170)

FOR REAL THIS TIME

Does what it says on the tin, adding adjusted overlays for the new intercoms, making the command intercoms visually distinctive as well and finally making the "receive" animation more unique!
image

This PR also fixes a bug caused by PR lizardqueenlexi#166, which made compiling fail because they forgot to put two variables before adding the defines (lol).

    Closes 

    Intercoms have drifted. also we need more of them lizardqueenlexi#156

Why It's Good For The Game

ONE STEP CLOSER
  • Loading branch information
Imaginos16 authored Mar 17, 2023
1 parent 3498996 commit 08ed542
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions code/game/turfs/closed/wall/window_frames.dm
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@

///Gives the user a shock if they get unlucky (Based on shock chance)
/obj/structure/window_frame/proc/try_shock(mob/user, shock_chance)
var/turf/my_turf = get_turf(src)
var/obj/structure/cable/underlaying_cable = my_turf.get_cable_node()
if(!has_grille) // no grille? dont shock.
return FALSE
if(!underlaying_cable)
Expand All @@ -74,8 +76,6 @@
return FALSE
if(!in_range(src, user))//To prevent TK and mech users from getting shocked
return FALSE
var/turf/my_turf = get_turf(src)
var/obj/structure/cable/underlaying_cable = my_turf.get_cable_node()
if(electrocute_mob(user, underlaying_cable, src, 1, TRUE))
var/datum/effect_system/spark_spread/spark_effect = new /datum/effect_system/spark_spread
spark_effect.set_up(3, 1, src)
Expand Down
Binary file modified icons/obj/radio.dmi
Binary file not shown.

0 comments on commit 08ed542

Please sign in to comment.