mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-11 08:06:33 +01:00
[no gbp] reverts some unintended duplicate checks (#86674)
## About The Pull Request when working on #86031 , i added some checks that were already being handled earlier in the chain, serving nothing. thanks to melbert for catching these ## Why It's Good For The Game removes some duplicated checks
This commit is contained in:
@@ -462,9 +462,7 @@ GLOBAL_LIST_INIT(channel_tokens, list(
|
||||
grant_headset_languages(mob_loc)
|
||||
|
||||
/obj/item/radio/headset/click_alt(mob/living/user)
|
||||
if(!istype(user) || !Adjacent(user) || user.incapacitated)
|
||||
return CLICK_ACTION_BLOCKING
|
||||
if (!command)
|
||||
if(!istype(user) || !command)
|
||||
return CLICK_ACTION_BLOCKING
|
||||
use_command = !use_command
|
||||
to_chat(user, span_notice("You toggle high-volume mode [use_command ? "on" : "off"]."))
|
||||
|
||||
@@ -274,8 +274,6 @@
|
||||
. += span_notice("Ctrl-click to activate seed extraction.")
|
||||
|
||||
/obj/item/storage/bag/plants/portaseeder/item_ctrl_click(mob/user)
|
||||
if(user.incapacitated)
|
||||
return
|
||||
for(var/obj/item/plant in contents)
|
||||
seedify(plant, 1)
|
||||
return CLICK_ACTION_SUCCESS
|
||||
|
||||
@@ -915,8 +915,6 @@ GLOBAL_LIST_EMPTY(roundstart_station_closets)
|
||||
/obj/structure/closet/mouse_drop_receive(atom/movable/O, mob/living/user, params)
|
||||
if(!istype(O) || O.anchored || istype(O, /atom/movable/screen))
|
||||
return
|
||||
if(!istype(user) || user.incapacitated || user.body_position == LYING_DOWN)
|
||||
return
|
||||
if(user == O) //try to climb onto it
|
||||
return ..()
|
||||
if(!opened)
|
||||
|
||||
Reference in New Issue
Block a user