cyberpresidentvanellope/fulpstation
1
0
Fork 0
mirror of https://github.com/fulpstation/fulpstation.git synced 2025-12-10 18:11:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes some missing adjancency checks. (#44020)

Browse Source
This commit is contained in:
skoglol
2019-05-21 11:43:35 +02:00
committed by AnturK
parent c326333316
commit 5316926510
22 changed files with 36 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/machinery/Sleeper.dm
View File

@@ -142,6 +142,8 @@
ui.open()
/obj/machinery/sleeper/AltClick(mob/user)
if(!user.canUseTopic(src, !issilicon(user)))
return
if(state_open)
close_machine()
else

2
code/game/machinery/aug_manipulator.dm
View File

@@ -130,7 +130,7 @@
/obj/machinery/aug_manipulator/AltClick(mob/living/user)
..()
if(!user.canUseTopic(src))
if(!user.canUseTopic(src, !issilicon(user)))
return
else
eject_part(user)

8
code/game/machinery/computer/apc_control.dm
View File

@@ -90,7 +90,7 @@
/obj/machinery/computer/apc_control/Topic(href, href_list)
if(..())
return
if(!usr || !usr.canUseTopic(src) || stat || QDELETED(src))
if(!usr || !usr.canUseTopic(src, !issilicon(usr)) || stat || QDELETED(src))
return
if(href_list["authenticate"])
var/obj/item/card/id/ID = usr.get_idcard(TRUE)
@@ -139,7 +139,7 @@
if(href_list["name_filter"])
playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0)
var/new_filter = stripped_input(usr, "What name are you looking for?", name)
if(!src || !usr || !usr.canUseTopic(src) || stat || QDELETED(src))
if(!src || !usr || !usr.canUseTopic(src, !issilicon(usr)) || stat || QDELETED(src))
return
log_activity("changed name filter to \"[new_filter]\"")
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
@@ -147,7 +147,7 @@
if(href_list["above_filter"])
playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0)
var/new_filter = input(usr, "Enter a percentage from 1-100 to sort by (greater than).", name) as null|num
if(!src || !usr || !usr.canUseTopic(src) || stat || QDELETED(src))
if(!src || !usr || !usr.canUseTopic(src, !issilicon(usr)) || stat || QDELETED(src))
return
log_activity("changed greater than charge filter to \"[new_filter]\"")
if(new_filter)
@@ -157,7 +157,7 @@
if(href_list["below_filter"])
playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0)
var/new_filter = input(usr, "Enter a percentage from 1-100 to sort by (lesser than).", name) as null|num
if(!src || !usr || !usr.canUseTopic(src) || stat || QDELETED(src))
if(!src || !usr || !usr.canUseTopic(src, !issilicon(usr)) || stat || QDELETED(src))
return
log_activity("changed lesser than charge filter to \"[new_filter]\"")
if(new_filter)

4
code/game/machinery/computer/communications.dm
View File

@@ -52,7 +52,7 @@
/obj/machinery/computer/communications/Topic(href, href_list)
if(..())
return
if(!usr.canUseTopic(src))
if(!usr.canUseTopic(src, !issilicon(usr)))
return
if(!is_station_level(z) && !is_reserved_level(z)) //Can only use in transit and on SS13
to_chat(usr, "<span class='boldannounce'>Unable to establish a connection</span>: \black You're too far away from the station!")
@@ -708,7 +708,7 @@
to_chat(user, "Intercomms recharging. Please stand by.")
return
var/input = stripped_input(user, "Please choose a message to announce to the station crew.", "What?")
if(!input || !user.canUseTopic(src))
if(!input || !user.canUseTopic(src, !issilicon(usr)))
return
SScommunications.make_announcement(user, is_silicon, input)
deadchat_broadcast("<span class='deadsay'><span class='name'>[user.real_name]</span> made a priority announcement from <span class='name'>[get_area_name(usr, TRUE)]</span>.</span>", user)

2
code/game/machinery/computer/medical.dm
View File

@@ -583,7 +583,7 @@
if(user)
if(message)
if(authenticated)
if(user.canUseTopic(src))
if(user.canUseTopic(src, BE_CLOSE))
if(!record1 || record1 == active1)
if(!record2 || record2 == active2)
return 1

4
code/game/machinery/computer/security.dm
View File

@@ -816,7 +816,7 @@ What a mess.*/
/obj/machinery/computer/secure_data/proc/canUseSecurityRecordsConsole(mob/user, message1 = 0, record1, record2)
if(user)
if(authenticated)
if(user.canUseTopic(src))
if(user.canUseTopic(src, BE_CLOSE))
if(!trim(message1))
return 0
if(!record1 || record1 == active1)
@@ -825,7 +825,7 @@ What a mess.*/
return 0
/obj/machinery/computer/secure_data/AltClick(mob/user)
if(user.canUseTopic(src))
if(user.canUseTopic(src, !issilicon(user)))
eject_id(user)
/obj/machinery/computer/secure_data/proc/eject_id(mob/user)

2
code/game/machinery/stasis.dm
View File

@@ -34,7 +34,7 @@
last_stasis_sound = _running
/obj/machinery/stasis/AltClick(mob/user)
if(world.time >= stasis_can_toggle && user.canUseTopic(src))
if(world.time >= stasis_can_toggle && user.canUseTopic(src, !issilicon(user)))
stasis_enabled = !stasis_enabled
stasis_can_toggle = world.time + STASIS_TOGGLE_COOLDOWN
playsound(src, 'sound/machines/click.ogg', 60, TRUE)

2
code/game/machinery/washing_machine.dm
View File

@@ -19,7 +19,7 @@
to_chat(user, "<span class='notice'>Alt-click it to start a wash cycle.</span>")
/obj/machinery/washing_machine/AltClick(mob/user)
if(!user.canUseTopic(src))
if(!user.canUseTopic(src, !issilicon(user)))
return
if(busy)

2
code/game/objects/items/RPD.dm
View File

@@ -278,7 +278,7 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
/obj/item/pipe_dispenser/ui_act(action, params)
if(..())
return
if(!usr.canUseTopic(src))
if(!usr.canUseTopic(src, BE_CLOSE))
return
var/playeffect = TRUE
switch(action)

2
code/game/objects/items/cardboard_cutouts.dm
View File

@@ -88,7 +88,7 @@
to_chat(user, "<span class='warning'>Take the cap off first!</span>")
return
var/new_appearance = input(user, "Choose a new appearance for [src].", "26th Century Deception") as null|anything in possible_appearances
if(!new_appearance || !crayon || !user.canUseTopic(src))
if(!new_appearance || !crayon || !user.canUseTopic(src, BE_CLOSE))
return
if(!do_after(user, 10, FALSE, src, TRUE))
return

2
code/game/objects/items/devices/scanners.dm
View File

@@ -472,7 +472,7 @@ GENE SCANNER
/obj/item/analyzer/AltClick(mob/user) //Barometer output for measuring when the next storm happens
..()
if(user.canUseTopic(src))
if(user.canUseTopic(src, BE_CLOSE))
if(cooldown)
to_chat(user, "<span class='warning'>[src]'s barometer function is preparing itself.</span>")

2
code/game/objects/items/devices/transfer_valve.dm
View File

@@ -99,7 +99,7 @@
/obj/item/transfer_valve/Topic(href, href_list)
..()
if(!usr.canUseTopic(src))
if(!usr.canUseTopic(src, BE_CLOSE))
return
if(tank_one && href_list["tankone"])
split_gases()

2
code/game/objects/items/storage/book.dm
View File

@@ -66,7 +66,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning",
H << browse(dat, "window=editicon;can_close=0;can_minimize=0;size=250x650")
/obj/item/storage/book/bible/Topic(href, href_list)
if(!usr.canUseTopic(src))
if(!usr.canUseTopic(src, BE_CLOSE))
return
if(href_list["seticon"] && SSreligion && !SSreligion.bible_icon_state)
var/iconi = text2num(href_list["seticon"])

2
code/game/objects/structures/crates_lockers/closets.dm
View File

@@ -417,7 +417,7 @@
/obj/structure/closet/CtrlShiftClick(mob/living/user)
if(!HAS_TRAIT(user, TRAIT_SKITTISH))
return ..()
if(!user.canUseTopic(src) || !isturf(user.loc))
if(!user.canUseTopic(src, BE_CLOSE) || !isturf(user.loc))
return
dive_into(user)

2
code/game/objects/structures/safe.dm
View File

@@ -96,7 +96,7 @@ FLOOR SAFES
return
var/mob/living/carbon/human/user = usr
if(!user.canUseTopic(src))
if(!user.canUseTopic(src, BE_CLOSE))
return
var/canhear = FALSE

2
code/modules/assembly/health.dm
View File

@@ -90,7 +90,7 @@
var/mob/user = usr
if(!user.canUseTopic(src))
if(!user.canUseTopic(src, BE_CLOSE))
usr << browse(null, "window=hscan")
onclose(usr, "hscan")
return

2
code/modules/events/pirates.dm
View File

@@ -132,7 +132,7 @@
if(!active)
if(alert(user, "Turning the scrambler on will make the shuttle trackable by GPS. Are you sure you want to do it?", "Scrambler", "Yes", "Cancel") == "Cancel")
return
if(active || !user.canUseTopic(src))
if(active || !user.canUseTopic(src, BE_CLOSE))
return
toggle_on(user)
update_icon()

6
code/modules/food_and_drinks/kitchen_machinery/microwave.dm
View File

@@ -188,13 +188,13 @@
..()
/obj/machinery/microwave/AltClick(mob/user)
if(user.canUseTopic(src, BE_CLOSE))
if(user.canUseTopic(src, !issilicon(usr)))
cook()
/obj/machinery/microwave/ui_interact(mob/user)
. = ..()
if(operating || panel_open || !anchored || !user.canUseTopic(src))
if(operating || panel_open || !anchored || !user.canUseTopic(src, !issilicon(user)))
return
if(isAI(user) && (stat & NOPOWER))
return
@@ -209,7 +209,7 @@
var/choice = show_radial_menu(user, src, isAI(user) ? ai_radial_options : radial_options, require_near = !issilicon(user))
// post choice verification
if(operating || panel_open || !anchored || !user.canUseTopic(src))
if(operating || panel_open || !anchored || !user.canUseTopic(src, !issilicon(user)))
return
if(isAI(user) && (stat & NOPOWER))
return

2
code/modules/mob/living/carbon/human/human.dm
View File

@@ -700,7 +700,7 @@
to_chat(src, "<span class='warning'>You can't do that right now!</span>")
return FALSE
if(!Adjacent(M) && (M.loc != src))
if((be_close == 0) || (!no_tk && (dna.check_mutation(TK) && tkMaxRangeCheck(src, M))))
if((be_close == FALSE) || (!no_tk && (dna.check_mutation(TK) && tkMaxRangeCheck(src, M))))
return TRUE
to_chat(src, "<span class='warning'>You are too far away!</span>")
return FALSE

10
code/modules/modular_computers/computers/item/computer.dm
View File

@@ -97,7 +97,7 @@
if(issilicon(usr))
return
var/obj/item/computer_hardware/card_slot/card_slot = all_components[MC_CARD]
if(usr.canUseTopic(src))
if(usr.canUseTopic(src, BE_CLOSE))
card_slot.try_eject(null, usr)
// Eject ID card from computer, if it has ID slot with card inside.
@@ -108,7 +108,7 @@
if(issilicon(usr))
return
var/obj/item/computer_hardware/ai_slot/ai_slot = all_components[MC_AI]
if(usr.canUseTopic(src))
if(usr.canUseTopic(src, BE_CLOSE))
ai_slot.try_eject(null, usr,1)
@@ -120,7 +120,7 @@
if(issilicon(usr))
return
if(usr.canUseTopic(src))
if(usr.canUseTopic(src, BE_CLOSE))
var/obj/item/computer_hardware/hard_drive/portable/portable_drive = all_components[MC_SDD]
if(uninstall_component(portable_drive, usr))
portable_drive.verb_pickup()
@@ -130,7 +130,7 @@
if(issilicon(user))
return
if(user.canUseTopic(src))
if(user.canUseTopic(src, BE_CLOSE))
var/obj/item/computer_hardware/card_slot/card_slot = all_components[MC_CARD]
var/obj/item/computer_hardware/ai_slot/ai_slot = all_components[MC_AI]
var/obj/item/computer_hardware/hard_drive/portable/portable_drive = all_components[MC_SDD]
@@ -159,7 +159,7 @@
/obj/item/modular_computer/MouseDrop(obj/over_object, src_location, over_location)
var/mob/M = usr
if((!istype(over_object, /obj/screen)) && usr.canUseTopic(src))
if((!istype(over_object, /obj/screen)) && usr.canUseTopic(src, BE_CLOSE))
return attack_self(M)
return ..()

2
code/modules/modular_computers/computers/item/laptop.dm
View File

@@ -77,7 +77,7 @@
return
if(!isturf(loc) && !ismob(loc)) // No opening it in backpack.
return
if(!user.canUseTopic(src))
if(!user.canUseTopic(src, BE_CLOSE))
return
toggle_open(user)

4
code/modules/reagents/chemistry/machinery/reagentgrinder.dm
View File

@@ -166,7 +166,7 @@
/obj/machinery/reagentgrinder/ui_interact(mob/user) // The microwave Menu //I am reasonably certain that this is not a microwave
. = ..()
if(operating || !user.canUseTopic(src))
if(operating || !user.canUseTopic(src, !issilicon(user)))
return
var/list/options = list()
@@ -197,7 +197,7 @@
choice = show_radial_menu(user, src, options, require_near = !issilicon(user))
// post choice verification
if(operating || (isAI(user) && stat & NOPOWER) || !user.canUseTopic(src))
if(operating || (isAI(user) && stat & NOPOWER) || !user.canUseTopic(src, !issilicon(user)))
return
switch(choice)