Merge pull request #2499 from CHOMPStationBot/upstream-merge-11010

[MIRROR] Fix some bugs
This commit is contained in:
Nadyr
2021-07-10 18:47:04 -04:00
committed by GitHub
6 changed files with 14 additions and 12 deletions

View File

@@ -83,12 +83,11 @@
data["linked"] = linked
var/list/filter = list()
if(LAZYLEN(freq_listening))
for(var/x in freq_listening)
filter.Add(list(list(
"name" = "[format_frequency(x)]",
"freq" = x,
)))
for(var/x in freq_listening)
filter.Add(list(list(
"name" = "[format_frequency(x)]",
"freq" = x,
)))
data["filter"] = filter
return data

View File

@@ -390,7 +390,7 @@ or don't wish to potentially have a random person teleported into you, it's sugg
not carry this around."}, "OOC Warning", list("Take It","Leave It"))
if(choice == "Leave It")
return
..()
return ..()
/obj/item/device/perfect_tele_beacon/stationary
name = "stationary translocator beacon"

View File

@@ -16,7 +16,7 @@
my_brain.implant_assist(target_state)
if(H.isSynthetic() && H.get_FBP_type() != FBP_CYBORG) //If this on an FBP, it's just an extra inefficient attachment to whatever their brain is.
robotic_brain = TRUE
if(my_brain && my_brain.can_assist())
if(istype(my_brain) && my_brain.can_assist())
START_PROCESSING(SSobj, src)
/obj/item/weapon/implant/neural/Destroy()

View File

@@ -87,6 +87,9 @@
/mob/living/simple_mob/protean_blob/speech_bubble_appearance()
return "synthetic"
/mob/living/simple_mob/protean_blob/get_available_emotes()
return global._robot_default_emotes
/mob/living/simple_mob/protean_blob/init_vore()
return //Don't make a random belly, don't waste your time

View File

@@ -53,13 +53,13 @@
if(istype(I, /obj/item/device/multitool))
if(panel_open)
var/obj/item/device/multitool/M = I
M.buffer = src
M.connectable = src
to_chat(user, "<span class='notice'>You save the data in [I]'s buffer.</span>")
return 1
else
var/obj/item/device/multitool/M = I
if(istype(M.buffer, /obj/machinery/power/quantumpad))
linked_pad = M.buffer
if(istype(M.connectable, /obj/machinery/power/quantumpad))
linked_pad = M.connectable
to_chat(user, "<span class='notice'>You link [src] to the one in [I]'s buffer.</span>")
return 1

View File

@@ -47,7 +47,7 @@
/atom/movable/proc/size_range_check(size_select) //both objects and mobs needs to have that
var/area/A = get_area(src) //Get the atom's area to check for size limit.
if((A.limit_mob_size && (size_select > 200 || size_select < 25)) || (size_select > 600 || size_select <1))
if((A?.limit_mob_size && (size_select > 200 || size_select < 25)) || (size_select > 600 || size_select <1))
return FALSE
return TRUE