Fixed 'in' precedence errors.

This commit is contained in:
Melichior
2015-12-29 17:16:09 -07:00
parent c0c36df209
commit 53db2cbcd1
5 changed files with 5 additions and 5 deletions
+1 -1
View File
@@ -81,7 +81,7 @@ var/list/uplink_items = list()
return 0
// If the uplink's holder is in the user's contents
if ((U.loc in user.contents || (in_range(U.loc, user) && istype(U.loc.loc, /turf))))
if ((U.loc in user.contents) || (in_range(U.loc, user) && istype(U.loc.loc, /turf)))
user.set_machine(U)
if(cost > U.uses)
return 0
@@ -206,7 +206,7 @@
var/newnet = stripped_input(usr, "Which network do you want to view?", "Comm Monitor", network)
if(newnet && ((usr in range(1, src) || issilicon(usr))))
if(newnet && ((usr in range(1, src)) || issilicon(usr)))
if(length(newnet) > 15)
temp = "<font color = #D70B00>- FAILED: NETWORK TAG STRING TOO LENGHTLY -</font color>"
@@ -109,7 +109,7 @@
if(href_list["network"])
var/newnet = stripped_input(usr, "Which network do you want to view?", "Comm Monitor", network)
if(newnet && ((usr in range(1, src) || issilicon(usr))))
if(newnet && ((usr in range(1, src)) || issilicon(usr)))
if(length(newnet) > 15)
temp = "<font color = #D70B00>- FAILED: NETWORK TAG STRING TOO LENGHTLY -</font color>"
@@ -221,7 +221,7 @@ mob/verb/test()
hclient = getClient(hclient, TRUE)
if (istype(hclient))
if (type in asset_list && islist(asset_list[type]))
if ((type in asset_list) && islist(asset_list[type]))
send_asset_list(hclient.client, asset_list[type], TRUE)
if (!winexists(hclient.client, "browser_\ref[src]"))
+1 -1
View File
@@ -25,7 +25,7 @@
/datum/surgery_step/handle_cavity/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
if(tool)
if(IC || tool.w_class > 3 || NODROP in tool.flags || istype(tool, /obj/item/organ))
if(IC || tool.w_class > 3 || (NODROP in tool.flags) || istype(tool, /obj/item/organ))
user << "<span class='warning'>You can't seem to fit [tool] in [target]'s [target_zone]!</span>"
return 0
else